@e-mc/db 0.6.0 → 0.6.2

package/LICENSE

@@ -1,11 +1,7 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright 2023 Ninja Scroll
+
+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,5 +1,7 @@
-### @e-mc/db
+# @e-mc/db
 
-### LICENSE
+PEP 402 - Forever Kagerō
 
-BSD 3-Clause
+## LICENSE
+
+MIT

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DbConstructor } from '../types/lib';
-
-declare const Db: DbConstructor;
-
+import type { DbConstructor } from '../types/lib';
+
+declare const Db: DbConstructor;
+
 export = Db;

package/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const types_1 = require("../types");
-const core_1 = require("../core");
-const request_1 = require("../request");
-const util_1 = require("./util");
+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 DB_CLIENT = new Map();
 const POOL_CONFIG = new Map();
 function sanitizePoolConfig(value) {
@@ -60,12 +60,12 @@ class Db extends core_1.ClientDb {
     static getPoolConfig(source) {
         return POOL_CONFIG.get(source);
     }
-    setCredential(item) {
+    async setCredential(item) {
         try {
             return this.getClient(item.source).setCredential.call(this, item);
         }
         catch (err) {
-            return Promise.reject(err instanceof Error ? err : new Error(Db.asString(err) || "Invalid credentials" /* ERR_DB.CREDENTIALS */));
+            return Promise.reject(err instanceof Error ? err : new Error(Db.asString(err) || "Invalid credentials"));
         }
     }
     getCredential(item) {
@@ -91,7 +91,7 @@ class Db extends core_1.ClientDb {
             return false;
         }
     }
-    executeQuery(item, options) {
+    async executeQuery(item, options) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -102,7 +102,7 @@ class Db extends core_1.ClientDb {
             return Promise.reject(err);
         }
     }
-    executeBatchQuery(batch, options, outResult) {
+    async executeBatchQuery(batch, options, outResult) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -113,13 +113,13 @@ class Db extends core_1.ClientDb {
             return Promise.reject(err);
         }
     }
-    processRows(batch, tasks, parallel, outResult) {
+    async processRows(batch, tasks, parallel, outResult) {
         let disconnect;
         if ((0, types_1.isObject)(parallel)) {
             ({ disconnect, parallel } = parallel);
         }
         const terminate = () => {
-            this.applyState(batch, 8 /* DB_TRANSACTION.TERMINATE */);
+            this.applyState(batch, 8);
             if (typeof disconnect === 'function') {
                 try {
                     disconnect();
@@ -129,7 +129,7 @@ class Db extends core_1.ClientDb {
             }
         };
         const cleanup = () => {
-            this.applyState(batch, 16 /* DB_TRANSACTION.ABORT */);
+            this.applyState(batch, 16);
             terminate();
             if (outResult) {
                 for (let i = 0, length = outResult.length; i < length; ++i) {
@@ -160,7 +160,7 @@ class Db extends core_1.ClientDb {
             .catch(() => cleanup());
     }
     handleFail(err, item, options) {
-        this.add(item, 32 /* DB_TRANSACTION.FAIL */);
+        this.add(item, 32);
         item.transactionFail = true;
         if (options && typeof options.errorQuery === 'function') {
             if (options.errorQuery(err, item, options.commandType)) {
@@ -174,7 +174,7 @@ class Db extends core_1.ClientDb {
             if (item.willAbort) {
                 this.abort();
             }
-            this.writeFail(["Unable to execute query" /* ERR_DB.EXEC_QUERY */, item.source], err, 65536 /* LOG_TYPE.DB */);
+            this.writeFail(["Unable to execute query", item.source], err, 65536);
         }
         return false;
     }
@@ -182,14 +182,14 @@ class Db extends core_1.ClientDb {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
-        const tasks = (items || this.pending).map(data => {
+        const tasks = (items || this.pending).map(async (data) => {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.executeQuery(data).catch(() => {
-                this.applyState([data], 16 /* DB_TRANSACTION.ABORT */);
+                this.applyState([data], 16);
                 return [];
             });
         });
-        return tasks.length === 0 ? Promise.resolve(false) : this.allSettled(tasks, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
+        return tasks.length === 0 ? Promise.resolve(false) : this.allSettled(tasks, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     readTLSCert(value, cache) {
         if ((0, types_1.isString)(value)) {
@@ -224,10 +224,10 @@ class Db extends core_1.ClientDb {
     }
     resolveSource(source, folder) {
         let result;
-        if (source[0] !== '@') {
+        if (!source.startsWith('@')) {
             result = this.settings.imports?.[source] || util_1.IMPORTS[source];
         }
-        else if (!folder && source.indexOf('/') === -1) {
+        else if (!folder && !source.includes('/')) {
             folder = 'client';
         }
         return (result || source) + (folder ? '/' + folder : '');
@@ -271,11 +271,11 @@ class Db extends core_1.ClientDb {
         }
         catch {
         }
-        throw (0, types_1.errorMessage)(source, "Database provider not found" /* ERR_DB.PROVIDER_NOTFOUND */);
+        throw (0, types_1.errorMessage)(source, "Database provider not found");
     }
 }
-Db.STORE_RESULT_PARTITION_SIZE = 16 /* CACHE_SIZE.DB_PARTITION_SIZE */;
-Db.STORE_RESULT_PARTITION_MULT = 2 /* CACHE_SIZE.DB_PARTITION_MULT */;
+Db.STORE_RESULT_PARTITION_SIZE = 16;
+Db.STORE_RESULT_PARTITION_MULT = 2;
 Object.freeze(types_1.DB_TYPE);
 Object.freeze(util_1.SQL_COMMAND);
 exports.default = Db;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/db",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "DB modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,11 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.6.0",
-    "@e-mc/request": "0.6.0",
-    "@e-mc/types": "0.6.0"
+    "@e-mc/core": "0.6.2",
+    "@e-mc/request": "0.6.2",
+    "@e-mc/types": "0.6.2"
   }
 }

package/pool.d.ts

@@ -1,5 +1,5 @@
-import type { DbPoolConstructor } from '../types/lib/db';
-
-declare const DbPool: DbPoolConstructor;
-
+import type { DbPoolConstructor } from '../types/lib/db';
+
+declare const DbPool: DbPoolConstructor;
+
 export = DbPool;

package/pool.js

@@ -1,8 +1,8 @@
 "use strict";
 var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../types");
-const util_1 = require("./util");
+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');
@@ -88,7 +88,7 @@ class DbPool {
             delete parent[this.poolKey];
         }
     }
-    detach(force) {
+    async detach(force) {
         this.remove();
         return this.closed ? Promise.resolve() : force ? this.close().catch(() => { }) : this.close();
     }
@@ -113,7 +113,7 @@ class DbPool {
         }
         previous.success = success;
         previous.failed = failed;
-        return Date.now() - timeout >= this.lastAccessed && (this.closeable || count >= (this.uuidKey ? 10 /* IDLE_THRESHOLD.UUID */ : 5 /* IDLE_THRESHOLD.CONFIG */)) || error >= (this.uuidKey ? 3 /* IDLE_THRESHOLD.UUID_ERROR */ : 2 /* IDLE_THRESHOLD.CONFIG_ERROR */);
+        return Date.now() - timeout >= this.lastAccessed && (this.closeable || count >= (this.uuidKey ? 10 : 5)) || error >= (this.uuidKey ? 3 : 2);
     }
     get persist() {
         return this.uuidKey ? this.success > this.failed : false;

package/util.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasBasicAuth = exports.getBasicAuth = exports.setUUIDKey = exports.checkEmpty = exports.parseConnectionString = exports.parseServerAuth = exports.IMPORTS = exports.SQL_COMMAND = void 0;
-const types_1 = require("../types");
-const util_1 = require("../request/util");
+const types_1 = require("@e-mc/types");
+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; } });
 var SQL_COMMAND;