@adalo/metrics 0.1.150 → 0.1.152

package/README-health.md

@@ -137,18 +137,14 @@ app.get('/hc', healthCheckClient.healthHandler())
 ### Healthy Response
 ```json
 {
-  "status": "healthy",
-  "timestamp": "2026-01-23T08:27:57.926Z",
-  "checks": {
-    "database": {
-      "status": "healthy",
-      "latencyMs": 52
-    },
-    "redis": {
-      "status": "healthy",
-      "latencyMs": 1
-    }
-  }
+  "status": "ok",
+  "lastCheckAt": 1738143477926,
+  "resources": {
+    "DATABASE_URL": { "status": "ok", "connectMs": 9.2 },
+    "REDIS_URL": { "status": "ok" }
+  },
+  "isStale": false,
+  "config": { "checkIntervalMs": 30000, "staleThresholdMs": 180000, "checkTimeoutMs": 15000 }
 }
 ```
 
@@ -170,16 +166,13 @@ app.get('/hc', healthCheckClient.healthHandler())
 ### Unhealthy Response (Database Issue)
 ```json
 {
-  "status": "unhealthy",
-  "timestamp": "2026-01-23T08:27:57.926Z",
-  "checks": {
-    "database": {
-      "status": "unhealthy",
-      "error": "connection timeout",
-      "latencyMs": 5000
-    }
+  "status": "error",
+  "lastCheckAt": 1738143477926,
+  "resources": {
+    "DATABASE_URL": { "status": "error", "error": "connection timeout", "connectMs": 5000 }
   },
-  "errors": ["DB backend: connection timeout"]
+  "isStale": false,
+  "config": { "checkIntervalMs": 30000, "staleThresholdMs": 180000, "checkTimeoutMs": 15000 }
 }
 ```
 

package/README.md

@@ -81,12 +81,12 @@ Response format (BetterStack compatible):
     "database": {
       "status": "healthy",
       "clusters": {
-        "main": { "status": "healthy", "latencyMs": 5 },
-        "cluster_1": { "status": "healthy", "latencyMs": 8 },
-        "cluster_2": { "status": "healthy", "latencyMs": 6 }
+        "main": { "status": "healthy", "connectMs": 5.2 },
+        "cluster_1": { "status": "healthy", "connectMs": 8.1 },
+        "cluster_2": { "status": "healthy", "connectMs": 6.4 }
       }
     },
