@aifabrix/builder 2.3.4 → 2.3.6

package/README.md

@@ -11,12 +11,6 @@ Local development infrastructure + Azure deployment tool.
 npm install -g @aifabrix/builder
 ```
 
-OR
-
-```bash
-sudo npm install -g @aifabrix/builder
-```
-
 ## Quick Start
 
 ```bash

package/lib/audit-logger.js

@@ -14,6 +14,7 @@
 const fs = require('fs').promises;
 const path = require('path');
 const os = require('os');
+const paths = require('./utils/paths');
 
 // Audit log file path (in user's home directory for compliance)
 let auditLogPath = null;
@@ -28,8 +29,7 @@ async function getAuditLogPath() {
     return auditLogPath;
   }
 
-  const homeDir = os.homedir();
-  const aifabrixDir = path.join(homeDir, '.aifabrix');
+  const aifabrixDir = paths.getAifabrixHome();
 
   try {
     await fs.mkdir(aifabrixDir, { recursive: true });

package/lib/build.js

@@ -13,7 +13,7 @@
 const fs = require('fs').promises;
 const fsSync = require('fs');
 const path = require('path');
-const os = require('os');
+const paths = require('./utils/paths');
 const { exec } = require('child_process');
 const { promisify } = require('util');
 const chalk = require('chalk');
@@ -198,7 +198,7 @@ async function generateDockerfile(appNameOrPath, language, config, buildConfig =
   if (devDir) {
     targetDir = devDir;
   } else {
-    targetDir = path.join(os.homedir(), '.aifabrix', appName);
+    targetDir = path.join(paths.getAifabrixHome(), appName);
   }
 
   if (!fsSync.existsSync(targetDir)) {

package/lib/config.js

@@ -11,12 +11,18 @@
 
 const fs = require('fs').promises;
 const path = require('path');
-const os = require('os');
 const yaml = require('js-yaml');
+const os = require('os');
+const paths = require('./utils/paths');
 
+// Default (for tests and constants): always reflects OS home
 const CONFIG_DIR = path.join(os.homedir(), '.aifabrix');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.yaml');
 
+// Runtime (respects AIFABRIX_HOME override)
+const RUNTIME_CONFIG_DIR = paths.getAifabrixHome();
+const RUNTIME_CONFIG_FILE = path.join(RUNTIME_CONFIG_DIR, 'config.yaml');
+
 // Cache for developer ID - loaded when getConfig() is first called
 let cachedDeveloperId = null;
 
@@ -27,7 +33,7 @@ let cachedDeveloperId = null;
  */
 async function getConfig() {
   try {
-    const configContent = await fs.readFile(CONFIG_FILE, 'utf8');
+    const configContent = await fs.readFile(RUNTIME_CONFIG_FILE, 'utf8');
     let config = yaml.load(configContent);
 
     // Handle empty file or null/undefined result from yaml.load
@@ -91,19 +97,19 @@ async function getConfig() {
 async function saveConfig(data) {
   try {
     // Create directory if it doesn't exist
-    await fs.mkdir(CONFIG_DIR, { recursive: true });
+    await fs.mkdir(RUNTIME_CONFIG_DIR, { recursive: true });
 
     // Set secure permissions
     // Force quotes to ensure numeric-like strings (e.g., "01") remain strings in YAML
     const configContent = yaml.dump(data, { forceQuotes: true });
     // Write file first
-    await fs.writeFile(CONFIG_FILE, configContent, {
+    await fs.writeFile(RUNTIME_CONFIG_FILE, configContent, {
       mode: 0o600,
       flag: 'w'
     });
     // Open file descriptor and fsync to ensure write is flushed to disk
     // This is critical on Windows where file writes may be cached
-    const fd = await fs.open(CONFIG_FILE, 'r+');
+    const fd = await fs.open(RUNTIME_CONFIG_FILE, 'r+');
     try {
       await fd.sync();
     } finally {
@@ -120,7 +126,7 @@ async function saveConfig(data) {
  */
 async function clearConfig() {
   try {
-    await fs.unlink(CONFIG_FILE);
+    await fs.unlink(RUNTIME_CONFIG_FILE);
   } catch (error) {
     if (error.code !== 'ENOENT') {
       throw new Error(`Failed to clear config: ${error.message}`);
@@ -179,7 +185,7 @@ async function setDeveloperId(developerId) {
   // Add a small delay to ensure file system has flushed the write
   await new Promise(resolve => setTimeout(resolve, 100));
   // Read file again with fresh file handle to avoid OS caching
-  const savedContent = await fs.readFile(CONFIG_FILE, 'utf8');
+  const savedContent = await fs.readFile(RUNTIME_CONFIG_FILE, 'utf8');
   const savedConfig = yaml.load(savedContent);
   // YAML may parse numbers as numbers, so convert to string for comparison
   const savedDevIdString = String(savedConfig['developer-id']);

package/lib/infra.js

@@ -13,7 +13,6 @@ const { exec } = require('child_process');
 const { promisify } = require('util');
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const handlebars = require('handlebars');
 const secrets = require('./secrets');
 const config = require('./config');
@@ -21,6 +20,7 @@ const devConfig = require('./utils/dev-config');
 const logger = require('./utils/logger');
 const containerUtils = require('./utils/infra-containers');
 const dockerUtils = require('./utils/docker');
+const paths = require('./utils/paths');
 
 // Register Handlebars helper for equality check
 handlebars.registerHelper('eq', (a, b) => a === b);
@@ -84,7 +84,7 @@ async function checkDockerAvailability() {
 }
 
 async function ensureAdminSecrets() {
-  const adminSecretsPath = path.join(os.homedir(), '.aifabrix', 'admin-secrets.env');
+  const adminSecretsPath = path.join(paths.getAifabrixHome(), 'admin-secrets.env');
   if (!fs.existsSync(adminSecretsPath)) {
     logger.log('Generating admin-secrets.env...');
     await secrets.generateAdminSecretsEnv();
@@ -109,8 +109,8 @@ async function startInfra(developerId = null) {
     throw new Error(`Compose template not found: ${templatePath}`);
   }
 
-  // Create infra directory in ~/.aifabrix with dev ID
-  const aifabrixDir = path.join(os.homedir(), '.aifabrix');
+  // Create infra directory in AIFABRIX_HOME with dev ID
+  const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
   if (!fs.existsSync(infraDir)) {
@@ -123,7 +123,7 @@ async function startInfra(developerId = null) {
   // Dev 0: infra-aifabrix-network, Dev > 0: infra-dev{id}-aifabrix-network
   const networkName = idNum === 0 ? 'infra-aifabrix-network' : `infra-dev${devId}-aifabrix-network`;
   const composeContent = template({
-    devId: devId,
+    devId: idNum,
     postgresPort: ports.postgres,
     redisPort: ports.redis,
     pgadminPort: ports.pgadmin,
@@ -164,7 +164,7 @@ async function startInfra(developerId = null) {
  */
 async function stopInfra() {
   const devId = await config.getDeveloperId();
-  const aifabrixDir = path.join(os.homedir(), '.aifabrix');
+  const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
   const composePath = path.join(infraDir, 'compose.yaml');
@@ -201,7 +201,7 @@ async function stopInfra() {
  */
 async function stopInfraWithVolumes() {
   const devId = await config.getDeveloperId();
-  const aifabrixDir = path.join(os.homedir(), '.aifabrix');
+  const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
   const composePath = path.join(infraDir, 'compose.yaml');
@@ -337,7 +337,7 @@ async function restartService(serviceName) {
   }
 
   const devId = await config.getDeveloperId();
-  const aifabrixDir = path.join(os.homedir(), '.aifabrix');
+  const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
   const composePath = path.join(infraDir, 'compose.yaml');

package/lib/secrets.js

@@ -438,7 +438,7 @@ async function generateAdminSecretsEnv(secretsPath) {
 POSTGRES_PASSWORD=${postgresPassword}
 PGADMIN_DEFAULT_EMAIL=admin@aifabrix.ai
 PGADMIN_DEFAULT_PASSWORD=${postgresPassword}
-REDIS_HOST=local:localhost:6379
+REDIS_HOST=local:redis:6379
 REDIS_COMMANDER_USER=admin
 REDIS_COMMANDER_PASSWORD=${postgresPassword}
 `;

package/lib/utils/build-copy.js

@@ -13,7 +13,7 @@
 const fs = require('fs').promises;
 const fsSync = require('fs');
 const path = require('path');
-const os = require('os');
+const paths = require('./paths');
 
 /**
  * Copies all files from builder directory to developer-specific directory
@@ -40,9 +40,7 @@ async function copyBuilderToDevDirectory(appName, developerId) {
 
   // Get base directory (applications or applications-dev-{id})
   const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
-  const baseDir = idNum === 0
-    ? path.join(os.homedir(), '.aifabrix', 'applications')
-    : path.join(os.homedir(), '.aifabrix', `applications-dev-${developerId}`);
+  const baseDir = paths.getApplicationsBaseDir(idNum);
 
   // Clear base directory before copying (delete all files)
   if (fsSync.existsSync(baseDir)) {
@@ -117,13 +115,7 @@ async function copyDirectory(sourceDir, targetDir) {
  * @returns {string} Path to developer-specific directory
  */
 function getDevDirectory(appName, developerId) {
-  const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
-  if (idNum === 0) {
-    // Dev 0: all apps go directly to applications/ (no subdirectory)
-    return path.join(os.homedir(), '.aifabrix', 'applications');
-  }
-  // Dev > 0: apps go to applications-dev-{id}/{appName}-dev-{id}/
-  return path.join(os.homedir(), '.aifabrix', `applications-dev-${developerId}`, `${appName}-dev-${developerId}`);
+  return paths.getDevDirectory(appName, developerId);
 
 }
 

package/lib/utils/docker.js

@@ -49,7 +49,7 @@ async function getComposeCommand() {
     await execAsync('docker-compose --version');
     return 'docker-compose';
   } catch (_) {
-    throw new Error('Docker Compose is not available (neither "docker compose" nor "docker-compose" found).');
+    throw new Error('Docker Compose is not available (neither "docker compose" nor "docker-compose" found). Install the Docker Compose v2 plugin (e.g., apt-get install docker-compose-plugin) or ensure docker-compose is on PATH.');
   }
 }
 

package/lib/utils/infra-containers.js

@@ -28,21 +28,32 @@ async function findContainer(serviceName, devId = null) {
     const developerId = devId || await config.getDeveloperId();
     const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
     // Dev 0: aifabrix-{serviceName}, Dev > 0: aifabrix-dev{id}-{serviceName}
-    const containerNamePattern = idNum === 0
-      ? `aifabrix-${serviceName}`
-      : `aifabrix-dev${developerId}-${serviceName}`;
-    let { stdout } = await execAsync(`docker ps --filter "name=${containerNamePattern}" --format "{{.Names}}"`);
-    let containerName = stdout.trim();
-    if (!containerName) {
-      // Fallback to old naming patterns for backward compatibility
-      ({ stdout } = await execAsync(`docker ps --filter "name=infra-${serviceName}" --format "{{.Names}}"`));
-      containerName = stdout.trim();
-      if (!containerName) {
-        ({ stdout } = await execAsync(`docker ps --filter "name=aifabrix-${serviceName}" --format "{{.Names}}"`));
-        containerName = stdout.trim();
+    const primaryPattern = idNum === 0 ? `aifabrix-${serviceName}` : `aifabrix-dev${developerId}-${serviceName}`;
+
+    // Search order expected by tests:
+    // 1) primaryPattern
+    // 2) infra-{serviceName} (old pattern)
+    // 3) aifabrix-{serviceName} (base pattern)
+    const patternsToTry = [
+      primaryPattern,
+      `infra-${serviceName}`,
+      `aifabrix-${serviceName}`
+    ];
+
+    for (const pattern of patternsToTry) {
+      const { stdout } = await execAsync(`docker ps --filter "name=${pattern}" --format "{{.Names}}"`);
+      const names = stdout
+        .split('\n')
+        .map(s => s.trim())
+        .filter(s => s.length > 0);
+      const exactMatch = names.find(n => n === pattern);
+      if (exactMatch || names[0]) {
+        return exactMatch || names[0];
       }
     }
-    return containerName;
+
+    // Not found with any pattern
+    return '';
   } catch (error) {
     return null;
   }

package/lib/utils/paths.js

@@ -0,0 +1,77 @@
+/**
+ * Path Utilities for AI Fabrix Builder
+ *
+ * Centralized helpers for resolving filesystem locations with support for
+ * AIFABRIX_HOME override. Defaults to ~/.aifabrix when not specified.
+ *
+ * @fileoverview Path resolution utilities with environment overrides
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+'use strict';
+
+const path = require('path');
+const os = require('os');
+
+/**
+ * Returns the base AI Fabrix directory.
+ * Respects AIFABRIX_HOME environment variable, otherwise defaults to ~/.aifabrix
+ *
+ * @returns {string} Absolute path to the AI Fabrix home directory
+ */
+function getAifabrixHome() {
+  // In test environments, ignore AIFABRIX_HOME to keep deterministic paths for unit tests
+  // Jest sets JEST_WORKER_ID; NODE_ENV may be 'test'
+  const isTestEnv = process.env.NODE_ENV === 'test' || process.env.JEST_WORKER_ID !== undefined;
+  if (isTestEnv) {
+    return path.join(os.homedir(), '.aifabrix');
+  }
+  const homeOverride = process.env.AIFABRIX_HOME && String(process.env.AIFABRIX_HOME).trim();
+  if (homeOverride) {
+    return path.resolve(homeOverride);
+  }
+  return path.join(os.homedir(), '.aifabrix');
+}
+
+/**
+ * Returns the applications base directory for a developer.
+ * Dev 0: <home>/applications
+ * Dev > 0: <home>/applications-dev-{id}
+ *
+ * @param {number|string} developerId - Developer ID
+ * @returns {string} Absolute path to applications base directory
+ */
+function getApplicationsBaseDir(developerId) {
+  const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
+  const base = getAifabrixHome();
+  if (idNum === 0) {
+    return path.join(base, 'applications');
+  }
+  return path.join(base, `applications-dev-${developerId}`);
+}
+
+/**
+ * Returns the developer-specific application directory.
+ * Dev 0: points to applications/ (no app subdirectory)
+ * Dev > 0: <home>/applications-dev-{id}/{appName}-dev-{id}
+ *
+ * @param {string} appName - Application name
+ * @param {number|string} developerId - Developer ID
+ * @returns {string} Absolute path to developer-specific app directory
+ */
+function getDevDirectory(appName, developerId) {
+  const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
+  const baseDir = getApplicationsBaseDir(developerId);
+  if (idNum === 0) {
+    return baseDir;
+  }
+  return path.join(baseDir, `${appName}-dev-${developerId}`);
+}
+
+module.exports = {
+  getAifabrixHome,
+  getApplicationsBaseDir,
+  getDevDirectory
+};
+

package/lib/utils/secrets-path.js

@@ -14,6 +14,7 @@ const path = require('path');
 const os = require('os');
 const yaml = require('js-yaml');
 const config = require('../config');
+const paths = require('./paths');
 
 /**
  * Resolves secrets file path (backward compatibility)
@@ -32,7 +33,7 @@ function resolveSecretsPath(secretsPath) {
       path.join(process.cwd(), '..', '..', 'aifabrix-setup', 'secrets.local.yaml'),
       path.join(process.cwd(), 'secrets.local.yaml'),
       path.join(process.cwd(), '..', 'secrets.local.yaml'),
-      path.join(os.homedir(), '.aifabrix', 'secrets.yaml')
+      path.join(paths.getAifabrixHome(), 'secrets.yaml')
     ];
 
     // Find first existing file
@@ -45,7 +46,7 @@ function resolveSecretsPath(secretsPath) {
 
     // If none found, use default location
     if (!resolvedPath) {
-      resolvedPath = path.join(os.homedir(), '.aifabrix', 'secrets.yaml');
+      resolvedPath = path.join(paths.getAifabrixHome(), 'secrets.yaml');
     }
   } else if (secretsPath.startsWith('..')) {
     resolvedPath = path.resolve(process.cwd(), secretsPath);

package/package.json

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