@e-mc/db 0.11.7 → 0.12.0

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/db
 
-* NodeJS 16 LTS
-* ES2021
+* NodeJS 18
+* ES2022
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.0/lib/index.d.ts)
 
 ```typescript
 import type { DbDataSource } from "./squared";
@@ -88,7 +88,9 @@ interface IDbPool {
 
 interface DbPoolConstructor {
     CACHE_UNUSED: readonly string[];
+    CACHE_IGNORE: readonly string[];
     asString(credential: unknown): string;
+    canCache(credential: unknown): boolean;
     sanitize(credential: unknown): unknown;
     removeUUIDKey(credential: unknown): unknown;
     findKey(pools: Record<string, IDbPool>, uuidKey: unknown, poolKey: string | undefined, ...items: DbDataSource[]): Record<string, IDbPool> | null;
@@ -204,11 +206,11 @@ const [rows1, rows2] = await instance.executeBatchQuery([
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -4,6 +4,7 @@ const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const request_1 = require("@e-mc/request");
 const util_1 = require("@e-mc/db/util");
+const kDb = Symbol.for('db:constructor');
 const DB_CLIENT = new Map();
 const POOL_CONFIG = new Map();
 function sanitizePoolConfig(value) {
@@ -14,23 +15,14 @@ function sanitizePoolConfig(value) {
     value.queue_idle ??= -1;
     value.purge ??= 0;
     value.timeout ??= -1;
+    value.server_timeout ??= -1;
     value.socket_timeout ??= -1;
     return value;
 }
-function setCert(instance, items, cache) {
-    if (Array.isArray(items)) {
-        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 instance.readTLSCert(items, cache);
-    }
-}
 class Db extends core_1.ClientDb {
-    constructor() {
-        super(...arguments);
-        this._moduleName = 'db';
-        this._threadable = true;
-    }
+    static [kDb] = true;
+    static STORE_RESULT_PARTITION_SIZE = 16;
+    static STORE_RESULT_PARTITION_MULT = 2;
     static async purgeMemory(percent = 1, limit = 0, parent) {
         let result = 0;
         if (percent > 0 && percent <= 1) {
@@ -61,6 +53,8 @@ class Db extends core_1.ClientDb {
     static getPoolConfig(source) {
         return POOL_CONFIG.get(source);
     }
+    _moduleName = 'db';
+    _threadable = true;
     async setCredential(item) {
         try {
             return this.getClient(item.source).setCredential.call(this, item);
@@ -239,17 +233,17 @@ class Db extends core_1.ClientDb {
         if ((0, types_1.isPlainObject)(options)) {
             const { ca, cert, key } = options;
             if (ca) {
-                options.ca = setCert(this, ca);
+                options.ca = this.#checkCert(ca);
             }
             if (cert) {
-                options.cert = setCert(this, cert);
+                options.cert = this.#checkCert(cert);
             }
             if (key) {
                 if ((0, types_1.isString)(key)) {
                     options.key = this.readTLSCert(key, cache);
                 }
                 else if ((0, types_1.isArray)(key)) {
-                    options.key = key.map(item => (0, types_1.isString)(item) ? { pem: this.readTLSCert(item, cache) } : Buffer.isBuffer(item) ? { pem: item.toString('utf-8') } : item).filter(item => item.pem);
+                    options.key = key.map(item => (0, types_1.isString)(item) ? { pem: this.readTLSCert(item, cache) } : Buffer.isBuffer(item) ? { pem: item.toString('utf8') } : item).filter(item => item.pem);
                 }
             }
         }
@@ -284,12 +278,6 @@ class Db extends core_1.ClientDb {
         }
         return config;
     }
-    get sourceType() {
-        return types_1.DB_TYPE;
-    }
-    get commandType() {
-        return util_1.SQL_COMMAND;
-    }
     getClient(source) {
         let client = DB_CLIENT.get(source);
         if (client) {
@@ -307,9 +295,21 @@ class Db extends core_1.ClientDb {
         }
         throw (0, types_1.errorMessage)(source, "Database provider not found");
     }
+    #checkCert(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);
+        }
+        if ((0, types_1.isString)(items)) {
+            return this.readTLSCert(items, cache);
+        }
+    }
+    get sourceType() {
+        return types_1.DB_TYPE;
+    }
+    get commandType() {
+        return util_1.SQL_COMMAND;
+    }
 }
-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.11.7",
+  "version": "0.12.0",
   "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.11.7",
-    "@e-mc/request": "0.11.7",
-    "@e-mc/types": "0.11.7"
+    "@e-mc/core": "0.12.0",
+    "@e-mc/request": "0.12.0",
+    "@e-mc/types": "0.12.0"
   }
 }

package/pool.js

@@ -1,15 +1,25 @@
 "use strict";
-var _a, _b, _c;
 const crypto = require("node: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 {
+    client;
+    poolKey;
+    uuidKey;
+    static CACHE_UNUSED = [];
+    static CACHE_IGNORE = [];
     static asString(credential) {
         return crypto.randomUUID();
     }
+    static canCache(credential) {
+        const properties = this.CACHE_IGNORE;
+        for (let i = 0, length = properties.length; i < length; ++i) {
+            if (credential[properties[i]] !== undefined) {
+                return true;
+            }
+        }
+        return false;
+    }
     static sanitize(credential) {
         const properties = this.CACHE_UNUSED;
         let result;
@@ -80,19 +90,19 @@ class DbPool {
         }
         return result;
     }
+    success = 0;
+    failed = 0;
+    lastAccessed = 0;
+    #parent = null;
+    #items = new WeakSet();
+    #idleStats = { success: -1, failed: -1, count: 0, error: 0 };
     constructor(client, poolKey, uuidKey = null) {
         this.client = client;
         this.poolKey = poolKey;
         this.uuidKey = uuidKey;
-        this.success = 0;
-        this.failed = 0;
-        this.lastAccessed = 0;
-        this[_a] = new WeakSet();
-        this[_b] = null;
-        this[_c] = { success: -1, failed: -1, count: 0, error: 0 };
     }
     add(item, uuidKey) {
-        this[kItems].add(item);
+        this.#items.add(item);
         if (uuidKey ||= this.uuidKey?.password) {
             (0, util_1.setUUIDKey)(item, uuidKey);
         }
@@ -100,10 +110,10 @@ class DbPool {
         return this;
     }
     has(item) {
-        return this[kItems].has(item);
+        return this.#items.has(item);
     }
     remove() {
-        const parent = this[kParent];
+        const parent = this.#parent;
         if (parent) {
             delete parent[this.poolKey];
         }
@@ -120,22 +130,22 @@ class DbPool {
             return true;
         }
         const { success, failed } = this;
-        const previous = this[kIdlePrevious];
+        const stats = this.#idleStats;
         let count = 0, error = 0;
-        if (success === previous.success && failed >= previous.failed) {
-            count = ++previous.count;
-            if (failed > previous.failed) {
-                error = ++previous.error;
+        if (success === stats.success && failed >= stats.failed) {
+            count = ++stats.count;
+            if (failed > stats.failed) {
+                error = ++stats.error;
             }
         }
         else {
-            previous.count = 0;
-            if (failed === previous.failed) {
-                previous.error = 0;
+            stats.count = 0;
+            if (failed === stats.failed) {
+                stats.error = 0;
             }
         }
-        previous.success = success;
-        previous.failed = failed;
+        stats.success = success;
+        stats.failed = failed;
         return Date.now() - timeout >= this.lastAccessed && (this.closeable || count >= (this.uuidKey ? 10 : 5)) || error >= (this.uuidKey ? 3 : 2);
     }
     get persist() {
@@ -155,9 +165,7 @@ class DbPool {
     }
     set parent(value) {
         value[this.poolKey] = this;
-        this[kParent] = value;
+        this.#parent = value;
     }
 }
-_a = kItems, _b = kParent, _c = kIdlePrevious;
-DbPool.CACHE_UNUSED = [];
 module.exports = DbPool;

package/util.d.ts

@@ -5,8 +5,6 @@ import type { AuthValue } from '@e-mc/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;
     function hasBasicAuth(value: string): boolean;

package/util.js

@@ -1,11 +1,10 @@
 "use strict";
-exports.hasBasicAuth = exports.getBasicAuth = exports.IMPORTS = exports.SQL_COMMAND = void 0;
+exports.hasBasicAuth = exports.getBasicAuth = 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; } });