wilfredwake 1.0.5 → 1.0.7

package/bin/cli.js

@@ -14,6 +14,7 @@
 
 import { Command } from 'commander';
 import chalk from 'chalk';
+import fs from 'fs';
 import { initCommand } from '../src/cli/commands/init.js';
 import { statusCommand } from '../src/cli/commands/status.js';
 import { wakeCommand } from '../src/cli/commands/wake.js';
@@ -30,7 +31,16 @@ program
   .description(
     chalk.cyan('🌅 CLI Tool for Multi-Developer Development Environment Wake & Status Management')
   )
-  .version('1.0.0')
+  .version(
+    (() => {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
+        return pkg.version || '0.0.0';
+      } catch (e) {
+        return '0.0.0';
+      }
+    })()
+  )
   .usage(chalk.yellow('[command] [options]'));
 
 // ═══════════════════════════════════════════════════════════════
@@ -59,7 +69,7 @@ program
 program
   .command('status [service]')
   .description(chalk.green('Check status of all services or a specific service'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .option('-f, --format <format>', 'Output format (table, json)', 'table')
   .action(statusCommand);
 
@@ -72,7 +82,7 @@ program
 program
   .command('wake [target]')
   .description(chalk.blue('Wake services on demand (all, <service>, or <group>)'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .option('--no-wait', 'Don\'t wait for services to be ready')
   .option('--timeout <seconds>', 'Timeout for service readiness', '300')
   .action(wakeCommand);
@@ -85,7 +95,7 @@ program
 program
   .command('health [service]')
   .description(chalk.cyan('Check health status of services'))
-  .option('-e, --env <environment>', 'Environment (dev, staging, prod)', 'dev')
+  .option('-e, --env <environment>', 'Environment (dev, staging, prod)')
   .action(healthCommand);
 
 // ═══════════════════════════════════════════════════════════════

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wilfredwake",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "CLI Tool for Multi-Developer Development Environment Wake & Status Management",
   "type": "module",
   "main": "index.js",

package/src/cli/commands/status.js

@@ -126,14 +126,14 @@ function _displayTableStatus(services, environment) {
     const lastWoken = service.lastWakeTime
       ? new Date(service.lastWakeTime).toLocaleString()
       : 'Never';
-
     const cells = [
       chalk.cyan(service.name.padEnd(20)),
       statusColor(service.status.toUpperCase().padEnd(20)),
       chalk.yellow(lastWoken.padEnd(20)),
-      chalk.gray(service.url.substring(0, 20).padEnd(20)),
+      chalk.gray((service.url || '').substring(0, 20).padEnd(20)),
     ];
     console.log(format.tableRow(cells));
+    console.log(''); // Extra spacing between rows for clarity
   });
 
   console.log(''); // Spacing
@@ -158,23 +158,16 @@ function _displaySummary(services) {
 
   const stats = {
     total: services.length,
-    ready: services.filter(s => s.status === 'ready').length,
-    sleeping: services.filter(s => s.status === 'sleeping').length,
+    live: services.filter(s => s.status === 'live').length,
+    dead: services.filter(s => s.status === 'dead').length,
     waking: services.filter(s => s.status === 'waking').length,
     failed: services.filter(s => s.status === 'failed').length,
+    unknown: services.filter(s => s.status === 'unknown').length,
   };
 
   console.log(chalk.magentaBright.bold('Summary'));
   console.log(
-    `  ${colors.status.ready('✓')} Ready: ${colors.status.ready(
-      stats.ready
-    )} | ${colors.status.sleeping('⚫')} Sleeping: ${colors.status.sleeping(
-      stats.sleeping
-    )} | ${colors.status.waking('⟳')} Waking: ${colors.status.waking(
-      stats.waking
-    )} | ${colors.status.failed('✗')} Failed: ${colors.status.failed(
-      stats.failed
-    )}`
+    `  ${colors.status.live('✓')} Live: ${colors.status.live(stats.live)} | ${colors.status.dead('⚫')} Dead: ${colors.status.dead(stats.dead)} | ${colors.status.waking('⟳')} Waking: ${colors.status.waking(stats.waking)} | ${colors.status.failed('✗')} Failed: ${colors.status.failed(stats.failed)} | ${colors.status.unknown('?')} Unknown: ${colors.status.unknown(stats.unknown)}`
   );
   console.log(`  Total: ${stats.total} services\n`);
 }

package/src/cli/commands/wake.js

@@ -82,13 +82,22 @@ export async function wakeCommand(target, options) {
       _displayWakeResults(results);
 
       // ═══════════════════════════════════════════════════════════════
-      // DISPLAY FINAL STATUS
+      // DISPLAY FINAL STATUS AND START MONITORING
       // ═══════════════════════════════════════════════════════════════
       if (shouldWait) {
         _displayFinalStatus(results);
+        
+        // Start 5-minute monitoring period
+        await _monitorServicesForDuration(
+          config.orchestratorUrl,
+          config.token,
+          env,
+          wakeTarget,
+          5 * 60 * 1000 // 5 minutes in milliseconds
+        );
       }
 
-      process.exit(results.success ? 0 : 1);
+      process.exit(0);
     } catch (error) {
       stopSpinner?.();
       throw error;
@@ -180,3 +189,167 @@ function _displayFinalStatus(results) {
 
   console.log('');
 }
+
+/**
+ * Monitor services for a duration and display live status updates
+ * @private
+ * @param {string} orchestratorUrl - Orchestrator URL
+ * @param {string} token - Authorization token
+ * @param {string} env - Environment name
+ * @param {string} wakeTarget - Wake target (all, <service>, or <group>)
+ * @param {number} duration - Duration in milliseconds
+ */
+async function _monitorServicesForDuration(
+  orchestratorUrl,
+  token,
+  env,
+  wakeTarget,
+  duration
+) {
+  const pollInterval = 10000; // Poll every 10 seconds
+  const startTime = Date.now();
+  const endTime = startTime + duration;
+  let pollCount = 0;
+
+  console.log(
+    chalk.magentaBright.bold(
+      `📡 Monitoring services for ${Math.round(duration / 1000)}s...\n`
+    )
+  );
+
+  while (Date.now() < endTime) {
+    pollCount++;
+    const elapsedSeconds = Math.round((Date.now() - startTime) / 1000);
+    
+    try {
+      // Fetch current status from orchestrator
+      const response = await axios.get(
+        `${orchestratorUrl}/api/status`,
+        {
+          params: {
+            environment: env,
+          },
+          timeout: 5000,
+          headers: {
+            Authorization: token ? `Bearer ${token}` : undefined,
+          },
+        }
+      );
+
+      const services = response.data.services || [];
+
+      // Clear screen and display updated status
+      console.clear();
+      console.log(chalk.cyanBright.bold('📡 Live Service Monitoring\n'));
+      console.log(
+        chalk.gray(`Elapsed: ${chalk.yellow(elapsedSeconds)}s / ${Math.round(duration / 1000)}s | Poll #${pollCount}\n`)
+      );
+
+      // Display table with current status
+      _displayLiveMonitoringTable(services, env);
+
+      // Display summary stats
+      _displayLiveMonitoringSummary(services);
+    } catch (error) {
+      console.clear();
+      console.log(chalk.cyanBright.bold('📡 Live Service Monitoring\n'));
+      console.log(
+        chalk.gray(`Elapsed: ${chalk.yellow(elapsedSeconds)}s / ${Math.round(duration / 1000)}s | Poll #${pollCount}\n`)
+      );
+      logger.warn(`Status check failed: ${error.message}`);
+    }
+
+    // Wait before next poll (unless we're at the end)
+    if (Date.now() < endTime) {
+      await new Promise(resolve => setTimeout(resolve, pollInterval));
+    }
+  }
+
+  // Final summary
+  console.clear();
+  console.log(chalk.cyanBright.bold('📡 Monitoring Complete\n'));
+  console.log(chalk.yellow(`Total monitoring duration: ${Math.round(duration / 1000)}s\n`));
+
+  try {
+    // Fetch final status
+    const response = await axios.get(
+      `${orchestratorUrl}/api/status`,
+      {
+        params: {
+          environment: env,
+        },
+        timeout: 5000,
+        headers: {
+          Authorization: token ? `Bearer ${token}` : undefined,
+        },
+      }
+    );
+
+    const services = response.data.services || [];
+    _displayLiveMonitoringTable(services, env);
+    _displayLiveMonitoringSummary(services);
+  } catch (error) {
+    logger.warn(`Could not fetch final status: ${error.message}`);
+  }
+
+  console.log('');
+}
+
+/**
+ * Display live monitoring status table
+ * @private
+ * @param {Array} services - Services array
+ * @param {string} environment - Environment name
+ */
+function _displayLiveMonitoringTable(services, environment) {
+  if (services.length === 0) {
+    logger.info('No services to display.');
+    return;
+  }
+
+  console.log(chalk.cyanBright.bold(`Services (${environment.toUpperCase()})\n`));
+
+  const headers = ['Service', 'Status', 'Last Woken', 'URL'];
+  console.log(format.tableHeader(headers));
+
+  services.forEach((service) => {
+    const statusColor = colors.status[service.status] || colors.status.unknown;
+    const lastWoken = service.lastWakeTime
+      ? new Date(service.lastWakeTime).toLocaleString()
+      : 'Never';
+    const cells = [
+      chalk.cyan(service.name.padEnd(20)),
+      statusColor(service.status.toUpperCase().padEnd(20)),
+      chalk.yellow(lastWoken.padEnd(20)),
+      chalk.gray((service.url || '').substring(0, 20).padEnd(20)),
+    ];
+    console.log(format.tableRow(cells));
+    console.log('');
+  });
+
+  console.log('');
+}
+
+/**
+ * Display live monitoring summary stats
+ * @private
+ * @param {Array} services - Services array
+ */
+function _displayLiveMonitoringSummary(services) {
+  if (services.length === 0) return;
+
+  const stats = {
+    total: services.length,
+    live: services.filter(s => s.status === 'live').length,
+    dead: services.filter(s => s.status === 'dead').length,
+    waking: services.filter(s => s.status === 'waking').length,
+    failed: services.filter(s => s.status === 'failed').length,
+    unknown: services.filter(s => s.status === 'unknown').length,
+  };
+
+  console.log(chalk.magentaBright.bold('Summary'));
+  console.log(
+    `  ${colors.status.live('✓')} Live: ${colors.status.live(stats.live)} | ${colors.status.dead('⚫')} Dead: ${colors.status.dead(stats.dead)} | ${colors.status.waking('⟳')} Waking: ${colors.status.waking(stats.waking)} | ${colors.status.failed('✗')} Failed: ${colors.status.failed(stats.failed)} | ${colors.status.unknown('?')} Unknown: ${colors.status.unknown(stats.unknown)}`
+  );
+  console.log(`  Total: ${stats.total} services\n`);
+}

package/src/orchestrator/orchestrator.js

@@ -283,17 +283,13 @@ export class Orchestrator {
       // ═══════════════════════════════════════════════════════════════
       // DETERMINE STATE FROM STATUS CODE
       // ═══════════════════════════════════════════════════════════════
-      let state = ServiceState.UNKNOWN;
-
-      if (response.status < 300) {
-        state = ServiceState.LIVE;  // Changed from READY
-      } else if (response.status === 503) {
-        state = ServiceState.DEAD;  // Changed from SLEEPING
-      } else if (response.status >= 500) {
-        state = ServiceState.FAILED;
-      } else if (response.status >= 400) {
-        state = ServiceState.UNKNOWN;
-      }
+      // NEW LOGIC: If we get ANY response from the API (2xx, 3xx, 4xx, 5xx),
+      // mark the service as LIVE. This means the service is responsive.
+      // Only mark as FAILED if no response is received at all.
+      let state = ServiceState.LIVE;
+      
+      // If we got a response, the service is responsive = LIVE
+      // No need to check status code, any response means service can be reached
 
       this._logTimestamp(
         service.name,
@@ -316,7 +312,7 @@ export class Orchestrator {
       );
 
       return {
-        state: ServiceState.DEAD,  // Changed: assume dead on error
+        state: ServiceState.DEAD,  // Only dead if no response received
         statusCode: null,
         responseTime,
         error: error.message,