@pi-r/aws 0.11.2 → 0.12.0

package/client/index.js

@@ -1,27 +1,10 @@
 "use strict";
-exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
-exports.validateStorage = validateStorage;
-exports.validateDatabase = validateDatabase;
-exports.createStorageClient = createStorageClient;
-exports.createDatabaseClient = createDatabaseClient;
-exports.createBucket = createBucket;
-exports.createBucketV2 = createBucketV2;
-exports.setBucketPolicy = setBucketPolicy;
-exports.setBucketTagging = setBucketTagging;
-exports.setBucketWebsite = setBucketWebsite;
-exports.deleteObjects = deleteObjects;
-exports.deleteObjectsV2 = deleteObjectsV2;
-exports.deleteObjectsV3 = deleteObjectsV3;
-exports.copyObject = copyObject;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-exports.parseAttributeValue = parseAttributeValue;
-exports.isNoSuchBucket = isNoSuchBucket;
-const aws = require("aws-sdk");
-const Cloud = require("@e-mc/cloud");
-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 aws = require('aws-sdk');
+const Cloud = require('@e-mc/cloud');
+const { isArray, isErrorCode, isPlainObject, isString } = require('@e-mc/types');
+const { formatError } = require('@e-mc/cloud/util');
+const { checkBucketCannedACL, getBucketPublicReadPolicy, getPrivatePolicy, getPublicReadPolicy, isAccessDefined, isDatabaseDefined, isEnvDefined, isProviderChainDefined, isSharedCredentialsDefined, setDatabaseEndpoint } = require('@pi-r/aws-lib');
 const ACP_AUTHENTICATEDREAD = {
     Grants: [
         {
@@ -39,7 +22,7 @@ async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
             this.formatMessage(64, service, ['Grant ' + ACL, Bucket], '', Cloud.optionsLogMessage(recursive ? 'DELAYED' : 'COMMAND'));
         }
         else if (!recursive) {
-            if ((0, types_1.isErrorCode)(err, 'OperationAborted')) {
+            if (isErrorCode(err, 'OperationAborted')) {
                 setTimeout(() => {
                     void setCannedAcl.call(this, S3, Bucket, ACL, service, true);
                 }, 60000);
@@ -60,19 +43,19 @@ async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
     else {
         switch (ACL) {
             case 1:
-                promise = S3.putBucketPolicy({ Bucket, Policy: (0, aws_lib_1.getBucketPublicReadPolicy)(Bucket) }).promise();
+                promise = S3.putBucketPolicy({ Bucket, Policy: getBucketPublicReadPolicy(Bucket) }).promise();
                 break;
             case "public-read":
-                promise = S3.putBucketPolicy({ Bucket, Policy: (0, aws_lib_1.getPublicReadPolicy)(Bucket) }).promise();
+                promise = S3.putBucketPolicy({ Bucket, Policy: getPublicReadPolicy(Bucket) }).promise();
                 break;
             case "public-read-write":
-                promise = S3.putBucketPolicy({ Bucket, Policy: (0, aws_lib_1.getPublicReadPolicy)(Bucket, false, true) }).promise();
+                promise = S3.putBucketPolicy({ Bucket, Policy: getPublicReadPolicy(Bucket, false, true) }).promise();
                 break;
             case "authenticated-read":
-                promise = S3.putBucketPolicy({ Bucket, Policy: (0, aws_lib_1.getPublicReadPolicy)(Bucket, true) }).promise();
+                promise = S3.putBucketPolicy({ Bucket, Policy: getPublicReadPolicy(Bucket, true) }).promise();
                 break;
             default:
-                promise = S3.putBucketPolicy({ Bucket, Policy: (0, aws_lib_1.getPrivatePolicy)(Bucket) }).promise();
+                promise = S3.putBucketPolicy({ Bucket, Policy: getPrivatePolicy(Bucket) }).promise();
                 break;
         }
     }
@@ -82,10 +65,10 @@ async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
         .catch(callback);
 }
 function validateStorage(credential) {
-    return !!((0, aws_lib_1.isAccessDefined)(credential) || (0, aws_lib_1.isEnvDefined)() || credential.fromPath || credential.profile || (0, aws_lib_1.isProviderChainDefined)());
+    return !!(isAccessDefined(credential) || isEnvDefined() || credential.fromPath || credential.profile || isProviderChainDefined());
 }
 function validateDatabase(credential, data) {
-    return (0, aws_lib_1.isDatabaseDefined)(credential, data) && validateStorage(credential);
+    return isDatabaseDefined(credential, data) && validateStorage(credential);
 }
 function createStorageClient(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
     try {
@@ -96,7 +79,7 @@ function createStorageClient(credential, service = "aws", sdk = "aws-sdk/clients
                 client.config.loadFromPath(fromPath);
                 return client;
             }
-            if (profile || (0, aws_lib_1.isSharedCredentialsDefined)() && !(0, aws_lib_1.isAccessDefined)(credential) && !(0, aws_lib_1.isEnvDefined)()) {
+            if (profile || isSharedCredentialsDefined() && !isAccessDefined(credential) && !isEnvDefined()) {
                 credential = new aws.SharedIniFileCredentials({ profile });
             }
             return new aws.S3(credential);
@@ -118,14 +101,14 @@ function createDatabaseClient(credential) {
         catch {
         }
     }
-    else if (profile || (0, aws_lib_1.isSharedCredentialsDefined)() && !(0, aws_lib_1.isAccessDefined)(credential) && !(0, aws_lib_1.isEnvDefined)()) {
+    else if (profile || isSharedCredentialsDefined() && !isAccessDefined(credential) && !isEnvDefined()) {
         options = new aws.SharedIniFileCredentials({ profile });
     }
     else {
         options = credential;
     }
     if (options?.endpoint && !options.region) {
-        (0, aws_lib_1.setDatabaseEndpoint)(options);
+        setDatabaseEndpoint(options);
     }
     return new aws.DynamoDB.DocumentClient(options);
 }
@@ -133,7 +116,7 @@ async function createBucket(credential, Bucket, publicRead, service, sdk) {
     return createBucketV2.call(this, credential, Bucket, publicRead ? "public-read" : undefined, undefined, service, sdk);
 }
 async function createBucketV2(credential, Bucket, ACL, options, service = "aws", sdk = "aws-sdk/clients/s3") {
-    ACL = ACL === 1 ? 1 : (0, aws_lib_1.checkBucketCannedACL)(ACL);
+    ACL = ACL === 1 ? 1 : checkBucketCannedACL(ACL);
     const S3 = createStorageClient.call(this, credential, service, sdk);
     return S3.headBucket({ Bucket }).promise()
         .then(async () => {
@@ -157,17 +140,14 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws",
             return true;
         })
             .catch(async (err) => {
-            switch (err instanceof Error && err.code) {
-                case 'BucketAlreadyExists':
-                case 'BucketAlreadyOwnedByYou':
-                    if (ACL) {
-                        await setCannedAcl.call(this, S3, Bucket, ACL, service);
-                    }
-                    return true;
-                default:
-                    this.formatFail(64, service, ["Unable to create bucket", Bucket], err, Cloud.optionsLogMessage('FAIL'));
-                    return false;
+            if (isErrorCode(err, 'BucketAlreadyExists', 'BucketAlreadyOwnedByYou')) {
+                if (ACL) {
+                    await setCannedAcl.call(this, S3, Bucket, ACL, service);
+                }
+                return true;
             }
+            this.formatFail(64, service, ["Unable to create bucket", Bucket], err, Cloud.optionsLogMessage('FAIL'));
+            return false;
         });
     });
 }
@@ -179,7 +159,7 @@ async function setBucketPolicy(credential, Bucket, options, service = "aws", sdk
         options.AccessControlPolicy = ACP_AUTHENTICATEDREAD;
         delete options.ACL;
     }
-    return ('PublicAccessBlockConfiguration' in options ? S3.putPublicAccessBlock(options) : 'Policy' in options && (0, types_1.isString)(options.Policy) && !ibm ? S3.putBucketPolicy(options) : S3.putBucketAcl(options)).promise()
+    return ('PublicAccessBlockConfiguration' in options ? S3.putPublicAccessBlock(options) : 'Policy' in options && isString(options.Policy) && !ibm ? S3.putBucketPolicy(options) : S3.putBucketAcl(options)).promise()
         .then(() => {
         this.formatMessage(64, service, ["Bucket policy configured", Bucket], '', Cloud.optionsLogMessage('COMMAND'));
         return true;
@@ -192,7 +172,7 @@ async function setBucketPolicy(credential, Bucket, options, service = "aws", sdk
     });
 }
 async function setBucketTagging(credential, Bucket, options, service = "aws", sdk = "aws-sdk/clients/s3") {
-    if (!(0, types_1.isPlainObject)(options) || !Array.isArray(options.Tagging?.TagSet)) {
+    if (!isPlainObject(options) || !Array.isArray(options.Tagging?.TagSet)) {
         return false;
     }
     const S3 = createStorageClient.call(this, credential, service, sdk);
@@ -221,10 +201,10 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws", sd
     const S3 = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
     const { indexPage: Suffix, errorPage: Key } = options;
-    if ((0, types_1.isString)(Suffix)) {
+    if (isString(Suffix)) {
         WebsiteConfiguration.IndexDocument = { Suffix };
     }
-    if ((0, types_1.isString)(Key)) {
+    if (isString(Key)) {
         WebsiteConfiguration.ErrorDocument = { Key };
     }
     return S3.putBucketWebsite({ Bucket, WebsiteConfiguration }).promise()
@@ -239,8 +219,8 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws", sd
         return false;
     });
 }
-async function deleteObjects(credential, Bucket, service, sdk, recursive = true) {
-    return deleteObjectsV2.call(this, credential, Bucket, recursive, service, sdk);
+async function deleteObjects(credential, Bucket, options, service, sdk) {
+    return deleteObjectsV3.call(this, credential, Bucket, options, service, sdk);
 }
 async function deleteObjectsV2(credential, Bucket, recursive = true, service, sdk) {
     return deleteObjectsV3.call(this, credential, Bucket, { recursive, Bucket }, service, sdk);
@@ -264,7 +244,7 @@ async function deleteObjectsV3(credential, Bucket, options = {}, service = "aws"
             return S3.deleteObjects({ Bucket, Delete: { Objects } }).promise()
                 .then(data => {
                 const Deleted = data.Deleted;
-                if ((0, types_1.isArray)(Deleted)) {
+                if (isArray(Deleted)) {
                     const files = Deleted.length + ' files';
                     this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', Cloud.optionsLogMessage('COMMAND'));
                 }
@@ -284,7 +264,7 @@ async function copyObject(credential, BucketSource, KeySource, Bucket, Key, opti
     const S3 = createStorageClient.call(this, credential, service, sdk);
     const index = Key.lastIndexOf('/');
     if (index !== -1) {
-        await S3.putObject({ Bucket, Key: Key.substring(0, index + 1), Body: Buffer.from(''), ContentLength: 0 }).promise().catch(() => { });
+        await S3.putObject({ Bucket, Key: Key.slice(0, index + 1), Body: Buffer.from(''), ContentLength: 0 }).promise().catch(() => { });
     }
     const CopySource = BucketSource + '/' + KeySource;
     return S3.copyObject({ ...options, Bucket, Key, CopySource }).promise()
@@ -305,16 +285,16 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
     const createClient = () => client ||= createDatabaseClient.call(this, credential);
-    (0, aws_lib_1.setDatabaseEndpoint)(credential);
+    setDatabaseEndpoint(credential);
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         let { service, table: TableName, id, query, key, limit = 0, update, ignoreCache } = item;
         const useCache = caching && ignoreCache !== true;
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = '';
-        if (key && (id || (0, types_1.isPlainObject)(key))) {
+        if (key && (id || isPlainObject(key))) {
             if (!TableName) {
-                throw (0, util_1.formatError)(item, "Missing database table");
+                throw formatError(item, "Missing database table");
             }
             if (useCache) {
                 queryString = TableName + '_' + Cloud.asString(key, true) + (id !== undefined ? '_' + Cloud.asString(id, true) : '');
@@ -323,7 +303,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: id };
+            const Key = isPlainObject(key) ? key : { [key]: id };
             const command = { TableName, Key };
             client = createClient();
             if (update) {
@@ -334,12 +314,12 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = [Item];
             }
         }
-        else if ((0, types_1.isPlainObject)(query)) {
+        else if (isPlainObject(query)) {
             if (TableName) {
                 query.TableName = TableName;
             }
             if (!TableName) {
-                throw (0, util_1.formatError)(item, "Missing database table");
+                throw formatError(item, "Missing database table");
             }
             if (limit > 0) {
                 query.Limit = limit;
@@ -353,14 +333,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = Items;
             }
         }
-        else if ((0, types_1.isArray)(query)) {
+        else if (isArray(query)) {
             let params = (item.params || {});
-            if (!(0, types_1.isPlainObject)(params.RequestItems)) {
+            if (!isPlainObject(params.RequestItems)) {
                 params.RequestItems = {};
             }
             TableName ||= Object.keys(params.RequestItems)[0];
             if (!TableName) {
-                throw (0, util_1.formatError)(item, "Missing database table");
+                throw formatError(item, "Missing database table");
             }
             const Item = params.RequestItems[TableName] ||= {};
             Item.Keys = query;
@@ -381,7 +361,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     params.TableName = TableName;
                 }
                 else if (!params.TableName) {
-                    throw (0, util_1.formatError)(item, "Missing database table");
+                    throw formatError(item, "Missing database table");
                 }
             }
             if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
@@ -403,7 +383,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else {
-            throw (0, util_1.formatError)(item, "Missing database query");
+            throw formatError(item, "Missing database query");
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
     }
@@ -439,7 +419,27 @@ function parseAttributeValue(value) {
     return { NULL: true };
 }
 function isNoSuchBucket(err) {
-    return (0, types_1.isErrorCode)(err, 'NoSuchBucket');
+    return isErrorCode(err, 'NoSuchBucket');
 }
-exports.CLOUD_UPLOAD_STREAM = true;
-exports.CLOUD_UPLOAD_CHUNK = true;
+const CLOUD_UPLOAD_STREAM = true;
+const CLOUD_UPLOAD_CHUNK = true;
+
+exports.CLOUD_UPLOAD_CHUNK = CLOUD_UPLOAD_CHUNK;
+exports.CLOUD_UPLOAD_STREAM = CLOUD_UPLOAD_STREAM;
+exports.copyObject = copyObject;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.createDatabaseClient = createDatabaseClient;
+exports.createStorageClient = createStorageClient;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.isNoSuchBucket = isNoSuchBucket;
+exports.parseAttributeValue = parseAttributeValue;
+exports.setBucketPolicy = setBucketPolicy;
+exports.setBucketTagging = setBucketTagging;
+exports.setBucketWebsite = setBucketWebsite;
+exports.validateDatabase = validateDatabase;
+exports.validateStorage = validateStorage;

package/download/index.d.ts

@@ -0,0 +1,5 @@
+import type { DownloadHost } from '@e-mc/cloud/types';
+
+declare const download: DownloadHost;
+
+export = download;

package/download/index.js

@@ -1,35 +1,36 @@
 "use strict";
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const client_1 = require("@pi-r/aws");
+
+const Cloud = require('@e-mc/cloud');
+const { errorValue, isPlainObject } = require('@e-mc/types');
+const { createErrorHandler, intoArray } = require('@e-mc/cloud/util');
+const { copyObject, createStorageClient } = require('@pi-r/aws');
 function download(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
-    const s3 = client_1.createStorageClient.call(this, credential, service, sdk);
+    const s3 = createStorageClient.call(this, credential, service, sdk);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
         const Key = target.keyname || target.filename;
         if (!Bucket || !Key) {
-            callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
+            callback(errorValue('Missing property', !Bucket ? 'Bucket' : 'Key'));
             return;
         }
         s3.getObject({ ...target.options, Bucket, Key, VersionId: target.versionId }, async (err, result) => {
             if (!err) {
                 callback(null, result.Body);
-                const copyTo = (0, util_1.intoArray)(target.copyObject);
+                const copyTo = intoArray(target.copyObject);
                 if (copyTo) {
                     const tasks = [];
                     for (const { bucket, pathname, filename, options } of copyTo) {
                         const keyObject = filename ? Cloud.joinPath(pathname, filename, true) : Key;
-                        tasks.push(client_1.copyObject
+                        tasks.push(copyObject
                             .call(this, credential, Bucket, Key, bucket, keyObject, options, service, sdk)
-                            .catch((0, util_1.createErrorHandler)(this, service, Bucket)));
+                            .catch(createErrorHandler(this, service, Bucket)));
                     }
                     await Promise.all(tasks);
                 }
                 const deleteObject = target.deleteObject;
                 if (deleteObject) {
                     const location = Cloud.joinPath(Bucket, Key);
-                    const deleteOptions = (0, types_1.isPlainObject)(deleteObject) ? deleteObject : undefined;
+                    const deleteOptions = isPlainObject(deleteObject) ? deleteObject : undefined;
                     s3.deleteObject({ ...deleteOptions, Bucket, Key, VersionId: target.versionId }, error => {
                         if (!error) {
                             this.formatMessage(64, service, "Delete success", location, Cloud.optionsLogMessage('DELETE'));
@@ -46,4 +47,5 @@ function download(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
         });
     };
 }
+
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.13.9",
-    "@e-mc/module": "^0.13.9",
-    "@e-mc/types": "^0.13.9",
-    "@pi-r/aws-lib": "^0.11.2",
+    "@e-mc/cloud": "^0.14.0",
+    "@e-mc/module": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
+    "@pi-r/aws-lib": "^0.12.0",
     "aws-sdk": "^2.1693.0"
   }
 }

package/upload/index.d.ts

@@ -0,0 +1,5 @@
+import type { UploadHost } from '@e-mc/cloud/types';
+
+declare const upload: UploadHost;
+
+export = upload;

package/upload/index.js

@@ -1,21 +1,22 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const stream = require("node:stream");
-const aws = require("aws-sdk");
-const node_crypto_1 = require("node:crypto");
-const Cloud = require("@e-mc/cloud");
-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");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const aws = require('aws-sdk');
+const { randomUUID } = require('node:crypto');
+const Cloud = require('@e-mc/cloud');
+const { alignSize, createAbortError, isErrorCode, isPlainObject } = require('@e-mc/types');
+const { createErrorHandler, createKeyAndBody, generateFilename, intoArray } = require('@e-mc/cloud/util');
+const { formatDefaultRetention, getBucketKey } = require('@pi-r/aws-lib');
+const { copyObject, createBucketV2, createStorageClient } = require('@pi-r/aws');
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
-    const s3 = client_1.createStorageClient.call(this, credential, service, sdk);
+    const s3 = createStorageClient.call(this, credential, service, sdk);
     return async (data, callback) => {
         const { bucket: Bucket, localUri } = data;
-        const { pathname, flags = 0, fileGroup, contentType, metadata, tags: Tags, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, descendantsGroup, contentType, metadata, tags: Tags, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
         const complete = (err, url) => {
             BUCKET_SESSION.delete(service + Bucket);
@@ -24,11 +25,11 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
             }
             callback(err, url);
         };
-        const addLog = (0, util_1.createErrorHandler)(this, Bucket, service);
+        const addLog = createErrorHandler(this, Bucket, service);
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? "public-read" : admin.acl;
-            const response = BUCKET_RESPONSE[bucketKey = (0, aws_lib_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] ||= client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, configBucket?.create, service, sdk);
+            const response = BUCKET_RESPONSE[bucketKey = getBucketKey(credential, Bucket, bucketAcl, service, sdk)] ||= createBucketV2.call(this, credential, Bucket, bucketAcl, configBucket?.create, service, sdk);
             if (!await response) {
                 complete(null);
                 return;
@@ -42,10 +43,10 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
                 this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, Bucket], message || ExpectedBucketOwner, { ...Cloud[message === 'delete' ? 'LOG_CLOUD_WARN' : 'LOG_CLOUD_COMMAND'] });
             };
             if (service !== "ibm") {
-                if ((0, types_1.isPlainObject)(DefaultRetention)) {
+                if (isPlainObject(DefaultRetention)) {
                     s3.putObjectLockConfiguration({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner, RequestPayer: options?.RequestPayer }, err => {
                         if (!err) {
-                            this.formatMessage(64, service, ["Bucket configured" + ' (Retention Policy)', Bucket], (0, aws_lib_1.formatDefaultRetention)(DefaultRetention), Cloud.optionsLogMessage('COMMAND'));
+                            this.formatMessage(64, service, ["Bucket configured" + ' (Retention Policy)', Bucket], formatDefaultRetention(DefaultRetention), Cloud.optionsLogMessage('COMMAND'));
                         }
                         else {
                             addLog(err);
@@ -100,7 +101,7 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
         }
         if (!overwrite) {
             const current = filename;
-            const next = (0, util_1.generateFilename)(filename);
+            const next = generateFilename(filename);
             let i = 0, exists = false;
             do {
                 if (i > 0) {
@@ -112,8 +113,8 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
                 exists = await s3.headObject({ Bucket, Key: Cloud.joinPath(pathname, filename, true) }).promise()
                     .then(() => true)
                     .catch((err) => {
-                    if (err instanceof Error && err.code !== 'NotFound') {
-                        filename = (0, node_crypto_1.randomUUID)() + path.extname(current);
+                    if (!isErrorCode(err, 'NotFound')) {
+                        filename = randomUUID() + path.extname(current);
                     }
                     return false;
                 });
@@ -125,7 +126,7 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
         if (pathname) {
             await s3.putObject({ Bucket, Key: pathname.endsWith('/') ? pathname : pathname + '/', Body: Buffer.from(''), ContentLength: 0 }).promise().catch(() => { });
         }
-        const partSize = flags & 4 ? (0, types_1.alignSize)(data.upload.chunkSize, 1024) : 0;
+        const partSize = flags & 4 ? alignSize(data.upload.chunkSize, 1024) : 0;
         const Key = [filename];
         const Body = [data.buffer];
         const Stream = [];
@@ -149,7 +150,7 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
             Stream[0] = stream.Readable.from(Body[0], { highWaterMark: getPartSize() });
         }
         if (fileGroup) {
-            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, 0, addLog, flags);
+            const [key, body, type] = createKeyAndBody(filename, fileGroup, { errorCallback: addLog, descendantsGroup, flags });
             Key.push(...key);
             ContentType.push(...type);
             if (flags & 2) {
@@ -163,7 +164,7 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
             const first = i === 0;
             if (this.aborted) {
                 if (first) {
-                    complete((0, types_1.createAbortError)());
+                    complete(createAbortError());
                 }
                 return;
             }
@@ -182,7 +183,7 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
                     params.Metadata = metadata;
                 }
                 if (service !== "oci") {
-                    if ((0, types_1.isPlainObject)(Tags) && (length = Object.keys(Tags).length) > 0) {
+                    if (isPlainObject(Tags) && (length = Object.keys(Tags).length) > 0) {
                         tags = [];
                         for (const name in Tags) {
                             tags.push({ Key: name, Value: Tags[name] });
@@ -227,12 +228,12 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
                             }
                         });
                     }
-                    const copyTo = (0, util_1.intoArray)(data.upload.copyObject);
+                    const copyTo = intoArray(data.upload.copyObject);
                     if (copyTo) {
                         const tasks = [];
                         for (const { bucket: bucketName, pathname: pathObject = pathname, filename: fileObject, options: copyOptions } of copyTo) {
                             const keyObject = fileObject ? Cloud.joinPath(pathObject, fileObject, true) : result.Key;
-                            tasks.push(client_1.copyObject
+                            tasks.push(copyObject
                                 .call(this, credential, Bucket, result.Key, bucketName, keyObject, copyOptions, service, sdk)
                                 .catch(addLog));
                         }
@@ -244,4 +245,5 @@ function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
         }
     };
 }
+
 module.exports = upload;