@e-mc/cloud 0.8.4 → 0.8.6

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2024 An Pham
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/index.d.ts
 
 ```typescript
 import type { IHost, IScopeOrigin } from "./index";
@@ -45,7 +45,6 @@ interface ICloud extends IClientDb<IHost, CloudModule, CloudDatabase, CloudServi
     getUploadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
     getDownloadHandler(service: string, credential: unknown): (...args: unknown[]) => void;
     resolveService(service: string, folder?: string): string;
-    getUserSettings(): unknown;
     get settings(): CloudSettings;
 }
 
@@ -68,12 +67,12 @@ interface CloudConstructor extends ClientDbConstructor<IHost> {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.4/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.6/lib/settings.d.ts
 
 ## LICENSE
 

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 = {};
@@ -64,7 +64,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);
@@ -73,7 +73,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: {
@@ -122,7 +122,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) {
@@ -144,7 +144,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) {
@@ -156,7 +156,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)());
                 }
@@ -182,7 +182,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;
                         }
                     }
@@ -197,7 +197,7 @@ class Cloud extends core_1.ClientDb {
                         active = true;
                     }
                     else if (!Cloud.createDir(destDir)) {
-                        instance.writeFail(["Unable to create directory" /* ERR_MESSAGE.CREATE_DIRECTORY */, filename], (0, types_1.errorValue)("Path is not a directory" /* ERR_MESSAGE.NOT_DIRECTORY */, destDir), { type: 64 /* LOG_TYPE.CLOUD */, fatal: !!active, startTime });
+                        instance.writeFail(["Unable to create directory", filename], (0, types_1.errorValue)("Path is not a directory", destDir), { type: 64, fatal: !!active, startTime });
                         continue;
                     }
                     else if (active) {
@@ -237,7 +237,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) {
@@ -246,14 +246,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 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);
                     }
@@ -306,7 +306,7 @@ class Cloud extends core_1.ClientDb {
                     let fileGroup;
                     if (index === 0) {
                         if (!group[0]) {
-                            instance.writeFail("Unable to read file" /* ERR_MESSAGE.READ_FILE */, (0, types_1.errorValue)("File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, service), { type: 64 /* LOG_TYPE.CLOUD */, fatal: true });
+                            instance.writeFail("Unable to read file", (0, types_1.errorValue)("File not found", service), { type: 64, fatal: true });
                             return;
                         }
                         if (group.length > 1) {
@@ -322,7 +322,7 @@ class Cloud extends core_1.ClientDb {
                                             fileGroup.push([typeof minStreamSize === 'number' ? await this.streamFile(value, { minStreamSize, cache: false, signal: instance.signal }) : fs.readFileSync(value), path.extname(value), value]);
                                         }
                                         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 });
                                         }
                                     }
                                 }
@@ -334,7 +334,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" /* 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: i === 0 && 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: i === 0 && index === 0 });
                             continue;
                         }
                         let buffer, filename;
@@ -358,10 +358,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: i === 0 && index === 0 })));
+                            .catch(err => instance.writeFail(["Upload failed", path.basename(localUri)], err, { type: 64, fatal: i === 0 && 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);
@@ -466,10 +466,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);
             }
         }
@@ -488,11 +488,11 @@ 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);
@@ -509,11 +509,11 @@ 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);
@@ -524,7 +524,7 @@ class Cloud extends core_1.ClientDb {
             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) {
@@ -534,7 +534,7 @@ 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);
@@ -549,14 +549,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) {
@@ -566,7 +566,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"));
                     }
                 });
             }
@@ -587,14 +587,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) {
@@ -610,7 +610,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"));
                     }
                 });
             }
@@ -642,13 +642,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) {
@@ -674,13 +674,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;
@@ -708,7 +708,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;
                 }
             }
@@ -740,7 +740,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;
     }
@@ -755,7 +755,7 @@ class Cloud extends core_1.ClientDb {
         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 : '');
@@ -772,7 +772,7 @@ class Cloud extends core_1.ClientDb {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.getDatabaseRows(data, true);
         });
-        return items.length === 0 ? false : this.allSettled(items, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
+        return items.length === 0 ? false : this.allSettled(items, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     getClient(service) {
         let client = SERVICE_CLIENT.get(service);
@@ -788,11 +788,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.8.4",
+  "version": "0.8.6",
   "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.8.4",
-    "@e-mc/db": "0.8.4",
-    "@e-mc/types": "0.8.4",
+    "@e-mc/core": "0.8.6",
+    "@e-mc/db": "0.8.6",
+    "@e-mc/types": "0.8.6",
     "mime-types": "^2.1.35"
   }
 }

package/util.js

@@ -4,8 +4,8 @@ exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.gene
 const path = require("path");
 const fs = require("fs");
 const mime = require("mime-types");
-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 = {
@@ -74,9 +74,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;