vibex-sh 0.12.3 → 0.13.0

package/index.js

@@ -449,6 +449,7 @@ async function handleInit(options) {
     
     // Get token - required for authenticated session creation
     let token = process.env.VIBEX_TOKEN || await getStoredToken();
+    const tokenSource = process.env.VIBEX_TOKEN ? 'cli-env' : 'cli-config';
     if (!token) {
       console.error('\n  ✗ Authentication required');
       console.error('  💡 Run: npx vibex-sh login');
@@ -462,6 +463,7 @@ async function handleInit(options) {
       headers: { 
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${token}`,
+        'X-Token-Source': tokenSource,
       },
       body: JSON.stringify({
         enabledParsers: enabledParsers.length > 0 ? enabledParsers : undefined,
@@ -556,7 +558,20 @@ async function handleSendLogs(options) {
   const { webUrl, socketUrl } = getProductionUrls();
   
   // Get token - REQUIRED for all operations
-  let token = options.token || process.env.VIBEX_TOKEN || await getStoredToken();
+  // Track token source for debugging
+  let token;
+  let tokenSource = 'cli-config'; // default
+  if (options.token) {
+    token = options.token;
+    tokenSource = 'cli-option';
+  } else if (process.env.VIBEX_TOKEN) {
+    token = process.env.VIBEX_TOKEN;
+    tokenSource = 'cli-env';
+  } else {
+    token = await getStoredToken();
+    tokenSource = 'cli-config';
+  }
+  
   if (!token) {
     console.error('\n  ✗ Authentication required');
     console.error('  💡 Run: npx vibex-sh login to authenticate');
@@ -602,11 +617,14 @@ async function handleSendLogs(options) {
     
     try {
       const createUrl = `${webUrl}/api/sessions/create`;
+      // Determine token source for this request
+      const requestTokenSource = options.token ? 'cli-option' : (process.env.VIBEX_TOKEN ? 'cli-env' : 'cli-config');
       const response = await httpRequest(createUrl, {
         method: 'POST',
         headers: { 
           'Content-Type': 'application/json',
           'Authorization': `Bearer ${token}`,
+          'X-Token-Source': requestTokenSource,
         },
         body: JSON.stringify({
           enabledParsers: enabledParsers.length > 0 ? enabledParsers : undefined,
@@ -728,7 +746,69 @@ async function handleSendLogs(options) {
     });
   };
 
-  const connectWebSocket = () => {
+  // WebSocket token cache
+  let websocketToken = null;
+  let websocketTokenExpiresAt = 0;
+
+  // Fetch WebSocket token from API
+  const fetchWebSocketToken = async () => {
+    try {
+      // Check if we have a valid cached token
+      const now = Date.now();
+      if (websocketToken && websocketTokenExpiresAt > now + 60000) {
+        // Token is still valid (at least 1 minute remaining)
+        return websocketToken;
+      }
+
+      // Fetch new token
+      const tokenUrl = `${webUrl}/api/session/${sessionId}/websocket-token`;
+      const response = await httpRequest(tokenUrl, {
+        method: 'GET',
+        headers: {
+          'Authorization': `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+      });
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({ message: response.status === 401 ? 'Authentication required' : 'Unknown error' }));
+        
+        if (response.status === 401) {
+          console.error(chalk.red('\n  ✗ Authentication failed'));
+          console.error(chalk.yellow('  💡 Run: npx vibex-sh login to authenticate'));
+          console.error('');
+          process.exit(1);
+        } else if (response.status === 403) {
+          console.error(chalk.red(`\n  ✗ Access denied: ${errorData.message || 'You do not have permission to access this session'}`));
+          process.exit(1);
+        } else if (response.status === 404) {
+          console.error(chalk.red(`\n  ✗ Session not found: ${errorData.message || 'The session does not exist'}`));
+          process.exit(1);
+        } else if (response.status === 503) {
+          // Database not ready yet - retry after delay
+          console.warn(chalk.yellow('  ⚠️  Session database not ready yet, retrying in 2 seconds...'));
+          await new Promise(resolve => setTimeout(resolve, 2000));
+          return await fetchWebSocketToken(); // Retry
+        } else {
+          console.error(chalk.red(`\n  ✗ Failed to get WebSocket token: ${errorData.message || 'Unknown error'}`));
+          process.exit(1);
+        }
+      }
+
+      const data = await response.json();
+      websocketToken = data.token;
+      websocketTokenExpiresAt = data.expiresAt;
+      
+      return websocketToken;
+    } catch (err) {
+      console.error(chalk.red(`\n  ✗ Error fetching WebSocket token: ${err.message}`));
+      console.error(chalk.yellow('  💡 Run: npx vibex-sh login to authenticate'));
+      console.error('');
+      process.exit(1);
+    }
+  };
+
+  const connectWebSocket = async () => {
     // Prevent multiple simultaneous connections
     if (connectionLock) {
       console.log('  ⚠️  Connection already in progress, skipping...');
@@ -746,24 +826,32 @@ async function handleSendLogs(options) {
       reconnectTimeout = null;
     }
     
-      connectionLock = true;
-      connectionState = 'connecting';
-      connectionStartTime = Date.now();
-      if (!hasStdin || !progressBar) {
-        console.log(chalk.blue('  🔄 Connecting to WebSocket...'));
+    connectionLock = true;
+    connectionState = 'connecting';
+    connectionStartTime = Date.now();
+    if (!hasStdin || !progressBar) {
+      console.log(chalk.blue('  🔄 Connecting to WebSocket...'));
+    }
+    
+    try {
+      // Fetch WebSocket token first
+      const wsToken = await fetchWebSocketToken();
+      if (!wsToken) {
+        connectionLock = false;
+        connectionState = 'disconnected';
+        return;
       }
-      
-      try {
-        // Close existing socket if any (cleanup)
-        if (socket && socket.readyState !== WebSocket.CLOSED) {
-          try {
-            socket.close();
-          } catch (e) {
-            // Ignore errors when closing
-          }
+
+      // Close existing socket if any (cleanup)
+      if (socket && socket.readyState !== WebSocket.CLOSED) {
+        try {
+          socket.close();
+        } catch (e) {
+          // Ignore errors when closing
         }
-        
-        socket = new WebSocket(`${socketUrl}?sessionId=${sessionId}`);
+      }
+      
+      socket = new WebSocket(`${socketUrl}?sessionId=${sessionId}&token=${wsToken}`);
 
         socket.onopen = () => {
           const connectTime = Date.now() - connectionStartTime;
@@ -948,7 +1036,9 @@ async function handleSendLogs(options) {
           console.log(`  ↻ Reconnecting in ${delay}ms (attempt ${reconnectAttempts})...\n`);
           
           reconnectTimeout = setTimeout(() => {
-            connectWebSocket();
+            connectWebSocket().catch(err => {
+              console.error(`  ✗ Error reconnecting: ${err.message}`);
+            });
           }, delay);
         } else if (event.code === 1000) {
           console.log('  ✓ Normal closure, no reconnect needed\n');
@@ -962,7 +1052,9 @@ async function handleSendLogs(options) {
       console.error(`  ↻ URL: ${socketUrl}`);
       // Retry connection
       reconnectTimeout = setTimeout(() => {
-        connectWebSocket();
+        connectWebSocket().catch(err => {
+          console.error(`  ✗ Error retrying connection: ${err.message}`);
+        });
       }, 1000);
     }
   };
@@ -981,6 +1073,7 @@ async function handleSendLogs(options) {
       const headers = {
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${token}`,
+        'X-Token-Source': tokenSource, // Track token origin for debugging
       };
       
       const response = await fetch(ingestUrl, {
@@ -1123,7 +1216,10 @@ async function handleSendLogs(options) {
   // Only start WebSocket connection if we have stdin (piped input)
   // Don't connect WebSocket when run without parameters
   if (hasStdin) {
-    connectWebSocket();
+    connectWebSocket().catch(err => {
+      console.error(chalk.red(`\n  ✗ Failed to connect WebSocket: ${err.message}`));
+      // Don't exit - HTTP POST will still work
+    });
   }
 
   // Rate limiting queue for piped input
@@ -1289,7 +1385,7 @@ async function handleSendLogs(options) {
       : `${webUrl}/${sessionId}`;
     
     console.log(chalk.cyan('  ╔═══════════════════════════════════════╗'));
-    console.log(chalk.cyan('  ║         ✓ Upload Complete              ║'));
+    console.log(chalk.cyan('  ║         ✓ Upload Complete             ║'));
     console.log(chalk.cyan('  ╚═══════════════════════════════════════╝'));
     console.log('');
     console.log(chalk.white(`  📊 Stats:`));

package/package.json

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