@aifabrix/builder 2.5.2 → 2.5.3

package/.markdownlint.json

@@ -0,0 +1,14 @@
+{
+  "default": true,
+  "MD007": false,
+  "MD012": false,
+  "MD013": false,
+  "MD022": false,
+  "MD024": { "siblings_only": true },
+  "MD029": false,
+  "MD031": false,
+  "MD032": false,
+  "MD033": false,
+  "MD041": false
+}
+

package/lib/infra.js

@@ -107,24 +107,42 @@ async function ensureAdminSecrets() {
   return adminSecretsPath;
 }
 
+/**
+ * Generates pgAdmin4 configuration files (servers.json and pgpass)
+ * @param {string} infraDir - Infrastructure directory path
+ * @param {string} postgresPassword - PostgreSQL password
+ */
+function generatePgAdminConfig(infraDir, postgresPassword) {
+  const serversJsonTemplatePath = path.join(__dirname, '..', 'templates', 'infra', 'servers.json.hbs');
+  if (!fs.existsSync(serversJsonTemplatePath)) {
+    return;
+  }
+
+  const serversJsonTemplateContent = fs.readFileSync(serversJsonTemplatePath, 'utf8');
+  const serversJsonTemplate = handlebars.compile(serversJsonTemplateContent);
+  const serversJsonContent = serversJsonTemplate({ postgresPassword });
+  const serversJsonPath = path.join(infraDir, 'servers.json');
+  fs.writeFileSync(serversJsonPath, serversJsonContent, { mode: 0o644 });
+
+  const pgpassContent = `postgres:5432:postgres:pgadmin:${postgresPassword}\n`;
+  const pgpassPath = path.join(infraDir, 'pgpass');
+  fs.writeFileSync(pgpassPath, pgpassContent, { mode: 0o600 });
+}
+
 async function startInfra(developerId = null) {
   await checkDockerAvailability();
   const adminSecretsPath = await ensureAdminSecrets();
 
-  // Get developer ID from parameter or config
   const devId = developerId || await config.getDeveloperId();
-  // Convert to number for getDevPorts (it expects numbers)
   const devIdNum = typeof devId === 'string' ? parseInt(devId, 10) : devId;
   const ports = devConfig.getDevPorts(devIdNum);
   const idNum = devIdNum;
 
-  // Load compose template (Handlebars)
   const templatePath = path.join(__dirname, '..', 'templates', 'infra', 'compose.yaml.hbs');
   if (!fs.existsSync(templatePath)) {
     throw new Error(`Compose template not found: ${templatePath}`);
   }
 
-  // Create infra directory in AIFABRIX_HOME with dev ID
   const aifabrixDir = paths.getAifabrixHome();
   const infraDirName = getInfraDirName(devId);
   const infraDir = path.join(aifabrixDir, infraDirName);
@@ -132,8 +150,11 @@ async function startInfra(developerId = null) {
     fs.mkdirSync(infraDir, { recursive: true });
   }
 
-  // Generate compose file from template
-  // Register helper right before compiling to ensure it's available
+  const adminSecretsContent = fs.readFileSync(adminSecretsPath, 'utf8');
+  const postgresPasswordMatch = adminSecretsContent.match(/^POSTGRES_PASSWORD=(.+)$/m);
+  const postgresPassword = postgresPasswordMatch ? postgresPasswordMatch[1] : '';
+  generatePgAdminConfig(infraDir, postgresPassword);
+
   handlebars.registerHelper('eq', (a, b) => {
     if (a === null || a === undefined) a = '0';
     if (b === null || b === undefined) b = '0';
@@ -146,19 +167,20 @@ async function startInfra(developerId = null) {
   });
   const templateContent = fs.readFileSync(templatePath, 'utf8');
   const template = handlebars.compile(templateContent);
-  // Dev 0: infra-aifabrix-network, Dev > 0: infra-dev{id}-aifabrix-network
   const networkName = idNum === 0 ? 'infra-aifabrix-network' : `infra-dev${devId}-aifabrix-network`;
-  // Pass string devId to preserve leading zeros (e.g., "01") in container names
-  // The eq helper will handle numeric comparisons correctly
+  const serversJsonPath = path.join(infraDir, 'servers.json');
+  const pgpassPath = path.join(infraDir, 'pgpass');
   const composeContent = template({
     devId: devId,
     postgresPort: ports.postgres,
     redisPort: ports.redis,
     pgadminPort: ports.pgadmin,
     redisCommanderPort: ports.redisCommander,
-    networkName: networkName
+    networkName: networkName,
+    serversJsonPath: serversJsonPath,
+    pgpassPath: pgpassPath,
+    infraDir: infraDir
   });
-
   const composePath = path.join(infraDir, 'compose.yaml');
   fs.writeFileSync(composePath, composeContent);
 
@@ -170,6 +192,22 @@ async function startInfra(developerId = null) {
     await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" up -d`, { cwd: infraDir });
     logger.log('Infrastructure services started successfully');
 
+    // Copy pgAdmin4 config files into container after it starts
+    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)');
+    }
+
     await waitForServices(devId);
     logger.log('All services are healthy and ready');
   } finally {
@@ -431,64 +469,25 @@ async function getAppStatus() {
   const apps = [];
 
   try {
-    // Find all containers with pattern
-    // Dev 0: aifabrix-* (but exclude infrastructure containers)
-    // Dev > 0: aifabrix-dev{id}-*
     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() !== '');
-
-    // Infrastructure container names to exclude
-    // Dev 0: aifabrix-{serviceName}, Dev > 0: aifabrix-dev{id}-{serviceName}
     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`
-      ];
-
+      ? ['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');
-
-      // Skip infrastructure containers
-      if (infraContainers.includes(containerName)) {
-        continue;
-      }
-
-      // Extract app name from container name
-      // Dev 0: aifabrix-{appName}, Dev > 0: aifabrix-dev{id}-{appName}
-      const pattern = devId === 0
-        ? /^aifabrix-(.+)$/
-        : new RegExp(`^aifabrix-dev${devId}-(.+)$`);
+      if (infraContainers.includes(containerName)) continue;
+      const pattern = devId === 0 ? /^aifabrix-(.+)$/ : new RegExp(`^aifabrix-dev${devId}-(.+)$`);
       const appNameMatch = containerName.match(pattern);
-      if (!appNameMatch) {
-        continue;
-      }
-
+      if (!appNameMatch) continue;
       const appName = appNameMatch[1];
-
-      // Extract host port from ports string (e.g., "0.0.0.0:3100->3000/tcp")
       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
-      });
+      apps.push({ name: appName, container: containerName, port: ports, status: status.trim(), url: url });
     }
   } catch (error) {
-    // If no containers found, return empty array
     return [];
   }
 

package/lib/secrets.js

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

package/package.json

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

package/templates/infra/compose.yaml.hbs

@@ -53,10 +53,24 @@ services:
       PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
       PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
       PGADMIN_CONFIG_SERVER_MODE: 'False'
+      PGADMIN_SERVER_JSON_FILE: /pgadmin4/servers.json
+      PGPASSFILE: /pgpass
     ports:
       - "{{pgadminPort}}:80"
     volumes:
       - {{#if (eq devId 0)}}pgadmin_data{{else}}dev{{devId}}_pgadmin_data{{/if}}:/var/lib/pgadmin
+      - {{infraDir}}:/host-config:ro
+    command: >
+      sh -c "
+      if [ -f /host-config/servers.json ]; then
+        cp /host-config/servers.json /pgadmin4/servers.json;
+      fi &&
+      if [ -f /host-config/pgpass ]; then
+        cp /host-config/pgpass /pgpass;
+        chmod 600 /pgpass;
+      fi &&
+      /entrypoint.sh
+      "
     restart: unless-stopped
     depends_on:
       postgres:

package/templates/infra/servers.json.hbs

@@ -0,0 +1,21 @@
+{
+  "Servers": {
+    "1": {
+      "Name": "PostgreSQL (pgvector)",
+      "Group": "Servers",
+      "Host": "postgres",
+      "Port": 5432,
+      "MaintenanceDB": "postgres",
+      "Username": "pgadmin",
+      "PassFile": "/pgpass",
+      "SSLMode": "prefer",
+      "Comment": "Auto-registered PostgreSQL server with pgvector extension"
+    }
+  }
+}
+
+
+
+
+
+