@onlineapps/service-wrapper 2.1.55 → 2.1.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/service-wrapper",
-  "version": "2.1.55",
+  "version": "2.1.57",
   "description": "Thin orchestration layer for microservices - delegates all infrastructure concerns to specialized connectors",
   "main": "src/index.js",
   "scripts": {
@@ -28,10 +28,10 @@
     "@onlineapps/conn-base-monitoring": "1.0.5",
     "@onlineapps/conn-infra-error-handler": "1.0.5",
     "@onlineapps/conn-infra-mq": "1.1.57",
-    "@onlineapps/conn-orch-api-mapper": "1.0.16",
-    "@onlineapps/conn-orch-cookbook": "2.0.15",
-    "@onlineapps/conn-orch-orchestrator": "1.0.71",
-    "@onlineapps/conn-orch-registry": "1.1.31",
+    "@onlineapps/conn-orch-api-mapper": "1.0.18",
+    "@onlineapps/conn-orch-cookbook": "2.0.16",
+    "@onlineapps/conn-orch-orchestrator": "1.0.72",
+    "@onlineapps/conn-orch-registry": "1.1.33",
     "@onlineapps/conn-orch-validator": "2.0.22",
     "@onlineapps/monitoring-core": "1.0.15",
     "@onlineapps/service-common": "1.0.12",

package/src/ConfigLoader.js

@@ -11,7 +11,7 @@
  *
  * Usage:
  *   const { ConfigLoader } = require('@onlineapps/service-wrapper');
- *   const config = ConfigLoader.loadAll();
+ *   const config = ConfigLoader.loadAll({ env: process.env });
  *
  * Design principle: ONE place to define, validate, and load ALL configs.
  * 
@@ -22,7 +22,6 @@
 const fs = require('fs');
 const path = require('path');
 
-const RUNTIME_DEFAULTS = require('../config/runtime-defaults.json');
 const runtimeCfg = require('./config');
 
 /**
@@ -49,63 +48,47 @@ const CONFIG_REGISTRY = {
 
 class ConfigLoader {
   /**
-   * Resolve environment variable substitution
-   * Supports format: ${VAR_NAME:default_value} OR ${VAR_NAME}
-   * @param {string} value - Value to resolve
-   * @returns {string} Resolved value
+   * Ensure env is provided for placeholder resolution.
+   * @param {any} env
+   * @returns {Object} env object
+   * @private
    */
-  static resolveEnvVar(value) {
-    if (typeof value !== 'string') {
-      return value;
-    }
-
-    // Match ${VAR_NAME:default} or ${VAR_NAME}
-    const match = value.match(/^\$\{([^:}]+)(?::([^}]+))?\}$/);
-    if (!match) {
-      return value;
-    }
-
-    const varName = match[1];
-    const defaultValue = match[2];
-
-    const envValue = process.env[varName];
-    if (envValue !== undefined) {
-      return envValue;
+  static _requireEnv(env) {
+    if (!env || typeof env !== 'object') {
+      throw new Error('[ConfigLoader] Missing dependency - env is required (pass { env: process.env } from the service entrypoint)');
     }
-    if (defaultValue !== undefined) {
-      return defaultValue;
-    }
-    throw new Error(`[ConfigLoader] Missing environment variable - ${varName} is required (config placeholder ${match[0]})`);
+    return env;
   }
 
   /**
-   * Apply ${VAR} / ${VAR:default} substitutions anywhere within a string.
-   * Mirrors ServiceWrapper placeholder support but keeps logic centralized in ConfigLoader.
-   *
-   * NOTE: This does NOT enforce strict missing-env behavior (that is addressed later).
+   * Apply ${VAR} substitutions anywhere within a string.
+   * NOTE: ${VAR:default} is NOT allowed (no fallbacks). Use explicit config or set ENV.
    *
    * @param {string} value
+   * @param {Object} options
+   * @param {Object} options.env
    * @returns {string}
    */
-  static resolveEnvPlaceholdersInString(value) {
+  static resolveEnvPlaceholdersInString(value, options = {}) {
     if (typeof value !== 'string') {
       return value;
     }
 
+    const env = this._requireEnv(options.env);
+
     return value.replace(/\$\{([^:}]+)(?::([^}]*))?\}/g, (match, varName, defaultValue) => {
-      const envValue = process.env[varName];
+      if (defaultValue !== undefined) {
+        throw new Error(`[ConfigLoader] Unsupported placeholder default - "${match}" is not allowed. Fix: set ENV "${varName}" or set an explicit value in config.json`);
+      }
+
+      const envValue = env[varName];
 
       // Use env value if exists (even if empty string)
       if (envValue !== undefined) {
         return envValue;
       }
 
-      // Use default if provided
-      if (defaultValue !== undefined) {
-        return defaultValue;
-      }
-
-      // Fail-fast: placeholder without default requires ENV to be set
+      // Fail-fast: placeholder requires ENV to be set
       throw new Error(`[ConfigLoader] Missing environment variable - ${varName} is required (config placeholder ${match})`);
     });
   }
