4runr-os 2.10.8 → 2.10.10

package/apps/gateway/package-lock.json

@@ -875,9 +875,9 @@
       }
     },
     "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.20",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.20.tgz",
-      "integrity": "sha512-MDcUfroaMAnDAHn29vN781t0wudR8zjfgg+r3s5otx8TJXFWg01NZB7HvHkBbOf7UUmKEwIZf5kHxiaVUgwjlQ==",
+      "version": "3.972.21",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.21.tgz",
+      "integrity": "sha512-qxNiHUtlrsjTeSlrPWiFkWps7uD6YB4eKzg7eLAFH8jbiHTlt0ePNlo2Xu+WlftP38JIcMaIX4jTUjOlE2ySWw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@nodable/entities": "2.1.0",
@@ -3207,9 +3207,9 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.6.tgz",
-      "integrity": "sha512-5zhmo2AkstmM/RMKYP0NHfmuYWBR+/umlmSuALgajLxf0X0rLE6d17MfzTxpzkILWVhwvCJkCyPH0AfMlbaucQ==",
+      "version": "4.5.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.7.tgz",
+      "integrity": "sha512-bRt6ZImqVSeTk39Nm81K20ObIiAZ3WefY7G6+iz/0tZjs4dgRRjvRX2sgsH+zi6iDCRR/aQvQofLKxxz4rPBZg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/core": "^3.23.17",
@@ -3219,7 +3219,7 @@
         "@smithy/smithy-client": "^4.12.13",
         "@smithy/types": "^4.14.1",
         "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-retry": "^4.3.5",
+        "@smithy/util-retry": "^4.3.6",
         "@smithy/uuid": "^1.1.2",
         "tslib": "^2.6.2"
       },
@@ -3562,9 +3562,9 @@
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.5.tgz",
-      "integrity": "sha512-h1IJsbgMDA+jaTjrco/JsyfWOgHRJBv8myB1y4AEI2fjIzD6ktZ7pFAyTw+gwN9GKIAygvC6db0mq0j8N2rFOg==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.6.tgz",
+      "integrity": "sha512-p6/FO1n2KxMeQyna067i0uJ6TSbb165ZhnRtCpWh4Foxqbfc6oW+XITaL8QkFJj3KFnDe2URt4gOhgU06EP9ew==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/service-error-classification": "^4.3.1",
@@ -4376,9 +4376,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.23",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.23.tgz",
-      "integrity": "sha512-xwVXGqevyKPsiuQdLj+dZMVjidjJV508TBqexND5HrF89cGdCYCJFB3qhcxRHSeMctdCfbR1jrxBajhDy7o29g==",
+      "version": "2.10.24",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.24.tgz",
+      "integrity": "sha512-I2NkZOOrj2XuguvWCK6OVh9GavsNjZjK908Rq3mIBK25+GD8vPX5w2WdxVqnQ7xx3SrZJiCiZFu+/Oz50oSYSA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

package/apps/gateway/src/db/init.ts

