@e-mc/db 0.12.8 → 0.13.0

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/db
 
-* NodeJS 18
+* NodeJS 18.20.5 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.0/lib/index.d.ts)
 
 ```typescript
 import type { DbDataSource } from "./squared";
@@ -45,6 +45,14 @@ interface IDb extends IClientDb<IHost, DbModule, DbDataSource, DbSourceOptions,
     getPoolConfig(source: string, uuidKey?: string): Required<PoolConfig> | undefined;
     get sourceType(): DB_TYPE;
     get commandType(): SQL_COMMAND;
+
+    /* EventEmitter */
+    on(event: "db:result", listener: (batch: DbDataSource[], result: BatchQueryResult) => void): this;
+    on(event: "db:fail", listener: (err: unknown, item: DbDataSource) => void): this;
+    once(event: "db:result", listener: (batch: DbDataSource[], result: BatchQueryResult) => void): this;
+    once(event: "db:fail", listener: (err: unknown, item: DbDataSource) => void): this;
+    emit(event: "db:result", batch: DbDataSource[], result: BatchQueryResult): boolean;
+    emit(event: "db:fail", err: unknown, item: DbDataSource): boolean;
 }
 
 interface DbConstructor extends ClientDbConstructor<IHost> {
@@ -206,11 +214,11 @@ const [rows1, rows2] = await instance.executeBatchQuery([
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.0/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -11,6 +11,7 @@ function sanitizePoolConfig(value) {
     value.min ??= -1;
     value.max ??= -1;
     value.idle ??= -1;
+    value.idle_max ??= -1;
     value.queue_max ??= -1;
     value.queue_idle ??= -1;
     value.purge ??= 0;
@@ -100,19 +101,18 @@ class Db extends core_1.ClientDb {
             let name, table;
             const [group, procedure] = Array.isArray(command) ? command : ({ name, table } = item, [(name || table ? name && table ? name + ':' + table : table || name : typeof item.document === 'string' && item.document) || '', command]);
             const data = settings[group]?.[procedure];
-            if (!(0, types_1.isPlainObject)(data)) {
-                continue;
-            }
-            if ('uri' in data) {
-                delete data.uri;
-            }
-            if ('credential' in data) {
-                delete data.credential;
-            }
-            if ('usePool' in data) {
-                delete data.usePool;
+            if ((0, types_1.isPlainObject)(data)) {
+                if ('uri' in data) {
+                    delete data.uri;
+                }
+                if ('credential' in data) {
+                    delete data.credential;
+                }
+                if ('usePool' in data) {
+                    delete data.usePool;
+                }
+                Object.assign(item, data);
             }
-            Object.assign(item, data);
         }
     }
     async executeQuery(item, options) {
@@ -164,6 +164,7 @@ class Db extends core_1.ClientDb {
         }
         if (!parallel && outResult) {
             terminate();
+            this.emit('db:result', batch, outResult);
             return outResult;
         }
         return Promise.all(tasks)
@@ -179,8 +180,10 @@ class Db extends core_1.ClientDb {
                 for (let i = 0, length = outResult.length; i < length; ++i) {
                     outResult[i] = result[i] || null;
                 }
+                this.emit('db:result', batch, outResult);
                 return outResult;
             }
+            this.emit('db:result', batch, result);
             return result;
         })
             .catch(cleanup);
@@ -193,6 +196,7 @@ class Db extends core_1.ClientDb {
                 if (item.willAbort) {
                     this.abort(err);
                 }
+                this.emit('db:fail', err, item);
                 return true;
             }
         }
@@ -202,6 +206,7 @@ class Db extends core_1.ClientDb {
             }
             this.writeFail(["Unable to execute query", item.source], err, 65536);
         }
+        this.emit('db:fail', err, item);
         return false;
     }
     async commit(items) {
@@ -266,6 +271,7 @@ class Db extends core_1.ClientDb {
                 result.min ??= config.min;
                 result.max ??= config.max;
                 result.idle ??= config.idle;
+                result.idle_max ??= config.idle_max;
                 result.queue_max ??= config.queue_max;
                 result.queue_idle ??= config.queue_idle;
                 result.timeout ??= config.timeout;

package/package.json

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