-    "redis": { "status": "healthy", "latencyMs": 2 }
+    "redis": { "status": "healthy" }
   }
 }
 ```

package/lib/health/databaseChecker.d.ts

@@ -28,12 +28,10 @@ export function createDatabasePool(env: string, url: string, connectionTimeoutMs
 /**
  * @param {any} pool
  * @param {string} type
- * @returns {Promise<{ connectMs: number, queryMs: number, totalMs: number }>}
+ * @returns {Promise<{ connectMs: number }>}
  */
 export function runHealthCheck(pool: any, type: string): Promise<{
     connectMs: number;
-    queryMs: number;
-    totalMs: number;
 }>;
 /**
  * @param {any} pool

package/lib/health/databaseChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databaseChecker.d.ts","sourceRoot":"","sources":["../../src/health/databaseChecker.js"],"names":[],"mappings":"AAaA;;;GAGG;AACH,qCAHW,MAAM,GACJ,MAAM,CAYlB;AAED;;;;GAIG;AACH,wCAJW,MAAM,8BAEJ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAiBnG;AAED;;;;;GAKG;AACH,wCALW,MAAM,OACN,MAAM,uBACN,MAAM;UACI,GAAG;UAAQ,MAAM;EA8BrC;AAED;;;;GAIG;AACH,qCAJW,GAAG,QACH,MAAM;eACiB,MAAM;aAAW,MAAM;aAAW,MAAM;GAwEzE;AAED;;;GAGG;AACH,gCAHW,GAAG,GACD,QAAQ,IAAI,CAAC,CAQzB;AA3KD,0CAAmC;AACnC,oCAA6B"}
+{"version":3,"file":"databaseChecker.d.ts","sourceRoot":"","sources":["../../src/health/databaseChecker.js"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,qCAHW,MAAM,GACJ,MAAM,CAYlB;AAED;;;;GAIG;AACH,wCAJW,MAAM,8BAEJ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAiBnG;AAED;;;;;GAKG;AACH,wCALW,MAAM,OACN,MAAM,uBACN,MAAM;UACI,GAAG;UAAQ,MAAM;EA8BrC;AAED;;;;GAIG;AACH,qCAJW,GAAG,QACH,MAAM;eACiB,MAAM;GA8DvC;AAED;;;GAGG;AACH,gCAHW,GAAG,GACD,QAAQ,IAAI,CAAC,CAQzB;AAzKD,0CAAmC;AACnC,oCAA6B"}

package/lib/health/databaseChecker.js

@@ -8,10 +8,18 @@ const DB_TYPE_POSTGRES = 'postgres';
 const DB_TYPE_MYSQL = 'mysql';
 
 /**
+ * @returns {bigint}
+ */
+function nowNs() {
+  return process.hrtime.bigint();
+}
+
+/**
+ * @param {bigint} deltaNs
  * @returns {number}
  */
-function nowMs() {
-  return Number(process.hrtime.bigint() / 1_000_000n);
+function nsToMs(deltaNs) {
+  return Number(deltaNs) / 1_000_000;
 }
 
 /**
@@ -95,76 +103,62 @@ function createDatabasePool(env, url, connectionTimeoutMs) {
 /**
  * @param {any} pool
  * @param {string} type
- * @returns {Promise<{ connectMs: number, queryMs: number, totalMs: number }>}
+ * @returns {Promise<{ connectMs: number }>}
  */
 async function runHealthCheck(pool, type) {
   if (type === DB_TYPE_MYSQL) {
-    const startTotal = nowMs();
-    let connectMs = 0;
-    let queryMs = 0;
+    let connectMs = 0.0;
 
     /** @type {any} */
     let conn;
     try {
-      const startConnect = nowMs();
+      const startConnect = nowNs();
       conn = await pool.getConnection();
-      connectMs = nowMs() - startConnect;
-      const startQuery = nowMs();
+      connectMs = nsToMs(nowNs() - startConnect);
       await conn.query('SELECT 1');
-      queryMs = nowMs() - startQuery;
       return {
-        connectMs,
-        queryMs,
-        totalMs: nowMs() - startTotal
+        connectMs
       };
     } catch (err) {
-      const totalMs = nowMs() - startTotal;
       err.healthCheckTimings = {
-        connectMs,
-        queryMs,
-        totalMs
+        connectMs
       };
       throw err;
     } finally {
       if (conn) {
         try {
-          conn.release();
+          // Destroy the connection so next check measures a real connect.
+          // mysql2 pooled connections support destroy() to remove it from the pool.
+          if (typeof conn.destroy === 'function') conn.destroy();else if (typeof conn.end === 'function') await conn.end();else if (typeof conn.release === 'function') conn.release();
         } catch {
           // ignore
         }
       }
     }
   }
-  const startTotal = nowMs();
-  let connectMs = 0;
-  let queryMs = 0;
+  let connectMs = 0.0;
 
   /** @type {import('pg').PoolClient | null} */
   let client = null;
   try {
-    const startConnect = nowMs();
+    const startConnect = nowNs();
     client = await pool.connect();
-    connectMs = nowMs() - startConnect;
-    const startQuery = nowMs();
+    connectMs = nsToMs(nowNs() - startConnect);
     await client.query('SELECT 1');
-    queryMs = nowMs() - startQuery;
     return {
-      connectMs,
-      queryMs,
-      totalMs: nowMs() - startTotal
+      connectMs
     };
   } catch (err) {
-    const totalMs = nowMs() - startTotal;
     err.healthCheckTimings = {
-      connectMs,
-      queryMs,
-      totalMs
+      connectMs
     };
     throw err;
   } finally {
     if (client) {
       try {
-        client.release();
+        // Force the pool to drop the client so next check measures a real connect.
+        // In node-postgres, passing a truthy value removes the client from the pool.
+        client.release(true);
       } catch {
         // ignore
       }

package/lib/health/databaseChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"databaseChecker.js","names":["Pool","require","mysql","DB_TYPE_POSTGRES","DB_TYPE_MYSQL","nowMs","Number","process","hrtime","bigint","getDatabaseType","url","lower","toLowerCase","startsWith","parseConnectionUrl","type","parsed","URL","defaultPort","defaultDb","host","hostname","port","parseInt","String","user","username","password","database","pathname","replace","createDatabasePool","env","connectionTimeoutMs","config","Error","pool","createPool","connectionLimit","connectTimeout","waitForConnections","connectionString","max","idleTimeoutMillis","connectionTimeoutMillis","runHealthCheck","startTotal","connectMs","queryMs","conn","startConnect","getConnection","startQuery","query","totalMs","err","healthCheckTimings","release","client","connect","closePool","end","module","exports"],"sources":["../../src/health/databaseChecker.js"],"sourcesContent":["const { Pool } = require('pg')\nconst mysql = require('mysql2/promise')\n\nconst DB_TYPE_POSTGRES = 'postgres'\nconst DB_TYPE_MYSQL = 'mysql'\n\n/**\n * @returns {number}\n */\nfunction nowMs() {\n  return Number(process.hrtime.bigint() / 1_000_000n)\n}\n\n/**\n * @param {string} url\n * @returns {string} postgres | mysql\n */\nfunction getDatabaseType(url) {\n  if (!url || typeof url !== 'string') return DB_TYPE_POSTGRES\n  const lower = url.toLowerCase()\n  if (lower.startsWith('mysql://') || lower.startsWith('mysql2://')) {\n    return DB_TYPE_MYSQL\n  }\n  if (lower.startsWith('mariadb://')) {\n    return DB_TYPE_MYSQL\n  }\n  return DB_TYPE_POSTGRES\n}\n\n/**\n * @param {string} url\n * @param {string} [type]\n * @returns {{ host: string, port: number, user: string, password: string, database: string } | null}\n */\nfunction parseConnectionUrl(url, type) {\n  try {\n    const parsed = new URL(url)\n    const defaultPort = type === DB_TYPE_MYSQL ? 3306 : 5432\n    const defaultDb = type === DB_TYPE_MYSQL ? 'mysql' : 'postgres'\n    return {\n      host: parsed.hostname || 'localhost',\n      port: parseInt(parsed.port || String(defaultPort), 10),\n      user: parsed.username || '',\n      password: parsed.password || '',\n      database: (parsed.pathname || '/').replace(/^\\//, '') || defaultDb,\n    }\n  } catch {\n    return null\n  }\n}\n\n/**\n * @param {string} env\n * @param {string} url\n * @param {number} connectionTimeoutMs\n * @returns {{ pool: any, type: string }}\n */\nfunction createDatabasePool(env, url, connectionTimeoutMs) {\n  const type = getDatabaseType(url)\n\n  if (type === DB_TYPE_MYSQL) {\n    const config = parseConnectionUrl(url, DB_TYPE_MYSQL)\n    if (!config) {\n      throw new Error(`Invalid MySQL URL for ${env}`)\n    }\n    const pool = mysql.createPool({\n      host: config.host,\n      port: config.port,\n      user: config.user,\n      password: config.password,\n      database: config.database,\n      connectionLimit: 1,\n      connectTimeout: connectionTimeoutMs,\n      waitForConnections: false,\n    })\n    return { pool, type: DB_TYPE_MYSQL }\n  }\n\n  const pool = new Pool({\n    connectionString: url,\n    max: 1,\n    idleTimeoutMillis: 30000,\n    connectionTimeoutMillis: connectionTimeoutMs,\n  })\n  return { pool, type: DB_TYPE_POSTGRES }\n}\n\n/**\n * @param {any} pool\n * @param {string} type\n * @returns {Promise<{ connectMs: number, queryMs: number, totalMs: number }>}\n */\nasync function runHealthCheck(pool, type) {\n  if (type === DB_TYPE_MYSQL) {\n    const startTotal = nowMs()\n    let connectMs = 0\n    let queryMs = 0\n\n    /** @type {any} */\n    let conn\n    try {\n      const startConnect = nowMs()\n      conn = await pool.getConnection()\n      connectMs = nowMs() - startConnect\n\n      const startQuery = nowMs()\n      await conn.query('SELECT 1')\n      queryMs = nowMs() - startQuery\n\n      return { connectMs, queryMs, totalMs: nowMs() - startTotal }\n    } catch (err) {\n      const totalMs = nowMs() - startTotal\n      err.healthCheckTimings = {\n        connectMs,\n        queryMs,\n        totalMs,\n      }\n      throw err\n    } finally {\n      if (conn) {\n        try {\n          conn.release()\n        } catch {\n          // ignore\n        }\n      }\n    }\n  }\n\n  const startTotal = nowMs()\n  let connectMs = 0\n  let queryMs = 0\n\n  /** @type {import('pg').PoolClient | null} */\n  let client = null\n  try {\n    const startConnect = nowMs()\n    client = await pool.connect()\n    connectMs = nowMs() - startConnect\n\n    const startQuery = nowMs()\n    await client.query('SELECT 1')\n    queryMs = nowMs() - startQuery\n\n    return { connectMs, queryMs, totalMs: nowMs() - startTotal }\n  } catch (err) {\n    const totalMs = nowMs() - startTotal\n    err.healthCheckTimings = {\n      connectMs,\n      queryMs,\n      totalMs,\n    }\n    throw err\n  } finally {\n    if (client) {\n      try {\n        client.release()\n      } catch {\n        // ignore\n      }\n    }\n  }\n}\n\n/**\n * @param {any} pool\n * @returns {Promise<void>}\n */\nasync function closePool(pool) {\n  try {\n    await pool.end()\n  } catch {\n    // ignore\n  }\n}\n\nmodule.exports = {\n  getDatabaseType,\n  parseConnectionUrl,\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n  DB_TYPE_POSTGRES,\n  DB_TYPE_MYSQL,\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"databaseChecker.js","names":["Pool","require","mysql","DB_TYPE_POSTGRES","DB_TYPE_MYSQL","nowNs","process","hrtime","bigint","nsToMs","deltaNs","Number","getDatabaseType","url","lower","toLowerCase","startsWith","parseConnectionUrl","type","parsed","URL","defaultPort","defaultDb","host","hostname","port","parseInt","String","user","username","password","database","pathname","replace","createDatabasePool","env","connectionTimeoutMs","config","Error","pool","createPool","connectionLimit","connectTimeout","waitForConnections","connectionString","max","idleTimeoutMillis","connectionTimeoutMillis","runHealthCheck","connectMs","conn","startConnect","getConnection","query","err","healthCheckTimings","destroy","end","release","client","connect","closePool","module","exports"],"sources":["../../src/health/databaseChecker.js"],"sourcesContent":["const { Pool } = require('pg')\nconst mysql = require('mysql2/promise')\n\nconst DB_TYPE_POSTGRES = 'postgres'\nconst DB_TYPE_MYSQL = 'mysql'\n\n/**\n * @returns {bigint}\n */\nfunction nowNs() {\n  return process.hrtime.bigint()\n}\n\n/**\n * @param {bigint} deltaNs\n * @returns {number}\n */\nfunction nsToMs(deltaNs) {\n  return Number(deltaNs) / 1_000_000\n}\n\n/**\n * @param {string} url\n * @returns {string} postgres | mysql\n */\nfunction getDatabaseType(url) {\n  if (!url || typeof url !== 'string') return DB_TYPE_POSTGRES\n  const lower = url.toLowerCase()\n  if (lower.startsWith('mysql://') || lower.startsWith('mysql2://')) {\n    return DB_TYPE_MYSQL\n  }\n  if (lower.startsWith('mariadb://')) {\n    return DB_TYPE_MYSQL\n  }\n  return DB_TYPE_POSTGRES\n}\n\n/**\n * @param {string} url\n * @param {string} [type]\n * @returns {{ host: string, port: number, user: string, password: string, database: string } | null}\n */\nfunction parseConnectionUrl(url, type) {\n  try {\n    const parsed = new URL(url)\n    const defaultPort = type === DB_TYPE_MYSQL ? 3306 : 5432\n    const defaultDb = type === DB_TYPE_MYSQL ? 'mysql' : 'postgres'\n    return {\n      host: parsed.hostname || 'localhost',\n      port: parseInt(parsed.port || String(defaultPort), 10),\n      user: parsed.username || '',\n      password: parsed.password || '',\n      database: (parsed.pathname || '/').replace(/^\\//, '') || defaultDb,\n    }\n  } catch {\n    return null\n  }\n}\n\n/**\n * @param {string} env\n * @param {string} url\n * @param {number} connectionTimeoutMs\n * @returns {{ pool: any, type: string }}\n */\nfunction createDatabasePool(env, url, connectionTimeoutMs) {\n  const type = getDatabaseType(url)\n\n  if (type === DB_TYPE_MYSQL) {\n    const config = parseConnectionUrl(url, DB_TYPE_MYSQL)\n    if (!config) {\n      throw new Error(`Invalid MySQL URL for ${env}`)\n    }\n    const pool = mysql.createPool({\n      host: config.host,\n      port: config.port,\n      user: config.user,\n      password: config.password,\n      database: config.database,\n      connectionLimit: 1,\n      connectTimeout: connectionTimeoutMs,\n      waitForConnections: false,\n    })\n    return { pool, type: DB_TYPE_MYSQL }\n  }\n\n  const pool = new Pool({\n    connectionString: url,\n    max: 1,\n    idleTimeoutMillis: 30000,\n    connectionTimeoutMillis: connectionTimeoutMs,\n  })\n  return { pool, type: DB_TYPE_POSTGRES }\n}\n\n/**\n * @param {any} pool\n * @param {string} type\n * @returns {Promise<{ connectMs: number }>}\n */\nasync function runHealthCheck(pool, type) {\n  if (type === DB_TYPE_MYSQL) {\n    let connectMs = 0.0\n\n    /** @type {any} */\n    let conn\n    try {\n      const startConnect = nowNs()\n      conn = await pool.getConnection()\n      connectMs = nsToMs(nowNs() - startConnect)\n\n      await conn.query('SELECT 1')\n      return { connectMs }\n    } catch (err) {\n      err.healthCheckTimings = {\n        connectMs,\n      }\n      throw err\n    } finally {\n      if (conn) {\n        try {\n          // Destroy the connection so next check measures a real connect.\n          // mysql2 pooled connections support destroy() to remove it from the pool.\n          if (typeof conn.destroy === 'function') conn.destroy()\n          else if (typeof conn.end === 'function') await conn.end()\n          else if (typeof conn.release === 'function') conn.release()\n        } catch {\n          // ignore\n        }\n      }\n    }\n  }\n\n  let connectMs = 0.0\n\n  /** @type {import('pg').PoolClient | null} */\n  let client = null\n  try {\n    const startConnect = nowNs()\n    client = await pool.connect()\n    connectMs = nsToMs(nowNs() - startConnect)\n\n    await client.query('SELECT 1')\n    return { connectMs }\n  } catch (err) {\n    err.healthCheckTimings = {\n      connectMs,\n    }\n    throw err\n  } finally {\n    if (client) {\n      try {\n        // Force the pool to drop the client so next check measures a real connect.\n        // In node-postgres, passing a truthy value removes the client from the pool.\n        client.release(true)\n      } catch {\n        // ignore\n      }\n    }\n  }\n}\n\n/**\n * @param {any} pool\n * @returns {Promise<void>}\n */\nasync function closePool(pool) {\n  try {\n    await pool.end()\n  } catch {\n    // ignore\n  }\n}\n\nmodule.exports = {\n  getDatabaseType,\n  parseConnectionUrl,\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n  DB_TYPE_POSTGRES,\n  DB_TYPE_MYSQL,\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/health/healthCheckClient.d.ts

@@ -53,7 +53,14 @@ export class HealthCheckClient {
         pool: any;
         type: string;
     } | undefined;
-    _checkDatabase(resource: any): Promise<any>;
+    _checkDatabase(resource: any): Promise<{
+        status: string;
+        connectMs: number;
+    } | {
+        connectMs?: any;
+        status: string;
+        error: string;
+    }>;
     _checkRedis(resource: any): Promise<{
         status: string;
         error?: undefined;

package/lib/health/healthCheckClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"healthCheckClient.d.ts","sourceRoot":"","sources":["../../src/health/healthCheckClient.js"],"names":[],"mappings":"6BA6Ea;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE;AAD1E;;GAEG;AACH;IACE;;;;;;OAMG;IACH;QALqC,SAAS,EAAnC,cAAc,EAAE;QACC,MAAM;QACN,OAAO;QACP,QAAQ;OA2BnC;IAxBC;;;;;;;;;;;;MAAmE;IACnE,gBACgE;IAEhE,mBAAmD;IAEnD,qBAA2B;IAC3B,uDAAuD;IACvD;cAD+B,GAAG;cAAQ,MAAM;OACjB;IAE/B,+BAA+B;IAC/B,YADW,cAAc,EAAE,CACc;IAIvC,qCAAuD;IAGzD,yBAKE;IAGJ,4BAEC;IAED,+BAGC;IAED;cA5BiC,GAAG;cAAQ,MAAM;kBAsCjD;IAED,4CAkCC;IAED;;;;;;OA4BC;IAED;;;;;;;;;;;;;;;;;;OA8BC;IAED,kDAeC;IAED,mCAgBC;IAED,gCAiBC;IAED;;;;;;;;;;;;;;;;;;OAIC;IAED,mBAEC;IAED,uDAiCC;IAED,yBASC;CACF;AA9TD,2HAA2H;AAC3H,oCADW;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,CAAA;CAAE,CAOtH"}
+{"version":3,"file":"healthCheckClient.d.ts","sourceRoot":"","sources":["../../src/health/healthCheckClient.js"],"names":[],"mappings":"6BA6Ea;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE;AAD1E;;GAEG;AACH;IACE;;;;;;OAMG;IACH;QALqC,SAAS,EAAnC,cAAc,EAAE;QACC,MAAM;QACN,OAAO;QACP,QAAQ;OA2BnC;IAxBC;;;;;;;;;;;;MAAmE;IACnE,gBACgE;IAEhE,mBAAmD;IAEnD,qBAA2B;IAC3B,uDAAuD;IACvD;cAD+B,GAAG;cAAQ,MAAM;OACjB;IAE/B,+BAA+B;IAC/B,YADW,cAAc,EAAE,CACc;IAIvC,qCAAuD;IAGzD,yBAKE;IAGJ,4BAEC;IAED,+BAGC;IAED;cA5BiC,GAAG;cAAQ,MAAM;kBAsCjD;IAED;;;;;;;OAoCC;IAED;;;;;;OA4BC;IAED;;;;;;;;;;;;;;;;;;OA8BC;IAED,kDAeC;IAED,mCAgBC;IAED,gCAiBC;IAED;;;;;;;;;;;;;;;;;;OAIC;IAED,mBAEC;IAED,uDAiCC;IAED,yBASC;CACF;AAhUD,2HAA2H;AAC3H,oCADW;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,CAAA;CAAE,CAOtH"}

package/lib/health/healthCheckClient.js

@@ -144,19 +144,21 @@ class HealthCheckClient {
         return {
           status: 'error',
           error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,
-          ...timings
+          connectMs: timings.connectMs
         };
       }
       return {
         status: 'ok',
-        ...timings
+        connectMs: timings.connectMs
       };
     } catch (err) {
       const timings = err?.healthCheckTimings;
       return {
         status: 'error',
         error: maskSensitiveData(err.message),
-        ...(timings && typeof timings === 'object' ? timings : {})
+        ...(timings && typeof timings === 'object' ? {
+          connectMs: timings.connectMs
+        } : {})
       };
     }
   }

package/lib/health/healthCheckClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"healthCheckClient.js","names":["createDatabasePool","runHealthCheck","closePool","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","HealthCheckCache","readNumberEnv","name","raw","process","env","undefined","num","Number","isFinite","DEFAULT_HEALTH_CONFIG","checkIntervalMs","staleThresholdMs","checkTimeoutMs","maxDbConnectLatencyMs","SENSITIVE_PATTERNS","pattern","replacement","maskSensitiveData","text","masked","replace","HealthCheckClient","constructor","options","healthConfig","config","appName","BUILD_APP_NAME","prefixLogs","_refreshPromise","_databasePools","Map","_resources","resources","redisClient","_getRedisClientForCache","_redisClientType","_cache","cacheKey","_getEnv","resource","redisResource","find","r","client","_getPool","url","has","pool","type","set","get","_checkDatabase","status","error","timings","maxConnect","connectMs","err","healthCheckTimings","message","_checkRedis","pong","Promise","resolve","reject","ping","result","_performHealthCheckInternal","sortedResources","Object","keys","sort","reduce","acc","key","hasError","values","some","lastCheckAt","Date","now","isStale","_formatResult","cached","performHealthCheck","then","catch","getCachedResult","console","refreshCache","clearCache","healthHandler","req","res","json","statusCode","cleanup","clear","module","exports"],"sources":["../../src/health/healthCheckClient.js"],"sourcesContent":["const {\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n} = require('./databaseChecker')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('../redisUtils')\nconst { HealthCheckCache } = require('./healthCheckCache')\n\n/**\n * @param {string} name\n * @returns {number | undefined}\n */\nfunction readNumberEnv(name) {\n  const raw = process.env[name]\n  if (raw == null || raw === '') return undefined\n  const num = Number(raw)\n  return Number.isFinite(num) ? num : undefined\n}\n\n/** @type {{ checkIntervalMs: number, staleThresholdMs: number, checkTimeoutMs: number, maxDbConnectLatencyMs: number }} */\nconst DEFAULT_HEALTH_CONFIG = {\n  checkIntervalMs: 30_000,\n  staleThresholdMs: 180_000,\n  checkTimeoutMs: 15_000,\n  maxDbConnectLatencyMs:\n    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 1000,\n}\n\nconst SENSITIVE_PATTERNS = [\n  {\n    pattern:\n      /(postgres(?:ql)?|mysql|mongodb|redis|amqp):\\/\\/([^:]+):([^@]+)@([^:/]+)(:\\d+)?\\/([^\\s?]+)/gi,\n    replacement: '$1://***:***@***$5/***',\n  },\n  {\n    pattern: /(\\w+):\\/\\/([^:]+):([^@]+)@([^\\s/]+)/gi,\n    replacement: '$1://***:***@***',\n  },\n  {\n    pattern:\n      /(password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?token)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n  {\n    pattern:\n      /(database|table|schema|role|user|relation|column|index)\\s*[\"']([^\"']+)[\"']/gi,\n    replacement: '$1 \"***\"',\n  },\n  {\n    pattern: /\\b(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})(:\\d+)?\\b/g,\n    replacement: '***$2',\n  },\n  {\n    pattern: /\\b(host|hostname|server)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n]\n\n/**\n * @param {string} text\n * @returns {string}\n */\nfunction maskSensitiveData(text) {\n  if (!text || typeof text !== 'string') return text\n  let masked = text\n  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {\n    masked = masked.replace(pattern, replacement)\n  }\n  return masked\n}\n\n/**\n * @typedef {{ env: string, url?: string } | { env: string, client?: any }} HealthResource\n */\nclass HealthCheckClient {\n  /**\n   * @param {Object} options\n   * @param {HealthResource[]} options.resources - Must include Redis resource with client\n   * @param {Object} [options.config]\n   * @param {string} [options.appName] - For cache key: healthcheck:${appName}\n   * @param {string} [options.cacheKey] - Redis key (overrides appName)\n   */\n  constructor(options = {}) {\n    this.healthConfig = { ...DEFAULT_HEALTH_CONFIG, ...options.config }\n    this.appName =\n      options.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n\n    this.prefixLogs = `[${this.appName}] [HealthCheck]`\n\n    this._refreshPromise = null\n    /** @type {Map<string, { pool: any, type: string }>} */\n    this._databasePools = new Map()\n\n    /** @type {HealthResource[]} */\n    this._resources = options.resources || []\n\n    const redisClient = this._getRedisClientForCache()\n    if (redisClient) {\n      this._redisClientType = getRedisClientType(redisClient)\n    }\n\n    this._cache = new HealthCheckCache({\n      redisClient: redisClient || null,\n      cacheKey: options.cacheKey,\n      appName: this.appName,\n      staleThresholdMs: this.healthConfig.staleThresholdMs,\n    })\n  }\n\n  _getEnv(resource) {\n    return resource.env ?? resource.name\n  }\n\n  _getRedisClientForCache() {\n    const redisResource = this._resources.find(r => 'client' in r && r.client)\n    return redisResource?.client || null\n  }\n\n  _getPool(env, url) {\n    if (!this._databasePools.has(env)) {\n      const { pool, type } = createDatabasePool(\n        env,\n        url,\n        this.healthConfig.checkTimeoutMs\n      )\n      this._databasePools.set(env, { pool, type })\n    }\n    return this._databasePools.get(env)\n  }\n\n  async _checkDatabase(resource) {\n    const env = this._getEnv(resource)\n    const url = 'url' in resource ? resource.url : process.env[env]\n    if (!url) {\n      return { status: 'error', error: `Env ${env} not set` }\n    }\n\n    try {\n      const { pool, type } = this._getPool(env, url)\n      const timings = await runHealthCheck(pool, type)\n\n      const maxConnect = this.healthConfig.maxDbConnectLatencyMs\n      if (\n        typeof maxConnect === 'number' &&\n        Number.isFinite(maxConnect) &&\n        timings?.connectMs != null &&\n        timings.connectMs > maxConnect\n      ) {\n        return {\n          status: 'error',\n          error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,\n          ...timings,\n        }\n      }\n\n      return { status: 'ok', ...timings }\n    } catch (err) {\n      const timings = err?.healthCheckTimings\n      return {\n        status: 'error',\n        error: maskSensitiveData(err.message),\n        ...(timings && typeof timings === 'object' ? timings : {}),\n      }\n    }\n  }\n\n  async _checkRedis(resource) {\n    const { client } = resource\n    if (!client) return { status: 'ok' }\n\n    try {\n      let pong\n      if (this._redisClientType === REDIS_V3) {\n        pong = await new Promise((resolve, reject) => {\n          client.ping((err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n      } else if (\n        this._redisClientType === REDIS_V4 ||\n        this._redisClientType === IOREDIS\n      ) {\n        pong = await client.ping()\n      } else {\n        return { status: 'error', error: 'Unknown Redis client type' }\n      }\n\n      return pong === 'PONG'\n        ? { status: 'ok' }\n        : { status: 'error', error: `Unexpected: ${pong}` }\n    } catch (err) {\n      return { status: 'error', error: maskSensitiveData(err.message) }\n    }\n  }\n\n  async _performHealthCheckInternal() {\n    const resources = {}\n\n    for (const resource of this._resources) {\n      const env = this._getEnv(resource)\n\n      if ('client' in resource && resource.client) {\n        resources[env] = await this._checkRedis(resource)\n      } else {\n        resources[env] = await this._checkDatabase(resource)\n      }\n    }\n\n    const sortedResources = Object.keys(resources)\n      .sort()\n      .reduce((acc, key) => {\n        acc[key] = resources[key]\n        return acc\n      }, {})\n\n    const hasError = Object.values(resources).some(r => r.status === 'error')\n    const lastCheckAt = Date.now()\n\n    return {\n      status: hasError ? 'error' : 'ok',\n      lastCheckAt,\n      resources: sortedResources,\n      isStale: false,\n      config: this.healthConfig,\n    }\n  }\n\n  _formatResult(result, cached = false) {\n    const isStale =\n      !result.lastCheckAt ||\n      Date.now() - result.lastCheckAt > this.healthConfig.staleThresholdMs\n\n    return {\n      ...result,\n      isStale,\n      status: isStale ? 'stale' : result.status,\n      ...(isStale && {\n        error:\n          'Health check data is stale, health-check worker may not be running. Resource statuses are unknown.',\n      }),\n      ...(cached && { cached: true }),\n    }\n  }\n\n  async performHealthCheck() {\n    if (this._refreshPromise) {\n      return this._refreshPromise\n    }\n\n    this._refreshPromise = this._performHealthCheckInternal()\n      .then(result => {\n        this._refreshPromise = null\n        return this._formatResult(result)\n      })\n      .catch(err => {\n        this._refreshPromise = null\n        throw err\n      })\n\n    return this._refreshPromise\n  }\n\n  async getCachedResult() {\n    try {\n      const cached = await this._cache.get()\n      if (cached) return this._formatResult(cached)\n      return null\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to read from cache:`, err)\n      return {\n        status: 'error',\n        lastCheckAt: null,\n        resources: {},\n        isStale: true,\n        error:\n          'Redis unavailable, unable to read health status of other resources',\n        config: this.healthConfig,\n      }\n    }\n  }\n\n  async refreshCache() {\n    const result = await this._performHealthCheckInternal()\n    await this._cache.set(result)\n    return result\n  }\n\n  clearCache() {\n    this._refreshPromise = null\n  }\n\n  healthHandler() {\n    return async (req, res) => {\n      try {\n        const result = await this.getCachedResult()\n\n        if (!result) {\n          res.status(503).json({\n            status: 'error',\n            lastCheckAt: null,\n            resources: {},\n            isStale: true,\n            error:\n              'No health check data yet, health-check worker may not be running',\n            config: this.healthConfig,\n          })\n          return\n        }\n\n        const statusCode = result.status === 'ok' ? 200 : 503\n        res.status(statusCode).json(result)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Health check failed:`, err)\n        res.status(503).json({\n          status: 'error',\n          lastCheckAt: null,\n          resources: {},\n          isStale: true,\n          error:\n            'Redis unavailable, unable to read health status of other resources',\n          config: this.healthConfig,\n        })\n      }\n    }\n  }\n\n  async cleanup() {\n    for (const [, { pool }] of this._databasePools) {\n      try {\n        await closePool(pool)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Error closing database pool:`, err)\n      }\n    }\n    this._databasePools.clear()\n  }\n}\n\nmodule.exports = { HealthCheckClient, DEFAULT_HEALTH_CONFIG }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"healthCheckClient.js","names":["createDatabasePool","runHealthCheck","closePool","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","HealthCheckCache","readNumberEnv","name","raw","process","env","undefined","num","Number","isFinite","DEFAULT_HEALTH_CONFIG","checkIntervalMs","staleThresholdMs","checkTimeoutMs","maxDbConnectLatencyMs","SENSITIVE_PATTERNS","pattern","replacement","maskSensitiveData","text","masked","replace","HealthCheckClient","constructor","options","healthConfig","config","appName","BUILD_APP_NAME","prefixLogs","_refreshPromise","_databasePools","Map","_resources","resources","redisClient","_getRedisClientForCache","_redisClientType","_cache","cacheKey","_getEnv","resource","redisResource","find","r","client","_getPool","url","has","pool","type","set","get","_checkDatabase","status","error","timings","maxConnect","connectMs","err","healthCheckTimings","message","_checkRedis","pong","Promise","resolve","reject","ping","result","_performHealthCheckInternal","sortedResources","Object","keys","sort","reduce","acc","key","hasError","values","some","lastCheckAt","Date","now","isStale","_formatResult","cached","performHealthCheck","then","catch","getCachedResult","console","refreshCache","clearCache","healthHandler","req","res","json","statusCode","cleanup","clear","module","exports"],"sources":["../../src/health/healthCheckClient.js"],"sourcesContent":["const {\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n} = require('./databaseChecker')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('../redisUtils')\nconst { HealthCheckCache } = require('./healthCheckCache')\n\n/**\n * @param {string} name\n * @returns {number | undefined}\n */\nfunction readNumberEnv(name) {\n  const raw = process.env[name]\n  if (raw == null || raw === '') return undefined\n  const num = Number(raw)\n  return Number.isFinite(num) ? num : undefined\n}\n\n/** @type {{ checkIntervalMs: number, staleThresholdMs: number, checkTimeoutMs: number, maxDbConnectLatencyMs: number }} */\nconst DEFAULT_HEALTH_CONFIG = {\n  checkIntervalMs: 30_000,\n  staleThresholdMs: 180_000,\n  checkTimeoutMs: 15_000,\n  maxDbConnectLatencyMs:\n    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 1000,\n}\n\nconst SENSITIVE_PATTERNS = [\n  {\n    pattern:\n      /(postgres(?:ql)?|mysql|mongodb|redis|amqp):\\/\\/([^:]+):([^@]+)@([^:/]+)(:\\d+)?\\/([^\\s?]+)/gi,\n    replacement: '$1://***:***@***$5/***',\n  },\n  {\n    pattern: /(\\w+):\\/\\/([^:]+):([^@]+)@([^\\s/]+)/gi,\n    replacement: '$1://***:***@***',\n  },\n  {\n    pattern:\n      /(password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?token)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n  {\n    pattern:\n      /(database|table|schema|role|user|relation|column|index)\\s*[\"']([^\"']+)[\"']/gi,\n    replacement: '$1 \"***\"',\n  },\n  {\n    pattern: /\\b(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})(:\\d+)?\\b/g,\n    replacement: '***$2',\n  },\n  {\n    pattern: /\\b(host|hostname|server)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n]\n\n/**\n * @param {string} text\n * @returns {string}\n */\nfunction maskSensitiveData(text) {\n  if (!text || typeof text !== 'string') return text\n  let masked = text\n  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {\n    masked = masked.replace(pattern, replacement)\n  }\n  return masked\n}\n\n/**\n * @typedef {{ env: string, url?: string } | { env: string, client?: any }} HealthResource\n */\nclass HealthCheckClient {\n  /**\n   * @param {Object} options\n   * @param {HealthResource[]} options.resources - Must include Redis resource with client\n   * @param {Object} [options.config]\n   * @param {string} [options.appName] - For cache key: healthcheck:${appName}\n   * @param {string} [options.cacheKey] - Redis key (overrides appName)\n   */\n  constructor(options = {}) {\n    this.healthConfig = { ...DEFAULT_HEALTH_CONFIG, ...options.config }\n    this.appName =\n      options.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n\n    this.prefixLogs = `[${this.appName}] [HealthCheck]`\n\n    this._refreshPromise = null\n    /** @type {Map<string, { pool: any, type: string }>} */\n    this._databasePools = new Map()\n\n    /** @type {HealthResource[]} */\n    this._resources = options.resources || []\n\n    const redisClient = this._getRedisClientForCache()\n    if (redisClient) {\n      this._redisClientType = getRedisClientType(redisClient)\n    }\n\n    this._cache = new HealthCheckCache({\n      redisClient: redisClient || null,\n      cacheKey: options.cacheKey,\n      appName: this.appName,\n      staleThresholdMs: this.healthConfig.staleThresholdMs,\n    })\n  }\n\n  _getEnv(resource) {\n    return resource.env ?? resource.name\n  }\n\n  _getRedisClientForCache() {\n    const redisResource = this._resources.find(r => 'client' in r && r.client)\n    return redisResource?.client || null\n  }\n\n  _getPool(env, url) {\n    if (!this._databasePools.has(env)) {\n      const { pool, type } = createDatabasePool(\n        env,\n        url,\n        this.healthConfig.checkTimeoutMs\n      )\n      this._databasePools.set(env, { pool, type })\n    }\n    return this._databasePools.get(env)\n  }\n\n  async _checkDatabase(resource) {\n    const env = this._getEnv(resource)\n    const url = 'url' in resource ? resource.url : process.env[env]\n    if (!url) {\n      return { status: 'error', error: `Env ${env} not set` }\n    }\n\n    try {\n      const { pool, type } = this._getPool(env, url)\n      const timings = await runHealthCheck(pool, type)\n\n      const maxConnect = this.healthConfig.maxDbConnectLatencyMs\n      if (\n        typeof maxConnect === 'number' &&\n        Number.isFinite(maxConnect) &&\n        timings?.connectMs != null &&\n        timings.connectMs > maxConnect\n      ) {\n        return {\n          status: 'error',\n          error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,\n          connectMs: timings.connectMs,\n        }\n      }\n\n      return { status: 'ok', connectMs: timings.connectMs }\n    } catch (err) {\n      const timings = err?.healthCheckTimings\n      return {\n        status: 'error',\n        error: maskSensitiveData(err.message),\n        ...(timings && typeof timings === 'object'\n          ? { connectMs: timings.connectMs }\n          : {}),\n      }\n    }\n  }\n\n  async _checkRedis(resource) {\n    const { client } = resource\n    if (!client) return { status: 'ok' }\n\n    try {\n      let pong\n      if (this._redisClientType === REDIS_V3) {\n        pong = await new Promise((resolve, reject) => {\n          client.ping((err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n      } else if (\n        this._redisClientType === REDIS_V4 ||\n        this._redisClientType === IOREDIS\n      ) {\n        pong = await client.ping()\n      } else {\n        return { status: 'error', error: 'Unknown Redis client type' }\n      }\n\n      return pong === 'PONG'\n        ? { status: 'ok' }\n        : { status: 'error', error: `Unexpected: ${pong}` }\n    } catch (err) {\n      return { status: 'error', error: maskSensitiveData(err.message) }\n    }\n  }\n\n  async _performHealthCheckInternal() {\n    const resources = {}\n\n    for (const resource of this._resources) {\n      const env = this._getEnv(resource)\n\n      if ('client' in resource && resource.client) {\n        resources[env] = await this._checkRedis(resource)\n      } else {\n        resources[env] = await this._checkDatabase(resource)\n      }\n    }\n\n    const sortedResources = Object.keys(resources)\n      .sort()\n      .reduce((acc, key) => {\n        acc[key] = resources[key]\n        return acc\n      }, {})\n\n    const hasError = Object.values(resources).some(r => r.status === 'error')\n    const lastCheckAt = Date.now()\n\n    return {\n      status: hasError ? 'error' : 'ok',\n      lastCheckAt,\n      resources: sortedResources,\n      isStale: false,\n      config: this.healthConfig,\n    }\n  }\n\n  _formatResult(result, cached = false) {\n    const isStale =\n      !result.lastCheckAt ||\n      Date.now() - result.lastCheckAt > this.healthConfig.staleThresholdMs\n\n    return {\n      ...result,\n      isStale,\n      status: isStale ? 'stale' : result.status,\n      ...(isStale && {\n        error:\n          'Health check data is stale, health-check worker may not be running. Resource statuses are unknown.',\n      }),\n      ...(cached && { cached: true }),\n    }\n  }\n\n  async performHealthCheck() {\n    if (this._refreshPromise) {\n      return this._refreshPromise\n    }\n\n    this._refreshPromise = this._performHealthCheckInternal()\n      .then(result => {\n        this._refreshPromise = null\n        return this._formatResult(result)\n      })\n      .catch(err => {\n        this._refreshPromise = null\n        throw err\n      })\n\n    return this._refreshPromise\n  }\n\n  async getCachedResult() {\n    try {\n      const cached = await this._cache.get()\n      if (cached) return this._formatResult(cached)\n      return null\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to read from cache:`, err)\n      return {\n        status: 'error',\n        lastCheckAt: null,\n        resources: {},\n        isStale: true,\n        error:\n          'Redis unavailable, unable to read health status of other resources',\n        config: this.healthConfig,\n      }\n    }\n  }\n\n  async refreshCache() {\n    const result = await this._performHealthCheckInternal()\n    await this._cache.set(result)\n    return result\n  }\n\n  clearCache() {\n    this._refreshPromise = null\n  }\n\n  healthHandler() {\n    return async (req, res) => {\n      try {\n        const result = await this.getCachedResult()\n\n        if (!result) {\n          res.status(503).json({\n            status: 'error',\n            lastCheckAt: null,\n            resources: {},\n            isStale: true,\n            error:\n              'No health check data yet, health-check worker may not be running',\n            config: this.healthConfig,\n          })\n          return\n        }\n\n        const statusCode = result.status === 'ok' ? 200 : 503\n        res.status(statusCode).json(result)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Health check failed:`, err)\n        res.status(503).json({\n          status: 'error',\n          lastCheckAt: null,\n          resources: {},\n          isStale: true,\n          error:\n            'Redis unavailable, unable to read health status of other resources',\n          config: this.healthConfig,\n        })\n      }\n    }\n  }\n\n  async cleanup() {\n    for (const [, { pool }] of this._databasePools) {\n      try {\n        await closePool(pool)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Error closing database pool:`, err)\n      }\n    }\n    this._databasePools.clear()\n  }\n}\n\nmodule.exports = { HealthCheckClient, DEFAULT_HEALTH_CONFIG }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsQueueRedisClient.d.ts

@@ -12,17 +12,37 @@ export class QueueRedisMetricsClient extends RedisMetricsClient {
     /** Gauge for queue jobs by status */
     queueJobsGauge: import("prom-client").Gauge<string>;
     /**
-     * Get the correct Redis configuration for a queue depending on the client type
+     * Execute a Redis command in a client-type safe way.
      *
-     * For ioredis, returns { host, port, db, password } because BeeQueue
-     * cannot accept the full client instance.
-     * For other Redis clients (v3/v4), returns the client instance directly.
-     *
-     * @returns {object|any} Redis config object for BeeQueue or Redis client instance
+     * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
+     * @returns {Promise<any>}
      */
-    getConfigForDifferentRedis: () => object | any;
+    _send: (args: string[]) => Promise<any>;
+    _toNumber: (v: any) => number;
+    _getQueueType: (queueName: any) => Promise<"bull" | "bee">;
+    _getBullHealth: (queueName: any) => Promise<{
+        waiting: number;
+        active: number;
+        succeeded: number;
+        failed: number;
+        delayed: number;
+    }>;
+    _getBeeQueueHealth: (queueName: any) => Promise<{
+        waiting: number;
+        active: number;
+        succeeded: number;
+        failed: number;
+        delayed: number;
+    }>;
     /**
-     * Collect metrics for a single Bee Queue and set gauges
+     * Collect metrics for a single queue and set gauges.
+     *
+     * Supports:
+     * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
+     * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
+     *
+     * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
+     *
      * @param {string} queueName - Name of the queue
      * @returns {Promise<void>}
      */

package/lib/metrics/metricsQueueRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAC5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;;;;OAQG;IACH,kCAFa,MAAM,GAAC,GAAG,CAStB;IAED;;;;OAIG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAkDzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}
+{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA2BxB;IAED,8BAGC;IAED,2DAyBC;IAED;;;;;;OAmBC;IAED;;;;;;OAoBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}

package/lib/metrics/metricsQueueRedisClient.js

@@ -1,11 +1,12 @@
 "use strict";
 
-const Queue = require('bee-queue');
 const {
   RedisMetricsClient
 } = require('./metricsRedisClient');
 const {
-  IOREDIS
+  IOREDIS,
+  REDIS_V3,
+  REDIS_V4
 } = require('../redisUtils');
 
 /**
@@ -66,6 +67,18 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
     this.startupValidation = startupValidation;
 
     /** Cache for queue objects to avoid multiple connections */
+    // NOTE:
+    // Historically we used `bee-queue`'s `Queue#checkHealth()` here.
+    // But bee-queue depends on `redis@3`, which is not compatible with Node 22
+    // in some environments and can crash with errors like:
+    // - "this._ready.then is not a function"
+    // - "TypeError: this.stream.once is not a function"
+    //
+    // To avoid pulling in node-redis v3 at runtime, we read queue counters
+    // directly from Redis using the *provided* redis client (ioredis or node-redis).
+    //
+    // Keep this map reserved for possible future caching (e.g. key schema detection),
+    // but we no longer store Queue instances.
     this.queueCache = new Map();
 
     /** Gauge for queue jobs by status */
@@ -78,49 +91,98 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
   }
 
   /**
-   * Get the correct Redis configuration for a queue depending on the client type
+   * Execute a Redis command in a client-type safe way.
    *
-   * For ioredis, returns { host, port, db, password } because BeeQueue
-   * cannot accept the full client instance.
-   * For other Redis clients (v3/v4), returns the client instance directly.
-   *
-   * @returns {object|any} Redis config object for BeeQueue or Redis client instance
+   * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
+   * @returns {Promise<any>}
    */
