@open-xchange/fastify-sdk 0.2.1 → 0.2.3

package/lib/database/mariadb.js

@@ -3,11 +3,14 @@ import * as mariadb from 'mariadb'
 const defaults = {
   dateStrings: ['DATE', 'DATETIME'],
   timezone: '+00:00',
-  namedPlaceholders: true
+  namedPlaceholders: true,
+  connectTimeout: 10_000
 }
 
 export function createMariaDBPool (options = {}) {
-  const pool = mariadb.createPool({ ...defaults, ...options })
+  const config = { ...defaults, ...options }
+  const pool = mariadb.createPool(config)
+  pool._connConfig = config
   pool.on('connection', (connection) => {
     connection.query('SET SESSION time_zone="+00:00"')
   })
@@ -47,15 +50,31 @@ export function createMariaDBPoolFromEnv ({ prefix = 'SQL', names } = {}) {
 }
 
 export async function mariadbReadyCheck (pool, { retries = 12, delay = 10_000, logger } = {}) {
+  // Pools created via createMariaDBPool() have _connConfig attached.
+  // Use createConnection() directly for these because the pool swallows
+  // connection errors and waits the full acquireTimeout (10s) before
+  // returning a generic ER_GET_CONNECTION_TIMEOUT. Direct connections
+  // fail immediately with the real error (ECONNREFUSED etc.), making
+  // retries fast. Falls back to pool.query() for plain mock pools.
+  const useDirectConnect = Boolean(pool._connConfig)
+  const config = useDirectConnect ? { ...pool._connConfig, connectTimeout: defaults.connectTimeout } : null
   for (let i = 1; i <= retries; i++) {
+    let conn
     try {
-      await pool.query('SELECT 1')
+      if (useDirectConnect) {
+        conn = await mariadb.createConnection(config)
+        await conn.query('SELECT 1')
+      } else {
+        await pool.query('SELECT 1')
+      }
       if (logger) logger.info('Database is ready')
       return
     } catch (err) {
       if (logger) logger.warn(`Database not ready (attempt ${i}/${retries}): ${err.code} ${err.message}`)
       if (i === retries) throw err
       await new Promise(resolve => setTimeout(resolve, delay))
+    } finally {
+      if (conn) await conn.end().catch(() => {})
     }
   }
 }
@@ -76,6 +95,6 @@ export function getMariaDBPools () {
 }
 
 export async function createUUID (pool) {
-  const [[{ uuid }]] = await pool.query('SELECT uuid() as uuid')
+  const [{ uuid }] = await pool.query('SELECT uuid() as uuid')
   return uuid
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-xchange/fastify-sdk",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Shared foundation package for OX App Suite Node.js services",
   "private": false,
   "type": "module",
@@ -13,6 +13,11 @@
     "./redis": "./lib/redis/index.js",
     "./testing": "./lib/testing/index.js"
   },
+  "scripts": {
+    "lint": "eslint . --cache --fix",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage"
+  },
   "author": "Open-Xchange",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
@@ -70,9 +75,10 @@
   "engines": {
     "node": ">=20"
   },
-  "scripts": {
-    "lint": "eslint . --cache --fix",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage"
+  "packageManager": "pnpm@10.27.0",
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "unrs-resolver"
+    ]
   }
-}
+}