@@ -118,23 +101,23 @@ class ConfigLoader {
    * @returns {any}
    */
   static resolveEnvPlaceholdersDeep(input, options = {}) {
-    const { jsonPath = '$' } = options;
+    const { jsonPath = '$', env } = options;
 
     if (Array.isArray(input)) {
-      return input.map((item, idx) => this.resolveEnvPlaceholdersDeep(item, { jsonPath: `${jsonPath}[${idx}]` }));
+      return input.map((item, idx) => this.resolveEnvPlaceholdersDeep(item, { jsonPath: `${jsonPath}[${idx}]`, env }));
     }
 
     if (input && typeof input === 'object') {
       const out = {};
       for (const [k, v] of Object.entries(input)) {
-        out[k] = this.resolveEnvPlaceholdersDeep(v, { jsonPath: `${jsonPath}.${k}` });
+        out[k] = this.resolveEnvPlaceholdersDeep(v, { jsonPath: `${jsonPath}.${k}`, env });
       }
       return out;
     }
 
     if (typeof input === 'string') {
       try {
-        return this.resolveEnvPlaceholdersInString(input);
+        return this.resolveEnvPlaceholdersInString(input, { env });
       } catch (err) {
         throw new Error(`${err.message} at ${jsonPath}`);
       }
@@ -200,7 +183,17 @@ class ConfigLoader {
    * @returns {Object} Service configuration
    * @throws {Error} If config file not found or invalid JSON
    */
-  static loadServiceConfig(basePath = process.cwd()) {
+  /**
+   * Load service configuration from conn-config/config.json
+   * Version is always taken from package.json (Single Source of Truth)
+   * @param {Object} options
+   * @param {string} [options.basePath] - Base path (defaults to process.cwd())
+   * @param {Object} options.env - Environment variables for ${VAR} placeholders
+   * @returns {Object} Service configuration
+   * @throws {Error} If config file not found or invalid JSON
+   */
+  static loadServiceConfig(options = {}) {
+    const { basePath = process.cwd(), env } = options;
     const configPath = path.join(basePath, 'conn-config', 'config.json');
 
     try {
@@ -215,13 +208,9 @@ class ConfigLoader {
       // Always use version from package.json (Single Source of Truth)
       config.service.version = this.loadPackageVersion(basePath);
 
-      // Apply repo defaults (non-critical) then allow service config to override
-      const defaults = RUNTIME_DEFAULTS?.defaults || {};
-      const merged = this.deepMerge(defaults, config);
-
       // Resolve env placeholders across the whole config (service + wrapper + custom sections)
       try {
-        return this.resolveEnvPlaceholdersDeep(merged, { jsonPath: '$' });
+        return this.resolveEnvPlaceholdersDeep(config, { jsonPath: '$', env });
       } catch (err) {
         throw new Error(`[ConfigLoader] Failed to resolve placeholders in ${configPath}. ${err.message}`);
       }
@@ -299,8 +288,17 @@ class ConfigLoader {
    * @param {string} basePath - Base path (defaults to process.cwd())
    * @returns {Object} Combined configuration object
    */
-  static loadAll(basePath = process.cwd()) {
-    const serviceConfig = this.loadServiceConfig(basePath);
+  /**
+   * Load all service configurations at once
+   * @param {Object} options
+   * @param {string} [options.basePath] - Base path (defaults to process.cwd())
+   * @param {Object} options.env - Environment variables for ${VAR} placeholders
+   * @returns {Object} Combined configuration object
+   */
+  static loadAll(options = {}) {
+    const { basePath = process.cwd(), env } = options;
+
+    const serviceConfig = this.loadServiceConfig({ basePath, env });
     const operations = this.loadOperations(basePath);
     const validationProof = this.loadValidationProof(basePath);
     const nodeEnv = runtimeCfg.get('nodeEnv');

package/src/ServiceWrapper.js

@@ -1582,7 +1582,11 @@ class ServiceWrapper {
     }
 
     // Build service URL for validation (HTTP calls to running server)
-    const serviceUrl = `http://localhost:${servicePort}`;
+    // Fail-fast: do not guess hostnames (no localhost defaults). Service URL must be explicit in ServiceConfig.
+    const serviceUrl = this.config.service?.url;
+    if (!serviceUrl) {
+      throw new Error('[ServiceWrapper] Missing configuration - config.service.url is required for validation (set SERVICE_URL in conn-config/config.json placeholder)');
+    }
 
     this.logger?.info('[ServiceWrapper] Checking validation proof...');
 

package/src/index.js

@@ -15,6 +15,7 @@ const path = require('path');
 const ServiceWrapper = require('./ServiceWrapper');
 const { ConfigLoader } = require('./ConfigLoader');
 const runtimeCfg = require('./config');
+const pkg = require('../package.json');
 
 // Note: WorkflowProcessor and ApiCaller functionality has been moved to connectors:
 // - WorkflowProcessor -> @onlineapps/conn-orch-orchestrator
@@ -39,9 +40,6 @@ const runtimeCfg = require('./config');
  * 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'));
@@ -118,4 +116,4 @@ module.exports.ServiceWrapper = ServiceWrapper;
 module.exports.ConfigLoader = ConfigLoader;
 module.exports.bootstrap = bootstrap;
 module.exports.default = ServiceWrapper;
-module.exports.VERSION = '2.1.11';
+module.exports.VERSION = pkg.version;