@onlineapps/service-wrapper 2.0.29 → 2.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {

package/src/ServiceWrapper.js

@@ -137,14 +137,16 @@ class ServiceWrapper {
    * @async
    */
   async initialize() {
-    if (this.isInitialized) {
-      console.warn('ServiceWrapper already initialized');
+      if (this.isInitialized) {
+      // Logger might not be initialized yet, use console as fallback
+      (this.logger || console).warn('ServiceWrapper already initialized');
       return;
     }
 
     try {
       const serviceName = this.config.service?.name || 'unnamed-service';
-      console.log(`Initializing ServiceWrapper for ${serviceName}`);
+      // Logger might not be initialized yet, use console as fallback
+      (this.logger || console).info(`Initializing ServiceWrapper for ${serviceName}`);
 
       // 1. Initialize monitoring first (needed for logging)
       if (this.config.wrapper?.monitoring?.enabled !== false) {
@@ -190,10 +192,15 @@ class ServiceWrapper {
       }
 
       this.isInitialized = true;
-      console.log(`ServiceWrapper initialized successfully for ${serviceName}`);
+      this.logger?.info(`ServiceWrapper initialized successfully for ${serviceName}`);
 
     } catch (error) {
-      console.error('Failed to initialize ServiceWrapper:', error);
+      // Always log errors - use logger if available, otherwise console
+      if (this.logger) {
+        this.logger.error('Failed to initialize ServiceWrapper', { error: error.message, stack: error.stack });
+      } else {
+        console.error('Failed to initialize ServiceWrapper:', error);
+      }
       throw error;
     }
   }
@@ -212,7 +219,8 @@ class ServiceWrapper {
     });
 
     this.logger = this.monitoring;
-    console.log('Monitoring connector initialized');
+    // Logger is now available, use it
+    this.logger.info('Monitoring connector initialized');
 
     // Add monitoring middleware to Express app
     if (this.app) {
@@ -257,32 +265,11 @@ class ServiceWrapper {
     });
 
     await this.mqClient.connect();
-    console.log('MQ connector initialized');
+    this.logger?.info('MQ connector initialized');
 
-    // Initialize infrastructure queues using unified tool
-    // All services (infrastructure AND business) should create infrastructure queues
-    // This ensures consistent parameters across all services
-    if (this.config.wrapper?.mq?.initInfrastructureQueues !== false) {
-      try {
-        const { initInfrastructureQueues } = require('@onlineapps/conn-infra-mq').utils || {};
-        if (initInfrastructureQueues) {
-          // Get channel from transport (RabbitMQClient has channel getter)
-          const channel = this.mqClient._transport?.channel || this.mqClient._transport?._channel;
-          if (channel) {
-            await initInfrastructureQueues(channel, {
-              logger: this.logger || console
-            });
-            console.log('✓ Infrastructure queues initialized');
-          } else {
-            console.warn('⚠ Could not get channel from MQ transport');
-          }
-        }
-      } catch (error) {
-        // If tool not available or fails, log warning but continue
-        // Infrastructure queues may have been created by other services
-        console.warn('⚠ Could not initialize infrastructure queues:', error.message);
-      }
-    }
+    // NOTE: Business services (ServiceWrapper) do NOT create infrastructure queues
+    // Infrastructure queues are created by infrastructure services (Monitoring Consumer, Gateway)
+    // Business services only consume from them - if they don't exist, that's an infrastructure problem
   }
 
   /**
@@ -311,7 +298,7 @@ class ServiceWrapper {
 
     // Initialize registry client connection
     await this.registryClient.init();
-    console.log('Registry client initialized');
+    this.logger?.info('Registry client initialized');
 
     // Register service
     const serviceInfo = {
@@ -329,28 +316,28 @@ class ServiceWrapper {
 
     try {
       const registrationResult = await this.registryClient.register(serviceInfo);
-      console.log(`Service registered: ${serviceName}`, registrationResult);
+      this.logger?.info(`Service registered: ${serviceName}`, { registrationResult });
 
       // Store certificate if received
       if (registrationResult.certificate) {
         this.certificate = registrationResult.certificate;
-        console.log(`✓ Certificate received: ${registrationResult.certificate.certificateId}`);
+        this.logger?.info(`✓ Certificate received: ${registrationResult.certificate.certificateId}`);
       }
 
       // CRITICAL: Start workflow listeners ONLY after successful validation and registration with certificate
       // Both workflow.init and service-specific listeners start here
       if (registrationResult.success && registrationResult.certificate) {
-        console.log('✓ Certificate validated, starting workflow listeners...');
+        this.logger?.info('✓ Certificate validated, starting workflow listeners...');
         // Start workflow.init listener (for all services)
         await this._startWorkflowInitListener();
         // Start service-specific workflow listener
         await this._startServiceWorkflowListener();
       } else {
-        console.warn('⚠ Registration succeeded but no certificate received - workflow listeners NOT started');
+        this.logger?.warn('⚠ Registration succeeded but no certificate received - workflow listeners NOT started');
       }
 
     } catch (error) {
-      console.error(`Service registration failed: ${error.message}`);
+      this.logger?.error(`Service registration failed: ${error.message}`, { error: error.message, stack: error.stack });
       throw new Error(`Failed to register service ${serviceName}: ${error.message}`);
     }
 
@@ -359,13 +346,13 @@ class ServiceWrapper {
     const heartbeatInterval = parseInt(process.env.HEARTBEAT_INTERVAL) ||
                                this.config.wrapper?.registry?.heartbeatInterval ||
                                10000;
-    console.log(`[ServiceWrapper] Heartbeat interval set to ${heartbeatInterval}ms`);
+    this.logger?.info(`[ServiceWrapper] Heartbeat interval set to ${heartbeatInterval}ms`);
 
     this.heartbeatTimer = setInterval(async () => {
       try {
         await this.registryClient.sendHeartbeat(serviceName);
       } catch (error) {
-        console.error('Heartbeat failed:', error.message);
+        this.logger?.error('Heartbeat failed', { error: error.message, stack: error.stack });
       }
     }, heartbeatInterval);
   }
@@ -377,7 +364,7 @@ class ServiceWrapper {
   async _initializeCache() {
     const cacheUrl = this.config.wrapper?.cache?.url;
     if (!cacheUrl) {
-      console.warn('Cache enabled but no URL provided. Skipping cache initialization');
+      this.logger?.warn('Cache enabled but no URL provided. Skipping cache initialization');
       return;
     }
 
@@ -390,7 +377,7 @@ class ServiceWrapper {
     });
 
     await this.cacheConnector.connect();
-    console.log('Cache connector initialized');
+    this.logger?.info('Cache connector initialized');
   }
 
   /**
@@ -425,7 +412,7 @@ class ServiceWrapper {
       res.json(health);
     });
 
-    console.log(`Health check endpoint registered at ${healthEndpoint}`);
+    this.logger?.info(`Health check endpoint registered at ${healthEndpoint}`);
   }
 
   /**
@@ -476,7 +463,7 @@ class ServiceWrapper {
       defaultTimeout: this.config.wrapper?.timeout || 30000
     });
 
-    console.log('Orchestrator initialized');
+    this.logger?.info('Orchestrator initialized');
   }
 
   /**
@@ -486,7 +473,7 @@ class ServiceWrapper {
    */
   async _startWorkflowInitListener() {
     if (!this.mqClient) {
-      console.warn('Cannot start workflow.init listener: MQ client not initialized');
+      this.logger?.warn('Cannot start workflow.init listener: MQ client not initialized');
       return;
     }
 
@@ -495,7 +482,7 @@ class ServiceWrapper {
       await this._processWorkflowMessage(message, 'workflow.init');
     });
 
-    console.log('✓ workflow.init listener started (after successful registration)');
+    this.logger?.info('✓ workflow.init listener started (after successful registration)');
   }
 
   /**
@@ -504,7 +491,7 @@ class ServiceWrapper {
    */
   async _startServiceWorkflowListener() {
     if (!this.mqClient) {
-      console.warn('Cannot start service workflow listener: MQ client not initialized');
+      this.logger?.warn('Cannot start service workflow listener: MQ client not initialized');
       return;
     }
 
@@ -516,7 +503,7 @@ class ServiceWrapper {
       await this._processWorkflowMessage(message, serviceQueue);
     });
 
-    console.log(`✓ Service-specific workflow listener started: ${serviceQueue}`);
+    this.logger?.info(`✓ Service-specific workflow listener started: ${serviceQueue}`);
   }
 
   /**
@@ -541,7 +528,7 @@ class ServiceWrapper {
       const isTest = flags.includes('test');
       const isTier2Validation = flags.includes('tier2-validation');
 
-      console.log(`Processing message from ${queueName}:`, {
+      this.logger?.debug(`Processing message from ${queueName}`, {
         workflow_id: message.workflow_id,
         step: message.step?.operation || message.operation,
         flags,
@@ -551,7 +538,7 @@ class ServiceWrapper {
       // Check if this message is for our service
       const serviceName = this.config.service?.name || 'unnamed-service';
       if (message.step?.service && message.step.service !== serviceName) {
-        console.log(`Message not for this service (target: ${message.step.service})`);
+        this.logger?.debug(`Message not for this service (target: ${message.step.service})`);
         return;
       }
 
@@ -656,7 +643,7 @@ class ServiceWrapper {
     const url = `http://localhost:${servicePort}${operation.endpoint}`;
     const method = operation.method || 'POST';
 
-    console.log(`Executing operation ${operationName} via ${method} ${url}`);
+    this.logger?.debug(`Executing operation ${operationName} via ${method} ${url}`);
 
     // Make HTTP request using fetch (Node.js 18+) or http module
     const http = require('http');
@@ -711,7 +698,7 @@ class ServiceWrapper {
    */
   async shutdown() {
     const serviceName = this.config.service?.name || 'unnamed-service';
-    console.log(`Shutting down ServiceWrapper for ${serviceName}`);
+    this.logger?.info(`Shutting down ServiceWrapper for ${serviceName}`);
 
     try {
       // Stop heartbeat
@@ -735,10 +722,10 @@ class ServiceWrapper {
       }
 
       this.isInitialized = false;
-      console.log('ServiceWrapper shutdown complete');
+      this.logger?.info('ServiceWrapper shutdown complete');
 
     } catch (error) {
-      console.error('Error during shutdown:', error);
+      this.logger?.error('Error during shutdown', { error: error.message, stack: error.stack });
       throw error;
     }
   }
