sam-coder-cli 1.0.25 → 1.0.27

package/bin/agi-cli.js

@@ -752,11 +752,17 @@ async function start() {
 
   // Check for server mode
   if (process.argv.includes('--server')) {
-    const MultiplayerServer = require('./multiplayer-server');
-    const server = new MultiplayerServer(8080);
-    server.start();
-    console.log('Multiplayer server started on ws://localhost:8080');
-    return;
+    try {
+      const port = parseInt(process.argv[process.argv.indexOf('--port') + 1]) || 8080;
+      const MultiplayerServer = require('./multiplayer-server');
+      const server = new MultiplayerServer(port);
+      await server.start();
+      console.log(`Multiplayer server started on ws://localhost:${server.port}`);
+      return;
+    } catch (error) {
+      console.error('Failed to start multiplayer server:', error.message);
+      process.exit(1);
+    }
   }
 
   try {

package/bin/multiplayer-server.js

@@ -1,6 +1,34 @@
 const WebSocket = require('ws');
 const http = require('http');
+const net = require('net');
 const uuid = require('uuid');
+const chalk = require('chalk');
+
+async function findAvailablePort(startPort = 8080, maxAttempts = 10) {
+  let port = startPort;
+  let attempts = 0;
+  
+  while (attempts < maxAttempts) {
+    const inUse = await new Promise((resolve) => {
+      const server = net.createServer()
+        .once('error', () => resolve(true))
+        .once('listening', () => {
+          server.close();
+          resolve(false);
+        })
+        .listen(port);
+    });
+    
+    if (!inUse) {
+      return port;
+    }
+    
+    port++;
+    attempts++;
+  }
+  
+  throw new Error(`Could not find an available port after ${maxAttempts} attempts`);
+}
 
 class MultiplayerServer {
   constructor(port = 8080) {
@@ -8,34 +36,109 @@ class MultiplayerServer {
     this.sessions = new Map();
     this.clients = new Map();
     this.tasks = new Map();
-    this.server = new WebSocket.Server({ port });
-    this.setupEventHandlers();
+    this.httpServer = null;
+    this.wss = null;
+  }
+  
+  async start() {
+    try {
+      this.port = await findAvailablePort(this.port);
+      
+      // Create HTTP server
+      this.httpServer = http.createServer();
+      
+      // Create WebSocket server
+      this.wss = new WebSocket.Server({ server: this.httpServer });
+      
+      // Setup event handlers
+      this.setupEventHandlers();
+      
+      // Start listening
+      return new Promise((resolve, reject) => {
+        this.httpServer.on('error', (error) => {
+          console.error(chalk.red('HTTP server error:'), error);
+          reject(error);
+        });
+        
+        this.httpServer.listen(this.port, () => {
+          console.log(chalk.green(`Multiplayer server started on port ${this.port}`));
+          resolve(this.port);
+        });
+      });
+    } catch (error) {
+      console.error(chalk.red('Failed to start multiplayer server:'), error.message);
+      throw error;
+    }
+  }
+
+  static async startAsChildProcess(port = 8080) {
+    const { spawn } = require('child_process');
+    const serverProcess = spawn('node', [__filename, '--port', port.toString()], {
+      detached: true,
+      stdio: 'inherit',
+      windowsHide: true
+    });
+    
+    serverProcess.on('error', (error) => {
+      console.error('Failed to start server process:', error);
+    });
+    
+    serverProcess.unref();
+    console.log(`Multiplayer server starting on port ${port}...`);
+    return serverProcess;
   }
 
   setupEventHandlers() {
-    this.server.on('connection', (ws) => {
+    if (!this.wss) {
+      throw new Error('WebSocket server not initialized');
+    }
+
+    this.wss.on('connection', (ws) => {
       let clientId = uuid.v4();
       let sessionId = null;
       let clientInfo = {};
 
-      ws.on('message', (message) => {
-        this.handleMessage(ws, message);
+      // Store client
+      this.clients.set(clientId, { ws, clientInfo });
+
+      ws.on('message', (data) => {
+        try {
+          const message = typeof data === 'string' ? JSON.parse(data) : data;
+          this.handleMessage(ws, clientId, message);
+        } catch (error) {
+          console.error('Error processing message:', error);
+        }
       });
 
       ws.on('close', () => {
+        // Remove client from any session
         if (sessionId && this.sessions.has(sessionId)) {
           const session = this.sessions.get(sessionId);
-          delete session.clients[clientId];
-          this.broadcastToSession(sessionId, {
-            type: 'agent_left',
-            clientId,
-            clientInfo
-          });
-
-          if (Object.keys(session.clients).length === 0) {
-            this.sessions.delete(sessionId);
+          if (session && session.clients) {
+            delete session.clients[clientId];
+            
+            // Notify other clients
+            this.broadcastToSession(sessionId, {
+              type: 'agent_left',
+              clientId,
+              clientInfo,
+              timestamp: new Date().toISOString()
+            }, clientId);
+
+            // Clean up empty sessions
+            if (Object.keys(session.clients).length === 0) {
+              this.sessions.delete(sessionId);
+              console.log(`Session ${sessionId} ended (no clients)`);
+            }
           }
         }
+
+        // Remove client from clients map
+        this.clients.delete(clientId);
+      });
+
+      ws.on('error', (error) => {
+        console.error('WebSocket error:', error);
       });
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {