fluxy-bot 0.4.15 → 0.4.16

package/package.json

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

package/supervisor/backend.ts

@@ -1,24 +1,11 @@
 import { spawn, type ChildProcess } from 'child_process';
-import fs from 'fs';
 import path from 'path';
 import { PKG_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 
 let child: ChildProcess | null = null;
 let restarts = 0;
-let lastSpawnTime = 0;
-let pendingRestartTimer: ReturnType<typeof setTimeout> | null = null;
 const MAX_RESTARTS = 3;
-const STABLE_THRESHOLD_MS = 30_000; // 30s uptime = reset counter
-
-// File watcher state
-let watcher: fs.FSWatcher | null = null;
-let restartInProgress = false;
-let restartInProgressTimer: ReturnType<typeof setTimeout> | null = null;
-let debounceTimer: ReturnType<typeof setTimeout> | null = null;
-
-const IGNORED_EXTENSIONS = new Set(['.db', '.sqlite', '.db-journal', '.db-wal']);
-const IGNORED_DIRS = new Set(['node_modules', '.git']);
 
 export function getBackendPort(basePort: number): number {
   return basePort + 4;
@@ -33,8 +20,6 @@ export function spawnBackend(port: number): ChildProcess {
     env: { ...process.env, BACKEND_PORT: String(port) },
   });
 
-  lastSpawnTime = Date.now();
-
   child.stdout?.on('data', (d) => {
     process.stdout.write(d);
   });
@@ -46,20 +31,10 @@ export function spawnBackend(port: number): ChildProcess {
   child.on('exit', (code) => {
     if (code !== 0 && code !== null) {
       log.warn(`Backend crashed (code ${code})`);
-
-      // Auto-reset counter if the process was stable (alive >30s)
-      const uptime = Date.now() - lastSpawnTime;
-      if (uptime > STABLE_THRESHOLD_MS) {
-        restarts = 0;
-      }
-
       if (restarts < MAX_RESTARTS) {
         restarts++;
         log.info(`Restarting backend (${restarts}/${MAX_RESTARTS})...`);
-        pendingRestartTimer = setTimeout(() => {
-          pendingRestartTimer = null;
-          spawnBackend(port);
-        }, 1000);
+        setTimeout(() => spawnBackend(port), 1000);
       } else {
         log.error('Backend failed too many times. Use Fluxy chat to debug.');
       }
@@ -71,11 +46,6 @@ export function spawnBackend(port: number): ChildProcess {
 }
 
 export function stopBackend(): void {
-  // Clear any pending crash-recovery restart
-  if (pendingRestartTimer) {
-    clearTimeout(pendingRestartTimer);
-    pendingRestartTimer = null;
-  }
   child?.kill();
   child = null;
 }
@@ -87,75 +57,3 @@ export function isBackendAlive(): boolean {
 export function resetBackendRestarts(): void {
   restarts = 0;
 }
-
-/**
- * Mark that a restart is already in progress (e.g. from Fluxy agent bot:done).
- * The file watcher will skip triggering a restart for the next 2 seconds.
- */
-export function markRestartInProgress(): void {
-  restartInProgress = true;
-  if (restartInProgressTimer) clearTimeout(restartInProgressTimer);
-  restartInProgressTimer = setTimeout(() => {
-    restartInProgress = false;
-    restartInProgressTimer = null;
-  }, 2000);
-}
-
-/**
- * Watch workspace/backend/ for file changes and auto-restart.
- * Returns a cleanup function.
- */
-export function startBackendWatcher(port: number, onRestart?: () => void): void {
-  const watchDir = path.join(PKG_DIR, 'workspace', 'backend');
-
-  try {
-    watcher = fs.watch(watchDir, { recursive: true }, (_event, filename) => {
-      if (!filename) return;
-
-      // Filter out ignored files
-      const ext = path.extname(filename);
-      if (IGNORED_EXTENSIONS.has(ext)) return;
-
-      // Filter out ignored directories
-      const parts = filename.split(path.sep);
-      if (parts.some((p) => IGNORED_DIRS.has(p))) return;
-
-      // Debounce rapid saves (500ms)
-      if (debounceTimer) clearTimeout(debounceTimer);
-      debounceTimer = setTimeout(() => {
-        debounceTimer = null;
-
-        // Skip if a restart was already triggered (e.g. by Fluxy agent)
-        if (restartInProgress) {
-          log.info(`[watcher] File changed (${filename}) — restart already in progress, skipping`);
-          return;
-        }
-
-        log.info(`[watcher] File changed: ${filename} — restarting backend`);
-        resetBackendRestarts();
-        stopBackend();
-        spawnBackend(port);
-        onRestart?.();
-      }, 500);
-    });
-
-    log.ok(`Watching workspace/backend/ for changes`);
-  } catch (err) {
-    log.warn(`File watcher failed: ${err instanceof Error ? err.message : err}`);
-  }
-}
-
-export function stopBackendWatcher(): void {
-  if (watcher) {
-    watcher.close();
-    watcher = null;
-  }
-  if (debounceTimer) {
-    clearTimeout(debounceTimer);
-    debounceTimer = null;
-  }
-  if (restartInProgressTimer) {
-    clearTimeout(restartInProgressTimer);
-    restartInProgressTimer = null;
-  }
-}

package/supervisor/index.ts

@@ -10,7 +10,7 @@ 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';
-import { spawnBackend, stopBackend, getBackendPort, resetBackendRestarts, startBackendWatcher, stopBackendWatcher, markRestartInProgress } from './backend.js';
+import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, resetBackendRestarts } from './backend.js';
 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';
@@ -162,44 +162,30 @@ export async function startSupervisor() {
       return;
     }
 
-    // App API routes → proxy to user's backend server (with retry on startup)
+    // App API routes → proxy to user's backend server
     if (req.url?.startsWith('/app/api')) {
       const backendPath = req.url.replace(/^\/app\/api/, '') || '/';
       console.log(`[supervisor] → backend :${backendPort} | ${req.method} ${backendPath}`);
+      if (!isBackendAlive()) {
+        console.log('[supervisor] Backend down — returning 503');
+        res.writeHead(503, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Backend is starting...' }));
+        return;
+      }
 
-      // Buffer request body so we can replay it on retry
-      const chunks: Buffer[] = [];
-      req.on('data', (chunk) => chunks.push(chunk));
-      req.on('end', () => {
-        const body = Buffer.concat(chunks);
-        let attempt = 0;
-        const MAX_RETRIES = 3;
-        const RETRY_DELAY = 500;
-
-        function tryProxy() {
-          const proxy = http.request(
-            { host: '127.0.0.1', port: backendPort, path: backendPath, method: req.method, headers: req.headers },
-            (proxyRes) => {
-              res.writeHead(proxyRes.statusCode!, proxyRes.headers);
-              proxyRes.pipe(res);
-            },
-          );
-          proxy.on('error', (e: NodeJS.ErrnoException) => {
-            if (e.code === 'ECONNREFUSED' && attempt < MAX_RETRIES) {
-              attempt++;
-              console.log(`[supervisor] Backend not ready, retry ${attempt}/${MAX_RETRIES}...`);
-              setTimeout(tryProxy, RETRY_DELAY);
-            } else {
-              console.error(`[supervisor] Backend proxy error: ${req.url}`, e.message);
-              res.writeHead(503, { 'Content-Type': 'application/json' });
-              res.end(JSON.stringify({ error: 'Backend unavailable' }));
-            }
-          });
-          proxy.end(body);
-        }
-
-        tryProxy();
+      const proxy = http.request(
+        { host: '127.0.0.1', port: backendPort, path: backendPath, method: req.method, headers: req.headers },
+        (proxyRes) => {
+          res.writeHead(proxyRes.statusCode!, proxyRes.headers);
+          proxyRes.pipe(res);
+        },
+      );
+      proxy.on('error', (e) => {
+        console.error(`[supervisor] Backend proxy error: ${req.url}`, e.message);
+        res.writeHead(503, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Backend unavailable' }));
       });
+      req.pipe(proxy);
       return;
     }
 
@@ -437,7 +423,6 @@ export async function startSupervisor() {
                 if (eventData.usedFileTools) {
                   console.log('[supervisor] File tools used — Vite HMR will apply changes automatically');
                   console.log('[supervisor] Restarting backend...');
-                  markRestartInProgress(); // prevent file watcher from double-restarting
                   resetBackendRestarts();
                   stopBackend();
                   spawnBackend(backendPort);
@@ -579,9 +564,6 @@ export async function startSupervisor() {
   // Spawn worker + backend
   spawnWorker(workerPort);
   spawnBackend(backendPort);
-  startBackendWatcher(backendPort, () => {
-    broadcastFluxy('app:hmr-update');
-  });
 
   // Tunnel
   let tunnelUrl: string | null = null;
@@ -661,7 +643,6 @@ export async function startSupervisor() {
     delete latestConfig.tunnelUrl;
     saveConfig(latestConfig);
     stopWorker();
-    stopBackendWatcher();
     stopBackend();
     stopTunnel();
     console.log('[supervisor] Stopping Vite dev servers...');