@pi-r/aws-v3 0.10.2 → 0.11.0

package/client/index.js

@@ -12,6 +12,7 @@ exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
 exports.deleteObjectsV3 = deleteObjectsV3;
+exports.copyObject = copyObject;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 const S3 = require("@aws-sdk/client-s3");
@@ -40,16 +41,16 @@ async function setCannedAcl(instance, client, Bucket, ACL, service = "aws-v3", r
     }
     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 });
+        this.formatMessage(64, service, ['Grant ' + ACL, Bucket], '', Cloud.optionsLogMessage(recursive ? 'DELAYED' : 'COMMAND'));
     })
         .catch((err) => {
         if (!recursive && err instanceof Error) {
             if (err.name === 'OperationAborted') {
                 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 });
+                this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, Cloud.optionsLogMessage('DELAYED'));
             }
             else {
-                this.formatMessage(64, service, ['Unable to grant ' + ACL, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ['Unable to grant ' + ACL, err.Endpoint || Bucket], err, Cloud.optionsLogMessage('WARN'));
             }
         }
     });
@@ -177,7 +178,7 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
-            this.formatMessage(64, service, ["Bucket created", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, ["Bucket created", Bucket], '', Cloud.optionsLogMessage('COMMAND'));
             if (ACL) {
                 await setCannedAcl.call(this, AWS, client, Bucket, ACL, service);
             }
@@ -192,7 +193,7 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v
                     }
                     return true;
                 default:
-                    this.formatFail(64, service, ["Unable to create bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+                    this.formatFail(64, service, ["Unable to create bucket", Bucket], err, Cloud.optionsLogMessage('FAIL'));
                     return false;
             }
         });
@@ -205,12 +206,12 @@ async function setBucketPolicy(credential, Bucket, options, service = "aws-v3",
     options.Bucket = Bucket;
     return (block ? client.send(new AWS.PutPublicAccessBlockCommand(options)) : policy ? client.send(new AWS.PutBucketPolicyCommand(options)) : client.send(new AWS.PutBucketAclCommand(options)))
         .then(() => {
-        this.formatMessage(64, service, [block ? "Bucket configured" : policy ? "Bucket policy configured" : "Bucket ACL configured", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, [block ? "Bucket configured" : policy ? "Bucket policy configured" : "Bucket ACL configured", Bucket], '', Cloud.optionsLogMessage('COMMAND'));
         return true;
     })
         .catch((err) => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64, service, ["Unable to update bucket policy", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to update bucket policy", Bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         }
         return false;
     });
@@ -232,12 +233,12 @@ async function setBucketTagging(credential, Bucket, options, service = "aws-v3",
     }
     return client.send(command)
         .then(() => {
-        this.formatMessage(64, service, [message, Bucket], null, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, [message, Bucket], null, Cloud.optionsLogMessage('COMMAND'));
         return true;
     })
         .catch((err) => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64, service, ["Unable to update bucket tagging", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to update bucket tagging", Bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         }
         return false;
     });
@@ -254,12 +255,12 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws-v3",
     }
     return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
-        this.formatMessage(64, service, ["Bucket website configured", Bucket], WebsiteConfiguration, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket website configured", Bucket], WebsiteConfiguration, Cloud.optionsLogMessage('COMMAND'));
         return true;
     })
         .catch((err) => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64, service, ["Unable to set bucket website", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to set bucket website", Bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         }
         return false;
     });
@@ -277,7 +278,7 @@ async function deleteObjectsV3(credential, Bucket, options = {}, service = "aws-
         recursive = options.recursive;
         delete options.recursive;
     }
-    options.Bucket ||= Bucket;
+    options.Bucket = Bucket;
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.ListObjectsCommand(options))
         .then(async ({ Contents }) => {
@@ -290,20 +291,35 @@ async function deleteObjectsV3(credential, Bucket, options = {}, service = "aws-
                 .then(data => {
                 if ((0, types_1.isArray)(data.Deleted)) {
                     const files = data.Deleted.length + ' files';
-                    this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', Cloud.optionsLogMessage('COMMAND'));
                 }
             })
                 .catch((err) => {
-                this.formatFail(64, service, ["Unable to empty bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                this.formatFail(64, service, ["Unable to empty bucket", Bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
             });
         }
     })
         .catch((err) => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64, service, ["Unable to list bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to list bucket", Bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         }
     });
 }
