vibex-sh 0.9.8 → 0.10.0

package/index.js

@@ -56,6 +56,103 @@ function normalizeSessionId(sessionId) {
   return sessionId;
 }
 
+/**
+ * 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) {
   const url = new URL(webUrl);
   
@@ -66,7 +163,7 @@ function deriveSocketUrl(webUrl) {
   // 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://vibex-ingest.prop.workers.dev';
+    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
@@ -113,7 +210,7 @@ function getUrls(options) {
   
   // Priority 5: Production defaults
   // Use Worker WebSocket endpoint instead of old Socket.io server
-  const defaultWorkerUrl = process.env.VIBEX_WORKER_URL || 'https://vibex-ingest.prop.workers.dev';
+  const defaultWorkerUrl = process.env.VIBEX_WORKER_URL || 'https://ingest.vibex.sh';
   return {
     webUrl: 'https://vibex.sh',
     socketUrl: socket || defaultWorkerUrl.replace('https://', 'wss://').replace('http://', 'ws://'),
@@ -505,12 +602,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 = () => {
@@ -726,7 +838,7 @@ async function main() {
         ingestUrl = `${process.env.VIBEX_WORKER_URL}/api/v1/ingest`;
       } else {
         // Production default - use Worker URL (not web URL)
-        const defaultWorkerUrl = 'https://vibex-ingest.prop.workers.dev';
+        const defaultWorkerUrl = 'https://ingest.vibex.sh';
         ingestUrl = `${defaultWorkerUrl}/api/v1/ingest`;
       }
             
@@ -855,15 +967,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.8",
+  "version": "0.10.0",
   "description": "Zero-config observability CLI - pipe logs and visualize instantly",
   "type": "module",
   "bin": {