@e-mc/cloud 0.8.7 → 0.8.8

package/LICENSE

@@ -1,11 +1,7 @@
 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:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/cloud
 
 * NodeJS 14
-* ES2020
+* ES2019
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/index.d.ts
 
 ```typescript
 import type { IHost, IScopeOrigin } from "./index";
@@ -67,13 +67,13 @@ interface CloudConstructor extends ClientDbConstructor<IHost> {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.8/lib/settings.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+MIT

package/index.js

@@ -50,7 +50,8 @@ class Cloud extends core_1.ClientDb {
         this.downloaded = [];
     }
     static async finalize(instance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        var _e, _f;
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -67,7 +68,7 @@ class Cloud extends core_1.ClientDb {
             instance.writeTimeElapsed(instance.moduleName, "Transactions were committed", startTime, { type: 64, ...Cloud.LOG_STYLE_SUCCESS });
         }
         for (const { instance: document } of this.Document) {
-            document.cloudInit?.(state);
+            (_a = document.cloudInit) === null || _a === void 0 ? void 0 : _a.call(document, state);
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
@@ -79,7 +80,7 @@ class Cloud extends core_1.ClientDb {
                 ignore: {
                     if (item.localUri || item.torrentFiles) {
                         for (const { instance: document } of this.Document) {
-                            if (document.cloudObject?.(state, item)) {
+                            if ((_b = document.cloudObject) === null || _b === void 0 ? void 0 : _b.call(document, state, item)) {
                                 break ignore;
                             }
                         }
@@ -92,9 +93,9 @@ class Cloud extends core_1.ClientDb {
                 for (const storage of cloudStorage) {
                     const { admin, bucket } = storage;
                     if (admin && bucket && instance.hasCredential('storage', storage)) {
-                        const policy = admin.configBucket?.policy;
+                        const policy = (_c = admin.configBucket) === null || _c === void 0 ? void 0 : _c.policy;
                         if (admin.emptyBucket) {
-                            const service = bucketDelete[_a = storage.service] || (bucketDelete[_a] = {});
+                            const service = bucketDelete[_e = storage.service] || (bucketDelete[_e] = {});
                             const items = service[bucket];
                             if (!items) {
                                 service[bucket] = [instance.getCredential(storage), admin.recursive];
@@ -104,7 +105,7 @@ class Cloud extends core_1.ClientDb {
                             }
                         }
                         if (policy) {
-                            const service = bucketPolicy[_b = storage.service] || (bucketPolicy[_b] = {});
+                            const service = bucketPolicy[_f = storage.service] || (bucketPolicy[_f] = {});
                             service[bucket] = [storage.service, instance.getCredential(storage), bucket, policy];
                         }
                     }
@@ -187,7 +188,7 @@ class Cloud extends core_1.ClientDb {
                         }
                     }
                     else {
-                        downloadUri = pathname ? path.join(this.baseDirectory, pathname.replace(/^([A-Z]:)?[\\/]+/i, ''), filename) : path.join(data.admin?.preservePath && localUri ? path.dirname(localUri) : this.baseDirectory, filename);
+                        downloadUri = pathname ? path.join(this.baseDirectory, pathname.replace(/^([A-Z]:)?[\\/]+/i, ''), filename) : path.join(((_d = data.admin) === null || _d === void 0 ? void 0 : _d.preservePath) && localUri ? path.dirname(localUri) : this.baseDirectory, filename);
                     }
                     const destDir = path.dirname(downloadUri);
                     if (Cloud.isPath(downloadUri)) {
@@ -303,6 +304,7 @@ class Cloud extends core_1.ClientDb {
                 const credential = instance.getCredential(storage, true);
                 const uploading = [];
                 getFiles(file, upload).forEach(async (group, index) => {
+                    var _a;
                     let fileGroup;
                     if (index === 0) {
                         if (!group[0]) {
@@ -310,7 +312,7 @@ class Cloud extends core_1.ClientDb {
                             return;
                         }
                         if (group.length > 1) {
-                            if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
+                            if ((_a = SERVICE_CLIENT.get(service)) === null || _a === void 0 ? void 0 : _a.CLOUD_UPLOAD_FROMDISK) {
                                 fileGroup = group.slice(1).filter(value => this.isPath(value, true)).map(value => [value, path.extname(value), value]);
                             }
                             else {
@@ -370,6 +372,7 @@ class Cloud extends core_1.ClientDb {
         return tasks;
     }
     static sanitizeAssets(assets) {
+        var _a;
         const storage = [];
         for (const item of assets) {
             const cloudStorage = item.cloudStorage;
@@ -380,7 +383,7 @@ class Cloud extends core_1.ClientDb {
                         if (upload.filename) {
                             setUploadFilename(upload, this.toPosix(upload.filename));
                         }
-                        const pathname = upload.pathname || data.admin?.preservePath && item.pathname;
+                        const pathname = upload.pathname || ((_a = data.admin) === null || _a === void 0 ? void 0 : _a.preservePath) && item.pathname;
                         if (pathname) {
                             upload.pathname = this.toPosix(pathname).replace(/^\/+/, '') + '/';
                         }
@@ -448,6 +451,7 @@ class Cloud extends core_1.ClientDb {
         return super.setQueryResult(service, credential, queryString, result, sessionKey);
     }
     async createBucket(service, credential, bucket, publicRead, options) {
+        var _a, _b;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -455,13 +459,13 @@ class Cloud extends core_1.ClientDb {
             const client = this.getClient(service);
             try {
                 if (publicRead === undefined || typeof publicRead === 'boolean') {
-                    const handler = client.createBucket?.bind(this);
+                    const handler = (_a = client.createBucket) === null || _a === void 0 ? void 0 : _a.bind(this);
                     if (handler) {
                         return handler.call(this, credential, bucket, publicRead);
                     }
                 }
                 else {
-                    const handler = client.createBucketV2?.bind(this);
+                    const handler = (_b = client.createBucketV2) === null || _b === void 0 ? void 0 : _b.bind(this);
                     if (handler) {
                         return handler.call(this, credential, bucket, publicRead, options);
                     }
@@ -478,11 +482,12 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async setBucketPolicy(service, credential, bucket, options) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
-            const handler = this.getClient(service).setBucketPolicy?.bind(this);
+            const handler = (_a = this.getClient(service).setBucketPolicy) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handler) {
                 try {
                     return handler.call(this, credential, bucket, options);
@@ -499,11 +504,12 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async setBucketWebsite(service, credential, bucket, options) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
-            const handler = this.getClient(service).setBucketWebsite?.bind(this);
+            const handler = (_a = this.getClient(service).setBucketWebsite) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handler) {
                 try {
                     return handler.call(this, credential, bucket, options);
@@ -520,17 +526,18 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async deleteObjects(service, credential, bucket, recursive = true) {
+        var _a, _b;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         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);
+            const handlerV2 = (_a = client.deleteObjectsV2) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handlerV2) {
                 return handlerV2.call(this, credential, bucket, recursive, service).catch(err => errorResponse(err));
             }
-            const handlerV1 = client.deleteObjects?.bind(this);
+            const handlerV1 = (_b = client.deleteObjects) === null || _b === void 0 ? void 0 : _b.bind(this);
             if (handlerV1) {
                 return handlerV1.call(this, credential, bucket, service, undefined, recursive).catch(err => errorResponse(err));
             }
@@ -630,7 +637,7 @@ class Cloud extends core_1.ClientDb {
         const service = item.service;
         let client;
         if (this.hasCredential('database', item) && (client = this.getClient(item.service))) {
-            if (client?.executeQuery) {
+            if (client === null || client === void 0 ? void 0 : client.executeQuery) {
                 const credential = this.getCredential(item);
                 if (item.options && this.hasCoerce(service, 'options', null, credential)) {
                     (0, types_1.coerceObject)(item.options);
@@ -662,7 +669,7 @@ class Cloud extends core_1.ClientDb {
         const service = data.service;
         let client;
         if (this.hasCredential('database', data) && (client = this.getClient(service))) {
-            if (client?.executeBatchQuery) {
+            if (client === null || client === void 0 ? void 0 : client.executeBatchQuery) {
                 const credential = this.getCredential(data);
                 if (this.hasCoerce(service, 'options', null, credential)) {
                     batch.forEach(item => item.options && (0, types_1.coerceObject)(item.options));
@@ -751,9 +758,10 @@ class Cloud extends core_1.ClientDb {
         return (SERVICE_DOWNLOAD[service] || (SERVICE_DOWNLOAD[service] = require(this.resolveService(service, 'download')))).call(this, credential, service);
     }
     resolveService(service, folder) {
+        var _a;
         let result;
         if (!service.startsWith('@')) {
-            result = this.settings.imports?.[service] || util_1.IMPORTS[service];
+            result = ((_a = this.settings.imports) === null || _a === void 0 ? void 0 : _a[service]) || util_1.IMPORTS[service];
         }
         else if (!folder && !service.startsWith("@squared-functions/")) {
             folder = 'client';
@@ -761,7 +769,8 @@ class Cloud extends core_1.ClientDb {
         return (result || service) + (folder ? '/' + folder : '');
     }
     settingsOf(service, name, component) {
-        const result = this.settings[service]?.[name];
+        var _a;
+        const result = (_a = this.settings[service]) === null || _a === void 0 ? void 0 : _a[name];
         return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
     }
     async commit() {
@@ -769,7 +778,8 @@ class Cloud extends core_1.ClientDb {
             return Promise.reject((0, types_1.createAbortError)());
         }
         const items = this.pending.filter(item => !item.document).map(async (data) => {
-            data.ignoreCache ?? (data.ignoreCache = true);
+            var _a;
+            (_a = data.ignoreCache) !== null && _a !== void 0 ? _a : (data.ignoreCache = true);
             return this.getDatabaseRows(data, true);
         });
         return items.length === 0 ? false : this.allSettled(items, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,12 +17,12 @@
     "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.8.7",
-    "@e-mc/db": "0.8.7",
-    "@e-mc/types": "0.8.7",
+    "@e-mc/core": "0.8.8",
+    "@e-mc/db": "0.8.8",
+    "@e-mc/types": "0.8.8",
     "mime-types": "^2.1.35"
   }
 }

package/util.js

@@ -54,7 +54,7 @@ function createKeyAndBody(filename, items, mimeType, errorCallback) {
                 }
             }
             catch (err) {
-                errorCallback?.(err);
+                errorCallback === null || errorCallback === void 0 ? void 0 : errorCallback(err);
             }
         }
         else if (Buffer.isBuffer(content)) {