@onlineapps/service-wrapper 2.1.40 → 2.1.42

package/config/runtime-defaults.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "Runtime defaults for @onlineapps/service-wrapper (non-critical only). Service configs may override.",
+  "defaults": {
+    "wrapper": {
+      "mq": {
+        "prefetch": 10,
+        "enabled": true
+      },
+      "registry": {
+        "enabled": true,
+        "heartbeatInterval": 30000
+      },
+      "monitoring": {
+        "enabled": true,
+        "metrics": ["requests", "errors", "duration"]
+      },
+      "logging": {
+        "enabled": true,
+        "level": "info",
+        "requests": {
+          "enabled": true,
+          "bodies": true,
+          "headers": false
+        },
+        "responses": {
+          "enabled": true,
+          "bodies": true
+        },
+        "excludePaths": ["/health", "/status", "/metrics", "/specification"]
+      },
+      "health": {
+        "enabled": true,
+        "endpoint": "/health"
+      },
+      "validation": {
+        "enabled": true
+      }
+    }
+  }
+}
+
+

package/package.json

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

package/src/ConfigLoader.js

@@ -22,6 +22,8 @@
 const fs = require('fs');
 const path = require('path');
 
+const RUNTIME_DEFAULTS = require('../config/runtime-defaults.json');
+
 /**
  * CENTRAL REGISTRY: All configuration files used by business services
  * If you add a new config file, add it here!
@@ -47,7 +49,7 @@ const CONFIG_REGISTRY = {
 class ConfigLoader {
   /**
    * Resolve environment variable substitution
-   * Supports format: ${VAR_NAME:default_value}
+   * Supports format: ${VAR_NAME:default_value} OR ${VAR_NAME}
    * @param {string} value - Value to resolve
    * @returns {string} Resolved value
    */
@@ -68,6 +70,96 @@ class ConfigLoader {
     return process.env[varName] || defaultValue || '';
   }
 
+  /**
+   * 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).
+   *
+   * @param {string} value
+   * @returns {string}
+   */
+  static resolveEnvPlaceholdersInString(value) {
+    if (typeof value !== 'string') {
+      return value;
+    }
+
+    return value.replace(/\$\{([^:}]+)(?::([^}]*))?\}/g, (match, varName, defaultValue) => {
+      const envValue = process.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
+      throw new Error(`[ConfigLoader] Missing environment variable - ${varName} is required (config placeholder ${match})`);
+    });
+  }
+
+  /**
+   * Deeply resolve env placeholders across an object.
+   * @param {any} input
+   * @param {Object} [options]
+   * @param {string} [options.jsonPath] - JSON path prefix for error context
+   * @returns {any}
+   */
+  static resolveEnvPlaceholdersDeep(input, options = {}) {
+    const { jsonPath = '$' } = options;
+
+    if (Array.isArray(input)) {
+      return input.map((item, idx) => this.resolveEnvPlaceholdersDeep(item, { jsonPath: `${jsonPath}[${idx}]` }));
+    }
+
+    if (input && typeof input === 'object') {
+      const out = {};
+      for (const [k, v] of Object.entries(input)) {
+        out[k] = this.resolveEnvPlaceholdersDeep(v, { jsonPath: `${jsonPath}.${k}` });
+      }
+      return out;
+    }
+
+    if (typeof input === 'string') {
+      try {
+        return this.resolveEnvPlaceholdersInString(input);
+      } catch (err) {
+        throw new Error(`${err.message} at ${jsonPath}`);
+      }
+    }
+
+    return input;
+  }
+
+  /**
+   * Deep merge (plain objects only). Arrays are replaced (not merged).
+   * @param {Object} base
+   * @param {Object} override
+   * @returns {Object}
+   */
+  static deepMerge(base, override) {
+    if (!base || typeof base !== 'object' || Array.isArray(base)) {
+      return override;
+    }
+    if (!override || typeof override !== 'object' || Array.isArray(override)) {
+      return override === undefined ? base : override;
+    }
+
+    const out = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v && typeof v === 'object' && !Array.isArray(v) && base[k] && typeof base[k] === 'object' && !Array.isArray(base[k])) {
+        out[k] = this.deepMerge(base[k], v);
+      } else {
+        out[k] = v;
+      }
+    }
+    return out;
+  }
+
   /**
    * Get list of all configuration files
    * @returns {Object} Configuration registry
@@ -115,7 +207,16 @@ class ConfigLoader {
       // Always use version from package.json (Single Source of Truth)
       config.service.version = this.loadPackageVersion(basePath);
 
-      return config;
+      // 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: '$' });
+      } catch (err) {
+        throw new Error(`[ConfigLoader] Failed to resolve placeholders in ${configPath}. ${err.message}`);
+      }
     } catch (error) {
       if (error.code === 'ENOENT') {
         throw new Error(`Service config not found: ${configPath}`);
@@ -195,16 +296,12 @@ class ConfigLoader {
     const operations = this.loadOperations(basePath);
     const validationProof = this.loadValidationProof(basePath);
 
-    // Resolve environment variables in port and url
-    const resolvedPort = this.resolveEnvVar(serviceConfig.service.port);
-    const resolvedUrl = this.resolveEnvVar(serviceConfig.service.url);
-
     return {
       service: {
         name: serviceConfig.service.name,
         version: serviceConfig.service.version,
-        port: parseInt(resolvedPort, 10),
-        url: resolvedUrl,
+        port: parseInt(serviceConfig.service.port, 10),
+        url: serviceConfig.service.url,
         env: process.env.NODE_ENV || 'development'
       },
       wrapper: serviceConfig.wrapper || {},