sam-coder-cli 1.0.24 → 1.0.26

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-client.js

@@ -704,38 +704,91 @@ class MultiplayerClient extends EventEmitter {
     return client ? (client.name || client.clientInfo?.name || 'Unknown') : 'Unknown';
   }
   
-  createSession() {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      throw new Error('Not connected to server');
-    }
-    this.sessionId = uuidv4();
-    this.isHost = true;
-    this.send({
-      type: 'create_session',
-      sessionId: this.sessionId,
-      clientInfo: {
-        name: this.name,
-        role: this.role,
-        model: this.model
+  async createSession() {
+    if (!this.connected) {
+      try {
+        await this.connect();
+      } catch (error) {
+        throw new Error(`Failed to connect to server: ${error.message}`);
       }
+    }
+    
+    return new Promise((resolve, reject) => {
+      this.sessionId = uuidv4();
+      this.isHost = true;
+      
+      const onSessionCreated = (data) => {
+        if (data.sessionId === this.sessionId) {
+          this.off('session_created', onSessionCreated);
+          this.off('error', onError);
+          resolve(this.sessionId);
+        }
+      };
+      
+      const onError = (error) => {
+        this.off('session_created', onSessionCreated);
+        this.off('error', onError);
+        reject(error);
+      };
+      
+      this.once('session_created', onSessionCreated);
+      this.once('error', onError);
+      
+      this.send({
+        type: 'create_session',
+        sessionId: this.sessionId,
+        clientInfo: {
+          name: this.name,
+          role: this.role,
+          model: this.model
+        }
+      });
     });
-    return this.sessionId;
   }
   
-  joinSession(sessionId) {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      throw new Error('Not connected to server');
+  async joinSession(sessionId) {
+    if (!sessionId) {
+      throw new Error('Session ID is required');
     }
-    this.sessionId = sessionId;
-    this.isHost = false;
-    this.send({
-      type: 'join_session',
-      sessionId: this.sessionId,
-      clientInfo: {
-        name: this.name,
-        role: this.role,
-        model: this.model
+    
+    if (!this.connected) {
+      try {
+        await this.connect();
+      } catch (error) {
+        throw new Error(`Failed to connect to server: ${error.message}`);
       }
+    }
+    
+    return new Promise((resolve, reject) => {
+      this.sessionId = sessionId;
+      this.isHost = false;
+      
+      const onSessionJoined = (data) => {
+        if (data.sessionId === this.sessionId) {
+          this.off('session_joined', onSessionJoined);
+          this.off('error', onError);
+          resolve();
+        }
+      };
+      
+      const onError = (error) => {
+        this.off('session_joined', onSessionJoined);
+        this.off('error', onError);
+        reject(error);
+      };
+      
+      this.once('session_joined', onSessionJoined);
+      this.once('error', onError);
+      
+      this.send({
+        type: 'join_session',
+        sessionId: this.sessionId,
+        clientInfo: {
+          name: this.name,
+          role: this.role,
+          model: this.model
+        }
+      });
     });
   }
 }

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,8 +36,37 @@ class MultiplayerServer {
     this.sessions = new Map();
     this.clients = new Map();
     this.tasks = new Map();
-    this.server = new WebSocket.Server({ port });
-    this.setupEventHandlers();
+    this.server = null;
+  }
+  
+  async start() {
+    try {
+      this.port = await findAvailablePort(this.port);
+      this.server = new WebSocket.Server({ port: this.port });
+      this.setupEventHandlers();
+      console.log(chalk.green(`Multiplayer server started on port ${this.port}`));
+      return 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() {

package/package.json

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