@e-mc/cloud 0.13.9 → 0.14.0

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/cloud
 
-* NodeJS 18.20 LTS
+* NodeJS 20 (Minimum 18)
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.9/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.0/lib/index.d.ts)
 
 ```typescript
 import type { IFileManager, IHost, IScopeOrigin } from "./index";
@@ -180,12 +180,12 @@ const rows = await instance.getDatabaseRows({ service: "aws-v3", credential: "ma
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.9/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.0/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -1,9 +1,11 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const crypto = require("node:crypto");
-const types_1 = require("@e-mc/types");
-const core_1 = require("@e-mc/core");
+
+var _a;
+const path = require('node:path');
+const fs = require('node:fs');
+const { randomUUID } = require('node:crypto');
+const { IMPORT_MAP, alignSize, coerceObject, createAbortError, errorMessage, errorValue, formatSize, ignoreFlag, isArray, isError, isErrorCode, isObject, isPlainObject, isString } = require('@e-mc/types');
+const { ClientDb } = require('@e-mc/core');
 const kCloud = Symbol.for('cloud:constructor');
 const SERVICE_CLIENT = new Map();
 const SERVICE_UPLOAD = Object.create(null);
@@ -12,19 +14,19 @@ function setUploadFilename(upload, filename) {
     filename = Cloud.toPosix(filename.replace(/^\.*[\\/]+/, ''));
     const index = filename.lastIndexOf('/');
     if (index !== -1) {
-        const directory = filename.substring(0, index + 1);
+        const directory = filename.slice(0, index + 1);
         upload.pathname = upload.pathname ? Cloud.joinPath(upload.pathname, directory) : directory;
-        filename = filename.substring(index + 1);
+        filename = filename.slice(index + 1);
     }
     return upload.filename = filename;
 }
-function hasSameBucket({ upload, service, bucket }, other) {
+function fromSameBucket({ upload, service, bucket }, other) {
     const endpoint = upload.endpoint;
     return (service && other.service || endpoint && endpoint === other.upload.endpoint) && bucket === other.bucket;
 }
 function getFiles(file, data) {
     const localUri = file.localUri;
-    const grouped = [localUri && core_1.ClientDb.isPath(localUri, true) ? localUri : ''];
+    const grouped = [localUri && ClientDb.isPath(localUri, true) ? localUri : ''];
     if (data.all) {
         if (file.descendants) {
             grouped.push(...file.descendants);
@@ -43,19 +45,16 @@ function renameTrailing(map, item, folder, value) {
     const location = folder + value;
     map[location] ||= 1;
     const index = value.indexOf('.');
-    item.filename = (index !== -1 ? value.substring(0, index) : value) + '_' + map[location]++ + (index !== -1 ? value.substring(index) : '');
+    item.filename = (index !== -1 ? value.slice(0, index) : value) + '_' + map[location]++ + (index !== -1 ? value.slice(index) : '');
 }
-function errorResponse(instance, service, bucket, err) {
-    instance.formatMessage(64, service, ["Unable to empty bucket", bucket], err, Cloud.optionsLogMessage('WARN'));
-}
-const errorObject = (err, service, value) => err instanceof Error ? err : typeof err === 'string' ? new Error(err) : (0, types_1.errorMessage)(service, value);
-const assignFilename = (value) => crypto.randomUUID() + (path.extname(value) || '');
-class Cloud extends core_1.ClientDb {
+const errorObject = (err, service, value) => isError(err) ? err : typeof err === 'string' ? new Error(err) : errorMessage(service, value);
+const assignFilename = (value) => randomUUID() + (path.extname(value) || '');
+class Cloud extends ClientDb {
     static [kCloud] = true;
     static STORE_RESULT_PARTITION_SIZE = 16;
     static STORE_RESULT_PARTITION_MULT = 2;
-    static LOG_CLOUD_SUCCESS = core_1.ClientDb.LOG_STYLE_SUCCESS;
-    static LOG_CLOUD_FAIL = core_1.ClientDb.LOG_STYLE_FAIL;
+    static LOG_CLOUD_SUCCESS = ClientDb.LOG_STYLE_SUCCESS;
+    static LOG_CLOUD_FAIL = ClientDb.LOG_STYLE_FAIL;
     static LOG_CLOUD_COMMAND = Object.freeze({ titleColor: 'blue' });
     static LOG_CLOUD_WARN = Object.freeze({ titleColor: 'yellow' });
     static LOG_CLOUD_UPLOAD = Object.freeze({ titleColor: 'green' });
@@ -87,11 +86,11 @@ class Cloud extends core_1.ClientDb {
     }
     static async finalize(instance) {
         if (instance.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
-        Cloud.sanitizeAssets(this.assets);
+        _a.sanitizeAssets(this.assets);
         const localStorage = new Map();
-        const bucketGroup = crypto.randomUUID();
+        const bucketGroup = randomUUID();
         const state = { host: this, instance, bucketGroup, localStorage };
         const bucketDelete = {};
         const bucketPolicy = {};
@@ -100,17 +99,17 @@ class Cloud extends core_1.ClientDb {
         const startTime = process.hrtime.bigint();
         let tasks = [], downloadMap;
         if (await instance.commit()) {
-            instance.writeTimeElapsed(instance.moduleName, "Transactions were committed", startTime, Cloud.optionsLogMessage('SUCCESS'));
+            instance.writeTimeElapsed(instance.moduleName, "Transactions were committed", startTime, _a.optionsLogMessage('SUCCESS'));
         }
         for (const { instance: document } of this.Document) {
             document.cloudInit?.(state);
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
-            if ((0, types_1.isArray)(cloudStorage) && !(0, types_1.ignoreFlag)(item)) {
+            if (isArray(cloudStorage) && !ignoreFlag(item)) {
                 if (item.invalid) {
                     for (const storage of cloudStorage) {
-                        instance.formatMessage(64, storage.service, ["Upload failed", storage.bucket], (0, types_1.errorValue)("File not found", item.uri || item.filename || "Unknown"), Cloud.optionsLogMessage('WARN'));
+                        instance.formatMessage(64, storage.service, ["Upload failed", storage.bucket], errorValue("File not found", item.uri || item.filename || "Unknown"), _a.optionsLogMessage('WARN'));
                     }
                     continue;
                 }
@@ -137,7 +136,7 @@ class Cloud extends core_1.ClientDb {
                             const service = bucketDelete[name] ||= {};
                             const items = service[bucket];
                             if (!items) {
-                                let options = (0, types_1.isObject)(admin.emptyBucket) ? admin.emptyBucket : undefined;
+                                let options = isObject(admin.emptyBucket) ? admin.emptyBucket : undefined;
                                 if (typeof admin.recursive === 'boolean') {
                                     (options ||= {}).recursive = admin.recursive;
                                 }
@@ -165,7 +164,7 @@ class Cloud extends core_1.ClientDb {
         if (tasks.length > 0) {
             await instance.allSettled(tasks, ["Compress files", instance.moduleName]);
             if (instance.aborted) {
-                return (0, types_1.createAbortError)(true);
+                return createAbortError(true);
             }
             tasks = [];
         }
@@ -181,20 +180,20 @@ class Cloud extends core_1.ClientDb {
         if (tasks.length > 0) {
             await instance.allSettled(tasks, ["Empty bucket", instance.moduleName]);
             if (instance.aborted) {
-                return (0, types_1.createAbortError)(true);
+                return createAbortError(true);
             }
             tasks = [];
         }
         if (rawFiles.length > 0) {
             const options = { preferBuffer: process.env.EMC_CLOUD_UPLOAD_BUFFER === 'true' };
             for (const item of rawFiles) {
-                tasks.push(...Cloud.uploadAsset(state, item, options));
+                tasks.push(..._a.uploadAsset(state, item, options));
             }
         }
         if (tasks.length > 0) {
             await instance.allSettled(tasks, ["Upload raw assets", instance.moduleName]);
             if (instance.aborted) {
-                return (0, types_1.createAbortError)(true);
+                return createAbortError(true);
             }
             tasks = [];
         }
@@ -219,7 +218,7 @@ class Cloud extends core_1.ClientDb {
         if (tasks.length > 0) {
             await instance.allSettled(tasks, ["Configure bucket", instance.moduleName]);
             if (instance.aborted) {
-                return (0, types_1.createAbortError)(true);
+                return createAbortError(true);
             }
             tasks = [];
         }
@@ -229,7 +228,7 @@ class Cloud extends core_1.ClientDb {
                     document.writeFail(["Handled rejection", document.moduleName], err, { type: 64, startTime });
                 });
                 if (document.aborted) {
-                    return (0, types_1.createAbortError)(true);
+                    return createAbortError(true);
                 }
             }
         }
@@ -244,7 +243,7 @@ class Cloud extends core_1.ClientDb {
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
-            if ((0, types_1.isArray)(cloudStorage) && !(0, types_1.ignoreFlag)(item)) {
+            if (isArray(cloudStorage) && !ignoreFlag(item)) {
                 for (const data of cloudStorage) {
                     if (!instance.hasStorage('download', data)) {
                         continue;
@@ -258,8 +257,8 @@ class Cloud extends core_1.ClientDb {
                     let active = download.active, downloadUri;
                     if (pathname && path.isAbsolute(pathname)) {
                         downloadUri = path.join(pathname, filename);
-                        if (!Cloud.isPath(downloadUri) && !this.canWrite(pathname)) {
-                            instance.writeFail(["Unable to download file", filename], (0, types_1.errorValue)("Unsupported access", pathname), { type: 64, fatal: !!active, startTime });
+                        if (!_a.isPath(downloadUri) && !this.canWrite(pathname)) {
+                            instance.writeFail(["Unable to download file", filename], errorValue("Unsupported access", pathname), { type: 64, fatal: !!active, startTime });
                             continue;
                         }
                     }
@@ -267,14 +266,14 @@ class Cloud extends core_1.ClientDb {
                         downloadUri = pathname ? path.join(this.baseDirectory, pathname.replace(/^([A-Z]:)?[\\/]+/i, ''), filename) : path.join(data.admin?.preservePath && localUri ? path.dirname(localUri) : this.baseDirectory, filename);
                     }
                     const destDir = path.dirname(downloadUri);
-                    if (Cloud.isPath(downloadUri)) {
+                    if (_a.isPath(downloadUri)) {
                         if (!active && !overwrite) {
                             continue;
                         }
                         active = true;
                     }
-                    else if (!Cloud.createDir(destDir)) {
-                        instance.writeFail(["Unable to create directory", filename], (0, types_1.errorValue)("Path is not a directory", destDir), { type: 64, fatal: !!active, startTime });
+                    else if (!_a.createDir(destDir)) {
+                        instance.writeFail(["Unable to create directory", filename], errorValue("Path is not a directory", destDir), { type: 64, fatal: !!active, startTime });
                         continue;
                     }
                     else if (active) {
@@ -294,7 +293,7 @@ class Cloud extends core_1.ClientDb {
                     }
                     pending = new Set([downloadUri]);
                     download.admin = data.admin;
-                    download.flags = SERVICE_CLIENT.get(service).CLOUD_DOWNLOAD_CHUNK && (0, types_1.alignSize)(download.chunkSize) > 0 ? 4 : 0;
+                    download.flags = SERVICE_CLIENT.get(service).CLOUD_DOWNLOAD_CHUNK && alignSize(download.chunkSize) > 0 ? 4 : 0;
                     const task = instance.downloadObject(service, instance.getCredential(data), data.bucket, download, async (value) => {
                         if (instance.aborted || !value) {
                             return;
@@ -318,11 +317,11 @@ class Cloud extends core_1.ClientDb {
                                     this.addDownload(size = value.length);
                                 }
                                 this.add(destUri);
-                                this.formatMessage(64, service, ["Download success", (0, types_1.formatSize)(size)], destUri, Cloud.optionsLogMessage('DOWNLOAD'));
+                                this.formatMessage(64, service, ["Download success", formatSize(size)], destUri, _a.optionsLogMessage('DOWNLOAD'));
                                 result ||= destUri;
                             }
                             catch (err) {
-                                if (!copy && (0, types_1.isErrorCode)(err, 'EXDEV')) {
+                                if (!copy && isErrorCode(err, 'EXDEV')) {
                                     copy = true;
                                     --i;
                                 }
@@ -349,7 +348,7 @@ class Cloud extends core_1.ClientDb {
     }
     static uploadAsset(state, file, contentType, ignoreProcess) {
         let preferBuffer;
-        if ((0, types_1.isObject)(contentType)) {
+        if (isObject(contentType)) {
             ({ contentType, ignoreProcess, preferBuffer } = contentType);
         }
         else if (typeof contentType === 'boolean') {
@@ -375,7 +374,7 @@ class Cloud extends core_1.ClientDb {
                 if (client.CLOUD_UPLOAD_STREAM && upload.minStreamSize !== -1) {
                     flags |= 2;
                 }
-                if (client.CLOUD_UPLOAD_CHUNK && (0, types_1.alignSize)(upload.chunkSize) > 0) {
+                if (client.CLOUD_UPLOAD_CHUNK && alignSize(upload.chunkSize) > 0) {
                     flags |= 4;
                 }
             }
@@ -385,13 +384,13 @@ class Cloud extends core_1.ClientDb {
             const task = new Promise(resolve => {
                 const { service, bucket = state.bucketGroup, admin } = storage;
                 const credential = instance.getCredential(storage, true);
-                const minStreamSize = (0, types_1.alignSize)(upload.minStreamSize);
+                const minStreamSize = alignSize(upload.minStreamSize);
                 const uploading = [];
                 getFiles(file, upload).forEach(async (group, index) => {
                     let fileGroup;
                     if (index === 0) {
                         if (!group[0]) {
-                            instance.writeFail("Unable to read file", (0, types_1.errorValue)("File not found", service), { type: 64, fatal: true });
+                            instance.writeFail("Unable to read file", errorValue("File not found", service), { type: 64, fatal: true });
                             return;
                         }
                         if (group.length > 1) {
@@ -419,7 +418,7 @@ class Cloud extends core_1.ClientDb {
                         const localUri = group[i];
                         const exists = index === 0 || this.isPath(localUri, true);
                         if (!exists || !instance.canRead(localUri, { ownPermissionOnly: true })) {
-                            instance.writeFail(["Unable to read file", path.basename(localUri)], (0, types_1.errorValue)(!exists ? "File not found" : "Not permitted to read file", localUri), { type: 64, fatal: i === 0 && index === 0 });
+                            instance.writeFail(["Unable to read file", path.basename(localUri)], errorValue(!exists ? "File not found" : "Not permitted to read file", localUri), { type: 64, fatal: i === 0 && index === 0 });
                             continue;
                         }
                         let buffer, filename;
@@ -483,7 +482,7 @@ class Cloud extends core_1.ClientDb {
         const storage = [];
         for (const item of assets) {
             const cloudStorage = item.cloudStorage;
-            if ((0, types_1.isArray)(cloudStorage) && !(0, types_1.ignoreFlag)(item)) {
+            if (isArray(cloudStorage) && !ignoreFlag(item)) {
                 for (const data of cloudStorage) {
                     const upload = data.upload;
                     if (upload) {
@@ -505,34 +504,32 @@ class Cloud extends core_1.ClientDb {
             const current = storage[i];
             for (const data of current.cloudStorage) {
                 const trailing = data.upload;
-                if (!trailing) {
-                    continue;
-                }
-                renamed: {
+                if (trailing) {
                     const basename = trailing.filename;
                     const filename = basename || current.filename;
                     const trailingFolder = trailing.pathname || '';
                     const trailingName = this.joinPath(trailingFolder, filename);
-                    for (let j = 0; j < length - 1; ++j) {
-                        const previous = storage[j];
-                        if (current === previous) {
-                            continue;
-                        }
-                        for (const other of previous.cloudStorage) {
-                            const leading = other.upload;
-                            if (leading && hasSameBucket(data, other)) {
-                                const leadingFolder = leading.pathname || '';
-                                if (basename && basename === leading.filename && leadingFolder === trailingFolder) {
-                                    renameTrailing(nameIndex, trailing, trailingFolder, basename);
-                                    break renamed;
-                                }
-                                const leadingName = this.joinPath(leadingFolder, leading.filename || previous.filename);
-                                if (trailingName === leadingName) {
-                                    if (!trailing.overwrite || leading.overwrite) {
-                                        renameTrailing(nameIndex, trailing, trailingFolder, filename);
-                                        break renamed;
+                    renamed: {
+                        for (let j = 0; j < length - 1; ++j) {
+                            const previous = storage[j];
+                            if (current !== previous) {
+                                for (const other of previous.cloudStorage) {
+                                    const leading = other.upload;
+                                    if (leading && fromSameBucket(data, other)) {
+                                        const leadingFolder = leading.pathname || '';
+                                        if (basename && basename === leading.filename && leadingFolder === trailingFolder) {
+                                            renameTrailing(nameIndex, trailing, trailingFolder, basename);
+                                            break renamed;
+                                        }
+                                        const leadingName = this.joinPath(leadingFolder, leading.filename || previous.filename);
+                                        if (trailingName === leadingName) {
+                                            if (!trailing.overwrite || leading.overwrite) {
+                                                renameTrailing(nameIndex, trailing, trailingFolder, filename);
+                                                break renamed;
+                                            }
+                                            leading.filename = assignFilename(leading.filename || previous.filename);
+                                        }
                                     }
-                                    leading.filename = assignFilename(leading.filename || previous.filename);
                                 }
                             }
                         }
@@ -560,7 +557,7 @@ class Cloud extends core_1.ClientDb {
     }
     async createBucket(service, credential, bucket, acl, options) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const client = this.getClient(service);
         try {
@@ -578,14 +575,14 @@ class Cloud extends core_1.ClientDb {
             }
         }
         catch (err) {
-            this.formatMessage(64, service, ["Unable to create bucket", bucket], err, Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ["Unable to create bucket", bucket], err, _a.optionsLogMessage('WARN'));
             throw err;
         }
-        throw (0, types_1.errorMessage)(service, "Create bucket not supported");
+        throw errorMessage(service, "Create bucket not supported");
     }
     async setBucketPolicy(service, credential, bucket, options) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const handler = this.getClient(service).setBucketPolicy?.bind(this);
         if (handler) {
@@ -593,15 +590,15 @@ class Cloud extends core_1.ClientDb {
                 return handler.call(this, credential, bucket, options);
             }
             catch (err) {
-                this.formatMessage(64, service, ["Unable to update bucket policy", bucket], err, Cloud.optionsLogMessage('WARN'));
+                this.formatMessage(64, service, ["Unable to update bucket policy", bucket], err, _a.optionsLogMessage('WARN'));
                 throw err;
             }
         }
-        throw (0, types_1.errorMessage)(service, "Bucket policy not supported");
+        throw errorMessage(service, "Bucket policy not supported");
     }
     async setBucketTagging(service, credential, bucket, options) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const handler = this.getClient(service).setBucketTagging?.bind(this);
         if (handler) {
@@ -609,15 +606,15 @@ class Cloud extends core_1.ClientDb {
                 return handler.call(this, credential, bucket, options);
             }
             catch (err) {
-                this.formatMessage(64, service, ["Unable to update bucket tagging", bucket], err, Cloud.optionsLogMessage('WARN'));
+                this.formatMessage(64, service, ["Unable to update bucket tagging", bucket], err, _a.optionsLogMessage('WARN'));
                 throw err;
             }
         }
-        throw (0, types_1.errorMessage)(service, "Bucket tagging not supported");
+        throw errorMessage(service, "Bucket tagging not supported");
     }
     async setBucketWebsite(service, credential, bucket, options) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const handler = this.getClient(service).setBucketWebsite?.bind(this);
         if (handler) {
@@ -625,53 +622,53 @@ class Cloud extends core_1.ClientDb {
                 return handler.call(this, credential, bucket, options);
             }
             catch (err) {
-                this.formatMessage(64, service, ["Unable to configure bucket", bucket], err, Cloud.optionsLogMessage('WARN'));
+                this.formatMessage(64, service, ["Unable to configure bucket", bucket], err, _a.optionsLogMessage('WARN'));
                 throw err;
             }
         }
-        throw (0, types_1.errorMessage)(service, "Set bucket website not supported");
+        throw errorMessage(service, "Set bucket website not supported");
     }
     async deleteObjects(service, credential, bucket, options = true) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const client = this.getClient(service);
         const handlerV3 = client.deleteObjectsV3?.bind(this);
         if (handlerV3) {
             return handlerV3.call(this, credential, bucket, typeof options === 'boolean' ? { recursive: options } : options, service).catch((err) => {
-                errorResponse(this, service, bucket, err);
+                this.#errorResponse(service, bucket, err);
+            });
+        }
+        const handlerV1 = client.deleteObjects?.bind(this);
+        if (handlerV1) {
+            return handlerV1.call(this, credential, bucket, typeof options === 'boolean' ? { recursive: options } : options, service).catch((err) => {
+                this.#errorResponse(service, bucket, err);
             });
         }
-        const recursive = (0, types_1.isObject)(options) ? options.recursive : options;
+        const recursive = isObject(options) ? options.recursive : options;
         const handlerV2 = client.deleteObjectsV2?.bind(this);
         if (handlerV2) {
             return handlerV2.call(this, credential, bucket, recursive ?? true, service).catch((err) => {
-                errorResponse(this, service, bucket, err);
+                this.#errorResponse(service, bucket, err);
             });
         }
-        const handlerV1 = client.deleteObjects?.bind(this);
-        if (handlerV1) {
-            return handlerV1.call(this, credential, bucket, service, undefined, recursive).catch((err) => {
-                errorResponse(this, service, bucket, err);
-            });
-        }
-        throw (0, types_1.errorMessage)(service, "Delete objects not supported");
+        throw errorMessage(service, "Delete objects not supported");
     }
     async copyObject(service, credential, bucketSource, keySource, bucket, key, options) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const handler = this.getClient(service).copyObject?.bind(this);
         if (handler) {
             return handler.call(this, credential, bucketSource, keySource, bucket, key, options, service).catch((err) => {
-                errorResponse(this, service, bucket, err);
+                this.#errorResponse(service, bucket, err);
             });
         }
-        throw (0, types_1.errorMessage)(service, "Copy object not supported");
+        throw errorMessage(service, "Copy object not supported");
     }
     async uploadObject(service, credential, bucket, upload, localUri, beforeResolve) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         try {
             const handler = this.getUploadHandler(service, credential).bind(this);
@@ -681,7 +678,7 @@ class Cloud extends core_1.ClientDb {
                     if (err) {
                         reject(errorObject(err, service, "Upload failed"));
                     }
-                    else if ((0, types_1.isString)(value)) {
+                    else if (isString(value)) {
                         if (beforeResolve) {
                             await beforeResolve(value);
                         }
@@ -690,21 +687,21 @@ class Cloud extends core_1.ClientDb {
                         resolve(value);
                     }
                     else {
-                        reject((0, types_1.errorMessage)(service, "Upload failed"));
+                        reject(errorMessage(service, "Upload failed"));
                     }
                 });
             });
         }
         catch (err) {
-            this.formatMessage(64, service, ["Upload function not supported", bucket], localUri, Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ["Upload function not supported", bucket], localUri, _a.optionsLogMessage('WARN'));
             throw err;
         }
     }
     async downloadObject(service, credential, bucket, download, beforeResolve) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
-        if ((service === 'gcp' || service === 'gcloud') && (0, types_1.isPlainObject)(credential)) {
+        if ((service === 'gcp' || service === 'gcloud') && isPlainObject(credential)) {
             credential.storageBucket ||= bucket;
         }
         try {
@@ -717,30 +714,30 @@ class Cloud extends core_1.ClientDb {
                     else if (value) {
                         if (beforeResolve) {
                             const output = await beforeResolve(value);
-                            if ((0, types_1.isString)(output)) {
+                            if (isString(output)) {
                                 value = output;
                             }
                         }
-                        if ((0, types_1.isString)(value) && path.isAbsolute(value)) {
+                        if (isString(value) && path.isAbsolute(value)) {
                             this.addLog(4, 'downloadObject: ' + bucket, service, value);
                             this.downloaded.push(value);
                         }
                         resolve(value);
                     }
                     else {
-                        reject((0, types_1.errorMessage)(service, "Download failed"));
+                        reject(errorMessage(service, "Download failed"));
                     }
                 });
             });
         }
         catch (err) {
-            this.formatMessage(64, service, ["Download function not supported", bucket], Cloud.joinPath(download.pathname, download.filename), Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ["Download function not supported", bucket], _a.joinPath(download.pathname, download.filename), _a.optionsLogMessage('WARN'));
             throw err;
         }
     }
     async getDatabaseRows(item, ignoreErrors, sessionKey) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         if (typeof ignoreErrors === 'string') {
             sessionKey = ignoreErrors;
@@ -752,7 +749,7 @@ class Cloud extends core_1.ClientDb {
             if (client?.executeQuery) {
                 const credential = this.getCredential(item);
                 if (item.options && this.hasCoerce(service, 'options', credential)) {
-                    (0, types_1.coerceObject)(item.options);
+                    coerceObject(item.options);
                 }
                 if (ignoreErrors) {
                     return client.executeQuery.call(this, credential, item, sessionKey);
@@ -761,17 +758,17 @@ class Cloud extends core_1.ClientDb {
                     return await client.executeQuery.call(this, credential, item, sessionKey);
                 }
                 catch (err) {
-                    this.formatFail(64, service, "Unable to execute query", err, Cloud.optionsLogMessage('FAIL'));
+                    this.formatFail(64, service, "Unable to execute query", err, _a.optionsLogMessage('FAIL'));
                     throw err;
                 }
             }
-            throw (0, types_1.errorMessage)(service, "Execute query not supported");
+            throw errorMessage(service, "Execute query not supported");
         }
-        throw (0, types_1.errorMessage)(service, "Invalid credentials");
+        throw errorMessage(service, "Invalid credentials");
     }
     async getDatabaseBatchRows(batch, ignoreErrors, sessionKey) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         if (typeof ignoreErrors === 'string') {
             sessionKey = ignoreErrors;
@@ -786,7 +783,7 @@ class Cloud extends core_1.ClientDb {
                 if (this.hasCoerce(service, 'options', credential)) {
                     for (const item of batch) {
                         if (item.options) {
-                            (0, types_1.coerceObject)(item.options);
+                            coerceObject(item.options);
                         }
                     }
                 }
@@ -797,28 +794,28 @@ class Cloud extends core_1.ClientDb {
                     return await client.executeBatchQuery.call(this, credential, batch, sessionKey);
                 }
                 catch (err) {
-                    this.formatFail(64, service, "Unable to execute query", err, Cloud.optionsLogMessage('FAIL'));
+                    this.formatFail(64, service, "Unable to execute query", err, _a.optionsLogMessage('FAIL'));
                     throw err;
                 }
             }
-            throw (0, types_1.errorMessage)(service, "Execute query not supported");
+            throw errorMessage(service, "Execute query not supported");
         }
-        throw (0, types_1.errorMessage)(service, "Invalid credentials");
+        throw errorMessage(service, "Invalid credentials");
     }
     getCredential(item, unused) {
         const service = item.service;
         let credential = item.credential, stored = false;
         if (typeof credential === 'string') {
             const settings = this.getSettings(service);
-            if ((0, types_1.isPlainObject)(settings)) {
+            if (isPlainObject(settings)) {
                 credential = settings[credential];
                 stored = true;
             }
         }
-        if ((0, types_1.isPlainObject)(credential)) {
+        if (isPlainObject(credential)) {
             item.credential = credential;
             if (this.settingsOf(service, 'coerce', 'credential') === true) {
-                (0, types_1.coerceObject)(credential, stored);
+                coerceObject(credential, stored);
             }
             return unused ? credential : { ...credential };
         }
@@ -828,7 +825,7 @@ class Cloud extends core_1.ClientDb {
         return this.module[service];
     }
     getStorage(action, data) {
-        if ((0, types_1.isArray)(data)) {
+        if (isArray(data)) {
             for (const item of data) {
                 const service = this.hasStorage(action, item);
                 if (service && service.active) {
@@ -863,7 +860,7 @@ class Cloud extends core_1.ClientDb {
             }
         }
         catch (err) {
-            this.formatFail(64, data.service, "Cloud provider not found", err, Cloud.optionsLogMessage('FAIL'));
+            this.formatFail(64, data.service, "Cloud provider not found", err, _a.optionsLogMessage('FAIL'));
         }
         return false;
     }
@@ -876,7 +873,7 @@ class Cloud extends core_1.ClientDb {
     resolveService(service, folder) {
         let result;
         if (!service.startsWith('@')) {
-            result = this.settings.imports?.[service] || types_1.IMPORT_MAP[service];
+            result = this.settings.imports?.[service] || IMPORT_MAP[service];
         }
         else {
             folder ||= 'client';
@@ -885,11 +882,11 @@ class Cloud extends core_1.ClientDb {
     }
     settingsOf(service, name, component) {
         const result = this.settings[service]?.[name];
-        return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
+        return component ? isObject(result) ? result[component] : undefined : result;
     }
     async commit() {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const items = this.pending.filter(item => !item.document).map(async (data) => {
             data.ignoreCache ??= true;
@@ -909,9 +906,15 @@ class Cloud extends core_1.ClientDb {
                 return client;
             }
         }
-        catch {
+        catch (err) {
+            this.addLog(3, err, service);
         }
-        throw service ? (0, types_1.errorMessage)(service, "Cloud provider not found") : (0, types_1.errorValue)("Cloud provider not found");
+        throw service ? errorMessage(service, "Cloud provider not found") : errorValue("Cloud provider not found");
+    }
+    #errorResponse(service, bucket, err) {
+        this.formatMessage(64, service, ["Unable to empty bucket", bucket], err, _a.optionsLogMessage('WARN'));
     }
 }
+_a = Cloud;
+
 module.exports = Cloud;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.13.9",
+  "version": "0.14.0",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,9 +19,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.13.9",
-    "@e-mc/db": "0.13.9",
-    "@e-mc/types": "0.13.9",
+    "@e-mc/core": "0.14.0",
+    "@e-mc/db": "0.14.0",
+    "@e-mc/types": "0.14.0",
     "mime-types": "^3.0.2"
   }
 }

package/types/index.d.ts

@@ -18,10 +18,11 @@ export interface ICloudServiceClient<T extends CloudDatabase = CloudDatabase, U
     setBucketPolicy?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
     setBucketTagging?(this: IModule, credential: U, bucket: string, options: unknown, service?: string, sdk?: string): Promise<boolean>;
     setBucketWebsite?(this: IModule, credential: U, bucket: string, options: BucketWebsiteOptions, service?: string, sdk?: string): Promise<boolean>;
-    /** @deprecated */
-    deleteObjects?(this: IModule, credential: U, bucket: string, service?: string, sdk?: string, recursive?: boolean): Promise<void>;
+    copyObject?(this: IModule, credential: U, bucketSource: string, keySource: string, bucket: string, key: string, options?: unknown, service?: string, sdk?: string): Promise<void>;
+    deleteObjects?(this: IModule, credential: U, bucket: string, options?: DeleteObjectsOptions, service?: string, sdk?: string): Promise<void>;
     /** @deprecated */
     deleteObjectsV2?(this: IModule, credential: U, bucket: string, recursive?: boolean, service?: string, sdk?: string): Promise<void>;
+    /** @deprecated */
     deleteObjectsV3?(this: IModule, credential: U, bucket: string, options?: DeleteObjectsOptions, service?: string, sdk?: string): Promise<void>;
     copyObject?(this: IModule, credential: U, bucketSource: string, keySource: string, bucket: string, key: string, options?: unknown, service?: string, sdk?: string): Promise<void>;
     executeQuery?(this: ICloud, credential: V, data: T, sessionKey?: string): Promise<QueryResult>;

package/util.d.ts

@@ -5,8 +5,19 @@ import type { AuthValue } from '@e-mc/types/lib/http';
 import type { Readable } from 'node:stream';
 
 declare namespace util {
+    interface CreateKeyAndBodyOptions {
+        errorCallback?: FunctionReturn<void>;
+        descendantsGroup?: string[];
+        flags?: number;
+        chunkSize?: number;
+        mimeType?: string;
+    }
+
     function readableAsBuffer(from: Readable): Promise<Buffer | null>;
-    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionType<void>, errorCallback?: FunctionType<void> | number, flags?: number): [string[], T[], string[]];
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], options: CreateKeyAndBodyOptions): [string[], T[], string[]];
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], errorCallback: FunctionReturn<void>, flags?: number): [string[], T[], string[]];
+    /** @deprecated options */
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionReturn<void>, errorCallback?: FunctionReturn<void> | number, flags?: number, descendantsGroup?: string[]): [string[], T[], string[]];
     function createErrorHandler(instance: IModule, service: string, bucket: string): (err: unknown) => void;
     function generateFilename(filename: string): (i: number) => [string, boolean];
     function getBasicAuth(auth: AuthValue): string;

package/util.js

@@ -1,23 +1,15 @@
 "use strict";
-exports.hasBasicAuth = exports.getBasicAuth = void 0;
-exports.readableAsBuffer = readableAsBuffer;
-exports.createKeyAndBody = createKeyAndBody;
-exports.createErrorHandler = createErrorHandler;
-exports.intoArray = intoArray;
-exports.generateFilename = generateFilename;
-exports.formatError = formatError;
-const path = require("node:path");
-const fs = require("node:fs");
-const stream = require("node:stream");
-const mime = require("mime-types");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-Object.defineProperty(exports, "getBasicAuth", { enumerable: true, get: function () { return util_1.getBasicAuth; } });
-Object.defineProperty(exports, "hasBasicAuth", { enumerable: true, get: function () { return util_1.hasBasicAuth; } });
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const mime = require('mime-types');
+const { errorMessage, incrementUUID, isObject, isPlainObject } = require('@e-mc/types');
+const { getBasicAuth, hasBasicAuth } = require('@e-mc/db/util');
 async function readableAsBuffer(from) {
     return new Promise((resolve, reject) => {
         let result = null;
-        from.on('data', chunk => {
+        from.on('data', (chunk) => {
             if (!Buffer.isBuffer(chunk)) {
                 chunk = Buffer.from(chunk);
             }
@@ -30,21 +22,26 @@ async function readableAsBuffer(from) {
             .read();
     });
 }
-function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags = 0) {
+function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags = 0, descendantsGroup) {
     let mimeType;
-    switch (typeof chunkSize) {
-        case 'function':
-            errorCallback = chunkSize;
-            chunkSize = 0;
-            break;
-        case 'string':
-            mimeType = chunkSize;
-            chunkSize = 0;
-            break;
+    if (isPlainObject(chunkSize)) {
+        ({ errorCallback, mimeType, descendantsGroup, chunkSize = 0, flags = 0 } = chunkSize);
     }
-    if (typeof errorCallback === 'number') {
-        flags = errorCallback;
-        errorCallback = undefined;
+    else {
+        switch (typeof chunkSize) {
+            case 'function':
+                errorCallback = chunkSize;
+                chunkSize = 0;
+                break;
+            case 'string':
+                mimeType = chunkSize;
+                chunkSize = 0;
+                break;
+        }
+        if (typeof errorCallback === 'number') {
+            flags = errorCallback;
+            errorCallback = undefined;
+        }
     }
     const key = [];
     const body = [];
@@ -105,9 +102,9 @@ function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags =
             }
             if (target) {
                 const output = filename + ext;
-                key.push(ext === '.map' && localFile ? path.basename(localFile) : output);
+                key.push(Array.isArray(descendantsGroup) && descendantsGroup.includes(ext) && localFile ? path.basename(localFile) : output);
                 body.push(target);
-                type.push(ext !== '.map' && mime.lookup(output) || mimeType || "application/octet-stream");
+                type.push(type.length === 0 && mimeType ? mimeType : mime.lookup(output) || "application/octet-stream");
             }
         }
         catch (err) {
@@ -134,20 +131,29 @@ function generateFilename(filename) {
             const type = /\.[a-z0-9]+\.[a-z0-9]+$/i.exec(filename);
             const j = type ? type.index : filename.lastIndexOf('.');
             if (j !== -1) {
-                const match = /^(.+)_(\d+)$/.exec(basename = filename.substring(0, j));
+                const match = /^(.+)_(\d+)$/.exec(basename = filename.slice(0, j));
                 if (match) {
                     basename = match[1];
                     i = parseInt(match[2]) + 1;
                 }
-                suffix = filename.substring(j);
+                suffix = filename.slice(j);
             }
         }
-        return basename && suffix ? [basename + `_${i}` + suffix, true] : [(0, types_1.incrementUUID)() + path.extname(filename), false];
+        return basename && suffix ? [basename + `_${i}` + suffix, true] : [incrementUUID() + path.extname(filename), false];
     };
 }
 function formatError(title, value, hint) {
-    if ((0, types_1.isObject)(title)) {
+    if (isObject(title)) {
         title = title.service;
     }
-    return (0, types_1.errorMessage)(typeof title === 'string' ? title : '', value, hint);
+    return errorMessage(typeof title === 'string' ? title : '', value, hint);
 }
+
+exports.createErrorHandler = createErrorHandler;
+exports.createKeyAndBody = createKeyAndBody;
+exports.formatError = formatError;
+exports.generateFilename = generateFilename;
+exports.getBasicAuth = getBasicAuth;
+exports.hasBasicAuth = hasBasicAuth;
+exports.intoArray = intoArray;
+exports.readableAsBuffer = readableAsBuffer;