@aifabrix/builder 2.22.1 → 2.31.0

package/lib/utils/cli-utils.js

@@ -22,6 +22,157 @@ function validateCommand(_command, _options) {
   return true;
 }
 
+/**
+ * Format already formatted error message
+ * @param {string} formatted - Formatted error message
+ * @returns {string[]} Array of error message lines
+ */
+function formatFormattedError(formatted) {
+  const messages = [];
+  const lines = formatted.split('\n');
+  lines.forEach(line => {
+    if (line.trim()) {
+      messages.push(`   ${line}`);
+    }
+  });
+  return messages;
+}
+
+/**
+ * Format Docker-related errors
+ * @param {string} errorMsg - Error message
+ * @returns {string[]|null} Array of error message lines or null if not a Docker error
+ */
+function formatDockerError(errorMsg) {
+  if (errorMsg.includes('not found locally') || (errorMsg.includes('Docker image') && errorMsg.includes('not found'))) {
+    return [
+      '   Docker image not found.',
+      '   Run: aifabrix build <app> first'
+    ];
+  }
+  if (errorMsg.includes('Docker') && (errorMsg.includes('not running') || errorMsg.includes('not installed') || errorMsg.includes('Cannot connect'))) {
+    return [
+      '   Docker is not running or not installed.',
+      '   Please start Docker Desktop and try again.'
+    ];
+  }
+  if (errorMsg.toLowerCase().includes('port') && (errorMsg.includes('already in use') || errorMsg.includes('in use') || errorMsg.includes('conflict'))) {
+    return [
+      '   Port conflict detected.',
+      '   Run "aifabrix doctor" to check which ports are in use.'
+    ];
+  }
+  if ((errorMsg.includes('permission denied') || errorMsg.includes('EACCES') || errorMsg.includes('Permission denied')) && !errorMsg.includes('permissions/') && !errorMsg.includes('Field "permissions')) {
+    return [
+      '   Permission denied.',
+      '   Make sure you have the necessary permissions to run Docker commands.'
+    ];
+  }
+  return null;
+}
+
+/**
+ * Format Azure-related errors
+ * @param {string} errorMsg - Error message
+ * @returns {string[]|null} Array of error message lines or null if not an Azure error
+ */
+function formatAzureError(errorMsg) {
+  if (errorMsg.includes('Azure CLI is not installed') || errorMsg.includes('az --version failed') || (errorMsg.includes('az') && errorMsg.includes('failed'))) {
+    return [
+      '   Azure CLI is not installed or not working properly.',
+      '   Install from: https://docs.microsoft.com/cli/azure/install-azure-cli',
+      '   Run: az login'
+    ];
+  }
+  if (errorMsg.includes('Invalid ACR URL') || errorMsg.includes('Invalid registry URL') || errorMsg.includes('Expected format')) {
+    return [
+      '   Invalid registry URL format.',
+      '   Use format: *.azurecr.io (e.g., myacr.azurecr.io)'
+    ];
+  }
+  if (errorMsg.includes('authenticate') || errorMsg.includes('ACR') || errorMsg.includes('Authentication required')) {
+    return [
+      '   Azure Container Registry authentication failed.',
+      '   Run: az acr login --name <registry-name>',
+      '   Or login to Azure: az login'
+    ];
+  }
+  if (errorMsg.includes('Registry URL is required')) {
+    return [
+      '   Registry URL is required.',
+      '   Provide via --registry flag or configure in variables.yaml under image.registry'
+    ];
+  }
+  return null;
+}
+
+/**
+ * Format secrets-related errors
+ * @param {string} errorMsg - Error message
+ * @returns {string[]|null} Array of error message lines or null if not a secrets error
+ */
+function formatSecretsError(errorMsg) {
+  if (!errorMsg.includes('Missing secrets')) {
+    return null;
+  }
+
+  const messages = [];
+  const missingSecretsMatch = errorMsg.match(/Missing secrets: ([^\n]+)/);
+  const fileInfoMatch = errorMsg.match(/Secrets file location: ([^\n]+)/);
+  const resolveMatch = errorMsg.match(/Run "aifabrix resolve ([^"]+)"/);
+
+  if (missingSecretsMatch) {
+    messages.push(`   Missing secrets: ${missingSecretsMatch[1]}`);
+  } else {
+    messages.push('   Missing secrets in secrets file.');
+  }
+
+  if (fileInfoMatch) {
+    messages.push(`   Secrets file location: ${fileInfoMatch[1]}`);
+  }
+
+  if (resolveMatch) {
+    messages.push(`   Run: aifabrix resolve ${resolveMatch[1]} to generate missing secrets.`);
+  } else {
+    messages.push('   Run: aifabrix resolve <app-name> to generate missing secrets.');
+  }
+
+  return messages;
+}
+
+/**
+ * Format deployment-related errors
+ * @param {string} errorMsg - Error message
+ * @returns {string[]|null} Array of error message lines or null if not a deployment error
+ */
+function formatDeploymentError(errorMsg) {
+  if (!errorMsg.includes('Deployment failed after')) {
+    return null;
+  }
+
+  const match = errorMsg.match(/Deployment failed after \d+ attempts: (.+)/);
+  if (match) {
+    return [`   ${match[1]}`];
+  }
+  return [`   ${errorMsg}`];
+}
+
+/**
+ * Format validation errors
+ * @param {string} errorMsg - Error message
+ * @returns {string[]|null} Array of error message lines or null if not a validation error
+ */
+function formatValidationError(errorMsg) {
+  if (errorMsg.includes('Configuration not found') ||
+      errorMsg.includes('does not match schema') ||
+      errorMsg.includes('Validation failed') ||
+      errorMsg.includes('Field "') ||
+      errorMsg.includes('Invalid format')) {
+    return [`   ${errorMsg}`];
+  }
+  return null;
+}
+
 /**
  * Formats error message based on error type
  * @function formatError
@@ -29,92 +180,42 @@ function validateCommand(_command, _options) {
  * @returns {string[]} Array of error message lines
  */
 function formatError(error) {
-  const messages = [];
-
   // If error has formatted message (from API error handler), use it directly
   if (error.formatted) {
-    // Split formatted message into lines and add proper indentation
-    const lines = error.formatted.split('\n');
-    lines.forEach(line => {
-      if (line.trim()) {
-        messages.push(`   ${line}`);
-      }
-    });
-    return messages;
+    return formatFormattedError(error.formatted);
   }
 
   const errorMsg = error.message || '';
+  const messages = [];
 
-  // Check for specific error patterns first (most specific to least specific)
-  if (errorMsg.includes('Configuration not found')) {
-    messages.push(`   ${errorMsg}`);
-  } else if (errorMsg.includes('does not match schema') || errorMsg.includes('Validation failed') || errorMsg.includes('Field "') || errorMsg.includes('Invalid format')) {
-    // Schema validation errors - show the actual error message
-    messages.push(`   ${errorMsg}`);
-  } else if (errorMsg.includes('not found locally') || (errorMsg.includes('Docker image') && errorMsg.includes('not found'))) {
-    messages.push('   Docker image not found.');
-    messages.push('   Run: aifabrix build <app> first');
-  } else if (errorMsg.includes('Docker') && (errorMsg.includes('not running') || errorMsg.includes('not installed') || errorMsg.includes('Cannot connect'))) {
-    messages.push('   Docker is not running or not installed.');
-    messages.push('   Please start Docker Desktop and try again.');
-  } else if (errorMsg.toLowerCase().includes('port') && (errorMsg.includes('already in use') || errorMsg.includes('in use') || errorMsg.includes('conflict'))) {
-    messages.push('   Port conflict detected.');
-    messages.push('   Run "aifabrix doctor" to check which ports are in use.');
-  } else if ((errorMsg.includes('permission denied') || errorMsg.includes('EACCES') || errorMsg.includes('Permission denied')) && !errorMsg.includes('permissions/') && !errorMsg.includes('Field "permissions')) {
-    // Only match actual permission denied errors, not validation errors about permissions fields
-    messages.push('   Permission denied.');
-    messages.push('   Make sure you have the necessary permissions to run Docker commands.');
-  } else if (errorMsg.includes('Azure CLI is not installed') || errorMsg.includes('az --version failed') || (errorMsg.includes('az') && errorMsg.includes('failed'))) {
-    // Specific error for missing Azure CLI installation or Azure CLI command failures
-    messages.push('   Azure CLI is not installed or not working properly.');
-    messages.push('   Install from: https://docs.microsoft.com/cli/azure/install-azure-cli');
-    messages.push('   Run: az login');
-  } else if (errorMsg.includes('Invalid ACR URL') || errorMsg.includes('Invalid registry URL') || errorMsg.includes('Expected format')) {
-    messages.push('   Invalid registry URL format.');
-    messages.push('   Use format: *.azurecr.io (e.g., myacr.azurecr.io)');
-  } else if (errorMsg.includes('authenticate') || errorMsg.includes('ACR') || errorMsg.includes('Authentication required')) {
-    messages.push('   Azure Container Registry authentication failed.');
-    messages.push('   Run: az acr login --name <registry-name>');
-    messages.push('   Or login to Azure: az login');
-  } else if (errorMsg.includes('Registry URL is required')) {
-    messages.push('   Registry URL is required.');
-    messages.push('   Provide via --registry flag or configure in variables.yaml under image.registry');
-  } else if (errorMsg.includes('Missing secrets')) {
-    // Extract the missing secrets list and file info from the error message
-    const missingSecretsMatch = errorMsg.match(/Missing secrets: ([^\n]+)/);
-    const fileInfoMatch = errorMsg.match(/Secrets file location: ([^\n]+)/);
-    const resolveMatch = errorMsg.match(/Run "aifabrix resolve ([^"]+)"/);
-
-    if (missingSecretsMatch) {
-      messages.push(`   Missing secrets: ${missingSecretsMatch[1]}`);
-    } else {
-      messages.push('   Missing secrets in secrets file.');
-    }
+  // Try different error formatters in order of specificity
+  const dockerError = formatDockerError(errorMsg);
+  if (dockerError) {
+    return dockerError;
+  }
 
-    if (fileInfoMatch) {
-      messages.push(`   Secrets file location: ${fileInfoMatch[1]}`);
-    }
+  const azureError = formatAzureError(errorMsg);
+  if (azureError) {
+    return azureError;
+  }
 
-    // Always show resolve command suggestion
-    if (resolveMatch) {
-      // Extract app name from error message if available
-      messages.push(`   Run: aifabrix resolve ${resolveMatch[1]} to generate missing secrets.`);
-    } else {
-      // Generic suggestion if app name not in error message
-      messages.push('   Run: aifabrix resolve <app-name> to generate missing secrets.');
-    }
-  } else if (errorMsg.includes('Deployment failed after')) {
-    // Handle deployment retry errors - extract the actual error message
-    const match = errorMsg.match(/Deployment failed after \d+ attempts: (.+)/);
-    if (match) {
-      messages.push(`   ${match[1]}`);
-    } else {
-      messages.push(`   ${errorMsg}`);
-    }
-  } else {
-    messages.push(`   ${errorMsg}`);
+  const secretsError = formatSecretsError(errorMsg);
+  if (secretsError) {
+    return secretsError;
+  }
+
+  const deploymentError = formatDeploymentError(errorMsg);
+  if (deploymentError) {
+    return deploymentError;
+  }
+
+  const validationError = formatValidationError(errorMsg);
+  if (validationError) {
+    return validationError;
   }
 
+  // Default: return generic error message
+  messages.push(`   ${errorMsg}`);
   return messages;
 }
 

