@pi-r/aws-v3 0.5.0 → 0.6.0

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 => {
@@ -230,11 +230,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         (0, aws_1.setDatabaseEndpoint)(credential);
         const renewCache = ignoreCache === 0;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = renewCache;
+                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 + '_' : '';
         if (key && (id || (0, types_1.isPlainObject)(key))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "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.0",
+    "@e-mc/module": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
+    "@pi-r/aws": "^0.6.0",
+    "@aws-sdk/client-dynamodb": "^3.478.0",
+    "@aws-sdk/client-s3": "^3.478.0",
+    "@aws-sdk/lib-dynamodb": "^3.478.0"
   }
 }

package/upload/index.js

@@ -29,7 +29,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;