sam-coder-cli 1.0.23 → 1.0.25

package/bin/multiplayer-client.js

@@ -272,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) {
@@ -675,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/package.json

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