@pi-r/mariadb 0.3.4 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/mariadb
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/mariadb
+
+## LICENSE
+
 MIT

package/client/index.d.ts

@@ -1,11 +1,11 @@
-import type { IDb } from '@e-mc/types/lib';
-
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { MariaDBCredential, MariaDBDataSource } from '../types';
-
-declare const MariaDB: IDbSourceClient<MariaDBDataSource> & {
-    setAuthentication(this: IDb, credential: MariaDBCredential): void;
-};
-
+import type { IDb } from '@e-mc/types/lib';
+
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { MariaDBCredential, MariaDBDataSource } from '../types';
+
+declare const MariaDB: IDbSourceClient<MariaDBDataSource> & {
+    setAuthentication(this: IDb, credential: MariaDBCredential): void;
+};
+
 export = MariaDB;

package/client/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
-const mariadb = require("mariadb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -60,6 +59,7 @@ function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
     credential.host || (credential.host = auth.hostname);
     credential.user || (credential.user = auth.username);
+    credential.port || (credential.port = 3306);
     if ((0, types_1.isPlainObject)(credential.ssl)) {
         this.readTLSConfig(credential.ssl);
     }
@@ -111,6 +111,7 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
+            const { createPool } = require("mariadb");
             const config = this.getPoolConfig("mariadb", password);
             if (config) {
                 const { max, idle } = config;
@@ -121,7 +122,7 @@ function setCredential(item) {
                     (_b = credential.idleTimeout) !== null && _b !== void 0 ? _b : (credential.idleTimeout = idle);
                 }
             }
-            new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MariaDBPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -138,6 +139,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
+    const db = require("mariadb");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -203,7 +205,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await mariadb.createConnection(removeUUIDKey(mariaDBCredential || credential)));
+            clients.push(client = await db.createConnection(removeUUIDKey(mariaDBCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {

package/client/pool.js

@@ -0,0 +1,60 @@
+"use strict";
+const types_1 = require("@e-mc/types");
+const DbPool = require('@e-mc/db/pool');
+const POOL_ACTIVE = new WeakSet();
+class MariaDBPool extends DbPool {
+    static CACHE_UNUSED = ['connectTimeout', 'socketTimeout', 'compress', 'keepAliveDelay', 'acquireTimeout', 'connectionLimit', 'idleTimeout', 'initializationTimeout', 'minDelayValidation', 'minimumIdle', 'resetAfterUse', 'noControlAfterUse', 'leakDetectionTimeout'];
+    static CACHE_IGNORE = ['initSql', 'sessionVariables', 'stream', 'infileStreamFactory'];
+    static asString(credential) {
+        if ((credential.host || credential.socketPath) && credential.user) {
+            return JSON.stringify(this.removeUUIDKey(credential));
+        }
+        return super.asString(credential);
+    }
+    static sanitize(credential) {
+        if (!this.canCache(credential)) {
+            return;
+        }
+        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
+            return credential;
+        }
+        const ssl = credential.ssl;
+        let result = super.sanitize(credential);
+        if ((0, types_1.isObject)(ssl)) {
+            if (result === credential) {
+                result = { ...credential };
+            }
+            const cert = ssl.cert;
+            if ((0, types_1.isString)(cert)) {
+                result.ssl = { cert };
+            }
+            else if (Buffer.isBuffer(cert)) {
+                result.ssl = { cert: cert.toString('utf8') };
+            }
+            else if ((0, types_1.isArray)(cert)) {
+                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '') };
+            }
+            else {
+                result.ssl = { cert: "Unknown" };
+            }
+        }
+        return result;
+    }
+    async getConnection(credential) {
+        if (credential) {
+            POOL_ACTIVE.add(credential);
+        }
+        return this.client.getConnection();
+    }
+    async close() {
+        return this.client.end();
+    }
+    isEmpty() {
+        const client = this.client;
+        return this.closed || client.activeConnections() === 0 && client.taskQueueSize() === 0;
+    }
+    get closed() {
+        return this.client.closed;
+    }
+}
+module.exports = MariaDBPool;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/mariadb",
-  "version": "0.3.4",
-  "description": "MariaDB client driver for E-mc.",
-  "main": "client/index.js",
-  "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/db/mariadb"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.6.3",
-    "@e-mc/types": "^0.6.3",
-    "mariadb": "^3.3.0"
-  }
-}
+{
+  "name": "@pi-r/mariadb",
+  "version": "0.3.6",
+  "description": "MariaDB client driver for E-mc.",
+  "main": "client/index.js",
+  "types": "client/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/db/mariadb"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/db": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "mariadb": "^3.3.1"
+  }
+}

package/types/index.d.ts

@@ -1,15 +1,15 @@
-import type { DbDataSource } from '@e-mc/types/lib/squared';
-
-import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
-
-import type { SecureContextOptions } from 'tls';
-
-import type { PoolConfig, QueryConfig } from 'mariadb';
-
-export interface MariaDBDataSource<T = unknown> extends DbDataSource<string | QueryConfig, unknown, unknown, string | MariaDBCredential, string>, ExecuteAction<T> {
-    source: "mariadb";
-}
-
-export interface MariaDBCredential extends ServerAuth, Omit<PoolConfig, "ssl"> {
-    ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
+
+import type { SecureContextOptions } from 'tls';
+
+import type { PoolConfig, QueryConfig } from 'mariadb';
+
+export interface MariaDBDataSource<T = unknown> extends DbDataSource<string | QueryConfig, unknown, unknown, string | MariaDBCredential, string>, ExecuteAction<T> {
+    source: "mariadb";
+}
+
+export interface MariaDBCredential extends ServerAuth, Omit<PoolConfig, "ssl"> {
+    ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
 }