@pi-r/aws-v3 0.2.2 → 0.5.0

package/client/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.validateDatabase = exports.validateStorage = exports.createDatabaseClient = exports.createStorageClient = void 0;
+const Lib = require("@aws-sdk/lib-dynamodb");
+const Client = require("@aws-sdk/client-dynamodb");
 const aws_1 = require("@pi-r/aws");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
@@ -70,22 +72,15 @@ function createStorageClient(credential, service = 'aws-v3', sdk = '@aws-sdk/cli
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    try {
-        const AWS = require('@aws-sdk/lib-dynamodb');
-        const { DynamoDBClient } = require('@aws-sdk/client-dynamodb');
-        return [AWS.DynamoDBDocumentClient.from(new DynamoDBClient(credential), credential.translateConfig), AWS];
-    }
-    catch (err) {
-        this.checkPackage(err, '@aws-sdk', { passThrough: true });
-        throw err;
-    }
+    return [Lib.DynamoDBDocumentClient.from(new Client.DynamoDBClient(credential), credential.translateConfig), Lib];
 }
 exports.createDatabaseClient = createDatabaseClient;
 function validateStorage(credential) {
     const credentials = sanitizeCredentials(credential);
-    if (credential.profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
+    const profile = credential.profile;
+    if (profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
         const { fromIni } = require('@aws-sdk/credential-provider-ini');
-        credential.credentials = fromIni({ profile: credential.profile });
+        credential.credentials = fromIni({ profile });
         return true;
     }
     return !!credentials && (typeof credentials === 'function' || (0, aws_1.isAccessDefined)(credentials) || (0, aws_1.isEnvDefined)());
@@ -112,8 +107,8 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         .catch(() => {
         const input = { ...options, Bucket };
         const region = credential.region;
-        if (!input.CreateBucketConfiguration && typeof region === 'string' && region !== 'us-east-1') {
-            input.CreateBucketConfiguration = { LocationConstraint: region };
+        if (typeof region === 'string' && region !== 'us-east-1') {
+            input.CreateBucketConfiguration || (input.CreateBucketConfiguration = { LocationConstraint: region });
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
@@ -141,11 +136,12 @@ 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') {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
-    const policy = 'Policy' in options && !('ACL' in options);
+    const block = 'PublicAccessBlockConfiguration' in options;
+    const policy = !block && 'Policy' in options && !('ACL' in options);
     options.Bucket = Bucket;
-    return (policy ? client.send(new AWS.PutBucketPolicyCommand(options)) : client.send(new AWS.PutBucketAclCommand(options)))
+    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 /* LOG_TYPE.CLOUD */, service, [policy ? "Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */ : "Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [block ? "Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ : policy ? "Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */ : "Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
@@ -159,11 +155,12 @@ exports.setBucketPolicy = setBucketPolicy;
 function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
-    if ((0, types_1.isString)(options.indexPage)) {
-        WebsiteConfiguration.IndexDocument = { Suffix: options.indexPage };
+    const { indexPage: Suffix, errorPage: Key } = options;
+    if ((0, types_1.isString)(Suffix)) {
+        WebsiteConfiguration.IndexDocument = { Suffix };
     }
-    if ((0, types_1.isString)(options.errorPage)) {
-        WebsiteConfiguration.ErrorDocument = { Key: options.errorPage };
+    if ((0, types_1.isString)(Key)) {
+        WebsiteConfiguration.ErrorDocument = { Key };
     }
     return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
@@ -193,8 +190,9 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
             }
             return client.send(new AWS.DeleteObjectsCommand({ Bucket, Delete: { Objects } }))
                 .then(data => {
-                if ((0, types_1.isArray)(data.Deleted)) {
-                    const files = data.Deleted.length + ' files';
+                const Deleted = data.Deleted;
+                if ((0, types_1.isArray)(Deleted)) {
+                    const files = Deleted.length + ' files';
                     this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
@@ -253,9 +251,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (update) {
                 await db.send(new AWS.UpdateCommand({ ...command, ...update }));
             }
-            const output = await db.send(new AWS.GetCommand(command));
-            if (output.Item) {
-                rows = [output.Item];
+            const Item = (await db.send(new AWS.GetCommand(command))).Item;
+            if (Item) {
+                rows = [Item];
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {

package/download/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
 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");
+const client_1 = require("../client");
 function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     const [client, AWS] = client_1.createStorageClient.call(this, config, service, sdk);
     return (data, callback) => {
@@ -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.2.2",
+  "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.5.3",
-    "@e-mc/module": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "@pi-r/aws": "^0.2.2",
-    "@aws-sdk/client-dynamodb": "^3.335.0",
-    "@aws-sdk/client-s3": "^3.335.0",
-    "@aws-sdk/lib-dynamodb": "^3.335.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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
-const client_1 = require("../client");
 const util_1 = require("@e-mc/cloud/util");
 const aws_1 = require("@pi-r/aws");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
+const client_1 = require("../client");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
@@ -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);
                 }