@e-mc/db 0.5.4 → 0.5.6

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+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:
 

package/index.js

@@ -8,12 +8,13 @@ const util_1 = require("@e-mc/db/util");
 const DB_CLIENT = new Map();
 const POOL_CONFIG = new Map();
 function sanitizePoolConfig(value) {
-    value.min ?? (value.min = -1);
-    value.max ?? (value.max = -1);
-    value.idle ?? (value.idle = -1);
-    value.queue_max ?? (value.queue_max = -1);
-    value.queue_idle ?? (value.queue_idle = -1);
-    value.purge ?? (value.purge = 0);
+    var _a, _b, _c, _d, _e, _f;
+    (_a = value.min) !== null && _a !== void 0 ? _a : (value.min = -1);
+    (_b = value.max) !== null && _b !== void 0 ? _b : (value.max = -1);
+    (_c = value.idle) !== null && _c !== void 0 ? _c : (value.idle = -1);
+    (_d = value.queue_max) !== null && _d !== void 0 ? _d : (value.queue_max = -1);
+    (_e = value.queue_idle) !== null && _e !== void 0 ? _e : (value.queue_idle = -1);
+    (_f = value.purge) !== null && _f !== void 0 ? _f : (value.purge = 0);
     return value;
 }
 function setCert(items, cache) {
@@ -31,12 +32,13 @@ class Db extends core_1.ClientDb {
         this._threadable = true;
     }
     static async purgeMemory(percent = 1, limit = 0, parent) {
+        var _a;
         let result = 0;
         if (percent > 0 && percent <= 1) {
             for (const [name, client] of DB_CLIENT) {
                 const config = POOL_CONFIG.get(name);
                 if (config && config.purge > 0) {
-                    const checkTimeout = client.checkTimeout?.bind(client);
+                    const checkTimeout = (_a = client.checkTimeout) === null || _a === void 0 ? void 0 : _a.bind(client);
                     if (checkTimeout) {
                         try {
                             result += await checkTimeout(config.purge, limit);
@@ -69,9 +71,10 @@ class Db extends core_1.ClientDb {
         }
     }
     getCredential(item) {
+        var _a;
         let credential = item.credential, stored;
         if (typeof credential === 'string') {
-            credential = this.module[item.source]?.[credential];
+            credential = (_a = this.module[item.source]) === null || _a === void 0 ? void 0 : _a[credential];
             stored = true;
         }
         if ((0, types_1.isPlainObject)(credential)) {
@@ -183,7 +186,8 @@ class Db extends core_1.ClientDb {
             return Promise.reject((0, types_1.createAbortError)());
         }
         const tasks = (items || this.pending).map(async (data) => {
-            data.ignoreCache ?? (data.ignoreCache = true);
+            var _a;
+            (_a = data.ignoreCache) !== null && _a !== void 0 ? _a : (data.ignoreCache = true);
             return this.executeQuery(data).catch(() => {
                 this.applyState([data], 16);
                 return [];
@@ -226,6 +230,7 @@ class Db extends core_1.ClientDb {
         let result;
         if (!source.startsWith('@')) {
             switch (source) {
+                case 'mariadb':
                 case 'mongodb':
                 case 'mssql':
                 case 'mysql':
@@ -245,15 +250,16 @@ class Db extends core_1.ClientDb {
         return result + (folder ? '/' + folder : '');
     }
     getPoolConfig(source, uuidKey) {
+        var _a, _b, _c, _d, _e;
         const config = Db.getPoolConfig(source);
         const result = uuidKey && this.settingsKey(uuidKey, 'pool');
         if (result) {
             if (config) {
-                result.min ?? (result.min = config.min);
-                result.max ?? (result.max = config.max);
-                result.idle ?? (result.idle = config.idle);
-                result.queue_max ?? (result.queue_max = config.queue_max);
-                result.queue_idle ?? (result.queue_idle = config.queue_idle);
+                (_a = result.min) !== null && _a !== void 0 ? _a : (result.min = config.min);
+                (_b = result.max) !== null && _b !== void 0 ? _b : (result.max = config.max);
+                (_c = result.idle) !== null && _c !== void 0 ? _c : (result.idle = config.idle);
+                (_d = result.queue_max) !== null && _d !== void 0 ? _d : (result.queue_max = config.queue_max);
+                (_e = result.queue_idle) !== null && _e !== void 0 ? _e : (result.queue_idle = config.queue_idle);
             }
             else {
                 sanitizePoolConfig(result);
@@ -275,7 +281,7 @@ class Db extends core_1.ClientDb {
         }
         try {
             client = require(this.resolveSource(source));
-            if (client?.DB_SOURCE_CLIENT) {
+            if (client === null || client === void 0 ? void 0 : client.DB_SOURCE_CLIENT) {
                 client.DB_SOURCE_NAME = source;
                 DB_CLIENT.set(source, client);
                 return client;

package/package.json

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

package/pool.js

@@ -34,7 +34,7 @@ class DbPool {
                 for (const key in pools) {
                     const pool = pools[key];
                     const auth = pool.uuidKey;
-                    if (auth?.username === username && auth.password === uuidKey) {
+                    if ((auth === null || auth === void 0 ? void 0 : auth.username) === username && auth.password === uuidKey) {
                         if (!pool.closed) {
                             return [uuidKey, pool];
                         }
@@ -72,8 +72,9 @@ class DbPool {
         this[_c] = { success: -1, failed: -1, count: 0, error: 0 };
     }
     add(item, uuidKey) {
+        var _d;
         this[kItems].add(item);
-        if (uuidKey || (uuidKey = this.uuidKey?.password)) {
+        if (uuidKey || (uuidKey = (_d = this.uuidKey) === null || _d === void 0 ? void 0 : _d.password)) {
             (0, util_1.setUUIDKey)(item, uuidKey);
         }
         this.lastAccessed = Date.now();

package/util.js

@@ -77,13 +77,14 @@ function parseServerAuth(credential, port, all) {
 }
 exports.parseServerAuth = parseServerAuth;
 function parseConnectionString(value, scheme = 'http') {
+    var _a;
     if (!/^[^:]+:\/\//.test(value)) {
         value = scheme + '://' + value;
     }
     try {
         const { protocol, username, password, hostname, pathname, port, search } = new URL(value);
         const database = pathname.substring(1);
-        return { protocol, username: decodeURIComponent(username), password: decodeURIComponent(password), hostname, port, database: decodeURIComponent(/^([^?/#]+)/.exec(database)?.[1] || database), pathname, search };
+        return { protocol, username: decodeURIComponent(username), password: decodeURIComponent(password), hostname, port, database: decodeURIComponent(((_a = /^([^?/#]+)/.exec(database)) === null || _a === void 0 ? void 0 : _a[1]) || database), pathname, search };
     }
     catch {
         return null;