@pi-r/aws-v3 0.5.0 → 0.6.1

package/client/index.js

@@ -8,7 +8,7 @@ const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
-function setCannedAcl(S3, client, Bucket, ACL, service = 'aws-v3', recursive) {
+async function setCannedAcl(S3, client, Bucket, ACL, service = 'aws-v3', recursive) {
     let Policy;
     switch (ACL) {
         case 1:
@@ -28,7 +28,7 @@ function setCannedAcl(S3, client, Bucket, ACL, service = 'aws-v3', recursive) {
         .catch((err) => {
         if (!recursive && err instanceof Error) {
             if (err.name === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000 /* TIME.m */);
+                setTimeout(async () => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000 /* TIME.m */);
                 this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
@@ -90,11 +90,11 @@ function validateDatabase(credential, data) {
     return (0, aws_1.isDatabaseDefined)(credential, data) && validateStorage(credential);
 }
 exports.validateDatabase = validateDatabase;
-function createBucket(credential, Bucket, publicRead, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
+async function createBucket(credential, Bucket, publicRead, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     return createBucketV2.call(this, credential, Bucket, publicRead ? 'public-read' : undefined, undefined, service, sdk);
 }
 exports.createBucket = createBucket;
-function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
+async function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     ACL = ACL === 1 ? 1 : (0, aws_1.checkBucketCannedACL)(ACL);
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.HeadBucketCommand({ Bucket }))
@@ -104,7 +104,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         }
         return true;
     })
-        .catch(() => {
+        .catch(async () => {
         const input = { ...options, Bucket };
         const region = credential.region;
         if (typeof region === 'string' && region !== 'us-east-1') {
@@ -134,7 +134,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
     });
 }
 exports.createBucketV2 = createBucketV2;
-function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     const block = 'PublicAccessBlockConfiguration' in options;
     const policy = !block && 'Policy' in options && !('ACL' in options);
@@ -152,7 +152,7 @@ function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aw
     });
 }
 exports.setBucketPolicy = setBucketPolicy;
-function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
     const { indexPage: Suffix, errorPage: Key } = options;
@@ -175,18 +175,18 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     });
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, Bucket, service, sdk) {
+async function deleteObjects(credential, Bucket, service, sdk) {
     return deleteObjectsV2.call(this, credential, Bucket, true, service, sdk);
 }
 exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, Bucket, recursive = true, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.ListObjectsCommand({ Bucket }))
