@cap-js/db-service 2.1.0 → 2.1.1

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.1](https://github.com/cap-js/cds-dbs/compare/db-service-v2.1.0...db-service-v2.1.1) (2025-06-06)
+
+
+### Fixed
+
+* Better opt in flag for builtin generic pool ([#1234](https://github.com/cap-js/cds-dbs/issues/1234)) ([98282ff](https://github.com/cap-js/cds-dbs/commit/98282ffd86cb143ebe9000f75b4a51156f6c3539))
+* miscellaneous fixes for builtin pool ([#1235](https://github.com/cap-js/cds-dbs/issues/1235)) ([c657a0b](https://github.com/cap-js/cds-dbs/commit/c657a0ba2292fd429adb1b69aa9ead3eec9d5be0))
+
 ## [2.1.0](https://github.com/cap-js/cds-dbs/compare/db-service-v2.0.1...db-service-v2.1.0) (2025-06-04)
 
 

package/lib/common/generic-pool.js

@@ -1,10 +1,8 @@
 const cds = require('@sap/cds')
 const LOG = cds.log('db')
 
-const createPool = (factory, config) => {
-  if (cds.requires.db?.pool?.builtin) return new Pool(factory, config)
-  return require('generic-pool').createPool(factory, config)
-}
+const use_new_pool = cds.requires.db?.pool?.builtin || cds.env.features.pool === 'builtin'
+const createPool = use_new_pool ? (...args) => new Pool(...args) : require('generic-pool').createPool
 
 function ConnectionPool (factory, tenant) {
   let bound_factory = { __proto__: factory, create: factory.create.bind(null, tenant) }
@@ -35,7 +33,7 @@ function TrackedConnectionPool (factory, tenant) {
 }
 
 const DEBUG = /\bpool\b/.test(process.env.DEBUG)
-module.exports = DEBUG && !cds.requires.db?.pool?.builtin ? TrackedConnectionPool : ConnectionPool
+module.exports = DEBUG && !use_new_pool ? TrackedConnectionPool : ConnectionPool
 
 // Drop-in replacement for https://github.com/coopernurse/node-pool
 // TODO: fifo: true? relevant for our use case?
@@ -57,7 +55,7 @@ const RequestState = Object.freeze({
 
 class Request {
   constructor (ttl) {
-    this.state = 'pending'
+    this.state = RequestState.PENDING
     this.promise = new Promise((resolve, reject) => {
       this._resolve = value => {
         clearTimeout(this._timeout)
@@ -71,12 +69,12 @@ class Request {
       }
       if (typeof ttl === 'number' && ttl >= 0) {
         const err = new Error(`Pool resource could not be acquired within ${ttl / 1000}s`)
-        this._timeout = setTimeout(() => this._reject(err), ttl)
+        this._timeout = setTimeout(() => this._reject(err), ttl).unref()
       }
     })
   }
-  resolve (v) { if (this.state === 'pending') this._resolve(v) }
-  reject (e) { if (this.state === 'pending') this._reject(e) }
+  resolve (v) { if (this.state === RequestState.PENDING) this._resolve(v) }
+  reject (e) { if (this.state === RequestState.PENDING) this._reject(e) }
 }
 
 class PooledResource {
@@ -133,7 +131,9 @@ constructor (factory, options = {}) {
   this._queue = []
 
   this.#scheduleEviction()
-  for (let i = 0; i < this.options.min - this.size; i++) this.#createResource()
+
+  const initial = this.options.min - this.size
+  for (let i = 0; i < initial; i++) this.#createResource()
 }
 
   async acquire() {
@@ -173,7 +173,7 @@ constructor (factory, options = {}) {
 
   async clear() {
     await Promise.allSettled(Array.from(this._creates))
-    await Promise.allSettled(Array.from(this._available).map(resource => this.#destroy(resource)))
+    await Promise.allSettled(Array.from(this._all).map(resource => this.#destroy(resource)))
   }
 
   async #createResource() {
@@ -250,16 +250,23 @@ constructor (factory, options = {}) {
     this._available.delete(resource)
     this._loans.delete(resource.obj)
     try {
-      await this.factory.destroy(resource.obj)
+      const destroyPromise = Promise.resolve(this.factory.destroy(resource.obj))
+      const { destroyTimeoutMillis } = this.options
+      if (destroyTimeoutMillis && destroyTimeoutMillis > 0) {
+        const timeout = new Promise((_, reject) =>
+          setTimeout(() => reject(new Error(`Resource destruction timed out after ${destroyTimeoutMillis}ms`)), destroyTimeoutMillis).unref()
+        )
+        await Promise.race([destroyPromise, timeout])
+      } else {
+        await destroyPromise
+      }
     } catch (e) {
        LOG.error(e)
        /* FIXME: We have to ignore errors here due to a TypeError in hdb */
        /* This was also a problem with the old (generic-pool) implementation */
        /* Root cause in hdb needs to be fixed */
     } finally {
-      if (!this._draining && this.size < this.options.min) {
-        await this.#createResource()
-      }
+      if (!this._draining && this.size < this.options.min) this.#createResource()
     }
   }
 
@@ -268,14 +275,19 @@ constructor (factory, options = {}) {
     if (evictionRunIntervalMillis <= 0) return
     this._scheduledEviction = setTimeout(async () => {
       try {
-        const resourcesToEvict = Array.from(this._available)
-          .slice(0, numTestsPerEvictionRun)
-          .filter(resource => {
-            const idleTime = Date.now() - resource.lastIdleTime
-            const softEvict = softIdleTimeoutMillis > 0 && softIdleTimeoutMillis < idleTime && min < this._available.size
-            return softEvict || idleTimeoutMillis < idleTime
-          })
-        await Promise.all(resourcesToEvict.map(resource => this.#destroy(resource)))
+        const evictionCandidates = Array.from(this._available).slice(0, numTestsPerEvictionRun)
+        const destructionPromises = []
+        for (const resource of evictionCandidates) {
+          const idleTime = Date.now() - resource.lastIdleTime
+          const softEvict = softIdleTimeoutMillis > 0 && softIdleTimeoutMillis < idleTime && this._all.size > min
+          const hardEvict = idleTimeoutMillis < idleTime
+          if (softEvict || hardEvict) {
+            if (this._available.delete(resource)) {
+              destructionPromises.push(this.#destroy(resource))
+            }
+          }
+        }
+        await Promise.all(destructionPromises)
       } finally {
         this.#scheduleEviction()
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/db-service",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "CDS base database service",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/db-service#cds-base-database-service",
   "repository": {