vibex-sh 0.9.7 → 0.9.8

package/index.js

@@ -437,19 +437,89 @@ async function main() {
   let reconnectAttempts = 0;
   const maxReconnectDelay = 5000;
 
+  // Connection state management
+  let connectionState = 'disconnected'; // disconnected, connecting, connected, closing, closed
+  let connectionEstablished = false;
+  let connectionLock = false;
+  let connectionStartTime = null;
+
   // Store auth code received from socket
   let receivedAuthCode = authCode;
   
   // Track if this is a new session (not reusing an existing one)
   const isNewSession = !options.sessionId;
 
+  // Graceful shutdown function
+  const closeWebSocket = () => {
+    return new Promise((resolve) => {
+      if (!socket || socket.readyState !== WebSocket.OPEN) {
+        if (connectionState === 'connected' || connectionState === 'closing') {
+          connectionState = 'closed';
+        }
+        resolve();
+        return;
+      }
+      
+      connectionState = 'closing';
+      const closeStartTime = Date.now();
+      console.log('  🔄 Initiating graceful WebSocket close...');
+      
+      const closeTimeout = setTimeout(() => {
+        const elapsed = Date.now() - closeStartTime;
+        console.log(`  ⚠️  Close handshake timeout after ${elapsed}ms, forcing exit`);
+        connectionState = 'closed';
+        resolve();
+      }, 2000);
+      
+      // Store original onclose handler
+      const originalOnClose = socket.onclose;
+      
+      socket.onclose = (event) => {
+        clearTimeout(closeTimeout);
+        const elapsed = Date.now() - closeStartTime;
+        connectionState = 'closed';
+        connectionEstablished = false;
+        console.log(`  ✓ WebSocket closed gracefully (code: ${event.code}, reason: ${event.reason || 'none'}, time: ${elapsed}ms)`);
+        
+        // Call original handler if it exists
+        if (originalOnClose) {
+          originalOnClose(event);
+        }
+        
+        resolve();
+      };
+      
+      socket.close(1000, 'Stream ended');
+    });
+  };
+
   const connectWebSocket = () => {
+    // Prevent multiple simultaneous connections
+    if (connectionLock) {
+      console.log('  ⚠️  Connection already in progress, skipping...');
+      return;
+    }
+    
+    if (connectionState === 'connected' || connectionState === 'connecting') {
+      console.log(`  ⚠️  Already ${connectionState}, skipping new connection...`);
+      return;
+    }
+    
+    connectionLock = true;
+    connectionState = 'connecting';
+    connectionStartTime = Date.now();
+    console.log('  🔄 Connecting to WebSocket...');
+    
     try {
       socket = new WebSocket(`${socketUrl}?sessionId=${sessionId}`);
 
       socket.onopen = () => {
+        const connectTime = Date.now() - connectionStartTime;
+        connectionLock = false;
+        connectionState = 'connected';
         isConnected = true;
-        console.log('  ✓ Connected to server\n');
+        connectionEstablished = true;
+        console.log(`  ✓ Connected to server (${connectTime}ms)\n`);
         reconnectAttempts = 0;
 
         // Join session
@@ -458,17 +528,15 @@ async function main() {
           sessionId,
         }));
 
-        // Wait a bit for join-session to be processed
-        setTimeout(() => {
-          hasJoinedSession = true;
-          // Process any queued logs
-          while (logQueue.length > 0) {
-            const logData = logQueue.shift();
-            // Send logs via HTTP POST (non-blocking) instead of WebSocket
-            // WebSocket is only for receiving logs
-            sendLogViaHTTP(logData);
-          }
-        }, 100);
+        // Set hasJoinedSession immediately - HTTP POST doesn't need WebSocket
+        hasJoinedSession = true;
+        // Process any queued logs immediately
+        while (logQueue.length > 0) {
+          const logData = logQueue.shift();
+          // Send logs via HTTP POST (non-blocking) instead of WebSocket
+          // WebSocket is only for receiving logs
+          sendLogViaHTTP(logData);
+        }
       };
 
       socket.onmessage = (event) => {
@@ -607,11 +675,17 @@ async function main() {
       };
 
       socket.onclose = (event) => {
+        connectionLock = false;
+        connectionState = 'closed';
+        connectionEstablished = false;
         isConnected = false;
         hasJoinedSession = false;
+        
+        const connectionDuration = connectionStartTime ? Date.now() - connectionStartTime : 0;
+        console.log(`  📊 Connection closed (code: ${event.code}, reason: ${event.reason || 'none'}, duration: ${connectionDuration}ms)`);
 
-        // Reconnect logic
-        if (event.code !== 1000) { // Not a normal closure
+        // Reconnect logic - only if not a normal closure and not already closing
+        if (event.code !== 1000 && connectionState !== 'closing') {
           const delay = Math.min(1000 * Math.pow(2, reconnectAttempts), maxReconnectDelay);
           reconnectAttempts++;
           console.log(`  ↻ Reconnecting in ${delay}ms (attempt ${reconnectAttempts})...\n`);
@@ -619,9 +693,14 @@ async function main() {
           reconnectTimeout = setTimeout(() => {
             connectWebSocket();
           }, delay);
+        } else if (event.code === 1000) {
+          console.log('  ✓ Normal closure, no reconnect needed\n');
         }
       };
     } catch (error) {
+      connectionLock = false;
+      connectionState = 'disconnected';
+      connectionEstablished = false;
       console.error(`  ✗ Error creating WebSocket: ${error.message}`);
       console.error(`  ↻ URL: ${socketUrl}`);
       // Retry connection
@@ -634,6 +713,7 @@ async function main() {
   // Send logs via HTTP POST (non-blocking, same as SDKs)
   // Use Cloudflare Worker endpoint (port 8787 for local, or Worker URL for production)
   // Token is optional - anonymous sessions can send logs without authentication
+  // HTTP POST works independently of WebSocket - don't wait for WebSocket connection
   const sendLogViaHTTP = async (logData) => {
     try {
       // Determine ingest URL
@@ -788,43 +868,52 @@ async function main() {
       };
     }
 
-    // Send logs via HTTP POST (non-blocking, same as SDKs)
-    // WebSocket is only for receiving logs and auth codes
-    if (hasJoinedSession) {
-      sendLogViaHTTP(logData);
-    } else {
-      logQueue.push(logData);
-    }
+    // Send logs via HTTP POST immediately - don't wait for WebSocket
+    // WebSocket is only for receiving logs and auth codes, not required for sending
+    sendLogViaHTTP(logData);
   });
 
-  rl.on('close', () => {
+  rl.on('close', async () => {
     // Wait for queued logs to be sent
     const waitForQueue = () => {
-      if (logQueue.length === 0) {
-        console.log('\n  Stream ended. Closing connection...\n');
-        if (socket && socket.readyState === 1) { // WebSocket.OPEN = 1
-          socket.close(1000, 'Stream ended');
-        }
-        if (reconnectTimeout) {
-          clearTimeout(reconnectTimeout);
+      return new Promise((resolve) => {
+        if (logQueue.length === 0) {
+          resolve();
+        } else {
+          setTimeout(() => waitForQueue().then(resolve), 100);
         }
-        setTimeout(() => process.exit(0), 100);
-      } else {
-        setTimeout(waitForQueue, 100);
-      }
+      });
     };
     
-    waitForQueue();
+    await waitForQueue();
+    
+    console.log('\n  Stream ended. Closing connection...\n');
+    
+    // Cancel any pending reconnection attempts
+    if (reconnectTimeout) {
+      clearTimeout(reconnectTimeout);
+      reconnectTimeout = null;
+    }
+    
+    // Graceful shutdown - wait for close handshake
+    await closeWebSocket();
+    
+    // Give a moment for any final cleanup
+    setTimeout(() => process.exit(0), 100);
   });
 
-  process.on('SIGINT', () => {
+  process.on('SIGINT', async () => {
     console.log('\n  Interrupted. Closing connection...\n');
-    if (socket && socket.readyState === 1) { // WebSocket.OPEN = 1
-      socket.close(1000, 'Interrupted');
-    }
+    
+    // Cancel any pending reconnection attempts
     if (reconnectTimeout) {
       clearTimeout(reconnectTimeout);
+      reconnectTimeout = null;
     }
+    
+    // Graceful shutdown
+    await closeWebSocket();
+    
     process.exit(0);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibex-sh",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Zero-config observability CLI - pipe logs and visualize instantly",
   "type": "module",
   "bin": {