@pi-r/aws-v3 0.7.3 → 0.8.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.
-
+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

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

package/client/index.js

@@ -1,5 +1,18 @@
 "use strict";
-exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketTagging = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.validateDatabase = exports.validateStorage = exports.createDatabaseClient = exports.createStorageClient = void 0;
+exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
+exports.createStorageClient = createStorageClient;
+exports.createDatabaseClient = createDatabaseClient;
+exports.validateStorage = validateStorage;
+exports.validateDatabase = validateDatabase;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.setBucketPolicy = setBucketPolicy;
+exports.setBucketTagging = setBucketTagging;
+exports.setBucketWebsite = setBucketWebsite;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+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");
@@ -115,11 +128,9 @@ function createStorageClient(credential, service = "aws-v3", sdk = "@aws-sdk/cli
         throw err;
     }
 }
-exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
     return [Lib.DynamoDBDocumentClient.from(new Client.DynamoDBClient(fromProvider(credential)), credential.translateConfig), Lib];
 }
-exports.createDatabaseClient = createDatabaseClient;
 function validateStorage(credential) {
     const credentials = credential.credentials;
     if (!credentials && !credential.provider && (0, aws_lib_1.isSharedCredentialsDefined)()) {
@@ -128,15 +139,12 @@ function validateStorage(credential) {
     }
     return !!credentials && ((0, aws_lib_1.isAccessDefined)(credentials) || typeof credentials === 'function') || (0, types_1.isPlainObject)(credential.provider) || (0, aws_lib_1.isEnvDefined)();
 }
-exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
     return (0, aws_lib_1.isDatabaseDefined)(credential, data) && validateStorage(credential);
 }
-exports.validateDatabase = validateDatabase;
 async function createBucket(credential, Bucket, publicRead, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     return createBucketV2.call(this, credential, Bucket, publicRead ? "public-read" : undefined, undefined, service, sdk);
 }
-exports.createBucket = createBucket;
 async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     ACL = ACL === 1 ? 1 : (0, aws_lib_1.checkBucketCannedACL)(ACL);
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
@@ -176,7 +184,6 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws-v
         });
     });
 }
-exports.createBucketV2 = createBucketV2;
 async function setBucketPolicy(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     const block = 'PublicAccessBlockConfiguration' in options;
@@ -194,7 +201,6 @@ async function setBucketPolicy(credential, Bucket, options, service = "aws-v3",
         return false;
     });
 }
-exports.setBucketPolicy = setBucketPolicy;
 async function setBucketTagging(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     if (!(0, types_1.isPlainObject)(options) || !Array.isArray(options.Tagging?.TagSet)) {
         return false;
@@ -217,7 +223,6 @@ async function setBucketTagging(credential, Bucket, options, service = "aws-v3",
     options.Bucket = Bucket;
     return client.send(new AWS.PutBucketTaggingCommand(options)).then(command).catch((err) => error(err));
 }
-exports.setBucketTagging = setBucketTagging;
 async function setBucketWebsite(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
@@ -240,11 +245,9 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws-v3",
         return false;
     });
 }
-exports.setBucketWebsite = setBucketWebsite;
 async function deleteObjects(credential, Bucket, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     return deleteObjectsV2.call(this, credential, Bucket, true, service, sdk);
 }
-exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, Bucket, recursive = true, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.ListObjectsCommand({ Bucket }))
@@ -256,9 +259,8 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = "
             }
             return client.send(new AWS.DeleteObjectsCommand({ Bucket, Delete: { Objects } }))
                 .then(data => {
-                const Deleted = data.Deleted;
-                if ((0, types_1.isArray)(Deleted)) {
-                    const files = Deleted.length + ' files';
+                if ((0, types_1.isArray)(data.Deleted)) {
+                    const files = data.Deleted.length + ' files';
                     this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
@@ -273,11 +275,9 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = "
         }
     });
 }
-exports.deleteObjectsV2 = deleteObjectsV2;
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
-exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
     const length = batch.length;
     const result = new Array(length);
@@ -291,12 +291,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const item = batch[i];
         let { service, table: TableName, id, query, key, limit = 0, update, ignoreCache } = item;
         const useCache = caching && ignoreCache !== true;
