@onlineapps/service-wrapper 2.0.11 → 2.0.13

package/README.md

@@ -101,6 +101,22 @@ NO infrastructure code needed in your service!
 
 ## Configuration
 
+### Environment Variable Parsing
+
+**ServiceWrapper handles environment variable parsing directly** rather than delegating to a separate connector. This design decision is based on:
+
+1. **Core Responsibility** - Configuration loading is fundamental to the wrapper's initialization, not a specialized concern
+2. **Simplicity** - Avoids creating a separate connector for ~20 lines of parsing logic
+3. **Performance** - Eliminates unnecessary abstraction layers for a trivial operation
+4. **Universal Need** - All connectors (MQ, Registry, Cache) require parsed configuration
+
+The wrapper parses `${VAR:default}` syntax in configuration files:
+- `${RABBITMQ_URL}` - Uses environment variable, fails if not set
+- `${PORT:3000}` - Uses environment variable, defaults to 3000 if not set
+- `${ENABLED:true}` - Uses environment variable, defaults to true
+
+This follows Docker/Kubernetes best practices for configuration management while keeping the wrapper architecture clean and focused.
+
 ### operations.json
 ```json
 {
@@ -121,13 +137,23 @@ NO infrastructure code needed in your service!
 {
   "service": {
     "name": "my-service",
-    "port": 3000
+    "port": "${PORT:3000}"
   },
   "wrapper": {
-    "mq": { "url": "${RABBITMQ_URL}" },
-    "registry": { "url": "${REGISTRY_URL}" },
-    "monitoring": { "enabled": true },
-    "health": { "endpoint": "/health" }
+    "mq": {
+      "url": "${RABBITMQ_URL:amqp://localhost:5672}",
+      "enabled": "${MQ_ENABLED:true}"
+    },
+    "registry": {
+      "url": "${REGISTRY_URL}",
+      "enabled": "${REGISTRY_ENABLED:false}"
+    },
+    "monitoring": {
+      "enabled": "${MONITORING_ENABLED:true}"
+    },
+    "health": {
+      "endpoint": "/health"
+    }
   }
 }
 ```

package/package.json

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

package/src/ServiceWrapper.js

@@ -82,10 +82,25 @@ class ServiceWrapper {
   _processConfig(config) {
     // Replace environment variables in config
     const processValue = (value) => {
-      if (typeof value === 'string' && value.startsWith('${') && value.endsWith('}')) {
-        const envVar = value.slice(2, -1);
-        const [varName, defaultValue] = envVar.split(':');
-        return process.env[varName] || defaultValue || '';
+      if (typeof value === 'string') {
+        // Support ${VAR:default} format anywhere in string
+        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;
+          }
+
+          // Log warning and return empty string
+          console.warn(`[ServiceWrapper] Missing env variable: ${varName}`);
+          return '';
+        });
       }
       return value;
     };
@@ -96,6 +111,10 @@ class ServiceWrapper {
       for (const [key, value] of Object.entries(obj)) {
         if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
           result[key] = processObject(value);
+        } else if (Array.isArray(value)) {
+          result[key] = value.map(item =>
+            typeof item === 'object' && item !== null ? processObject(item) : processValue(item)
+          );
         } else {
           result[key] = processValue(value);
         }
@@ -183,7 +202,7 @@ class ServiceWrapper {
 
         res.on('finish', () => {
           const duration = Date.now() - start;
-          this.monitoring.info('Request processed', {
+          this.monitoring?.info && this.monitoring.info('Request processed', {
             method: req.method,
             path: req.path,
             statusCode: res.statusCode,