@e-mc/cloud 0.9.7 → 0.10.0

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.0/lib/index.d.ts)
 
 ```typescript
 import type { IHost, IScopeOrigin } from "./index";
@@ -57,10 +57,10 @@ interface CloudConstructor extends ClientDbConstructor<IHost> {
     LOG_CLOUD_DOWNLOAD: LogMessageOptions;
     LOG_CLOUD_DELETE: LogMessageOptions;
     LOG_CLOUD_DELAYED: LogMessageOptions;
-    finalize(this: IHost, instance: ICloud): Promise<unknown>;
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, options: UploadAssetOptions): Promise<unknown>[];
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, ignoreProcess: boolean): Promise<unknown>[];
-    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, contentType?: string, ignoreProcess?: boolean): Promise<unknown>[];
+    finalize(this: IHost, instance: ICloud): Promise<void>;
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, options: UploadAssetOptions): Promise<void>[];
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, ignoreProcess: boolean): Promise<void>[];
+    uploadAsset(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, contentType?: string, ignoreProcess?: boolean): Promise<void>[];
     sanitizeAssets(assets: ExternalAsset[]): ExternalAsset[];
     readonly prototype: ICloud;
     new(module?: CloudModule, database?: CloudDatabase[], ...args: unknown[]): ICloud;
@@ -174,12 +174,12 @@ const rows = await instance.getDatabaseRows({ service: "aws-v3", credential: "ma
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.0/lib/settings.d.ts
 
 ## LICENSE
 

package/index.d.ts

@@ -1,6 +1,6 @@
-import type { CloudConstructor, IFileManager } from '../types/lib';
-import type { CloudAsset } from '../types/lib/cloud';
-
-declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
-
+import type { CloudConstructor, IFileManager } from '../types/lib';
+import type { CloudAsset } from '../types/lib/cloud';
+
+declare const Cloud: CloudConstructor<IFileManager<CloudAsset>>;
+
 export = Cloud;

package/index.js

@@ -1,9 +1,9 @@
 "use strict";
 const path = require("path");
 const fs = require("fs");
-const types_1 = require("@e-mc/types");
+const crypto = require("crypto");
 const core_1 = require("@e-mc/core");
-const util_1 = require("@e-mc/cloud/util");
+const types_1 = require("@e-mc/types");
 const SERVICE_CLIENT = new Map();
 const SERVICE_UPLOAD = {};
 const SERVICE_DOWNLOAD = {};
@@ -32,14 +32,34 @@ function getFiles(file, data) {
         if (file.torrentFiles) {
             individual.push(...file.torrentFiles);
         }
-        if (individual.length) {
+        if (individual.length > 0) {
             return [grouped, Array.from(new Set(individual))];
         }
     }
     return [grouped];
 }
+function createUploadCallback(state, file, active) {
+    return async (value) => {
+        if ((0, types_1.isString)(value)) {
+            for (const { instance: document } of state.host.Document) {
+                if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
+                    return;
+                }
+            }
+        }
+    };
+}
+function renameTrailing(map, item, folder, value) {
+    const location = folder + value;
+    map[location] || (map[location] = 1);
+    const index = value.indexOf('.');
+    item.filename = (index !== -1 ? value.substring(0, index) : value) + '_' + map[location]++ + (index !== -1 ? value.substring(index) : '');
+}
+function errorResponse(instance, service, bucket, err) {
+    instance.formatMessage(64, service, ["Unable to empty bucket", bucket], err, { ...Cloud.LOG_CLOUD_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) => (0, types_1.generateUUID)() + (path.extname(value) || '');
+const assignFilename = (value) => crypto.randomUUID() + (path.extname(value) || '');
 class Cloud extends core_1.ClientDb {
     constructor() {
         super(...arguments);
@@ -54,7 +74,7 @@ class Cloud extends core_1.ClientDb {
         }
         Cloud.sanitizeAssets(this.assets);
         const localStorage = new Map();
-        const bucketGroup = (0, types_1.generateUUID)();
+        const bucketGroup = crypto.randomUUID();
         const state = { host: this, instance, bucketGroup, localStorage };
         const bucketDelete = {};
         const bucketPolicy = {};
@@ -72,7 +92,9 @@ class Cloud extends core_1.ClientDb {
             const cloudStorage = item.cloudStorage;
             if ((0, types_1.isArray)(cloudStorage) && !(0, types_1.ignoreFlag)(item.flags)) {
                 if (item.invalid) {
-                    cloudStorage.forEach(storage => instance.formatMessage(64, storage.service, ["Upload failed", storage.bucket], (0, types_1.errorValue)("File not found", item.uri || item.filename || "Unknown"), { ...Cloud.LOG_CLOUD_WARN }));
+                    cloudStorage.forEach(storage => {
+                        instance.formatMessage(64, storage.service, ["Upload failed", storage.bucket], (0, types_1.errorValue)("File not found", item.uri || item.filename || "Unknown"), { ...Cloud.LOG_CLOUD_WARN });
+                    });
                     continue;
                 }
                 resume: {
@@ -119,8 +141,8 @@ class Cloud extends core_1.ClientDb {
                 }
             }
         }
-        if (tasks.length) {
-            await instance.allSettled(tasks, ['Compress files', instance.moduleName]);
+        if (tasks.length > 0) {
+            await instance.allSettled(tasks, ["Compress files", instance.moduleName]);
             if (instance.aborted) {
                 return (0, types_1.createAbortError)(true);
             }
@@ -130,22 +152,26 @@ class Cloud extends core_1.ClientDb {
             const map = bucketDelete[service];
             for (const bucket in map) {
                 const [credential, recursive] = map[bucket];
-                tasks.push(instance.deleteObjects(service, credential, bucket, recursive).catch((err) => instance.writeFail(["Unable to empty bucket", service + ': ' + bucket], err, { type: 64, startTime })));
+                tasks.push(instance.deleteObjects(service, credential, bucket, recursive).catch((err) => {
+                    instance.writeFail(["Unable to empty bucket", service + ': ' + bucket], err, { type: 64, startTime });
+                }));
             }
         }
-        if (tasks.length) {
-            await instance.allSettled(tasks, ['Empty bucket', instance.moduleName]);
+        if (tasks.length > 0) {
+            await instance.allSettled(tasks, ["Empty bucket", instance.moduleName]);
             if (instance.aborted) {
                 return (0, types_1.createAbortError)(true);
             }
             tasks = [];
         }
-        if (rawFiles.length) {
+        if (rawFiles.length > 0) {
             const options = { preferBuffer: process.env.EMC_CLOUD_UPLOAD_BUFFER === 'true' };
-            rawFiles.forEach(item => tasks.push(...Cloud.uploadAsset(state, item, options)));
+            rawFiles.forEach(item => {
+                tasks.push(...Cloud.uploadAsset(state, item, options));
+            });
         }
-        if (tasks.length) {
-            await instance.allSettled(tasks, ['Upload raw assets', instance.moduleName]);
+        if (tasks.length > 0) {
+            await instance.allSettled(tasks, ["Upload raw assets", instance.moduleName]);
             if (instance.aborted) {
                 return (0, types_1.createAbortError)(true);
             }
@@ -155,18 +181,22 @@ class Cloud extends core_1.ClientDb {
             const map = bucketPolicy[service];
             for (const bucket in map) {
                 const [credential, options] = map[bucket];
-                tasks.push(instance.setBucketPolicy(service, credential, bucket, options).catch((err) => instance.writeFail(["Unable to update bucket policy", service + ': ' + bucket], err, { type: 64, startTime })));
+                tasks.push(instance.setBucketPolicy(service, credential, bucket, options).catch((err) => {
+                    instance.writeFail(["Unable to update bucket policy", service + ': ' + bucket], err, { type: 64, startTime });
+                }));
             }
         }
         for (const service in bucketTagging) {
             const map = bucketTagging[service];
             for (const bucket in map) {
                 const [credential, options] = map[bucket];
-                tasks.push(instance.setBucketTagging(service, credential, bucket, options).catch((err) => instance.writeFail(["Unable to update bucket tagging", service + ': ' + bucket], err, { type: 64, startTime })));
+                tasks.push(instance.setBucketTagging(service, credential, bucket, options).catch((err) => {
+                    instance.writeFail(["Unable to update bucket tagging", service + ': ' + bucket], err, { type: 64, startTime });
+                }));
             }
         }
-        if (tasks.length) {
-            await instance.allSettled(tasks, ['Configure bucket', instance.moduleName]);
+        if (tasks.length > 0) {
+            await instance.allSettled(tasks, ["Configure bucket", instance.moduleName]);
             if (instance.aborted) {
                 return (0, types_1.createAbortError)(true);
             }
@@ -174,14 +204,22 @@ class Cloud extends core_1.ClientDb {
         }
         for (const { instance: document } of this.Document) {
             if (document.cloudFinalize) {
-                await document.cloudFinalize(state).catch((err) => document.writeFail(["Handled rejection", document.moduleName], err, { type: 64, startTime }));
+                await document.cloudFinalize(state).catch((err) => {
+                    document.writeFail(["Handled rejection", document.moduleName], err, { type: 64, startTime });
+                });
                 if (document.aborted) {
                     return (0, types_1.createAbortError)(true);
                 }
             }
         }
         for (const [item, data] of localStorage) {
-            getFiles(item, data).forEach(group => group.forEach(value => value && this.deleteFile(value, { emptyDir: true })));
+            getFiles(item, data).forEach(group => {
+                group.forEach(value => {
+                    if (value) {
+                        this.deleteFile(value, { emptyDir: true });
+                    }
+                });
+            });
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
@@ -274,7 +312,9 @@ class Cloud extends core_1.ClientDb {
                         }
                         return result;
                     })
-                        .catch((err) => instance.writeFail(["Download failed", path.basename(downloadUri)], err, { type: 64, startTime }));
+                        .catch((err) => {
+                        instance.writeFail(["Download failed", path.basename(downloadUri)], err, { type: 64, startTime });
+                    });
                     if (active || waitStatus || this.incremental === "staging") {
                         tasks.push(task);
                     }
@@ -282,8 +322,8 @@ class Cloud extends core_1.ClientDb {
                 }
             }
         }
-        if (tasks.length) {
-            return instance.allSettled(tasks, ['Download objects', instance.moduleName]);
+        if (tasks.length > 0) {
+            await instance.allSettled(tasks, ["Download objects", instance.moduleName]);
         }
     }
     static uploadAsset(state, file, contentType, ignoreProcess) {
@@ -321,15 +361,6 @@ class Cloud extends core_1.ClientDb {
             if (active && upload.localStorage === false) {
                 state.localStorage.set(file, upload);
             }
-            const callback = async (value) => {
-                if ((0, types_1.isString)(value) && !ignoreProcess) {
-                    for (const { instance: document } of host.Document) {
-                        if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
-                            return;
-                        }
-                    }
-                }
-            };
             const task = new Promise(resolve => {
                 const { service, bucket = state.bucketGroup, admin } = storage;
                 const credential = instance.getCredential(storage, true);
@@ -398,18 +429,19 @@ class Cloud extends core_1.ClientDb {
                                 }
                             }
                         }
-                        else {
-                            contentType = this.lookupMime(path.basename(localUri)) || file.mimeType;
-                        }
                         const options = { ...upload, buffer, filename, fileGroup, admin, flags };
                         if (index > 0 || !options.contentType) {
-                            options.contentType = contentType;
+                            options.contentType = index === 0 && contentType || this.lookupMime(path.basename(localUri)) || "application/octet-stream";
                         }
-                        uploading.push(instance.uploadObject(service, { ...credential }, bucket, options, localUri, callback)
-                            .catch((err) => instance.writeFail(["Upload failed", path.basename(localUri)], err, { type: 64, fatal: i === 0 && index === 0 })));
+                        uploading.push(instance.uploadObject(service, { ...credential }, bucket, options, localUri, !ignoreProcess ? createUploadCallback(state, file, active) : undefined)
+                            .catch((err) => {
+                            instance.writeFail(["Upload failed", path.basename(localUri)], err, { type: 64, fatal: i === 0 && index === 0 });
+                        }));
                     }
                 });
-                instance.allSettled(uploading, [`Upload file "${contentType || "Unknown"}"`, storage.service + ': ' + path.basename(file.localUri)]).then(() => resolve());
+                void instance.allSettled(uploading, [`Upload file "${contentType || "Unknown"}"`, storage.service + ': ' + path.basename(file.localUri)]).then(() => {
+                    resolve();
+                });
             });
             if (active) {
                 tasks.push(task);
@@ -460,20 +492,14 @@ class Cloud extends core_1.ClientDb {
                             const leading = other.upload;
                             if (leading && hasSameBucket(data, other)) {
                                 const leadingFolder = leading.pathname || '';
-                                const renameTrailing = (value) => {
-                                    const location = trailingFolder + value;
-                                    nameIndex[location] || (nameIndex[location] = 1);
-                                    const index = value.indexOf('.');
-                                    trailing.filename = (index !== -1 ? value.substring(0, index) : value) + '_' + nameIndex[location]++ + (index !== -1 ? value.substring(index) : '');
-                                };
                                 if (basename && basename === leading.filename && leadingFolder === trailingFolder) {
-                                    renameTrailing(basename);
+                                    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(filename);
+                                        renameTrailing(nameIndex, trailing, trailingFolder, filename);
                                         break renamed;
                                     }
                                     leading.filename = assignFilename(leading.filename || previous.filename);
@@ -499,115 +525,93 @@ class Cloud extends core_1.ClientDb {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
+        const client = this.getClient(service);
         try {
-            const client = this.getClient(service);
-            try {
-                if (publicRead === undefined || typeof publicRead === 'boolean') {
-                    const handler = client.createBucket?.bind(this);
-                    if (handler) {
-                        return handler.call(this, credential, bucket, publicRead);
-                    }
-                }
-                else {
-                    const handler = client.createBucketV2?.bind(this);
-                    if (handler) {
-                        return handler.call(this, credential, bucket, publicRead, options);
-                    }
+            if (publicRead === undefined || typeof publicRead === 'boolean') {
+                const handler = client.createBucket?.bind(this);
+                if (handler) {
+                    return handler.call(this, credential, bucket, publicRead);
                 }
-                return Promise.reject((0, types_1.errorMessage)(service, "Create bucket not supported"));
             }
-            catch (err) {
-                this.formatMessage(64, service, ["Unable to create bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
-                return Promise.reject(err);
+            else {
+                const handler = client.createBucketV2?.bind(this);
+                if (handler) {
+                    return handler.call(this, credential, bucket, publicRead, options);
+                }
             }
         }
         catch (err) {
-            return Promise.reject(err);
+            this.formatMessage(64, service, ["Unable to create bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+            throw err;
         }
+        throw (0, types_1.errorMessage)(service, "Create bucket not supported");
     }
     async setBucketPolicy(service, credential, bucket, options) {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        try {
-            const handler = this.getClient(service).setBucketPolicy?.bind(this);
-            if (handler) {
-                try {
-                    return handler.call(this, credential, bucket, options);
-                }
-                catch (err) {
-                    this.formatMessage(64, service, ["Unable to update bucket policy", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
-                    return Promise.reject(err);
-                }
+        const handler = this.getClient(service).setBucketPolicy?.bind(this);
+        if (handler) {
+            try {
+                return handler.call(this, credential, bucket, options);
+            }
+            catch (err) {
+                this.formatMessage(64, service, ["Unable to update bucket policy", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                throw err;
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Bucket policy not supported"));
-        }
-        catch (err) {
-            return Promise.reject(err);
         }
+        throw (0, types_1.errorMessage)(service, "Bucket policy not supported");
     }
     async setBucketTagging(service, credential, bucket, options) {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        try {
-            const handler = this.getClient(service).setBucketTagging?.bind(this);
-            if (handler) {
-                try {
-                    return handler.call(this, credential, bucket, options);
-                }
-                catch (err) {
-                    this.formatMessage(64, service, ["Unable to update bucket tagging", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
-                    return Promise.reject(err);
-                }
+        const handler = this.getClient(service).setBucketTagging?.bind(this);
+        if (handler) {
+            try {
+                return handler.call(this, credential, bucket, options);
+            }
+            catch (err) {
+                this.formatMessage(64, service, ["Unable to update bucket tagging", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                throw err;
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Bucket tagging not supported"));
-        }
-        catch (err) {
-            return Promise.reject(err);
         }
+        throw (0, types_1.errorMessage)(service, "Bucket tagging not supported");
     }
     async setBucketWebsite(service, credential, bucket, options) {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        try {
-            const handler = this.getClient(service).setBucketWebsite?.bind(this);
-            if (handler) {
-                try {
-                    return handler.call(this, credential, bucket, options);
-                }
-                catch (err) {
-                    this.formatMessage(64, service, ["Unable to configure bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
-                    return Promise.reject(err);
-                }
+        const handler = this.getClient(service).setBucketWebsite?.bind(this);
+        if (handler) {
+            try {
+                return handler.call(this, credential, bucket, options);
+            }
+            catch (err) {
+                this.formatMessage(64, service, ["Unable to configure bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                throw err;
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Set bucket website not supported"));
-        }
-        catch (err) {
-            return Promise.reject(err);
         }
+        throw (0, types_1.errorMessage)(service, "Set bucket website not supported");
     }
     async deleteObjects(service, credential, bucket, recursive = true) {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        try {
-            const errorResponse = (err) => this.formatMessage(64, service, ["Unable to empty bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
-            const client = this.getClient(service);
-            const handlerV2 = client.deleteObjectsV2?.bind(this);
-            if (handlerV2) {
-                return handlerV2.call(this, credential, bucket, recursive, service).catch((err) => errorResponse(err));
-            }
-            const handlerV1 = client.deleteObjects?.bind(this);
-            if (handlerV1) {
-                return handlerV1.call(this, credential, bucket, service, undefined, recursive).catch((err) => errorResponse(err));
-            }
-            return Promise.reject((0, types_1.errorMessage)(service, "Delete objects not supported"));
+        const client = this.getClient(service);
+        const handlerV2 = client.deleteObjectsV2?.bind(this);
+        if (handlerV2) {
+            return handlerV2.call(this, credential, bucket, recursive, service).catch((err) => {
+                errorResponse(this, service, bucket, err);
+            });
         }
-        catch (err) {
-            return Promise.reject(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");
     }
     async uploadObject(service, credential, bucket, upload, localUri, beforeResolve) {
         if (this.aborted) {
@@ -619,7 +623,7 @@ class Cloud extends core_1.ClientDb {
         }
         catch (err) {
             this.formatMessage(64, service, ["Upload function not supported", bucket], localUri, { ...Cloud.LOG_CLOUD_WARN });
-            return Promise.reject(err);
+            throw err;
         }
         return new Promise((resolve, reject) => {
             const flags = upload.flags || 0;
@@ -631,7 +635,7 @@ class Cloud extends core_1.ClientDb {
                     if (beforeResolve) {
                         await beforeResolve(value);
                     }
-                    this.addLog(types_1.STATUS_TYPE.INFO, service + ' -> uploadObject', bucket, value);
+                    this.addLog(types_1.STATUS_TYPE.INFO, 'uploadObject: ' + bucket, service, value);
                     resolve(value);
                 }
                 else {
@@ -653,7 +657,7 @@ class Cloud extends core_1.ClientDb {
         }
         catch (err) {
             this.formatMessage(64, service, ["Download function not supported", bucket], Cloud.joinPath(download.pathname, download.filename), { ...Cloud.LOG_CLOUD_WARN });
-            return Promise.reject(err);
+            throw err;
         }
         return new Promise((resolve, reject) => {
             handler({ bucket, download }, async (err, value) => {
@@ -668,7 +672,7 @@ class Cloud extends core_1.ClientDb {
                         }
                     }
                     if (typeof value === 'string' && path.isAbsolute(value)) {
-                        this.addLog(types_1.STATUS_TYPE.INFO, service + ' -> downloadObject', bucket, value);
+                        this.addLog(types_1.STATUS_TYPE.INFO, 'downloadObject: ' + bucket, service, value);
                         this.downloaded.push(value);
                     }
                     resolve(value);
@@ -703,12 +707,12 @@ class Cloud extends core_1.ClientDb {
                 }
                 catch (err) {
                     this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL });
-                    return Promise.reject(err);
+                    throw err;
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported"));
+            throw (0, types_1.errorMessage)(service, "Execute query not supported");
         }
-        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials"));
+        throw (0, types_1.errorMessage)(service, "Invalid credentials");
     }
     async getDatabaseBatchRows(batch, ignoreErrors, sessionKey) {
         if (this.aborted) {
@@ -725,7 +729,11 @@ class Cloud extends core_1.ClientDb {
             if (client?.executeBatchQuery) {
                 const credential = this.getCredential(data);
                 if (this.hasCoerce(service, 'options', credential)) {
-                    batch.forEach(item => item.options && (0, types_1.coerceObject)(item.options));
+                    batch.forEach(item => {
+                        if (item.options) {
+                            (0, types_1.coerceObject)(item.options);
+                        }
+                    });
                 }
                 if (ignoreErrors) {
                     return client.executeBatchQuery.call(this, credential, batch, sessionKey);
@@ -735,12 +743,12 @@ class Cloud extends core_1.ClientDb {
                 }
                 catch (err) {
                     this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL });
-                    return Promise.reject(err);
+                    throw err;
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported"));
+            throw (0, types_1.errorMessage)(service, "Execute query not supported");
         }
-        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials"));
+        throw (0, types_1.errorMessage)(service, "Invalid credentials");
     }
     getCredential(item, unused) {
         const service = item.service;
@@ -813,7 +821,7 @@ class Cloud extends core_1.ClientDb {
     resolveService(service, folder) {
         let result;
         if (!service.startsWith('@')) {
-            result = this.settings.imports?.[service] || util_1.IMPORTS[service];
+            result = this.settings.imports?.[service] || types_1.IMPORT_MAP[service];
         }
         else {
             folder || (folder = 'client');
@@ -860,5 +868,4 @@ Cloud.LOG_CLOUD_UPLOAD = Object.freeze({ titleColor: 'green' });
 Cloud.LOG_CLOUD_DOWNLOAD = Object.freeze({ titleColor: 'cyan' });
 Cloud.LOG_CLOUD_DELETE = Object.freeze({ titleColor: 'grey' });
 Cloud.LOG_CLOUD_DELAYED = Object.freeze({ titleColor: 'grey' });
-
 module.exports = Cloud;

package/package.json

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

package/util.d.ts

@@ -4,6 +4,7 @@ import type { AuthValue } from '../types/lib/http';
 import type { Readable } from 'stream';
 
 declare namespace util {
+    /** @deprecated Types.IMPORT_MAP */
     const IMPORTS: Record<string, string | undefined>;
     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[]];

package/util.js

@@ -1,25 +1,18 @@
 "use strict";
-exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.generateFilename = exports.createKeyAndBody = exports.readableAsBuffer = exports.IMPORTS = void 0;
+exports.hasBasicAuth = exports.getBasicAuth = exports.IMPORTS = void 0;
+exports.readableAsBuffer = readableAsBuffer;
+exports.createKeyAndBody = createKeyAndBody;
+exports.generateFilename = generateFilename;
+exports.formatError = formatError;
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
 const mime = require("mime-types");
 const types_1 = require("@e-mc/types");
+Object.defineProperty(exports, "IMPORTS", { enumerable: true, get: function () { return types_1.IMPORT_MAP; } });
 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; } });
-exports.IMPORTS = {
-    "atlas": "@pi-r/atlas",
-    "aws": "@pi-r/aws",
-    "aws-v3": "@pi-r/aws-v3",
-    "az": "@pi-r/azure",
-    "azure": "@pi-r/azure",
-    "gcloud": "@pi-r/gcp",
-    "gcp": "@pi-r/gcp",
-    "ibm": "@pi-r/ibm",
-    "minio": "@pi-r/minio",
-    "oci": "@pi-r/oci"
-};
 async function readableAsBuffer(from) {
     return new Promise((resolve, reject) => {
         let result = null;
@@ -29,12 +22,15 @@ async function readableAsBuffer(from) {
             }
             result = result ? Buffer.concat([result, chunk]) : chunk;
         })
-            .on('end', () => resolve(result))
-            .on('error', err => reject(err))
+            .on('end', () => {
+            resolve(result);
+        })
+            .on('error', err => {
+            reject(err);
+        })
             .read();
     });
 }
-exports.readableAsBuffer = readableAsBuffer;
 function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags = 0) {
     let mimeType;
     switch (typeof chunkSize) {
@@ -112,7 +108,7 @@ function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags =
                 const output = filename + ext;
                 key.push(ext === '.map' && localFile ? path.basename(localFile) : output);
                 body.push(target);
-                type.push(ext !== '.map' && mime.lookup(output) || mimeType || 'application/octet-stream');
+                type.push(ext !== '.map' && mime.lookup(output) || mimeType || "application/octet-stream");
             }
         }
         catch (err) {
@@ -121,7 +117,6 @@ function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags =
     }
     return [key, body, type];
 }
-exports.createKeyAndBody = createKeyAndBody;
 function generateFilename(filename) {
     let basename, suffix;
     return (i) => {
@@ -140,11 +135,9 @@ function generateFilename(filename) {
         return basename && suffix ? [basename + `_${i}` + suffix, true] : [(0, types_1.incrementUUID)() + path.extname(filename), false];
     };
 }
-exports.generateFilename = generateFilename;
 function formatError(title, value, hint) {
     if ((0, types_1.isObject)(title)) {
         title = title.service;
     }
     return (0, types_1.errorMessage)(typeof title === 'string' ? title : '', value, hint);
 }
-exports.formatError = formatError;