fluxy-bot 0.8.9 → 0.9.0

package/shared/relay.ts

@@ -5,99 +5,90 @@ const RELAY_API = 'https://api.fluxy.bot/api';
 // ─── Register a new handle ──────────────────────────────────────────────────
 
 export async function registerHandle(
-    username: string,
-    tier: string
+  username: string,
+  tier: string,
 ): Promise<{ token: string; relayUrl: string }> {
-    const res = await fetch(`${RELAY_API}/register`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ username, tier })
-    });
+  const res = await fetch(`${RELAY_API}/register`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ username, tier }),
+  });
 
-    const data = await res.json();
+  const data = await res.json();
 
-    if (!res.ok) {
-        throw new Error(data.error || `Registration failed (${res.status})`);
-    }
+  if (!res.ok) {
+    throw new Error(data.error || `Registration failed (${res.status})`);
+  }
 
-    return { token: data.token, relayUrl: data.relayUrl };
+  return { token: data.token, relayUrl: data.relayUrl };
 }
 
 // ─── Check username availability ─────────────────────────────────────────────
 
-export async function checkAvailability(username: string): Promise<{
-    valid: boolean;
-    error?: string;
-    handles: {
-        tier: string;
-        url: string;
-        paid: boolean;
-        price: number;
-        available: boolean;
-    }[];
+export async function checkAvailability(
+  username: string,
+): Promise<{
+  valid: boolean;
+  error?: string;
+  handles: { tier: string; url: string; paid: boolean; price: number; available: boolean }[];
 }> {
-    const res = await fetch(
-        `${RELAY_API}/availability/${encodeURIComponent(username)}`
-    );
-    return res.json();
+  const res = await fetch(`${RELAY_API}/availability/${encodeURIComponent(username)}`);
+  return res.json();
 }
 
 // ─── Claim a reserved (purchased) handle ────────────────────────────────────
 
 export async function claimReservedHandle(
-    handle: string,
-    hash: string
+  handle: string,
+  hash: string,
 ): Promise<{ token: string; relayUrl: string }> {
-    const res = await fetch(`${RELAY_API}/handle/claim-reserved`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ handle, hash })
-    });
+  const res = await fetch(`${RELAY_API}/handle/claim-reserved`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ handle, hash }),
+  });
 
-    const data = await res.json();
+  const data = await res.json();
 
-    if (!res.ok) {
-        throw new Error(data.error || `Claim failed (${res.status})`);
-    }
+  if (!res.ok) {
+    throw new Error(data.error || `Claim failed (${res.status})`);
+  }
 
-    return { token: data.token, relayUrl: data.relayUrl };
+  return { token: data.token, relayUrl: data.relayUrl };
 }
 
 // ─── Release handle ─────────────────────────────────────────────────────────
 
 export async function releaseHandle(token: string): Promise<void> {
-    const res = await fetch(`${RELAY_API}/handle`, {
-        method: 'DELETE',
-        headers: { Authorization: `Bearer ${token}` }
-    });
-
-    if (!res.ok) {
-        const data = await res.json().catch(() => ({}));
-        throw new Error(data.error || `Release failed (${res.status})`);
-    }
+  const res = await fetch(`${RELAY_API}/handle`, {
+    method: 'DELETE',
+    headers: { Authorization: `Bearer ${token}` },
+  });
+
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Release failed (${res.status})`);
+  }
 }
 
 // ─── Update tunnel URL ──────────────────────────────────────────────────────
 
-export async function updateTunnelUrl(
-    token: string,
-    tunnelUrl: string
-): Promise<void> {
-    const res = await fetch(`${RELAY_API}/tunnel`, {
-        method: 'PUT',
-        headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${token}`
-        },
-        body: JSON.stringify({ tunnelUrl })
-    });
-
-    if (!res.ok) {
-        const data = await res.json().catch(() => ({}));
-        throw new Error(data.error || `Tunnel update failed (${res.status})`);
-    }
-
-    log.ok('Relay updated with tunnel URL');
+export async function updateTunnelUrl(token: string, tunnelUrl: string): Promise<void> {
+  const res = await fetch(`${RELAY_API}/tunnel`, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({ tunnelUrl }),
+  });
+
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    throw new Error(data.error || `Tunnel update failed (${res.status})`);
+  }
+
+  log.ok('Relay updated with tunnel URL');
 }
 
 // ─── Heartbeat ───────────────────────────────────────────────────────────────
