@onlineapps/conn-base-hub 1.0.6 → 1.0.7

package/coverage/lcov.info

@@ -1,145 +1,216 @@
 TN:
+SF:src/config.js
+FNF:0
+FNH:0
+DA:14,1
+DA:15,1
+DA:21,1
+DA:43,1
+LF:4
+LH:4
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/defaults.js
+FNF:0
+FNH:0
+DA:16,1
+LF:1
+LH:1
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:src/index.js
-FN:30,(anonymous_0)
-FN:35,(anonymous_1)
-FN:45,(anonymous_2)
-FN:52,(anonymous_3)
-FN:90,(anonymous_4)
-FN:123,(anonymous_5)
-FN:148,(anonymous_6)
-FN:162,(anonymous_7)
-FN:175,(anonymous_8)
-FN:185,(anonymous_9)
-FN:193,(anonymous_10)
-FN:204,(anonymous_11)
-FN:223,(anonymous_12)
-FN:260,(anonymous_13)
-FNF:14
-FNH:10
+FN:35,(anonymous_0)
+FN:37,(anonymous_1)
+FN:44,(anonymous_2)
+FN:51,(anonymous_3)
+FN:52,(anonymous_4)
+FN:53,(anonymous_5)
+FN:54,(anonymous_6)
+FN:55,(anonymous_7)
+FN:94,(anonymous_8)
+FN:142,(anonymous_9)
+FN:167,(anonymous_10)
+FN:181,(anonymous_11)
+FN:194,(anonymous_12)
+FN:204,(anonymous_13)
+FN:212,(anonymous_14)
+FN:223,(anonymous_15)
+FN:242,(anonymous_16)
+FN:280,(anonymous_17)
+FN:289,(anonymous_18)
+FNF:19
+FNH:12
 FNDA:1,(anonymous_0)
-FNDA:0,(anonymous_1)
-FNDA:0,(anonymous_2)
-FNDA:7,(anonymous_3)
-FNDA:3,(anonymous_4)
-FNDA:1,(anonymous_5)
-FNDA:1,(anonymous_6)
+FNDA:3,(anonymous_1)
+FNDA:7,(anonymous_2)
+FNDA:0,(anonymous_3)
+FNDA:0,(anonymous_4)
+FNDA:0,(anonymous_5)
+FNDA:0,(anonymous_6)
 FNDA:1,(anonymous_7)
-FNDA:2,(anonymous_8)
-FNDA:2,(anonymous_9)
+FNDA:3,(anonymous_8)
+FNDA:1,(anonymous_9)
 FNDA:1,(anonymous_10)
 FNDA:1,(anonymous_11)
-FNDA:0,(anonymous_12)
-FNDA:0,(anonymous_13)
-DA:13,1
-DA:16,1
-DA:31,1
-DA:32,1
-DA:35,0
-DA:36,0
-DA:53,7
-DA:56,7
+FNDA:2,(anonymous_12)
+FNDA:2,(anonymous_13)
+FNDA:1,(anonymous_14)
+FNDA:1,(anonymous_15)
+FNDA:0,(anonymous_16)
+FNDA:0,(anonymous_17)
+FNDA:0,(anonymous_18)
+DA:15,1
+DA:18,1
+DA:36,1
+DA:37,1
+DA:39,3
+DA:45,7
+DA:49,7
+DA:50,7
+DA:51,0
+DA:52,0
+DA:53,0
+DA:54,0
+DA:56,1
+DA:57,1
 DA:62,7
-DA:91,3
-DA:94,3
 DA:95,3
-DA:98,2
-DA:99,0
-DA:103,2
-DA:104,2
-DA:108,2
-DA:109,2
-DA:110,2
-DA:114,2
-DA:115,2
-DA:116,2
-DA:119,2
-DA:124,1
-DA:126,1
-DA:127,1
-DA:130,1
-DA:131,1
-DA:134,1
-DA:135,1
-DA:138,1
+DA:98,3
+DA:99,3
+DA:104,3
+DA:106,0
+DA:109,0
+DA:113,3
+DA:114,3
+DA:117,2
+DA:118,0
+DA:122,2
+DA:123,2
+DA:127,2
+DA:128,2
+DA:129,2
+DA:133,2
+DA:134,2
+DA:135,2
+DA:138,2
+DA:143,1
+DA:145,1
+DA:146,1
 DA:149,1
