vibex-sh 0.9.9 → 0.10.1

package/README.md

@@ -7,12 +7,6 @@ Zero-config observability CLI - pipe logs and visualize instantly.
 ```bash
 # Production (default)
 echo '{"cpu": 45, "memory": 78}' | vibex
-
-# Local development
-echo '{"test": 123}' | vibex --local
-
-# Custom ports
-echo '{"data": 123}' | vibex --web http://localhost:3000 --socket http://localhost:8080
 ```
 
 ## Installation
@@ -43,40 +37,33 @@ echo '{"more": "data"}' | vibex --session-id vibex-abc123
 | Flag | Description | Example |
 |------|-------------|---------|
 | `-s, --session-id <id>` | Reuse existing session | `vibex --session-id vibex-abc123` |
-| `-l, --local` | Use localhost (web: 3000, socket: 3001) | `vibex --local` |
-| `--web <url>` | Web server URL | `vibex --web http://localhost:3000` |
-| `--socket <url>` | Socket server URL | `vibex --socket http://localhost:8080` |
-| `--server <url>` | Shorthand for `--web` (auto-derives socket) | `vibex --server http://localhost:3000` |
+| `--web <url>` | Web server URL | `vibex --web https://vibex.sh` |
+| `--socket <url>` | Socket server URL | `vibex --socket wss://ingest.vibex.sh` |
+| `--server <url>` | Shorthand for `--web` (auto-derives socket) | `vibex --server https://vibex.sh` |
 
 ## Server Configuration
 
 The CLI automatically derives the socket URL from the web URL, but you can override it:
 
 ```bash
-# Auto-derive socket (localhost:3000 → localhost:3001)
-vibex --web http://localhost:3000
-
-# Explicit socket URL
-vibex --web http://localhost:3000 --socket http://localhost:8080
-
-# Production (auto-derives socket.vibex.sh)
+# Production (auto-derives socket URL)
 vibex --server https://vibex.sh
 
 # Custom domain
-vibex --web https://staging.vibex.sh --socket https://socket-staging.vibex.sh
+vibex --web https://staging.vibex.sh --socket wss://ingest-staging.vibex.sh
 ```
 
 ## Priority Order
 
-1. **Flags** (`--web`, `--socket`, `--local`, `--server`)
+1. **Flags** (`--web`, `--socket`, `--server`)
 2. **Environment variables** (`VIBEX_WEB_URL`, `VIBEX_SOCKET_URL`)
-3. **Production defaults** (`https://vibex.sh`, `https://socket.vibex.sh`)
+3. **Production defaults** (`https://vibex.sh`, `wss://ingest.vibex.sh`)
 
 ## Environment Variables
 
 ```bash
-export VIBEX_WEB_URL=http://localhost:3000
-export VIBEX_SOCKET_URL=http://localhost:8080
+export VIBEX_WEB_URL=https://vibex.sh
+export VIBEX_SOCKET_URL=wss://ingest.vibex.sh
 ```
 
 ## Examples
@@ -85,14 +72,8 @@ export VIBEX_SOCKET_URL=http://localhost:8080
 # Production (default)
 echo '{"data": 123}' | vibex
 
-# Quick localhost
-echo '{"data": 123}' | vibex --local
-
 # Custom web server, auto socket
-echo '{"data": 123}' | vibex --server http://localhost:3000
-
-# Both custom
-echo '{"data": 123}' | vibex --web http://localhost:3000 --socket http://localhost:8080
+echo '{"data": 123}' | vibex --server https://vibex.sh
 
 # Staging
 echo '{"data": 123}' | vibex --server https://staging.vibex.sh

package/index.js

@@ -56,28 +56,111 @@ function normalizeSessionId(sessionId) {
   return sessionId;
 }
 
