ag-common 0.0.328 → 0.0.331

package/dist/common/const.d.ts

@@ -0,0 +1,2 @@
+export declare const retryHttpCodes: number[];
+export declare const retryHttpMs = 1500;

package/dist/common/const.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retryHttpMs = exports.retryHttpCodes = void 0;
+exports.retryHttpCodes = [429, 408, 502, 503, 504];
+exports.retryHttpMs = 1500;

package/dist/common/index.d.ts

@@ -1 +1,2 @@
+export * from './const';
 export * from './helpers';

package/dist/common/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./const"), exports);
 __exportStar(require("./helpers"), exports);

package/dist/ui/helpers/axiosHelper.js

@@ -23,6 +23,7 @@ const axios_1 = __importDefault(require("axios"));
  * @returns
  */
 const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0, onStaleAuth, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     let retry = 0;
     let ret;
     do {
@@ -70,19 +71,20 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
         }
         catch (e) {
             const em = e;
+            const c = Number((_a = em.code) !== null && _a !== void 0 ? _a : '500');
             // jwt expired or bad response
             // 403 returned for old token - will be refreshed
-            if (em.code === '401' || em.code === '403') {
+            if (c === 401 || c === 403) {
                 (0, log_1.debug)('auth expired');
                 onStaleAuth === null || onStaleAuth === void 0 ? void 0 : onStaleAuth();
                 retry = retryMax;
             }
-            if (retry >= retryMax) {
+            if (!common_1.retryHttpCodes.includes(c) || retry >= retryMax) {
                 throw em;
             }
         }
         retry += 1;
-        yield (0, common_1.sleep)(1000);
+        yield (0, common_1.sleep)(common_1.retryHttpMs);
     } while (retry <= retryMax);
     throw new Error('unexpected');
 });

package/dist/ui/helpers/callOpenApi/direct.js

@@ -14,6 +14,7 @@ const cookie_1 = require("../cookie");
 const sleep_1 = require("../../../common/helpers/sleep");
 const array_1 = require("../../../common/helpers/array");
 const useLocalStorage_1 = require("../useLocalStorage");
+const const_1 = require("../../../common/const");
 /**
  * get the id_token from provided value, or cookie, or LS
  */
@@ -57,7 +58,7 @@ function getIdTokenAuthHeader({ overrideAuth, refreshToken, }) {
     });
 }
 const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const { func, apiUrl, logout, newDefaultApi, headers } = p;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error;
@@ -87,13 +88,13 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
         catch (e) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const ae = e;
-            const status = (_a = ae.response) === null || _a === void 0 ? void 0 : _a.status;
+            const status = (_b = (_a = ae.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 500;
             const errorMessage = [
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (_d = (_c = (_b = ae.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : '',
-                (_g = (_f = (_e = ae.response) === null || _e === void 0 ? void 0 : _e.statusText) === null || _f === void 0 ? void 0 : _f.toString()) !== null && _g !== void 0 ? _g : '',
-                (_k = (_j = (_h = ae.response) === null || _h === void 0 ? void 0 : _h.status) === null || _j === void 0 ? void 0 : _j.toString()) !== null && _k !== void 0 ? _k : '',
-                (_m = (_l = ae.message) === null || _l === void 0 ? void 0 : _l.toString()) !== null && _m !== void 0 ? _m : '',
+                (_e = (_d = (_c = ae.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : '',
+                (_h = (_g = (_f = ae.response) === null || _f === void 0 ? void 0 : _f.statusText) === null || _g === void 0 ? void 0 : _g.toString()) !== null && _h !== void 0 ? _h : '',
+                (_l = (_k = (_j = ae.response) === null || _j === void 0 ? void 0 : _j.status) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
+                (_o = (_m = ae.message) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
             ]
                 .filter(array_1.notEmpty)
                 .sort((a, b) => (a.length < b.length ? -1 : 1))
@@ -105,13 +106,12 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
                     data: undefined,
                 };
             }
-            if (status !== 500 || errorCount === errorMax) {
+            if (!const_1.retryHttpCodes.includes(status) || errorCount === errorMax) {
                 error = Object.assign(Object.assign({}, ae), { message: errorMessage });
                 break;
             }
         }
-        // eslint-disable-next-line no-await-in-loop
-        yield (0, sleep_1.sleep)(2000);
+        yield (0, sleep_1.sleep)(const_1.retryHttpMs);
     }
     return Object.assign({ data }, (error && { error }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.328",
+  "version": "0.0.331",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -22,7 +22,7 @@
     "jsonwebtoken": "8.x",
     "jwks-rsa": "2.x",
     "node-cache": "5.x",
-    "openapi-request-validator": "12.0.0",
+    "openapi-request-validator": "12.0.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hot-toast": "2.x",
@@ -32,7 +32,7 @@
     "styled-components": ">=5"
   },
   "devDependencies": {
-    "@babel/core": "7.18.13",
+    "@babel/core": "7.19.0",
     "@storybook/addon-actions": "6.5.10",
     "@storybook/addon-docs": "6.5.10",
     "@storybook/addon-essentials": "6.5.10",
@@ -42,8 +42,8 @@
     "@storybook/react": "6.5.10",
     "@storybook/theming": "6.5.10",
     "@types/jsonwebtoken": "8.5.9",
-    "@types/node": "18.7.13",
-    "@types/react": "18.0.17",
+    "@types/node": "18.7.16",
+    "@types/react": "18.0.19",
     "@types/react-dom": "18.0.6",
     "@types/styled-components": "5.1.26",
     "cross-env": "7.0.3",