@onlineapps/infrastructure-tools 1.0.2 → 1.0.4

package/README.md

@@ -55,6 +55,8 @@ await waitForInfrastructureReady({
 });
 ```
 
+**Note:** `waitForInfrastructureReady` is re-exported from `@onlineapps/service-common` to avoid duplication. Both infrastructure and business services can use it.
+
 ### Initialize Infrastructure Queues
 
 Initialize infrastructure queues with correct parameters:
@@ -120,7 +122,7 @@ Creates health publisher adapter for amqplib (direct connection + channel).
 ## Dependencies
 
 - `@onlineapps/mq-client-core` - For queue configuration
-- `redis` - For health status checking
+- `@onlineapps/service-common` - For `waitForInfrastructureReady` (shared utility)
 
 ## Related Libraries
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/infrastructure-tools",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Infrastructure orchestration utilities for OA Drive infrastructure services (health tracking, queue initialization, service discovery)",
   "main": "src/index.js",
   "scripts": {
@@ -18,8 +18,8 @@
   "author": "OnlineApps",
   "license": "MIT",
   "dependencies": {
-    "@onlineapps/mq-client-core": "^1.0.24",
-    "redis": "^4.6.0"
+    "@onlineapps/mq-client-core": "^1.0.25",
+    "@onlineapps/service-common": "^1.0.0"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/index.js

@@ -10,7 +10,9 @@
  * Business services should NOT use this library.
  */
 
-const { waitForInfrastructureReady } = require('./orchestration/waitForInfrastructureReady');
+// Re-export waitForInfrastructureReady from service-common (no duplication)
+const { waitForInfrastructureReady } = require('@onlineapps/service-common');
+
 const { initInfrastructureQueues } = require('./orchestration/initInfrastructureQueues');
 const {
   createHealthPublisher,
@@ -20,6 +22,7 @@ const {
 
 module.exports = {
   // Orchestration utilities
+  // waitForInfrastructureReady is re-exported from @onlineapps/service-common
   waitForInfrastructureReady,
   initInfrastructureQueues,
   

package/src/orchestration/waitForInfrastructureReady.js

@@ -1,142 +0,0 @@
-'use strict';
-
-/**
- * waitForInfrastructureReady.js
- * 
- * Waits for all infrastructure services to be verified as running and healthy.
- * Used by infrastructure services before creating queues to ensure system consistency.
- * 
- * This prevents race conditions where queues are created before all services are ready.
- * 
- * **How it works:**
- * 1. Connects to Redis (where Registry stores infrastructure health status)
- * 2. Checks `infrastructure:health:all` key every 5 seconds
- * 3. If key is `"true"` → all infrastructure services are UP → return success
- * 4. If key is `"false"` or missing → wait and retry
- * 5. If timeout reached → throw error
- * 
- * **Why Redis (not HTTP):**
- * - Fast: In-memory lookup, no network overhead
- * - Reliable: Redis is already required infrastructure
- * - Low latency: Direct key lookup, no HTTP parsing
- * - Consistent: Same data source as Registry uses
- * - No single point of failure: Redis can be clustered
- */
-
-/**
- * Wait for all infrastructure services to be ready
- * @param {Object} options - Options
- * @param {string} [options.redisUrl] - Redis URL (default: REDIS_URL env or redis://api_node_cache:6379)
- * @param {number} [options.maxWait] - Maximum wait time in ms (default: INFRASTRUCTURE_HEALTH_WAIT_MAX_TIME env or 300000 = 5 minutes)
- * @param {number} [options.checkInterval] - Check interval in ms (default: INFRASTRUCTURE_HEALTH_WAIT_CHECK_INTERVAL env or 5000 = 5 seconds)
- * @param {Object} [options.logger] - Logger instance (default: console)
- * @returns {Promise<boolean>} - True if all infrastructure services are ready
- * @throws {Error} - If timeout is reached
- * 
- * Note: Default values can be overridden via ENV variables or options parameter.
- * Registry config (config.infrastructureHealth) is the source of truth for these defaults.
- */
-async function waitForInfrastructureReady(options = {}) {
-  const redisUrl = options.redisUrl || process.env.REDIS_URL || 'redis://api_node_cache:6379';
-  const maxWait = options.maxWait || parseInt(process.env.INFRASTRUCTURE_HEALTH_WAIT_MAX_TIME) || 300000; // 5 minutes
-  const checkInterval = options.checkInterval || parseInt(process.env.INFRASTRUCTURE_HEALTH_WAIT_CHECK_INTERVAL) || 5000; // 5 seconds
-  const logger = options.logger || console;
-
-  // Universal logger adapter (supports both console and winston)
-  // Winston logger expects object with message property, console.log accepts string
-  const log = (message) => {
-    if (typeof logger.info === 'function' && typeof logger.log !== 'function') {
-      // Likely winston logger - use object format
-      logger.info({ message: String(message) });
-    } else if (typeof logger.log === 'function') {
-      // console.log or similar
-      logger.log(message);
-    } else if (typeof logger.info === 'function') {
-      // Fallback for other loggers
-      logger.info(message);
-    } else {
-      console.log(message);
-    }
-  };
-
-  const startTime = Date.now();
-  let attemptCount = 0;
-  let redis = null;
-
-  log('[InfrastructureReady] Waiting for all infrastructure services to be ready...');
-  log(`[InfrastructureReady] Redis URL: ${redisUrl}`);
-  log(`[InfrastructureReady] Max wait: ${maxWait}ms, Check interval: ${checkInterval}ms`);
-
-  try {
-    // Connect to Redis
-    const { createClient } = require('redis');
-    redis = createClient({ url: redisUrl });
-    
-    redis.on('error', (err) => {
-      log(`[InfrastructureReady] Redis error: ${err.message}`);
-    });
-    
-    await redis.connect();
-    log('[InfrastructureReady] Connected to Redis');
-
-    while (Date.now() - startTime < maxWait) {
-      attemptCount++;
-      
-      try {
-        // Check Redis key: infrastructure:health:all
-        const allHealthy = await redis.get('infrastructure:health:all');
-        
-        if (allHealthy === 'true') {
-          // All services are UP, we can proceed
-          const elapsed = Date.now() - startTime;
-          log(`[InfrastructureReady] ✓ All infrastructure services are ready (took ${elapsed}ms, ${attemptCount} attempts)`);
-          
-          // Optionally log individual service status
-          // Note: Service names should match config.infrastructureServices in Registry
-          const serviceKeys = ['gateway', 'registry', 'validator', 'delivery', 'monitoring'];
-          const statuses = {};
-          for (const serviceName of serviceKeys) {
-            const status = await redis.get(`infrastructure:health:${serviceName}`);
-            if (status) {
-              statuses[serviceName] = JSON.parse(status);
-            }
-          }
-          log(`[InfrastructureReady] Infrastructure status: ${JSON.stringify(statuses, null, 2)}`);
-          
-          return true;
-        }
-
-        // Not all services ready yet
-        log(`[InfrastructureReady] Attempt ${attemptCount}: Not all services ready (allHealthy: ${allHealthy || 'null'})`);
-        log(`[InfrastructureReady] Waiting ${checkInterval}ms before next check...`);
-
-      } catch (error) {
-        // Redis might not be ready yet, or connection issue
-        log(`[InfrastructureReady] Attempt ${attemptCount}: Redis check failed (${error.message})`);
-        log(`[InfrastructureReady] Waiting ${checkInterval}ms before retry...`);
-      }
-
-      // Wait before next check
-      await new Promise(resolve => setTimeout(resolve, checkInterval));
-    }
-
-    // Timeout reached
-    const elapsed = Date.now() - startTime;
-    throw new Error(
-      `Infrastructure services not ready within ${maxWait}ms (${elapsed}ms elapsed, ${attemptCount} attempts). ` +
-      `Check Redis keys: infrastructure:health:*`
-    );
-
-  } finally {
-    // Clean up Redis connection
-    if (redis && redis.isReady) {
-      await redis.quit();
-      log('[InfrastructureReady] Redis connection closed');
-    }
-  }
-}
-
-module.exports = {
-  waitForInfrastructureReady
-};
-