@onlineapps/service-wrapper 2.1.7 → 2.1.10

package/package.json

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

package/src/ServiceWrapper.js

@@ -273,6 +273,7 @@ class ServiceWrapper {
    * @private
    */
   _logPhase(phase, phaseName, status, error = null, duration = null) {
+    const serviceName = this.config.service?.name || 'unnamed-service';
     const logMsg = `[FÁZE ${phase}] ${phaseName} - ${status}`;
     const logData = {
       phase,
@@ -281,8 +282,19 @@ class ServiceWrapper {
       timestamp: new Date().toISOString(),
       duration,
       error: error ? { message: error.message, stack: error.stack } : null,
-      serviceName: this.config.service?.name || 'unnamed-service'
+      serviceName
     };
+    
+    // Structured log for service wrapper phases
+    console.log(`[${serviceName}:service-wrapper:init:PHASE_${status}] ${JSON.stringify({
+      timestamp: new Date().toISOString(),
+      service: serviceName,
+      phase,
+      phase_name: phaseName,
+      status,
+      duration_ms: duration,
+      error: error ? error.message : null
+    })}`);
 
     if (status === 'PASSED') {
       this.logger?.info(logMsg, logData);
@@ -1255,10 +1267,13 @@ class ServiceWrapper {
         }
         
         // Normalize message format: Gateway sends workflowId, orchestrator expects workflow_id
+        // V2 format uses step_id, V1 used id - support both for backwards compatibility during migration
+        const firstStep = message.cookbook?.steps?.[0];
+        const firstStepId = firstStep?.step_id || firstStep?.id;
         const normalizedMessage = {
           ...message,
           workflow_id: message.workflow_id || message.workflowId,
-          current_step: message.current_step || (message.cookbook?.steps?.[0]?.id)
+          current_step: message.current_step || firstStepId
         };
         
         // Validate normalized message has required fields

package/src/index.js

@@ -11,6 +11,7 @@
  * @since 2.0.0
  */
 
+const path = require('path');
 const ServiceWrapper = require('./ServiceWrapper');
 const { ConfigLoader } = require('./ConfigLoader');
 
@@ -21,8 +22,98 @@ const { ConfigLoader } = require('./ConfigLoader');
 // Note: HTTP logging middleware is now in each service's middlewares/httpLogging.js
 // It uses lazy logger access via lib/logger.js (set after wrapper.initialize())
 
+/**
+ * Bootstrap a business service with standard configuration
+ * Eliminates boilerplate code in service index.js
+ * 
+ * @param {string} serviceRoot - Service root directory (__dirname from index.js)
+ * @param {Object} [options] - Optional overrides
+ * @param {Object} [options.app] - Express app (default: require('./src/app'))
+ * @param {Object} [options.config] - Config (default: require('./src/config'))
+ * @param {Function} [options.setLogger] - Logger setter (default: require('./src/lib/logger').setLogger)
+ * @returns {Promise<{wrapper: ServiceWrapper, server: Object}>}
+ * 
+ * @example
+ * // index.js (minimal)
+ * require('@onlineapps/service-wrapper').bootstrap(__dirname);
+ */
+async function bootstrap(serviceRoot, options = {}) {
+  // Load dotenv first
+  require('dotenv').config({ path: path.join(serviceRoot, '.env') });
+
+  // Load app, config, and logger from service
+  const app = options.app || require(path.join(serviceRoot, 'src', 'app'));
+  const config = options.config || require(path.join(serviceRoot, 'src', 'config'));
+  
+  // Logger setter is optional - some services may not have it
+  let setLogger = options.setLogger;
+  if (!setLogger) {
+    try {
+      const loggerModule = require(path.join(serviceRoot, 'src', 'lib', 'logger'));
+      setLogger = loggerModule.setLogger;
+    } catch (e) {
+      // No logger module - that's OK
+      setLogger = () => {};
+    }
+  }
+
+  console.log(`Starting ${config.service.name} v${config.service.version}...`);
+
+  // 1. Start HTTP server
+  const PORT = config.service.port;
+  const server = app.listen(PORT, () => {
+    console.log(`✓ HTTP server listening on port ${PORT}`);
+    console.log(`✓ Health check: http://localhost:${PORT}/health`);
+  });
+
+  // 2. Initialize Service Wrapper (MQ, Registry, Monitoring, etc.)
+  const wrapper = new ServiceWrapper({
+    app,
+    server,
+    serviceRoot,
+    config: {
+      service: {
+        name: config.service.name,
+        version: config.service.version,
+        port: config.service.port,
+        url: process.env.SERVICE_URL || `http://localhost:${PORT}`
+      },
+      wrapper: config.wrapper
+    },
+    operations: config.operations,
+    validationProof: config.validationProof
+  });
+
+  await wrapper.initialize();
+
+  // Initialize centralized logger for use throughout the service
+  if (setLogger && wrapper.logger) {
+    setLogger(wrapper.logger);
+  }
+
+  console.log(`✓ Service Wrapper initialized (MQ, Registry, Monitoring)`);
+  console.log(`✓ Local logs: logs/app.{date}.log`);
+  console.log(`✓ ${config.service.name} ready\n`);
+
+  // 3. Setup graceful shutdown
+  const shutdown = async () => {
+    console.log('\nShutting down gracefully...');
+    await wrapper.shutdown();
+    server.close(() => {
+      console.log('Server closed');
+      process.exit(0);
+    });
+  };
+
+  process.on('SIGTERM', shutdown);
+  process.on('SIGINT', shutdown);
+
+  return { wrapper, server };
+}
+
 module.exports = ServiceWrapper;
 module.exports.ServiceWrapper = ServiceWrapper;
 module.exports.ConfigLoader = ConfigLoader;
+module.exports.bootstrap = bootstrap;
 module.exports.default = ServiceWrapper;
-module.exports.VERSION = '2.1.6';
+module.exports.VERSION = '2.1.10';