@aifabrix/builder 2.33.3 → 2.33.5

package/lib/utils/env-config-loader.js

@@ -75,6 +75,19 @@ function mergeEnvConfigs(baseConfig, userConfig) {
   return merged;
 }
 
+/**
+ * Load schema-only env-config (no user merge). Used for *_PUBLIC_PORT calculation
+ * so public ports always use canonical base (e.g. KEYCLOAK_PUBLIC_PORT = 8082 + devId*100).
+ *
+ * @function loadSchemaEnvConfig
+ * @returns {Object} Parsed schema env-config (environments.docker / .local only)
+ */
+function loadSchemaEnvConfig() {
+  const envConfigPath = path.join(__dirname, '..', 'schema', 'env-config.yaml');
+  const content = fs.readFileSync(envConfigPath, 'utf8');
+  return yaml.load(content) || {};
+}
+
 /**
  * Load env config YAML used for environment variable interpolation
  * Loads base config from lib/schema/env-config.yaml and merges with user config if configured
@@ -84,10 +97,7 @@ function mergeEnvConfigs(baseConfig, userConfig) {
  * @throws {Error} If base file cannot be read or parsed
  */
 async function loadEnvConfig() {
-  // Load base env-config.yaml
-  const envConfigPath = path.join(__dirname, '..', 'schema', 'env-config.yaml');
-  const content = fs.readFileSync(envConfigPath, 'utf8');
-  const baseConfig = yaml.load(content) || {};
+  const baseConfig = loadSchemaEnvConfig();
 
   // Load user env-config if configured
   const userConfig = await loadUserEnvConfig();
@@ -97,6 +107,7 @@ async function loadEnvConfig() {
 }
 
 module.exports = {
-  loadEnvConfig
+  loadEnvConfig,
+  loadSchemaEnvConfig
 };
 

package/lib/utils/env-map.js

@@ -10,7 +10,7 @@
 
 const fs = require('fs');
 const yaml = require('js-yaml');
-const { loadEnvConfig } = require('./env-config-loader');
+const { loadEnvConfig, loadSchemaEnvConfig } = require('./env-config-loader');
 const config = require('../core/config');
 
 /**
@@ -233,11 +233,15 @@ function applyLocalPortAdjustment(result, devIdNum) {
 
 /**
  * Calculate public ports for docker context
+ * Uses schema env-config ports only so *_PUBLIC_PORT is always canonical base + devId*100
+ * (e.g. KEYCLOAK_PUBLIC_PORT = 8082 + 600 = 8682 for dev 6, even if user env-config or config overrides KEYCLOAK_PORT to 8080)
+ *
  * @function calculateDockerPublicPorts
- * @param {Object} result - Environment variable map
+ * @param {Object} result - Environment variable map (merged base + overrides)
  * @param {number} devIdNum - Developer ID number
+ * @param {Object} [schemaBaseVars] - Schema-only env-config vars (lib/schema/env-config.yaml) for *_PUBLIC_PORT
  */
-function calculateDockerPublicPorts(result, devIdNum) {
+function calculateDockerPublicPorts(result, devIdNum, schemaBaseVars = {}) {
   if (devIdNum <= 0) {
     return;
   }
@@ -245,13 +249,14 @@ function calculateDockerPublicPorts(result, devIdNum) {
     // Match any variable ending with _PORT (e.g., MISO_PORT, KEYCLOAK_PORT, DB_PORT)
     if (/_PORT$/.test(key) && !/_PUBLIC_PORT$/.test(key)) {
       const publicPortKey = key.replace(/_PORT$/, '_PUBLIC_PORT');
-      // Always recalculate public port based on base port, even if manually set
-      // This ensures developer-id offset is always applied correctly
+      // Use schema port when available so PUBLIC_PORT is canonical (e.g. 8082), not overridden (e.g. 8080)
+      const schemaPort = schemaBaseVars[key];
+      const sourceVal = schemaPort !== undefined && schemaPort !== null ? schemaPort : value;
       let portVal;
-      if (typeof value === 'string') {
-        portVal = parseInt(value, 10);
-      } else if (typeof value === 'number') {
-        portVal = value;
+      if (typeof sourceVal === 'string') {
+        portVal = parseInt(sourceVal, 10);
+      } else if (typeof sourceVal === 'number') {
+        portVal = sourceVal;
       } else {
         continue;
       }
@@ -289,7 +294,9 @@ async function buildEnvVarMap(context, osModule = null, developerId = null) {
     applyLocalPortAdjustment(result, devIdNum);
   } else if (context === 'docker') {
     const devIdNum = await getDeveloperIdNumber(developerId);
-    calculateDockerPublicPorts(result, devIdNum);
+    const schemaCfg = loadSchemaEnvConfig();
+    const schemaBaseVars = (schemaCfg && schemaCfg.environments && schemaCfg.environments[context]) ? schemaCfg.environments[context] : {};
+    calculateDockerPublicPorts(result, devIdNum, schemaBaseVars);
   }
 
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.33.3",
+  "version": "2.33.5",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {