fluxy-bot 0.8.9 → 0.9.0

package/supervisor/tunnel.ts

@@ -10,201 +10,147 @@ let proc: ChildProcess | null = null;
 const MIN_CF_SIZE = 10 * 1024 * 1024; // 10 MB — valid cloudflared is ~30-50 MB
 
 function findBinary(): string | null {
-    // Check system-wide install
-    const which =
-        process.platform === 'win32'
-            ? 'where cloudflared'
-            : 'which cloudflared';
-    try {
-        execSync(which, { stdio: 'ignore' });
-        return 'cloudflared';
-    } catch {}
-
-    // Check local install (validate by file size, never execute — avoids Windows popup)
-    if (!fs.existsSync(paths.cloudflared)) return null;
-    const size = fs.statSync(paths.cloudflared).size;
-    if (size < MIN_CF_SIZE) {
-        fs.unlinkSync(paths.cloudflared);
-        return null;
-    }
-    return paths.cloudflared;
+  // Check system-wide install
+  const which = process.platform === 'win32' ? 'where cloudflared' : 'which cloudflared';
+  try { execSync(which, { stdio: 'ignore' }); return 'cloudflared'; } catch {}
+
+  // Check local install (validate by file size, never execute — avoids Windows popup)
+  if (!fs.existsSync(paths.cloudflared)) return null;
+  const size = fs.statSync(paths.cloudflared).size;
+  if (size < MIN_CF_SIZE) {
+    fs.unlinkSync(paths.cloudflared);
+    return null;
+  }
+  return paths.cloudflared;
 }
 
 export async function installCloudflared(): Promise<string> {
-    const existing = findBinary();
-    if (existing) return existing;
-
-    const dir = path.dirname(paths.cloudflared);
-    fs.mkdirSync(dir, { recursive: true });
-
-    const p = os.platform();
-    const a =
-        p === 'win32'
-            ? (process.env.PROCESSOR_ARCHITECTURE || os.arch()).toLowerCase()
-            : os.arch();
-    const base =
-        'https://github.com/cloudflare/cloudflared/releases/latest/download';
-
-    let url: string;
-    if (p === 'win32')
-        url = `${base}/cloudflared-windows-${a.includes('arm') ? 'arm64' : 'amd64'}.exe`;
-    else if (p === 'darwin')
-        url = `${base}/cloudflared-darwin-${a === 'arm64' ? 'arm64' : 'amd64'}.tgz`;
-    else if (a === 'arm64' || a === 'aarch64')
-        url = `${base}/cloudflared-linux-arm64`;
-    else if (a.startsWith('arm')) url = `${base}/cloudflared-linux-arm`;
-    else url = `${base}/cloudflared-linux-amd64`;
-
-    log.info('Installing cloudflared...');
-    if (p === 'win32') {
-        execSync(`curl.exe -fsSL -o "${paths.cloudflared}" "${url}"`, {
-            stdio: 'ignore'
-        });
-    } else if (url.endsWith('.tgz')) {
-        execSync(`curl -fsSL "${url}" | tar xz -C "${dir}"`, {
-            stdio: 'ignore'
-        });
-    } else {
-        execSync(`curl -fsSL -o "${paths.cloudflared}" "${url}"`, {
-            stdio: 'ignore'
-        });
-    }
-    if (p !== 'win32') fs.chmodSync(paths.cloudflared, 0o755);
-    log.ok('cloudflared installed');
-    return paths.cloudflared;
+  const existing = findBinary();
+  if (existing) return existing;
+
+  const dir = path.dirname(paths.cloudflared);
+  fs.mkdirSync(dir, { recursive: true });
+
+  const p = os.platform();
+  const a = p === 'win32'
+    ? (process.env.PROCESSOR_ARCHITECTURE || os.arch()).toLowerCase()
+    : os.arch();
+  const base = 'https://github.com/cloudflare/cloudflared/releases/latest/download';
+
+  let url: string;
+  if (p === 'win32') url = `${base}/cloudflared-windows-${a.includes('arm') ? 'arm64' : 'amd64'}.exe`;
+  else if (p === 'darwin') url = `${base}/cloudflared-darwin-${a === 'arm64' ? 'arm64' : 'amd64'}.tgz`;
+  else if (a === 'arm64' || a === 'aarch64') url = `${base}/cloudflared-linux-arm64`;
+  else if (a.startsWith('arm')) url = `${base}/cloudflared-linux-arm`;
+  else url = `${base}/cloudflared-linux-amd64`;
+
+  log.info('Installing cloudflared...');
+  if (p === 'win32') {
+    execSync(`curl.exe -fsSL -o "${paths.cloudflared}" "${url}"`, { stdio: 'ignore' });
+  } else if (url.endsWith('.tgz')) {
+    execSync(`curl -fsSL "${url}" | tar xz -C "${dir}"`, { stdio: 'ignore' });
+  } else {
+    execSync(`curl -fsSL -o "${paths.cloudflared}" "${url}"`, { stdio: 'ignore' });
+  }
+  if (p !== 'win32') fs.chmodSync(paths.cloudflared, 0o755);
+  log.ok('cloudflared installed');
+  return paths.cloudflared;
 }
 
 export function startTunnel(port: number): Promise<string> {
-    return new Promise(async (resolve, reject) => {
-        const bin = await installCloudflared();
-        const timeout = setTimeout(
-            () => reject(new Error('Tunnel timeout')),
-            30_000
-        );
-
-        proc = spawn(
-            bin,
-            ['tunnel', '--url', `http://localhost:${port}`, '--no-autoupdate'],
-            {
-                stdio: ['ignore', 'pipe', 'pipe'],
-                windowsHide: true
-            }
-        );
-
-        let buf = '';
-        const onData = (d: Buffer) => {
-            buf += d.toString();
-            const m = buf.match(/https:\/\/[^\s]+\.trycloudflare\.com/);
-            if (m) {
-                clearTimeout(timeout);
-                resolve(m[0]);
-            }
-        };
-
-        proc.stdout?.on('data', onData);
-        proc.stderr?.on('data', onData);
-        proc.on('error', e => {
-            clearTimeout(timeout);
-            reject(e);
-        });
-        proc.on('exit', code => {
-            if (code !== 0) {
-                clearTimeout(timeout);
-                reject(new Error(`cloudflared exited with code ${code}`));
-            }
-        });
+  return new Promise(async (resolve, reject) => {
+    const bin = await installCloudflared();
+    const timeout = setTimeout(() => reject(new Error('Tunnel timeout')), 30_000);
+
+    proc = spawn(bin, ['tunnel', '--url', `http://localhost:${port}`, '--no-autoupdate'], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true,
     });
+
+    let buf = '';
+    const onData = (d: Buffer) => {
+      buf += d.toString();
+      const m = buf.match(/https:\/\/[^\s]+\.trycloudflare\.com/);
+      if (m) { clearTimeout(timeout); resolve(m[0]); }
+    };
+
+    proc.stdout?.on('data', onData);
+    proc.stderr?.on('data', onData);
+    proc.on('error', (e) => { clearTimeout(timeout); reject(e); });
+    proc.on('exit', (code) => { if (code !== 0) { clearTimeout(timeout); reject(new Error(`cloudflared exited with code ${code}`)); } });
+  });
 }
 
-export async function startNamedTunnel(
-    configPath: string,
-    name: string
-): Promise<void> {
-    const bin = await installCloudflared();
+export async function startNamedTunnel(configPath: string, name: string): Promise<void> {
+  const bin = await installCloudflared();
 
-    proc = spawn(bin, ['tunnel', '--config', configPath, 'run', name], {
-        stdio: ['ignore', 'pipe', 'pipe'],
-        windowsHide: true
-    });
+  proc = spawn(bin, ['tunnel', '--config', configPath, 'run', name], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    windowsHide: true,
+  });
 
-    proc.stdout?.on('data', (d: Buffer) =>
-        log.info(`[named-tunnel] ${d.toString().trim()}`)
-    );
-    proc.stderr?.on('data', (d: Buffer) =>
-        log.info(`[named-tunnel] ${d.toString().trim()}`)
-    );
-    proc.on('error', e => log.error(`Named tunnel error: ${e.message}`));
-    proc.on('exit', code => {
-        if (code !== 0) log.warn(`Named tunnel exited with code ${code}`);
-    });
+  proc.stdout?.on('data', (d: Buffer) => log.info(`[named-tunnel] ${d.toString().trim()}`));
+  proc.stderr?.on('data', (d: Buffer) => log.info(`[named-tunnel] ${d.toString().trim()}`));
+  proc.on('error', (e) => log.error(`Named tunnel error: ${e.message}`));
+  proc.on('exit', (code) => { if (code !== 0) log.warn(`Named tunnel exited with code ${code}`); });
 }
 
 export async function startTunnelForMode(
-    mode: 'off' | 'quick' | 'named',
-    port: number,
-    configPath?: string,
-    name?: string
+  mode: 'off' | 'quick' | 'named',
+  port: number,
+  configPath?: string,
+  name?: string,
 ): Promise<string | null> {
-    if (mode === 'off') return null;
-    if (mode === 'named') {
-        if (!configPath || !name)
-            throw new Error('Named tunnel requires configPath and name');
-        await startNamedTunnel(configPath, name);
-        return null; // URL is known from config.tunnel.domain
-    }
-    // mode === 'quick'
-    return startTunnel(port);
+  if (mode === 'off') return null;
+  if (mode === 'named') {
+    if (!configPath || !name) throw new Error('Named tunnel requires configPath and name');
+    await startNamedTunnel(configPath, name);
+    return null; // URL is known from config.tunnel.domain
+  }
+  // mode === 'quick'
+  return startTunnel(port);
 }
 
 export function stopTunnel(): void {
-    proc?.kill();
-    proc = null;
+  proc?.kill();
+  proc = null;
 }
 
 /** Check if the cloudflared child process is still running */
 export function isTunnelProcessAlive(): boolean {
-    return proc !== null && proc.exitCode === null && proc.signalCode === null;
+  return proc !== null && proc.exitCode === null && proc.signalCode === null;
 }
 
-export async function isTunnelAlive(
-    url: string,
-    localPort?: number
-): Promise<boolean> {
-    // 1. Process check — if cloudflared exited, tunnel is definitely dead
-    if (!isTunnelProcessAlive()) return false;
-
-    // 2. Local reachability check — confirm the local server is still responding.
-    //    We probe localhost directly instead of the tunnel URL because on macOS
-    //    the server can't reach itself through the Cloudflare tunnel (DNS/firewall).
-    //    If localhost responds and cloudflared is running, the tunnel is alive.
-    if (localPort) {
-        try {
-            const res = await fetch(
-                `http://127.0.0.1:${localPort}/api/health?_cb=${Date.now()}`,
-                {
-                    signal: AbortSignal.timeout(3000)
-                }
-            );
-            if (res.ok) return true;
-        } catch {}
-        // Local server not responding — but cloudflared is alive, so tunnel is still up.
-        // The worker may be restarting. Don't kill the tunnel for a local issue.
-        return true;
-    }
-
-    // No local port provided — process alive is enough
+export async function isTunnelAlive(url: string, localPort?: number): Promise<boolean> {
+  // 1. Process check — if cloudflared exited, tunnel is definitely dead
+  if (!isTunnelProcessAlive()) return false;
+
+  // 2. Local reachability check — confirm the local server is still responding.
+  //    We probe localhost directly instead of the tunnel URL because on macOS
+  //    the server can't reach itself through the Cloudflare tunnel (DNS/firewall).
+  //    If localhost responds and cloudflared is running, the tunnel is alive.
+  if (localPort) {
+    try {
+      const res = await fetch(`http://127.0.0.1:${localPort}/api/health?_cb=${Date.now()}`, {
+        signal: AbortSignal.timeout(3000),
+      });
+      if (res.ok) return true;
+    } catch {}
+    // Local server not responding — but cloudflared is alive, so tunnel is still up.
+    // The worker may be restarting. Don't kill the tunnel for a local issue.
     return true;
+  }
+
+  // No local port provided — process alive is enough
+  return true;
 }
 
 export async function restartTunnel(port: number): Promise<string> {
-    stopTunnel();
-    return startTunnel(port);
+  stopTunnel();
+  return startTunnel(port);
 }
 
-export async function restartNamedTunnel(
-    configPath: string,
-    name: string
-): Promise<void> {
-    stopTunnel();
-    await startNamedTunnel(configPath, name);
+export async function restartNamedTunnel(configPath: string, name: string): Promise<void> {
+  stopTunnel();
+  await startNamedTunnel(configPath, name);
 }

package/supervisor/vite-dev.ts

@@ -6,77 +6,67 @@ import { log } from '../shared/logger.js';
 
 let dashboardVite: ViteDevServer | null = null;
 
-export async function startViteDevServers(
-    supervisorPort: number,
-    hmrServer: http.Server
-): Promise<{ dashboard: number }> {
-    const ports = {
-        dashboard: supervisorPort + 2
-    };
+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 attached to supervisor server`);
-    console.log(`[vite-dev] PKG_DIR = ${PKG_DIR}`);
+  console.log(`[vite-dev] Starting dashboard Vite dev server on :${ports.dashboard}`);
+  console.log(`[vite-dev] HMR attached to supervisor server`);
+  console.log(`[vite-dev] PKG_DIR = ${PKG_DIR}`);
 
-    try {
-        dashboardVite = await createViteServer({
-            configFile: path.join(PKG_DIR, 'vite.config.ts'),
-            server: {
-                port: ports.dashboard,
-                host: '127.0.0.1',
-                strictPort: true,
-                allowedHosts: true,
-                // HMR WebSocket is attached directly to the supervisor's HTTP server.
-                // No clientPort — the browser connects on the same origin the page is served from,
-                // so it works both locally (localhost:3000) and through the relay (riven.fluxy.bot:443).
-                hmr: { server: hmrServer }
-            },
-            logLevel: 'info'
-        });
-        await dashboardVite.listen();
-        console.log(`[vite-dev] ✓ Dashboard Vite ready on :${ports.dashboard}`);
-    } catch (err) {
-        console.error('[vite-dev] ✗ Dashboard Vite failed:', err);
-        throw err;
-    }
+  try {
+    dashboardVite = await createViteServer({
+      configFile: path.join(PKG_DIR, 'vite.config.ts'),
+      server: {
+        port: ports.dashboard,
+        host: '127.0.0.1',
+        strictPort: true,
+        allowedHosts: true,
+        // HMR WebSocket is attached directly to the supervisor's HTTP server.
+        // No clientPort — the browser connects on the same origin the page is served from,
+        // so it works both locally (localhost:3000) and through the relay (riven.fluxy.bot:443).
+        hmr: { server: hmrServer },
+      },
+      logLevel: 'info',
+    });
+    await dashboardVite.listen();
+    console.log(`[vite-dev] ✓ Dashboard Vite ready on :${ports.dashboard}`);
+  } catch (err) {
+    console.error('[vite-dev] ✗ Dashboard Vite failed:', err);
+    throw err;
+  }
 
-    log.ok(`Vite HMR active — dashboard :${ports.dashboard}`);
+  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__');
-        });
+  // 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__');
+  });
 
-    return ports;
+  return ports;
 }
 
 /** Tell connected browsers to full-reload via Vite's HMR WebSocket */
 export function reloadDashboard(): void {
-    if (!dashboardVite) return;
-    console.log('[vite-dev] Sending full-reload to dashboard clients');
-    dashboardVite.hot.send({ type: 'full-reload', path: '*' });
+  if (!dashboardVite) return;
+  console.log('[vite-dev] Sending full-reload to dashboard clients');
+  dashboardVite.hot.send({ type: 'full-reload', path: '*' });
 }
 
 export async function stopViteDevServers(): Promise<void> {
-    console.log('[vite-dev] Stopping Vite dev servers...');
-    if (dashboardVite) {
-        await dashboardVite.close();
-        dashboardVite = null;
-        console.log('[vite-dev] Dashboard Vite stopped');
-    }
+  console.log('[vite-dev] Stopping Vite dev servers...');
+  if (dashboardVite) {
+    await dashboardVite.close();
+    dashboardVite = null;
+    console.log('[vite-dev] Dashboard Vite stopped');
+  }
 }