@e-mc/cloud 0.5.3 → 0.7.0

package/index.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const types_1 = require("../types");
 const core_1 = require("../core");
 const util_1 = require("./util");
-const SERVICE_CLIENT = {};
+const SERVICE_CLIENT = new Map();
 const SERVICE_UPLOAD = {};
 const SERVICE_DOWNLOAD = {};
 function setUploadFilename(upload, filename) {
@@ -37,7 +37,7 @@ function getFiles(file, data) {
     }
     return [grouped];
 }
-const errorObject = (err, service, value) => err instanceof Error ? err : typeof err === 'string' ? new Error(err) : (0, util_1.formatError)(service, value);
+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) || '');
 class Cloud extends core_1.ClientDb {
     constructor() {
@@ -284,11 +284,12 @@ class Cloud extends core_1.ClientDb {
                 state.localStorage.set(file, upload);
             }
             const callback = async (value) => {
-                if (value && !ignoreProcess) {
-                    for (const { instance: document } of host.Document) {
-                        if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
-                            return;
-                        }
+                if (ignoreProcess || !(0, types_1.isString)(value)) {
+                    return;
+                }
+                for (const { instance: document } of host.Document) {
+                    if (document.cloudUpload && await document.cloudUpload(state, file, value, active)) {
+                        return;
                     }
                 }
             };
@@ -299,25 +300,22 @@ class Cloud extends core_1.ClientDb {
                 getFiles(file, upload).forEach((group, index) => {
                     let fileGroup;
                     if (index === 0 && group.length > 1) {
-                        switch (service) {
-                            case 'gcp':
-                            case 'gcloud':
-                                fileGroup = group.slice(1).filter(value => this.isPath(value)).map(value => [value, path.extname(value), value]);
-                                break;
-                            default:
-                                fileGroup = [];
-                                for (let i = 1; i < group.length; ++i) {
-                                    const value = group[i];
-                                    try {
-                                        if (fs.existsSync(value)) {
-                                            fileGroup.push([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 });
+                        if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
+                            fileGroup = group.slice(1).filter(value => this.isPath(value)).map(value => [value, path.extname(value), value]);
+                        }
+                        else {
+                            fileGroup = [];
+                            for (let i = 1; i < group.length; ++i) {
+                                const value = group[i];
+                                try {
+                                    if (fs.existsSync(value)) {
+                                        fileGroup.push([fs.readFileSync(value), path.extname(value), value]);
                                     }
                                 }
-                                break;
+                                catch (err) {
+                                    instance.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(value)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false });
+                                }
+                            }
                         }
                         group = [group[0]];
                     }
@@ -456,7 +454,7 @@ class Cloud extends core_1.ClientDb {
                         return handler.call(this, credential, bucket, publicRead, options);
                     }
                 }
-                return Promise.reject((0, util_1.formatError)(service, "Create bucket not supported" /* ERR_CLOUD.CREATE_BUCKET_SUPPORT */));
+                return Promise.reject((0, types_1.errorMessage)(service, "Create bucket not supported" /* ERR_CLOUD.CREATE_BUCKET_SUPPORT */));
             }
             catch (err) {
                 this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to create bucket" /* ERR_CLOUD.CREATE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_WARN });
@@ -482,7 +480,7 @@ class Cloud extends core_1.ClientDb {
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, util_1.formatError)(service, "Bucket policy not supported" /* ERR_CLOUD.BUCKET_POLICY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Bucket policy not supported" /* ERR_CLOUD.BUCKET_POLICY_SUPPORT */));
         }
         catch (err) {
             return Promise.reject(err);
@@ -503,7 +501,7 @@ class Cloud extends core_1.ClientDb {
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, util_1.formatError)(service, "Set bucket website not supported" /* ERR_CLOUD.BUCKET_WEBSITE_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Set bucket website not supported" /* ERR_CLOUD.BUCKET_WEBSITE_SUPPORT */));
         }
         catch (err) {
             return Promise.reject(err);
@@ -524,7 +522,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, util_1.formatError)(service, "Delete objects not supported" /* ERR_CLOUD.DELETE_OBJECTS_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Delete objects not supported" /* ERR_CLOUD.DELETE_OBJECTS_SUPPORT */));
         }
         catch (err) {
             return Promise.reject(err);
@@ -556,7 +554,7 @@ class Cloud extends core_1.ClientDb {
                         resolve(value);
                     }
                     else {
-                        reject((0, util_1.formatError)(service, "Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */));
+                        reject((0, types_1.errorMessage)(service, "Upload failed" /* ERR_CLOUD.UPLOAD_FAIL */));
                     }
                 });
             }
@@ -600,7 +598,7 @@ class Cloud extends core_1.ClientDb {
                         resolve(value);
                     }
                     else {
-                        reject((0, util_1.formatError)(service, "Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */));
+                        reject((0, types_1.errorMessage)(service, "Download failed" /* ERR_CLOUD.DOWNLOAD_FAIL */));
                     }
                 });
             }
