@e-mc/db 0.0.3 → 0.1.0

package/index.js

@@ -5,8 +5,8 @@ const types_1 = require("../types");
 const core_1 = require("../core");
 const request_1 = require("../request");
 const util_1 = require("./util");
-const DB_CLIENT = {};
-const POOL_CONFIG = {};
+const DB_CLIENT = new Map();
+const POOL_CONFIG = new Map();
 function sanitizePoolConfig(value) {
     value.min ?? (value.min = -1);
     value.max ?? (value.max = -1);
@@ -33,14 +33,13 @@ class Db extends core_1.ClientDb {
     static async purgeMemory(percent = 1, limit = 0, parent) {
         let result = 0;
         if (percent > 0 && percent <= 1) {
-            for (const name in DB_CLIENT) {
-                const client = DB_CLIENT[name];
-                const { purge } = POOL_CONFIG[name];
-                if (purge > 0) {
+            for (const [name, client] of DB_CLIENT) {
+                const config = POOL_CONFIG.get(name);
+                if (config && config.purge > 0) {
                     const checkTimeout = client.checkTimeout?.bind(client);
                     if (checkTimeout) {
                         try {
-                            result += await checkTimeout(purge, limit);
+                            result += await checkTimeout(config.purge, limit);
                         }
                         catch {
                         }
@@ -54,12 +53,12 @@ class Db extends core_1.ClientDb {
         for (const name in value) {
             const source = value[name];
             if ((0, types_1.isPlainObject)(source)) {
-                POOL_CONFIG[name] = sanitizePoolConfig(source);
+                POOL_CONFIG.set(name, sanitizePoolConfig(source));
             }
         }
     }
     static getPoolConfig(source) {
-        return POOL_CONFIG[source];
+        return POOL_CONFIG.get(source);
     }
     setCredential(item) {
         try {
@@ -120,7 +119,7 @@ class Db extends core_1.ClientDb {
             ({ disconnect, parallel } = parallel);
         }
         const terminate = () => {
-            this.applyState(batch, 8 /* TRANSACTION_DB.TERMINATE */);
+            this.applyState(batch, 8 /* DB_TRANSACTION.TERMINATE */);
             if (typeof disconnect === 'function') {
                 try {
                     disconnect();
@@ -130,7 +129,7 @@ class Db extends core_1.ClientDb {
             }
         };
         const cleanup = () => {
-            this.applyState(batch, 16 /* TRANSACTION_DB.ABORT */);
+            this.applyState(batch, 16 /* DB_TRANSACTION.ABORT */);
             terminate();
             if (outResult) {
                 for (let i = 0, length = outResult.length; i < length; ++i) {
@@ -161,7 +160,7 @@ class Db extends core_1.ClientDb {
             .catch(() => cleanup());
     }
     handleFail(err, item, options) {
-        this.add(item, 32 /* TRANSACTION_DB.FAIL */);
+        this.add(item, 32 /* DB_TRANSACTION.FAIL */);
         item.transactionFail = true;
         if (options && typeof options.errorQuery === 'function') {
             if (options.errorQuery(err, item, options.commandType)) {
@@ -186,7 +185,7 @@ class Db extends core_1.ClientDb {
         const tasks = (items || this.pending).map(data => {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.executeQuery(data).catch(() => {
-                this.applyState([data], 16 /* TRANSACTION_DB.ABORT */);
+                this.applyState([data], 16 /* DB_TRANSACTION.ABORT */);
                 return [];
             });
         });
@@ -224,18 +223,26 @@ class Db extends core_1.ClientDb {
         }
     }
     resolveSource(source, folder) {
-        let result, sep = path.sep;
-        if (source[0] === '@') {
-            if ((result = source).indexOf('/') === -1) {
-                folder || (folder = 'client');
+        let result;
+        if (source[0] !== '@') {
+            switch (source) {
+                case 'mongodb':
+                case 'mssql':
+                case 'mysql':
+                case 'oracle':
+                case 'postgres':
+                case 'redis':
+                    result = '@e-mc2/' + source;
+                    break;
+                default:
+                    result = source;
+                    break;
             }
-            sep = '/';
         }
-        else if (!Db.isDir(result = path.join(__dirname, source))) {
-            result = source;
-            sep = '/';
+        else if ((result = source).indexOf('/') === -1) {
+            folder || (folder = 'client');
         }
-        return result + (folder ? sep + folder : '');
+        return result + (folder ? '/' + folder : '');
     }
     getPoolConfig(source, uuidKey) {
         const config = Db.getPoolConfig(source);
@@ -262,15 +269,16 @@ class Db extends core_1.ClientDb {
         return util_1.SQL_COMMAND;
     }
     getClient(source) {
-        let client;
-        if (client = DB_CLIENT[source]) {
+        let client = DB_CLIENT.get(source);
+        if (client) {
             return client;
         }
         try {
             client = require(this.resolveSource(source));
             if (client?.DB_SOURCE_CLIENT) {
                 client.DB_SOURCE_NAME = source;
-                return DB_CLIENT[source] = client;
+                DB_CLIENT.set(source, client);
+                return client;
             }
         }
         catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/db",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "DB modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.0.3",
-    "@e-mc/request": "0.0.3"
+    "@e-mc/core": "0.1.0",
+    "@e-mc/request": "0.1.0",
+    "@e-mc/types": "0.1.0"
   }
 }

package/mongodb/index.d.ts

@@ -1,12 +0,0 @@
-import type { MongoDBDataSource, MongoDBFilterValue, MongoDBSortValue } from '../../types/lib/db';
-
-import type { IDbSourceClient } from '../types';
-
-import type { CommandOperationOptions, Document, Filter, Sort, SortDirection } from 'mongodb';
-
-declare const MongoDB: IDbSourceClient<MongoDBDataSource> & {
-    getFilterValue: (query: Filter<Document> | MongoDBFilterValue, coerce?: boolean) => [Filter<Document>, CommandOperationOptions?];
-    getSortValue: (sort: Sort | string | MongoDBSortValue, coerce?: boolean) => [Sort | string, SortDirection?];
-};
-
-export = MongoDB;