@pi-r/aws-v3 0.9.4 → 0.10.1

package/client/index.js

@@ -14,6 +14,7 @@ exports.deleteObjectsV2 = deleteObjectsV2;
 exports.deleteObjectsV3 = deleteObjectsV3;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
+const S3 = require("@aws-sdk/client-s3");
 const Lib = require("@aws-sdk/lib-dynamodb");
 const Client = require("@aws-sdk/client-dynamodb");
 const Providers = require("@aws-sdk/credential-providers");
@@ -21,7 +22,7 @@ const Cloud = require("@e-mc/cloud");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
 const aws_lib_1 = require("@pi-r/aws-lib");
-async function setCannedAcl(S3, client, Bucket, ACL, service = "aws-v3", recursive) {
+async function setCannedAcl(instance, client, Bucket, ACL, service = "aws-v3", recursive) {
     let Policy;
     switch (ACL) {
         case 1:
@@ -37,14 +38,14 @@ async function setCannedAcl(S3, client, Bucket, ACL, service = "aws-v3", recursi
             Policy = (0, aws_lib_1.getPrivatePolicy)(Bucket);
             break;
     }
-    return client.send(new S3.PutBucketPolicyCommand({ Bucket, Policy }))
+    return client.send(new instance.PutBucketPolicyCommand({ Bucket, Policy }))
         .then(() => {
         this.formatMessage(64, service, ['Grant ' + ACL, Bucket], '', { ...recursive ? Cloud.LOG_CLOUD_DELAYED : Cloud.LOG_CLOUD_COMMAND });
     })
         .catch((err) => {
         if (!recursive && err instanceof Error) {
             if (err.name === 'OperationAborted') {
-                setTimeout(async () => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000);
+                setTimeout(async () => setCannedAcl.call(this, instance, client, Bucket, ACL, service, true), 60000);
                 this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
@@ -121,7 +122,7 @@ function fromProvider(credential) {
 const isNoSuchBucket = (err) => err instanceof Error && err.name === 'NoSuchBucket';
 function createStorageClient(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     try {
-        const AWS = require(sdk);
+        const AWS = sdk === "@aws-sdk/client-s3" ? S3 : require(sdk);
         return [new AWS.S3Client(fromProvider(credential)), AWS];
     }
     catch (err) {
@@ -147,7 +148,9 @@ async function createBucket(credential, Bucket, publicRead, service = "aws-v3",
     return createBucketV2.call(this, credential, Bucket, publicRead ? "public-read" : undefined, undefined, service, sdk);
 }
 async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
-    ACL = ACL === 1 ? 1 : (0, aws_lib_1.checkBucketCannedACL)(ACL);
+    if (ACL !== 1) {
+        ACL = (0, aws_lib_1.checkBucketCannedACL)(ACL);
+    }
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.HeadBucketCommand({ Bucket }))
         .then(async () => {
@@ -160,7 +163,7 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v
         const input = { ...options, Bucket };
         const config = input.CreateBucketConfiguration ||= {};
         if (!config.Location) {
-            const match = /^.+--([\w\d-]+)--x-s3$/.exec(Bucket);
+            const match = /^.+--([\w-]+)--x-s3$/.exec(Bucket);
             if (match) {
                 config.Location = { Type: 'AvailabilityZone', Name: match[1] };
                 config.Bucket = { Type: 'Directory', DataRedundancy: 'SingleAvailabilityZone' };
@@ -398,7 +401,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             else {
                 update = '';
             }
-            if (useCache && !update && (rows = this.getCacheResult(service, credential, queryString = Statement + '_' + Cloud.asString(Parameters, true) + (Limit ? '_' + Limit : ''), cacheValue, ignoreCache))) {
+            if (useCache && !update && (rows = this.getCacheResult(service, credential, queryString = Statement + '_' + Cloud.asString(Parameters, true) + '_' + (Limit ? Limit.toString() : '0'), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -413,22 +416,32 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 queryString = '';
             }
         }
-        else if (TableName) {
-            let params = item.params;
-            if ((0, types_1.isPlainObject)(params)) {
-                params.TableName = TableName;
-            }
-            else {
-                params = { TableName };
+        else if (TableName || item.params) {
+            const params = (item.params || {});
+            if (!params.TransactItems) {
+                if (TableName) {
+                    params.TableName = TableName;
+                }
+                else if (params.TableName) {
+                    throw (0, util_1.formatError)(item, "Missing database table");
+                }
             }
             if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
             const [db, AWS] = createClient();
-            const { Count, Items } = await db.send(new AWS.ScanCommand(params));
-            if (Count && Items) {
-                rows = Items;
+            if (params.TransactItems) {
+                const { Responses } = await db.send(new AWS.TransactGetCommand(params));
+                if (Responses) {
+                    rows = Responses.map(value => value.Item || {});
+                }
+            }
+            else {
+                const { Count, Items } = await db.send(new AWS.ScanCommand(params));
+                if (Count && Items) {
+                    rows = Items;
+                }
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "description": "AWS cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,14 +19,14 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.11.5",
-    "@e-mc/module": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
-    "@pi-r/aws-lib": "^0.9.4",
-    "@aws-sdk/client-dynamodb": "^3.777.0",
-    "@aws-sdk/client-s3": "^3.777.0",
+    "@e-mc/cloud": "^0.12.3",
+    "@e-mc/module": "^0.12.3",
+    "@e-mc/types": "^0.12.3",
+    "@pi-r/aws-lib": "^0.10.1",
+    "@aws-sdk/client-dynamodb": "^3.808.0",
+    "@aws-sdk/client-s3": "^3.808.0",
     "@aws-sdk/credential-providers": "*",
-    "@aws-sdk/lib-dynamodb": "^3.778.0",
-    "@aws-sdk/lib-storage": "^3.777.0"
+    "@aws-sdk/lib-dynamodb": "^3.808.0",
+    "@aws-sdk/lib-storage": "^3.808.0"
   }
 }

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
 
 import type { AwsSdkSigV4AuthInputConfig } from '@aws-sdk/core';
-import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput } from '@aws-sdk/client-dynamodb';
+import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput, TransactGetItemsCommandInput } from '@aws-sdk/client-dynamodb';
 import type { BatchGetCommandInput, NativeAttributeValue, TranslateConfig, UpdateCommandInput } from '@aws-sdk/lib-dynamodb';
 import type { S3ClientConfig } from '@aws-sdk/client-s3';
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
@@ -29,7 +29,7 @@ export type AWSStorage = CloudStorage<AWSStorageCredential, "aws-v3">;
 
 export interface AWSStorageCredential extends S3ClientConfig, AWSBaseCredential {}
 
-export interface AWSDatabaseQuery extends CloudDatabase<QueryCommandInput | ObjectMap<NativeAttributeValue>[] | string, PlainObject, UpdateCommandInput | string, BatchGetCommandInput | ScanCommandInput | NativeAttributeValue[]> {
+export interface AWSDatabaseQuery extends CloudDatabase<QueryCommandInput | ObjectMap<NativeAttributeValue>[] | string, PlainObject, UpdateCommandInput | string, BatchGetCommandInput | ScanCommandInput | TransactGetItemsCommandInput | NativeAttributeValue[]> {
     source: "cloud";
     service: "aws-v3";
     key?: string | AttributeKey;