@pi-r/aws 0.3.0 → 0.6.0

package/client/index.d.ts

@@ -31,6 +31,7 @@ declare namespace AWS {
     function executeBatchQuery(this: ICloud, credential: AWSDatabaseCredential, batch: AWSDatabaseQuery[], sessionKey?: string): Promise<BatchQueryResult>;
     function setDatabaseEndpoint(config: ServiceConfigurationOptions | DynamoDBClientConfig): void;
     function checkBucketCannedACL(value: unknown): BucketCannedACL | undefined;
+    function writeMessageDefaultRetention(this: IModule, bucket: string, retention: s3.DefaultRetention, service?: string): void;
     function getBucketKey(credential: unknown, Bucket: string, acl: string | undefined, service: string, sdk: string): string;
     function isNoSuchBucket(err: unknown): boolean;
 }

package/client/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNoSuchBucket = exports.getBucketKey = exports.checkBucketCannedACL = exports.setDatabaseEndpoint = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.getPrivatePolicy = exports.getBucketPublicReadPolicy = exports.getPublicReadPolicy = exports.isDatabaseDefined = exports.isEnvDefined = exports.isAccessDefined = void 0;
+exports.isNoSuchBucket = exports.getBucketKey = exports.writeMessageDefaultRetention = exports.checkBucketCannedACL = exports.setDatabaseEndpoint = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.getPrivatePolicy = exports.getBucketPublicReadPolicy = exports.getPublicReadPolicy = exports.isDatabaseDefined = exports.isEnvDefined = exports.isAccessDefined = void 0;
 const aws = require("aws-sdk");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
@@ -22,7 +22,7 @@ async function setCannedAcl(S3, Bucket, ACL, service = 'aws', recursive) {
         }
         else if (!recursive) {
             if (err instanceof Error && err.code === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000 /* TIME.m */);
+                setTimeout(async () => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000 /* TIME.m */);
                 this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Grant ${ACL} (delayed)`, Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
@@ -158,11 +158,11 @@ function createDatabaseClient(credential) {
     return new aws.DynamoDB.DocumentClient(options);
 }
 exports.createDatabaseClient = createDatabaseClient;
-function createBucket(credential, Bucket, publicRead, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function createBucket(credential, Bucket, publicRead, service = 'aws', sdk = 'aws-sdk/clients/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', sdk = 'aws-sdk/clients/s3') {
+async function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     ACL = ACL === 1 ? 1 : checkBucketCannedACL(ACL);
     const S3 = createStorageClient.call(this, credential, service, sdk);
     return S3.headBucket({ Bucket }).promise()
@@ -172,7 +172,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
         }
         return true;
     })
-        .catch(() => {
+        .catch(async () => {
         const input = { ...options, Bucket };
         const region = credential.region;
         if (region && (region !== 'us-east-1' || service !== 'aws')) {
@@ -202,7 +202,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
     });
 }
 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 ibm = service === 'ibm';
     const S3 = createStorageClient.call(this, credential, service, sdk);
     options.Bucket = Bucket;
@@ -223,7 +223,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 S3 = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
     const { indexPage: Suffix, errorPage: Key } = options;
@@ -246,18 +246,18 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     });
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, Bucket, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function deleteObjects(credential, Bucket, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     return deleteObjectsV2.call(this, credential, Bucket, true, service, sdk);
 }
 exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, Bucket, recursive = true, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const S3 = createStorageClient.call(this, credential, service, sdk);
     return S3.listObjects({ Bucket }).promise()
-        .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 S3.deleteObjects({ Bucket, Delete: { Objects } }).promise()
                 .then(data => {
@@ -301,11 +301,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         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))) {
@@ -370,6 +369,21 @@ function checkBucketCannedACL(value) {
     }
 }
 exports.checkBucketCannedACL = checkBucketCannedACL;
+function writeMessageDefaultRetention(bucket, retention, service = 'aws') {
+    const { Years = 0, Days = 0, Mode } = retention;
+    const status = [];
+    if (Years > 0) {
+        status.push(Years.toString() + 'Y');
+    }
+    if (Days > 0) {
+        status.push(Days.toString() + 'D');
+    }
+    if (Mode) {
+        status.push(status.length ? `(${Mode})` : Mode);
+    }
+    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (retention policy)', bucket], status.join(' '), { ...Cloud.LOG_CLOUD_COMMAND });
+}
+exports.writeMessageDefaultRetention = writeMessageDefaultRetention;
 const getBucketKey = (credential, Bucket, acl, service, sdk) => Module.asString(credential, true) + Bucket + '_' + (acl || '') + service + sdk;
 exports.getBucketKey = getBucketKey;
 const isNoSuchBucket = (err) => err instanceof Error && err.code === 'NoSuchBucket';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,9 +21,9 @@
   "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",
-    "aws-sdk": "^2.1430.0"
+    "@e-mc/cloud": "^0.8.0",
+    "@e-mc/module": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
+    "aws-sdk": "^2.1524.0"
   }
 }

package/upload/index.js

@@ -14,7 +14,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/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);
@@ -26,15 +26,30 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
             cleanup();
             callback(err);
         };
+        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;
-            const response = BUCKET_RESPONSE[_a = bucketKey = (0, client_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, client_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);
         }
+        if (service !== 'oci') {
+            const DefaultRetention = configBucket?.retentionPolicy;
+            if ((0, types_1.isPlainObject)(DefaultRetention)) {
+                s3.putObjectLockConfiguration({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner: options?.ExpectedBucketOwner, RequestPayer: options?.RequestPayer }, err => {
+                    if (!err) {
+                        client_1.writeMessageDefaultRetention.call(this, Bucket, DefaultRetention, service);
+                    }
+                    else {
+                        addLog(err);
+                    }
+                });
+            }
+        }
         if (!overwrite) {
             const current = filename;
             const next = (0, util_1.generateFilename)(filename);
@@ -65,7 +80,6 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/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 {
@@ -115,6 +129,32 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
                     const url = endpoint ? Module.joinPath(endpoint, result.Key) : result.Location;
                     this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
                     if (first) {
+                        if (service !== 'oci') {
+                            if ((0, types_1.isPlainObject)(tags)) {
+                                const TagSet = [];
+                                for (const name in tags) {
+                                    TagSet.push({ Key: name, Value: tags[name] });
+                                }
+                                s3.putObjectTagging({ Bucket, Key: result.Key, Tagging: { TagSet }, ExpectedBucketOwner: params.ExpectedBucketOwner, RequestPayer: params.RequestPayer }, error => {
+                                    if (!error) {
+                                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags created" /* VAL_CLOUD.CREATE_TAG */, Bucket], result.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                                    }
+                                    else {
+                                        addLog(error);
+                                    }
+                                });
+                            }
+                            else if (tags === false) {
+                                s3.deleteObjectTagging({ Bucket, Key: result.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }, error => {
+                                    if (!error) {
+                                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags deleted" /* VAL_CLOUD.DELETE_TAG */, Bucket], result.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                                    }
+                                    else {
+                                        addLog(error);
+                                    }
+                                });
+                            }
+                        }
                         cleanup();
                         callback(null, url);
                     }