-DA:163,1
-DA:176,2
-DA:177,1
-DA:179,1
-DA:186,2
-DA:194,1
-DA:205,1
-DA:224,0
-DA:227,0
-DA:228,0
-DA:229,0
-DA:233,0
-DA:236,0
-DA:261,0
-DA:263,0
-DA:264,0
-DA:265,0
-DA:268,0
-DA:274,1
-LF:51
-LH:37
-BRDA:65,0,0,5
-BRDA:65,0,1,2
-BRDA:66,1,0,5
-BRDA:66,1,1,5
-BRDA:68,2,0,5
-BRDA:68,2,1,0
-BRDA:73,3,0,4
-BRDA:73,3,1,3
-BRDA:75,4,0,4
-BRDA:75,4,1,4
-BRDA:81,5,0,3
-BRDA:81,5,1,4
-BRDA:82,6,0,3
-BRDA:82,6,1,3
-BRDA:83,7,0,3
-BRDA:83,7,1,3
-BRDA:84,8,0,3
-BRDA:84,8,1,3
-BRDA:85,9,0,3
-BRDA:85,9,1,3
-BRDA:94,10,0,3
-BRDA:94,10,1,0
-BRDA:98,11,0,0
-BRDA:98,11,1,2
-BRDA:108,12,0,2
-BRDA:108,12,1,0
-BRDA:114,13,0,2
-BRDA:114,13,1,0
-BRDA:126,14,0,1
-BRDA:126,14,1,0
-BRDA:130,15,0,1
-BRDA:130,15,1,0
-BRDA:134,16,0,1
-BRDA:134,16,1,0
-BRDA:134,17,0,1
-BRDA:134,17,1,1
-BRDA:152,18,0,1
-BRDA:152,18,1,0
+DA:150,1
+DA:153,1
+DA:154,1
+DA:157,1
+DA:168,1
+DA:182,1
+DA:195,2
+DA:196,1
+DA:198,1
+DA:205,2
+DA:213,1
+DA:224,1
+DA:243,0
+DA:246,0
+DA:247,0
+DA:248,0
+DA:252,0
+DA:255,0
+DA:281,0
+DA:283,0
+DA:284,0
+DA:288,0
+DA:289,0
+DA:290,0
+DA:291,0
+DA:292,0
+DA:294,0
+DA:298,0
+DA:299,0
+DA:300,0
+DA:301,0
+DA:302,0
+DA:303,0
+DA:306,0
+DA:312,1
+LF:73
+LH:44
+BRDA:51,0,0,0
+BRDA:51,0,1,0
+BRDA:52,1,0,0
+BRDA:52,1,1,0
+BRDA:53,2,0,0
+BRDA:53,2,1,0
+BRDA:54,3,0,0
+BRDA:54,3,1,0
+BRDA:56,4,0,1
+BRDA:56,4,1,0
+BRDA:56,5,0,1
+BRDA:56,5,1,1
+BRDA:65,6,0,5
+BRDA:65,6,1,2
+BRDA:67,7,0,5
+BRDA:67,7,1,5
+BRDA:67,7,2,0
+BRDA:67,7,3,0
+BRDA:69,8,0,5
+BRDA:69,8,1,0
+BRDA:74,9,0,4
+BRDA:74,9,1,3
+BRDA:77,10,0,4
+BRDA:77,10,1,4
+BRDA:77,10,2,0
+BRDA:77,10,3,0
+BRDA:83,11,0,3
+BRDA:83,11,1,4
+BRDA:113,12,0,3
+BRDA:113,12,1,0
+BRDA:117,13,0,0
+BRDA:117,13,1,2
+BRDA:127,14,0,2
+BRDA:127,14,1,0
+BRDA:133,15,0,2
+BRDA:133,15,1,0
+BRDA:145,16,0,1
+BRDA:145,16,1,0
+BRDA:149,17,0,1
+BRDA:149,17,1,0
+BRDA:153,18,0,1
+BRDA:153,18,1,0
 BRDA:153,19,0,1
