@e-mc/cloud 0.0.1 → 0.0.3

package/index.js

@@ -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" /* CMD_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
+                                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /* VAL_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
                                         result || (result = destUri);
                                     }
                                     catch (err) {
@@ -753,11 +753,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) {
-        let result, sep = path.sep;
+        let result;
         if (service[0] === '@') {
             result = service;
             folder || (folder = 'client');
-            sep = '/';
         }
         else {
             switch (service) {
@@ -768,12 +767,23 @@ class Cloud extends core_1.ClientDb {
                     service = 'gcp';
                     break;
             }
-            if (!Cloud.isDir(result = path.join(__dirname, service))) {
-                result = service;
-                sep = '/';
+            switch (service) {
+                case 'atlas':
+                case 'aws':
+                case 'aws-v3':
+                case 'azure':
+                case 'gcp':
+                case 'ibm':
+                case 'minio':
+                case 'oci':
+                    result = '@e-mc2/' + service;
+                    break;
+                default:
+                    result = service;
+                    break;
             }
         }
-        return result + (folder ? sep + folder : '');
+        return result + (folder ? '/' + folder : '');
     }
     settingsOf(service, name, component) {
         const settings = this.settings;
@@ -806,7 +816,7 @@ class Cloud extends core_1.ClientDb {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.getDatabaseRows(data, true);
         });
-        return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries" /* CMD_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" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     getClient(service) {
         try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.0.1",
-  "description": "Cloud constructor for e-mc.",
+  "version": "0.0.3",
+  "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
   "publishConfig": {
@@ -20,7 +20,7 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.0.1",
-    "@e-mc/db": "0.0.1"
+    "@e-mc/core": "0.0.3",
+    "@e-mc/db": "0.0.3"
   }
 }

package/atlas/index.js

@@ -1,193 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectId = exports.executeBatchQuery = exports.executeQuery = exports.createDatabaseClient = exports.validateDatabase = void 0;
-const types_1 = require("../../types");
-const mongodb_1 = require("../../db/mongodb");
-const util_1 = require("../util");
-const module_1 = require("../../module");
-const MONGODB_V3 = module_1.default.checkSemVer('mongodb', 1, 4);
-function sanitizeCredentials(item, credential) {
-    const { username, password } = credential;
-    if (username) {
-        const auth = password ? { username, password } : { username };
-        if (MONGODB_V3) {
-            credential.auth = password || !credential.auth || !credential.auth.password ? auth : credential.auth;
-        }
-        else {
-            credential.auth || (credential.auth = auth);
-        }
-        delete credential.username;
-    }
-    if (password) {
-        delete credential.password;
-    }
-    if (MONGODB_V3 && credential.auth) {
-        if (!(0, util_1.hasBasicAuth)(item.uri)) {
-            const auth = (0, util_1.getBasicAuth)(credential.auth);
-            if (auth) {
-                const url = item.uri.split('://');
-                item.uri = url[0] + '://' + auth + url[1];
-            }
-        }
-        delete credential.auth;
-    }
-}
-function validateDatabase(credential, data) {
-    const auth = credential.auth;
-    return !!(data.table && (auth?.username || credential.username || module_1.default.isURL(data.uri) && (0, util_1.hasBasicAuth)(data.uri)));
-}
-exports.validateDatabase = validateDatabase;
-function createDatabaseClient(credential, data) {
-    try {
-        sanitizeCredentials(data, credential);
-        const { MongoClient } = require('mongodb');
-        return new MongoClient(data.uri, credential);
-    }
-    catch (err) {
-        this.checkPackage(err, 'mongodb', { passThrough: true });
-        throw err;
-    }
-}
-exports.createDatabaseClient = createDatabaseClient;
-async function executeQuery(credential, data, sessionKey) {
-    return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
-}
-exports.executeQuery = executeQuery;
-async function executeBatchQuery(credential, batch, sessionKey) {
-    const length = batch.length;
-    const result = new Array(length);
-    const clients = {};
-    const caching = length > 0 && this.hasCache(batch[0].service, sessionKey);
-    const coercing = this.hasCoerce('atlas', 'options');
-    const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
-    const createClient = async (item, options) => {
-        var _a;
-        return clients[_a = item.uri + module_1.default.asString(options, true)] || (clients[_a] = await createDatabaseClient.call(this, options, item).connect());
-    };
-    const closeClient = () => {
-        for (const key in clients) {
-            clients[key].close();
-        }
-    };
-    for (let i = 0; i < length; ++i) {
-        const item = batch[i];
-        const { service, name, table, id, aggregate, sort, client, ignoreCache } = item;
-        if (!table) {
-            closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
-        }
-        let { query, update, limit = 0 } = item;
-        if (id && (!query || limit === 1)) {
-            query = getObjectId(id);
-            limit = 1;
-        }
-        const renewCache = ignoreCache === 0;
-        const options = item.options ? length === 1 && !MONGODB_V3 ? Object.assign(item.options, credential) : { ...item.options, ...credential } : length === 1 && !MONGODB_V3 ? credential : { ...credential };
-        let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? (name || '') + '_' + table + '_' + limit + module_1.default.asString(options, true) + (sort ? module_1.default.asString(sort, true) : '') + (client ? module_1.default.asString(client, true) : '') : '', auth, pipeline;
-        if (queryString) {
-            sanitizeCredentials(item, options);
-            auth = { uri: item.uri, options };
-        }
-        const getCache = () => {
-            if (ignoreCache === 1) {
-                return;
-            }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, auth, queryString, cacheValue);
-        };
-        const getCollection = (mongoClient) => mongoClient.db(name, client?.db).collection(table, client?.collection);
-        if (aggregate) {
-            pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
-        }
-        if (pipeline || query) {
-            if (queryString) {
-                queryString += module_1.default.asString(aggregate || query, true);
-                if ((aggregate || !update) && (rows = getCache())) {
-                    result[i] = rows;
-                    continue;
-                }
-            }
-            const collection = getCollection(await createClient(item, options));
-            if (pipeline) {
-                const aggregateOptions = aggregate?.options;
-                if (coercing) {
-                    pipeline.forEach(doc => (0, types_1.coerceObject)(doc));
-                    if (aggregateOptions) {
-                        (0, types_1.coerceObject)(aggregateOptions);
-                    }
-                }
-                const items = collection.aggregate(pipeline, aggregateOptions);
-                if (sort) {
-                    items.sort((0, mongodb_1.getSortValue)(sort, coercing)[0]);
-                }
-                if (limit > 0) {
-                    items.limit(limit);
-                }
-                rows = await items.toArray();
-            }
-            else {
-                const updateType = item.updateType;
-                const [filter, command] = (0, mongodb_1.getFilterValue)(query, coercing);
-                if (update && coercing) {
-                    (0, types_1.coerceObject)(update);
-                }
-                if ((0, types_1.isArray)(update)) {
-                    const insertOptions = item.execute?.insert;
-                    if (insertOptions) {
-                        await collection.insertMany(update, coercing ? (0, types_1.coerceObject)(insertOptions) : insertOptions);
-                    }
-                    else {
-                        await collection.insertMany(update);
-                    }
-                    update = undefined;
-                }
-                else if (updateType === 1) {
-                    update = undefined;
-                }
-                if (limit === 1) {
-                    const document = update ? await collection[updateType === 2 ? 'findOneAndReplace' : updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, command) : await collection.findOne(filter, command);
-                    rows = document ? [document] : [];
-                }
-                else {
-                    if (update) {
-                        await collection.updateMany(filter, update);
-                    }
-                    const items = collection.find(filter, command);
-                    if (sort) {
-                        items.sort(...(0, mongodb_1.getSortValue)(sort, coercing));
-                    }
-                    if (limit > 1) {
-                        items.limit(limit);
-                    }
-                    rows = await items.toArray();
-                }
-            }
-        }
-        else if (!aggregate) {
-            if (queryString && (rows = getCache())) {
-                result[i] = rows;
-                continue;
-            }
-            const items = getCollection(await createClient(item, options)).find();
-            if (sort) {
-                items.sort(...(0, mongodb_1.getSortValue)(sort, coercing));
-            }
-            if (limit > 0) {
-                items.limit(limit);
-            }
-            rows = await items.toArray();
-        }
-        else {
-            queryString = '';
-        }
-        result[i] = this.setQueryResult(service, auth, queryString, rows, cacheValue);
-    }
-    closeClient();
-    return result;
-}
-exports.executeBatchQuery = executeBatchQuery;
-function getObjectId(value) {
-    const { ObjectId } = require('mongodb');
-    return { '_id': new ObjectId(value) };
-}
-exports.getObjectId = getObjectId;

package/aws/download/index.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const types_1 = require("../../../types");
-const module_1 = require("../../../module");
-const index_2 = require("../../index");
-function download(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
-    const s3 = index_1.createStorageClient.call(this, credential, service, sdk);
-    return (data, callback) => {
-        const { bucket: Bucket, download: target } = data;
-        const Key = target.filename;
-        if (!Bucket || !Key) {
-            callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
-            return;
-        }
-        const location = module_1.default.joinPath(Bucket, Key);
-        const params = { Bucket, Key, VersionId: target.versionId };
-        s3.getObject(params, (err, result) => {
-            if (!err) {
-                callback(null, result.Body);
-                const deleteObject = target.deleteObject;
-                if (deleteObject) {
-                    s3.deleteObject((0, types_1.isPlainObject)(deleteObject) ? Object.assign(deleteObject, params) : params, error => {
-                        if (!error) {
-                            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* CMD_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE });
-                        }
-                        else {
-                            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], error, { ...index_2.default.LOG_CLOUD_FAIL, fatal: !!target.active });
-                        }
-                    });
-                }
-            }
-            else {
-                callback(err);
-            }
-        });
-    };
-}
-exports.default = download;
-
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}