ag-common 0.0.325 → 0.0.329

package/dist/api/helpers/cloudfront.d.ts

@@ -0,0 +1,5 @@
+export declare const setCF: (region: string) => void;
+export declare const invalidateCloudfrontPath: ({ path, distributionId, }: {
+    path: string;
+    distributionId: string;
+}) => Promise<void>;

package/dist/api/helpers/cloudfront.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invalidateCloudfrontPath = exports.setCF = void 0;
+const cloudfront_1 = __importDefault(require("aws-sdk/clients/cloudfront"));
+let cf = new cloudfront_1.default();
+const setCF = (region) => {
+    cf = new cloudfront_1.default({ region });
+};
+exports.setCF = setCF;
+const invalidateCloudfrontPath = ({ path, distributionId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const params = {
+        DistributionId: distributionId,
+        InvalidationBatch: {
+            CallerReference: 'scraper',
+            Paths: {
+                Quantity: 1,
+                Items: [path],
+            },
+        },
+    };
+    yield cf.createInvalidation(params).promise();
+});
+exports.invalidateCloudfrontPath = invalidateCloudfrontPath;

package/dist/api/helpers/dynamoInfra.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSMParams = exports.generateTableRef = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
+const ssm_1 = require("./ssm");
 const generateTableRef = ({ stack, baseKey, hasStream, hasGSI, }) => {
     const tableStreamArn = !hasStream
         ? undefined
-        : aws_cdk_lib_1.aws_ssm.StringParameter.valueForStringParameter(stack, `${baseKey}/streamArn`);
+        : (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/streamArn` });
     const globalIndexes = !hasGSI
         ? undefined
-        : aws_cdk_lib_1.Fn.split(',', aws_cdk_lib_1.aws_ssm.StringParameter.valueForStringParameter(stack, `${baseKey}/gsi`));
+        : (0, ssm_1.loadSsmStringList)({ stack, path: `${baseKey}/gsi` });
     const shortName = aws_cdk_lib_1.aws_ssm.StringParameter.valueFromLookup(stack, `${baseKey}/shortName`);
     const table = aws_cdk_lib_1.aws_dynamodb.Table.fromTableAttributes(stack, baseKey, {
-        tableArn: aws_cdk_lib_1.aws_ssm.StringParameter.valueForStringParameter(stack, `${baseKey}/arn`),
+        tableArn: (0, ssm_1.loadSsmString)({ stack, path: `${baseKey}/arn` }),
         tableStreamArn,
         globalIndexes,
     });
@@ -22,43 +23,25 @@ const generateTableRef = ({ stack, baseKey, hasStream, hasGSI, }) => {
 };
 exports.generateTableRef = generateTableRef;
 const generateSSMParams = ({ stack, table, baseKey, gsi, shortName, }) => {
-    const name1 = `${baseKey}TableArn`;
-    new aws_cdk_lib_1.aws_ssm.StringParameter(stack, name1, {
-        allowedPattern: '.*',
-        description: `${name1} (cdk)`,
-        parameterName: `${baseKey}/arn`,
-        stringValue: table.tableArn,
-        tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
-    });
+    (0, ssm_1.saveToSsm)({ stack, path: `${baseKey}/arn`, value: table.tableArn });
     if (table.tableStreamArn) {
-        const name2 = `${baseKey}TableStreamArn`;
-        new aws_cdk_lib_1.aws_ssm.StringParameter(stack, name2, {
-            allowedPattern: '.*',
-            description: `${name2} (cdk)`,
-            parameterName: `${baseKey}/streamArn`,
-            stringValue: table.tableStreamArn,
-            tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
+        (0, ssm_1.saveToSsm)({
+            stack,
+            path: `${baseKey}/streamArn`,
+            value: table.tableStreamArn,
         });
     }
     if (gsi && (gsi === null || gsi === void 0 ? void 0 : gsi.length) > 0) {
-        const name3 = `${baseKey}TableGSI`;
-        new aws_cdk_lib_1.aws_ssm.StringParameter(stack, name3, {
-            allowedPattern: '.*',
-            description: `${name3} (cdk)`,
-            parameterName: `${baseKey}/gsi`,
-            stringValue: gsi.join(','),
-            tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
-            type: aws_cdk_lib_1.aws_ssm.ParameterType.STRING,
+        (0, ssm_1.saveToSsm)({
+            stack,
+            path: `${baseKey}/gsi`,
+            value: gsi.join(','),
         });
     }
-    const name4 = `${baseKey}TableShortName`;
-    new aws_cdk_lib_1.aws_ssm.StringParameter(stack, name4, {
-        allowedPattern: '.*',
-        description: `${name4} (cdk)`,
-        parameterName: `${baseKey}/shortName`,
-        stringValue: shortName,
-        tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
-        type: aws_cdk_lib_1.aws_ssm.ParameterType.STRING,
+    (0, ssm_1.saveToSsm)({
+        stack,
+        path: `${baseKey}/shortName`,
+        value: shortName,
     });
 };
 exports.generateSSMParams = generateSSMParams;

package/dist/api/helpers/index.d.ts

@@ -1,5 +1,6 @@
 export * from './api';
 export * from './aws';
+export * from './cloudfront';
 export * from './dynamo';
 export * from './enforceDynamoProvisionCap';
 export * from './dynamoInfra';
@@ -7,5 +8,6 @@ export * from './openApiHelpers';
 export * from './s3';
 export * from './ses';
 export * from './sqs';
+export * from './ssm';
 export * from './validateOpenApi';
 export * from './validations';

package/dist/api/helpers/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
 __exportStar(require("./aws"), exports);
+__exportStar(require("./cloudfront"), exports);
 __exportStar(require("./dynamo"), exports);
 __exportStar(require("./enforceDynamoProvisionCap"), exports);
 __exportStar(require("./dynamoInfra"), exports);
@@ -23,5 +24,6 @@ __exportStar(require("./openApiHelpers"), exports);
 __exportStar(require("./s3"), exports);
 __exportStar(require("./ses"), exports);
 __exportStar(require("./sqs"), exports);
+__exportStar(require("./ssm"), exports);
 __exportStar(require("./validateOpenApi"), exports);
 __exportStar(require("./validations"), exports);

package/dist/api/helpers/ssm.d.ts

@@ -0,0 +1,23 @@
+import { Stack } from 'aws-cdk-lib';
+/**
+ * save a value to ssm
+ * @param param0
+ */
+export declare const saveToSsm: ({ stack, path, value, }: {
+    /** eg `/${NODE_ENV}/${shortStackName}/service/key` */
+    path: string;
+    stack: Stack;
+    value: string;
+}) => void;
+/** load a string from ssm */
+export declare const loadSsmString: ({ stack, path, }: {
+    stack: Stack;
+    /** eg `/${NODE_ENV}/${shortStackName}/service/key` */
+    path: string;
+}) => string;
+/** load a csv from ssm */
+export declare const loadSsmStringList: ({ stack, path, }: {
+    stack: Stack;
+    /** eg `/${NODE_ENV}/${shortStackName}/service/key` */
+    path: string;
+}) => string[];

package/dist/api/helpers/ssm.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadSsmStringList = exports.loadSsmString = exports.saveToSsm = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const common_1 = require("../../common");
+/**
+ * save a value to ssm
+ * @param param0
+ */
+const saveToSsm = ({ stack, path, value, }) => {
+    const name = (0, common_1.toBase64)(path);
+    new aws_cdk_lib_1.aws_ssm.StringParameter(stack, name, {
+        allowedPattern: '.*',
+        description: `${name} (cdk)`,
+        parameterName: path,
+        stringValue: value,
+        tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
+    });
+};
+exports.saveToSsm = saveToSsm;
+/** load a string from ssm */
+const loadSsmString = ({ stack, path, }) => aws_cdk_lib_1.aws_ssm.StringParameter.valueForStringParameter(stack, path);
+exports.loadSsmString = loadSsmString;
+/** load a csv from ssm */
+const loadSsmStringList = ({ stack, path, }) => aws_cdk_lib_1.Fn.split(',', (0, exports.loadSsmString)({ stack, path }));
+exports.loadSsmStringList = loadSsmStringList;

package/dist/api/helpers/validations.js

@@ -34,13 +34,16 @@ const jwtVerify = ({ token, jwksUri, issuer, }) => __awaiter(void 0, void 0, voi
             }
             jwksClient.getSigningKey(header.kid, (errorV, key) => {
                 if (errorV) {
-                    (0, log_1.error)(`signing key error. jwks=${jwksUri} iss=${issuer}`);
-                    reject(errorV);
+                    const msg = `signing key error. jwks=${jwksUri} iss=${issuer}` + errorV;
+                    (0, log_1.error)(msg);
+                    reject(msg);
                     return;
                 }
                 const signingKey = (key === null || key === void 0 ? void 0 : key.publicKey) || (key === null || key === void 0 ? void 0 : key.rsaPublicKey) || undefined;
                 if (!signingKey) {
-                    callback('no key');
+                    const msg = `no key error`;
+                    (0, log_1.error)(msg);
+                    reject(msg);
                 }
                 else {
                     callback(null, signingKey);

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/helpers/math.js

@@ -34,7 +34,7 @@ function clamp({ value, min, max, }) {
 }
 exports.clamp = clamp;
 function sumArray(array) {
-    return array.reduce((a, b) => a + b);
+    return array.reduce((a, b) => a + b, 0);
 }
 exports.sumArray = sumArray;
 const getRandomInt = (max) => {

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,12 +1,12 @@
 {
   "name": "ag-common",
-  "version": "0.0.325",
+  "version": "0.0.329",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
   "repository": "github:andreigec/ag-common",
   "license": "ISC",
-  "packageManager": "yarn@3.2.2",
+  "packageManager": "yarn@3.2.3",
   "scripts": {
     "format": "npx eslint --ext .ts,.tsx ./src --fix",
     "build": "rimraf dist && yarn lint && tsc",
@@ -41,8 +41,8 @@
     "@storybook/addons": "6.5.10",
     "@storybook/react": "6.5.10",
     "@storybook/theming": "6.5.10",
-    "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "18.7.9",
+    "@types/jsonwebtoken": "8.5.9",
+    "@types/node": "18.7.13",
     "@types/react": "18.0.17",
     "@types/react-dom": "18.0.6",
     "@types/styled-components": "5.1.26",