@pi-r/mariadb 0.7.2 → 0.7.4

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/mariadb
-
-https://e-mc.readthedocs.io/en/latest/db/mariadb.html
-
-### LICENSE
-
+### @pi-r/mariadb
+
+https://e-mc.readthedocs.io/en/latest/db/mariadb.html
+
+### 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/pool.js

@@ -0,0 +1,56 @@
+"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 asString(credential) {
+        if ((credential.host || credential.socketPath) && credential.user) {
+            return JSON.stringify(this.removeUUIDKey(credential));
+        }
+        return super.asString(credential);
+    }
+    static sanitize(credential) {
+        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('utf-8') };
+            }
+            else if ((0, types_1.isArray)(cert)) {
+                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf-8') : 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;
+    }
+}
+MariaDBPool.CACHE_UNUSED = ['connectTimeout', 'socketTimeout', 'compress', 'keepAliveDelay', 'acquireTimeout', 'connectionLimit', 'idleTimeout', 'initializationTimeout', 'minDelayValidation', 'minimumIdle', 'resetAfterUse', 'noControlAfterUse', 'leakDetectionTimeout'];
+module.exports = MariaDBPool;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/mariadb",
-  "version": "0.7.2",
-  "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.9.4",
-    "@e-mc/types": "^0.9.4",
-    "mariadb": "^3.3.1"
-  }
-}
+{
+  "name": "@pi-r/mariadb",
+  "version": "0.7.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.9.12",
+    "@e-mc/types": "^0.9.12",
+    "mariadb": "^3.3.2"
+  }
+}

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, 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, MariaDBCredential, string>, ExecuteAction<T> {
+    source: "mariadb";
+}
+
+export interface MariaDBCredential extends ServerAuth, Omit<PoolConfig, "ssl"> {
+    ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
 }