@onlineapps/infrastructure-tools 1.0.44 → 1.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/infrastructure-tools",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "Infrastructure orchestration utilities for OA Drive infrastructure services (health tracking, queue initialization, service discovery)",
   "main": "src/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@onlineapps/mq-client-core": "1.0.63",
-    "@onlineapps/service-common": "1.0.11",
+    "@onlineapps/service-common": "1.0.12",
     "@onlineapps/storage-core": "1.0.9",
     "uuid": "^9.0.1",
     "@onlineapps/infra-logger": "^1.0.0"

package/src/config.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * Runtime configuration schema for @onlineapps/infrastructure-tools.
+ */
+
+const { createRuntimeConfig } = require('@onlineapps/runtime-config');
+const DEFAULTS = require('./defaults');
+
+const runtimeCfg = createRuntimeConfig({
+  defaults: DEFAULTS,
+  schema: {
+    infrastructureHealthQueueName: { env: 'INFRASTRUCTURE_HEALTH_QUEUE', defaultKey: 'infrastructureHealthQueueName' },
+    infrastructureHealthPublishIntervalMs: { env: 'INFRASTRUCTURE_HEALTH_PUBLISH_INTERVAL', defaultKey: 'infrastructureHealthPublishIntervalMs', type: 'number' },
+    disableHealthChecks: { env: 'DISABLE_HEALTH_CHECKS', defaultKey: 'disableHealthChecks', type: 'boolean' },
+    serviceName: { env: 'SERVICE_NAME', defaultKey: 'serviceName' },
+  }
+});
+
+module.exports = runtimeCfg;
+
+

package/src/defaults.js

@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * Module-owned defaults for @onlineapps/infrastructure-tools.
+ *
+ * IMPORTANT:
+ * - These defaults are for runtime behavior only (intervals/flags).
+ * - Infrastructure topology is not defaulted anywhere.
+ */
+
+module.exports = {
+  infrastructureHealthQueueName: 'infrastructure.health.checks',
+  infrastructureHealthPublishIntervalMs: 5000,
+  disableHealthChecks: false,
+  serviceName: 'unknown-service',
+};
+
+

package/src/health/healthPublisher.js

@@ -14,6 +14,7 @@
 
 const { createLogger } = require('../utils/logger');
 const { v4: uuidv4 } = require('uuid');
+const runtimeCfg = require('../config');
 
 /**
  * Create infrastructure health publisher
@@ -54,13 +55,17 @@ function createHealthPublisher(options) {
   let healthCheckInterval = null;
   let isPublishing = false;
 
-  const queueName = config.queueName || config.infrastructureHealth?.queueName || process.env.INFRASTRUCTURE_HEALTH_QUEUE || 'infrastructure.health.checks';
-  const publishInterval = config.publishInterval || config.infrastructureHealth?.publishInterval || parseInt(process.env.INFRASTRUCTURE_HEALTH_PUBLISH_INTERVAL) || 5000;
-  
-  // Support for disabling health checks via environment variable (useful for library updates)
-  const healthChecksDisabled = process.env.DISABLE_HEALTH_CHECKS === 'true' || 
-                                process.env.DISABLE_HEALTH_CHECKS === '1' ||
-                                config.disableHealthChecks === true;
+  const queueName = runtimeCfg.get(
+    'infrastructureHealthQueueName',
+    config.queueName || config.infrastructureHealth?.queueName
+  );
+  const publishInterval = runtimeCfg.get(
+    'infrastructureHealthPublishIntervalMs',
+    config.publishInterval || config.infrastructureHealth?.publishInterval
+  );
+
+  const isHealthChecksDisabled = () =>
+    runtimeCfg.get('disableHealthChecks', config.disableHealthChecks === true);
 
   /**
    * Publish health check to infrastructure.health.checks queue
@@ -131,7 +136,7 @@ function createHealthPublisher(options) {
     }
 
     // Check if health checks are disabled (useful for library updates/maintenance)
-    if (healthChecksDisabled) {
+    if (isHealthChecksDisabled()) {
       logger.warn(`[InfrastructureHealth:${serviceName}] Health checks are disabled (DISABLE_HEALTH_CHECKS=true). Skipping start.`, {
         reason: 'health_checks_disabled',
         serviceName
@@ -145,7 +150,7 @@ function createHealthPublisher(options) {
     // Then publish periodically
     healthCheckInterval = setInterval(() => {
       // Double-check disabled flag on each interval (allows runtime changes)
-      if (healthChecksDisabled) {
+      if (isHealthChecksDisabled()) {
         stop();
         return;
       }
@@ -186,7 +191,7 @@ function createHealthPublisher(options) {
     stop,
     publishNow,
     isRunning: () => healthCheckInterval !== null,
-    isDisabled: () => healthChecksDisabled
+    isDisabled: () => isHealthChecksDisabled()
   };
 }
 

package/src/orchestration/initInfrastructureQueues.js

@@ -2,6 +2,7 @@
 
 const { sendQueueMismatchAlert } = require('../monitoring/queueMismatchReporter');
 const { createLogger: createInfraLogger } = require('@onlineapps/infra-logger');
+const runtimeCfg = require('../config');
 
 /**
  * initInfrastructureQueues.js
@@ -32,7 +33,7 @@ async function initInfrastructureQueues(channel, options = {}) {
 
   const logger = options.logger || console;
   const connection = options.connection || channel.connection;
-  const serviceName = options.serviceName || process.env.SERVICE_NAME || 'unknown-service';
+  const serviceName = runtimeCfg.get('serviceName', options.serviceName);
   const alertOnMismatch = options.alertOnMismatch !== false;
   
   // Load queueConfig from mq-client-core
@@ -41,16 +42,20 @@ async function initInfrastructureQueues(channel, options = {}) {
   // - Business services (via conn-infra-mq connector)
   const queueConfig = options.queueConfig || require('@onlineapps/mq-client-core/src/config/queueConfig');
 
-  const queuesToCreate = options.queues || [
-    // Workflow infrastructure queues
-    'workflow.init',
-    'workflow.control',
-    'workflow.completed',
-    'workflow.failed',
-    'workflow.dlq',
-    // Registry infrastructure queues
-    'registry.register',
-  ];
+  const deriveInfrastructureQueueNames = (cfg) => {
+    const prefixes = ['workflow', 'registry', 'infrastructure', 'validation', 'monitoring', 'telemetry', 'delivery'];
+    const result = [];
+    for (const prefix of prefixes) {
+      const group = cfg[prefix];
+      if (!group || typeof group !== 'object') continue;
+      for (const name of Object.keys(group)) {
+        result.push(`${prefix}.${name}`);
+      }
+    }
+    return result;
+  };
+
+  const queuesToCreate = options.queues || deriveInfrastructureQueueNames(queueConfig);
 
   const watchChannel = (ch) => {
     if (!ch) return ch;