@ereo/db 0.2.36 → 0.2.38

package/dist/index.js

@@ -225,6 +225,7 @@ class ConnectionPool {
     totalCreated: 0,
     totalClosed: 0
   };
+  idleTimers = new Map;
   constructor(config) {
     this.config = {
       ...DEFAULT_POOL_CONFIG,
@@ -237,6 +238,11 @@ class ConnectionPool {
     }
     const idle = this.connections.pop();
     if (idle) {
+      const timer = this.idleTimers.get(idle);
+      if (timer) {
+        clearTimeout(timer);
+        this.idleTimers.delete(idle);
+      }
       try {
         const isValid = await this.validateConnection(idle);
         if (isValid) {
@@ -274,6 +280,10 @@ class ConnectionPool {
   }
   async close() {
     this.closed = true;
+    for (const timer of this.idleTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.idleTimers.clear();
     for (const waiter of this.waitQueue) {
       clearTimeout(waiter.timeout);
       waiter.reject(new ConnectionError("Pool is closing"));
@@ -286,7 +296,14 @@ class ConnectionPool {
       } catch {}
     });
     this.connections = [];
-    await Promise.all(closePromises);
+    const activeClosePromises = Array.from(this.activeConnections).map(async (conn) => {
+      try {
+        await this.closeConnection(conn);
+        this.stats.totalClosed++;
+      } catch {}
+    });
+    this.activeConnections.clear();
+    await Promise.all([...closePromises, ...activeClosePromises]);
   }
   getStats() {
     return {
@@ -350,7 +367,11 @@ class ConnectionPool {
   scheduleIdleTimeout(connection) {
     if (this.config.idleTimeoutMs <= 0)
       return;
-    setTimeout(async () => {
+    const existing = this.idleTimers.get(connection);
+    if (existing)
+      clearTimeout(existing);
+    const timer = setTimeout(async () => {
+      this.idleTimers.delete(connection);
       const index = this.connections.indexOf(connection);
       if (index !== -1) {
         this.connections.splice(index, 1);
@@ -360,6 +381,7 @@ class ConnectionPool {
         } catch {}
       }
     }, this.config.idleTimeoutMs);
+    this.idleTimers.set(connection, timer);
   }
   delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));

package/dist/pool.d.ts

@@ -56,6 +56,8 @@ export declare abstract class ConnectionPool<T> {
         totalCreated: number;
         totalClosed: number;
     };
+    /** Track idle timeout timers so they can be cleaned up */
+    private idleTimers;
     constructor(config?: PoolConfig);
     /**
      * Create a new connection.

package/dist/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO7D;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,UAAU,CAMpD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAWhF;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAStF;AAMD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,8BAAsB,cAAc,CAAC,CAAC;IACpC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAM;IAChC,SAAS,CAAC,iBAAiB,SAAgB;IAC3C,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC;QACzB,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;QAC3B,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;QAC7B,OAAO,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;KACxC,CAAC,CAAM;IACR,SAAS,CAAC,MAAM,UAAS;IACzB,SAAS,CAAC,KAAK;;;MAGb;IACF,0DAA0D;IAC1D,OAAO,CAAC,UAAU,CAA+C;gBAErD,MAAM,CAAC,EAAE,UAAU;IAO/B;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,IAAI,OAAO,CAAC,CAAC,CAAC;IAEjD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAEhE;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAEtE;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC;IAsC3B;;OAEG;IACG,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B3C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC5B;;OAEG;IACH,QAAQ,IAAI,SAAS;IAWrB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAuB/C;;OAEG;YACW,gBAAgB;IAwB9B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;OAEG;IACH,OAAO,CAAC,KAAK;CAGd;AAMD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,uCAAuC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,qDAAqD;IACrD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CACzC;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAKlC,CAAC;AAEF;;GAEG;AACH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM,GAChC,OAAO,CAAC,CAAC,CAAC,CAkCZ;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CA6B5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ereo/db",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "license": "MIT",
   "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
@@ -33,7 +33,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.36"
+    "@ereo/core": "workspace:*"
   },
   "devDependencies": {
     "@types/bun": "^1.1.0",