vibex-sh 0.9.2 → 0.9.4

package/index.js

@@ -9,6 +9,7 @@ import http from 'http';
 import https from 'https';
 import { fileURLToPath } from 'url';
 import WebSocket from 'ws';
+import crypto from 'crypto';
 
 // Get version from package.json
 const __filename = fileURLToPath(import.meta.url);
@@ -29,12 +30,11 @@ try {
   }
 }
 
-import crypto from 'crypto';
-
+// Session ID generation is now handled by the server
+// This function is kept for backward compatibility but should not be used for new sessions
 function generateSessionId() {
-  // Generate secure random session ID with 12 characters (as per security plan)
-  // Format: vibex-{12 random alphanumeric chars}
-  // Using crypto for better randomness
+  // DEPRECATED: Session IDs should be generated by the server
+  // This is only used as a fallback if server creation fails
   const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
   let result = 'vibex-';
   
@@ -370,41 +370,63 @@ async function main() {
     .parse();
 
   const options = program.opts();
-
-  // Normalize session ID - add 'vibex-' prefix if missing
-  const rawSessionId = options.sessionId || generateSessionId();
-  const sessionId = normalizeSessionId(rawSessionId);
   const { webUrl, socketUrl } = getUrls(options);
   
   // Get token from flag, env var, or stored config
   let token = options.token || process.env.VIBEX_TOKEN || await getStoredToken();
   
-  // Auto-claim session if token is available and fetch auth code
+  let sessionId;
   let authCode = null;
-  if (token) {
-    // Try to claim session (works for both new and existing sessions)
-    // For new sessions, this will create and claim
-    // For existing sessions, this will return the auth code if user owns it
-    authCode = await claimSession(sessionId, token, webUrl);
-    if (authCode && !options.sessionId) {
-      // Only show claim message for new sessions
-      console.log('  ✓ Session automatically claimed to your account\n');
-    }
-  }
   
-  // For unclaimed sessions, auth code will come from socket.io 'session-auth-code' event
-  // We'll set it when we receive it from the socket
-
-  // Print banner only once, and show how to reuse session
-  if (!options.sessionId) {
-    printBanner(sessionId, webUrl, authCode);
-    const localFlag = webUrl.includes('localhost') ? ' --local' : '';
-    const sessionSlug = sessionId.replace(/^vibex-/, ''); // Remove prefix for example
-    console.log('  💡 Tip: Use -s to send more logs to this session');
-    console.log(`  Example: echo '{"cpu": 45, "memory": 78}' | npx vibex-sh -s ${sessionSlug}${localFlag}\n`);
-  } else {
-    // When reusing a session, show minimal info (no auth code)
+  // If session ID is provided, use it (existing session)
+  if (options.sessionId) {
+    sessionId = normalizeSessionId(options.sessionId);
+    
+    // If token is available, try to claim the session
+    if (token) {
+      authCode = await claimSession(sessionId, token, webUrl);
+    }
+    
+    // When reusing a session, show minimal info
     console.log(`  🔍 Sending logs to session: ${sessionId}\n`);
+  } else {
+    // No session ID provided - create a new anonymous session
+    try {
+      const createUrl = `${webUrl}/api/sessions/create-anonymous`;
+      const response = await httpRequest(createUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+      });
+      
+      if (!response.ok) {
+        const errorData = await response.json();
+        console.error(`  ✗ Failed to create session: ${errorData.message || 'Unknown error'}`);
+        process.exit(1);
+      }
+      
+      const data = await response.json();
+      sessionId = data.sessionId; // Server-generated unique session ID
+      authCode = data.authCode; // Server-generated auth code
+      
+      // If token is available, claim the session
+      if (token) {
+        const claimAuthCode = await claimSession(sessionId, token, webUrl);
+        if (claimAuthCode) {
+          authCode = claimAuthCode;
+          console.log('  ✓ Session automatically claimed to your account\n');
+        }
+      }
+      
+      // Print banner for new session
+      printBanner(sessionId, webUrl, authCode);
+      const localFlag = webUrl.includes('localhost') ? ' --local' : '';
+      const sessionSlug = sessionId.replace(/^vibex-/, ''); // Remove prefix for example
+      console.log('  💡 Tip: Use -s to send more logs to this session');
+      console.log(`  Example: echo '{"cpu": 45, "memory": 78}' | npx vibex-sh -s ${sessionSlug}${localFlag}\n`);
+    } catch (error) {
+      console.error(`  ✗ Error creating session: ${error.message}`);
+      process.exit(1);
+    }
   }
 
   let socket = null;
@@ -475,14 +497,22 @@ async function main() {
               break;
 
             case 'error':
-              if (message.error === 'Rate Limit Exceeded') {
+              const errorType = message.error || 'Error';
+              const errorMsg = message.message || 'An unexpected error occurred';
+              const statusCode = message.statusCode || 0;
+              
+              // Handle specific error types
+              if (errorType === 'Rate Limit Exceeded' || statusCode === 429) {
                 console.error('\n  ⚠️  Rate Limit Exceeded');
-                console.error(`  ${message.message || 'Too many requests. Please try again later.'}`);
+                console.error(`  ${errorMsg}`);
+                if (message.retryAfter) {
+                  console.error(`  ⏱️  Retry after: ${message.retryAfter} seconds`);
+                }
                 console.error('');
                 logQueue.length = 0;
-              } else if (message.error === 'History Limit Reached') {
+              } else if (errorType === 'History Limit Reached' || (statusCode === 403 && errorMsg.includes('History Limit'))) {
                 console.error('\n  🚫 History Limit Reached');
-                console.error(`  ${message.message || 'Session history limit reached'}`);
+                console.error(`  ${errorMsg}`);
                 if (message.limit !== undefined && message.current !== undefined) {
                   console.error(`  Current: ${message.current} / ${message.limit} logs`);
                 }
@@ -493,10 +523,69 @@ async function main() {
                 console.error('');
                 logQueue.length = 0;
                 hasJoinedSession = false;
+              } else if (statusCode === 401 || errorType === 'Unauthorized') {
+                if (errorMsg.includes('expired')) {
+                  console.error('\n  🔑 Token Expired');
+                  console.error('  Your authentication token has expired.');
+                  console.error('  💡 Run: npx vibex-sh login');
+                } else {
+                  console.error('\n  🔑 Unauthorized');
+                  console.error(`  ${errorMsg}`);
+                  console.error('  💡 Run: npx vibex-sh login');
+                }
+                console.error('');
+                logQueue.length = 0;
+                hasJoinedSession = false;
+              } else if (statusCode === 403 || errorType === 'Forbidden') {
+                if (errorMsg.includes('access') || errorMsg.includes('belongs')) {
+                  console.error('\n  🚫 Access Denied');
+                  console.error(`  ${errorMsg}`);
+                  console.error('  💡 This session belongs to another user or is not accessible');
+                  console.error('  💡 Make sure you are using the correct token and session ID');
+                } else if (errorMsg.includes('archived')) {
+                  console.error('\n  🚫 Session Archived');
+                  console.error(`  ${errorMsg}`);
+                  console.error('  💡 This session is archived and cannot accept new logs');
+                } else {
+                  console.error('\n  🚫 Forbidden');
+                  console.error(`  ${errorMsg}`);
+                }
+                console.error('');
+                logQueue.length = 0;
+                hasJoinedSession = false;
+              } else if (statusCode === 404 || errorType === 'Not Found') {
+                console.error('\n  🔍 Session Not Found');
+                console.error(`  ${errorMsg}`);
+                console.error('  💡 Make sure the session ID is correct');
+                console.error('  💡 Check if the session exists in your dashboard');
+                console.error('');
+                logQueue.length = 0;
+                hasJoinedSession = false;
+              } else if (statusCode === 400 || errorType === 'Bad Request') {
+                console.error('\n  📝 Bad Request');
+                console.error(`  ${errorMsg}`);
+                if (errorMsg.includes('sessionId')) {
+                  console.error('  💡 Make sure you provided a valid session ID with -s or --session');
+                } else if (errorMsg.includes('logs')) {
+                  console.error('  💡 Make sure you are sending valid log data');
+                }
+                console.error('');
+                logQueue.length = 0;
+              } else if (statusCode >= 500 || errorType === 'Internal Server Error') {
+                console.error('\n  🔴 Server Error');
+                console.error(`  ${errorMsg}`);
+                console.error('  💡 This is a server-side issue. Please try again later.');
+                console.error('  💡 If the problem persists, contact support');
+                console.error('');
+                logQueue.length = 0;
               } else {
-                console.error('\n  ✗ Server Error');
-                console.error(`  ${message.error || message.message || 'An unexpected error occurred'}`);
+                console.error('\n  ✗ Error');
+                console.error(`  ${errorType}: ${errorMsg}`);
+                if (statusCode) {
+                  console.error(`  Status Code: ${statusCode}`);
+                }
                 console.error('');
+                logQueue.length = 0;
               }
               break;
 
@@ -544,12 +633,8 @@ 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
   const sendLogViaHTTP = async (logData) => {
-    if (!token) {
-      console.error('  ✗ No token available for sending logs');
-      return;
-    }
-
     try {
       // Determine ingest URL
       let ingestUrl;
@@ -567,12 +652,17 @@ async function main() {
       
       console.log(`  📤 Sending log to: ${ingestUrl}`);
       
+      // Build headers - only include Authorization if token exists
+      const headers = {
+        'Content-Type': 'application/json',
+      };
+      if (token) {
+        headers['Authorization'] = `Bearer ${token}`;
+      }
+      
       const response = await fetch(ingestUrl, {
         method: 'POST',
-        headers: {
-          'Authorization': `Bearer ${token}`,
-          'Content-Type': 'application/json',
-        },
+        headers,
         body: JSON.stringify({
           sessionId,
           logs: [logData],
@@ -581,18 +671,83 @@ async function main() {
 
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}));
-        console.error(`  ✗ HTTP ${response.status}: ${errorData.message || response.statusText}`);
-        if (response.status === 429) {
-          console.error('\n  ⚠️  Rate Limit Exceeded');
-          console.error(`  ${errorData.message || 'Too many requests. Please try again later.'}`);
+        const errorMessage = errorData.message || response.statusText || 'Unknown error';
+        
+        console.error(`\n  ✗ HTTP ${response.status}: ${errorMessage}`);
+        
+        // Handle specific error cases
+        if (response.status === 401) {
+          if (errorMessage.includes('expired')) {
+            console.error('\n  🔑 Token Expired');
+            console.error('  Your authentication token has expired.');
+            console.error('  💡 Run: npx vibex-sh login');
+            console.error('');
+          } else if (errorMessage.includes('Invalid') || errorMessage.includes('invalid')) {
+            console.error('\n  🔑 Invalid Token');
+            console.error('  Your authentication token is invalid or missing.');
+            console.error('  💡 Run: npx vibex-sh login');
+            console.error('');
+          } else {
+            console.error('\n  🔑 Unauthorized');
+            console.error(`  ${errorMessage}`);
+            console.error('  💡 Run: npx vibex-sh login');
+            console.error('');
+          }
+        } else if (response.status === 400) {
+          console.error('\n  📝 Bad Request');
+          console.error(`  ${errorMessage}`);
+          if (errorMessage.includes('sessionId')) {
+            console.error('  💡 Make sure you provided a valid session ID with -s or --session');
+          } else if (errorMessage.includes('logs')) {
+            console.error('  💡 Make sure you are sending valid log data');
+          }
           console.error('');
-        } else if (response.status === 403 && errorData.message?.includes('History Limit')) {
-          console.error('\n  🚫 History Limit Reached');
-          console.error(`  ${errorData.message || 'Session history limit reached'}`);
-          if (errorData.upgradeRequired) {
-            console.error('  💡 Upgrade to Pro to unlock 30 days retention');
-            console.error('  🌐 Visit: https://vibex.sh/pricing');
+        } else if (response.status === 403) {
+          if (errorMessage.includes('History Limit')) {
+            console.error('\n  🚫 History Limit Reached');
+            console.error(`  ${errorMessage}`);
+            if (errorData.upgradeRequired) {
+              console.error('  💡 Upgrade to Pro to unlock 30 days retention');
+              console.error('  🌐 Visit: https://vibex.sh/pricing');
+            }
+            console.error('');
+          } else if (errorMessage.includes('access') || errorMessage.includes('belongs')) {
+            console.error('\n  🚫 Access Denied');
+            console.error(`  ${errorMessage}`);
+            console.error('  💡 This session belongs to another user or is not accessible');
+            console.error('  💡 Make sure you are using the correct token and session ID');
+            console.error('');
+          } else if (errorMessage.includes('archived')) {
+            console.error('\n  🚫 Session Archived');
+            console.error(`  ${errorMessage}`);
+            console.error('  💡 This session is archived and cannot accept new logs');
+            console.error('');
+          } else {
+            console.error('\n  🚫 Forbidden');
+            console.error(`  ${errorMessage}`);
+            console.error('');
           }
+        } else if (response.status === 404) {
+          console.error('\n  🔍 Session Not Found');
+          console.error(`  ${errorMessage}`);
+          console.error('  💡 Make sure the session ID is correct');
+          console.error('  💡 Check if the session exists in your dashboard');
+          console.error('');
+        } else if (response.status === 429) {
+          console.error('\n  ⚠️  Rate Limit Exceeded');
+          console.error(`  ${errorMessage}`);
+          if (errorData.retryAfter) {
+            console.error(`  ⏱️  Retry after: ${errorData.retryAfter} seconds`);
+          }
+          console.error('');
+        } else if (response.status >= 500) {
+          console.error('\n  🔴 Server Error');
+          console.error(`  ${errorMessage}`);
+          console.error('  💡 This is a server-side issue. Please try again later.');
+          console.error('  💡 If the problem persists, contact support');
+          console.error('');
+        } else {
+          console.error(`  ${errorMessage}`);
           console.error('');
         }
       } else {

package/package.json

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