@aifabrix/builder 2.22.2 → 2.31.1

package/lib/app-run.js

@@ -17,6 +17,131 @@ const composeGenerator = require('./utils/compose-generator');
 // Helper functions extracted to reduce file size and complexity
 const helpers = require('./app-run-helpers');
 
+/**
+ * Validate app for run and check if it's an external system
+ * @async
+ * @param {string} appName - Application name
+ * @param {boolean} _debug - Debug flag (unused)
+ * @returns {Promise<boolean>} True if should continue, false if external system
+ * @throws {Error} If app name is invalid
+ */
+async function validateAppForRun(appName, _debug) {
+  if (!appName || typeof appName !== 'string') {
+    throw new Error('Application name is required');
+  }
+
+  // Check if app type is external - skip Docker run
+  const { detectAppType } = require('./utils/paths');
+  try {
+    const { isExternal } = await detectAppType(appName);
+    if (isExternal) {
+      logger.log(chalk.yellow('⚠️  External systems don\'t run as Docker containers.'));
+      logger.log(chalk.blue('Use "aifabrix build" to deploy to dataplane, then test via OpenAPI endpoints.'));
+      return false;
+    }
+  } catch (error) {
+    // If detection fails, continue with normal run
+    // (detectAppType throws if app doesn't exist, which is fine for run command)
+  }
+
+  return true;
+}
+
+/**
+ * Check if container is running and stop it if needed
+ * @async
+ * @param {string} appName - Application name
+ * @param {number|string} developerId - Developer ID
+ * @param {boolean} debug - Debug flag
+ * @returns {Promise<void>}
+ */
+async function checkAndStopContainer(appName, developerId, debug) {
+  const containerRunning = await helpers.checkContainerRunning(appName, developerId, debug);
+  if (!containerRunning) {
+    return;
+  }
+
+  // Dev 0: aifabrix-{appName} (no dev-0 suffix), Dev > 0: aifabrix-dev{id}-{appName}
+  const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
+  const containerName = idNum === 0 ? `aifabrix-${appName}` : `aifabrix-dev${developerId}-${appName}`;
+  logger.log(chalk.yellow(`Container ${containerName} is already running`));
+  await helpers.stopAndRemoveContainer(appName, developerId, debug);
+}
+
+/**
+ * Calculate host port and validate it's available
+ * @async
+ * @param {Object} appConfig - Application configuration
+ * @param {Object} options - Run options
+ * @param {number} [options.port] - Override port
+ * @param {boolean} debug - Debug flag
+ * @returns {Promise<number>} Host port
+ * @throws {Error} If port is not available
+ */
+async function calculateHostPort(appConfig, options, debug) {
+  const basePort = appConfig.port || 3000;
+  const idNum = typeof appConfig.developerId === 'string' ? parseInt(appConfig.developerId, 10) : appConfig.developerId;
+  const hostPort = options.port || (idNum === 0 ? basePort : basePort + (idNum * 100));
+
+  if (debug) {
+    logger.log(chalk.gray(`[DEBUG] Host port: ${hostPort} (${options.port ? 'CLI override' : 'dev-specific'}), Container port: ${appConfig.build?.containerPort || appConfig.port || 3000} (unchanged)`));
+  }
+
+  const portAvailable = await checkPortAvailable(hostPort);
+  if (debug) {
+    logger.log(chalk.gray(`[DEBUG] Port ${hostPort} available: ${portAvailable}`));
+  }
+
+  if (!portAvailable) {
+    throw new Error(`Port ${hostPort} is already in use. Try --port <alternative>`);
+  }
+
+  return hostPort;
+}
+
+/**
+ * Load and configure application
+ * @async
+ * @param {string} appName - Application name
+ * @param {boolean} debug - Debug flag
+ * @returns {Promise<Object>} Application configuration with developerId
+ */
+async function loadAndConfigureApp(appName, debug) {
+  const appConfig = await helpers.validateAppConfiguration(appName);
+  const developerId = await config.getDeveloperId();
+  appConfig.developerId = developerId;
+
+  if (debug) {
+    logger.log(chalk.gray(`[DEBUG] Configuration loaded: port=${appConfig.port || 'default'}, healthCheck.path=${appConfig.healthCheck?.path || '/health'}, developerId=${appConfig.developerId}`));
+  }
+
+  return appConfig;
+}
+
+/**
+ * Start application container and display status
+ * @async
+ * @param {string} appName - Application name
+ * @param {string} tempComposePath - Path to compose file
+ * @param {number} hostPort - Host port
+ * @param {Object} appConfig - Application configuration
+ * @param {boolean} debug - Debug flag
+ * @throws {Error} If container start fails
+ */
+async function startAppContainer(appName, tempComposePath, hostPort, appConfig, debug) {
+  try {
+    await helpers.startContainer(appName, tempComposePath, hostPort, appConfig, debug);
+    await helpers.displayRunStatus(appName, hostPort, appConfig);
+  } catch (error) {
+    logger.log(chalk.yellow(`\n⚠️  Compose file preserved at: ${tempComposePath}`));
+    logger.log(chalk.yellow('   Review the file to debug issues'));
+    if (debug) {
+      logger.log(chalk.gray(`[DEBUG] Error during container start: ${error.message}`));
+    }
+    throw error;
+  }
+}
+
 /**
  * Runs the application locally using Docker
  * Starts container with proper port mapping and environment
@@ -43,65 +168,23 @@ async function runApp(appName, options = {}) {
   }
 
   try {
-    // Validate app name first
-    if (!appName || typeof appName !== 'string') {
-      throw new Error('Application name is required');
-    }
-
-    // Check if app type is external - skip Docker run
-    const { detectAppType } = require('./utils/paths');
-    try {
-      const { isExternal } = await detectAppType(appName);
-      if (isExternal) {
-        logger.log(chalk.yellow('⚠️  External systems don\'t run as Docker containers.'));
-        logger.log(chalk.blue('Use "aifabrix build" to deploy to dataplane, then test via OpenAPI endpoints.'));
-        return;
-      }
-    } catch (error) {
-      // If detection fails, continue with normal run
-      // (detectAppType throws if app doesn't exist, which is fine for run command)
+    // Validate app for run and check if external
+    const shouldContinue = await validateAppForRun(appName, debug);
+    if (!shouldContinue) {
+      return;
     }
 
-    // Validate app name and load configuration
-    const appConfig = await helpers.validateAppConfiguration(appName);
-
-    // Load developer ID once from config module - it's now cached and available as config.developerId
-    // Developer ID: 0 = default infra, > 0 = developer-specific
-    const developerId = await config.getDeveloperId(); // Load and cache developer ID
-    appConfig.developerId = developerId; // Use developer ID in config
-
-    if (debug) {
-      logger.log(chalk.gray(`[DEBUG] Configuration loaded: port=${appConfig.port || 'default'}, healthCheck.path=${appConfig.healthCheck?.path || '/health'}, developerId=${appConfig.developerId}`));
-    }
+    // Load and configure application
+    const appConfig = await loadAndConfigureApp(appName, debug);
 
     // Check prerequisites: image and infrastructure
     await helpers.checkPrerequisites(appName, appConfig, debug);
 
-    // Check if container is already running
-    const containerRunning = await helpers.checkContainerRunning(appName, appConfig.developerId, debug);
-    if (containerRunning) {
-      // Dev 0: aifabrix-{appName} (no dev-0 suffix), Dev > 0: aifabrix-dev{id}-{appName}
-      const idNum2 = typeof appConfig.developerId === 'string' ? parseInt(appConfig.developerId, 10) : appConfig.developerId;
-      const containerName = idNum2 === 0 ? `aifabrix-${appName}` : `aifabrix-dev${appConfig.developerId}-${appName}`;
-      logger.log(chalk.yellow(`Container ${containerName} is already running`));
-      await helpers.stopAndRemoveContainer(appName, appConfig.developerId, debug);
-    }
+    // Check if container is already running and stop it if needed
+    await checkAndStopContainer(appName, appConfig.developerId, debug);
 
-    // Calculate host port: use dev-specific port offset if not overridden
-    // IMPORTANT: Container port (for Dockerfile) stays unchanged from appConfig.port
-    const basePort = appConfig.port || 3000;
-    const idNum3 = typeof appConfig.developerId === 'string' ? parseInt(appConfig.developerId, 10) : appConfig.developerId;
-    const hostPort = options.port || (idNum3 === 0 ? basePort : basePort + (idNum3 * 100));
-    if (debug) {
-      logger.log(chalk.gray(`[DEBUG] Host port: ${hostPort} (${options.port ? 'CLI override' : 'dev-specific'}), Container port: ${appConfig.build?.containerPort || appConfig.port || 3000} (unchanged)`));
-    }
-    const portAvailable = await checkPortAvailable(hostPort);
-    if (debug) {
-      logger.log(chalk.gray(`[DEBUG] Port ${hostPort} available: ${portAvailable}`));
-    }
-    if (!portAvailable) {
-      throw new Error(`Port ${hostPort} is already in use. Try --port <alternative>`);
-    }
+    // Calculate host port and validate it's available
+    const hostPort = await calculateHostPort(appConfig, options, debug);
 
     // Prepare environment: ensure .env file and generate Docker Compose
     const tempComposePath = await helpers.prepareEnvironment(appName, appConfig, options);
@@ -109,22 +192,8 @@ async function runApp(appName, options = {}) {
       logger.log(chalk.gray(`[DEBUG] Compose file generated: ${tempComposePath}`));
     }
 
-    try {
-      // Start container and wait for health check
-      await helpers.startContainer(appName, tempComposePath, hostPort, appConfig, debug);
-
-      // Display success message
-      await helpers.displayRunStatus(appName, hostPort, appConfig);
-
-    } catch (error) {
-      // Keep the compose file for debugging - don't delete on error
-      logger.log(chalk.yellow(`\n⚠️  Compose file preserved at: ${tempComposePath}`));
-      logger.log(chalk.yellow('   Review the file to debug issues'));
-      if (debug) {
-        logger.log(chalk.gray(`[DEBUG] Error during container start: ${error.message}`));
-      }
-      throw error;
-    }
+    // Start container and display status
+    await startAppContainer(appName, tempComposePath, hostPort, appConfig, debug);
 
   } catch (error) {
     if (debug) {

package/lib/audit-logger.js

@@ -258,14 +258,15 @@ async function logApplicationCreation(appName, options = {}) {
  * Logs API call attempt with full details for audit trail
  * Logs both successful and failed API calls for troubleshooting
  *
- * @param {string} url - API endpoint URL
- * @param {Object} options - Fetch options (method, headers, etc.)
- * @param {number} statusCode - HTTP status code
- * @param {number} duration - Request duration in milliseconds
- * @param {boolean} success - Whether the request was successful
- * @param {Object} errorInfo - Error information (if failed)
+ * @param {Object} params - Function parameters
+ * @param {string} params.url - API endpoint URL
+ * @param {Object} params.options - Fetch options (method, headers, etc.)
+ * @param {number} params.statusCode - HTTP status code
+ * @param {number} params.duration - Request duration in milliseconds
+ * @param {boolean} params.success - Whether the request was successful
+ * @param {Object} [params.errorInfo] - Error information (if failed)
  */
-async function logApiCall(url, options, statusCode, duration, success, errorInfo = {}) {
+async function logApiCall({ url, options, statusCode, duration, success, errorInfo = {} }) {
   const method = options.method || 'GET';
   const path = extractPathFromUrl(url);