fluxy-bot 0.4.18 → 0.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "Self-hosted, self-evolving AI agent with its own dashboard.",
   "type": "module",
   "license": "MIT",

package/supervisor/index.ts

@@ -14,7 +14,7 @@ import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, resetBackend
 import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../shared/relay.js';
 import { startFluxyAgentQuery, stopFluxyAgentQuery, clearFluxySession } from './fluxy-agent.js';
 import { ensureFileDirs, saveAttachment, type SavedFile } from './file-saver.js';
-import { startViteDevServers, stopViteDevServers, reloadDashboard } from './vite-dev.js';
+import { startViteDevServers, stopViteDevServers } from './vite-dev.js';
 import { execSync } from 'child_process';
 
 const DIST_FLUXY = path.join(PKG_DIR, 'dist-fluxy');
@@ -57,10 +57,15 @@ export async function startSupervisor() {
   const workerPort = getWorkerPort(config.port);
   const backendPort = getBackendPort(config.port);
 
-  // Start Vite dev server for dashboard HMR
+  // Create HTTP server first (Vite needs it for HMR WebSocket)
+  // The request handler is set up later via server.on('request')
+  const server = http.createServer();
+
+  // Start Vite dev server — pass supervisor server so Vite attaches HMR WebSocket directly
   console.log('[supervisor] Starting Vite dev server...');
-  const vitePorts = await startViteDevServers(config.port);
+  const vitePorts = await startViteDevServers(config.port, server);
   console.log(`[supervisor] Vite ready — dashboard :${vitePorts.dashboard}`);
+  console.log(`[supervisor] Upgrade listeners on server: ${server.listenerCount('upgrade')}`);
 
   // Ensure file storage dirs exist
   ensureFileDirs();
@@ -152,8 +157,8 @@ export async function startSupervisor() {
     });
   }
 
-  // HTTP server — proxies to Vite dev servers + worker API
-  const server = http.createServer(async (req, res) => {
+  // HTTP request handler — proxies to Vite dev servers + worker API
+  server.on('request', async (req, res) => {
     // Fluxy widget — served directly (not part of Vite build)
     if (req.url === '/fluxy/widget.js') {
       console.log('[supervisor] Serving /fluxy/widget.js directly');
@@ -421,11 +426,10 @@ export async function startSupervisor() {
               // Intercept bot:done — Vite HMR handles file changes automatically
               if (type === 'bot:done') {
                 if (eventData.usedFileTools) {
-                  console.log('[supervisor] File tools used — reloading dashboard + restarting backend');
+                  console.log('[supervisor] File tools used — Vite HMR handles frontend, restarting backend');
                   resetBackendRestarts();
                   stopBackend();
                   spawnBackend(backendPort);
-                  reloadDashboard();
                 }
                 return; // don't forward bot:done to client
               }
@@ -508,41 +512,30 @@ export async function startSupervisor() {
     });
   });
 
+  // Fluxy chat WebSocket — Vite HMR is handled automatically (hmr.server = this server)
   server.on('upgrade', async (req, socket: net.Socket, head) => {
-    console.log(`[supervisor] WebSocket upgrade: ${req.url}`);
-
-    if (req.url?.startsWith('/fluxy/ws')) {
-      // Auth check for WebSocket
-      const needsAuth = await isAuthRequired();
-      if (needsAuth) {
-        const urlObj = new URL(req.url, `http://${req.headers.host}`);
-        const token = urlObj.searchParams.get('token');
-        if (!token || !(await validateToken(token))) {
-          console.log('[supervisor] WS auth failed — rejecting');
-          socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
-          socket.destroy();
-          return;
-        }
-      }
+    console.log(`[supervisor] WebSocket upgrade: ${req.url} | protocol=${req.headers['sec-websocket-protocol'] || 'none'}`);
 
-      console.log('[supervisor] → Fluxy chat WebSocket');
-      fluxyWss.handleUpgrade(req, socket, head, (ws) => fluxyWss.emit('connection', ws, req));
+    if (!req.url?.startsWith('/fluxy/ws')) {
+      console.log('[supervisor] → Letting Vite handle this upgrade');
       return;
     }
 
-    // Route HMR WebSocket to dashboard Vite dev server
-    const targetPort = vitePorts.dashboard;
-    console.log(`[supervisor] → Vite HMR (dashboard) :${targetPort}`);
-
-    const proxy = net.connect(targetPort, () => {
-      const headers = Object.entries(req.headers).map(([k, v]) => `${k}: ${v}`).join('\r\n');
-      proxy.write(`GET ${req.url} HTTP/1.1\r\n${headers}\r\n\r\n`);
-      if (head.length > 0) proxy.write(head);
-      socket.pipe(proxy).pipe(socket);
-    });
+    // Auth check for WebSocket
+    const needsAuth = await isAuthRequired();
+    if (needsAuth) {
+      const urlObj = new URL(req.url, `http://${req.headers.host}`);
+      const token = urlObj.searchParams.get('token');
+      if (!token || !(await validateToken(token))) {
+        console.log('[supervisor] WS auth failed — rejecting');
+        socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
+        socket.destroy();
+        return;
+      }
+    }
 
-    proxy.on('error', () => { console.error(`[supervisor] WS proxy error → :${targetPort}`); socket.destroy(); });
-    socket.on('error', () => proxy.destroy());
+    console.log('[supervisor] → Fluxy chat WebSocket');
+    fluxyWss.handleUpgrade(req, socket, head, (ws) => fluxyWss.emit('connection', ws, req));
   });
 
   // Start

package/supervisor/vite-dev.ts

@@ -1,17 +1,18 @@
 import { createServer as createViteServer, type ViteDevServer } from 'vite';
+import type http from 'http';
 import path from 'path';
 import { PKG_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 
 let dashboardVite: ViteDevServer | null = null;
 
-export async function startViteDevServers(supervisorPort: number): Promise<{ dashboard: number }> {
+export async function startViteDevServers(supervisorPort: number, hmrServer: http.Server): Promise<{ dashboard: number }> {
   const ports = {
     dashboard: supervisorPort + 2,
   };
 
   console.log(`[vite-dev] Starting dashboard Vite dev server on :${ports.dashboard}`);
-  console.log(`[vite-dev] HMR clientPort → :${supervisorPort} (browser connects through supervisor proxy)`);
+  console.log(`[vite-dev] HMR attached to supervisor server (port ${supervisorPort})`);
   console.log(`[vite-dev] PKG_DIR = ${PKG_DIR}`);
 
   try {
@@ -22,7 +23,7 @@ export async function startViteDevServers(supervisorPort: number): Promise<{ das
         host: '127.0.0.1',
         strictPort: true,
         allowedHosts: true,
-        hmr: { clientPort: supervisorPort },
+        hmr: { server: hmrServer, clientPort: supervisorPort },
       },
       logLevel: 'info',
     });