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
13 changes: 11 additions & 2 deletions lib/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,26 @@ export default class HttpBase {
this.options = this.setDefaults(options);
this.rootHttp = axios.create({
...options.requestConfig,
baseURL: `${options.host}/api/v1`,
baseURL: options.baseURL,
});
this.http = axios.create({
...options.requestConfig,
baseURL: `${options.host}/api/v1/namespaces/${this.options.namespace}`,
baseURL: options.namespaceBaseURL,
});
}

private setDefaults(options: FireFlyOptionsInput): FireFlyOptions {
const baseURLSet = (options.baseURL ?? '') !== '' && (options.namespaceBaseURL ?? '' !== '');
if (!baseURLSet && (options.host ?? '') === '') {
throw new Error('Invalid options. Option host, or baseURL and namespaceBaseURL must be set.');
}

return {
...options,
baseURL: baseURLSet ? options.baseURL : `${options.host}/api/v1`,
namespaceBaseURL: baseURLSet
? options.namespaceBaseURL
: `${options.host}/api/v1/namespaces/${options.namespace}`,
namespace: options.namespace ?? 'default',
websocket: {
...options.websocket,
Expand Down
2 changes: 2 additions & 0 deletions lib/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export interface FireFlyOptionsInput {
namespace?: string;
username?: string;
password?: string;
baseURL?: string;
namespaceBaseURL?: string;
websocket?: {
host?: string;
reconnectDelay?: number;
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hyperledger/firefly-sdk",
"version": "1.2.10",
"version": "1.2.11",
"description": "Client SDK for Hyperledger FireFly",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -45,4 +45,4 @@
"form-data": "^4.0.0",
"ws": "^8.5.0"
}
}
}