sam-coder-cli 1.0.22 → 1.0.24

package/bin/multiplayer-client.js

@@ -19,12 +19,33 @@ async function isPortInUse(port) {
   });
 }
 
+async function findAvailablePort(startPort = 8080, maxAttempts = 10) {
+  let port = startPort;
+  let attempts = 0;
+  
+  while (attempts < maxAttempts) {
+    const inUse = await isPortInUse(port);
+    if (!inUse) {
+      return port;
+    }
+    port++;
+    attempts++;
+  }
+  throw new Error(`Could not find an available port after ${maxAttempts} attempts`);
+}
+
 async function ensureServerRunning(port = 8080) {
-  const portInUse = await isPortInUse(port);
-  if (!portInUse) {
+  try {
+    const availablePort = await findAvailablePort(port);
+    const isDefaultPort = (availablePort === port);
+    
+    if (!isDefaultPort) {
+      console.log(chalk.yellow(`Port ${port} is in use, trying port ${availablePort}...`));
+    }
+    
     console.log('Starting local multiplayer server...');
     // Start server in a detached process
-    const serverProcess = spawn('node', [__filename, '--server', '--port', port.toString()], {
+    const serverProcess = spawn('node', [__filename, '--server', '--port', availablePort.toString()], {
       detached: true,
       stdio: 'ignore',
       windowsHide: true
@@ -34,9 +55,12 @@ async function ensureServerRunning(port = 8080) {
     
     // Wait for server to start
     await new Promise(resolve => setTimeout(resolve, 1000));
-    console.log('Local multiplayer server started');
+    console.log(chalk.green(`Local multiplayer server started on port ${availablePort}`));
+    return `ws://localhost:${availablePort}`;
+  } catch (error) {
+    console.error(chalk.red('Failed to start multiplayer server:'), error.message);
+    throw error;
   }
-  return `ws://localhost:${port}`;
 }
 
 class MultiplayerServer {
@@ -248,49 +272,78 @@ class MultiplayerClient extends EventEmitter {
   }
 
   async connect() {
-    try {
-      // Ensure server is running
-      this.serverUrl = await ensureServerRunning(this.port);
-      
-      this.ws = new WebSocket(this.serverUrl);
-      
-      this.ws.on('open', () => {
-        this.connected = true;
-        this.emit('connected');
-        console.log(chalk.green('✅ Connected to multiplayer server'));
-        
-        // Send client info immediately after connection
-        this.updateClientInfo({
-          name: this.name,
-          role: this.role,
-          model: this.model
-        });
-      });
-      
-      this.ws.on('message', (data) => {
+    return new Promise((resolve, reject) => {
+      const connectWithRetry = async () => {
         try {
-          const message = JSON.parse(data);
-          this.handleMessage(message);
+          // If no server URL is provided, try to start a local server
+          if (this.serverUrl === 'ws://localhost:8080') {
+            try {
+              this.serverUrl = await ensureServerRunning(8080);
+            } catch (error) {
+              console.error(chalk.red('Failed to start local server:'), error.message);
+              reject(error);
+              return;
+            }
+          }
+          
+          console.log(chalk.blue(`Connecting to ${this.serverUrl}...`));
+          this.ws = new WebSocket(this.serverUrl);
+          
+          const connectionTimeout = setTimeout(() => {
+            this.ws.terminate();
+            reject(new Error('Connection timeout'));
+          }, 10000); // 10 seconds timeout
+          
+          this.ws.on('open', () => {
+            clearTimeout(connectionTimeout);
+            this.connected = true;
+            console.log(chalk.green('✅ Connected to multiplayer server'));
+            
+            // Send client info
+            this.send({
+              type: 'client_info',
+              clientId: this.clientId,
+              name: this.name,
+              role: this.role,
+              model: this.model
+            });
+            
+            this.emit('connected');
+            resolve();
+          });
+          
+          this.ws.on('message', (data) => {
+            try {
+              const message = JSON.parse(data);
+              this.handleMessage(message);
+            } catch (error) {
+              console.error('Error parsing message:', error);
+            }
+          });
+          
+          this.ws.on('close', () => {
+            this.connected = false;
+            this.emit('disconnected');
+            console.log(chalk.yellow('\n🔌 Disconnected from multiplayer server'));
+          });
+          
+          this.ws.on('error', (error) => {
+            clearTimeout(connectionTimeout);
+            console.error('WebSocket error:', error.message);
+            if (!this.connected) {
+              reject(error);
+            }
+            this.emit('error', error);
+          });
+          
         } catch (error) {
-          console.error('Error parsing message:', error);
+          console.error('Connection error:', error.message);
+          reject(error);
         }
-      });
-      
-      this.ws.on('close', () => {
-        this.connected = false;
-        this.emit('disconnected');
-        console.log(chalk.yellow('\n🔌 Disconnected from multiplayer server'));
-      });
-      
-      this.ws.on('error', (error) => {
-        console.error('WebSocket error:', error);
-        this.emit('error', error);
-      });
+      };
       
-    } catch (error) {
-      console.error('Failed to connect to server:', error);
-      this.emit('error', error);
-    }
+      connectWithRetry();
+    });
   }
 
   handleMessage(message) {

package/package.json

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