Add gateway diagnostics and improved UI proxy with better error handling

cabinlab · cabinlab · commit 68aa4b13a3df · 2025-06-14T18:27:50.000-08:00
diff --git a/claude-home/config.yaml b/claude-home/config.yaml
@@ -1,6 +1,6 @@
 name: "Claude Home"
 description: "AI-powered terminal and chat interface with Claude Code CLI"
-version: "2.3.15"
+version: "2.3.16"
 slug: "claude_home"
 init: false
 
diff --git a/claude-home/fix-gateway-proxy.js b/claude-home/fix-gateway-proxy.js
@@ -0,0 +1,137 @@
+// Fixed server.js with better error handling and logging
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+
+const PORT = 8080;
+
+// Simple proxy function with better error handling
+function proxy(req, res, targetHost, targetPort, targetPath) {
+    console.log(`Proxying ${req.url} to ${targetHost}:${targetPort}${targetPath}`);
+    
+    const options = {
+        hostname: targetHost,
+        port: targetPort,
+        path: targetPath || req.url,
+        method: req.method,
+        headers: {...req.headers, host: `${targetHost}:${targetPort}`}
+    };
+
+    const proxyReq = http.request(options, (proxyRes) => {
+        console.log(`Proxy response: ${proxyRes.statusCode}`);
+        res.writeHead(proxyRes.statusCode, proxyRes.headers);
+        proxyRes.pipe(res);
+    });
+
+    proxyReq.on('error', (err) => {
+        console.error(`Proxy error to ${targetHost}:${targetPort}:`, err.message);
+        res.writeHead(502, {'Content-Type': 'application/json'});
+        res.end(JSON.stringify({error: 'Gateway error', details: err.message}));
+    });
+
+    req.pipe(proxyReq);
+}
+
+const server = http.createServer((req, res) => {
+    console.log(`Request: ${req.method} ${req.url}`);
+    
+    // Add CORS headers for all responses
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+    
+    // Handle OPTIONS for CORS
+    if (req.method === 'OPTIONS') {
+        res.writeHead(200);
+        res.end();
+        return;
+    }
+    
+    // Route based on path
+    if (req.url === '/' || req.url === '/index.html') {
+        // Serve the main UI
+        fs.readFile(path.join(__dirname, 'index.html'), (err, data) => {
+            if (err) {
+                console.error('Error reading index.html:', err);
+                res.writeHead(500);
+                res.end('Error loading page');
+                return;
+            }
+            res.writeHead(200, {'Content-Type': 'text/html'});
+            res.end(data);
+        });
+    } else if (req.url.startsWith('/chat')) {
+        // Proxy to chat UI
+        const targetPath = req.url.substring(5) || '/';
+        proxy(req, res, 'localhost', 3000, targetPath);
+    } else if (req.url.startsWith('/terminal')) {
+        // Proxy to ttyd
+        const targetPath = req.url.substring(9) || '/';
+        proxy(req, res, 'localhost', 7681, targetPath);
+    } else if (req.url.startsWith('/v1/')) {
+        // Proxy to gateway API - THIS IS THE IMPORTANT ONE
+        proxy(req, res, 'localhost', 8001, req.url);
+    } else {
+        res.writeHead(404);
+        res.end(`Not found: ${req.url}`);
+    }
+});
+
+// Handle WebSocket upgrades
+server.on('upgrade', (req, socket, head) => {
+    console.log(`WebSocket upgrade request: ${req.url}`);
+    
+    if (req.url.startsWith('/terminal')) {
+        // Proxy WebSocket to ttyd
+        const net = require('net');
+        const upstream = net.connect(7681, 'localhost');
+        
+        upstream.on('connect', () => {
+            console.log('Connected to ttyd WebSocket');
+            const targetPath = req.url.substring(9) || '/';
+            upstream.write(`GET ${targetPath} HTTP/1.1\r\n`);
+            for (const [key, value] of Object.entries(req.headers)) {
+                if (key.toLowerCase() !== 'host') {
+                    upstream.write(`${key}: ${value}\r\n`);
+                }
+            }
+            upstream.write('Host: localhost:7681\r\n');
+            upstream.write('\r\n');
+            upstream.write(head);
+            
+            socket.pipe(upstream);
+            upstream.pipe(socket);
+        });
+        
+        upstream.on('error', (err) => {
+            console.error('WebSocket upstream error:', err);
+            socket.destroy();
+        });
+        
+        socket.on('error', (err) => {
+            console.error('WebSocket socket error:', err);
+            upstream.destroy();
+        });
+    } else {
+        socket.destroy();
+    }
+});
+
+server.listen(PORT, '0.0.0.0', () => {
+    console.log(`UI server running on port ${PORT}`);
+    console.log('Routes:');
+    console.log('  / -> UI (this server)');
+    console.log('  /chat/* -> localhost:3000');
+    console.log('  /terminal/* -> localhost:7681');
+    console.log('  /v1/* -> localhost:8001 (Gateway API)');
+    
+    // Test gateway connectivity on startup
+    setTimeout(() => {
+        const testReq = http.get('http://localhost:8001/health', (res) => {
+            console.log(`Gateway health check: ${res.statusCode}`);
+        });
+        testReq.on('error', (err) => {
+            console.error('Gateway not responding:', err.message);
+        });
+    }, 1000);
+});
diff --git a/claude-home/quick-gateway-fix.sh b/claude-home/quick-gateway-fix.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+# Quick fix for gateway connectivity issue
+
+echo "=== Quick Gateway Fix ==="
+echo
+
+# 1. Check if gateway is running
+echo "1. Checking gateway status..."
+if supervisorctl status chat-gateway | grep -q RUNNING; then
+    echo "   ✓ Gateway is running"
+else
+    echo "   ✗ Gateway is not running"
+    echo "   Starting gateway..."
+    supervisorctl start chat-gateway
+fi
+
+# 2. Test gateway directly
+echo
+echo "2. Testing gateway on port 8001..."
+if curl -s http://localhost:8001/health | grep -q "ok"; then
+    echo "   ✓ Gateway responding on 8001"
+else
+    echo "   ✗ Gateway not responding"
+    
+    # Try to start it manually to see errors
+    echo
+    echo "3. Testing gateway manually..."
+    timeout 5 /opt/gateway-venv/bin/python /opt/chat_gateway_mcp.py --http 8001 2>&1 | head -20
+fi
+
+# 4. Check if the issue is with the proxy
+echo
+echo "4. Testing UI proxy..."
+# Replace the server.js with fixed version if needed
+if [ -f fix-gateway-proxy.js ]; then
+    echo "   Updating UI server with better proxy..."
+    cp /opt/ui/server.js /opt/ui/server.js.bak
+    cp fix-gateway-proxy.js /opt/ui/server.js
+    supervisorctl restart responsive-ui
+    sleep 2
+fi
+
+# 5. Final test
+echo
+echo "5. Final connectivity test..."
+echo -n "   Gateway direct: "
+curl -s http://localhost:8001/health | jq -r .status || echo "FAILED"
+
+echo -n "   Gateway via proxy: "
+curl -s -X POST http://localhost:8080/v1/chat/completions/test \
+  -H "Content-Type: application/json" \
+  -d '{"messages":[{"role":"user","content":"test"}]}' \
+  | jq -r .status 2>/dev/null || echo "FAILED"
+
+echo
+echo "=== Status ==="
+supervisorctl status | grep -E "chat-gateway|responsive-ui"
+
+echo
+echo "If gateway still fails, check:"
+echo "1. Python venv: ls -la /opt/gateway-venv/bin/"
+echo "2. Gateway script: ls -la /opt/chat_gateway_mcp.py"
+echo "3. Import errors: /opt/gateway-venv/bin/python -c 'import mcp, httpx, pydantic, aiohttp'"
diff --git a/claude-home/test-gateway.sh b/claude-home/test-gateway.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Test gateway connectivity
+
+echo "=== Testing Gateway Connectivity ==="
+echo
+
+# 1. Direct gateway test
+echo "1. Testing gateway directly on port 8001..."
+echo -n "   Health check: "
+curl -s http://localhost:8001/health 2>/dev/null | jq . || echo "FAILED"
+
+echo
+echo "2. Testing gateway through UI proxy on port 8080..."
+echo -n "   Health check via proxy: "
+curl -s http://localhost:8080/v1/chat/completions/test \
+  -H "Content-Type: application/json" \
+  -d '{"messages":[{"role":"user","content":"test"}]}' 2>/dev/null | jq . || echo "FAILED"
+
+echo
+echo "3. Checking if gateway is actually running..."
+ps aux | grep -E "chat_gateway_mcp|gateway-venv" | grep -v grep || echo "   Gateway process not found!"
+
+echo
+echo "4. Checking gateway logs..."
+echo "   === Last 10 lines of gateway.log ==="
+tail -n 10 /var/log/gateway.log 2>/dev/null || echo "   No log file"
+echo
+echo "   === Last 10 lines of gateway.err ==="
+tail -n 10 /var/log/gateway.err 2>/dev/null || echo "   No error log"
+
+echo
+echo "5. Testing gateway port directly..."
+nc -zv localhost 8001 2>&1 || echo "   Port 8001 not open"
+
+echo
+echo "6. Checking supervisord status..."
+supervisorctl status chat-gateway
+
+echo
+echo "=== Quick Fixes ==="
+echo "1. Restart gateway: supervisorctl restart chat-gateway"
+echo "2. Check python path: which python3"
+echo "3. Test gateway manually:"
+echo "   /opt/gateway-venv/bin/python /opt/chat_gateway_mcp.py --http 8001"
+echo "4. Check if venv exists: ls -la /opt/gateway-venv/"
diff --git a/claude-home/ui/server-fixed.js b/claude-home/ui/server-fixed.js
@@ -0,0 +1,137 @@
+// Fixed server.js with better error handling and logging
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+
+const PORT = 8080;
+
+// Simple proxy function with better error handling
+function proxy(req, res, targetHost, targetPort, targetPath) {
+    console.log(`Proxying ${req.url} to ${targetHost}:${targetPort}${targetPath}`);
+    
+    const options = {
+        hostname: targetHost,
+        port: targetPort,
+        path: targetPath || req.url,
+        method: req.method,
+        headers: {...req.headers, host: `${targetHost}:${targetPort}`}
+    };
+
+    const proxyReq = http.request(options, (proxyRes) => {
+        console.log(`Proxy response: ${proxyRes.statusCode}`);
+        res.writeHead(proxyRes.statusCode, proxyRes.headers);
+        proxyRes.pipe(res);
+    });
+
+    proxyReq.on('error', (err) => {
+        console.error(`Proxy error to ${targetHost}:${targetPort}:`, err.message);
+        res.writeHead(502, {'Content-Type': 'application/json'});
+        res.end(JSON.stringify({error: 'Gateway error', details: err.message}));
+    });
+
+    req.pipe(proxyReq);
+}
+
+const server = http.createServer((req, res) => {
+    console.log(`Request: ${req.method} ${req.url}`);
+    
+    // Add CORS headers for all responses
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+    
+    // Handle OPTIONS for CORS
+    if (req.method === 'OPTIONS') {
+        res.writeHead(200);
+        res.end();
+        return;
+    }
+    
+    // Route based on path
+    if (req.url === '/' || req.url === '/index.html') {
+        // Serve the main UI
+        fs.readFile(path.join(__dirname, 'index.html'), (err, data) => {
+            if (err) {
+                console.error('Error reading index.html:', err);
+                res.writeHead(500);
+                res.end('Error loading page');
+                return;
+            }
+            res.writeHead(200, {'Content-Type': 'text/html'});
+            res.end(data);
+        });
+    } else if (req.url.startsWith('/chat')) {
+        // Proxy to chat UI
+        const targetPath = req.url.substring(5) || '/';
+        proxy(req, res, 'localhost', 3000, targetPath);
+    } else if (req.url.startsWith('/terminal')) {
+        // Proxy to ttyd
+        const targetPath = req.url.substring(9) || '/';
+        proxy(req, res, 'localhost', 7681, targetPath);
+    } else if (req.url.startsWith('/v1/')) {
+        // Proxy to gateway API - THIS IS THE IMPORTANT ONE
+        proxy(req, res, 'localhost', 8001, req.url);
+    } else {
+        res.writeHead(404);
+        res.end(`Not found: ${req.url}`);
+    }
+});
+
+// Handle WebSocket upgrades
+server.on('upgrade', (req, socket, head) => {
+    console.log(`WebSocket upgrade request: ${req.url}`);
+    
+    if (req.url.startsWith('/terminal')) {
+        // Proxy WebSocket to ttyd
+        const net = require('net');
+        const upstream = net.connect(7681, 'localhost');
+        
+        upstream.on('connect', () => {
+            console.log('Connected to ttyd WebSocket');
+            const targetPath = req.url.substring(9) || '/';
+            upstream.write(`GET ${targetPath} HTTP/1.1\r\n`);
+            for (const [key, value] of Object.entries(req.headers)) {
+                if (key.toLowerCase() !== 'host') {
+                    upstream.write(`${key}: ${value}\r\n`);
+                }
+            }
+            upstream.write('Host: localhost:7681\r\n');
+            upstream.write('\r\n');
+            upstream.write(head);
+            
+            socket.pipe(upstream);
+            upstream.pipe(socket);
+        });
+        
+        upstream.on('error', (err) => {
+            console.error('WebSocket upstream error:', err);
+            socket.destroy();
+        });
+        
+        socket.on('error', (err) => {
+            console.error('WebSocket socket error:', err);
+            upstream.destroy();
+        });
+    } else {
+        socket.destroy();
+    }
+});
+
+server.listen(PORT, '0.0.0.0', () => {
+    console.log(`UI server running on port ${PORT}`);
+    console.log('Routes:');
+    console.log('  / -> UI (this server)');
+    console.log('  /chat/* -> localhost:3000');
+    console.log('  /terminal/* -> localhost:7681');
+    console.log('  /v1/* -> localhost:8001 (Gateway API)');
+    
+    // Test gateway connectivity on startup
+    setTimeout(() => {
+        const testReq = http.get('http://localhost:8001/health', (res) => {
+            console.log(`Gateway health check: ${res.statusCode}`);
+        });
+        testReq.on('error', (err) => {
+            console.error('Gateway not responding:', err.message);
+        });
+    }, 1000);
+});
diff --git a/claude-home/ui/server.js b/claude-home/ui/server.js
diff --git a/claude-home/ui/server.js.bak b/claude-home/ui/server.js.bak
