triangle-utils 1.4.16 → 1.4.18

package/dist/src/UtilsDynamoDB.d.ts

@@ -2,7 +2,7 @@ export declare class UtilsDynamoDB {
     private readonly dynamodb;
     constructor(region: string);
     get_table_key_names(table_name: string): Promise<string[] | undefined>;
-    scan(table: string, options?: {
+    scan(table_index_name: string, options?: {
         filters?: Record<string, any>;
         undefined_attribute_names?: string[];
         defined_attribute_names?: string[];

package/dist/src/UtilsDynamoDB.js

@@ -98,7 +98,9 @@ export class UtilsDynamoDB {
             .filter(table_key_name => table_key_name !== undefined);
         return table_key_names;
     }
-    async scan(table, options = {}) {
+    async scan(table_index_name, options = {}) {
+        const table_name = table_index_name.split(":")[0];
+        const index_name = table_index_name.split(":")[1];
         const filters = options.filters !== undefined ? options.filters : {};
         const undefined_attribute_names = options.undefined_attribute_names !== undefined ? options.undefined_attribute_names : [];
         const defined_attribute_names = options.defined_attribute_names !== undefined ? options.defined_attribute_names : [];
@@ -118,7 +120,8 @@ export class UtilsDynamoDB {
             ].join(" AND ");
             const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
             const request = {
-                TableName: table,
+                TableName: table_name,
+                IndexName: index_name,
                 ExpressionAttributeNames: Object.keys(expression_attribute_names).length > 0 ? expression_attribute_names : undefined,
                 ExpressionAttributeValues: Object.keys(expression_attribute_values).length > 0 ? expression_attribute_values : undefined,
                 FilterExpression: filter_expression.length > 0 ? filter_expression : undefined,

package/dist/src/UtilsS3.d.ts

@@ -4,6 +4,7 @@ export declare class UtilsS3 {
     constructor(region: string);
     file_exists(s3_filename: string): Promise<boolean | undefined>;
     get_file(s3_filename: string): Promise<string | undefined>;
+    get_file_buffer(s3_filename: string): Promise<Buffer | undefined>;
     get_file_stream(s3_filename: string): Promise<Readable | undefined>;
     create_file(s3_filename: string, content: string | Buffer, options?: {
         content_type?: string;

package/dist/src/UtilsS3.js

@@ -39,7 +39,7 @@ export class UtilsS3 {
             if (body === undefined) {
                 return undefined;
             }
-            const text = body.transformToString("utf-8");
+            const text = await body.transformToString("utf-8");
             return text;
         }
         catch (error) {
@@ -49,6 +49,27 @@ export class UtilsS3 {
             throw error;
         }
     }
+    async get_file_buffer(s3_filename) {
+        const s3_key = parse_s3_filename(s3_filename);
+        if (s3_key === undefined) {
+            return undefined;
+        }
+        try {
+            const response = await this.s3.getObject(s3_key);
+            const body = response.Body;
+            if (body === undefined) {
+                return undefined;
+            }
+            const buffer = Buffer.from(await body.transformToByteArray());
+            return buffer;
+        }
+        catch (error) {
+            if (error instanceof NoSuchKey) {
+                return undefined;
+            }
+            throw error;
+        }
+    }
     async get_file_stream(s3_filename) {
         const s3_key = parse_s3_filename(s3_filename);
         if (s3_key === undefined) {

package/package.json

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

package/src/UtilsDynamoDB.ts

@@ -106,7 +106,7 @@ export class UtilsDynamoDB {
     }
 
     async scan(
-        table : string,
+        table_index_name : string,
         options : {
             filters? : Record<string, any>,
             undefined_attribute_names? : string[],
@@ -115,6 +115,8 @@ export class UtilsDynamoDB {
             concurrency? : number
         } = {}
     ) : Promise<Record<string, any>[]> {
+        const table_name : string = table_index_name.split(":")[0]
+        const index_name : string | undefined = table_index_name.split(":")[1]
         const filters = options.filters !== undefined ? options.filters : {}
         const undefined_attribute_names : string[] = options.undefined_attribute_names !== undefined ? options.undefined_attribute_names : []
         const defined_attribute_names : string[] = options.defined_attribute_names !== undefined ? options.defined_attribute_names : []
@@ -138,7 +140,8 @@ export class UtilsDynamoDB {
             ].join(" AND ")
             const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ")
             const request : ScanCommandInput = {
-                TableName : table,
+                TableName : table_name,
+                IndexName : index_name,
                 ExpressionAttributeNames : Object.keys(expression_attribute_names).length > 0 ? expression_attribute_names : undefined,
                 ExpressionAttributeValues : Object.keys(expression_attribute_values).length > 0 ? expression_attribute_values : undefined,
                 FilterExpression : filter_expression.length > 0 ? filter_expression : undefined,

package/src/UtilsS3.ts

@@ -49,7 +49,7 @@ export class UtilsS3 {
             if (body === undefined) {
                 return undefined
             }
-            const text = body.transformToString("utf-8")
+            const text = await body.transformToString("utf-8")
             return text
         } catch (error) {
             if (error instanceof NoSuchKey) {
@@ -59,6 +59,27 @@ export class UtilsS3 {
         }
     }
 
+    async get_file_buffer(s3_filename : string) : Promise<Buffer | undefined> {
+        const s3_key = parse_s3_filename(s3_filename)
+        if (s3_key === undefined) {
+            return undefined
+        }
+        try {
+            const response = await this.s3.getObject(s3_key)
+            const body = response.Body
+            if (body === undefined) {
+                return undefined
+            }
+            const buffer = Buffer.from(await body.transformToByteArray())
+            return buffer
+        } catch (error) {
+            if (error instanceof NoSuchKey) {
+                return undefined
+            }
+            throw error
+        }
+    }
+
     async get_file_stream(s3_filename : string) : Promise<Readable | undefined> {
         const s3_key = parse_s3_filename(s3_filename)
         if (s3_key === undefined) {