@@ -756,7 +743,7 @@ class ServiceWrapper {
       const proofPath = path.join(process.cwd(), '.validation-proof.json');
 
       if (!fs.existsSync(proofPath)) {
-        console.warn('Validation proof not found:', proofPath);
+        this.logger?.warn('Validation proof not found', { proofPath });
         return null;
       }
 
@@ -765,15 +752,15 @@ class ServiceWrapper {
 
       // Basic validation
       if (!proof.validationProof || !proof.validationData) {
-        console.warn('Invalid validation proof format');
+        this.logger?.warn('Invalid validation proof format');
         return null;
       }
 
-      console.log('✓ Validation proof loaded:', proof.validationProof.substring(0, 16) + '...');
+      this.logger?.info('✓ Validation proof loaded', { proofHash: proof.validationProof.substring(0, 16) + '...' });
       return proof;
 
     } catch (error) {
-      console.warn('Failed to load validation proof:', error.message);
+      this.logger?.warn('Failed to load validation proof', { error: error.message, stack: error.stack });
       return null;
     }
   }
@@ -804,7 +791,7 @@ class ServiceWrapper {
     // Build service URL for validation (HTTP calls to running server)
     const serviceUrl = `http://localhost:${servicePort}`;
 
-    console.log('[ServiceWrapper] Checking validation proof...');
+    this.logger?.info('[ServiceWrapper] Checking validation proof...');
 
     // Use injected orchestrator (for testing) or create new one (production)
     const orchestrator = this._injectedValidationOrchestrator || new ValidationOrchestrator({
@@ -822,9 +809,9 @@ class ServiceWrapper {
     }
 
     if (result.skipped) {
-      console.log('[ServiceWrapper] ✓ Using existing validation proof');
+      this.logger?.info('[ServiceWrapper] ✓ Using existing validation proof');
     } else {
-      console.log('[ServiceWrapper] ✓ Validation completed successfully');
+      this.logger?.info('[ServiceWrapper] ✓ Validation completed successfully');
     }
 
     // Store proof for registration