@pi-r/aws-v3 0.2.1 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Mile Square Park
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/aws-v3
+# @pi-r/aws-v3
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -21,16 +21,16 @@ function setCannedAcl(S3, client, Bucket, ACL, service = 'aws-v3', recursive) {
     }
     return client.send(new S3.PutBucketPolicyCommand({ Bucket, Policy }))
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Grant ' + ACL, Bucket], '', { ...recursive ? Cloud.LOG_CLOUD_DELAYED : Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ['Grant ' + ACL, Bucket], '', { ...recursive ? Cloud.LOG_CLOUD_DELAYED : Cloud.LOG_CLOUD_COMMAND });
     })
         .catch((err) => {
         if (!recursive && err instanceof Error) {
             if (err.name === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000 /* TIME.m */);
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
+                setTimeout(() => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000);
+                this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, 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.LOG_CLOUD_WARN });
             }
         }
     });
@@ -117,7 +117,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, ["Bucket created", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
             if (ACL) {
                 await setCannedAcl.call(this, AWS, client, Bucket, ACL, service);
             }
@@ -132,7 +132,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
                     }
                     return true;
                 default:
-                    this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to create bucket" /* ERR_CLOUD.CREATE_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+                    this.formatFail(64, service, ["Unable to create bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
                     return false;
             }
         });
@@ -141,16 +141,17 @@ 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, service, [block ? "Bucket configured" : policy ? "Bucket policy configured" : "Bucket ACL configured", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to update bucket policy", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
     });
@@ -167,12 +168,12 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     }
     return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, Bucket], WebsiteConfiguration, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket configured", Bucket], WebsiteConfiguration, { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure bucket" /* ERR_CLOUD.CONFIGURE_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to configure bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
     });
@@ -195,17 +196,17 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
                 .then(data => {
                 if ((0, types_1.isArray)(data.Deleted)) {
                     const files = data.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 });
+                    this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
                 .catch(err => {
-                this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to empty bucket" /* ERR_CLOUD.DELETE_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                this.formatFail(64, service, ["Unable to empty bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
             });
         }
     })
         .catch(err => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to list bucket" /* ERR_CLOUD.LIST_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to list bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
     });
 }
@@ -227,7 +228,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const { service, table, id = '', query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
         if (!table) {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            throw (0, util_1.formatError)(item, "Missing database table");
         }
         (0, aws_1.setDatabaseEndpoint)(credential);
         const renewCache = ignoreCache === 0;
@@ -275,7 +276,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         else {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+            throw (0, util_1.formatError)(item, "Missing database query");
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
     }

package/download/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
+const client_1 = require("@pi-r/aws-v3");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -16,7 +16,6 @@ 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 })
             .then(result => {
@@ -27,12 +26,16 @@ function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                     input = Object.assign(deleteObject, input);
                 }
                 client.send(new AWS.DeleteObjectCommand(input))
-                    .then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...Cloud.LOG_CLOUD_DELETE }))
-                    .catch(err => this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
+                    .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(err => callback(err));
     };
 }
+exports.default = download;
 
-module.exports = download;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.2.1",
+  "version": "0.2.8",
   "description": "AWS V3 cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/aws-v3"
   },
   "keywords": [
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.5.2",
-    "@e-mc/module": "^0.5.2",
-    "@e-mc/types": "^0.5.2",
-    "@pi-r/aws": "^0.2.1",
-    "@aws-sdk/client-dynamodb": "^3.321.1",
-    "@aws-sdk/client-s3": "^3.321.1",
-    "@aws-sdk/lib-dynamodb": "^3.321.1"
+    "@e-mc/cloud": "^0.5.4",
+    "@e-mc/module": "^0.5.4",
+    "@e-mc/types": "^0.5.4",
+    "@pi-r/aws": "^0.2.8",
+    "@aws-sdk/client-dynamodb": "^3.525.0",
+    "@aws-sdk/client-s3": "^3.525.0",
+    "@aws-sdk/lib-dynamodb": "^3.525.0"
   }
 }

package/upload/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
-const client_1 = require("../client");
+const client_1 = require("@pi-r/aws-v3");
 const util_1 = require("@e-mc/cloud/util");
 const aws_1 = require("@pi-r/aws");
 const types_1 = require("@e-mc/types");
@@ -60,7 +60,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                 });
             } while (exists && ++i);
             if (i > 0) {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ["File renamed", current], filename, { ...Cloud.LOG_CLOUD_WARN });
             }
         }
         if (pathname) {
@@ -128,7 +128,6 @@ 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);
@@ -136,7 +135,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                     cleanup();
                     callback(null, url);
                 }
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
             })
                 .catch(err => {
                 if (first) {
@@ -149,5 +148,9 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
         }
     };
 }
+exports.default = upload;
 
-module.exports = upload;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}