+async function copyObject(credential, BucketSource, KeySource, Bucket, Key, options = {}, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+    const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
+    const index = Key.lastIndexOf('/');
+    if (index !== -1) {
+        await client.send(new AWS.PutObjectCommand({ Bucket, Key: Key.substring(0, index + 1), Body: Buffer.from(''), ContentLength: 0 })).catch(() => { });
+    }
+    const CopySource = BucketSource + '/' + KeySource;
+    return client.send(new AWS.CopyObjectCommand({ ...options, Bucket, Key, CopySource }))
+        .then(() => {
+        this.formatMessage(64, service, ["Copy success", Bucket], CopySource, Cloud.optionsLogMessage('COMMAND'));
+    })
+        .catch((err) => {
+        this.formatFail(64, service, ["Copy failed", Bucket + '/' + Key], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
+    });
+}
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
@@ -400,7 +416,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const db = createClient()[0];
             if ((0, types_1.isString)(update) && /^(?:insert|delete|update)\s/i.test(update) && !update.includes('?')) {
                 await db.send(new Lib.ExecuteStatementCommand({ Statement: update })).catch((err) => {
-                    this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                    this.formatFail(64, service, "Unable to execute query", err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
                 });
             }
             else {

package/download/index.js

@@ -3,8 +3,8 @@ const Cloud = require("@e-mc/cloud");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
 const client_1 = require("@pi-r/aws-v3");
-function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
-    const [client, AWS] = client_1.createStorageClient.call(this, config, service, sdk);
+function download(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+    const [client, AWS] = client_1.createStorageClient.call(this, credential, service, sdk);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
         const Key = target.keyname || target.filename;
@@ -12,27 +12,36 @@ function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
             callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
             return;
         }
-        const location = Cloud.joinPath(Bucket, Key);
         client.send(new AWS.GetObjectCommand({ ...target.options, Bucket, Key, VersionId: target.versionId }), { abortSignal: this.signal })
             .then(result => {
             (0, util_1.readableAsBuffer)(result.Body)
-                .then(buffer => {
+                .then(async (buffer) => {
                 callback(null, buffer);
+                const copyTo = (0, util_1.intoArray)(target.copyObject);
+                if (copyTo) {
+                    const tasks = [];
+                    for (const { bucket, pathname, filename, options } of copyTo) {
+                        const keyObject = filename ? Cloud.joinPath(pathname, filename, true) : Key;
+                        tasks.push(client_1.copyObject
+                            .call(this, credential, Bucket, Key, bucket, keyObject, options, service, sdk)
+                            .catch((0, util_1.createErrorHandler)(this, service, Bucket)));
+                    }
+                    await Promise.all(tasks);
+                }
+                const deleteObject = target.deleteObject;
+                if (deleteObject) {
+                    const deleteOptions = (0, types_1.isPlainObject)(deleteObject) ? deleteObject : undefined;
+                    const location = Cloud.joinPath(Bucket, Key);
+                    client.send(new AWS.DeleteObjectCommand({ ...deleteOptions, Bucket, Key, VersionId: target.versionId }))
+                        .then(() => {
+                        this.formatMessage(64, service, "Delete success", location, Cloud.optionsLogMessage('DELETE'));
+                    })
+                        .catch((err) => {
+                        this.formatFail(64, service, ["Delete failed", location], err, Cloud.optionsLogMessage('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.2",
+  "version": "0.11.0",
   "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.5",
-    "@e-mc/module": "^0.12.5",
-    "@e-mc/types": "^0.12.5",
-    "@pi-r/aws-lib": "^0.10.2",
-    "@aws-sdk/client-dynamodb": "^3.864.0",
-    "@aws-sdk/client-s3": "^3.864.0",
+    "@e-mc/cloud": "^0.13.0",
+    "@e-mc/module": "^0.13.0",
+    "@e-mc/types": "^0.13.0",
+    "@pi-r/aws-lib": "^0.11.0",
+    "@aws-sdk/client-dynamodb": "^3.913.0",
+    "@aws-sdk/client-s3": "^3.913.0",
     "@aws-sdk/credential-providers": "*",
-    "@aws-sdk/lib-dynamodb": "^3.864.0",
-    "@aws-sdk/lib-storage": "^3.864.0"
+    "@aws-sdk/lib-dynamodb": "^3.913.0",
+    "@aws-sdk/lib-storage": "^3.913.0"
   }
 }

package/upload/index.js

@@ -15,30 +15,22 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = client_1.createStorageClient.call(this, credential, service, sdk);
     return async (data, callback) => {
         const { bucket: Bucket, localUri } = data;
-        const { pathname = '', flags = 0, fileGroup, contentType, metadata, tags: Tags, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, contentType, metadata, tags: Tags, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
-        const cleanup = () => {
+        const complete = (err, url) => {
             BUCKET_SESSION.delete(service + Bucket);
             if (bucketKey) {
                 delete BUCKET_RESPONSE[bucketKey];
             }
+            callback(err, url);
         };
-        const errorResponse = (err) => {
-            cleanup();
-            callback(err);
-            return false;
-        };
-        const addLog = (err) => {
-            if (err instanceof Error) {
-                this.addLog(this.statusType.WARN, err, service, Bucket);
-            }
-        };
+        const addLog = (0, util_1.createErrorHandler)(this, Bucket, service);
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? "public-read" : admin.acl;
             const response = BUCKET_RESPONSE[bucketKey = (0, aws_lib_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] ||= client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, configBucket?.create, service, sdk);
             if (!await response) {
-                errorResponse(null);
+                complete(null);
                 return;
             }
             BUCKET_SESSION.add(service + Bucket);
@@ -52,7 +44,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
             if ((0, types_1.isPlainObject)(DefaultRetention)) {
                 client.send(new AWS.PutObjectLockConfigurationCommand({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner, RequestPayer: options?.RequestPayer }))
                     .then(() => {
-                    this.formatMessage(64, service, ["Bucket configured" + ' (Retention Policy)', Bucket], (0, aws_lib_1.formatDefaultRetention)(DefaultRetention), { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, ["Bucket configured" + ' (Retention Policy)', Bucket], (0, aws_lib_1.formatDefaultRetention)(DefaultRetention), Cloud.optionsLogMessage('COMMAND'));
                 })
                     .catch(addLog);
             }
@@ -102,7 +94,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                         break;
                     }
                 }
-                exists = await client.send(new AWS.HeadObjectCommand({ Bucket, Key: pathname ? Cloud.joinPath(pathname, filename) : filename }))
+                exists = await client.send(new AWS.HeadObjectCommand({ Bucket, Key: Cloud.joinPath(pathname, filename, true) }))
                     .then(() => true)
                     .catch((err) => {
                     if (err instanceof Error && err.name !== 'NotFound') {
@@ -113,11 +105,11 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                 });
             } while (exists && ++i);
             if (i > 0) {
-                this.formatMessage(64, service, ["File renamed", current], filename, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ["File renamed", current], filename, Cloud.optionsLogMessage('WARN'));
             }
         }
         if (pathname) {
-            await client.send(new AWS.PutObjectCommand({ Bucket, Key: pathname, Body: Buffer.from(''), ContentLength: 0 })).catch(() => { });
+            await client.send(new AWS.PutObjectCommand({ Bucket, Key: pathname.endsWith('/') ? pathname : pathname + '/', Body: Buffer.from(''), ContentLength: 0 })).catch(() => { });
         }
         const Key = [filename];
         const Body = [];
@@ -139,7 +131,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                 }
             }
             catch (err) {
-                errorResponse(err);
+                complete(err);
                 return;
             }
         }
@@ -156,12 +148,12 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
             const first = i === 0;
             if (this.aborted) {
                 if (first) {
-                    errorResponse((0, types_1.createAbortError)());
+                    complete((0, types_1.createAbortError)());
                 }
                 return;
             }
-            const objectKey = Cloud.joinPath(pathname, Key[i]);
-            const params = { ...options, Bucket, Key: pathname + Key[i], Body: Stream[i] || stream.Readable.from(Body[i]) };
+            const objectKey = Cloud.joinPath(pathname, Key[i], true);
+            const params = { ...options, Bucket, Key: objectKey, Body: Stream[i] || stream.Readable.from(Body[i]) };
             const readable = publicRead || active && publicRead !== false && !acl;
             let tags, length = -1;
             if (first) {
@@ -199,25 +191,35 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
             new lib_storage_1.Upload({ client, params, tags, partSize: getPartSize(), queueSize: partSize > 0 ? data.upload.chunkLimit : undefined }).done()
                 .then(() => {
                 const url = endpoint ? Cloud.joinPath(endpoint, objectKey) : Cloud.joinPath(`https://${Bucket}.s3.${!credential.region || credential.region === "us-east-1" ? "us-east-1" + '.' : ''}amazonaws.com`, objectKey);
-                this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                this.formatMessage(64, service, "Upload success", url, Cloud.optionsLogMessage('UPLOAD'));
                 if (first) {
                     if (length === 0) {
                         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 });
+                                this.formatMessage(64, service, ["Tags deleted", Bucket], params.Key, Cloud.optionsLogMessage('COMMAND'));
                             }
                             else {
                                 addLog(error);
                             }
                         });
                     }
-                    cleanup();
-                    callback(null, url);
+                    const copyTo = (0, util_1.intoArray)(data.upload.copyObject);
+                    if (copyTo) {
+                        const tasks = [];
+                        for (const { bucket: bucketName, pathname: pathObject = pathname, filename: fileObject, options: copyOptions } of copyTo) {
+                            const keyObject = fileObject ? Cloud.joinPath(pathObject, fileObject, true) : objectKey;
+                            tasks.push(client_1.copyObject
+                                .call(this, credential, Bucket, objectKey, bucketName, keyObject, copyOptions, service, sdk)
+                                .catch(addLog));
+                        }
+                        void Promise.all(tasks);
+                    }
+                    complete(null, url);
                 }
             })
                 .catch((err) => {
                 if (first) {
-                    errorResponse(err);
+                    complete(err);
                 }
                 else {
                     addLog(err);