package/lib/utils/compose-generator.js

@@ -74,9 +74,19 @@ handlebars.registerHelper('pgUserName', (dbName) => {
  * @throws {Error} If template not found
  */
 function loadDockerComposeTemplate(language) {
-  const templatePath = path.join(__dirname, '..', '..', 'templates', language, 'docker-compose.hbs');
+  // Use getProjectRoot to reliably find templates in all environments
+  const { getProjectRoot } = require('./paths');
+  const projectRoot = getProjectRoot();
+  const templatePath = path.join(projectRoot, 'templates', language, 'docker-compose.hbs');
+
   if (!fsSync.existsSync(templatePath)) {
-    throw new Error(`Docker Compose template not found for language: ${language}`);
+    // Provide helpful error message with actual paths checked
+    const errorMessage = `Docker Compose template not found for language: ${language}\n` +
+      `  Expected path: ${templatePath}\n` +
+      `  Project root: ${projectRoot}\n` +
+      `  Templates directory: ${path.join(projectRoot, 'templates', language)}\n` +
+      `  Global PROJECT_ROOT: ${typeof global !== 'undefined' && global.PROJECT_ROOT ? global.PROJECT_ROOT : 'not set'}`;
+    throw new Error(errorMessage);
   }
 
   const templateContent = fsSync.readFileSync(templatePath, 'utf8');

package/lib/utils/config-tokens.js

@@ -30,22 +30,23 @@ function normalizeControllerUrl(url) {
 
 /**
  * Create token management functions with config access
- * @param {Function} getConfigFn - Function to get config
- * @param {Function} saveConfigFn - Function to save config
- * @param {Function} getSecretsEncryptionKeyFn - Function to get encryption key
- * @param {Function} encryptTokenValueFn - Function to encrypt token
- * @param {Function} decryptTokenValueFn - Function to decrypt token
- * @param {Function} isTokenEncryptedFn - Function to check if token is encrypted
+ * @param {Object} params - Function parameters
+ * @param {Function} params.getConfigFn - Function to get config
+ * @param {Function} params.saveConfigFn - Function to save config
+ * @param {Function} params.getSecretsEncryptionKeyFn - Function to get encryption key
+ * @param {Function} params.encryptTokenValueFn - Function to encrypt token
+ * @param {Function} params.decryptTokenValueFn - Function to decrypt token
+ * @param {Function} params.isTokenEncryptedFn - Function to check if token is encrypted
  * @returns {Object} Token management functions
  */
-function createTokenManagementFunctions(
+function createTokenManagementFunctions({
   getConfigFn,
   saveConfigFn,
   getSecretsEncryptionKeyFn,
   encryptTokenValueFn,
   decryptTokenValueFn,
   isTokenEncryptedFn
-) {
+}) {
   /**
    * Extract device token information with encryption/decryption handling
    * @param {Object} deviceToken - Device token object from config
@@ -219,11 +220,152 @@ function createTokenManagementFunctions(
     await saveConfigFn(config);
   }
 
+  /**
+   * Clear device token for specific controller
+   * @param {string} controllerUrl - Controller URL
+   * @returns {Promise<boolean>} True if token was cleared, false if it didn't exist
+   */
+  async function clearDeviceToken(controllerUrl) {
+    const config = await getConfigFn();
+    if (!config.device || !controllerUrl) return false;
+
+    const normalizedUrl = normalizeControllerUrl(controllerUrl);
+    let cleared = false;
+
+    // Try exact match first
+    if (config.device[normalizedUrl]) {
+      delete config.device[normalizedUrl];
+      cleared = true;
+    } else {
+      // Try to find matching URL by normalizing all stored URLs
+      for (const storedUrl of Object.keys(config.device)) {
+        if (normalizeControllerUrl(storedUrl) === normalizedUrl) {
+          delete config.device[storedUrl];
+          cleared = true;
+          break;
+        }
+      }
+    }
+
+    if (cleared) {
+      await saveConfigFn(config);
+    }
+
+    return cleared;
+  }
+
+  /**
+   * Clear all device tokens
+   * @returns {Promise<number>} Number of tokens cleared
+   */
+  async function clearAllDeviceTokens() {
+    const config = await getConfigFn();
+    if (!config.device) return 0;
+
+    const count = Object.keys(config.device).length;
+    if (count > 0) {
+      config.device = {};
+      await saveConfigFn(config);
+    }
+
+    return count;
+  }
+
+  /**
+   * Clear client token for specific environment and app
+   * @param {string} environment - Environment key
+   * @param {string} appName - Application name
+   * @returns {Promise<boolean>} True if token was cleared, false if it didn't exist
+   */
+  async function clearClientToken(environment, appName) {
+    const config = await getConfigFn();
+    if (!config.environments || !config.environments[environment]) return false;
+    if (!config.environments[environment].clients || !config.environments[environment].clients[appName]) return false;
+
+    delete config.environments[environment].clients[appName];
+
+    // Clean up empty clients object if no clients remain
+    if (Object.keys(config.environments[environment].clients).length === 0) {
+      delete config.environments[environment].clients;
+    }
+
+    // Clean up empty environment object if no clients remain
+    if (Object.keys(config.environments[environment]).length === 0) {
+      delete config.environments[environment];
+    }
+
+    await saveConfigFn(config);
+    return true;
+  }
+
+  /**
+   * Clear all client tokens for a specific environment
+   * @param {string} environment - Environment key
+   * @returns {Promise<number>} Number of tokens cleared
+   */
+  async function clearClientTokensForEnvironment(environment) {
+    const config = await getConfigFn();
+    if (!config.environments || !config.environments[environment]) return 0;
+    if (!config.environments[environment].clients) return 0;
+
+    const count = Object.keys(config.environments[environment].clients).length;
+    if (count > 0) {
+      delete config.environments[environment].clients;
+      // Clean up empty environment object if no other properties remain
+      if (Object.keys(config.environments[environment]).length === 0) {
+        delete config.environments[environment];
+      }
+      await saveConfigFn(config);
+    }
+
+    return count;
+  }
+
+  /**
+   * Clear all client tokens across all environments
+   * @returns {Promise<number>} Number of tokens cleared
+   */
+  async function clearAllClientTokens() {
+    const config = await getConfigFn();
+    if (!config.environments) return 0;
+
+    let totalCount = 0;
+    const environmentsToRemove = [];
+
+    for (const env of Object.keys(config.environments)) {
+      if (config.environments[env].clients) {
+        const count = Object.keys(config.environments[env].clients).length;
+        totalCount += count;
+        delete config.environments[env].clients;
+        // Mark environment for removal if no other properties remain
+        if (Object.keys(config.environments[env]).length === 0) {
+          environmentsToRemove.push(env);
+        }
+      }
+    }
+
+    // Remove empty environments
+    environmentsToRemove.forEach(env => {
+      delete config.environments[env];
+    });
+
+    if (totalCount > 0) {
+      await saveConfigFn(config);
+    }
+
+    return totalCount;
+  }
+
   return {
     getDeviceToken,
     getClientToken,
     saveDeviceToken,
-    saveClientToken
+    saveClientToken,
+    clearDeviceToken,
+    clearAllDeviceTokens,
+    clearClientToken,
+    clearClientTokensForEnvironment,
+    clearAllClientTokens
   };
 }