@aifabrix/builder 2.22.1 → 2.31.0

package/lib/infra.js

@@ -21,6 +21,7 @@ const logger = require('./utils/logger');
 const containerUtils = require('./utils/infra-containers');
 const dockerUtils = require('./utils/docker');
 const paths = require('./utils/paths');
+const statusHelpers = require('./utils/infra-status');
 
 // Register Handlebars helper for equality check
 // Handles both strict equality and numeric string comparisons
@@ -129,20 +130,13 @@ function generatePgAdminConfig(infraDir, postgresPassword) {
   fs.writeFileSync(pgpassPath, pgpassContent, { mode: 0o600 });
 }
 
-async function startInfra(developerId = null) {
-  await checkDockerAvailability();
-  const adminSecretsPath = await ensureAdminSecrets();
-
-  const devId = developerId || await config.getDeveloperId();
-  const devIdNum = typeof devId === 'string' ? parseInt(devId, 10) : devId;
-  const ports = devConfig.getDevPorts(devIdNum);
-  const idNum = devIdNum;
-
-  const templatePath = path.join(__dirname, '..', 'templates', 'infra', 'compose.yaml.hbs');
-  if (!fs.existsSync(templatePath)) {
-    throw new Error(`Compose template not found: ${templatePath}`);
-  }
-
+/**
+ * Prepare infrastructure directory and extract postgres password
+ * @param {string} devId - Developer ID
+ * @param {string} adminSecretsPath - Path to admin secrets file
+ * @returns {Object} Object with infraDir and postgresPassword
+ */
+function prepareInfraDirectory(devId, adminSecretsPath) {
   const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
@@ -155,6 +149,13 @@ async function startInfra(developerId = null) {
   const postgresPassword = postgresPasswordMatch ? postgresPasswordMatch[1] : '';
   generatePgAdminConfig(infraDir, postgresPassword);
 
+  return { infraDir, postgresPassword };
+}
+
+/**
+ * Register Handlebars helper for equality comparison
+ */
+function registerHandlebarsHelper() {
   handlebars.registerHelper('eq', (a, b) => {
     if (a === null || a === undefined) a = '0';
     if (b === null || b === undefined) b = '0';
@@ -165,6 +166,18 @@ async function startInfra(developerId = null) {
     }
     return a === b;
   });
+}
+
+/**
+ * Generate docker-compose file from template
+ * @param {string} templatePath - Path to compose template
+ * @param {string} devId - Developer ID
+ * @param {number} idNum - Developer ID number
+ * @param {Object} ports - Port configuration
+ * @param {string} infraDir - Infrastructure directory
+ * @returns {string} Path to generated compose file
+ */
+function generateComposeFile(templatePath, devId, idNum, ports, infraDir) {
   const templateContent = fs.readFileSync(templatePath, 'utf8');
   const template = handlebars.compile(templateContent);
   const networkName = idNum === 0 ? 'infra-aifabrix-network' : `infra-dev${devId}-aifabrix-network`;
@@ -183,31 +196,83 @@ async function startInfra(developerId = null) {
   });
   const composePath = path.join(infraDir, 'compose.yaml');
   fs.writeFileSync(composePath, composeContent);
+  return composePath;
+}
+
+/**
+ * Start Docker services using docker-compose
+ * @async
+ * @param {string} composePath - Path to compose file
+ * @param {string} projectName - Docker project name
+ * @param {string} adminSecretsPath - Path to admin secrets file
+ * @param {string} infraDir - Infrastructure directory
+ */
+async function startDockerServices(composePath, projectName, adminSecretsPath, infraDir) {
+  logger.log(`Using compose file: ${composePath}`);
+  logger.log('Starting infrastructure services...');
+  const composeCmd = await dockerUtils.getComposeCommand();
+  await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" up -d`, { cwd: infraDir });
+  logger.log('Infrastructure services started successfully');
+}
+
+/**
+ * Copy pgAdmin4 configuration files into container
+ * @async
+ * @param {string} pgadminContainerName - pgAdmin container name
+ * @param {string} serversJsonPath - Path to servers.json file
+ * @param {string} pgpassPath - Path to pgpass file
+ */
+async function copyPgAdminConfig(pgadminContainerName, serversJsonPath, pgpassPath) {
+  try {
+    await new Promise(resolve => setTimeout(resolve, 2000)); // Wait for container to be ready
+    if (fs.existsSync(serversJsonPath)) {
+      await execAsync(`docker cp "${serversJsonPath}" ${pgadminContainerName}:/pgadmin4/servers.json`);
+    }
+    if (fs.existsSync(pgpassPath)) {
+      await execAsync(`docker cp "${pgpassPath}" ${pgadminContainerName}:/pgpass`);
+      await execAsync(`docker exec ${pgadminContainerName} chmod 600 /pgpass`);
+    }
+  } catch (error) {
+    // Ignore copy errors - files might already be there or container not ready
+    logger.log('Note: Could not copy pgAdmin4 config files (this is OK if container was just restarted)');
+  }
+}
+
+async function startInfra(developerId = null) {
+  await checkDockerAvailability();
+  const adminSecretsPath = await ensureAdminSecrets();
+
+  const devId = developerId || await config.getDeveloperId();
+  const devIdNum = typeof devId === 'string' ? parseInt(devId, 10) : devId;
+  const ports = devConfig.getDevPorts(devIdNum);
+  const idNum = devIdNum;
+
+  const templatePath = path.join(__dirname, '..', 'templates', 'infra', 'compose.yaml.hbs');
+  if (!fs.existsSync(templatePath)) {
+    throw new Error(`Compose template not found: ${templatePath}`);
+  }
+
+  // Prepare infrastructure directory
+  const { infraDir } = prepareInfraDirectory(devId, adminSecretsPath);
+
+  // Register Handlebars helper
+  registerHandlebarsHelper();
+
+  // Generate compose file
+  const composePath = generateComposeFile(templatePath, devId, idNum, ports, infraDir);
 
   try {
-    logger.log(`Using compose file: ${composePath}`);
-    logger.log(`Starting infrastructure services for developer ${devId}...`);
+    // Start Docker services
     const projectName = getInfraProjectName(devId);
-    const composeCmd = await dockerUtils.getComposeCommand();
-    await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" up -d`, { cwd: infraDir });
-    logger.log('Infrastructure services started successfully');
+    await startDockerServices(composePath, projectName, adminSecretsPath, infraDir);
 
-    // Copy pgAdmin4 config files into container after it starts
+    // Copy pgAdmin4 config files
     const pgadminContainerName = idNum === 0 ? 'aifabrix-pgadmin' : `aifabrix-dev${devId}-pgadmin`;
-    try {
-      await new Promise(resolve => setTimeout(resolve, 2000)); // Wait for container to be ready
-      if (fs.existsSync(serversJsonPath)) {
-        await execAsync(`docker cp "${serversJsonPath}" ${pgadminContainerName}:/pgadmin4/servers.json`);
-      }
-      if (fs.existsSync(pgpassPath)) {
-        await execAsync(`docker cp "${pgpassPath}" ${pgadminContainerName}:/pgpass`);
-        await execAsync(`docker exec ${pgadminContainerName} chmod 600 /pgpass`);
-      }
-    } catch (error) {
-      // Ignore copy errors - files might already be there or container not ready
-      logger.log('Note: Could not copy pgAdmin4 config files (this is OK if container was just restarted)');
-    }
+    const serversJsonPath = path.join(infraDir, 'servers.json');
+    const pgpassPath = path.join(infraDir, 'pgpass');
+    await copyPgAdminConfig(pgadminContainerName, serversJsonPath, pgpassPath);
 
+    // Wait for services to be healthy
     await waitForServices(devId);
     logger.log('All services are healthy and ready');
   } finally {
@@ -321,62 +386,9 @@ async function checkInfraHealth(devId = null) {
   return health;
 }
 
-/**
- * Gets the status of infrastructure services
- * Returns detailed information about running containers
- *
- * @async
- * @function getInfraStatus
- * @returns {Promise<Object>} Status information for each service
- *
- * @example
- * const status = await getInfraStatus();
- * // Returns: { postgres: { status: 'running', port: 5432, url: 'localhost:5432' }, ... }
- */
-async function getInfraStatus() {
-  const devId = await config.getDeveloperId();
-  // Convert string developer ID to number for getDevPorts
-  const devIdNum = parseInt(devId, 10);
-  const ports = devConfig.getDevPorts(devIdNum);
-  const services = {
-    postgres: { port: ports.postgres, url: `localhost:${ports.postgres}` },
-    redis: { port: ports.redis, url: `localhost:${ports.redis}` },
-    pgadmin: { port: ports.pgadmin, url: `http://localhost:${ports.pgadmin}` },
-    'redis-commander': { port: ports.redisCommander, url: `http://localhost:${ports.redisCommander}` }
-  };
-
-  const status = {};
-
-  for (const [serviceName, serviceConfig] of Object.entries(services)) {
-    try {
-      const containerName = await containerUtils.findContainer(serviceName, devId);
-      if (containerName) {
-        const { stdout } = await execAsync(`docker inspect --format='{{.State.Status}}' ${containerName}`);
-        // Normalize status value (trim whitespace and remove quotes)
-        const normalizedStatus = stdout.trim().replace(/['"]/g, '');
-        status[serviceName] = {
-          status: normalizedStatus,
-          port: serviceConfig.port,
-          url: serviceConfig.url
-        };
-      } else {
-        status[serviceName] = {
-          status: 'not running',
-          port: serviceConfig.port,
-          url: serviceConfig.url
-        };
-      }
-    } catch (error) {
-      status[serviceName] = {
-        status: 'not running',
-        port: serviceConfig.port,
-        url: serviceConfig.url
-      };
-    }
-  }
-
-  return status;
-}
+// Re-export status helper functions
+const getInfraStatus = statusHelpers.getInfraStatus;
+const getAppStatus = statusHelpers.getAppStatus;
 
 /**
  * Restarts a specific infrastructure service
@@ -451,48 +463,6 @@ async function waitForServices(devId = null) {
 
   throw new Error('Services failed to become healthy within timeout period');
 }
-
-/**
- * Gets status of running application containers
- * Finds all containers matching pattern aifabrix-dev{id}-* (excluding infrastructure)
- *
- * @async
- * @function getAppStatus
- * @returns {Promise<Array>} Array of application status objects
- *
- * @example
- * const apps = await getAppStatus();
- * // Returns: [{ name: 'myapp', container: 'aifabrix-dev1-myapp', port: '3100:3000', status: 'running', url: 'http://localhost:3100' }]
- */
-async function getAppStatus() {
-  const devId = await config.getDeveloperId();
-  const apps = [];
-
-  try {
-    const filterPattern = devId === 0 ? 'aifabrix-' : `aifabrix-dev${devId}-`;
-    const { stdout } = await execAsync(`docker ps --filter "name=${filterPattern}" --format "{{.Names}}\t{{.Ports}}\t{{.Status}}"`);
-    const lines = stdout.trim().split('\n').filter(line => line.trim() !== '');
-    const infraContainers = devId === 0
-      ? ['aifabrix-postgres', 'aifabrix-redis', 'aifabrix-pgadmin', 'aifabrix-redis-commander']
-      : [`aifabrix-dev${devId}-postgres`, `aifabrix-dev${devId}-redis`, `aifabrix-dev${devId}-pgadmin`, `aifabrix-dev${devId}-redis-commander`];
-    for (const line of lines) {
-      const [containerName, ports, status] = line.split('\t');
-      if (infraContainers.includes(containerName)) continue;
-      const pattern = devId === 0 ? /^aifabrix-(.+)$/ : new RegExp(`^aifabrix-dev${devId}-(.+)$`);
-      const appNameMatch = containerName.match(pattern);
-      if (!appNameMatch) continue;
-      const appName = appNameMatch[1];
-      const portMatch = ports.match(/:(\d+)->\d+\//);
-      const hostPort = portMatch ? portMatch[1] : 'unknown';
-      const url = hostPort !== 'unknown' ? `http://localhost:${hostPort}` : 'unknown';
-      apps.push({ name: appName, container: containerName, port: ports, status: status.trim(), url: url });
-    }
-  } catch (error) {
-    return [];
-  }
-
-  return apps;
-}
 module.exports = {
   startInfra, stopInfra, stopInfraWithVolumes, checkInfraHealth,
   getInfraStatus, getAppStatus, restartService, ensureAdminSecrets