@extrahorizon/javascript-sdk 8.14.2-dev-207-77c1c66 → 8.14.2-dev-211-13941b3

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.14.2]
+
+### Fixed
+- OAuth2 token refreshes are now shared between parallel requests, no longer invalidating each other
+- Response transformations are no longer applied twice to retried requests
+- Retry handling no longer masks internally generated errors as `TypeError: Cannot destructure property 'retry' of 'config' as it is undefined`
+
 ## [8.14.1]
 
 ### Fixed

package/build/index.cjs.js

@@ -1752,11 +1752,13 @@ function typeReceivedError(error) {
 }
 
 const retryInterceptor = (axios) => async (error) => {
+    if (!error || !error.isAxiosError || !error.config) {
+        throw error;
+    }
     const { config } = error;
     const { retry } = config;
     // tries includes the initial try. So 5 tries equals 4 retries
-    if ((error === null || error === void 0 ? void 0 : error.isAxiosError) &&
-        (retry === null || retry === void 0 ? void 0 : retry.tries) > (retry === null || retry === void 0 ? void 0 : retry.current) &&
+    if ((retry === null || retry === void 0 ? void 0 : retry.tries) > (retry === null || retry === void 0 ? void 0 : retry.current) &&
         (retry === null || retry === void 0 ? void 0 : retry.retryCondition(error))) {
         await delay(retry.retryTimeInMs);
         return axios({
@@ -2235,11 +2237,11 @@ function createOAuth1HttpClient(http, options) {
                 {}),
         },
     }));
-    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
-    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     httpWithAuth.interceptors.response.use(camelizeResponseData);
     httpWithAuth.interceptors.response.use(transformResponseData);
     httpWithAuth.interceptors.response.use(transformKeysResponseData);
+    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
+    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     async function authenticate(data) {
         // If the user has passed in a token/tokenSecret combination.
         // Validate it against /users/me on the unauthenticated Axios client unless skipTokenCheck is true
@@ -2390,6 +2392,7 @@ function btoa(input) {
 const TOKEN_ENDPOINT = `${AUTH_BASE}/oauth2/tokens`;
 function createOAuth2HttpClient(http, options) {
     let tokenData;
+    let refreshingTokensPromise = null;
     if ('refreshToken' in options && 'accessToken' in options) {
         tokenData = {
             refreshToken: options.refreshToken,
@@ -2443,7 +2446,7 @@ function createOAuth2HttpClient(http, options) {
             // Refresh 10 seconds before the token is about to expire.
             // This is to prevent being just too late with a refresh of the token due to latencies
             if (Date.now() > expireTime - 10 * 1000) {
-                await authenticate({ refreshToken: tokenData.refreshToken });
+                await refreshTokens();
             }
         }
         return {
@@ -2454,6 +2457,9 @@ function createOAuth2HttpClient(http, options) {
             },
         };
     });
+    httpWithAuth.interceptors.response.use(camelizeResponseData);
+    httpWithAuth.interceptors.response.use(transformResponseData);
+    httpWithAuth.interceptors.response.use(transformKeysResponseData);
     httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
     // If we receive a expired/unknown access token error, refresh the tokens
     httpWithAuth.interceptors.response.use(null, async (error) => {
@@ -2467,15 +2473,12 @@ function createOAuth2HttpClient(http, options) {
             [118, 117].includes((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.code) &&
             !originalRequest.isRetryWithRefreshedTokens) {
             originalRequest.isRetryWithRefreshedTokens = true;
-            await authenticate({ refreshToken: tokenData.refreshToken });
+            await refreshTokens();
             return httpWithAuth(originalRequest);
         }
         throw error;
     });
     httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
-    httpWithAuth.interceptors.response.use(camelizeResponseData);
-    httpWithAuth.interceptors.response.use(transformResponseData);
-    httpWithAuth.interceptors.response.use(transformKeysResponseData);
     /**
      * - Adds a creationTimestamp to the token
      * - Notifies the user
@@ -2508,6 +2511,18 @@ function createOAuth2HttpClient(http, options) {
             {});
         return await dateAndSetTokenData(tokenResult.data);
     }
+    async function refreshTokens() {
+        if (refreshingTokensPromise) {
+            return refreshingTokensPromise;
+        }
+        refreshingTokensPromise = authenticate({ refreshToken: tokenData.refreshToken });
+        try {
+            return await refreshingTokensPromise;
+        }
+        finally {
+            refreshingTokensPromise = null;
+        }
+    }
     async function confirmMfa({ token, methodId, code, }) {
         const tokenResult = await http.post(TOKEN_ENDPOINT, {
             ...clientCredentials,
@@ -2629,11 +2644,11 @@ function createProxyHttpClient(http, options) {
             return Promise.reject(error);
         });
     }
-    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
-    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     httpWithAuth.interceptors.response.use(camelizeResponseData);
     httpWithAuth.interceptors.response.use(transformResponseData);
     httpWithAuth.interceptors.response.use(transformKeysResponseData);
+    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
+    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     async function logout() {
         try {
             await httpWithAuth.post('/logout');
@@ -2694,11 +2709,11 @@ function createHttpClient({ packageVersion, host, requestLogger, responseLogger,
             return Promise.reject(error);
         });
     }
-    http.interceptors.response.use(null, retryInterceptor(http));
-    http.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     http.interceptors.response.use(camelizeResponseData);
     http.interceptors.response.use(transformResponseData);
     http.interceptors.response.use(transformKeysResponseData);
+    http.interceptors.response.use(null, retryInterceptor(http));
+    http.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     return http;
 }
 
@@ -5768,7 +5783,7 @@ const templatesV2Service = (httpWithAuth) => {
     };
 };
 
-const version = '8.14.2-dev-207-77c1c66';
+const version = '8.14.2-dev-211-13941b3';
 
 /**
  * Create ExtraHorizon client.

package/build/index.mjs

@@ -1722,11 +1722,13 @@ function typeReceivedError(error) {
 }
 
 const retryInterceptor = (axios) => async (error) => {
+    if (!error || !error.isAxiosError || !error.config) {
+        throw error;
+    }
     const { config } = error;
     const { retry } = config;
     // tries includes the initial try. So 5 tries equals 4 retries
-    if ((error === null || error === void 0 ? void 0 : error.isAxiosError) &&
-        (retry === null || retry === void 0 ? void 0 : retry.tries) > (retry === null || retry === void 0 ? void 0 : retry.current) &&
+    if ((retry === null || retry === void 0 ? void 0 : retry.tries) > (retry === null || retry === void 0 ? void 0 : retry.current) &&
         (retry === null || retry === void 0 ? void 0 : retry.retryCondition(error))) {
         await delay(retry.retryTimeInMs);
         return axios({
@@ -2205,11 +2207,11 @@ function createOAuth1HttpClient(http, options) {
                 {}),
         },
     }));
-    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
-    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     httpWithAuth.interceptors.response.use(camelizeResponseData);
     httpWithAuth.interceptors.response.use(transformResponseData);
     httpWithAuth.interceptors.response.use(transformKeysResponseData);
+    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
+    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     async function authenticate(data) {
         // If the user has passed in a token/tokenSecret combination.
         // Validate it against /users/me on the unauthenticated Axios client unless skipTokenCheck is true
@@ -2360,6 +2362,7 @@ function btoa(input) {
 const TOKEN_ENDPOINT = `${AUTH_BASE}/oauth2/tokens`;
 function createOAuth2HttpClient(http, options) {
     let tokenData;
+    let refreshingTokensPromise = null;
     if ('refreshToken' in options && 'accessToken' in options) {
         tokenData = {
             refreshToken: options.refreshToken,
@@ -2413,7 +2416,7 @@ function createOAuth2HttpClient(http, options) {
             // Refresh 10 seconds before the token is about to expire.
             // This is to prevent being just too late with a refresh of the token due to latencies
             if (Date.now() > expireTime - 10 * 1000) {
-                await authenticate({ refreshToken: tokenData.refreshToken });
+                await refreshTokens();
             }
         }
         return {
@@ -2424,6 +2427,9 @@ function createOAuth2HttpClient(http, options) {
             },
         };
     });
+    httpWithAuth.interceptors.response.use(camelizeResponseData);
+    httpWithAuth.interceptors.response.use(transformResponseData);
+    httpWithAuth.interceptors.response.use(transformKeysResponseData);
     httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
     // If we receive a expired/unknown access token error, refresh the tokens
     httpWithAuth.interceptors.response.use(null, async (error) => {
@@ -2437,15 +2443,12 @@ function createOAuth2HttpClient(http, options) {
             [118, 117].includes((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.code) &&
             !originalRequest.isRetryWithRefreshedTokens) {
             originalRequest.isRetryWithRefreshedTokens = true;
-            await authenticate({ refreshToken: tokenData.refreshToken });
+            await refreshTokens();
             return httpWithAuth(originalRequest);
         }
         throw error;
     });
     httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
-    httpWithAuth.interceptors.response.use(camelizeResponseData);
-    httpWithAuth.interceptors.response.use(transformResponseData);
-    httpWithAuth.interceptors.response.use(transformKeysResponseData);
     /**
      * - Adds a creationTimestamp to the token
      * - Notifies the user
@@ -2478,6 +2481,18 @@ function createOAuth2HttpClient(http, options) {
             {});
         return await dateAndSetTokenData(tokenResult.data);
     }
+    async function refreshTokens() {
+        if (refreshingTokensPromise) {
+            return refreshingTokensPromise;
+        }
+        refreshingTokensPromise = authenticate({ refreshToken: tokenData.refreshToken });
+        try {
+            return await refreshingTokensPromise;
+        }
+        finally {
+            refreshingTokensPromise = null;
+        }
+    }
     async function confirmMfa({ token, methodId, code, }) {
         const tokenResult = await http.post(TOKEN_ENDPOINT, {
             ...clientCredentials,
@@ -2599,11 +2614,11 @@ function createProxyHttpClient(http, options) {
             return Promise.reject(error);
         });
     }
-    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
-    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     httpWithAuth.interceptors.response.use(camelizeResponseData);
     httpWithAuth.interceptors.response.use(transformResponseData);
     httpWithAuth.interceptors.response.use(transformKeysResponseData);
+    httpWithAuth.interceptors.response.use(null, retryInterceptor(httpWithAuth));
+    httpWithAuth.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     async function logout() {
         try {
             await httpWithAuth.post('/logout');
@@ -2664,11 +2679,11 @@ function createHttpClient({ packageVersion, host, requestLogger, responseLogger,
             return Promise.reject(error);
         });
     }
-    http.interceptors.response.use(null, retryInterceptor(http));
-    http.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     http.interceptors.response.use(camelizeResponseData);
     http.interceptors.response.use(transformResponseData);
     http.interceptors.response.use(transformKeysResponseData);
+    http.interceptors.response.use(null, retryInterceptor(http));
+    http.interceptors.response.use(null, typeReceivedErrorsInterceptor);
     return http;
 }
 
@@ -5738,7 +5753,7 @@ const templatesV2Service = (httpWithAuth) => {
     };
 };
 
-const version = '8.14.2-dev-207-77c1c66';
+const version = '8.14.2-dev-211-13941b3';
 
 /**
  * Create ExtraHorizon client.

package/build/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.14.2-dev-207-77c1c66";
+export declare const version = "8.14.2-dev-211-13941b3";

package/build/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.14.2-dev-207-77c1c66";
+export declare const version = "8.14.2-dev-211-13941b3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/javascript-sdk",
-  "version": "8.14.2-dev-207-77c1c66",
+  "version": "8.14.2-dev-211-13941b3",
   "description": "This package serves as a JavaScript wrapper around all Extra Horizon cloud services.",
   "main": "build/index.cjs.js",
   "types": "build/types/index.d.ts",