@oussema_mili/test-pkg-123 1.1.43 → 1.1.45

package/cli-commands.js

@@ -754,7 +754,7 @@ function setupCLICommands(program, startServerFunction) {
 
         console.log("");
 
-        // Agent running status - check daemon first, then fallback to port check
+        // Agent running status - only trust daemon state
         const daemonStatus = getDaemonStatus();
         if (daemonStatus.running) {
           console.log(
@@ -766,15 +766,10 @@ function setupCLICommands(program, startServerFunction) {
             chalk.gray(`   Uptime: ${formatDaemonUptime(daemonStatus.uptime)}`),
           );
         } else {
-          const isRunning = await checkAgentRunning(WS_PORT);
-          if (isRunning) {
-            console.log(chalk.green(`Agent: Running (port ${WS_PORT})`));
-          } else {
-            console.log(chalk.yellow("Agent: Not Running"));
-            console.log(
-              chalk.gray('   Run "fenwave service start" to start the agent'),
-            );
-          }
+          console.log(chalk.yellow("Agent: Not Running"));
+          console.log(
+            chalk.gray('   Run "fenwave service start" to start the agent'),
+          );
         }
 
         console.log("");
@@ -1887,29 +1882,7 @@ function setupCLICommands(program, startServerFunction) {
             formatDaemonUptime(daemonStatus.uptime),
           );
         } else {
-          // Fallback to checking port
-          const isAgentRunning = await checkAgentRunning(WS_PORT);
-          if (isAgentRunning) {
-            try {
-              const agentStartTime = await agentStore.loadAgentStartTime();
-              if (agentStartTime) {
-                const currentTime = Date.now();
-                const agentUptimeMs = currentTime - agentStartTime.getTime();
-                console.log(chalk.blue("Uptime:"), formatUptime(agentUptimeMs));
-              } else {
-                console.log(chalk.blue("Uptime:"), "0 seconds");
-              }
-            } catch (error) {
-              console.log(chalk.blue("Uptime:"), "0 seconds");
-            }
-          } else {
-            console.log(chalk.blue("Status:"), chalk.red("Agent Not Running"));
-            try {
-              await agentStore.clearAgentInfo();
-            } catch (error) {
-              // Ignore cleanup errors
-            }
-          }
+          console.log(chalk.blue("Status:"), chalk.red("Agent Not Running"));
         }
         process.exit(0);
       } catch (error) {

package/containerManager.js

@@ -4,7 +4,7 @@ import path from 'path';
 import chalk from 'chalk';
 import { loadConfig, DEFAULT_WS_PORT, DEFAULT_CONTAINER_PORT } from './store/configStore.js';
 import { getDaemonState } from './store/daemonStore.js';
-import { findAvailableContainerPort } from './utils/portUtils.js';
+import { findAvailableContainerPort, isPortAvailable } from './utils/portUtils.js';
 
 // Load static configuration (ports are resolved dynamically)
 const config = loadConfig();
@@ -176,13 +176,24 @@ class ContainerManager {
       // If containerPort is 0, find an available port
       if (APP_PORT === 0) {
         try {
-          APP_PORT = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT);
+          APP_PORT = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
           console.log(chalk.blue(`📍 Auto-assigned container port: ${APP_PORT}`));
         } catch (error) {
           throw new Error(`Failed to find available container port: ${error.message}`);
         }
       }
 
+      // If the desired container port conflicts with the WebSocket port or is unavailable, pick another port
+      if (APP_PORT === WS_PORT || !(await isPortAvailable(APP_PORT))) {
+        try {
+          const newPort = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
+          console.log(chalk.yellow(`⚠️  Port ${APP_PORT} is unavailable. Using ${newPort} instead.`));
+          APP_PORT = newPort;
+        } catch (err) {
+          throw new Error(`Failed to resolve container port conflict: ${err.message}`);
+        }
+      }
+
       // Check Docker availability
       const dockerAvailable = await this.checkDockerAvailable();
       if (!dockerAvailable) {

package/daemon/agentRunner.js

@@ -313,21 +313,6 @@ export async function runAgent(options = {}) {
   // Initialize registry store
   await registryStore.initialize();
 
-  // Start container with dynamic ports
-  log('Starting container...');
-  let actualContainerPort = preferredContainerPort;
-  try {
-    actualContainerPort = await containerManager.startContainer({
-      wsPort: actualPort,
-      containerPort: preferredContainerPort,
-    });
-    log(`Container started successfully on port ${actualContainerPort}`);
-  } catch (containerError) {
-    log(`Failed to start container: ${containerError.message}`, 'warn');
-    log('Starting agent without container...');
-    actualContainerPort = preferredContainerPort || DEFAULT_CONTAINER_PORT;
-  }
-
   // Create HTTP server with download endpoint handler
   const agentId = uuidv4();
   const existingWsToken = readWsToken();
@@ -401,14 +386,14 @@ export async function runAgent(options = {}) {
         // Initialize agent start time
         await initializeAgentStartTime();
 
-        // Save daemon state
+        // Save daemon pid and preliminary state (containerPort updated after container start)
         saveDaemonPid(process.pid);
         saveDaemonState({
           pid: process.pid,
           port: actualPort,
-          containerPort: actualContainerPort,
+          containerPort: null,
           startTime: new Date().toISOString(),
-          status: 'running',
+          status: 'starting',
           userEntityRef: session.userEntityRef,
           isDaemon,
         });
@@ -442,10 +427,30 @@ export async function runAgent(options = {}) {
           pollInterval,
         };
 
+        // Now that WebSocket is bound, start container (so it cannot take the WS port)
+        log('Starting container (after WebSocket bind)...');
+        let actualContainerPort = preferredContainerPort;
+        try {
+          actualContainerPort = await containerManager.startContainer({
+            wsPort: actualPort,
+            containerPort: preferredContainerPort,
+          });
+          log(`Container started successfully on port ${actualContainerPort}`);
+        } catch (containerError) {
+          log(`Failed to start container: ${containerError.message}`, 'warn');
+          log('Continuing without container...');
+          actualContainerPort = preferredContainerPort || DEFAULT_CONTAINER_PORT;
+        }
+
+        // Update daemon state now that containerPort is known
+        updateDaemonState({
+          port: actualPort,
+          containerPort: actualContainerPort,
+          status: 'running',
+        });
+
         // Display startup info
-        console.log(
-          chalk.green('\n' + '='.repeat(66))
-        );
+        console.log(chalk.green('\n' + '='.repeat(66)));
         console.log(chalk.green('  Fenwave Agent Started Successfully'));
         console.log(chalk.green('='.repeat(66) + '\n'));
         console.log(chalk.white('  Fenwave DevApp Dashboard:'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oussema_mili/test-pkg-123",
-  "version": "1.1.43",
+  "version": "1.1.45",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",

package/utils/portUtils.js

@@ -62,8 +62,15 @@ export async function isPortInUse(port) {
  * @param {number} maxAttempts - Maximum number of ports to try (default: 10)
  * @returns {Promise<number>} Available port number
  */
-export async function findAvailableContainerPort(startPort = DEFAULT_CONTAINER_PORT, maxAttempts = 10) {
-  return findAvailablePort(startPort, maxAttempts);
+export async function findAvailableContainerPort(startPort = DEFAULT_CONTAINER_PORT, maxAttempts = 100, excludePorts = []) {
+  for (let i = 0; i < maxAttempts; i++) {
+    const port = startPort + i;
+    if (excludePorts && excludePorts.includes(port)) continue;
+    if (await isPortAvailable(port)) {
+      return port;
+    }
+  }
+  throw new Error(`No available container port found in range ${startPort}-${startPort + maxAttempts - 1}`);
 }
 
 /**