-        const getCache = (value) => {
-            if (ignoreCache !== 1) {
-                cacheValue.renewCache = ignoreCache === 0;
-                return this.getQueryResult(service, credential, value, cacheValue);
-            }
-        };
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = '';
         if (key && (id || (0, types_1.isPlainObject)(key))) {
@@ -306,7 +300,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             if (useCache) {
                 queryString = TableName + '_' + Cloud.asString(key, true) + (id !== undefined ? '_' + Cloud.asString(id, true) : '');
-                if (!update && (rows = getCache(queryString))) {
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -314,7 +308,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const [db, AWS] = createClient();
             const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: id };
             const command = { TableName, Key };
-            if (update) {
+            if ((0, types_1.isPlainObject)(update)) {
                 await db.send(new AWS.UpdateCommand({ ...command, ...update }));
             }
             const Item = (await db.send(new AWS.GetCommand(command))).Item;
@@ -333,7 +327,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (limit > 0) {
                 query.Limit = limit;
             }
-            if (useCache && (rows = getCache(queryString = Cloud.asString(query, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(query, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -350,12 +344,13 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             TableName ||= Object.keys(params.RequestItems)[0];
             if (!TableName) {
+                closeClient();
                 throw (0, util_1.formatError)(item, "Missing database table");
             }
             const Item = params.RequestItems[TableName] ||= {};
             Item.Keys = query;
             params = { RequestItems: { [TableName]: Item } };
-            if (useCache && (rows = getCache(queryString = Cloud.asString(params, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -365,6 +360,38 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = Responses[TableName];
             }
         }
+        else if ((0, types_1.isString)(query)) {
+            const Statement = query.trim();
+            const Parameters = (0, types_1.isArray)(item.params) ? item.params : undefined;
+            const Limit = limit > 0 ? limit : undefined;
+            if (!/^select\s/i.test(Statement)) {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database query");
+            }
+            const db = createClient()[0];
+            if ((0, types_1.isString)(update) && /^(?:insert|delete|update)\s/i.test(update) && !update.includes('?')) {
+                await db.send(new Lib.ExecuteStatementCommand({ Statement: update })).catch((err) => {
+                    this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                });
+            }
+            else {
+                update = '';
+            }
+            if (useCache && !update && (rows = this.getCacheResult(service, credential, queryString = Statement + '_' + Cloud.asString(Parameters, true) + (Limit ? '_' + Limit : ''), cacheValue, ignoreCache))) {
+                result[i] = rows;
+                continue;
+            }
+            const { Items } = await db.send(new Lib.ExecuteStatementCommand({ Statement, Parameters, Limit }));
+            if (Items) {
+                rows = Items;
+                if (rows.length === 0) {
+                    queryString = '';
+                }
+            }
+            else {
+                queryString = '';
+            }
+        }
         else if (TableName) {
             let params = item.params;
             if ((0, types_1.isPlainObject)(params)) {
@@ -373,7 +400,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             else {
                 params = { TableName };
             }
-            if (useCache && (rows = getCache(queryString = Cloud.asString(params, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -392,6 +419,5 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-exports.executeBatchQuery = executeBatchQuery;
 exports.CLOUD_UPLOAD_STREAM = true;
 exports.CLOUD_UPLOAD_CHUNK = true;

package/download/index.js

@@ -1,9 +1,9 @@
 "use strict";
+const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
-const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/aws-v3");
-module.exports = function download(config, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+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) => {
         const { bucket: Bucket, download: target } = data;
@@ -15,17 +15,28 @@ module.exports = function download(config, service = "aws-v3", sdk = "@aws-sdk/c
         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 => callback(null, buffer)).catch((err) => callback(err));
+            (0, util_1.readableAsBuffer)(result.Body).then(buffer => {
+                callback(null, buffer);
+            }).catch((err) => {
+                callback(err);
+            });
             let deleteObject = target.deleteObject;
             if (deleteObject) {
                 if (!(0, types_1.isPlainObject)(deleteObject)) {
                     deleteObject = undefined;
                 }
                 client.send(new AWS.DeleteObjectCommand({ ...deleteObject, Bucket, Key, VersionId: target.versionId }))
-                    .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 }));
+                    .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));
+            .catch((err) => {
+            callback(err);
+        });
     };
-};
+}
+module.exports = download;

package/package.json

@@ -1,33 +1,33 @@
-{
-  "name": "@pi-r/aws-v3",
-  "version": "0.7.3",
-  "description": "AWS V3 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.9.6",
-    "@e-mc/module": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
-    "@pi-r/aws-lib": "^0.7.3",
-    "@aws-sdk/client-dynamodb": "^3.616.0",
-    "@aws-sdk/client-s3": "^3.616.0",
-    "@aws-sdk/credential-providers": "^3.616.0",
-    "@aws-sdk/lib-dynamodb": "^3.616.0",
-    "@aws-sdk/lib-storage": "^3.616.0"
-  }
-}
+{
+  "name": "@pi-r/aws-v3",
+  "version": "0.8.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",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.10.0",
+    "@e-mc/module": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
+    "@pi-r/aws-lib": "^0.8.0",
+    "@aws-sdk/client-dynamodb": "^3.624.0",
+    "@aws-sdk/client-s3": "^3.624.0",
+    "@aws-sdk/credential-providers": "^3.624.0",
+    "@aws-sdk/lib-dynamodb": "^3.624.0",
+    "@aws-sdk/lib-storage": "^3.624.0"
+  }
+}

package/types/index.d.ts

@@ -1,41 +1,40 @@
-import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
-
-import type { AwsAuthInputConfig } from '@aws-sdk/middleware-signing';
-import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput } from '@aws-sdk/client-dynamodb';
-import type { BatchGetCommandInput, TranslateConfig, UpdateCommandInput } from '@aws-sdk/lib-dynamodb';
-import type { NativeAttributeValue } from "@aws-sdk/util-dynamodb";
-import type { S3ClientConfig } from '@aws-sdk/client-s3';
-
-export interface AWSBaseCredential extends AwsAuthInputConfig {
-    provider?: {
-        http?: unknown;
-        ini?: unknown;
-        cognitoIdentity?: unknown;
-        cognitoIdentityPool?: unknown;
-        temporaryCredentials?: unknown;
-        webToken?: unknown;
-        containerMetadata?: unknown;
-        instanceMetadata?: unknown;
-        process?: unknown;
-        tokenFile?: unknown;
-        sso?: unknown;
-        env?: unknown;
-        nodeProviderChain?: unknown;
-    };
-}
-
-export type AWSStorage = CloudStorage<AWSStorageCredential, "aws-v3">;
-
-export interface AWSStorageCredential extends S3ClientConfig, AWSBaseCredential {}
-
-export interface AWSDatabaseQuery extends CloudDatabase<QueryCommandInput | ObjectMap<NativeAttributeValue>[], PlainObject, UpdateCommandInput, BatchGetCommandInput | ScanCommandInput> {
-    source: "cloud";
-    service: "aws-v3";
-    key?: string | AttributeKey;
-}
-
-export interface AWSDatabaseCredential extends Omit<DynamoDBClientConfig, "credentials">, AWSBaseCredential {
-    translateConfig?: TranslateConfig;
-}
-
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+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';
+
+export interface AWSBaseCredential extends AwsSdkSigV4AuthInputConfig {
+    provider?: {
+        http?: unknown;
+        ini?: unknown;
+        cognitoIdentity?: unknown;
+        cognitoIdentityPool?: unknown;
+        temporaryCredentials?: unknown;
+        webToken?: unknown;
+        containerMetadata?: unknown;
+        instanceMetadata?: unknown;
+        process?: unknown;
+        tokenFile?: unknown;
+        sso?: unknown;
+        env?: unknown;
+        nodeProviderChain?: unknown;
+    };
+}
+
+export type AWSStorage = CloudStorage<AWSStorageCredential, "aws-v3">;
+
+export interface AWSStorageCredential extends S3ClientConfig, AWSBaseCredential {}
+
+export interface AWSDatabaseQuery extends CloudDatabase<QueryCommandInput | ObjectMap<NativeAttributeValue>[] | string, PlainObject, UpdateCommandInput | string, BatchGetCommandInput | ScanCommandInput | NativeAttributeValue[]> {
+    source: "cloud";
+    service: "aws-v3";
+    key?: string | AttributeKey;
+}
+
+export interface AWSDatabaseCredential extends Omit<DynamoDBClientConfig, "credentials">, AWSBaseCredential {
+    translateConfig?: TranslateConfig;
+}
+
 export type AttributeKey = Record<string, NativeAttributeValue>;

package/upload/index.js

@@ -2,6 +2,7 @@
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
+const crypto_1 = require("crypto");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
 const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
@@ -10,7 +11,7 @@ const aws_lib_1 = require("@pi-r/aws-lib");
 const client_1 = require("@pi-r/aws-v3");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
-module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
+function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
     const [client, AWS] = client_1.createStorageClient.call(this, credential, service, sdk);
     return async (data, callback) => {
         const { bucket: Bucket, localUri } = data;
@@ -27,7 +28,11 @@ module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk
             callback(err);
             return false;
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, Bucket);
+        const addLog = (err) => {
+            if (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;
@@ -41,36 +46,56 @@ module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk
         if (configBucket) {
             const { cors: CORSConfiguration, lifecycle: LifecycleConfiguration, retentionPolicy: DefaultRetention } = configBucket;
             const ExpectedBucketOwner = options?.ExpectedBucketOwner;
-            const commandMessage = (feature, message) => this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, message || Bucket], ExpectedBucketOwner, { ...Cloud[message === 'delete' ? 'LOG_CLOUD_WARN' : 'LOG_CLOUD_COMMAND'] });
+            const commandMessage = (feature, message) => {
+                this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, message || Bucket], ExpectedBucketOwner, { ...Cloud[message === 'delete' ? 'LOG_CLOUD_WARN' : 'LOG_CLOUD_COMMAND'] });
+            };
             if ((0, types_1.isPlainObject)(DefaultRetention)) {
                 client.send(new AWS.PutObjectLockConfigurationCommand({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner, RequestPayer: options?.RequestPayer }))
                     .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((err) => {
+                    addLog(err);
+                });
             }
             if (CORSConfiguration && Array.isArray(CORSConfiguration.CORSRules)) {
                 if (CORSConfiguration.CORSRules.length === 0) {
                     client.send(new AWS.DeleteBucketCorsCommand({ Bucket, ExpectedBucketOwner }))
-                        .then(() => commandMessage('CORS', 'delete'))
-                        .catch((err) => addLog(err));
+                        .then(() => {
+                        commandMessage('CORS', 'delete');
+                    })
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
                 else {
                     client.send(new AWS.PutBucketCorsCommand({ Bucket, CORSConfiguration, ExpectedBucketOwner }))
-                        .then(() => commandMessage('CORS'))
-                        .catch((err) => addLog(err));
+                        .then(() => {
+                        commandMessage('CORS');
+                    })
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
             }
             if (LifecycleConfiguration && Array.isArray(LifecycleConfiguration.Rules)) {
                 if (LifecycleConfiguration.Rules.length === 0) {
                     client.send(new AWS.DeleteBucketLifecycleCommand({ Bucket, ExpectedBucketOwner }))
-                        .then(() => commandMessage('Lifecycle', 'delete'))
-                        .catch((err) => addLog(err));
+                        .then(() => {
+                        commandMessage('Lifecycle', 'delete');
+                    })
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
                 else {
                     client.send(new AWS.PutBucketLifecycleConfigurationCommand({ Bucket, LifecycleConfiguration, ExpectedBucketOwner }))
-                        .then(() => commandMessage('Lifecycle'))
-                        .catch((err) => addLog(err));
+                        .then(() => {
+                        commandMessage('Lifecycle');
+                    })
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
             }
         }
@@ -89,7 +114,7 @@ module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk
                     .then(() => true)
                     .catch((err) => {
                     if (err instanceof Error && err.name !== 'NotFound') {
-                        filename = (0, types_1.generateUUID)() + path.extname(current);
+                        filename = (0, crypto_1.randomUUID)() + path.extname(current);
                         return true;
                     }
                     return false;
@@ -113,7 +138,7 @@ module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk
                 partSize = (0, types_1.alignSize)(data.upload.chunkSize, 1024);
             }
             try {
-                Stream.push(data.buffer.length ? stream.Readable.from(data.buffer, { highWaterMark: getPartSize() }) : fs.createReadStream(localUri, { highWaterMark: getPartSize(), signal: this.signal }));
+                Stream.push(data.buffer.length > 0 ? stream.Readable.from(data.buffer, { highWaterMark: getPartSize() }) : fs.createReadStream(localUri, { highWaterMark: getPartSize(), signal: this.signal }));
                 if (fileGroup) {
                     const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, 0, addLog, 2);
                     Key.push(...key);
@@ -208,4 +233,5 @@ module.exports = function upload(credential, service = "aws-v3", sdk = "@aws-sdk
             });
         }
     };
-};
+}
+module.exports = upload;