@onlineapps/mq-client-core 1.0.61 → 1.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/mq-client-core",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "Core MQ client library for RabbitMQ - shared by infrastructure services and connectors",
   "main": "src/index.js",
   "scripts": {
@@ -21,7 +21,8 @@
     "amqplib": "^0.10.3",
     "ajv": "^8.12.0",
     "lodash.merge": "^4.6.2",
-    "@onlineapps/infrastructure-tools": "^1.0.23"
+    "@onlineapps/runtime-config": "1.0.2",
+    "@onlineapps/infrastructure-tools": "1.0.39"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/BaseClient.js

@@ -11,6 +11,7 @@ const merge = require('lodash.merge');
 
 const configSchema = require('./config/configSchema');
 const defaultConfig = require('./config/defaultConfig');
+const runtimeCfg = require('./config');
 const transportFactory = require('./transports/transportFactory');
 const serializer = require('./utils/serializer');
 const {
@@ -32,25 +33,20 @@ class BaseClient {
 
     // Merge user config with defaults
     this._config = merge({}, defaultConfig, config || {});
-    
-    // EXCEPTION: Fallback for infrastructure client configuration
-    // ENV variable name: RABBITMQ_URL (has priority over config.host and defaultConfig.host)
-    // Priority: config.host (explicit) → RABBITMQ_URL ENV → defaultConfig.host fallback
-    // Only use ENV if host was not explicitly provided in config
-    const userProvidedHost = (config && config.host);
-    if (!userProvidedHost) {
-      // ENV has priority over defaultConfig fallback
-      // Check ENV at runtime (not at module load time)
-      if (process.env.RABBITMQ_URL && process.env.RABBITMQ_URL.trim() !== '') {
-        this._config.host = process.env.RABBITMQ_URL;
-      }
-    }
-    
-    this._config.heartbeat =
-      this._config.heartbeat ?? Number(process.env.RABBITMQ_HEARTBEAT || 30);
+
+    // Resolve runtime config (FAIL-FAST for host)
+    const resolved = runtimeCfg.resolve({
+      host: config?.host,
+      heartbeat: config?.heartbeat,
+      serviceName: config?.serviceName,
+    });
+
+    // Apply resolved runtime config
+    this._config.host = resolved.host;
+    this._config.heartbeat = this._config.heartbeat ?? resolved.heartbeat;
     this._config.connectionName =
       this._config.connectionName ||
-      `${process.env.SERVICE_NAME || 'oa-service'}:${process.pid}`;
+      `${resolved.serviceName}:${process.pid}`;
 
     // Validate merged config
     const valid = validate(this._config);
@@ -81,11 +77,17 @@ class BaseClient {
     console.log(`[BaseClient] Starting connect() with config:`, JSON.stringify({ type: this._config.type, host: this._config.host }));
     // Merge overrides into existing config
     this._config = merge({}, this._config, options);
-    this._config.heartbeat =
-      this._config.heartbeat ?? Number(process.env.RABBITMQ_HEARTBEAT || 30);
+    // Ensure runtime-derived values are applied (options can override explicitly)
+    const resolved = runtimeCfg.resolve({
+      host: this._config.host,
+      heartbeat: this._config.heartbeat,
+      serviceName: this._config.serviceName,
+    });
+    this._config.host = resolved.host;
+    this._config.heartbeat = this._config.heartbeat ?? resolved.heartbeat;
     this._config.connectionName =
       this._config.connectionName ||
-      `${process.env.SERVICE_NAME || 'oa-service'}:${process.pid}`;
+      `${resolved.serviceName}:${process.pid}`;
 
     try {
       console.log(`[BaseClient] Creating transport...`);

package/src/config/defaultConfig.js

@@ -7,27 +7,17 @@
  * Users can override any of these by passing a custom config object
  * or by supplying overrides to connect().
  *
- * EXCEPTION: Fallbacks are allowed ONLY for infrastructure client configuration.
- * This is the ONLY place where fallbacks are acceptable.
- *
- * Environment variable (checked at runtime, has priority):
- * - RABBITMQ_URL: Full RabbitMQ URL (e.g., amqp://guest:guest@api_services_queuer:5672)
- *
- * Fallback (used only if RABBITMQ_URL is not set):
- * - amqp://guest:guest@api_services_queuer:5672 (docker-compose default)
- *
- * NOTE: host is resolved at runtime in BaseClient constructor, not at module load time.
+ * NOTE:
+ * - Infrastructure topology (RabbitMQ URL) is NOT defaulted here.
+ * - BaseClient resolves host via @onlineapps/runtime-config (fail-fast when missing).
  */
 
 module.exports = {
   // Transport type: currently only 'rabbitmq' is fully supported.
   type: 'rabbitmq',
 
-  // RabbitMQ connection URI or hostname.
-  // NOTE: This is a fallback value. BaseClient constructor will check RABBITMQ_URL ENV variable
-  // and override this if ENV is set. ENV variable name: RABBITMQ_URL
-  // Fallback: amqp://guest:guest@api_services_queuer:5672 (docker-compose default)
-  host: 'amqp://guest:guest@api_services_queuer:5672',
+  // RabbitMQ connection URI or hostname (resolved at runtime; required by schema).
+  // Provided via explicit config.host or ENV RABBITMQ_URL.
 
   // Default queue name; can be overridden per call to publish/consume.
   // Optional for infrastructure services (they may not need a default queue).

package/src/config.js

@@ -0,0 +1,29 @@
+'use strict';
+
+/**
+ * Runtime configuration schema for @onlineapps/mq-client-core.
+ *
+ * Uses @onlineapps/runtime-config for unified priority:
+ * 1. Explicit config
+ * 2. Environment variable
+ * 3. Module-owned defaults (from ./defaults.js)
+ */
+
+const { createRuntimeConfig } = require('@onlineapps/runtime-config');
+const DEFAULTS = require('./defaults');
+
+const runtimeCfg = createRuntimeConfig({
+  defaults: DEFAULTS,
+  schema: {
+    // RabbitMQ topology (FAIL-FAST)
+    host: { env: 'RABBITMQ_URL', required: true },
+
+    // Client behavior
+    heartbeat: { env: 'RABBITMQ_HEARTBEAT', defaultKey: 'heartbeatSeconds', type: 'number' },
+    serviceName: { env: 'SERVICE_NAME', defaultKey: 'serviceName' },
+  }
+});
+
+module.exports = runtimeCfg;
+
+

package/src/defaults.js

@@ -0,0 +1,17 @@
+'use strict';
+
+/**
+ * Module-owned defaults for @onlineapps/mq-client-core.
+ *
+ * Ownership rule:
+ * - This module owns defaults for MQ client behavior (heartbeat, connectionName prefix).
+ * - Infrastructure topology (RabbitMQ URL) is NOT defaulted; it must be provided via
+ *   explicit config.host or ENV RABBITMQ_URL (fail-fast).
+ */
+
+module.exports = {
+  heartbeatSeconds: 30,
+  serviceName: 'oa-service',
+};
+
+

package/src/transports/rabbitmqClient.js

@@ -17,6 +17,7 @@ const {
 const PublishLayer = require('../layers/PublishLayer');
 const RecoveryWorker = require('../workers/RecoveryWorker');
 const PublishMonitor = require('../monitoring/PublishMonitor');
+const runtimeCfg = require('../config');
 
 // LAZY LOAD: Avoid circular dependency with infrastructure-tools
 // infrastructure-tools imports mq-client-core, so we can't import it at top-level
@@ -413,7 +414,7 @@ class RabbitMQClient extends EventEmitter {
       const connectionName =
         this._config.connectionName ||
         this._config.clientName ||
-        `oa-client:${process.env.SERVICE_NAME || 'unknown'}:${process.pid}`;
+        `oa-client:${runtimeCfg.get('serviceName')}:${process.pid}`;
 
       console.log(`[RabbitMQClient] Attempting to connect to: ${rawTarget}`);
       const connectArgs = typeof rawTarget === 'string'
@@ -1621,7 +1622,7 @@ class RabbitMQClient extends EventEmitter {
         const connectionName =
           this._config.connectionName ||
           this._config.clientName ||
-          `oa-client:${process.env.SERVICE_NAME || 'unknown'}:${process.pid}`;
+          `oa-client:${runtimeCfg.get('serviceName')}:${process.pid}`;
 
         const connectArgs = typeof rawTarget === 'string'
           ? [rawTarget, { heartbeat, clientProperties: { connection_name: connectionName } }]