-BRDA:153,19,1,0
-BRDA:176,20,0,1
-BRDA:176,20,1,1
-BRDA:186,21,0,2
-BRDA:186,21,1,2
-BRDA:186,21,2,1
-BRDA:186,21,3,1
-BRDA:196,22,0,1
-BRDA:196,22,1,0
-BRDA:224,23,0,0
-BRDA:228,24,0,0
-BRDA:228,24,1,0
-BRDA:244,25,0,0
-BRDA:244,25,1,0
-BRDA:263,26,0,0
-BRDA:263,26,1,0
+BRDA:153,19,1,1
+BRDA:171,20,0,1
+BRDA:171,20,1,0
+BRDA:172,21,0,1
+BRDA:172,21,1,0
+BRDA:195,22,0,1
+BRDA:195,22,1,1
+BRDA:205,23,0,2
+BRDA:205,23,1,2
+BRDA:205,23,2,1
+BRDA:205,23,3,1
+BRDA:215,24,0,1
+BRDA:215,24,1,0
+BRDA:243,25,0,0
+BRDA:247,26,0,0
+BRDA:247,26,1,0
 BRDA:263,27,0,0
 BRDA:263,27,1,0
-BRF:57
-BRH:37
+BRDA:283,28,0,0
+BRDA:283,28,1,0
+BRDA:288,29,0,0
+BRDA:288,29,1,0
+BRDA:290,30,0,0
+BRDA:290,30,1,0
+BRDA:290,31,0,0
+BRDA:290,31,1,0
+BRDA:300,32,0,0
+BRDA:300,32,1,0
+BRDA:300,33,0,0
+BRDA:300,33,1,0
+BRF:73
+BRH:32
 end_of_record

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-base-hub",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Central hub for OA Drive connectors - bundles and integrates all essential connector libraries",
   "main": "src/index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@onlineapps/conn-infra-mq": "1.1.54",
     "@onlineapps/conn-orch-cookbook": "2.0.12",
     "@onlineapps/conn-orch-registry": "1.1.25",
-    "dotenv": "^16.0.3"
+    "@onlineapps/runtime-config": "1.0.1"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/config.js

@@ -0,0 +1,44 @@
+'use strict';
+
+/**
+ * Runtime configuration schema for @onlineapps/conn-base-hub.
+ *
+ * Uses @onlineapps/runtime-config for unified priority:
+ * 1. Explicit config
+ * 2. Environment variable (if applicable)
+ * 3. Owner defaults (from ./defaults.js)
+ *
+ * @module @onlineapps/conn-base-hub/config
+ */
+
+const { createRuntimeConfig } = require('@onlineapps/runtime-config');
+const DEFAULTS = require('./defaults');
+
+/**
+ * Runtime config schema for Hub
+ * Flat keys are used for simplicity (nested defaults are accessed via inline defaults)
+ */
+const runtimeCfg = createRuntimeConfig({
+  defaults: {},
+  schema: {
+    // Infrastructure topology (FAIL-FAST when used)
+    rabbitmqUrl: { env: 'RABBITMQ_URL', required: true },
+
+    minioEndpoint: { env: 'MINIO_ENDPOINT', required: true },
+    minioPort: { env: 'MINIO_PORT', required: true, type: 'number' },
+    minioAccessKey: { env: 'MINIO_ACCESS_KEY', required: true },
+    minioSecretKey: { env: 'MINIO_SECRET_KEY', required: true },
+    minioUseSSL: { env: 'MINIO_USE_SSL', default: false, type: 'boolean' },
+
+    // MQ defaults
+    mqType: { default: DEFAULTS.mq.type },
+    mqDefaultServiceQueueSuffix: { default: DEFAULTS.mq.defaultServiceQueueSuffix },
+
+    // Workflow defaults
+    workflowDefaultServiceQueueSuffix: { default: DEFAULTS.workflow.defaultServiceQueueSuffix },
+    workflowCompletedQueue: { default: DEFAULTS.workflow.completedQueue },
+  }
+});
+
+module.exports = runtimeCfg;
+

