@onlineapps/service-wrapper 2.0.44 → 2.0.46

package/package.json

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

package/src/ServiceWrapper.js

@@ -1082,12 +1082,29 @@ class ServiceWrapper {
         result = await this._executeOperation(message.step.operation, message.input || {});
       } else if (this.orchestrator) {
         // Delegate to orchestrator for complex workflow processing
+        // Validate required fields before processing
+        if (!message.workflow_id && !message.workflowId) {
+          throw new Error('Workflow message must have workflow_id or workflowId field');
+        }
+        if (!message.current_step && (!message.cookbook?.steps || message.cookbook.steps.length === 0)) {
+          throw new Error('Workflow message must have current_step field or cookbook with at least one step');
+        }
+        
         // Normalize message format: Gateway sends workflowId, orchestrator expects workflow_id
         const normalizedMessage = {
           ...message,
           workflow_id: message.workflow_id || message.workflowId,
           current_step: message.current_step || (message.cookbook?.steps?.[0]?.id)
         };
+        
+        // Validate normalized message has required fields
+        if (!normalizedMessage.workflow_id) {
+          throw new Error('Failed to normalize workflow_id: message must have workflow_id or workflowId');
+        }
+        if (!normalizedMessage.current_step) {
+          throw new Error('Failed to normalize current_step: message must have current_step or cookbook with steps');
+        }
+        
         this.logger?.info(`[ServiceWrapper] Calling orchestrator.processWorkflowMessage`, {
           workflow_id: normalizedMessage.workflow_id,
           current_step: normalizedMessage.current_step,
@@ -1101,45 +1118,70 @@ class ServiceWrapper {
 
       // Send response to workflow.completed if workflow_id is present
       if (message.workflow_id && this.mqClient) {
+        // Extract delivery configuration from context (passed from Gateway)
+        // Delivery can specify how to deliver the result (webhook, email, etc.)
+        const delivery = message.context?.delivery || null;
+        
         const workflowResponse = {
           workflow_id: message.workflow_id,
           service: serviceName,
           operation: message.step?.operation || message.operation,
           status: 'completed',
           output: result,
+          delivery: delivery, // Delivery configuration from Gateway context
           flags,
           timestamp: new Date().toISOString()
         };
 
         try {
           // Detailed logging before publish
-          this.logger?.info(`[ServiceWrapper] Preparing to publish workflow.completed`, {
+          const channelState = {
+            mqClientConnected: this.mqClient?._connected,
+            hasTransport: !!this.mqClient?._transport,
+            hasChannel: !!(this.mqClient?._transport?._channel),
+            channelClosed: this.mqClient?._transport?._channel?.closed,
+            hasConnection: !!(this.mqClient?._transport?._connection && !this.mqClient._transport._connection.closed)
+          };
+          
+          this.logger?.info(`[ServiceWrapper] [PUBLISH] Preparing to publish workflow.completed`, {
             workflowId: message.workflow_id,
             service: serviceName,
             operation: workflowResponse.operation,
-            mqClientConnected: this.mqClient._connected,
-            hasTransport: !!this.mqClient._transport,
-            hasChannel: !!(this.mqClient._transport?._channel)
+            queue: 'workflow.completed',
+            ...channelState
           });
+          
+          console.log(`[ServiceWrapper] [PUBLISH] Publishing workflow.completed for workflow ${message.workflow_id}`, channelState);
 
           await this.mqClient.publish('workflow.completed', workflowResponse);
           
           // Log success with details
-          this.logger?.info(`✓ Workflow response sent to workflow.completed: ${message.workflow_id}`, {
+          this.logger?.info(`[ServiceWrapper] [PUBLISH] ✓ Workflow response sent to workflow.completed: ${message.workflow_id}`, {
             workflowId: message.workflow_id,
             queue: 'workflow.completed',
             responseSize: JSON.stringify(workflowResponse).length
           });
+          console.log(`[ServiceWrapper] [PUBLISH] ✓ Successfully published workflow.completed for ${message.workflow_id}`);
         } catch (error) {
           // Use error handler to log and handle the error
-          this.logger?.error(`[ServiceWrapper] Failed to publish workflow.completed`, {
+          const errorContext = {
             workflowId: message.workflow_id,
             queue: 'workflow.completed',
             error: error.message,
             errorStack: error.stack,
             mqClientConnected: this.mqClient?._connected,
             hasTransport: !!this.mqClient?._transport,
-            hasChannel: !!(this.mqClient?._transport?._channel)
+            hasChannel: !!(this.mqClient?._transport?._channel),
+            channelClosed: this.mqClient?._transport?._channel?.closed,
+            hasConnection: !!(this.mqClient?._transport?._connection && !this.mqClient._transport._connection.closed)
+          };
+          
+          this.logger?.error(`[ServiceWrapper] [PUBLISH] ✗ Failed to publish workflow.completed`, errorContext);
+          console.error(`[ServiceWrapper] [PUBLISH] ✗ Failed to publish workflow.completed for ${message.workflow_id}:`, error.message);
+          console.error(`[ServiceWrapper] [PUBLISH] Channel state:`, {
+            hasChannel: errorContext.hasChannel,
+            channelClosed: errorContext.channelClosed,
+            hasConnection: errorContext.hasConnection
           });
           
           if (this.errorHandler) {