@cubejs-client/core 1.3.1 → 1.3.3

package/index.d.ts

@@ -23,6 +23,10 @@ declare module '@cubejs-client/core' {
     headers?: Record<string, string>;
     credentials?: 'omit' | 'same-origin' | 'include';
     method?: 'GET' | 'PUT' | 'POST' | 'PATCH';
+    /**
+     * Fetch timeout in milliseconds. Would be passed as AbortSignal.timeout()
+     */
+    fetchTimeout?: number;
   };
 
   export interface ITransportResponse<R> {
@@ -81,6 +85,10 @@ declare module '@cubejs-client/core' {
     parseDateMeasures?: boolean;
     resType?: 'default' | 'compact';
     castNumerics?: boolean;
+    /**
+     * How many network errors would be retried before returning to users. Default to 0.
+     */
+    networkErrorRetries?: number;
   };
 
   export type LoadMethodOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "engines": {},
   "repository": {
     "type": "git",
@@ -55,5 +55,5 @@
     ],
     "coverageDirectory": "coverage/"
   },
-  "gitHead": "78a557da3d86bc40416ced7d034ba829c55ad187"
+  "gitHead": "e033d8917c7b9ff89329edc5d0c4fc4cc74c6bf4"
 }

package/src/HttpTransport.js

@@ -2,12 +2,13 @@ import fetch from 'cross-fetch';
 import 'url-search-params-polyfill';
 
 class HttpTransport {
-  constructor({ authorization, apiUrl, method, headers = {}, credentials }) {
+  constructor({ authorization, apiUrl, method, headers = {}, credentials, fetchTimeout }) {
     this.authorization = authorization;
     this.apiUrl = apiUrl;
     this.method = method;
     this.headers = headers;
     this.credentials = credentials;
+    this.fetchTimeout = fetchTimeout;
   }
 
   request(method, { baseRequestId, ...params }) {
@@ -36,7 +37,8 @@ class HttpTransport {
         ...this.headers
       },
       credentials: this.credentials,
-      body: requestMethod === 'POST' ? JSON.stringify(params) : null
+      body: requestMethod === 'POST' ? JSON.stringify(params) : null,
+      signal: this.fetchTimeout ? AbortSignal.timeout(this.fetchTimeout) : undefined,
     });
 
     return {

package/src/index.js

@@ -57,6 +57,7 @@ class CubeApi {
     this.pollInterval = options.pollInterval || 5;
     this.parseDateMeasures = options.parseDateMeasures;
     this.castNumerics = typeof options.castNumerics === 'boolean' ? options.castNumerics : false;
+    this.networkErrorRetries = options.networkErrorRetries || 0;
 
     this.updateAuthorizationPromise = null;
   }
@@ -104,6 +105,8 @@ class CubeApi {
       }
     };
 
+    let networkRetries = this.networkErrorRetries;
+
     const loadImpl = async (response, next) => {
       const requestInstance = await requestPromise;
 
@@ -135,7 +138,11 @@ class CubeApi {
 
       skipAuthorizationUpdate = false;
 
-      if (response.status === 502) {
+      if (response.status === 502 ||
+        response.error &&
+        response.error.toLowerCase() === 'network error' &&
+        --networkRetries >= 0
+      ) {
         await checkMutex();
         return continueWait(true);
       }