package/src/defaults.js

@@ -0,0 +1,28 @@
+'use strict';
+
+/**
+ * Module-owned defaults for @onlineapps/conn-base-hub.
+ *
+ * Ownership rule:
+ * - Defaults that are specific to the "hub" (composition utilities, naming conventions)
+ *   live here to avoid duplication across the module.
+ * - Callers can override behavior via explicit config (highest priority) or ENV (fallback).
+ *
+ * NOTE:
+ * - Infrastructure connection URLs should NOT be hardcoded here; those belong to their owning modules
+ *   or must be provided explicitly via config/env.
+ */
+
+module.exports = {
+  mq: {
+    type: 'rabbitmq',
+    defaultServiceQueueSuffix: '_queue',
+  },
+  workflow: {
+    defaultServiceQueueSuffix: '.queue',
+    completedQueue: 'workflow.completed',
+  },
+};
+
+
+

package/src/index.js

@@ -10,7 +10,9 @@
  * - Centralized logging
  */
 
-require('dotenv').config();
+// NOTE: dotenv.config() removed to avoid side effects in library code
+// Consumers are responsible for loading their own .env
+const runtimeCfg = require('./config');
 
 // Re-export all connectors
 module.exports = {
@@ -33,9 +35,8 @@ module.exports = {
   createLogger: (() => {
     const monitoring = require('@onlineapps/conn-base-monitoring');
     return async function(config) {
-      // Initialize monitoring and return logger-like interface
-      await monitoring.init(config);
-      return monitoring;
+      // Initialize monitoring and return logger-like interface (API returned by init)
+      return monitoring.init(config);
     };
   })(),
 
@@ -43,18 +44,27 @@ module.exports = {
   createMicroservice: function(config) {
     const { ServiceRegistryClient, MQClient, StorageConnector, createLogger } = module.exports;
 
-    // Create logger instance
-    const logger = createLogger({
-      serviceName: config.serviceName,
-      version: config.version,
-      ...config.logger
-    });
+    // Logger instance is created lazily in init() to avoid side effects during construction.
+    // This also prevents unhandled promise rejections when env/config is incomplete in tests/dev.
+    let loggerApi = null;
+    const logger = {
+      info: (message, data) => (loggerApi ? loggerApi.info(message, data) : console.log(message, data)),
+      warn: (message, data) => (loggerApi ? loggerApi.warn(message, data) : console.warn(message, data)),
+      error: (message, data) => (loggerApi ? loggerApi.error(message, data) : console.error(message, data)),
+      debug: (message, data) => (loggerApi ? loggerApi.debug(message, data) : console.debug(message, data)),
+      close: async () => {
+        if (loggerApi && typeof loggerApi.shutdown === 'function') {
+          await loggerApi.shutdown();
+        }
+      }
+    };
 
     return {
       logger,
       // Initialize Registry Client
       registry: config.registry ? new ServiceRegistryClient({
-        amqpUrl: config.amqpUrl || process.env.RABBITMQ_URL,
+        // Priority: explicit registry config → top-level config → ENV
+        amqpUrl: config.registry?.amqpUrl || config.registry?.url || config.amqpUrl || runtimeCfg.get('rabbitmqUrl'),
         serviceName: config.serviceName,
         version: config.version || '1.0.0',
         ...config.registry
@@ -62,18 +72,21 @@ module.exports = {
 
       // Initialize MQ Client
       mq: config.mq ? new MQClient({
-        type: 'rabbitmq',
-        host: config.amqpUrl || process.env.RABBITMQ_URL,
-        queue: `${config.serviceName}_queue`,
+        type: runtimeCfg.get('mqType'),
+        // Priority: explicit mq config → top-level config → ENV
+        host: config.mq?.host || config.mq?.url || config.amqpUrl || runtimeCfg.get('rabbitmqUrl'),
+        queue: `${config.serviceName}${runtimeCfg.get('mqDefaultServiceQueueSuffix')}`,
         ...config.mq
       }) : null,
 
       // Initialize Storage (all MinIO config MUST come from env or config - no fallbacks)
       storage: config.storage ? new StorageConnector({
-        endPoint: process.env.MINIO_ENDPOINT || config.storage?.endPoint,
-        port: parseInt(process.env.MINIO_PORT || config.storage?.port),
-        accessKey: process.env.MINIO_ACCESS_KEY || config.storage?.accessKey,
-        secretKey: process.env.MINIO_SECRET_KEY || config.storage?.secretKey,
+        // Priority: explicit storage config → ENV (resolved via runtimeCfg)
+        endPoint: runtimeCfg.get('minioEndpoint', config.storage?.endPoint),
+        port: runtimeCfg.get('minioPort', config.storage?.port),
+        useSSL: runtimeCfg.get('minioUseSSL', config.storage?.useSSL),
+        accessKey: runtimeCfg.get('minioAccessKey', config.storage?.accessKey),
+        secretKey: runtimeCfg.get('minioSecretKey', config.storage?.secretKey),
         ...config.storage
       }) : null,
 
@@ -81,6 +94,21 @@ module.exports = {
       async init() {
         const results = {};
 
+        // Initialize Logger (Monitoring) - optional, keep microservice usable even if monitoring can't start
+        try {
+          loggerApi = await createLogger({
+            serviceName: config.serviceName,
+            version: config.version,
+            ...config.logger
+          });
+          results.logger = true;
+        } catch (err) {
+          console.warn(
+            `[conn-base-hub] Monitoring init failed - Continuing with console logger. Fix: set RABBITMQ_URL or pass logger.rabbitmq.url. (${err.message})`
+          );
+          results.logger = false;
+        }
+
         // Initialize Registry
         if (this.registry) {
           await this.registry.initialize();
@@ -122,7 +150,7 @@ module.exports = {
           promises.push(this.mq.disconnect());
         }
 
-        if (this.logger && this.logger.close) {
+        if (this.logger && typeof this.logger.close === 'function') {
           promises.push(this.logger.close());
         }
 
@@ -167,7 +195,7 @@ module.exports = {
       if (step.queue) {
         return step.queue;
       }
-      return `${step.service}.queue`;
+      return `${step.service}${runtimeCfg.get('workflowDefaultServiceQueueSuffix')}`;
     },
 
     /**
@@ -253,7 +281,7 @@ module.exports = {
       const { current_step, cookbook } = message;
 
       if (!cookbook?.steps) {
-        return 'workflow.completed';
+        return runtimeCfg.get('workflowCompletedQueue');
       }
       
       // V2.1: steps is array, find current step by step_id
@@ -261,9 +289,9 @@ module.exports = {
         const currentIndex = cookbook.steps.findIndex(s => s.step_id === current_step);
         if (currentIndex >= 0 && currentIndex < cookbook.steps.length - 1) {
           const nextStep = cookbook.steps[currentIndex + 1];
-          return `${nextStep.service}.queue`;
+          return `${nextStep.service}${runtimeCfg.get('workflowDefaultServiceQueueSuffix')}`;
         }
-        return 'workflow.completed';
+        return runtimeCfg.get('workflowCompletedQueue');
       }
       
       // V2.0 (deprecated): steps is object, current_step is step_id
@@ -272,10 +300,10 @@ module.exports = {
       if (currentIndex >= 0 && currentIndex < stepIds.length - 1) {
         const nextStepId = stepIds[currentIndex + 1];
         const nextStep = cookbook.steps[nextStepId];
-        return `${nextStep.service}.queue`;
+        return `${nextStep.service}${runtimeCfg.get('workflowDefaultServiceQueueSuffix')}`;
       }
 
-      return 'workflow.completed';
+      return runtimeCfg.get('workflowCompletedQueue');
     }
   }
 };