@pi-r/aws-v3 0.8.3 → 0.9.1

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2024 An Pham
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -4,4 +4,4 @@ https://e-mc.readthedocs.io/en/latest/cloud/aws-v3.html
 
 ### LICENSE
 
-MIT
+MIT

package/client/index.js

@@ -11,14 +11,15 @@ exports.setBucketTagging = setBucketTagging;
 exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 const Lib = require("@aws-sdk/lib-dynamodb");
 const Client = require("@aws-sdk/client-dynamodb");
 const Providers = require("@aws-sdk/credential-providers");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const aws_lib_1 = require("@pi-r/aws-lib");
 async function setCannedAcl(S3, client, Bucket, ACL, service = "aws-v3", recursive) {
     let Policy;
@@ -228,10 +229,10 @@ async function setBucketTagging(credential, Bucket, options, service = "aws-v3",
         return false;
     };
     if (deleting) {
-        return client.send(new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner })).then(command).catch((err) => error(err));
+        return client.send(new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner })).then(command).catch(error);
     }
     options.Bucket = Bucket;
-    return client.send(new AWS.PutBucketTaggingCommand(options)).then(command).catch((err) => error(err));
+    return client.send(new AWS.PutBucketTaggingCommand(options)).then(command).catch(error);
 }
 async function setBucketWebsite(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
@@ -255,12 +256,22 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws-v3",
         return false;
     });
 }
-async function deleteObjects(credential, Bucket, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
-    return deleteObjectsV2.call(this, credential, Bucket, true, service, sdk);
+async function deleteObjects(credential, Bucket, service, sdk, recursive = true) {
+    return deleteObjectsV2.call(this, credential, Bucket, recursive, service, sdk);
 }
-async function deleteObjectsV2(credential, Bucket, recursive = true, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+async function deleteObjectsV2(credential, Bucket, recursive = true, service, sdk) {
+    return deleteObjectsV3.call(this, credential, Bucket, { recursive, Bucket }, service, sdk);
+}
+async function deleteObjectsV3(credential, Bucket, options = {}, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+    options = { ...options };
+    let recursive = true;
+    if ('recursive' in options) {
+        recursive = options.recursive;
+        delete options.recursive;
+    }
+    options.Bucket ||= Bucket;
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
-    return client.send(new AWS.ListObjectsCommand({ Bucket }))
+    return client.send(new AWS.ListObjectsCommand(options))
         .then(async ({ Contents }) => {
         if (Contents?.length) {
             let Objects = Contents.map(data => ({ Key: data.Key }));

package/download/index.js

@@ -1,7 +1,7 @@
 "use strict";
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 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);
@@ -15,11 +15,11 @@ function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
         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 => {
+            (0, util_1.readableAsBuffer)(result.Body)
+                .then(buffer => {
                 callback(null, buffer);
-            }).catch((err) => {
-                callback(err);
-            });
+            })
+                .catch(callback);
             let deleteObject = target.deleteObject;
             if (deleteObject) {
                 if (!(0, types_1.isPlainObject)(deleteObject)) {
@@ -34,9 +34,7 @@ function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                 });
             }
         })
-            .catch((err) => {
-            callback(err);
-        });
+            .catch(callback);
     };
 }
 module.exports = download;

package/package.json

@@ -1,33 +1,32 @@
-{
-  "name": "@pi-r/aws-v3",
-  "version": "0.8.3",
-  "description": "AWS cloud functions for E-mc.",
-  "main": "client/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/cloud/aws-v3"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/module": "^0.10.3",
-    "@e-mc/types": "^0.10.3",
-    "@pi-r/aws-lib": "^0.8.3",
-    "@aws-sdk/client-dynamodb": "^3.670.0",
-    "@aws-sdk/client-s3": "^3.670.0",
-    "@aws-sdk/credential-providers": "^3.670.0",
-    "@aws-sdk/lib-dynamodb": "^3.670.0",
-    "@aws-sdk/lib-storage": "^3.670.0"
-  }
-}
+{
+  "name": "@pi-r/aws-v3",
+  "version": "0.9.1",
+  "description": "AWS cloud functions for E-mc.",
+  "main": "client/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/cloud/aws-v3"
+  },
+  "keywords": [
+    "squared",
+    "e-mc"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.11.2",
+    "@e-mc/module": "^0.11.2",
+    "@e-mc/types": "^0.11.2",
+    "@pi-r/aws-lib": "^0.9.1",
+    "@aws-sdk/client-dynamodb": "^3.741.0",
+    "@aws-sdk/client-s3": "^3.741.0",
+    "@aws-sdk/credential-providers": "*",
+    "@aws-sdk/lib-dynamodb": "^3.741.0",
+    "@aws-sdk/lib-storage": "^3.741.0"
+  }
+}

package/types/index.d.ts

@@ -4,8 +4,10 @@ import type { AwsSdkSigV4AuthInputConfig } from '@aws-sdk/core';
 import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput } from '@aws-sdk/client-dynamodb';
 import type { BatchGetCommandInput, NativeAttributeValue, TranslateConfig, UpdateCommandInput } from '@aws-sdk/lib-dynamodb';
 import type { S3ClientConfig } from '@aws-sdk/client-s3';
+import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
 
-export interface AWSBaseCredential extends AwsSdkSigV4AuthInputConfig {
+export interface AWSBaseCredential extends Omit<AwsSdkSigV4AuthInputConfig, "credentials"> {
+    credentials?: AwsCredentialIdentity | AwsCredentialIdentityProvider;
     provider?: {
         http?: unknown;
         ini?: unknown;

package/upload/index.js

@@ -1,12 +1,12 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const stream = require("stream");
-const crypto_1 = require("crypto");
+const path = require("node:path");
+const fs = require("node:fs");
+const stream = require("node:stream");
+const node_crypto_1 = require("node:crypto");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const aws_lib_1 = require("@pi-r/aws-lib");
 const client_1 = require("@pi-r/aws-v3");
 const BUCKET_SESSION = new Set();
@@ -54,9 +54,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                     .then(() => {
                     this.formatMessage(64, service, ["Bucket configured" + ' (Retention Policy)', Bucket], (0, aws_lib_1.formatDefaultRetention)(DefaultRetention), { ...Cloud.LOG_CLOUD_COMMAND });
                 })
-                    .catch((err) => {
-                    addLog(err);
-                });
+                    .catch(addLog);
             }
             if (CORSConfiguration && Array.isArray(CORSConfiguration.CORSRules)) {
                 if (CORSConfiguration.CORSRules.length === 0) {
@@ -64,18 +62,14 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                         .then(() => {
                         commandMessage('CORS', 'delete');
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
                 else {
                     client.send(new AWS.PutBucketCorsCommand({ Bucket, CORSConfiguration, ExpectedBucketOwner }))
                         .then(() => {
                         commandMessage('CORS');
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
             }
             if (LifecycleConfiguration && Array.isArray(LifecycleConfiguration.Rules)) {
@@ -93,16 +87,14 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                         .then(() => {
                         commandMessage('Lifecycle');
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
             }
         }
         if (!overwrite) {
             const current = filename;
             const next = (0, util_1.generateFilename)(filename);
-            let i = 0, exists;
+            let i = 0, exists = false;
             do {
                 if (i > 0) {
                     [filename, exists] = next(i);
@@ -114,7 +106,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
                     .then(() => true)
                     .catch((err) => {
                     if (err instanceof Error && err.name !== 'NotFound') {
-                        filename = (0, crypto_1.randomUUID)() + path.extname(current);
+                        filename = (0, node_crypto_1.randomUUID)() + path.extname(current);
                         return true;
                     }
                     return false;