@adalo/metrics 0.1.114 → 0.1.115

package/lib/metricsDatabaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../src/metricsDatabaseClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAf2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAmF9C;IAtBC,qBAAuB;IAUvB,qCAAqC;IACrC,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}
+{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../src/metricsDatabaseClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;OAeG;IACH;QAd2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;OAkF9C;IAtBC,qBAAuB;IAUvB,qCAAqC;IACrC,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}

package/lib/metricsDatabaseClient.js

@@ -4,31 +4,30 @@ const {
   Pool
 } = require('pg');
 const {
-  MetricsClient
-} = require('.');
+  BaseMetricsClient
+} = require('./baseMetricsClient');
 
 /**
  * DatabaseMetricsClient collects Postgres connection metrics
  * and pushes them to Prometheus Pushgateway.
  *
- * @extends MetricsClient
+ * @extends BaseMetricsClient
  */
-class DatabaseMetricsClient extends MetricsClient {
+class DatabaseMetricsClient extends BaseMetricsClient {
   /**
    * @param {Object} options
    * @param {string} options.databaseUrl - Required main database URL
    * @param {string} options.databaseName - Main database name for metrics
    * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value
-   * @param {string} [options.appName] - Application name (from MetricsClient)
-   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
-   * @param {string} [options.processType] - Process type (from MetricsClient)
-   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
-   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
-   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
-   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
+   * @param {string} [options.appName] - Application name (from BaseMetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
+   * @param {string} [options.processType] - Process type (from BaseMetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
    * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics
    * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service
-   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation
    * @param {function} [options.startupValidation] - Function to validate startup
    */
   constructor({
@@ -74,7 +73,6 @@ class DatabaseMetricsClient extends MetricsClient {
     };
     super({
       ...metricsConfig,
-      scripDefaultMetrics: true,
       processType: metricsConfig.processType || 'database-metrics',
       intervalSec,
       startupValidation

package/lib/metricsDatabaseClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","MetricsClient","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","scripDefaultMetrics","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","getDefaultLabels","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../src/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { MetricsClient } = require('.')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass DatabaseMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation\n   * @param {function} [options.startupValidation] - Function to validate startup\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabels([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.getDefaultLabels(),\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB metrics: ${error.message}`\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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\n\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","BaseMetricsClient","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","getDefaultLabels","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../src/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass DatabaseMetricsClient extends BaseMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\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\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {function} [options.startupValidation] - Function to validate startup\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabels([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.getDefaultLabels(),\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB metrics: ${error.message}`\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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\n\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metricsQueueRedisClient.d.ts

@@ -1,5 +1,5 @@
 /**
- * QueueRedisMetricsClient extends MetricsClient to collect
+ * QueueRedisMetricsClient extends RedisMetricsClient to collect
  * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
  *
  * @extends RedisMetricsClient

package/lib/metricsQueueRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../src/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/metricsQueueRedisClient.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IA+DI,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"}

package/lib/metricsQueueRedisClient.js

@@ -9,7 +9,7 @@ const {
 } = require('./redisUtils');
 
 /**
- * QueueRedisMetricsClient extends MetricsClient to collect
+ * QueueRedisMetricsClient extends RedisMetricsClient to collect
  * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
  *
  * @extends RedisMetricsClient
@@ -18,17 +18,16 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
   /**
    * @param {Object} options
    * @param {any} options.redisClient - Redis client instance (required)
-   * @param {string} [options.appName] - Application name (from MetricsClient)
-   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
-   * @param {string} [options.processType] - Process type (from MetricsClient)
-   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
-   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
-   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
-   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
-   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)
-   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
-   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
-   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+   * @param {string} [options.appName] - Application name (from BaseMetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
+   * @param {string} [options.processType] - Process type (from BaseMetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
+   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
    */
   constructor({
     redisClient,

package/lib/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/metricsQueueRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { RedisMetricsClient } = require('.')\nconst { IOREDIS } = require('./redisUtils')\n\n/**\n * QueueRedisMetricsClient extends MetricsClient 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 MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\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":["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/metricsQueueRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { RedisMetricsClient } = require('.')\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   */\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":[]}

package/lib/metricsRedisClient.d.ts

@@ -1,24 +1,23 @@
 /**
- * RedisMetricsClient extends MetricsClient to collect
+ * RedisMetricsClient extends BaseMetricsClient to collect
  * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
- * @extends MetricsClient
+ * @extends BaseMetricsClient
  */
-export class RedisMetricsClient extends MetricsClient {
+export class RedisMetricsClient extends BaseMetricsClient {
     /**
      * @param {Object} options
      * @param {any} options.redisClient - Redis client instance (required)
-     * @param {string} [options.appName] - Application name (from MetricsClient)
-     * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
-     * @param {string} [options.processType] - Process type (from MetricsClient)
-     * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
-     * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
-     * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
-     * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
-     * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)
-     * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
-     * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
-     * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+     * @param {string} [options.appName] - Application name (from BaseMetricsClient)
+     * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
+     * @param {string} [options.processType] - Process type (from BaseMetricsClient)
+     * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
+     * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
+     * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
+     * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
+     * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)
+     * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)
+     * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
      */
     constructor({ redisClient, ...metricsConfig }?: {
         redisClient: any;
@@ -31,7 +30,6 @@ export class RedisMetricsClient extends MetricsClient {
         pushgatewaySecret?: string | undefined;
         intervalSec?: number | undefined;
         removeOldMetrics?: boolean | undefined;
-        scripDefaultMetrics?: boolean | undefined;
         startupValidation?: Function | undefined;
     });
     /** Redis client used for metrics */
@@ -63,5 +61,5 @@ export class RedisMetricsClient extends MetricsClient {
      */
     startPush: (intervalSec?: number | undefined) => void;
 }
-import { MetricsClient } from "./metricsClient";
+import { BaseMetricsClient } from "./baseMetricsClient";
 //# sourceMappingURL=metricsRedisClient.d.ts.map

package/lib/metricsRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OA+C9C;IAhCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAgCC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAsFzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
+{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;OAaG;IACH;QAZwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;OA8C9C;IAhCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAgCC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAsFzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}

package/lib/metricsRedisClient.js

@@ -1,8 +1,8 @@
 "use strict";
 
 const {
-  MetricsClient
-} = require('.');
+  BaseMetricsClient
+} = require('./baseMetricsClient');
 const {
   getRedisClientType,
   REDIS_V4,
@@ -13,26 +13,25 @@ const redisConnectionStableFields = ['name', 'flags', 'cmd'];
 const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd'];
 
 /**
- * RedisMetricsClient extends MetricsClient to collect
+ * RedisMetricsClient extends BaseMetricsClient to collect
  * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
- * @extends MetricsClient
+ * @extends BaseMetricsClient
  */
-class RedisMetricsClient extends MetricsClient {
+class RedisMetricsClient extends BaseMetricsClient {
   /**
    * @param {Object} options
    * @param {any} options.redisClient - Redis client instance (required)
-   * @param {string} [options.appName] - Application name (from MetricsClient)
-   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
-   * @param {string} [options.processType] - Process type (from MetricsClient)
-   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
-   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
-   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
-   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
-   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)
-   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
-   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
-   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+   * @param {string} [options.appName] - Application name (from BaseMetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
+   * @param {string} [options.processType] - Process type (from BaseMetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
+   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
    */
   constructor({
     redisClient,
@@ -41,7 +40,6 @@ class RedisMetricsClient extends MetricsClient {
     const intervalSec = metricsConfig.intervalSec || parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) || 5;
     super({
       ...metricsConfig,
-      scripDefaultMetrics: true,
       processType: metricsConfig.processType || 'queue-metrics',
       intervalSec
     });

package/lib/metricsRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","grouped","conn","flags","totMem","cmd","key","JSON","stringify","count","memory","Object","values","valueLabels","set","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Counter for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    this.redisConnectionsMemoryGauge = this.createGauge({\n      name: 'app_redis_connections_memory_usage_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4\n    if (this.redisClientType === REDIS_V4) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.client('LIST')\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n\n      if (this.logValues) {\n        console.log('Redis connections: ', connectionsInfoStr)\n        console.log('Redis connections count: ', connections.length)\n      }\n\n      const grouped = {}\n      connections.forEach(conn => {\n        const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n        // build grouping key (includes default gauge labels later)\n        const key = JSON.stringify({ name, flags, cmd })\n\n        if (!grouped[key]) {\n          grouped[key] = {\n            labels: { name, flags, cmd },\n            count: 0,\n            memory: 0,\n          }\n        }\n\n        grouped[key].count += 1\n        grouped[key].memory += parseInt(totMem, 10)\n      })\n\n      Object.values(grouped).forEach(\n        ({ labels: valueLabels, count, memory }) => {\n          this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n          this.redisConnectionsMemoryGauge.set(\n            { ...labels, ...valueLabels },\n            memory\n          )\n        }\n      )\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\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 Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\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.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","grouped","conn","flags","totMem","cmd","key","JSON","stringify","count","memory","Object","values","valueLabels","set","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends BaseMetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass RedisMetricsClient extends BaseMetricsClient {\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   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Counter for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    this.redisConnectionsMemoryGauge = this.createGauge({\n      name: 'app_redis_connections_memory_usage_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4\n    if (this.redisClientType === REDIS_V4) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.client('LIST')\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n\n      if (this.logValues) {\n        console.log('Redis connections: ', connectionsInfoStr)\n        console.log('Redis connections count: ', connections.length)\n      }\n\n      const grouped = {}\n      connections.forEach(conn => {\n        const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n        // build grouping key (includes default gauge labels later)\n        const key = JSON.stringify({ name, flags, cmd })\n\n        if (!grouped[key]) {\n          grouped[key] = {\n            labels: { name, flags, cmd },\n            count: 0,\n            memory: 0,\n          }\n        }\n\n        grouped[key].count += 1\n        grouped[key].memory += parseInt(totMem, 10)\n      })\n\n      Object.values(grouped).forEach(\n        ({ labels: valueLabels, count, memory }) => {\n          this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n          this.redisConnectionsMemoryGauge.set(\n            { ...labels, ...valueLabels },\n            memory\n          )\n        }\n      )\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\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 Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\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.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/package.json

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