Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default class Client {
}

url(path) {
return `${this.api.baseUri}/${path}?secret=${this.api.secret}`;
return `${this.api.baseUri}${path}?secret=${this.api.secret}`;
}

static handleError(error) {
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import path from 'path';
import pkg from '../package.json';
import Task from './task';
import Client from './client';
import { getReadableStream } from './utils';
import { getReadableStream, normalizeBaseUri } from './utils';

function ConvertAPI(secret, options = {}) {
if (!(this instanceof ConvertAPI)) {
return new ConvertAPI(secret, options);
}

this.secret = secret;
this.baseUri = options.baseUri || 'https://v2.convertapi.com';
this.baseUri = normalizeBaseUri(options.baseUri || 'https://v2.convertapi.com/');
this.conversionTimeout = options.conversionTimeout;
this.conversionTimeoutDelta = options.conversionTimeoutDelta || 10;
this.uploadTimeout = options.uploadTimeout || 1800;
Expand Down
8 changes: 8 additions & 0 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ export const normalizeFilesParam = async (promise) => {
return Promise.all(value);
};

export const normalizeBaseUri = (baseUri) => {
if (baseUri[baseUri.length - 1] !== '/') {
return `${baseUri}/`;
}

return baseUri;
};

export const buildFileParam = async (api, value) => {
if (URI_REGEXP.test(value)) {
return value;
Expand Down