-        .then(({ Contents }) => {
+        .then(async ({ Contents }) => {
         if (Contents?.length) {
             let Objects = Contents.map(data => ({ Key: data.Key }));
             if (!recursive) {
-                Objects = Objects.filter(value => value.Key.indexOf('/') === -1);
+                Objects = Objects.filter(value => !value.Key.includes('/'));
             }
             return client.send(new AWS.DeleteObjectsCommand({ Bucket, Delete: { Objects } }))
                 .then(data => {
@@ -213,41 +213,42 @@ async function executeQuery(credential, data, sessionKey) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
+    var _a;
     const length = batch.length;
     const result = new Array(length);
     const caching = length > 0 && this.hasCache(batch[0].service, sessionKey);
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
-    const createClient = () => client || (client = createDatabaseClient.call(this, length === 1 ? credential : { ...credential }));
+    const createClient = () => client || (client = createDatabaseClient.call(this, credential));
     const closeClient = () => client?.[0].destroy();
+    (0, aws_1.setDatabaseEndpoint)(credential);
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, table, id = '', query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
-        if (!table) {
-            closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
-        }
-        (0, aws_1.setDatabaseEndpoint)(credential);
-        const renewCache = ignoreCache === 0;
+        let { service, table: TableName, id, query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
+        const useCache = caching && ignoreCache !== true;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = ignoreCache === 0;
+                return this.getQueryResult(service, credential, value, cacheValue);
             }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, credential, value, cacheValue);
         };
-        let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? table + '_' : '';
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
+        let rows, queryString = '';
         if (key && (id || (0, types_1.isPlainObject)(key))) {
-            if (queryString) {
-                queryString += Module.asString(key, true) + id;
+            if (!TableName) {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            if (useCache) {
+                queryString = TableName + '_' + Module.asString(key, true) + (id !== undefined ? '_' + Module.asString(id, true) : '');
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
                 }
             }
             const [db, AWS] = createClient();
-            const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: id };
-            const command = { TableName: table, Key };
+            const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: (0, aws_1.parseAttributeValue)(id) };
+            const command = { TableName, Key };
             if (update) {
                 await db.send(new AWS.UpdateCommand({ ...command, ...update }));
             }
@@ -257,18 +258,65 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {
-            if (queryString && (rows = getCache(queryString += Module.asString(query, true) + limit))) {
-                result[i] = rows;
-                continue;
+            if (TableName) {
+                query.TableName = TableName;
             }
-            query.TableName = table;
             if (limit > 0) {
                 query.Limit = limit;
             }
+            if (!query.TableName) {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            if (useCache && (rows = getCache(queryString = Module.asString(query, true)))) {
+                result[i] = rows;
+                continue;
+            }
+            const [db, AWS] = createClient();
+            const { Count, Items } = await db.send(new AWS.QueryCommand(query));
+            if (Count && Items) {
+                rows = Items;
+            }
+        }
+        else if ((0, types_1.isArray)(query)) {
+            let params = (item.params || {});
+            if (!(0, types_1.isPlainObject)(params.RequestItems)) {
+                params.RequestItems = {};
+            }
+            TableName || (TableName = Object.keys(params.RequestItems)[0]);
+            if (!TableName) {
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            // @ts-ignore
+            const Item = (_a = params.RequestItems)[TableName] || (_a[TableName] = {});
+            Item.Keys = query;
+            params = { RequestItems: { [TableName]: Item } };
+            if (useCache && (rows = getCache(queryString = Module.asString(params, true)))) {
+                result[i] = rows;
+                continue;
+            }
+            const [db, AWS] = createClient();
+            const { Responses } = await db.send(new AWS.BatchGetCommand(params));
+            if (Responses) {
+                rows = Responses[TableName];
+            }
+        }
+        else if (TableName) {
+            let params = item.params;
+            if ((0, types_1.isPlainObject)(params)) {
+                params.TableName = TableName;
+            }
+            else {
+                params = { TableName };
+            }
+            if (useCache && (rows = getCache(queryString = Module.asString(params, true)))) {
+                result[i] = rows;
+                continue;
+            }
             const [db, AWS] = createClient();
-            const output = await db.send(new AWS.QueryCommand(query));
-            if (output.Count && output.Items) {
-                rows = output.Items;
+            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.5.0",
+  "version": "0.6.1",
   "description": "AWS V3 cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.7.0",
-    "@e-mc/module": "^0.7.0",
-    "@e-mc/types": "^0.7.0",
-    "@pi-r/aws": "^0.5.0",
-    "@aws-sdk/client-dynamodb": "^3.468.0",
-    "@aws-sdk/client-s3": "^3.468.0",
-    "@aws-sdk/lib-dynamodb": "^3.468.0"
+    "@e-mc/cloud": "^0.8.1",
+    "@e-mc/module": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
+    "@pi-r/aws": "^0.6.1",
+    "@aws-sdk/client-dynamodb": "^3.485.0",
+    "@aws-sdk/client-s3": "^3.485.0",
+    "@aws-sdk/lib-dynamodb": "^3.485.0"
   }
 }

package/upload/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const fs = require("fs");
 const stream = require("stream");
 const util_1 = require("@e-mc/cloud/util");
 const aws_1 = require("@pi-r/aws");
@@ -29,7 +28,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
             callback(err);
             return false;
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + Bucket);
+        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, Bucket);
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? 'public-read' : admin.acl;
@@ -80,15 +79,10 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
         const Body = [data.buffer];
         const ContentType = [contentType];
         if (fileGroup) {
-            for (const [content, ext, localFile] of fileGroup) {
-                try {
-                    Body.push(typeof content === 'string' ? fs.readFileSync(content) : content);
-                    Key.push(ext === '.map' && localFile ? path.basename(localFile) : filename + ext);
-                }
-                catch (err) {
-                    addLog(err);
-                }
-            }
+            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, addLog);
+            Key.push(...key);
+            Body.push(...body);
+            ContentType.push(...type);
         }
         for (let i = 0; i < Key.length; ++i) {
             const first = i === 0;