@@ -1,289 +1,289 @@
-import { execSync } from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
-import { PrismaClient } from '@prisma/client';
-import { get4RunrDataDir } from '@4runr/shared';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-import {
-  isDockerAvailable,
-  isDockerRunning,
-  areContainersRunning,
-  startDockerCompose,
-  waitForHealthy,
-  getDockerStatus
-} from './docker-manager.js';
-
-/**
- * Database initialization result
- */
-export interface DatabaseInitResult {
-  mode: 'docker' | 'memory';
-  client: PrismaClient | null;
-  databaseUrl?: string;
-  error?: string;
-  warnings?: string[];
-}
-
-/**
- * Initialize database for Gateway
- * Handles Docker auto-start, migrations, and fallback to memory mode
- * 
- * @param logger - Fastify logger or compatible logger
- */
-export async function initializeDatabase(logger: any): Promise<DatabaseInitResult> {
-  const warnings: string[] = [];
-  
-  // Check explicit memory mode
-  const persistenceMode = process.env['GATEWAY_PERSISTENCE'] || 'auto';
-  if (persistenceMode === 'memory') {
-    logger.info('GATEWAY_PERSISTENCE=memory - skipping database initialization');
-    return { mode: 'memory', client: null };
-  }
-  
-  // Check if DATABASE_URL is explicitly provided (e.g., production)
-  if (process.env['DATABASE_URL'] && persistenceMode === 'postgres') {
-    logger.info('Using explicitly configured DATABASE_URL');
-    return await initializeWithExistingDatabase(logger);
-  }
-  
-  // Auto mode: Try Docker-based local database
-  logger.info('Checking Docker availability for local database...');
-  
-  const dockerStatus = await getDockerStatus();
-  
-  if (!dockerStatus.available) {
-    logger.warn('⚠️  Docker not available. Falling back to memory-only mode.');
-    warnings.push('Docker not installed - install Docker Desktop to enable persistent storage');
-    return { mode: 'memory', client: null, warnings };
-  }
-  
-  if (!dockerStatus.running) {
-    logger.warn('⚠️  Docker daemon not running. Falling back to memory-only mode.');
-    warnings.push('Docker is installed but not running - start Docker Desktop to enable persistent storage');
-    return { mode: 'memory', client: null, warnings };
-  }
-  
-  // Docker is available - proceed with container startup
-  try {
-    const containersRunning = await areContainersRunning();
-    
-    if (!containersRunning) {
-      logger.info('Starting 4Runr Docker containers...');
-      await startDockerContainers(logger);
-      logger.info('✓ Docker containers started');
-    } else {
-      logger.info('✓ Docker containers already running');
-    }
-    
-    // Wait for containers to be healthy
-    logger.info('Waiting for database to be ready...');
-    await waitForHealthy('4runr-postgres', 60000); // 60s for Postgres (first start slower)
-    await waitForHealthy('4runr-redis', 15000);
-    logger.info('✓ Database containers healthy');
-    
-    // Build DATABASE_URL and REDIS_URL for local Docker setup (localhost not 'postgres' hostname)
-    const databaseUrl = 'postgresql://4runr:4runr_dev_pass@localhost:5432/4runr_local';
-    const redisUrl = 'redis://localhost:6379';
-    
-    // Set environment variables so Redis client can connect when first requested
-    process.env['DATABASE_URL'] = databaseUrl;
-    process.env['REDIS_URL'] = redisUrl;
-    
-    // Run migrations
-    logger.info('Running database migrations...');
-    await runMigrations(databaseUrl, logger);
-    logger.info('✓ Migrations complete');
-    
-    // Create Prisma client
-    const client = new PrismaClient({
-      datasources: {
-        db: {
-          url: databaseUrl
-        }
-      },
-      log: [
-        { level: 'warn', emit: 'event' },
-        { level: 'error', emit: 'event' }
-      ]
-    });
-    
-    // Wire up Prisma logs to Fastify logger
-    client.$on('warn', (e: any) => logger.warn({ prisma: true }, e.message));
-    client.$on('error', (e: any) => logger.error({ prisma: true }, e.message));
-    
-    // Test connection
-    await client.$connect();
-    logger.info('✓ Database connection established');
-    
-    return {
-      mode: 'docker',
-      client,
-      databaseUrl
-    };
-    
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    logger.error({ err }, 'Failed to initialize Docker database');
-    logger.warn('⚠️  Falling back to memory-only mode');
-    
-    return {
-      mode: 'memory',
-      client: null,
-      error: errorMsg,
-      warnings: ['Database initialization failed - running in memory-only mode', errorMsg]
-    };
-  }
-}
-
-/**
- * Initialize with an existing database (production mode)
- */
-async function initializeWithExistingDatabase(logger: any): Promise<DatabaseInitResult> {
-  try {
-    const databaseUrl = process.env['DATABASE_URL']!;
-    
-    // Run migrations
-    logger.info('Running database migrations...');
-    await runMigrations(databaseUrl, logger);
-    logger.info('✓ Migrations complete');
-    
-    // Create Prisma client
-    const client = new PrismaClient({
-      log: [
-        { level: 'warn', emit: 'event' },
-        { level: 'error', emit: 'event' }
-      ]
-    });
-    
-    client.$on('warn', (e: any) => logger.warn({ prisma: true }, e.message));
-    client.$on('error', (e: any) => logger.error({ prisma: true }, e.message));
-    
-    await client.$connect();
-    logger.info('✓ Database connection established');
-    
-    return {
-      mode: 'docker', // Could be 'postgres' but we use 'docker' as generic DB mode
-      client,
-      databaseUrl
-    };
-    
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    logger.error({ err }, 'Failed to connect to database');
-    
-    return {
-      mode: 'memory',
-      client: null,
-      error: errorMsg,
-      warnings: ['Database connection failed - running in memory-only mode', errorMsg]
-    };
-  }
-}
-
-/**
- * Start Docker containers
- */
-async function startDockerContainers(logger: any): Promise<void> {
-  // Get user data directory
-  const dataDir = get4RunrDataDir();
-  const composeFilePath = path.join(dataDir, 'docker-compose.yml');
-  
-  // Copy docker-compose template if not exists
-  if (!fs.existsSync(composeFilePath)) {
-    // Try multiple possible template locations
-    const possiblePaths = [
-      path.join(__dirname, '../../docker-compose.local.yml'),  // dist/apps/gateway/src/db -> apps/gateway
-      path.join(__dirname, '../../../docker-compose.local.yml'),  // nested build output
-      path.join(__dirname, '../../../../docker-compose.local.yml'),  // even more nested
-      path.join(process.cwd(), 'apps/gateway/docker-compose.local.yml'),  // from repo root
-      path.join(process.cwd(), 'docker-compose.local.yml'),  // vendored in os-cli
-    ];
-    
-    let templatePath: string | null = null;
-    for (const tryPath of possiblePaths) {
-      if (fs.existsSync(tryPath)) {
-        templatePath = tryPath;
-        logger.info(`Found Docker Compose template at ${tryPath}`);
-        break;
-      }
-    }
-    
-    if (!templatePath) {
-      throw new Error(`Docker Compose template not found. Tried: ${possiblePaths.join(', ')}`);
-    }
-    
-    logger.info(`Copying Docker Compose template to ${composeFilePath}`);
-    fs.copyFileSync(templatePath, composeFilePath);
-  }
-  
-  // Start containers
-  await startDockerCompose(composeFilePath);
-}
-
-/**
- * Run Prisma migrations
- */
-async function runMigrations(databaseUrl: string, logger: any): Promise<void> {
-  // dist/src/db -> monorepo root: ../../../../../prisma. Also support global 4runr-os (cwd often apps/gateway).
-  const candidates = [
-    path.join(process.cwd(), '..', '..', 'prisma', 'schema.prisma'),
-    path.join(__dirname, '../../../../../prisma/schema.prisma'),
-    path.join(__dirname, '../../../../prisma/schema.prisma'),
-    path.join(__dirname, '../../../prisma/schema.prisma'),
-    path.join(process.cwd(), 'prisma', 'schema.prisma'),
-  ];
-  let actualSchemaPath: string | null = null;
-  for (const p of candidates) {
-    if (fs.existsSync(p)) {
-      actualSchemaPath = p;
-      break;
-    }
-  }
-  if (!actualSchemaPath) {
-    logger.warn(
-      `⚠️  Prisma schema not found (tried ${candidates.length} locations relative to Gateway), skipping migrations`,
-    );
-    return;
-  }
-  
-  try {
-    // For local Docker Postgres, use db push to avoid migration compatibility
-    // (migrations were created for SQLite, need Postgres-native approach)
-    const isLocalDocker = databaseUrl.includes('localhost:5432');
-    const command = isLocalDocker 
-      ? `npx prisma db push --skip-generate --accept-data-loss`
-      : `npx prisma migrate deploy`;
-    
-    execSync(command, {
-      env: {
-        ...process.env,
-        DATABASE_URL: databaseUrl
-      },
-      cwd: path.dirname(actualSchemaPath),
-      stdio: 'pipe', // Suppress output unless error
-      timeout: 60000 // 60 seconds
-    });
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    logger.error(`Migration failed: ${errorMsg}`);
-    throw new Error(`Database migration failed: ${errorMsg}`);
-  }
-}
-
-/**
- * Cleanup function for graceful shutdown
- */
-export async function shutdownDatabase(client: PrismaClient | null, logger: any): Promise<void> {
-  if (client) {
-    try {
-      await client.$disconnect();
-      logger.info('✓ Database connection closed');
-    } catch (err) {
-      logger.error({ err }, 'Error disconnecting from database');
-    }
-  }
-}
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+import { PrismaClient } from '@prisma/client';
+import { get4RunrDataDir } from '@4runr/shared';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+import {
+  isDockerAvailable,
+  isDockerRunning,
+  areContainersRunning,
+  startDockerCompose,
+  waitForHealthy,
+  getDockerStatus
+} from './docker-manager.js';
+
+/**
+ * Database initialization result
+ */
+export interface DatabaseInitResult {
+  mode: 'docker' | 'memory';
+  client: PrismaClient | null;
+  databaseUrl?: string;
+  error?: string;
+  warnings?: string[];
+}
+
+/**
+ * Initialize database for Gateway
+ * Handles Docker auto-start, migrations, and fallback to memory mode
+ * 
+ * @param logger - Fastify logger or compatible logger
+ */
+export async function initializeDatabase(logger: any): Promise<DatabaseInitResult> {
+  const warnings: string[] = [];
+  
+  // Check explicit memory mode
+  const persistenceMode = process.env['GATEWAY_PERSISTENCE'] || 'auto';
+  if (persistenceMode === 'memory') {
+    logger.info('GATEWAY_PERSISTENCE=memory - skipping database initialization');
+    return { mode: 'memory', client: null };
+  }
+  
+  // Check if DATABASE_URL is explicitly provided (e.g., production)
+  if (process.env['DATABASE_URL'] && persistenceMode === 'postgres') {
+    logger.info('Using explicitly configured DATABASE_URL');
+    return await initializeWithExistingDatabase(logger);
+  }
+  
+  // Auto mode: Try Docker-based local database
+  logger.info('Checking Docker availability for local database...');
+  
+  const dockerStatus = await getDockerStatus();
+  
+  if (!dockerStatus.available) {
+    logger.warn('⚠️  Docker not available. Falling back to memory-only mode.');
+    warnings.push('Docker not installed - install Docker Desktop to enable persistent storage');
+    return { mode: 'memory', client: null, warnings };
+  }
+  
+  if (!dockerStatus.running) {
+    logger.warn('⚠️  Docker daemon not running. Falling back to memory-only mode.');
+    warnings.push('Docker is installed but not running - start Docker Desktop to enable persistent storage');
+    return { mode: 'memory', client: null, warnings };
+  }
+  
+  // Docker is available - proceed with container startup
+  try {
+    const containersRunning = await areContainersRunning();
+    
+    if (!containersRunning) {
+      logger.info('Starting 4Runr Docker containers...');
+      await startDockerContainers(logger);
+      logger.info('✓ Docker containers started');
+    } else {
+      logger.info('✓ Docker containers already running');
+    }
+    
+    // Wait for containers to be healthy
+    logger.info('Waiting for database to be ready...');
+    await waitForHealthy('4runr-postgres', 60000); // 60s for Postgres (first start slower)
+    await waitForHealthy('4runr-redis', 15000);
+    logger.info('✓ Database containers healthy');
+    
+    // Build DATABASE_URL and REDIS_URL for local Docker setup (localhost not 'postgres' hostname)
+    const databaseUrl = 'postgresql://4runr:4runr_dev_pass@localhost:5432/4runr_local';
+    const redisUrl = 'redis://localhost:6379';
+    
+    // Set environment variables so Redis client can connect when first requested
+    process.env['DATABASE_URL'] = databaseUrl;
+    process.env['REDIS_URL'] = redisUrl;
+    
+    // Run migrations
+    logger.info('Running database migrations...');
+    await runMigrations(databaseUrl, logger);
+    logger.info('✓ Migrations complete');
+    
+    // Create Prisma client
+    const client = new PrismaClient({
+      datasources: {
+        db: {
+          url: databaseUrl
+        }
+      },
+      log: [
+        { level: 'warn', emit: 'event' },
+        { level: 'error', emit: 'event' }
+      ]
+    });
+    
+    // Wire up Prisma logs to Fastify logger
+    client.$on('warn', (e: any) => logger.warn({ prisma: true }, e.message));
+    client.$on('error', (e: any) => logger.error({ prisma: true }, e.message));
+    
+    // Test connection
+    await client.$connect();
+    logger.info('✓ Database connection established');
+    
+    return {
+      mode: 'docker',
+      client,
+      databaseUrl
+    };
+    
+  } catch (err) {
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    logger.error({ err }, 'Failed to initialize Docker database');
+    logger.warn('⚠️  Falling back to memory-only mode');
+    
+    return {
+      mode: 'memory',
+      client: null,
+      error: errorMsg,
+      warnings: ['Database initialization failed - running in memory-only mode', errorMsg]
+    };
+  }
+}
+
+/**
+ * Initialize with an existing database (production mode)
+ */
+async function initializeWithExistingDatabase(logger: any): Promise<DatabaseInitResult> {
+  try {
+    const databaseUrl = process.env['DATABASE_URL']!;
+    
+    // Run migrations
+    logger.info('Running database migrations...');
+    await runMigrations(databaseUrl, logger);
+    logger.info('✓ Migrations complete');
+    
+    // Create Prisma client
+    const client = new PrismaClient({
+      log: [
+        { level: 'warn', emit: 'event' },
+        { level: 'error', emit: 'event' }
+      ]
+    });
+    
+    client.$on('warn', (e: any) => logger.warn({ prisma: true }, e.message));
+    client.$on('error', (e: any) => logger.error({ prisma: true }, e.message));
+    
+    await client.$connect();
+    logger.info('✓ Database connection established');
+    
+    return {
+      mode: 'docker', // Could be 'postgres' but we use 'docker' as generic DB mode
+      client,
+      databaseUrl
+    };
+    
+  } catch (err) {
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    logger.error({ err }, 'Failed to connect to database');
+    
+    return {
+      mode: 'memory',
+      client: null,
+      error: errorMsg,
+      warnings: ['Database connection failed - running in memory-only mode', errorMsg]
+    };
+  }
+}
+
+/**
+ * Start Docker containers
+ */
+async function startDockerContainers(logger: any): Promise<void> {
+  // Get user data directory
+  const dataDir = get4RunrDataDir();
+  const composeFilePath = path.join(dataDir, 'docker-compose.yml');
+  
+  // Copy docker-compose template if not exists
+  if (!fs.existsSync(composeFilePath)) {
+    // Try multiple possible template locations
+    const possiblePaths = [
+      path.join(__dirname, '../../docker-compose.local.yml'),  // dist/apps/gateway/src/db -> apps/gateway
+      path.join(__dirname, '../../../docker-compose.local.yml'),  // nested build output
+      path.join(__dirname, '../../../../docker-compose.local.yml'),  // even more nested
+      path.join(process.cwd(), 'apps/gateway/docker-compose.local.yml'),  // from repo root
+      path.join(process.cwd(), 'docker-compose.local.yml'),  // vendored in os-cli
+    ];
+    
+    let templatePath: string | null = null;
+    for (const tryPath of possiblePaths) {
+      if (fs.existsSync(tryPath)) {
+        templatePath = tryPath;
+        logger.info(`Found Docker Compose template at ${tryPath}`);
+        break;
+      }
+    }
+    
+    if (!templatePath) {
+      throw new Error(`Docker Compose template not found. Tried: ${possiblePaths.join(', ')}`);
+    }
+    
+    logger.info(`Copying Docker Compose template to ${composeFilePath}`);
+    fs.copyFileSync(templatePath, composeFilePath);
+  }
+  
+  // Start containers
+  await startDockerCompose(composeFilePath);
+}
+
+/**
+ * Run Prisma migrations
+ */
+async function runMigrations(databaseUrl: string, logger: any): Promise<void> {
+  // dist/src/db -> monorepo root: ../../../../../prisma. Also support global 4runr-os (cwd often apps/gateway).
+  const candidates = [
+    path.join(process.cwd(), '..', '..', 'prisma', 'schema.prisma'),
+    path.join(__dirname, '../../../../../prisma/schema.prisma'),
+    path.join(__dirname, '../../../../prisma/schema.prisma'),
+    path.join(__dirname, '../../../prisma/schema.prisma'),
+    path.join(process.cwd(), 'prisma', 'schema.prisma'),
+  ];
+  let actualSchemaPath: string | null = null;
+  for (const p of candidates) {
+    if (fs.existsSync(p)) {
+      actualSchemaPath = p;
+      break;
+    }
+  }
+  if (!actualSchemaPath) {
+    logger.warn(
+      `⚠️  Prisma schema not found (tried ${candidates.length} locations relative to Gateway), skipping migrations`,
+    );
+    return;
+  }
+  
+  try {
+    // For local Docker Postgres, use db push to avoid migration compatibility
+    // (migrations were created for SQLite, need Postgres-native approach)
+    const isLocalDocker = databaseUrl.includes('localhost:5432');
+    const command = isLocalDocker 
+      ? `npx prisma db push --skip-generate --accept-data-loss`
+      : `npx prisma migrate deploy`;
+    
+    execSync(command, {
+      env: {
+        ...process.env,
+        DATABASE_URL: databaseUrl
+      },
+      cwd: path.dirname(actualSchemaPath),
+      stdio: 'pipe', // Suppress output unless error
+      timeout: 60000 // 60 seconds
+    });
+  } catch (err) {
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    logger.error(`Migration failed: ${errorMsg}`);
+    throw new Error(`Database migration failed: ${errorMsg}`);
+  }
+}
+
+/**
+ * Cleanup function for graceful shutdown
+ */
+export async function shutdownDatabase(client: PrismaClient | null, logger: any): Promise<void> {
+  if (client) {
+    try {
+      await client.$disconnect();
+      logger.info('✓ Database connection closed');
+    } catch (err) {
+      logger.error({ err }, 'Error disconnecting from database');
+    }
+  }
+}