@pi-r/aws-v3 0.3.0 → 0.5.0

package/download/index.js

@@ -16,9 +16,7 @@ function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
         }
         const location = Module.joinPath(Bucket, Key);
         let input = { Bucket, Key, VersionId: target.versionId };
-        // @ts-ignore
-        client
-            .send(new AWS.GetObjectCommand(input), { abortSignal: this.signal })
+        client.send(new AWS.GetObjectCommand(input), { abortSignal: this.signal })
             .then(result => {
             (0, util_1.readableAsBuffer)(result.Body).then(buffer => callback(null, buffer)).catch(err => callback(err));
             const deleteObject = target.deleteObject;

package/package.json

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

package/upload/index.js

@@ -16,7 +16,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     return async (data, callback) => {
         var _a;
         const { bucket: Bucket, localUri } = data;
-        const { pathname = '', fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname = '', fileGroup, contentType, metadata, tags, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
         const cleanup = () => {
             BUCKET_SESSION.delete(service + Bucket);
@@ -29,15 +29,25 @@ 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 configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? 'public-read' : admin.acl;
-            const response = BUCKET_RESPONSE[_a = bucketKey = (0, aws_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, admin.configBucket?.create, service, sdk));
+            const response = BUCKET_RESPONSE[_a = bucketKey = (0, aws_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, configBucket?.create, service, sdk));
             if (!await response) {
                 errorResponse(null);
                 return;
             }
             BUCKET_SESSION.add(service + Bucket);
         }
+        const DefaultRetention = configBucket?.retentionPolicy;
+        if ((0, types_1.isPlainObject)(DefaultRetention)) {
+            client.send(new AWS.PutObjectLockConfigurationCommand({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner: options?.ExpectedBucketOwner, RequestPayer: options?.RequestPayer }))
+                .then(() => {
+                aws_1.writeMessageDefaultRetention.call(this, Bucket, DefaultRetention, service);
+            })
+                .catch(err => addLog(err));
+        }
         if (!overwrite) {
             const current = filename;
             const next = (0, util_1.generateFilename)(filename);
@@ -69,7 +79,6 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
         const Key = [filename];
         const Body = [data.buffer];
         const ContentType = [contentType];
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + Bucket);
         if (fileGroup) {
             for (const [content, ext, localFile] of fileGroup) {
                 try {
@@ -128,11 +137,34 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                 }
                 continue;
             }
-            // @ts-ignore
             client.send(new AWS.PutObjectCommand(params), { abortSignal: this.signal })
                 .then(() => {
                 const url = endpoint ? Module.joinPath(endpoint, objectKey) : Module.joinPath(`https://${Bucket}.s3.${!credential.region || credential.region === 'us-east-1' ? 'us-east-1.' : ''}amazonaws.com`, objectKey);
                 if (first) {
+                    if ((0, types_1.isPlainObject)(tags)) {
+                        const TagSet = [];
+                        for (const name in tags) {
+                            TagSet.push({ Key: name, Value: tags[name] });
+                        }
+                        client.send(new AWS.PutObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner, Tagging: { TagSet }, RequestPayer: params.RequestPayer }), error => {
+                            if (!error) {
+                                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags created" /* VAL_CLOUD.CREATE_TAG */, Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                            }
+                            else {
+                                addLog(error);
+                            }
+                        });
+                    }
+                    else if (tags === false) {
+                        client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), error => {
+                            if (!error) {
+                                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags deleted" /* VAL_CLOUD.DELETE_TAG */, Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                            }
+                            else {
+                                addLog(error);
+                            }
+                        });
+                    }
                     cleanup();
                     callback(null, url);
                 }