fluxy-bot 0.1.28 → 0.1.30

package/bin/cli.js

@@ -159,19 +159,21 @@ function createConfig() {
 const MIN_CF_SIZE = 10 * 1024 * 1024; // 10 MB — valid cloudflared is ~30-50 MB
 
 function hasCloudflared() {
-  // Check system-wide install
-  const which = process.platform === 'win32' ? 'where cloudflared' : 'which cloudflared';
-  try { execSync(which, { stdio: 'ignore' }); return true; } catch {}
-
-  // Check local install (validate by file size, never execute — avoids Windows popup)
+  // Check local install first (validate by file size, never execute — avoids Windows popup)
   const cfExe = process.platform === 'win32' ? CF_PATH + '.exe' : CF_PATH;
-  if (!fs.existsSync(cfExe)) return false;
-  const size = fs.statSync(cfExe).size;
-  if (size < MIN_CF_SIZE) {
+  if (fs.existsSync(cfExe)) {
+    const size = fs.statSync(cfExe).size;
+    if (size >= MIN_CF_SIZE) return true;
     fs.unlinkSync(cfExe);
-    return false;
   }
-  return true;
+
+  // Fall back to system-wide install (skip on Windows — system cloudflared
+  // spams AssignProcessToJobObject when spawned as a child process)
+  if (process.platform !== 'win32') {
+    try { execSync('which cloudflared', { stdio: 'ignore' }); return true; } catch {}
+  }
+
+  return false;
 }
 
 async function installCloudflared() {

package/package.json

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

package/supervisor/tunnel.ts

@@ -10,18 +10,20 @@ 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) {
+  // Check local install first (validate by file size, never execute — avoids Windows popup)
+  if (fs.existsSync(paths.cloudflared)) {
+    const size = fs.statSync(paths.cloudflared).size;
+    if (size >= MIN_CF_SIZE) return paths.cloudflared;
     fs.unlinkSync(paths.cloudflared);
-    return null;
   }
-  return paths.cloudflared;
+
+  // Fall back to system-wide install (skip on Windows — system cloudflared
+  // spams AssignProcessToJobObject when spawned as a child process)
+  if (process.platform !== 'win32') {
+    try { execSync('which cloudflared', { stdio: 'ignore' }); return 'cloudflared'; } catch {}
+  }
+
+  return null;
 }
 
 export async function installCloudflared(): Promise<string> {
@@ -64,12 +66,13 @@ export function startTunnel(port: number): Promise<string> {
 
     proc = spawn(bin, ['tunnel', '--url', `http://localhost:${port}`, '--no-autoupdate'], {
       stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true,
     });
 
+    let buf = '';
     const onData = (d: Buffer) => {
-      const text = d.toString();
-      if (text.includes('AssignProcessToJobObject')) return;
-      const m = text.match(/https:\/\/[^\s]+\.trycloudflare\.com/);
+      buf += d.toString();
+      const m = buf.match(/https:\/\/[^\s]+\.trycloudflare\.com/);
       if (m) { clearTimeout(timeout); resolve(m[0]); }
     };