fluxy-bot 0.2.24 → 0.2.26

package/bin/cli.js

@@ -219,6 +219,10 @@ function bootServer() {
     let resolved = false;
     let stderrBuf = '';
 
+    // Vite warmup tracking
+    let viteWarmResolve;
+    const viteWarm = new Promise((r) => { viteWarmResolve = r; });
+
     const doResolve = () => {
       if (resolved) return;
       resolved = true;
@@ -227,6 +231,7 @@ function bootServer() {
         child,
         tunnelUrl: tunnelUrl || `http://localhost:${config.port}`,
         relayUrl: relayUrl || config.relay?.url || null,
+        viteWarm,
       });
     };
 
@@ -239,6 +244,10 @@ function bootServer() {
       const relayMatch = text.match(/__RELAY_URL__=(\S+)/);
       if (relayMatch) relayUrl = relayMatch[1];
 
+      if (text.includes('__VITE_WARM__')) {
+        viteWarmResolve();
+      }
+
       if (tunnelUrl && relayUrl) {
         doResolve();
         return;
@@ -308,18 +317,11 @@ async function init() {
     console.error(`  ${c.dim}${err.message}${c.reset}\n`);
     process.exit(1);
   }
-  const { child, tunnelUrl, relayUrl } = result;
+  const { child, tunnelUrl, relayUrl, viteWarm } = result;
   stepper.advance();
 
-  // Warm up Vite by fetching pages (triggers dep pre-bundling)
-  const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
-  const localUrl = `http://localhost:${config.port}`;
-  try {
-    await Promise.all([
-      fetch(localUrl + '/').then(r => r.text()),
-      fetch(localUrl + '/fluxy/onboard.html').then(r => r.text()),
-    ]);
-  } catch {}
+  // Wait for Vite to finish pre-transforming all modules (with timeout)
+  await Promise.race([viteWarm, new Promise(r => setTimeout(r, 30_000))]);
   stepper.advance();
 
   stepper.finish();
@@ -358,18 +360,11 @@ async function start() {
     console.error(`  ${c.dim}${err.message}${c.reset}\n`);
     process.exit(1);
   }
-  const { child, tunnelUrl, relayUrl } = result;
+  const { child, tunnelUrl, relayUrl, viteWarm } = result;
   stepper.advance();
 
-  // Warm up Vite by fetching pages (triggers dep pre-bundling)
-  const cfg = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
-  const local = `http://localhost:${cfg.port}`;
-  try {
-    await Promise.all([
-      fetch(local + '/').then(r => r.text()),
-      fetch(local + '/fluxy/onboard.html').then(r => r.text()),
-    ]);
-  } catch {}
+  // Wait for Vite to finish pre-transforming all modules (with timeout)
+  await Promise.race([viteWarm, new Promise(r => setTimeout(r, 30_000))]);
   stepper.advance();
 
   stepper.finish();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Self-hosted AI bot — run your own AI assistant from anywhere",
   "type": "module",
   "license": "MIT",

package/scripts/install.sh

@@ -69,9 +69,14 @@ ok "Files copied"
 # ── Install dependencies ──
 info "Installing dependencies (this may take a moment)..."
 cd "$FLUXY_HOME"
-npm install --omit=dev --ignore-scripts 2>/dev/null
+npm install --omit=dev 2>/dev/null
 ok "Dependencies installed"
 
+# ── Build fluxy chat + onboard (served as static files) ──
+info "Building chat interface..."
+npm run build:fluxy 2>/dev/null
+ok "Chat interface built"
+
 # ── Create symlink ──
 info "Creating fluxy command..."
 chmod +x "$FLUXY_HOME/bin/cli.js"

package/scripts/postinstall.js

@@ -61,6 +61,17 @@ try {
   // Non-fatal: deps may already exist from a previous install
 }
 
+// ── Build fluxy chat + onboard (served as static files) ──
+
+try {
+  execSync('npm run build:fluxy', {
+    cwd: FLUXY_HOME,
+    stdio: 'ignore',
+  });
+} catch {
+  // Non-fatal: will be built on first start if needed
+}
+
 // ── Create fluxy symlink ──
 
 const cliPath = path.join(FLUXY_HOME, 'bin', 'cli.js');

package/supervisor/index.ts

@@ -1,10 +1,12 @@
 import http from 'http';
 import net from 'net';
 import fs from 'fs';
+import path from 'path';
 import { WebSocketServer, WebSocket } from 'ws';
 import { loadConfig, saveConfig } from '../shared/config.js';
 import { createProvider, type AiProvider, type ChatMessage } from '../shared/ai.js';
 import { paths } from '../shared/paths.js';
+import { PKG_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 import { startTunnel, stopTunnel, isTunnelAlive, restartTunnel } from './tunnel.js';
 import { spawnWorker, stopWorker, getWorkerPort, isWorkerAlive } from './worker.js';
@@ -12,6 +14,20 @@ import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../s
 import { startFluxyAgentQuery, stopFluxyAgentQuery } from './fluxy-agent.js';
 import { startViteDevServers, stopViteDevServers } from './vite-dev.js';
 
+const DIST_FLUXY = path.join(PKG_DIR, 'dist-fluxy');
+
+const MIME_TYPES: Record<string, string> = {
+  '.html': 'text/html',
+  '.js': 'application/javascript',
+  '.css': 'text/css',
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.svg': 'image/svg+xml',
+  '.webm': 'video/webm',
+  '.woff2': 'font/woff2',
+  '.json': 'application/json',
+};
+
 const RECOVERING_HTML = `<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Recovering</title>
 <style>body{background:#0a0a0f;color:#94a3b8;font-family:system-ui;display:flex;align-items:center;justify-content:center;height:100vh;margin:0}
 div{text-align:center}h1{font-size:18px;margin-bottom:8px;color:#e2e8f0}p{font-size:14px}a{color:#60a5fa}</style></head>
@@ -23,10 +39,10 @@ export async function startSupervisor() {
   const config = loadConfig();
   const workerPort = getWorkerPort(config.port);
 
-  // Start Vite dev servers for instant HMR
-  console.log('[supervisor] Starting Vite dev servers...');
+  // Start Vite dev server for dashboard HMR
+  console.log('[supervisor] Starting Vite dev server...');
   const vitePorts = await startViteDevServers(config.port);
-  console.log(`[supervisor] Vite ready — dashboard :${vitePorts.dashboard}, fluxy :${vitePorts.fluxy}`);
+  console.log(`[supervisor] Vite ready — dashboard :${vitePorts.dashboard}`);
 
   // Fluxy's AI brain
   let ai: AiProvider | null = null;
@@ -73,25 +89,37 @@ export async function startSupervisor() {
       return;
     }
 
-    // Fluxy routes → proxy to fluxy Vite dev server
+    // Fluxy routes → serve pre-built static files from dist-fluxy/
     // Note: must check '/fluxy/' (with slash) to avoid matching '/fluxy_tilts.webm' etc.
     if (req.url === '/fluxy' || req.url?.startsWith('/fluxy/')) {
-      // Rewrite bare /fluxy or /fluxy/ to /fluxy/fluxy.html — Vite dev defaults to index.html otherwise
-      const proxyPath = (req.url === '/fluxy' || req.url === '/fluxy/') ? '/fluxy/fluxy.html' : req.url;
-      console.log(`[supervisor] → fluxy Vite :${vitePorts.fluxy} | ${req.method} ${proxyPath}${proxyPath !== req.url ? ` (rewritten from ${req.url})` : ''}`);
-      const proxy = http.request(
-        { host: '127.0.0.1', port: vitePorts.fluxy, path: proxyPath, method: req.method, headers: req.headers },
-        (proxyRes) => {
-          res.writeHead(proxyRes.statusCode!, proxyRes.headers);
-          proxyRes.pipe(res);
-        },
-      );
-      proxy.on('error', (e) => {
-        console.error(`[supervisor] Fluxy Vite proxy error: ${req.url}`, e.message);
-        res.writeHead(503, { 'Content-Type': 'text/html' });
-        res.end('<html><body style="background:#212121;color:#f5f5f5;display:flex;align-items:center;justify-content:center;height:100vh;font-family:system-ui"><p>Fluxy chat starting up...</p></body></html>');
-      });
-      req.pipe(proxy);
+      // Strip /fluxy prefix and resolve file path
+      let filePath = req.url!.replace(/^\/fluxy\/?/, '') || 'fluxy.html';
+      // Strip query strings (e.g. ?v=xxx)
+      filePath = filePath.split('?')[0];
+      const fullPath = path.join(DIST_FLUXY, filePath);
+
+      // Security: prevent directory traversal
+      if (!fullPath.startsWith(DIST_FLUXY)) {
+        res.writeHead(403);
+        res.end('Forbidden');
+        return;
+      }
+
+      try {
+        const stat = fs.statSync(fullPath);
+        if (stat.isFile()) {
+          const ext = path.extname(fullPath);
+          const mime = MIME_TYPES[ext] || 'application/octet-stream';
+          res.writeHead(200, { 'Content-Type': mime, 'Cache-Control': 'public, max-age=31536000, immutable' });
+          fs.createReadStream(fullPath).pipe(res);
+        } else {
+          res.writeHead(404);
+          res.end('Not found');
+        }
+      } catch {
+        res.writeHead(404);
+        res.end('Not found');
+      }
       return;
     }
 
@@ -213,10 +241,9 @@ export async function startSupervisor() {
       return;
     }
 
-    // Route HMR WebSocket to correct Vite dev server
-    const isFluxy = req.url === '/fluxy' || req.url?.startsWith('/fluxy/');
-    const targetPort = isFluxy ? vitePorts.fluxy : vitePorts.dashboard;
-    console.log(`[supervisor] → Vite HMR (${isFluxy ? 'fluxy' : 'dashboard'}) :${targetPort}`);
+    // 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');

package/supervisor/vite-dev.ts

@@ -4,21 +4,16 @@ import { PKG_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 
 let dashboardVite: ViteDevServer | null = null;
-let fluxyVite: ViteDevServer | null = null;
 
-export async function startViteDevServers(supervisorPort: number): Promise<{ dashboard: number; fluxy: number }> {
+export async function startViteDevServers(supervisorPort: number): Promise<{ dashboard: number }> {
   const ports = {
     dashboard: supervisorPort + 2,
-    fluxy: supervisorPort + 3,
   };
 
-  console.log(`[vite-dev] Starting Vite dev servers...`);
-  console.log(`[vite-dev] Dashboard → :${ports.dashboard}, Fluxy → :${ports.fluxy}`);
+  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] PKG_DIR = ${PKG_DIR}`);
 
-  // Dashboard Vite dev server
-  console.log('[vite-dev] Creating dashboard Vite server...');
   try {
     dashboardVite = await createViteServer({
       configFile: path.join(PKG_DIR, 'vite.config.ts'),
@@ -38,28 +33,21 @@ export async function startViteDevServers(supervisorPort: number): Promise<{ das
     throw err;
   }
 
-  // Fluxy chat Vite dev server
-  console.log('[vite-dev] Creating fluxy Vite server...');
-  try {
-    fluxyVite = await createViteServer({
-      configFile: path.join(PKG_DIR, 'vite.fluxy.config.ts'),
-      server: {
-        port: ports.fluxy,
-        host: '127.0.0.1',
-        strictPort: true,
-        allowedHosts: true,
-        hmr: { clientPort: supervisorPort },
-      },
-      logLevel: 'info',
-    });
-    await fluxyVite.listen();
-    console.log(`[vite-dev] ✓ Fluxy Vite ready on :${ports.fluxy}`);
-  } catch (err) {
-    console.error('[vite-dev] ✗ Fluxy Vite failed:', err);
-    throw err;
-  }
+  log.ok(`Vite HMR active — dashboard :${ports.dashboard}`);
+
+  // Warm up: fetch the dashboard entry to pre-transform modules
+  fetch(`http://127.0.0.1:${ports.dashboard}/`).then(r => r.text()).then(async (html) => {
+    const scriptRe = /src="([^"]+\.tsx)"/g;
+    let m;
+    while ((m = scriptRe.exec(html)) !== null) {
+      const url = `http://127.0.0.1:${ports.dashboard}${m[1].startsWith('/') ? '' : '/'}${m[1]}`;
+      await fetch(url).then(r => r.text()).catch(() => {});
+    }
+    console.log('__VITE_WARM__');
+  }).catch(() => {
+    console.log('__VITE_WARM__');
+  });
 
-  log.ok(`Vite HMR active — dashboard :${ports.dashboard}, fluxy :${ports.fluxy}`);
   return ports;
 }
 
@@ -70,9 +58,4 @@ export async function stopViteDevServers(): Promise<void> {
     dashboardVite = null;
     console.log('[vite-dev] Dashboard Vite stopped');
   }
-  if (fluxyVite) {
-    await fluxyVite.close();
-    fluxyVite = null;
-    console.log('[vite-dev] Fluxy Vite stopped');
-  }
 }

package/vite.config.ts

@@ -17,9 +17,20 @@ export default defineConfig({
     proxy: {
       '/api': 'http://localhost:3000',
     },
+    warmup: {
+      clientFiles: ['./src/main.tsx'],
+    },
   },
   optimizeDeps: {
     include: [
+      'react',
+      'react-dom/client',
+      'react/jsx-runtime',
+      'lucide-react',
+      'framer-motion',
+      'recharts',
+      'zustand',
+      'sonner',
       'use-sync-external-store',
       'use-sync-external-store/shim',
     ],

package/vite.fluxy.config.ts

@@ -19,8 +19,22 @@ export default defineConfig({
       },
     },
   },
+  server: {
+    warmup: {
+      clientFiles: ['./fluxy-main.tsx', './onboard-main.tsx'],
+    },
+  },
   optimizeDeps: {
     include: [
+      'react',
+      'react-dom/client',
+      'react/jsx-runtime',
+      'lucide-react',
+      'framer-motion',
+      'react-markdown',
+      'remark-gfm',
+      'react-syntax-highlighter',
+      'react-syntax-highlighter/dist/esm/styles/prism/one-dark',
       'use-sync-external-store',
       'use-sync-external-store/shim',
     ],