@e-mc/cloud 0.7.0 → 0.8.0

package/index.js

@@ -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);
@@ -249,7 +249,7 @@ class Cloud extends core_1.ClientDb {
                                     }
                                 }
                             }
-                            return Promise.resolve(result);
+                            return result;
                         })
                             .catch(err => instance.writeFail(["Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */, path.basename(downloadUri)], err, { type: 64 /* LOG_TYPE.CLOUD */, startTime }));
                         if (active || waitStatus || this.incremental === 'staging') {
@@ -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)());
         }
@@ -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)());
         }
@@ -486,7 +486,7 @@ class Cloud extends core_1.ClientDb {
             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)());
         }
@@ -507,7 +507,7 @@ class Cloud extends core_1.ClientDb {
             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)());
         }
@@ -528,7 +528,7 @@ class Cloud extends core_1.ClientDb {
             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)());
         }
@@ -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)());
         }
@@ -740,7 +740,7 @@ 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 */)) {
@@ -752,15 +752,15 @@ class Cloud extends core_1.ClientDb {
         const result = this.settings[service]?.[name];
         return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
     }
-    commit() {
+    async commit() {
         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 ? false : this.allSettled(items, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     getClient(service) {
         let client = SERVICE_CLIENT.get(service);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "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.8.0",
+    "@e-mc/db": "0.8.0",
+    "@e-mc/types": "0.8.0"
   }
 }

package/util.js

@@ -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
@@ -45,7 +45,7 @@ function generateFilename(filename) {
                 suffix = filename.substring(j);
             }
         }
-        return basename && suffix ? [basename + `_${i}` + suffix, true] : [(0, types_1.generateUUID)() + path.extname(filename), false];
+        return basename && suffix ? [basename + `_${i}` + suffix, true] : [(0, types_1.incrementUUID)() + path.extname(filename), false];
     };
 }
 exports.generateFilename = generateFilename;