sam-coder-cli 1.0.26 → 1.0.28

package/bin/multiplayer-client.js

@@ -695,9 +695,38 @@ class MultiplayerClient extends EventEmitter {
   disconnect() {
     if (this.ws) {
       this.ws.close();
+      this.connected = false;
+      this.ws = null;
+    }
+    if (this.rl) {
+      this.rl.close();
     }
   }
   
+  sendChatMessage(message) {
+    if (!this.connected || !this.ws) {
+      console.error('Not connected to server');
+      return false;
+    }
+    
+    try {
+      const chatMessage = {
+        type: 'chat_message',
+        sessionId: this.sessionId,
+        clientId: this.clientId,
+        sender: this.name,
+        message: message,
+        timestamp: new Date().toISOString()
+      };
+      
+      this.ws.send(JSON.stringify(chatMessage));
+      return true;
+    } catch (error) {
+      console.error('Error sending chat message:', error);
+      return false;
+    }
+  }
+
   getClientName(clientId) {
     if (!clientId) return 'Unknown';
     const client = this.clients.find(c => c.clientId === clientId || c.id === clientId);

package/bin/multiplayer-server.js

@@ -36,16 +36,35 @@ class MultiplayerServer {
     this.sessions = new Map();
     this.clients = new Map();
     this.tasks = new Map();
-    this.server = null;
+    this.httpServer = null;
+    this.wss = null;
   }
   
   async start() {
     try {
       this.port = await findAvailablePort(this.port);
-      this.server = new WebSocket.Server({ port: 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();
-      console.log(chalk.green(`Multiplayer server started on port ${this.port}`));
-      return this.port;
+      
+      // 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;
@@ -70,29 +89,56 @@ class MultiplayerServer {
   }
 
   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.26",
+  "version": "1.0.28",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {