@e-mc/cloud 0.7.0 → 0.7.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2023 Wit Studio
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,5 +1,7 @@
-### @e-mc/cloud
+# @e-mc/cloud
 
-### LICENSE
+PEP 402 - Forever Mikasa
 
-BSD 3-Clause
+## LICENSE
+
+MIT

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
-const types_1 = require("../types");
-const core_1 = require("../core");
-const util_1 = require("./util");
+const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
+const util_1 = require("@e-mc/cloud/util");
 const SERVICE_CLIENT = new Map();
 const SERVICE_UPLOAD = {};
 const SERVICE_DOWNLOAD = {};
@@ -62,7 +62,7 @@ class Cloud extends core_1.ClientDb {
         const startTime = process.hrtime();
         let tasks = [], downloadMap;
         if (await instance.commit()) {
-            instance.writeTimeElapsed(instance.moduleName, "Transactions were committed" /* VAL_MESSAGE.COMMIT_TRANSACTION */, startTime, { type: 64 /* LOG_TYPE.CLOUD */, ...Cloud.LOG_STYLE_SUCCESS });
+            instance.writeTimeElapsed(instance.moduleName, "Transactions were committed", startTime, { type: 64, ...Cloud.LOG_STYLE_SUCCESS });
         }
         for (const { instance: document } of this.Document) {
             document.cloudInit?.(state);
@@ -71,7 +71,7 @@ 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 /* LOG_TYPE.CLOUD */, storage.service, ["Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */, storage.bucket], (0, types_1.errorValue)("File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, item.uri || item.filename || "Unknown" /* ERR_MESSAGE.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;
                 }
                 ignore: {
@@ -120,7 +120,7 @@ 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" /* ERR_CLOUD.DELETE_BUCKET */, service + ': ' + bucket], err, { type: 64 /* LOG_TYPE.CLOUD */, 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) {
@@ -142,7 +142,7 @@ class Cloud extends core_1.ClientDb {
             const map = bucketPolicy[service];
             for (const bucket in map) {
                 const params = map[bucket];
-                tasks.push(instance.setBucketPolicy(...params).catch(err => instance.writeFail(["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, params[0] + ': ' + params[2]], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime })));
+                tasks.push(instance.setBucketPolicy(...params).catch(err => instance.writeFail(["Unable to update bucket policy", params[0] + ': ' + params[2]], err, { type: 64, startTime })));
             }
         }
         if (tasks.length) {
@@ -154,7 +154,7 @@ 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" /* ERR_MESSAGE.HANDLED_REJECTION */, document.moduleName], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime }));
+                await document.cloudFinalize(state).catch(err => document.writeFail(["Handled rejection", document.moduleName], err, { type: 64, startTime }));
                 if (document.aborted) {
                     return Promise.reject((0, types_1.createAbortError)());
                 }
@@ -181,7 +181,7 @@ class Cloud extends core_1.ClientDb {
                     if (pathname && path.isAbsolute(pathname)) {
                         downloadUri = path.join(pathname, filename);
                         if (!Cloud.isPath(downloadUri) && !this.canWrite(pathname)) {
-                            instance.writeFail(["Unable to download file" /* ERR_MESSAGE.DOWNLOAD_FILE */, filename], (0, types_1.errorValue)("Unsupported access" /* ERR_MESSAGE.UNSUPPORTED_ACCESS */, pathname), { type: 64 /* LOG_TYPE.CLOUD */, fatal: !!active, startTime });
+                            instance.writeFail(["Unable to download file", filename], (0, types_1.errorValue)("Unsupported access", pathname), { type: 64, fatal: !!active, startTime });
                             continue;
                         }
                     }
@@ -214,7 +214,7 @@ class Cloud extends core_1.ClientDb {
                     else {
                         pending = new Set([downloadUri]);
                         download.admin = data.admin;
-                        const task = instance.downloadObject(data.service, instance.getCredential(data), data.bucket, download, (value) => {
+                        const task = instance.downloadObject(data.service, instance.getCredential(data), data.bucket, download, async (value) => {
                             let result;
                             if (value && !instance.aborted) {
                                 const items = Array.from(pending);
@@ -235,7 +235,7 @@ class Cloud extends core_1.ClientDb {
                                             this.addDownload(size = value.length);
                                         }
                                         this.add(destUri);
-                                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /* VAL_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
+                                        this.formatMessage(64, data.service, ["Download success", (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
                                         result || (result = destUri);
                                     }
                                     catch (err) {
@@ -244,14 +244,14 @@ class Cloud extends core_1.ClientDb {
                                             --i;
                                         }
                                         else {
-                                            instance.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(destUri)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: !!active, startTime });
+                                            instance.writeFail(["Unable to write file", path.basename(destUri)], err, { type: 32, fatal: !!active, startTime });
                                         }
                                     }
                                 }
                             }
                             return Promise.resolve(result);
                         })
-                            .catch(err => instance.writeFail(["Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */, path.basename(downloadUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime }));
+                            .catch(err => instance.writeFail(["Download failed", path.basename(downloadUri)], err, { type: 64, startTime }));
                         if (active || waitStatus || this.incremental === 'staging') {
                             tasks.push(task);
                         }
@@ -313,7 +313,7 @@ class Cloud extends core_1.ClientDb {
                                     }
                                 }
                                 catch (err) {
-                                    instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(value)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false });
+                                    instance.writeFail(["Unable to read file", path.basename(value)], err, { type: 32, fatal: false });
                                 }
                             }
                         }
@@ -322,7 +322,7 @@ class Cloud extends core_1.ClientDb {
                     for (const localUri of group) {
                         const exists = this.isPath(localUri);
                         if (!exists || !instance.canRead(localUri, { ownPermissionOnly: true })) {
-                            instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(localUri)], (0, types_1.errorValue)(exists ? "Not permitted to read file" /* ERR_MESSAGE.UNSUPPORTED_READ */ : "File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, localUri), { type: 64 /* LOG_TYPE.CLOUD */, fatal: index === 0 });
+                            instance.writeFail(["Unable to read file", path.basename(localUri)], (0, types_1.errorValue)(exists ? "Not permitted to read file" : "File not found", localUri), { type: 64, fatal: index === 0 });
                             continue;
                         }
                         let buffer, filename;
@@ -346,10 +346,10 @@ class Cloud extends core_1.ClientDb {
                             options.contentType = contentType;
                         }
                         uploading.push(instance.uploadObject(service, { ...credential }, bucket, options, localUri, callback)
-                            .catch(err => instance.writeFail(["Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */, path.basename(localUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, fatal: index === 0 })));
+                            .catch(err => instance.writeFail(["Upload failed", path.basename(localUri)], err, { type: 64, fatal: index === 0 })));
                     }
                 });
-                instance.allSettled(uploading, [`Upload file "${contentType || "Unknown" /* ERR_MESSAGE.UNKNOWN */}"`, storage.service + ': ' + path.basename(file.localUri)]).then(() => resolve());
+                instance.allSettled(uploading, [`Upload file "${contentType || "Unknown"}"`, storage.service + ': ' + path.basename(file.localUri)]).then(() => resolve());
             });
             if (active) {
                 tasks.push(task);
@@ -435,7 +435,7 @@ class Cloud extends core_1.ClientDb {
         }
         return super.setQueryResult(service, credential, queryString, result, sessionKey);
     }
-    createBucket(service, credential, bucket, publicRead, options) {
+    async createBucket(service, credential, bucket, publicRead, options) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -454,10 +454,10 @@ class Cloud extends core_1.ClientDb {
                         return handler.call(this, credential, bucket, publicRead, options);
                     }
                 }
-                return Promise.reject((0, types_1.errorMessage)(service, "Create bucket not supported" /* ERR_CLOUD.CREATE_BUCKET_SUPPORT */));
+                return Promise.reject((0, types_1.errorMessage)(service, "Create bucket not supported"));
             }
             catch (err) {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to create bucket" /* ERR_CLOUD.CREATE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ["Unable to create bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
                 return Promise.reject(err);
             }
         }
@@ -465,7 +465,7 @@ class Cloud extends core_1.ClientDb {
             return Promise.reject(err);
         }
     }
-    setBucketPolicy(service, credential, bucket, options) {
+    async setBucketPolicy(service, credential, bucket, options) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -476,17 +476,17 @@ class Cloud extends core_1.ClientDb {
                     return handler.call(this, credential, bucket, options);
                 }
                 catch (err) {
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                    this.formatMessage(64, service, ["Unable to update bucket policy", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Bucket policy not supported" /* ERR_CLOUD.BUCKET_POLICY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Bucket policy not supported"));
         }
         catch (err) {
             return Promise.reject(err);
         }
     }
-    setBucketWebsite(service, credential, bucket, options) {
+    async setBucketWebsite(service, credential, bucket, options) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -497,22 +497,22 @@ class Cloud extends core_1.ClientDb {
                     return handler.call(this, credential, bucket, options);
                 }
                 catch (err) {
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure bucket" /* ERR_CLOUD.CONFIGURE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                    this.formatMessage(64, service, ["Unable to configure bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Set bucket website not supported" /* ERR_CLOUD.BUCKET_WEBSITE_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Set bucket website not supported"));
         }
         catch (err) {
             return Promise.reject(err);
         }
     }
-    deleteObjects(service, credential, bucket, recursive = true) {
+    async deleteObjects(service, credential, bucket, recursive = true) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
-            const errorResponse = (err) => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to empty bucket" /* ERR_CLOUD.DELETE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+            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) {
@@ -522,13 +522,13 @@ class Cloud extends core_1.ClientDb {
             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" /* ERR_CLOUD.DELETE_OBJECTS_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Delete objects not supported"));
         }
         catch (err) {
             return Promise.reject(err);
         }
     }
-    uploadObject(service, credential, bucket, upload, localUri, beforeResolve) {
+    async uploadObject(service, credential, bucket, upload, localUri, beforeResolve) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -537,14 +537,14 @@ class Cloud extends core_1.ClientDb {
             handler = this.getUploadHandler(service, credential).bind(this);
         }
         catch (err) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Upload function not supported" /* ERR_CLOUD.UPLOAD_SUPPORT */, bucket], localUri, { ...Cloud.LOG_CLOUD_WARN });
+            this.formatMessage(64, service, ["Upload function not supported", bucket], localUri, { ...Cloud.LOG_CLOUD_WARN });
             return Promise.reject(err);
         }
         return new Promise((resolve, reject) => {
             try {
                 handler({ bucket, upload, buffer: upload.buffer || fs.readFileSync(localUri), localUri }, async (err, value) => {
                     if (err) {
-                        reject(errorObject(err, service, "Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */));
+                        reject(errorObject(err, service, "Upload failed"));
                     }
                     else if (value) {
                         if (beforeResolve) {
@@ -554,7 +554,7 @@ class Cloud extends core_1.ClientDb {
                         resolve(value);
                     }
                     else {
-                        reject((0, types_1.errorMessage)(service, "Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */));
+                        reject((0, types_1.errorMessage)(service, "Upload failed"));
                     }
                 });
             }
@@ -563,7 +563,7 @@ class Cloud extends core_1.ClientDb {
             }
         });
     }
-    downloadObject(service, credential, bucket, download, beforeResolve) {
+    async downloadObject(service, credential, bucket, download, beforeResolve) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -575,14 +575,14 @@ class Cloud extends core_1.ClientDb {
             handler = this.getDownloadHandler(service, credential).bind(this);
         }
         catch (err) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Download function not supported" /* ERR_CLOUD.DOWNLOAD_SUPPORT */, bucket], Cloud.joinPath(download.pathname, download.filename), { ...Cloud.LOG_CLOUD_WARN });
+            this.formatMessage(64, service, ["Download function not supported", bucket], Cloud.joinPath(download.pathname, download.filename), { ...Cloud.LOG_CLOUD_WARN });
             return Promise.reject(err);
         }
         return new Promise((resolve, reject) => {
             try {
                 handler({ bucket, download }, async (err, value) => {
                     if (err) {
-                        reject(errorObject(err, service, "Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */));
+                        reject(errorObject(err, service, "Download failed"));
                     }
                     else if (value) {
                         if (beforeResolve) {
@@ -598,7 +598,7 @@ class Cloud extends core_1.ClientDb {
                         resolve(value);
                     }
                     else {
-                        reject((0, types_1.errorMessage)(service, "Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */));
+                        reject((0, types_1.errorMessage)(service, "Download failed"));
                     }
                 });
             }
@@ -630,13 +630,13 @@ class Cloud extends core_1.ClientDb {
                     return await client.executeQuery.call(this, credential, item, sessionKey);
                 }
                 catch (err) {
-                    this.formatFail(64 /* LOG_TYPE.CLOUD */, service, "Unable to execute query" /* ERR_DB.EXEC_QUERY */, err, { ...Cloud.LOG_CLOUD_FAIL });
+                    this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported"));
         }
-        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
+        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials"));
     }
     async getDatabaseBatchRows(batch, ignoreErrors, sessionKey) {
         if (this.aborted) {
@@ -662,13 +662,13 @@ class Cloud extends core_1.ClientDb {
                     return await client.executeBatchQuery.call(this, credential, batch, sessionKey);
                 }
                 catch (err) {
-                    this.formatFail(64 /* LOG_TYPE.CLOUD */, service, "Unable to execute query" /* ERR_DB.EXEC_QUERY */, err, { ...Cloud.LOG_CLOUD_FAIL });
+                    this.formatFail(64, service, "Unable to execute query", err, { ...Cloud.LOG_CLOUD_FAIL });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported"));
         }
-        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
+        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials"));
     }
     getCredential(item, unused) {
         const service = item.service;
@@ -696,7 +696,7 @@ class Cloud extends core_1.ClientDb {
         if ((0, types_1.isArray)(data)) {
             for (const item of data) {
                 const service = this.hasStorage(action, item);
-                if (service && service.active) { // eslint-disable-line @typescript-eslint/prefer-optional-chain
+                if (service && service.active) {
                     return item;
                 }
             }
@@ -728,7 +728,7 @@ class Cloud extends core_1.ClientDb {
             }
         }
         catch (err) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, data.service, "Cloud provider not found" /* ERR_CLOUD.PROVIDER_NOTFOUND */, err, { ...Cloud.LOG_CLOUD_FAIL });
+            this.formatFail(64, data.service, "Cloud provider not found", err, { ...Cloud.LOG_CLOUD_FAIL });
         }
         return false;
     }
@@ -740,10 +740,10 @@ class Cloud extends core_1.ClientDb {
     }
     resolveService(service, folder) {
         let result;
-        if (service[0] !== '@') {
+        if (!service.startsWith('@')) {
             result = this.settings.imports?.[service] || util_1.IMPORTS[service];
         }
-        else if (!folder && !service.startsWith("@squared-functions/" /* NAMESPACE.SQUARED_FUNCTIONS */)) {
+        else if (!folder && !service.startsWith("@squared-functions/")) {
             folder = 'client';
         }
         return (result || service) + (folder ? '/' + folder : '');
@@ -756,11 +756,11 @@ class Cloud extends core_1.ClientDb {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
-        const items = this.pending.filter(item => !item.document).map(data => {
+        const items = this.pending.filter(item => !item.document).map(async (data) => {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.getDatabaseRows(data, true);
         });
-        return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
+        return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     getClient(service) {
         let client = SERVICE_CLIENT.get(service);
@@ -776,11 +776,11 @@ class Cloud extends core_1.ClientDb {
         }
         catch {
         }
-        throw (0, types_1.errorMessage)(service, "Cloud provider not found" /* ERR_CLOUD.PROVIDER_NOTFOUND */);
+        throw (0, types_1.errorMessage)(service, "Cloud provider not found");
     }
 }
-Cloud.STORE_RESULT_PARTITION_SIZE = 16 /* CACHE_SIZE.CLOUD_PARTITION_SIZE */;
-Cloud.STORE_RESULT_PARTITION_MULT = 2 /* CACHE_SIZE.CLOUD_PARTITION_MULT */;
+Cloud.STORE_RESULT_PARTITION_SIZE = 16;
+Cloud.STORE_RESULT_PARTITION_MULT = 2;
 Cloud.LOG_CLOUD_FAIL = core_1.ClientDb.LOG_STYLE_FAIL;
 Cloud.LOG_CLOUD_COMMAND = Object.freeze({ titleColor: 'blue' });
 Cloud.LOG_CLOUD_WARN = Object.freeze({ titleColor: 'yellow' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
     "directory": "src/cloud"
   },
   "keywords": [
@@ -17,11 +17,11 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.7.0",
-    "@e-mc/db": "0.7.0",
-    "@e-mc/types": "0.7.0"
+    "@e-mc/core": "0.7.2",
+    "@e-mc/db": "0.7.2",
+    "@e-mc/types": "0.7.2"
   }
 }

package/util.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.generateFilename = exports.readableAsBuffer = exports.IMPORTS = void 0;
 const path = require("path");
-const types_1 = require("../types");
-const util_1 = require("../db/util");
+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; } });
 exports.IMPORTS = {
@@ -18,7 +18,7 @@ exports.IMPORTS = {
     "minio": "@pi-r/minio",
     "oci": "@pi-r/oci"
 };
-function readableAsBuffer(stream) {
+async function readableAsBuffer(stream) {
     return new Promise((resolve, reject) => {
         let result = null;
         stream
@@ -35,9 +35,10 @@ function generateFilename(filename) {
     let basename, suffix;
     return (i) => {
         if (i === 1) {
-            const j = filename.indexOf('.');
+            const type = /\.[a-z0-9]+\.[a-z0-9]+$/i.exec(filename);
+            const j = type ? type.index : filename.lastIndexOf('.');
             if (j !== -1) {
-                const match = /^([\S\s]+?)_(\d+)$/.exec(basename = filename.substring(0, j));
+                const match = /^(.+)_(\d+)$/.exec(basename = filename.substring(0, j));
                 if (match) {
                     basename = match[1];
                     i = parseInt(match[2]) + 1;