@sisense/sdk-rest-client 1.13.0 → 1.14.0

package/dist/http-client.d.ts

@@ -11,8 +11,8 @@ export declare class HttpClient {
     readonly env: string;
     constructor(url: string, auth: Authenticator, env: string);
     login(): Promise<boolean>;
-    call<T = unknown>(url: string, config: RequestInit, requestConfig?: HttpClientRequestConfig): Promise<T>;
-    post<T = unknown>(endpoint: string, data: unknown, options?: RequestInit, abortSignal?: AbortSignal, config?: HttpClientRequestConfig): Promise<T>;
-    get<T = unknown>(endpoint: string, request?: RequestInit, config?: HttpClientRequestConfig): Promise<T>;
-    delete<T = void>(endpoint: string, request?: RequestInit, config?: HttpClientRequestConfig): Promise<T>;
+    call<T>(url: string, config: RequestInit, requestConfig?: HttpClientRequestConfig): Promise<T | undefined>;
+    post<T = unknown>(endpoint: string, data: unknown, options?: RequestInit, abortSignal?: AbortSignal, config?: HttpClientRequestConfig): Promise<T | undefined>;
+    get<T = unknown>(endpoint: string, request?: RequestInit, config?: HttpClientRequestConfig): Promise<T | undefined>;
+    delete<T = void>(endpoint: string, request?: RequestInit, config?: HttpClientRequestConfig): Promise<T | undefined>;
 }

package/dist/http-client.js

@@ -11,6 +11,7 @@ import fetchIntercept from 'fetch-intercept';
 import { getResponseInterceptor, errorInterceptor } from './interceptors.js';
 import { SsoAuthenticator } from './sso-authenticator.js';
 import { addQueryParamsToUrl } from './helpers.js';
+const AUTH_WAIT_MS = 10;
 export class HttpClient {
     constructor(url, auth, env) {
         if (!url.endsWith('/')) {
@@ -36,7 +37,7 @@ export class HttpClient {
                     const retry = () => {
                         // wait if still authenticating
                         if (this.auth.isAuthenticating()) {
-                            setTimeout(retry, 10);
+                            setTimeout(retry, AUTH_WAIT_MS);
                             return;
                         }
                         void this.call(url, config, requestConfig).then((r) => res(r));
@@ -50,51 +51,41 @@ export class HttpClient {
                 config.credentials = 'include';
             }
             this.auth.applyHeader(config.headers);
-            // used for API usage tracking
-            const trackedUrl = addQueryParamsToUrl(url, {
-                trc: this.env,
-            });
-            const response = yield fetch((requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.skipTrackingParam) ? url : trackedUrl, config);
+            const fetchUrl = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.skipTrackingParam)
+                ? url
+                : addQueryParamsToUrl(url, {
+                    trc: this.env,
+                });
+            const response = yield fetch(fetchUrl, config);
             if (response.status === 204 || // No content
                 response.status === 304 // Not modified
             ) {
-                return undefined;
-            }
-            try {
-                return ((requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.returnBlob) ? yield response.blob() : yield response.json());
-            }
-            catch (e) {
-                // some of APIs in Sisense returns 200 with empty body - so it's not possible
-                // to understand definitely is it empty or not until you will try to parse it
-                if (e instanceof Error && e.message.includes('Unexpected end of JSON input')) {
-                    return undefined;
-                }
-                else {
-                    throw e;
-                }
+                return;
             }
+            return ((requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.returnBlob)
+                ? response.blob()
+                : response.json().catch((e) => {
+                    var _a, _b;
+                    // some of APIs in Sisense returns 200 with empty body - so it's not possible
+                    // to understand definitely is it empty or not until you will try to parse it
+                    if (!((_b = (_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'Unexpected end of JSON input'))) {
+                        throw e;
+                    }
+                }));
         });
     }
     // eslint-disable-next-line max-params
     post(endpoint, data, options = {}, abortSignal, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = Object.assign({ method: 'POST', body: ((config === null || config === void 0 ? void 0 : config.nonJSONBody) ? data : JSON.stringify(data)), headers: {
-                    Accept: 'application/json, text/plain, */*',
-                    'Content-Type': 'application/json;charset=UTF-8',
-                }, signal: abortSignal }, options);
-            return this.call(this.url + endpoint, request, config);
-        });
+        const request = Object.assign({ method: 'POST', body: ((config === null || config === void 0 ? void 0 : config.nonJSONBody) ? data : JSON.stringify(data)), headers: {
+                Accept: 'application/json, text/plain, */*',
+                'Content-Type': 'application/json;charset=UTF-8',
+            }, signal: abortSignal }, options);
+        return this.call(this.url + endpoint, request, config);
     }
     get(endpoint, request = {}, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            request.method = 'GET';
-            return this.call(this.url + endpoint, request, config);
-        });
+        return this.call(this.url + endpoint, Object.assign(Object.assign({}, request), { method: 'GET' }), config);
     }
     delete(endpoint, request = {}, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            request.method = 'DELETE';
-            return this.call(this.url + endpoint, request, config);
-        });
+        return this.call(this.url + endpoint, Object.assign(Object.assign({}, request), { method: 'DELETE' }), config);
     }
 }

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "1.13.0",
+  "version": "1.14.0",
   "type": "module",
   "exports": "./dist/index.js",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   "author": "Sisense",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@sisense/sdk-common": "^1.13.0",
+    "@sisense/sdk-common": "^1.14.0",
     "fetch-intercept": "^2.4.0"
   },
   "scripts": {