triangle-utils 1.4.105 → 1.4.107

package/dist/src/UtilsDynamoDB.d.ts

@@ -58,7 +58,9 @@ export declare class UtilsDynamoDB {
     remove(table_name: string, key: Record<string, any>, attributes: string[]): Promise<void>;
     create(table_name: string, key: Record<string, any>, attributes?: Record<string, any>): Promise<void>;
     delete(table_name: string, key: Record<string, any>): Promise<void>;
-    batch_put(table_name: string, items: Record<string, any>[]): Promise<void>;
+    batch_put(table_name: string, items: Record<string, any>[], options?: {
+        is_verbose?: boolean;
+    }): Promise<void>;
     batch_delete(table_name: string, keys: Record<string, any>[]): Promise<void>;
     duplicate_attribute(table_name: string, attribute_name: string, new_attribute_name: string): Promise<void>;
     remove_attribute(table_name: string, attribute_name: string): Promise<undefined>;

package/dist/src/UtilsDynamoDB.js

@@ -1,4 +1,6 @@
+import { ThrottlingException } from "@aws-sdk/client-bedrock-runtime";
 import { DynamoDB } from "@aws-sdk/client-dynamodb";
+import { UtilsMisc } from "./UtilsMisc.js";
 function convert_output(dynamodb_output) {
     if (dynamodb_output.S !== undefined) {
         return dynamodb_output.S;
@@ -498,30 +500,43 @@ export class UtilsDynamoDB {
             Key: converted_key
         });
     }
-    async batch_put(table_name, items) {
+    async batch_put(table_name, items, options = {}) {
+        const is_verbose = options.is_verbose !== undefined ? options.is_verbose : false;
         const dynamodb_items = items.map(item => convert_input(item)?.M)
             .filter(dynamodb_item => dynamodb_item !== undefined);
-        for (let i = 0; i < dynamodb_items.length; i += 100) {
-            let next_dynamodb_requests = dynamodb_items.slice(i, i + 100).map(next_dynamodb_item => ({
+        for (let i = 0; i < dynamodb_items.length; i += 25) {
+            let next_dynamodb_requests = dynamodb_items.slice(i, i + 25).map(next_dynamodb_item => ({
                 PutRequest: {
                     Item: next_dynamodb_item
                 }
             }));
             while (next_dynamodb_requests.length > 0) {
-                const response = await this.dynamodb.batchWriteItem({
-                    RequestItems: {
-                        [table_name]: next_dynamodb_requests
+                try {
+                    const response = await this.dynamodb.batchWriteItem({
+                        RequestItems: {
+                            [table_name]: next_dynamodb_requests
+                        }
+                    });
+                    next_dynamodb_requests = response.UnprocessedItems?.[table_name] || [];
+                }
+                catch (error) {
+                    if (error instanceof ThrottlingException) {
+                        if (is_verbose) {
+                            console.log("Throttled.");
+                        }
+                        await UtilsMisc.wait(1000);
+                        continue;
                     }
-                });
-                next_dynamodb_requests = response.UnprocessedItems?.[table_name] || [];
+                    throw error;
+                }
             }
         }
     }
     async batch_delete(table_name, keys) {
         const dynamodb_keys = keys.map(key => convert_input(key)?.M)
             .filter(dynamodb_key => dynamodb_key !== undefined);
-        for (let i = 0; i < dynamodb_keys.length; i += 100) {
-            let next_dynamodb_requests = dynamodb_keys.slice(i, i + 100).map(next_dynamodb_key => ({
+        for (let i = 0; i < dynamodb_keys.length; i += 25) {
+            let next_dynamodb_requests = dynamodb_keys.slice(i, i + 25).map(next_dynamodb_key => ({
                 DeleteRequest: {
                     Key: next_dynamodb_key
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.105",
+    "version": "1.4.107",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsDynamoDB.ts

@@ -1,4 +1,6 @@
+import { ThrottlingException } from "@aws-sdk/client-bedrock-runtime"
 import { AttributeValue, DynamoDB, QueryCommandInput, QueryCommandOutput, ScanCommandInput, ScanCommandOutput, UpdateItemCommandInput, WriteRequest } from "@aws-sdk/client-dynamodb"
+import { UtilsMisc } from "./UtilsMisc"
 
 function convert_output(dynamodb_output : AttributeValue) : string | boolean | number | any[] | Set<any> | Record<string, any> | undefined {
     if (dynamodb_output.S !== undefined) {
@@ -615,24 +617,39 @@ export class UtilsDynamoDB {
 
     async batch_put(
         table_name : string,
-        items : Record<string, any>[]
+        items : Record<string, any>[],
+        options : {
+            is_verbose? : boolean
+        } = {}
     ) : Promise<void> {
+        const is_verbose = options.is_verbose !== undefined ? options.is_verbose : false
         const dynamodb_items = items.map(item => convert_input(item)?.M)
             .filter(dynamodb_item => dynamodb_item !== undefined)
             
-        for (let i = 0; i < dynamodb_items.length; i += 100) {
-            let next_dynamodb_requests : WriteRequest[] = dynamodb_items.slice(i, i + 100).map(next_dynamodb_item => ({
+        for (let i = 0; i < dynamodb_items.length; i += 25) {
+            let next_dynamodb_requests : WriteRequest[] = dynamodb_items.slice(i, i + 25).map(next_dynamodb_item => ({
                 PutRequest : {
                     Item : next_dynamodb_item
                 }
             }))
             while (next_dynamodb_requests.length > 0) {
-                const response = await this.dynamodb.batchWriteItem({
-                    RequestItems : {
-                        [table_name] : next_dynamodb_requests
+                try {
+                    const response = await this.dynamodb.batchWriteItem({
+                        RequestItems : {
+                            [table_name] : next_dynamodb_requests
+                        }
+                    })
+                    next_dynamodb_requests = response.UnprocessedItems?.[table_name] || []
+                } catch (error : any) {
+                    if (error instanceof ThrottlingException) {
+                        if (is_verbose) {
+                            console.log("Throttled.")
+                        }
+                        await UtilsMisc.wait(1000)
+                        continue
                     }
-                })
-                next_dynamodb_requests = response.UnprocessedItems?.[table_name] || []
+                    throw error
+                }
             }
         }
     }
@@ -644,8 +661,8 @@ export class UtilsDynamoDB {
         const dynamodb_keys = keys.map(key => convert_input(key)?.M)
             .filter(dynamodb_key => dynamodb_key !== undefined)
             
-        for (let i = 0; i < dynamodb_keys.length; i += 100) {
-            let next_dynamodb_requests : WriteRequest[] = dynamodb_keys.slice(i, i + 100).map(next_dynamodb_key => ({
+        for (let i = 0; i < dynamodb_keys.length; i += 25) {
+            let next_dynamodb_requests : WriteRequest[] = dynamodb_keys.slice(i, i + 25).map(next_dynamodb_key => ({
                 DeleteRequest : {
                     Key : next_dynamodb_key
                 }