ag-common 0.0.720 → 0.0.722

package/dist/api/helpers/dynamo.js

@@ -55,8 +55,8 @@ const batchWrite = (tableName, itemsIn) => __awaiter(void 0, void 0, void 0, fun
     try {
         yield (0, async_1.asyncForEach)(chunked, (items) => __awaiter(void 0, void 0, void 0, function* () {
             let retryCount = 0;
-            let retryMax = 3;
-            let params = new lib_dynamodb_1.BatchWriteCommand({
+            const retryMax = 3;
+            const params = new lib_dynamodb_1.BatchWriteCommand({
                 RequestItems: {
                     [`${tableName}`]: items.map((Item) => ({
                         PutRequest: { Item },
@@ -64,28 +64,32 @@ const batchWrite = (tableName, itemsIn) => __awaiter(void 0, void 0, void 0, fun
                 },
             });
             (0, log_1.debug)(`running dynamo batchWrite=${JSON.stringify(params, null, 2)}`);
-            try {
-                yield exports.dynamoDb.send(params);
-                return {};
-            }
-            catch (e) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                let es = e.toString();
-                let msg = es;
-                (0, log_1.warn)('dynamo write error', msg);
-                if (es.indexOf('429') !== -1 ||
-                    es.indexOf('ProvisionedThroughputExceeded') !== -1) {
-                    retryCount += 1;
-                    msg = `batch write throttled. retry ${retryCount}/${retryMax}`;
-                }
-                else {
-                    throw e;
+            // eslint-disable-next-line
+            while (true) {
+                try {
+                    yield exports.dynamoDb.send(params);
+                    return {};
                 }
-                if (retryCount >= retryMax) {
+                catch (e) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const es = e.toString();
+                    let msg = es;
+                    (0, log_1.warn)('dynamo write error', msg);
+                    if (es.indexOf('429') !== -1 ||
+                        es.indexOf('ProvisionedThroughputExceeded') !== -1) {
+                        retryCount += 1;
+                        msg = `batch write throttled. retry ${retryCount}/${retryMax}`;
+                        (0, log_1.warn)(msg);
+                        if (retryCount >= retryMax) {
+                            throw new Error(`Max retries (${retryMax}) exceeded: ${es}`);
+                        }
+                        yield (0, sleep_1.sleep)(2000);
+                        // Continue the while loop to retry
+                        continue;
+                    }
+                    // For non-throttling errors, throw immediately
                     throw e;
                 }
-                (0, log_1.warn)(`dynamo retry ${retryCount}/${retryMax}`);
-                yield (0, sleep_1.sleep)(2000);
             }
         }));
         return {};
@@ -97,13 +101,13 @@ const batchWrite = (tableName, itemsIn) => __awaiter(void 0, void 0, void 0, fun
 });
 exports.batchWrite = batchWrite;
 const batchDelete = (_a) => __awaiter(void 0, [_a], void 0, function* ({ tableName, keys, pkName, }) {
-    //batch up to 20, so we can retry.
+    // batch up to 20, so we can retry
     let chunked = (0, array_1.chunk)(keys, 20);
     try {
         yield (0, async_1.asyncForEach)(chunked, (items) => __awaiter(void 0, void 0, void 0, function* () {
             let retryCount = 0;
-            let retryMax = 3;
-            let params = new lib_dynamodb_1.BatchWriteCommand({
+            const retryMax = 3;
+            const params = new lib_dynamodb_1.BatchWriteCommand({
                 RequestItems: {
                     [`${tableName}`]: items.map((key) => ({
                         DeleteRequest: { Key: { [`${pkName}`]: key } },
@@ -111,28 +115,36 @@ const batchDelete = (_a) => __awaiter(void 0, [_a], void 0, function* ({ tableNa
                 },
             });
             (0, log_1.debug)(`running dynamo batch delete=${JSON.stringify(params, null, 2)}`);
-            try {
-                yield exports.dynamoDb.send(params);
-                return {};
-            }
-            catch (e) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                let es = e.toString();
-                let msg = es;
-                (0, log_1.warn)('dynamo write error', msg);
-                if (es.indexOf('429') !== -1 ||
-                    es.indexOf('ProvisionedThroughputExceeded') !== -1) {
-                    retryCount += 1;
-                    msg = `batch delete write throttled. retry ${retryCount}/${retryMax}`;
-                }
-                else {
-                    throw e;
+            while (retryCount < retryMax) {
+                try {
+                    yield exports.dynamoDb.send(params);
+                    return {};
                 }
-                if (retryCount >= retryMax) {
-                    throw e;
+                catch (e) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const es = e.toString();
+                    let shouldRetry = false;
+                    if (es.indexOf('429') !== -1 ||
+                        es.indexOf('ProvisionedThroughputExceeded') !== -1) {
+                        shouldRetry = true;
+                        retryCount += 1;
+                        const msg = `batch delete write throttled. retry ${retryCount}/${retryMax}`;
+                        (0, log_1.warn)('dynamo write error', msg);
+                    }
+                    else {
+                        // Non-retryable error
+                        throw e;
+                    }
+                    if (shouldRetry) {
+                        if (retryCount >= retryMax) {
+                            (0, log_1.warn)(`Max retries (${retryMax}) reached, giving up`);
+                            throw e;
+                        }
+                        (0, log_1.warn)(`dynamo retry ${retryCount}/${retryMax}`);
+                        yield (0, sleep_1.sleep)(2000 * Math.pow(2, retryCount - 1)); // Exponential backoff
+                        continue;
+                    }
                 }
-                (0, log_1.warn)(`dynamo retry ${retryCount}/${retryMax}`);
-                yield (0, sleep_1.sleep)(2000);
             }
         }));
         return {};

package/dist/api/helpers/s3.js

@@ -27,6 +27,7 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_presigned_post_1 = require("@aws-sdk/s3-presigned-post");
 const array_1 = require("../../common/helpers/array");
 const log_1 = require("../../common/helpers/log");
+const object_1 = require("../../common/helpers/object");
 const setS3 = (region) => {
     const raw = new client_s3_1.S3Client({ region });
     return raw;
@@ -191,7 +192,7 @@ function getPresignedPostURL(_a) {
                     ['starts-with', '$Content-Type', 'image/'],
                 ],
             });
-            const fields = JSON.parse(JSON.stringify(ps.fields));
+            const fields = (0, object_1.copy)(ps.fields);
             return { data: { fields, url: ps.url } };
         }
         catch (e) {

package/dist/api/helpers/validateOpenApi.js

@@ -40,7 +40,7 @@ const getOperation = ({ path, method, resource, schema, }) => {
     const re = new RegExp(resourcePath
         .replace(/\//gim, `\\/`)
         .replace(/\{(.+?)\}/gim, '(?<$1>[^\\\\]+)'), 'i').exec(path);
-    const pathParams = (re === null || re === void 0 ? void 0 : re.groups) && JSON.parse(JSON.stringify(re.groups));
+    const pathParams = (re === null || re === void 0 ? void 0 : re.groups) && (0, object_1.copy)(re.groups);
     return { operation, pathParams };
 };
 function validateOpenApi(_a) {

package/dist/common/helpers/object.d.ts

@@ -65,3 +65,4 @@ export declare const removeUndefValuesFromObjectAdditional: <T>(orig: Record<str
  */
 export declare const castStringlyObject: (orig: Record<string, string | string[] | undefined>) => Record<string, string>;
 export declare const isObject: (o: any) => any;
+export declare const copy: <T>(v: T) => T;

package/dist/common/helpers/object.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = exports.castStringlyObject = exports.removeUndefValuesFromObjectAdditional = exports.removeUndefValuesFromObject = exports.filterObject = exports.castObject = exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
+exports.copy = exports.isObject = exports.castStringlyObject = exports.removeUndefValuesFromObjectAdditional = exports.removeUndefValuesFromObject = exports.filterObject = exports.castObject = exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
 const tryJsonParse = (str, defaultValue) => {
     if (!str) {
         return null;
@@ -193,3 +193,5 @@ exports.castStringlyObject = castStringlyObject;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const isObject = (o) => o && typeof o === 'object' && !Array.isArray(o);
 exports.isObject = isObject;
+const copy = (v) => JSON.parse(JSON.stringify(v));
+exports.copy = copy;

package/dist/ui/components/BarChart/getLegendItems.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLegendItems = void 0;
 const array_1 = require("../../../common/helpers/array");
 const math_1 = require("../../../common/helpers/math");
+const object_1 = require("../../../common/helpers/object");
 const getLegendItems = ({ data, selectedKey, }) => {
     const min = data.total * 0.1;
     const shownResults = 4;
     const part = (0, array_1.take)(data.values.filter((r) => r.value > min), shownResults).part;
-    const rest = JSON.parse(JSON.stringify(data.values)).filter((r) => !part.find((p) => p.name === r.name));
+    const rest = (0, object_1.copy)(data.values).filter((r) => !part.find((p) => p.name === r.name));
     //if we want to ensure this value exists in the returned results
     if (selectedKey) {
         const pi = part.findIndex((r) => r.name === selectedKey);

package/dist/ui/components/LineChart/getLegendItems.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLegendItems = void 0;
 const array_1 = require("../../../common/helpers/array");
 const math_1 = require("../../../common/helpers/math");
+const object_1 = require("../../../common/helpers/object");
 const shownResults = 4;
 const getTopItems = ({ data, colours, }) => {
     const val = {};
@@ -41,7 +42,7 @@ const getLegendItems = (p) => {
     let rest = [];
     if (part.length > shownResults) {
         part = (0, array_1.take)(part.filter((r) => r.y > min), shownResults).part;
-        rest = JSON.parse(JSON.stringify(values)).filter((r) => !part.find((p) => p.name === r.name));
+        rest = (0, object_1.copy)(values).filter((r) => !part.find((p) => p.name === r.name));
     }
     const restTotal = (0, math_1.sumArray)(rest.map((s) => s.y));
     return { part, rest, restTotal, total };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.720",
+  "version": "0.0.722",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",