-function deriveSocketUrl(webUrl) {
-  const url = new URL(webUrl);
-  
-  // For localhost, use Workers dev server
-  if (url.hostname === 'localhost' || url.hostname === '127.0.0.1') {
-    return 'ws://localhost:8787';
-  } 
-  // For vibex.sh domains, use Workers WebSocket endpoint
-  else if (url.hostname.includes('vibex.sh')) {
-    // Use Cloudflare Workers WebSocket endpoint
-    const workerUrl = process.env.VIBEX_WORKER_URL || 'https://ingest.vibex.sh';
-    return workerUrl.replace('https://', 'wss://').replace('http://', 'ws://');
-  } 
-  // For other domains, derive from web URL
-  else {
-    const workerUrl = process.env.VIBEX_WORKER_URL || webUrl.replace(url.hostname, `ingest.${url.hostname}`);
-    return workerUrl.replace('https://', 'wss://').replace('http://', 'ws://');
+/**
+ * Phase 1.8: Log Normalization for CLI
+ * Intelligently transforms log data into hybrid JSON structure
+ */
+
+function normalizeLevel(level) {
+  if (!level) return 'debug';
+  const levelStr = String(level).toLowerCase();
+  if (['debug', 'dbg', 'trace'].includes(levelStr)) return 'debug';
+  if (['info', 'information', 'log'].includes(levelStr)) return 'info';
+  if (['warn', 'warning', 'wrn'].includes(levelStr)) return 'warn';
+  if (['error', 'err', 'exception', 'fatal', 'critical'].includes(levelStr)) return 'error';
+  return 'debug';
+}
+
+function extractMetrics(payload) {
+  const metrics = {};
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+    return metrics;
+  }
+  if (payload.metrics && typeof payload.metrics === 'object' && !Array.isArray(payload.metrics)) {
+    for (const [key, value] of Object.entries(payload.metrics)) {
+      if (typeof value === 'number') {
+        metrics[key] = value;
+      }
+    }
+    return metrics;
+  }
+  const knownContextFields = new Set([
+    'trace_id', 'traceId', 'user_id', 'userId', 'request_id', 'requestId',
+    'correlation_id', 'correlationId', 'span_id', 'spanId', 'session_id', 'sessionId',
+    'id', 'pid', 'port', 'year', 'timestamp', 'time', 'date', 'createdAt', 'updatedAt',
+    'datetime', 'ts', 'utc', 'iso', 'exc_info', 'exception', 'error', 'message', 'msg', 'level', 'severity', 'log_level'
+  ]);
+  for (const [key, value] of Object.entries(payload)) {
+    const keyLower = key.toLowerCase();
+    if (knownContextFields.has(keyLower)) continue;
+    if (keyLower.includes('timestamp') || keyLower.includes('time') || keyLower.includes('date')) continue;
+    if (typeof value === 'number') {
+      if (key.endsWith('_ms') || key.endsWith('_count') || key.endsWith('_size') ||
+          key.endsWith('Ms') || key.endsWith('Count') || key.endsWith('Size') ||
+          ['cpu', 'memory', 'latency', 'response_time', 'duration'].some(pattern => keyLower.includes(pattern))) {
+        metrics[key] = value;
+      }
+    }
+  }
+  return metrics;
+}
+
+function extractContext(payload) {
+  const context = {};
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+    return context;
+  }
+  if (payload.context && typeof payload.context === 'object' && !Array.isArray(payload.context)) {
+    return payload.context;
+  }
+  const knownContextFields = {
+    'trace_id': 'trace_id', 'traceId': 'trace_id',
+    'user_id': 'user_id', 'userId': 'user_id',
+    'request_id': 'request_id', 'requestId': 'request_id',
+    'correlation_id': 'correlation_id', 'correlationId': 'correlation_id',
+    'span_id': 'span_id', 'spanId': 'span_id',
+    'session_id': 'session_id', 'sessionId': 'session_id',
+  };
+  for (const [field, normalizedKey] of Object.entries(knownContextFields)) {
+    if (payload[field] !== undefined) {
+      context[normalizedKey] = payload[field];
+    }
+  }
+  return context;
+}
+
+function normalizeToHybrid(message, level, payload) {
+  const merged = { ...(payload || {}) };
+  let normalizedMessage = message;
+  if (!normalizedMessage && merged.message) normalizedMessage = merged.message;
+  if (!normalizedMessage && merged.msg) normalizedMessage = merged.msg;
+  const normalizedLevel = normalizeLevel(level || merged.level || merged.severity || merged.log_level);
+  const metrics = extractMetrics(merged);
+  const context = extractContext(merged);
+  const annotation = merged._annotation;
+  const hybrid = {
+    message: normalizedMessage, // Can be null/undefined
+    level: normalizedLevel,
+    metrics: metrics,
+    context: context,
+  };
+  if (annotation) hybrid._annotation = annotation;
+  for (const [key, value] of Object.entries(merged)) {
+    if (!['message', 'msg', 'level', 'severity', 'log_level', 'metrics', 'context', '_annotation'].includes(key)) {
+      if (!(key in hybrid)) hybrid[key] = value;
+    }
   }
+  return hybrid;
+}
+
+function deriveSocketUrl(webUrl) {
+  // Always use production worker WebSocket endpoint
+  const workerUrl = process.env.VIBEX_WORKER_URL || 'https://ingest.vibex.sh';
+  return workerUrl.replace('https://', 'wss://').replace('http://', 'ws://');
 }
 
 function getUrls(options) {
-  const { local, web, socket, server } = options;
+  const { web, socket, server } = options;
   
   // Priority 1: Explicit --web and --socket flags (highest priority)
   if (web) {
@@ -95,15 +178,7 @@ function getUrls(options) {
     };
   }
   
-  // Priority 3: --local flag
-  if (local) {
-    return {
-      webUrl: process.env.VIBEX_WEB_URL || 'http://localhost:3000',
-      socketUrl: process.env.VIBEX_SOCKET_URL || socket || 'ws://localhost:8787',
-    };
-  }
-  
-  // Priority 4: Environment variables
+  // Priority 3: Environment variables
   if (process.env.VIBEX_WEB_URL) {
     return {
       webUrl: process.env.VIBEX_WEB_URL,
@@ -111,8 +186,8 @@ function getUrls(options) {
     };
   }
   
-  // Priority 5: Production defaults
-  // Use Worker WebSocket endpoint instead of old Socket.io server
+  // Priority 4: Production defaults
+  // Always use production worker WebSocket endpoint
   const defaultWorkerUrl = process.env.VIBEX_WORKER_URL || 'https://ingest.vibex.sh';
   return {
     webUrl: 'https://vibex.sh',
@@ -342,7 +417,6 @@ async function main() {
     // Create a separate command instance for login
     const loginCmd = new Command();
     loginCmd
-      .option('-l, --local', 'Use localhost')
       .option('--web <url>', 'Web server URL')
       .option('--server <url>', 'Shorthand for --web');
     
@@ -362,9 +436,8 @@ async function main() {
   program
     .version(cliVersion, '-v, --version', 'Display version number')
     .option('-s, --session-id <id>', 'Reuse existing session ID')
-    .option('-l, --local', 'Use localhost (web: 3000, socket: 3001)')
-    .option('--web <url>', 'Web server URL (e.g., http://localhost:3000)')
-    .option('--socket <url>', 'Socket server URL (e.g., http://localhost:3001)')
+    .option('--web <url>', 'Web server URL')
+    .option('--socket <url>', 'Socket server URL')
     .option('--server <url>', 'Shorthand for --web (auto-derives socket URL)')
     .option('--token <token>', 'Authentication token (or use VIBEX_TOKEN env var)')
     .parse();
@@ -419,10 +492,8 @@ async function main() {
       
       // 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`);
+      console.log(`  Example: echo '{"cpu": 45, "memory": 78}' | npx vibex-sh -s ${sessionId}\n`);
     } catch (error) {
       console.error(`  ✗ Error creating session: ${error.message}`);
       process.exit(1);
@@ -505,12 +576,27 @@ async function main() {
       return;
     }
     
+    // Clear any existing reconnect timeout to prevent duplicate connections
+    if (reconnectTimeout) {
+      clearTimeout(reconnectTimeout);
+      reconnectTimeout = null;
+    }
+    
     connectionLock = true;
     connectionState = 'connecting';
     connectionStartTime = Date.now();
     console.log('  🔄 Connecting to WebSocket...');
     
     try {
+      // 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.onopen = () => {
@@ -711,24 +797,14 @@ 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)
+  // Always use production Cloudflare Worker endpoint
   // 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
-      let ingestUrl;
-      if (webUrl.includes('localhost') || webUrl.includes('127.0.0.1')) {
-        // Local development - use Workers dev server
-        ingestUrl = 'http://localhost:8787/api/v1/ingest';
-      } else if (process.env.VIBEX_WORKER_URL) {
-        // Use explicit Worker URL if set
-        ingestUrl = `${process.env.VIBEX_WORKER_URL}/api/v1/ingest`;
-      } else {
-        // Production default - use Worker URL (not web URL)
-        const defaultWorkerUrl = 'https://ingest.vibex.sh';
-        ingestUrl = `${defaultWorkerUrl}/api/v1/ingest`;
-      }
+      // Always use production worker URL
+      const workerUrl = process.env.VIBEX_WORKER_URL || 'https://ingest.vibex.sh';
+      const ingestUrl = `${workerUrl}/api/v1/ingest`;
             
       // Build headers - only include Authorization if token exists
       const headers = {
@@ -855,15 +931,37 @@ async function main() {
     let logData;
     try {
       const parsed = JSON.parse(trimmedLine);
-      logData = {
-        type: 'json',
-        payload: parsed,
-        timestamp: Date.now(),
-      };
+      // Phase 1.8: Normalize JSON to hybrid structure
+      if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+        const hybrid = normalizeToHybrid(null, null, parsed);
+        logData = {
+          type: 'json',
+          payload: hybrid,
+          timestamp: Date.now(),
+        };
+      } else {
+        // Parsed but not an object - treat as text
+        logData = {
+          type: 'json',
+          payload: {
+            message: trimmedLine,
+            level: 'debug',
+            metrics: {},
+            context: {},
+          },
+          timestamp: Date.now(),
+        };
+      }
     } catch (e) {
+      // Phase 1.8: Text logs are now valuable - send as message field
       logData = {
-        type: 'text',
-        payload: trimmedLine,
+        type: 'json',
+        payload: {
+          message: trimmedLine,
+          level: 'debug',
+          metrics: {},
+          context: {},
+        },
         timestamp: Date.now(),
       };
     }

package/package.json

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