npm - fluxy-bot - Versions diffs - 0.11.5 → 0.11.6 - Mend

fluxy-bot 0.11.5 → 0.11.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "releaseNotes": [
     "Adding a way for users to claim their fluxies on the fluxy.bot dashboard",
     "2. ",

package/supervisor/index.ts CHANGED Viewed

@@ -9,7 +9,8 @@ import { paths } from '../shared/paths.js';
 import { PKG_DIR, DATA_DIR, WORKSPACE_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 import { startTunnel, stopTunnel, isTunnelAlive, restartTunnel, startNamedTunnel, restartNamedTunnel } from './tunnel.js';
-import { spawnWorker, stopWorker, getWorkerPort, isWorkerAlive } from './worker.js';
+import { createWorkerApp } from '../worker/index.js';
+import { closeDb, getSession, getSetting } from '../worker/db.js';
 import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, resetBackendRestarts } from './backend.js';
 import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../shared/relay.js';
 import { startFluxyAgentQuery, stopFluxyAgentQuery, type RecentMessage } from './fluxy-agent.js';
@@ -195,7 +196,6 @@ const RECOVERING_HTML = `<!DOCTYPE html><html style="background:#222122"><head><
 export async function startSupervisor() {
   const config = loadConfig();
-  const workerPort = getWorkerPort(config.port);
   const backendPort = getBackendPort(config.port);
   // Create HTTP server first (Vite needs it for HMR WebSocket)
@@ -211,6 +211,9 @@ export async function startSupervisor() {
   // Ensure file storage dirs exist
   ensureFileDirs();
+  // Initialize worker routes in-process (no separate child process)
+  const workerApp = createWorkerApp();
   // Fluxy's AI brain
   let ai: AiProvider | null = null;
   if (config.ai.provider && (config.ai.apiKey || config.ai.provider === 'ollama')) {
@@ -227,11 +230,11 @@ export async function startSupervisor() {
   let currentStreamConvId: string | null = null;
   let currentStreamBuffer = '';
-  /** Call worker API endpoints */
-  async function workerApi(path: string, method = 'GET', body?: any) {
+  /** Call worker API endpoints (in-process via supervisor's own HTTP server) */
+  async function workerApi(apiPath: string, method = 'GET', body?: any) {
     const opts: RequestInit = { method, headers: { 'Content-Type': 'application/json' } };
     if (body) opts.body = JSON.stringify(body);
-    const res = await fetch(`http://127.0.0.1:${workerPort}${path}`, opts);
+    const res = await fetch(`http://127.0.0.1:${config.port}${apiPath}`, opts);
     return res.json();
   }
@@ -252,13 +255,8 @@ export async function startSupervisor() {
     if (cached && cached > Date.now()) return true;
     try {
-      const res = await fetch(`http://127.0.0.1:${workerPort}/api/portal/validate-token`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ token }),
-      });
-      const data = await res.json() as { valid: boolean };
-      if (data.valid) {
+      const session = getSession(token);
+      if (session) {
         tokenCache.set(token, Date.now() + TOKEN_CACHE_TTL);
         return true;
       }
@@ -274,9 +272,7 @@ export async function startSupervisor() {
   async function isAuthRequired(): Promise<boolean> {
     if (authRequiredCache && authRequiredCache.expires > Date.now()) return authRequiredCache.value;
     try {
-      const res = await fetch(`http://127.0.0.1:${workerPort}/api/onboard/status`);
-      const data = await res.json() as { portalConfigured: boolean };
-      const required = !!data.portalConfigured;
+      const required = !!getSetting('portal_pass');
       authRequiredCache = { value: required, expires: Date.now() + 30_000 };
       return required;
     } catch {
@@ -368,16 +364,8 @@ export async function startSupervisor() {
       return;
     }
-    // API routes → proxy to worker
+    // API routes → handled in-process by worker Express app
     if (req.url?.startsWith('/api')) {
-      console.log(`[supervisor] → worker :${workerPort} | ${req.method} ${req.url}`);
-      if (!isWorkerAlive()) {
-        console.log('[supervisor] Worker down — returning 503');
-        res.writeHead(503, { 'Content-Type': 'text/html' });
-        res.end(RECOVERING_HTML);
-        return;
-      }
       // Auth check for mutation routes (POST/PUT/DELETE) — GET/HEAD are read-only, skip auth
       const method = req.method || 'GET';
       if (method !== 'GET' && method !== 'HEAD' && !isExemptRoute(method, req.url || '')) {
@@ -393,19 +381,7 @@ export async function startSupervisor() {
         }
       }
-      const proxy = http.request(
-        { host: '127.0.0.1', port: workerPort, path: req.url, method: req.method, headers: req.headers },
-        (proxyRes) => {
-          res.writeHead(proxyRes.statusCode!, proxyRes.headers);
-          proxyRes.pipe(res);
-        },
-      );
-      proxy.on('error', (e) => {
-        console.error(`[supervisor] Worker proxy error: ${req.url}`, e.message);
-        res.writeHead(503, { 'Content-Type': 'text/html' });
-        res.end(RECOVERING_HTML);
-      });
-      req.pipe(proxy);
+      workerApp(req, res);
       return;
     }
@@ -1047,8 +1023,7 @@ export async function startSupervisor() {
     }
   }
-  // Spawn worker + backend
-  spawnWorker(workerPort);
+  // Spawn backend (worker runs in-process)
   spawnBackend(backendPort);
   // Start pulse/cron scheduler
@@ -1277,7 +1252,7 @@ export async function startSupervisor() {
     // Clear persisted tunnel URL so stale values aren't reused
     delete latestConfig.tunnelUrl;
     saveConfig(latestConfig);
-    stopWorker();
+    closeDb();
     await stopBackend();
     stopTunnel();
     console.log('[supervisor] Stopping Vite dev servers...');

package/worker/index.ts CHANGED Viewed

@@ -67,9 +67,7 @@ function parseCookie(cookieHeader: string | undefined, name: string): string | u
   return match ? match.slice(name.length + 1) : undefined;
 }
-const port = parseInt(process.env.WORKER_PORT || '3001', 10);
-const config = loadConfig();
+export function createWorkerApp() {
 // Database
 initDb();
@@ -882,10 +880,7 @@ app.post('/api/whisper/transcribe', express.json({ limit: '10mb' }), async (req,
 // Serve stored files (audio, images, documents)
 app.use('/api/files', express.static(paths.files));
-// Dashboard is served by Vite dev server via supervisor proxy — no static files here
-console.log('[worker] API-only mode — dashboard served by Vite dev server');
-// HTTP server (no WebSocket — chat lives in supervisor)
-const server = app.listen(port, () => log.ok(`Worker on port ${port}`));
+log.ok('Worker routes initialized (in-process)');
-process.on('SIGTERM', () => { closeDb(); server.close(); process.exit(0); });
+return app;
+}