@pi-r/aws-v3 0.10.1 → 0.10.3

package/client/index.js

@@ -220,22 +220,27 @@ async function setBucketTagging(credential, Bucket, options, service = "aws-v3",
         return false;
     }
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
-    const deleting = options.Tagging.TagSet.length === 0;
-    const command = () => {
-        this.formatMessage(64, service, [deleting ? "Tags deleted" : "Tags created", Bucket], null, { ...Cloud.LOG_CLOUD_COMMAND });
+    let command, message;
+    if (options.Tagging.TagSet.length === 0) {
+        command = new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner });
+        message = "Tags deleted";
+    }
+    else {
+        options.Bucket = Bucket;
+        command = new AWS.PutBucketTaggingCommand(options);
+        message = "Tags created";
+    }
+    return client.send(command)
+        .then(() => {
+        this.formatMessage(64, service, [message, Bucket], null, { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
-    };
-    const error = (err) => {
+    })
+        .catch((err) => {
         if (!isNoSuchBucket(err)) {
             this.formatFail(64, service, ["Unable to update bucket tagging", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
-    };
-    if (deleting) {
-        return client.send(new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner })).then(command).catch(error);
-    }
-    options.Bucket = Bucket;
-    return client.send(new AWS.PutBucketTaggingCommand(options)).then(command).catch(error);
+    });
 }
 async function setBucketWebsite(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);

package/download/index.js

@@ -18,21 +18,19 @@ function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
             (0, util_1.readableAsBuffer)(result.Body)
                 .then(buffer => {
                 callback(null, buffer);
+                const deleteObject = target.deleteObject;
+                if (deleteObject) {
+                    const deleteOptions = (0, types_1.isPlainObject)(deleteObject) ? deleteObject : undefined;
+                    client.send(new AWS.DeleteObjectCommand({ ...deleteOptions, Bucket, Key, VersionId: target.versionId }))
+                        .then(() => {
+                        this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
+                    })
+                        .catch((err) => {
+                        this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                    });
+                }
             })
                 .catch(callback);
-            let deleteObject = target.deleteObject;
-            if (deleteObject) {
-                if (!(0, types_1.isPlainObject)(deleteObject)) {
-                    deleteObject = undefined;
-                }
-                client.send(new AWS.DeleteObjectCommand({ ...deleteObject, Bucket, Key, VersionId: target.versionId }))
-                    .then(() => {
-                    this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
-                })
-                    .catch((err) => {
-                    this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
-                });
-            }
         })
             .catch(callback);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "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.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",
+    "@e-mc/cloud": "^0.12.7",
+    "@e-mc/module": "^0.12.7",
+    "@e-mc/types": "^0.12.7",
+    "@pi-r/aws-lib": "^0.10.3",
+    "@aws-sdk/client-dynamodb": "^3.888.0",
+    "@aws-sdk/client-s3": "^3.888.0",
     "@aws-sdk/credential-providers": "*",
-    "@aws-sdk/lib-dynamodb": "^3.808.0",
-    "@aws-sdk/lib-storage": "^3.808.0"
+    "@aws-sdk/lib-dynamodb": "^3.888.0",
+    "@aws-sdk/lib-storage": "^3.888.0"
   }
 }

package/upload/index.js

@@ -202,7 +202,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                 this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
                 if (first) {
                     if (length === 0) {
-                        client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), error => {
+                        client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), (error) => {
                             if (!error) {
                                 this.formatMessage(64, service, ["Tags deleted", Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
                             }