@onlineapps/service-wrapper 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -41,4 +41,4 @@
   "engines": {
     "node": ">=14.0.0"
   }
-}
+}

package/src/ServiceWrapper.js

@@ -44,15 +44,17 @@ class ServiceWrapper {
    * Create a new ServiceWrapper instance
    * @constructor
    * @param {Object} options - Configuration options
-   * @param {Object} options.service - Express application instance
+   * @param {Object} [options.service] - Express application instance (for direct calls)
+   * @param {string} [options.serviceUrl] - HTTP URL of the service (for HTTP calls)
    * @param {string} options.serviceName - Name of the service
    * @param {Object} options.openApiSpec - OpenAPI specification
    * @param {Object} [options.config={}] - Infrastructure configuration
    * @param {string} [options.config.rabbitmq] - RabbitMQ connection URL
    * @param {string} [options.config.redis] - Redis connection string
    * @param {string} [options.config.registry] - Registry service URL
-   * @param {number} [options.config.port=3000] - Service port
+   * @param {number} [options.config.port=3000] - Service port (deprecated, use serviceUrl)
    * @param {number} [options.config.prefetch=10] - MQ prefetch count
+   * @param {boolean} [options.config.directCall] - Use direct Express calls (default: auto-detect)
    *
    * @throws {Error} If required options are missing
    */
@@ -61,6 +63,7 @@ class ServiceWrapper {
 
     // Store configuration
     this.service = options.service;
+    this.serviceUrl = options.serviceUrl;
     this.serviceName = options.serviceName;
     this.openApiSpec = options.openApiSpec;
     this.config = options.config || {};
@@ -83,8 +86,8 @@ class ServiceWrapper {
    * @throws {Error} If required options are missing
    */
   _validateOptions(options) {
-    if (!options.service) {
-      throw new Error('Service (Express app) is required');
+    if (!options.service && !options.serviceUrl) {
+      throw new Error('Either service (Express app) or serviceUrl is required');
     }
     if (!options.serviceName) {
       throw new Error('Service name is required');
@@ -135,14 +138,21 @@ class ServiceWrapper {
       });
 
       // 4. Create the orchestrator with all dependencies
+      // Determine if we should use direct calls or HTTP
+      const useDirectCall = this.config.directCall !== undefined
+        ? this.config.directCall
+        : (this.service && !this.serviceUrl); // Auto-detect based on what was provided
+
+      const serviceUrl = this.serviceUrl || `http://localhost:${this.config.port || 3000}`;
+
       this.orchestrator = OrchestratorConnector.create({
         mqClient: this.mqClient,
         registryClient: this.registryClient,
         apiMapper: ApiMapperConnector.create({
           openApiSpec: this.openApiSpec,
-          serviceUrl: `http://localhost:${this.config.port || 3000}`,
+          serviceUrl: serviceUrl,
           service: this.service,
-          directCall: true,
+          directCall: useDirectCall,
           logger: this.logger
         }),
         cookbook: CookbookConnector,
@@ -225,12 +235,16 @@ class ServiceWrapper {
    * @returns {Promise<void>}
    */
   async _initializeConnectors() {
-    // Initialize MQ client
+    // Initialize MQ client with correct config format
+    const rabbitUrl = this.config.rabbitmq || process.env.RABBITMQ_URL || 'amqp://localhost:5672';
+
     this.mqClient = new MQConnector({
-      url: this.config.rabbitmq || process.env.RABBITMQ_URL || 'amqp://localhost:5672',
-      serviceName: this.serviceName,
-      prefetchCount: this.config.prefetch || 10,
-      logger: this.logger
+      type: 'rabbitmq',
+      host: rabbitUrl,
+      queue: `${this.serviceName}.workflow`,
+      prefetch: this.config.prefetch || 10,
+      durable: true,
+      noAck: false
     });
     await this.mqClient.connect();
 
@@ -248,9 +262,10 @@ class ServiceWrapper {
    * @returns {Promise<void>}
    */
   async _registerService() {
+    const serviceUrl = this.serviceUrl || `http://localhost:${this.config.port || 3000}`;
     const serviceInfo = {
       name: this.serviceName,
-      url: `http://localhost:${this.config.port || 3000}`,
+      url: serviceUrl,
       openapi: this.openApiSpec,
       metadata: {
         version: this.openApiSpec.info?.version || '1.0.0',