-  getConfigForDifferentRedis = () => {
+  _send = args => {
+    if (!this.redisClient) return Promise.reject(new Error('Redis client not provided'));
+
+    // node-redis v3 (callback API)
+    if (this.redisClientType === REDIS_V3) {
+      return new Promise((resolve, reject) => {
+        this.redisClient.send_command(args[0], args.slice(1), (err, result) => {
+          if (err) reject(err);else resolve(result);
+        });
+      });
+    }
+
+    // node-redis v4 (Promise API)
+    if (this.redisClientType === REDIS_V4) {
+      return this.redisClient.sendCommand(args);
+    }
+
+    // ioredis (Promise API)
     if (this.redisClientType === IOREDIS) {
-      const {
-        host,
-        port,
-        db,
-        password
-      } = this.redisClient.options;
-      return {
-        host,
-        port,
-        db,
-        password
-      };
+      // ioredis supports `.call(command, ...args)`
+      return this.redisClient.call(args[0], ...args.slice(1));
     }
-    return this.redisClient;
+    return Promise.reject(new Error('Unsupported Redis client type'));
+  };
+  _toNumber = v => {
+    const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10);
+    return Number.isFinite(n) ? n : 0;
+  };
+  _getQueueType = async queueName => {
+    const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase();
+    if (forced === 'bull' || forced === 'bee') return forced;
+    const bullPrefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull';
+    const beePrefix = (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq';
+
+    // Detect by checking the canonical "waiting" key names.
+    const bullWaitKey = `${bullPrefix}:${queueName}:wait`;
+    const beeWaitKey = `${beePrefix}:${queueName}:waiting`;
+    try {
+      const [bullExists, beeExists] = await Promise.all([this._send(['EXISTS', bullWaitKey]), this._send(['EXISTS', beeWaitKey])]);
+      if (this._toNumber(bullExists) > 0) return 'bull';
+      if (this._toNumber(beeExists) > 0) return 'bee';
+    } catch {
+      // If EXISTS is blocked/unavailable, fall back to trying bull first.
+    }
+    return 'bull';
+  };
+  _getBullHealth = async queueName => {
+    const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull';
+    const base = `${prefix}:${queueName}:`;
+    const [waiting, active, succeeded, failed, delayed] = await Promise.all([this._send(['LLEN', `${base}wait`]), this._send(['LLEN', `${base}active`]), this._send(['ZCARD', `${base}completed`]), this._send(['ZCARD', `${base}failed`]), this._send(['ZCARD', `${base}delayed`])]);
+    return {
+      waiting: this._toNumber(waiting),
+      active: this._toNumber(active),
+      succeeded: this._toNumber(succeeded),
+      failed: this._toNumber(failed),
+      delayed: this._toNumber(delayed)
+    };
+  };
+  _getBeeQueueHealth = async queueName => {
+    const prefix = (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq';
+    const base = `${prefix}:${queueName}:`;
+    const [waiting, active, succeeded, failed, delayed] = await Promise.all([this._send(['LLEN', `${base}waiting`]), this._send(['LLEN', `${base}active`]), this._send(['SCARD', `${base}succeeded`]), this._send(['SCARD', `${base}failed`]), this._send(['ZCARD', `${base}delayed`])]);
+    return {
+      waiting: this._toNumber(waiting),
+      active: this._toNumber(active),
+      succeeded: this._toNumber(succeeded),
+      failed: this._toNumber(failed),
+      delayed: this._toNumber(delayed)
+    };
   };
 
   /**
-   * Collect metrics for a single Bee Queue and set gauges
+   * Collect metrics for a single queue and set gauges.
+   *
+   * Supports:
+   * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
+   * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
+   *
+   * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
+   *
    * @param {string} queueName - Name of the queue
    * @returns {Promise<void>}
    */
   collectSingleQueueMetrics = async queueName => {
     try {
-      if (!this.queueCache.has(queueName)) {
-        this.queueCache.set(queueName, new Queue(queueName, {
-          redis: this.getConfigForDifferentRedis(),
-          isWorker: false,
-          getEvents: false,
-          sendEvents: false
-        }));
-      }
-      const queue = this.queueCache.get(queueName);
-      const health = await queue.checkHealth();
+      const queueType = await this._getQueueType(queueName);
+      const health = queueType === 'bee' ? await this._getBeeQueueHealth(queueName) : await this._getBullHealth(queueName);
       const labels = {
         ...this.getDefaultLabels(),
         queue_name: queueName

package/lib/metrics/metricsQueueRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.js","names":["Queue","require","RedisMetricsClient","IOREDIS","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","getConfigForDifferentRedis","redisClientType","host","port","db","password","options","collectSingleQueueMetrics","queueName","has","set","redis","isWorker","getEvents","sendEvents","queue","get","health","checkHealth","labels","getDefaultLabels","queue_name","status","waiting","active","succeeded","failed","delayed","warn","collectQueueMetrics","collectRedisMetrics","Promise","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","err","on","cleanup","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({ redisClient, metricsConfig = {} } = {}) {\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      redisClient,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Cache for queue objects to avoid multiple connections */\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabels(['queue_name', 'status']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Get the correct Redis configuration for a queue depending on the client type\n   *\n   * For ioredis, returns { host, port, db, password } because BeeQueue\n   * cannot accept the full client instance.\n   * For other Redis clients (v3/v4), returns the client instance directly.\n   *\n   * @returns {object|any} Redis config object for BeeQueue or Redis client instance\n   */\n  getConfigForDifferentRedis = () => {\n    if (this.redisClientType === IOREDIS) {\n      const { host, port, db, password } = this.redisClient.options\n      return { host, port, db, password }\n    }\n\n    return this.redisClient\n  }\n\n  /**\n   * Collect metrics for a single Bee Queue and set gauges\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      if (!this.queueCache.has(queueName)) {\n        this.queueCache.set(\n          queueName,\n          new Queue(queueName, {\n            redis: this.getConfigForDifferentRedis(),\n            isWorker: false,\n            getEvents: false,\n            sendEvents: false,\n          })\n        )\n      }\n\n      const queue = this.queueCache.get(queueName)\n      const health = await queue.checkHealth()\n\n      const labels = {\n        ...this.getDefaultLabels(),\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n    process.exit(0)\n  }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","getDefaultLabels","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({ redisClient, metricsConfig = {} } = {}) {\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      redisClient,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Cache for queue objects to avoid multiple connections */\n    // NOTE:\n    // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n    // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n    // in some environments and can crash with errors like:\n    // - \"this._ready.then is not a function\"\n    // - \"TypeError: this.stream.once is not a function\"\n    //\n    // To avoid pulling in node-redis v3 at runtime, we read queue counters\n    // directly from Redis using the *provided* redis client (ioredis or node-redis).\n    //\n    // Keep this map reserved for possible future caching (e.g. key schema detection),\n    // but we no longer store Queue instances.\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabels(['queue_name', 'status']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Execute a Redis command in a client-type safe way.\n   *\n   * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n   * @returns {Promise<any>}\n   */\n  _send = args => {\n    if (!this.redisClient) return Promise.reject(new Error('Redis client not provided'))\n\n    // node-redis v3 (callback API)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 (Promise API)\n    if (this.redisClientType === REDIS_V4) {\n      return this.redisClient.sendCommand(args)\n    }\n\n    // ioredis (Promise API)\n    if (this.redisClientType === IOREDIS) {\n      // ioredis supports `.call(command, ...args)`\n      return this.redisClient.call(args[0], ...args.slice(1))\n    }\n\n    return Promise.reject(new Error('Unsupported Redis client type'))\n  }\n\n  _toNumber = v => {\n    const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n    return Number.isFinite(n) ? n : 0\n  }\n\n  _getQueueType = async queueName => {\n    const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n    if (forced === 'bull' || forced === 'bee') return forced\n\n    const bullPrefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const beePrefix =\n      (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() ||\n      'bq'\n\n    // Detect by checking the canonical \"waiting\" key names.\n    const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n    const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n    try {\n      const [bullExists, beeExists] = await Promise.all([\n        this._send(['EXISTS', bullWaitKey]),\n        this._send(['EXISTS', beeWaitKey]),\n      ])\n      if (this._toNumber(bullExists) > 0) return 'bull'\n      if (this._toNumber(beeExists) > 0) return 'bee'\n    } catch {\n      // If EXISTS is blocked/unavailable, fall back to trying bull first.\n    }\n\n    return 'bull'\n  }\n\n  _getBullHealth = async queueName => {\n    const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}wait`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['ZCARD', `${base}completed`]),\n      this._send(['ZCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  _getBeeQueueHealth = async queueName => {\n    const prefix =\n      (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}waiting`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['SCARD', `${base}succeeded`]),\n      this._send(['SCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  /**\n   * Collect metrics for a single queue and set gauges.\n   *\n   * Supports:\n   * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n   * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n   *\n   * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n   *\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      const queueType = await this._getQueueType(queueName)\n      const health =\n        queueType === 'bee'\n          ? await this._getBeeQueueHealth(queueName)\n          : await this._getBullHealth(queueName)\n\n      const labels = {\n        ...this.getDefaultLabels(),\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n    process.exit(0)\n  }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adalo/metrics",
-  "version": "0.1.150",
+  "version": "0.1.152",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/health/databaseChecker.js

@@ -5,10 +5,18 @@ const DB_TYPE_POSTGRES = 'postgres'
 const DB_TYPE_MYSQL = 'mysql'
 
 /**
+ * @returns {bigint}
+ */
+function nowNs() {
+  return process.hrtime.bigint()
+}
+
+/**
+ * @param {bigint} deltaNs
  * @returns {number}
  */
-function nowMs() {
-  return Number(process.hrtime.bigint() / 1_000_000n)
+function nsToMs(deltaNs) {
+  return Number(deltaNs) / 1_000_000
 }
 
 /**
@@ -88,38 +96,34 @@ function createDatabasePool(env, url, connectionTimeoutMs) {
 /**
  * @param {any} pool
  * @param {string} type
- * @returns {Promise<{ connectMs: number, queryMs: number, totalMs: number }>}
+ * @returns {Promise<{ connectMs: number }>}
  */
 async function runHealthCheck(pool, type) {
   if (type === DB_TYPE_MYSQL) {
-    const startTotal = nowMs()
-    let connectMs = 0
-    let queryMs = 0
+    let connectMs = 0.0
 
     /** @type {any} */
     let conn
     try {
-      const startConnect = nowMs()
+      const startConnect = nowNs()
       conn = await pool.getConnection()
-      connectMs = nowMs() - startConnect
+      connectMs = nsToMs(nowNs() - startConnect)
 
-      const startQuery = nowMs()
       await conn.query('SELECT 1')
-      queryMs = nowMs() - startQuery
-
-      return { connectMs, queryMs, totalMs: nowMs() - startTotal }
+      return { connectMs }
     } catch (err) {
-      const totalMs = nowMs() - startTotal
       err.healthCheckTimings = {
         connectMs,
-        queryMs,
-        totalMs,
       }
       throw err
     } finally {
       if (conn) {
         try {
-          conn.release()
+          // Destroy the connection so next check measures a real connect.
+          // mysql2 pooled connections support destroy() to remove it from the pool.
+          if (typeof conn.destroy === 'function') conn.destroy()
+          else if (typeof conn.end === 'function') await conn.end()
+          else if (typeof conn.release === 'function') conn.release()
         } catch {
           // ignore
         }
@@ -127,34 +131,28 @@ async function runHealthCheck(pool, type) {
     }
   }
 
-  const startTotal = nowMs()
-  let connectMs = 0
-  let queryMs = 0
+  let connectMs = 0.0
 
   /** @type {import('pg').PoolClient | null} */
   let client = null
   try {
-    const startConnect = nowMs()
+    const startConnect = nowNs()
     client = await pool.connect()
-    connectMs = nowMs() - startConnect
+    connectMs = nsToMs(nowNs() - startConnect)
 
-    const startQuery = nowMs()
     await client.query('SELECT 1')
-    queryMs = nowMs() - startQuery
-
-    return { connectMs, queryMs, totalMs: nowMs() - startTotal }
+    return { connectMs }
   } catch (err) {
-    const totalMs = nowMs() - startTotal
     err.healthCheckTimings = {
       connectMs,
-      queryMs,
-      totalMs,
     }
     throw err
   } finally {
     if (client) {
       try {
-        client.release()
+        // Force the pool to drop the client so next check measures a real connect.
+        // In node-postgres, passing a truthy value removes the client from the pool.
+        client.release(true)
       } catch {
         // ignore
       }

package/src/health/healthCheckClient.js

@@ -154,17 +154,19 @@ class HealthCheckClient {
         return {
           status: 'error',
           error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,
-          ...timings,
+          connectMs: timings.connectMs,
         }
       }
 
-      return { status: 'ok', ...timings }
+      return { status: 'ok', connectMs: timings.connectMs }
     } catch (err) {
       const timings = err?.healthCheckTimings
       return {
         status: 'error',
         error: maskSensitiveData(err.message),
-        ...(timings && typeof timings === 'object' ? timings : {}),
+        ...(timings && typeof timings === 'object'
+          ? { connectMs: timings.connectMs }
+          : {}),
       }
     }
   }

package/src/metrics/metricsQueueRedisClient.js

@@ -1,6 +1,5 @@
-const Queue = require('bee-queue')
 const { RedisMetricsClient } = require('./metricsRedisClient')
-const { IOREDIS } = require('../redisUtils')
+const { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')
 
 /**
  * QueueRedisMetricsClient extends RedisMetricsClient to collect
@@ -76,6 +75,18 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
     this.startupValidation = startupValidation
 
     /** Cache for queue objects to avoid multiple connections */
+    // NOTE:
+    // Historically we used `bee-queue`'s `Queue#checkHealth()` here.
+    // But bee-queue depends on `redis@3`, which is not compatible with Node 22
+    // in some environments and can crash with errors like:
+    // - "this._ready.then is not a function"
+    // - "TypeError: this.stream.once is not a function"
+    //
+    // To avoid pulling in node-redis v3 at runtime, we read queue counters
+    // directly from Redis using the *provided* redis client (ioredis or node-redis).
+    //
+    // Keep this map reserved for possible future caching (e.g. key schema detection),
+    // but we no longer store Queue instances.
     this.queueCache = new Map()
 
     /** Gauge for queue jobs by status */
@@ -89,44 +100,132 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
   }
 
   /**
-   * Get the correct Redis configuration for a queue depending on the client type
+   * Execute a Redis command in a client-type safe way.
    *
-   * For ioredis, returns { host, port, db, password } because BeeQueue
-   * cannot accept the full client instance.
-   * For other Redis clients (v3/v4), returns the client instance directly.
-   *
-   * @returns {object|any} Redis config object for BeeQueue or Redis client instance
+   * @param {string[]} args Command args array, e.g. ['LLEN', 'key']
+   * @returns {Promise<any>}
    */
-  getConfigForDifferentRedis = () => {
+  _send = args => {
+    if (!this.redisClient) return Promise.reject(new Error('Redis client not provided'))
+
+    // node-redis v3 (callback API)
+    if (this.redisClientType === REDIS_V3) {
+      return new Promise((resolve, reject) => {
+        this.redisClient.send_command(args[0], args.slice(1), (err, result) => {
+          if (err) reject(err)
+          else resolve(result)
+        })
+      })
+    }
+
+    // node-redis v4 (Promise API)
+    if (this.redisClientType === REDIS_V4) {
+      return this.redisClient.sendCommand(args)
+    }
+
+    // ioredis (Promise API)
     if (this.redisClientType === IOREDIS) {
-      const { host, port, db, password } = this.redisClient.options
-      return { host, port, db, password }
+      // ioredis supports `.call(command, ...args)`
+      return this.redisClient.call(args[0], ...args.slice(1))
+    }
+
+    return Promise.reject(new Error('Unsupported Redis client type'))
+  }
+
+  _toNumber = v => {
+    const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)
+    return Number.isFinite(n) ? n : 0
+  }
+
+  _getQueueType = async queueName => {
+    const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()
+    if (forced === 'bull' || forced === 'bee') return forced
+
+    const bullPrefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'
+    const beePrefix =
+      (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() ||
+      'bq'
+
+    // Detect by checking the canonical "waiting" key names.
+    const bullWaitKey = `${bullPrefix}:${queueName}:wait`
+    const beeWaitKey = `${beePrefix}:${queueName}:waiting`
+
+    try {
+      const [bullExists, beeExists] = await Promise.all([
+        this._send(['EXISTS', bullWaitKey]),
+        this._send(['EXISTS', beeWaitKey]),
+      ])
+      if (this._toNumber(bullExists) > 0) return 'bull'
+      if (this._toNumber(beeExists) > 0) return 'bee'
+    } catch {
+      // If EXISTS is blocked/unavailable, fall back to trying bull first.
     }
 
-    return this.redisClient
+    return 'bull'
+  }
+
+  _getBullHealth = async queueName => {
+    const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'
+    const base = `${prefix}:${queueName}:`
+
+    const [waiting, active, succeeded, failed, delayed] = await Promise.all([
+      this._send(['LLEN', `${base}wait`]),
+      this._send(['LLEN', `${base}active`]),
+      this._send(['ZCARD', `${base}completed`]),
+      this._send(['ZCARD', `${base}failed`]),
+      this._send(['ZCARD', `${base}delayed`]),
+    ])
+
+    return {
+      waiting: this._toNumber(waiting),
+      active: this._toNumber(active),
+      succeeded: this._toNumber(succeeded),
+      failed: this._toNumber(failed),
+      delayed: this._toNumber(delayed),
+    }
+  }
+
+  _getBeeQueueHealth = async queueName => {
+    const prefix =
+      (process.env.BEE_QUEUE_PREFIX || process.env.METRICS_BEE_QUEUE_PREFIX || 'bq').trim() || 'bq'
+    const base = `${prefix}:${queueName}:`
+
+    const [waiting, active, succeeded, failed, delayed] = await Promise.all([
+      this._send(['LLEN', `${base}waiting`]),
+      this._send(['LLEN', `${base}active`]),
+      this._send(['SCARD', `${base}succeeded`]),
+      this._send(['SCARD', `${base}failed`]),
+      this._send(['ZCARD', `${base}delayed`]),
+    ])
+
+    return {
+      waiting: this._toNumber(waiting),
+      active: this._toNumber(active),
+      succeeded: this._toNumber(succeeded),
+      failed: this._toNumber(failed),
+      delayed: this._toNumber(delayed),
+    }
   }
 
   /**
-   * Collect metrics for a single Bee Queue and set gauges
+   * Collect metrics for a single queue and set gauges.
+   *
+   * Supports:
+   * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`
+   * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`
+   *
+   * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.
+   *
    * @param {string} queueName - Name of the queue
    * @returns {Promise<void>}
    */
   collectSingleQueueMetrics = async queueName => {
     try {
-      if (!this.queueCache.has(queueName)) {
-        this.queueCache.set(
-          queueName,
-          new Queue(queueName, {
-            redis: this.getConfigForDifferentRedis(),
-            isWorker: false,
-            getEvents: false,
-            sendEvents: false,
-          })
-        )
-      }
-
-      const queue = this.queueCache.get(queueName)
-      const health = await queue.checkHealth()
+      const queueType = await this._getQueueType(queueName)
+      const health =
+        queueType === 'bee'
+          ? await this._getBeeQueueHealth(queueName)
+          : await this._getBullHealth(queueName)
 
       const labels = {
         ...this.getDefaultLabels(),