@@ -105,45 +96,45 @@ export async function updateTunnelUrl(
 let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
 
 export function startHeartbeat(token: string, tunnelUrl?: string): void {
-    stopHeartbeat();
-
-    const beat = async () => {
-        try {
-            await fetch(`${RELAY_API}/heartbeat`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${token}`
-                },
-                body: JSON.stringify(tunnelUrl ? { tunnelUrl } : {})
-            });
-        } catch {
-            // Silent — next heartbeat will retry
-        }
-    };
-
-    beat(); // immediate first beat
-    heartbeatTimer = setInterval(beat, 30_000); // every 30s
+  stopHeartbeat();
+
+  const beat = async () => {
+    try {
+      await fetch(`${RELAY_API}/heartbeat`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify(tunnelUrl ? { tunnelUrl } : {}),
+      });
+    } catch {
+      // Silent — next heartbeat will retry
+    }
+  };
+
+  beat(); // immediate first beat
+  heartbeatTimer = setInterval(beat, 30_000); // every 30s
 }
 
 export function stopHeartbeat(): void {
-    if (heartbeatTimer) {
-        clearInterval(heartbeatTimer);
-        heartbeatTimer = null;
-    }
+  if (heartbeatTimer) {
+    clearInterval(heartbeatTimer);
+    heartbeatTimer = null;
+  }
 }
 
 // ─── Disconnect (graceful shutdown) ──────────────────────────────────────────
 
 export async function disconnect(token: string): Promise<void> {
-    stopHeartbeat();
+  stopHeartbeat();
 
-    try {
-        await fetch(`${RELAY_API}/disconnect`, {
-            method: 'POST',
-            headers: { Authorization: `Bearer ${token}` }
-        });
-    } catch {
-        // Best-effort — if it fails, heartbeat timeout will mark offline
-    }
+  try {
+    await fetch(`${RELAY_API}/disconnect`, {
+      method: 'POST',
+      headers: { Authorization: `Bearer ${token}` },
+    });
+  } catch {
+    // Best-effort — if it fails, heartbeat timeout will mark offline
+  }
 }

package/supervisor/backend.ts

@@ -1,7 +1,7 @@
 import { spawn, type ChildProcess } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { PKG_DIR, WORKSPACE_DIR } from '../shared/paths.js';
+import { PKG_DIR } from '../shared/paths.js';
 import { log } from '../shared/logger.js';
 
 let child: ChildProcess | null = null;
@@ -11,108 +11,96 @@ let intentionallyStopped = false;
 const MAX_RESTARTS = 3;
 const STABLE_THRESHOLD = 30_000; // 30s — if backend ran this long, it wasn't a crash loop
 
-const LOG_FILE = path.join(WORKSPACE_DIR, '.backend.log');
+const LOG_FILE = path.join(PKG_DIR, 'workspace', '.backend.log');
 
 export function getBackendPort(basePort: number): number {
-    return basePort + 4;
+  return basePort + 4;
 }
 
 export function spawnBackend(port: number): ChildProcess {
-    const backendPath = path.join(WORKSPACE_DIR, 'backend', 'index.ts');
-    lastSpawnTime = Date.now();
-    intentionallyStopped = false;
-
-    // Clear log file on each restart — only keeps current run
-    try {
-        fs.writeFileSync(LOG_FILE, '');
-    } catch {}
-
-    // Wrap the backend in an inline loader that:
-    // 1. Dynamically imports the user's backend (tsx handles .ts compilation)
-    // 2. Adds a keepalive timer so the event loop never drains (fixes exit code 0 under systemd)
-    // 3. Catches and logs import errors instead of silently exiting
-    const backendUrl = 'file://' + backendPath.replace(/\\/g, '/');
-    const wrapper = [
-        `import('${backendUrl}')`,
-        `  .catch(e => { console.error('[backend] Fatal:', e); process.exit(1); });`,
-        `setInterval(() => {}, 60000);`
-    ].join('\n');
-
-    child = spawn(
-        process.execPath,
-        ['--import', 'tsx/esm', '--input-type=module', '-e', wrapper],
-        {
-            cwd: WORKSPACE_DIR,
-            stdio: ['ignore', 'pipe', 'pipe'],
-            env: { ...process.env, BACKEND_PORT: String(port) }
-        }
-    );
-
-    child.stdout?.on('data', d => {
-        process.stdout.write(d);
-        try {
-            fs.appendFileSync(LOG_FILE, d);
-        } catch {}
-    });
-
-    child.stderr?.on('data', d => {
-        process.stderr.write(d);
-        try {
-            fs.appendFileSync(LOG_FILE, d);
-        } catch {}
-    });
-
-    child.on('exit', code => {
-        // Supervisor called stopBackend() — don't auto-restart
-        if (intentionallyStopped) return;
-
-        // Any unexpected exit (crash, SIGTERM, OOM, null code) — restart
-        log.warn(`Backend exited unexpectedly (code ${code})`);
-        // If backend was alive for >30s, it's not a crash loop — reset counter
-        if (Date.now() - lastSpawnTime > STABLE_THRESHOLD) {
-            restarts = 0;
-        }
-
-        restarts++;
-        const delay = Math.min(1000 * restarts, 5000);
-        log.info(
-            `Restarting backend (attempt ${restarts}, delay ${delay}ms)...`
-        );
-        setTimeout(() => spawnBackend(port), delay);
-    });
-
-    log.ok(`Backend spawned on port ${port}`);
-    return child;
+  const backendPath = path.join(PKG_DIR, 'workspace', 'backend', 'index.ts');
+  lastSpawnTime = Date.now();
+  intentionallyStopped = false;
+
+  // Clear log file on each restart — only keeps current run
+  try { fs.writeFileSync(LOG_FILE, ''); } catch {}
+
+  // Wrap the backend in an inline loader that:
+  // 1. Dynamically imports the user's backend (tsx handles .ts compilation)
+  // 2. Adds a keepalive timer so the event loop never drains (fixes exit code 0 under systemd)
+  // 3. Catches and logs import errors instead of silently exiting
+  const backendUrl = 'file://' + backendPath.replace(/\\/g, '/');
+  const wrapper = [
+    `import('${backendUrl}')`,
+    `  .catch(e => { console.error('[backend] Fatal:', e); process.exit(1); });`,
+    `setInterval(() => {}, 60000);`,
+  ].join('\n');
+
+  child = spawn(process.execPath, ['--import', 'tsx/esm', '--input-type=module', '-e', wrapper], {
+    cwd: path.join(PKG_DIR, 'workspace'),
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: { ...process.env, BACKEND_PORT: String(port) },
+  });
+
+  child.stdout?.on('data', (d) => {
+    process.stdout.write(d);
+    try { fs.appendFileSync(LOG_FILE, d); } catch {}
+  });
+
+  child.stderr?.on('data', (d) => {
+    process.stderr.write(d);
+    try { fs.appendFileSync(LOG_FILE, d); } catch {}
+  });
+
+  child.on('exit', (code) => {
+    // Supervisor called stopBackend() — don't auto-restart
+    if (intentionallyStopped) return;
+
+    // Any unexpected exit (crash, SIGTERM, OOM, null code) — restart
+    log.warn(`Backend exited unexpectedly (code ${code})`);
+    // If backend was alive for >30s, it's not a crash loop — reset counter
+    if (Date.now() - lastSpawnTime > STABLE_THRESHOLD) {
+      restarts = 0;
+    }
+    if (restarts < MAX_RESTARTS) {
+      restarts++;
+      log.info(`Restarting backend (${restarts}/${MAX_RESTARTS})...`);
+      setTimeout(() => spawnBackend(port), 1000 * restarts);
+    } else {
+      log.error('Backend failed too many times. Use Fluxy chat to debug.');
+    }
+  });
+
+  log.ok(`Backend spawned on port ${port}`);
+  return child;
 }
 
 /** Stop the backend and wait for the process to fully exit before resolving.
  *  This prevents port collisions when restarting (old process must release the port first). */
 export function stopBackend(): Promise<void> {
-    return new Promise(resolve => {
-        if (!child || child.exitCode !== null) {
-            child = null;
-            resolve();
-            return;
-        }
-        intentionallyStopped = true;
-        const dying = child;
-        child = null;
-        dying.once('exit', () => resolve());
-        dying.kill();
-        // Safety: force kill after 3s if SIGTERM doesn't work
-        setTimeout(() => {
-            try {
-                dying.kill('SIGKILL');
-            } catch {}
-            resolve();
-        }, 3000);
-    });
+  return new Promise((resolve) => {
+    if (!child || child.exitCode !== null) {
+      child = null;
+      resolve();
+      return;
+    }
+    intentionallyStopped = true;
+    const dying = child;
+    child = null;
+    dying.once('exit', () => resolve());
+    dying.kill();
+    // Safety: force kill after 3s if SIGTERM doesn't work
+    setTimeout(() => {
+      try { dying.kill('SIGKILL'); } catch {}
+      resolve();
+    }, 3000);
+  });
 }
 
 export function isBackendAlive(): boolean {
-    return child !== null && child.exitCode === null;
+  return child !== null && child.exitCode === null;
 }
 
 export function resetBackendRestarts(): void {
-    restarts = 0;
+  restarts = 0;
 }

package/supervisor/chat/ARCHITECTURE.md

@@ -48,7 +48,6 @@ When a user registers a handle (e.g. `bug.at.fluxy.bot`), the relay proxies all
 However, **POST requests from the chat iframe fail** (502 / timeout). The relay + tunnel chain cannot reliably forward HTTP POST bodies originating from an iframe context. The exact cause is in the relay/tunnel infrastructure — the request never reaches the supervisor.
 
 This does NOT affect:
-
 - The initial onboard (`/fluxy/onboard.html` in a separate iframe, runs before the relay is configured)
 - Direct `localhost` access
 - GET requests from the chat iframe
@@ -72,19 +71,19 @@ The supervisor's WebSocket handler receives the `settings:save` message and make
 
 ### When to use WebSocket vs HTTP
 
-| From where      | GET                       | POST/PUT      | Notes                                         |
-| --------------- | ------------------------- | ------------- | --------------------------------------------- |
-| Initial onboard | `fetch()`                 | `fetch()`     | Runs before relay exists, direct tunnel works |
-| Chat iframe     | `fetch()` / `authFetch()` | **WebSocket** | POST through relay fails                      |
-| Dashboard       | `fetch()`                 | `fetch()`     | Not in an iframe, relay handles it fine       |
+| From where | GET | POST/PUT | Notes |
+|---|---|---|---|
+| Initial onboard | `fetch()` | `fetch()` | Runs before relay exists, direct tunnel works |
+| Chat iframe | `fetch()` / `authFetch()` | **WebSocket** | POST through relay fails |
+| Dashboard | `fetch()` | `fetch()` | Not in an iframe, relay handles it fine |
 
 ## Key Files
 
-| File                                   | Purpose                                                 |
-| -------------------------------------- | ------------------------------------------------------- |
-| `supervisor/widget.js`                 | Creates the chat iframe + bubble on the dashboard       |
-| `supervisor/chat/fluxy-main.tsx`       | Chat app entry point, WS connection, wizard integration |
-| `supervisor/chat/OnboardWizard.tsx`    | Setup wizard (uses `onSave` prop for WS saves)          |
-| `supervisor/chat/src/lib/ws-client.ts` | WebSocket client with reconnect + message queue         |
-| `supervisor/index.ts`                  | Supervisor HTTP server + WS handler (`settings:save`)   |
-| `worker/index.ts`                      | Worker API (`POST /api/onboard`, settings DB)           |
+| File | Purpose |
+|---|---|
+| `supervisor/widget.js` | Creates the chat iframe + bubble on the dashboard |
+| `supervisor/chat/fluxy-main.tsx` | Chat app entry point, WS connection, wizard integration |
+| `supervisor/chat/OnboardWizard.tsx` | Setup wizard (uses `onSave` prop for WS saves) |
+| `supervisor/chat/src/lib/ws-client.ts` | WebSocket client with reconnect + message queue |
+| `supervisor/index.ts` | Supervisor HTTP server + WS handler (`settings:save`) |
+| `worker/index.ts` | Worker API (`POST /api/onboard`, settings DB) |