@@ -618,27 +616,27 @@ class Cloud extends core_1.ClientDb {
             ignoreErrors = false;
         }
         const service = item.service;
-        if (this.hasCredential('database', item)) {
-            const host = SERVICE_CLIENT[service];
-            if (host?.executeQuery) {
+        let client;
+        if (this.hasCredential('database', item) && (client = this.getClient(item.service))) {
+            if (client?.executeQuery) {
                 const credential = this.getCredential(item);
                 if (item.options && this.hasCoerce(service, 'options', null, credential)) {
                     (0, types_1.coerceObject)(item.options);
                 }
                 if (ignoreErrors) {
-                    return host.executeQuery.call(this, credential, item, sessionKey);
+                    return client.executeQuery.call(this, credential, item, sessionKey);
                 }
                 try {
-                    return await host.executeQuery.call(this, credential, item, sessionKey);
+                    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 });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, util_1.formatError)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
         }
-        return Promise.reject((0, util_1.formatError)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
+        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
     }
     async getDatabaseBatchRows(batch, ignoreErrors, sessionKey) {
         if (this.aborted) {
@@ -650,32 +648,33 @@ class Cloud extends core_1.ClientDb {
         }
         const data = batch[0];
         const service = data.service;
-        if (this.hasCredential('database', data)) {
-            const host = SERVICE_CLIENT[service];
-            if (host?.executeBatchQuery) {
+        let client;
+        if (this.hasCredential('database', data) && (client = this.getClient(service))) {
+            if (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));
                 }
                 if (ignoreErrors) {
-                    return host.executeBatchQuery.call(this, credential, batch, sessionKey);
+                    return client.executeBatchQuery.call(this, credential, batch, sessionKey);
                 }
                 try {
-                    return await host.executeBatchQuery.call(this, credential, batch, sessionKey);
+                    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 });
                     return Promise.reject(err);
                 }
             }
-            return Promise.reject((0, util_1.formatError)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
+            return Promise.reject((0, types_1.errorMessage)(service, "Execute query not supported" /* ERR_CLOUD.EXECUTE_QUERY_SUPPORT */));
         }
-        return Promise.reject((0, util_1.formatError)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
+        return Promise.reject((0, types_1.errorMessage)(service, "Invalid credentials" /* ERR_DB.CREDENTIALS */));
     }
     getCredential(item, unused) {
+        const service = item.service;
         let credential = item.credential, stored;
         if (typeof credential === 'string') {
-            const settings = this.getSettings(item.service);
+            const settings = this.getSettings(service);
             if ((0, types_1.isPlainObject)(settings)) {
                 credential = settings[credential];
                 stored = true;
@@ -683,7 +682,7 @@ class Cloud extends core_1.ClientDb {
         }
         if ((0, types_1.isPlainObject)(credential)) {
             item.credential = credential;
-            if (this.settingsOf(item.service, 'coerce', 'credential') === true) {
+            if (this.settingsOf(service, 'coerce', 'credential') === true) {
                 (0, types_1.coerceObject)(credential, stored);
             }
             return unused ? credential : { ...credential };
@@ -691,19 +690,7 @@ class Cloud extends core_1.ClientDb {
         return {};
     }
     getSettings(service) {
-        const settings = this.module;
-        switch (service) {
-            case 'az':
-                return settings.az || settings.azure;
-            case 'azure':
-                return settings.azure || settings.az;
-            case 'gcp':
-                return settings.gcp || settings.gcloud;
-            case 'gcloud':
-                return settings.gcloud || settings.gcp;
-            default:
-                return settings[service];
-        }
+        return this.module[service];
     }
     getStorage(action, data) {
         if ((0, types_1.isArray)(data)) {
@@ -731,9 +718,8 @@ class Cloud extends core_1.ClientDb {
         return result && this.hasCredential('storage', storage) ? result : false;
     }
     hasCredential(feature, data, credential = this.getCredential(data, true)) {
-        var _a;
         try {
-            const client = SERVICE_CLIENT[_a = data.service] || (SERVICE_CLIENT[_a] = require(this.resolveService(data.service)));
+            const client = this.getClient(data.service);
             switch (feature) {
                 case 'storage':
                     return typeof client.validateStorage === 'function' && client.validateStorage(credential, data);
@@ -754,60 +740,16 @@ class Cloud extends core_1.ClientDb {
     }
     resolveService(service, folder) {
         let result;
-        if (service[0] === '@') {
-            result = service;
-            if (!folder && !service.startsWith("@squared-functions/" /* NAMESPACE.SQUARED_FUNCTIONS */)) {
-                folder = 'client';
-            }
+        if (service[0] !== '@') {
+            result = this.settings.imports?.[service] || util_1.IMPORTS[service];
         }
-        else {
-            switch (service) {
-                case 'az':
-                    service = 'azure';
-                    break;
-                case 'gcloud':
-                    service = 'gcp';
-                    break;
-            }
-            switch (service) {
-                case 'atlas':
-                case 'aws':
-                case 'aws-v3':
-                case 'azure':
-                case 'gcp':
-                case 'ibm':
-                case 'minio':
-                case 'oci':
-                    result = "@pi-r/" /* NAMESPACE.PIR */ + service;
-                    break;
-                default:
-                    result = service;
-                    break;
-            }
+        else if (!folder && !service.startsWith("@squared-functions/" /* NAMESPACE.SQUARED_FUNCTIONS */)) {
+            folder = 'client';
         }
-        return result + (folder ? '/' + folder : '');
+        return (result || service) + (folder ? '/' + folder : '');
     }
     settingsOf(service, name, component) {
-        const settings = this.settings;
-        let options;
-        switch (service) {
-            case 'az':
-                options = settings.az ?? settings.azure;
-                break;
-            case 'azure':
-                options = settings.azure ?? settings.az;
-                break;
-            case 'gcp':
-                options = settings.gcp ?? settings.gcloud;
-                break;
-            case 'gcloud':
-                options = settings.gcloud ?? settings.gcp;
-                break;
-            default:
-                options = settings[service];
-                break;
-        }
-        const result = options?.[name];
+        const result = this.settings[service]?.[name];
         return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
     }
     commit() {
@@ -821,14 +763,24 @@ class Cloud extends core_1.ClientDb {
         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);
     }
     getClient(service) {
+        let client = SERVICE_CLIENT.get(service);
+        if (client) {
+            return client;
+        }
         try {
-            return SERVICE_CLIENT[service] || (SERVICE_CLIENT[service] = require(this.resolveService(service)));
+            if (client = require(this.resolveService(service))) {
+                client.CLOUD_SERVICE_NAME = service;
+                SERVICE_CLIENT.set(service, client);
+                return client;
+            }
         }
         catch {
-            throw (0, util_1.formatError)(service, "Cloud provider not found" /* ERR_CLOUD.PROVIDER_NOTFOUND */);
         }
+        throw (0, types_1.errorMessage)(service, "Cloud provider not found" /* ERR_CLOUD.PROVIDER_NOTFOUND */);
     }
 }
+Cloud.STORE_RESULT_PARTITION_SIZE = 16 /* CACHE_SIZE.CLOUD_PARTITION_SIZE */;
+Cloud.STORE_RESULT_PARTITION_MULT = 2 /* CACHE_SIZE.CLOUD_PARTITION_MULT */;
 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.5.3",
+  "version": "0.7.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.5.3",
-    "@e-mc/db": "0.5.3",
-    "@e-mc/types": "0.5.3"
+    "@e-mc/core": "0.7.0",
+    "@e-mc/db": "0.7.0",
+    "@e-mc/types": "0.7.0"
   }
 }

package/types/index.d.ts

@@ -3,6 +3,8 @@ import type { BucketWebsiteOptions, CloudAsset, CloudDatabase, CloudService, Clo
 import type { BatchQueryResult, QueryResult } from '../../types/lib/db';
 
 export interface ICloudServiceClient<T extends CloudDatabase = CloudDatabase> {
+    CLOUD_SERVICE_NAME: string;
+    CLOUD_UPLOAD_FROMDISK?: boolean;
     validateStorage?(credential: unknown, data?: CloudService): boolean;
     validateDatabase?(credential: unknown, data?: CloudService): boolean;
     createStorageClient?<U>(this: IModule, credential: unknown, service?: string): U;

package/util.d.ts

@@ -1,6 +1,12 @@
 import type { Readable } from 'stream';
 
+interface AuthValue {
+    username?: string;
+    password?: string;
+}
+
 declare namespace util {
+    const IMPORTS: Record<string, string | undefined>;
     function readableAsBuffer(stream: Readable): Promise<Buffer | null>;
     function generateFilename(filename: string): (i: number) => [string, boolean];
     function getBasicAuth(auth: AuthValue): string;

package/util.js

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasBasicAuth = exports.getBasicAuth = exports.formatError = exports.generateFilename = exports.readableAsBuffer = void 0;
+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");
 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"
+};
 function readableAsBuffer(stream) {
     return new Promise((resolve, reject) => {
         let result = null;