@e-mc/db 0.9.9 → 0.10.1

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.9/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.1/lib/index.d.ts)
 
 ```typescript
 import type { DbDataSource } from "./squared";
@@ -73,7 +73,7 @@ interface IDbPool {
     uuidKey: AuthValue | null;
     add(item: DbDataSource, uuidKey?: string): this;
     has(item: DbDataSource): boolean;
-    getConnection(): Promise<unknown>;
+    getConnection(credential?: unknown): Promise<unknown>;
     remove(): void;
     detach(force?: boolean): Promise<void>;
     close(): Promise<void>;
@@ -87,6 +87,10 @@ interface IDbPool {
 }
 
 interface DbPoolConstructor {
+    CACHE_UNUSED: readonly string[];
+    asString(credential: unknown): string;
+    sanitize(credential: unknown): unknown;
+    removeUUIDKey(credential: unknown): unknown;
     findKey(pools: Record<string, IDbPool>, uuidKey: unknown, poolKey: string | undefined, ...items: DbDataSource[]): Record<string, IDbPool> | null;
     validateKey(pools: Record<string, IDbPool>, username: string, uuidKey: unknown): [string, Record<string, IDbPool> | null];
     checkTimeout(pools: Record<string, IDbPool>, value: number, limit?: number): Promise<number>;
@@ -200,11 +204,11 @@ const [rows1, rows2] = await instance.executeBatchQuery([
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.9/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.9/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.9/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.9/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.9/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -1,8 +1,8 @@
 "use strict";
 const path = require("path");
-const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const request_1 = require("@e-mc/request");
+const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const DB_CLIENT = new Map();
 const POOL_CONFIG = new Map();
@@ -17,12 +17,12 @@ function sanitizePoolConfig(value) {
     value.socket_timeout ?? (value.socket_timeout = -1);
     return value;
 }
-function setCert(items, cache) {
+function setCert(instance, items, cache) {
     if (Array.isArray(items)) {
-        return items.map(cert => (0, types_1.isString)(cert) ? this.readTLSCert(cert, cache) : Buffer.isBuffer(cert) ? cert : null).filter(cert => cert);
+        return items.map(cert => (0, types_1.isString)(cert) ? instance.readTLSCert(cert, cache) : Buffer.isBuffer(cert) ? cert : null).filter(cert => cert);
     }
     if ((0, types_1.isString)(items)) {
-        return this.readTLSCert(items, cache);
+        return instance.readTLSCert(items, cache);
     }
 }
 class Db extends core_1.ClientDb {
@@ -128,12 +128,7 @@ class Db extends core_1.ClientDb {
         if (typeof options === 'function') {
             options = { errorQuery: options };
         }
-        try {
-            return this.getClient(item.source).executeQuery.call(this, item, options);
-        }
-        catch (err) {
-            return Promise.reject(err);
-        }
+        return this.getClient(item.source).executeQuery.call(this, item, options);
     }
     async executeBatchQuery(batch, options, outResult) {
         if (this.aborted) {
@@ -142,12 +137,7 @@ class Db extends core_1.ClientDb {
         if (typeof options === 'function') {
             options = { errorQuery: options };
         }
-        try {
-            return this.getClient(batch[0].source).executeBatchQuery.call(this, batch, options, outResult);
-        }
-        catch (err) {
-            return Promise.reject(err);
-        }
+        return this.getClient(batch[0].source).executeBatchQuery.call(this, batch, options, outResult);
     }
     async processRows(batch, tasks, parallel, outResult) {
         let disconnect;
@@ -184,6 +174,12 @@ class Db extends core_1.ClientDb {
         }
         return Promise.all(tasks)
             .then(result => {
+            for (let i = 0, length = batch.length; i < length; ++i) {
+                const flat = batch[i].flat || 0;
+                if (flat > 0 && Array.isArray(result[i])) {
+                    result[i] = result[i].flat(flat);
+                }
+            }
             terminate();
             if (outResult) {
                 for (let i = 0, length = outResult.length; i < length; ++i) {
@@ -193,12 +189,12 @@ class Db extends core_1.ClientDb {
             }
             return result;
         })
-            .catch(() => cleanup());
+            .catch(cleanup);
     }
     handleFail(err, item, options) {
         this.add(item, 32);
         item.transactionFail = true;
-        if (options && typeof options.errorQuery === 'function') {
+        if (typeof options?.errorQuery === 'function') {
             if (options.errorQuery(err, item, options.commandType)) {
                 if (item.willAbort) {
                     this.abort(err);
@@ -243,10 +239,10 @@ class Db extends core_1.ClientDb {
         if ((0, types_1.isPlainObject)(options)) {
             const { ca, cert, key } = options;
             if (ca) {
-                options.ca = setCert.call(this, ca);
+                options.ca = setCert(this, ca);
             }
             if (cert) {
-                options.cert = setCert.call(this, cert);
+                options.cert = setCert(this, cert);
             }
             if (key) {
                 if ((0, types_1.isString)(key)) {
@@ -261,7 +257,7 @@ class Db extends core_1.ClientDb {
     resolveSource(source, folder) {
         let result;
         if (!source.startsWith('@')) {
-            result = this.settings.imports?.[source] || util_1.IMPORTS[source];
+            result = this.settings.imports?.[source] || types_1.IMPORT_MAP[source];
         }
         else if (!folder && !source.includes('/')) {
             folder = 'client';
@@ -316,5 +312,4 @@ Db.STORE_RESULT_PARTITION_SIZE = 16;
 Db.STORE_RESULT_PARTITION_MULT = 2;
 Object.freeze(types_1.DB_TYPE);
 Object.freeze(util_1.SQL_COMMAND);
-
 module.exports = Db;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/db",
-  "version": "0.9.9",
+  "version": "0.10.1",
   "description": "DB modules 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.9.9",
-    "@e-mc/request": "0.9.9",
-    "@e-mc/types": "0.9.9"
+    "@e-mc/core": "0.10.1",
+    "@e-mc/request": "0.10.1",
+    "@e-mc/types": "0.10.1"
   }
 }

package/pool.js

@@ -1,11 +1,34 @@
 "use strict";
 var _a, _b, _c;
+const crypto = require("crypto");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const kItems = Symbol('items');
 const kParent = Symbol('parent');
 const kIdlePrevious = Symbol('idlePrevious');
 class DbPool {
+    static asString(credential) {
+        return crypto.randomUUID();
+    }
+    static sanitize(credential) {
+        const properties = this.CACHE_UNUSED;
+        let result;
+        for (let i = 0, length = properties.length; i < length; ++i) {
+            const attr = properties[i];
+            if (attr in credential) {
+                result || (result = { ...credential });
+                result[attr] = undefined;
+            }
+        }
+        return result || credential;
+    }
+    static removeUUIDKey(credential) {
+        if ('uuidKey' in credential) {
+            credential = { ...credential };
+            delete credential.uuidKey;
+        }
+        return credential;
+    }
     static findKey(pools, uuidKey, poolKey, ...items) {
         if (uuidKey) {
             let pool;
@@ -20,7 +43,7 @@ class DbPool {
             }
             if (pool || poolKey && (pool = pools[poolKey])) {
                 if (!pool.closed) {
-                    return items.length && !items.some(item => pool.has(item)) ? null : pool;
+                    return items.length > 0 && !items.some(item => pool.has(item)) ? null : pool;
                 }
                 pool.remove();
             }
@@ -136,5 +159,5 @@ class DbPool {
     }
 }
 _a = kItems, _b = kParent, _c = kIdlePrevious;
-
+DbPool.CACHE_UNUSED = [];
 module.exports = DbPool;

package/util.d.ts

@@ -5,6 +5,7 @@ import type { AuthValue } from '../types/lib/http';
 
 declare namespace util {
     const SQL_COMMAND: SQL_COMMAND;
+    /** @deprecated Types.IMPORT_MAP */
     const IMPORTS: Record<string, string | undefined>;
     function getBasicAuth(auth: AuthValue): string;
     function getBasicAuth(username: unknown, password?: unknown): string;

package/util.js

@@ -1,6 +1,11 @@
 "use strict";
-exports.hasBasicAuth = exports.getBasicAuth = exports.setUUIDKey = exports.checkEmpty = exports.parseConnectionString = exports.parseServerAuth = exports.IMPORTS = exports.SQL_COMMAND = void 0;
+exports.hasBasicAuth = exports.getBasicAuth = exports.IMPORTS = exports.SQL_COMMAND = void 0;
+exports.parseServerAuth = parseServerAuth;
+exports.parseConnectionString = parseConnectionString;
+exports.checkEmpty = checkEmpty;
+exports.setUUIDKey = setUUIDKey;
 const types_1 = require("@e-mc/types");
+Object.defineProperty(exports, "IMPORTS", { enumerable: true, get: function () { return types_1.IMPORT_MAP; } });
 const util_1 = require("@e-mc/request/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; } });
@@ -11,15 +16,6 @@ var SQL_COMMAND;
     SQL_COMMAND[SQL_COMMAND["UPDATE"] = 3] = "UPDATE";
     SQL_COMMAND[SQL_COMMAND["DELETE"] = 4] = "DELETE";
 })(SQL_COMMAND || (exports.SQL_COMMAND = SQL_COMMAND = {}));
-exports.IMPORTS = {
-    "mongodb": "@pi-r/mongodb",
-    "redis": "@pi-r/redis",
-    "mysql": "@pi-r/mysql",
-    "postgres": "@pi-r/postgres",
-    "mssql": "@pi-r/mssql",
-    "oracle": "@pi-r/oracle",
-    "mariadb": "@pi-r/mariadb"
-};
 function parseServerAuth(credential, port, all) {
     if (typeof port === 'boolean') {
         all = port;
@@ -83,7 +79,6 @@ function parseServerAuth(credential, port, all) {
     }
     return { protocol, server, hostname, port, username, password, database };
 }
-exports.parseServerAuth = parseServerAuth;
 function parseConnectionString(value, scheme = 'http') {
     if (!/^[^:]+:\/\//.test(value)) {
         value = scheme + '://' + value;
@@ -97,11 +92,9 @@ function parseConnectionString(value, scheme = 'http') {
         return null;
     }
 }
-exports.parseConnectionString = parseConnectionString;
 function checkEmpty(value) {
     return value === undefined || value === null ? false : value === 0 || (value instanceof Set || value instanceof Map ? value.size === 0 : (Array.isArray(value) || (0, types_1.isObject)(value)) && value.length === 0);
 }
-exports.checkEmpty = checkEmpty;
 function setUUIDKey(item, value) {
     var _a;
     if ((0, types_1.isString)(value)) {
@@ -111,4 +104,3 @@ function setUUIDKey(item, value) {
         (_a = item.credential).uuidKey || (_a.uuidKey = value);
     }
 }
-exports.setUUIDKey = setUUIDKey;