fluxy-bot 0.1.30 → 0.1.32

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { spawn, spawnSync, execSync } from 'child_process';
+import { spawn, execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
@@ -8,21 +8,6 @@ import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-// Delegate to ~/.fluxy/app/ if we're not already running from there
-const FLUXY_APP_DIR = path.join(os.homedir(), '.fluxy', 'app');
-const FLUXY_APP_CLI = path.join(FLUXY_APP_DIR, 'bin', 'cli.js');
-if (
-  fs.existsSync(FLUXY_APP_CLI) &&
-  path.resolve(__dirname) !== path.resolve(path.join(FLUXY_APP_DIR, 'bin'))
-) {
-  const { status } = spawnSync(
-    process.execPath,
-    [FLUXY_APP_CLI, ...process.argv.slice(2)],
-    { stdio: 'inherit' },
-  );
-  process.exit(status ?? 0);
-}
-
 const ROOT = path.resolve(__dirname, '..');
 const DATA_DIR = path.join(os.homedir(), '.fluxy');
 const CONFIG_PATH = path.join(DATA_DIR, 'config.json');
@@ -159,21 +144,19 @@ function createConfig() {
 const MIN_CF_SIZE = 10 * 1024 * 1024; // 10 MB — valid cloudflared is ~30-50 MB
 
 function hasCloudflared() {
-  // Check local install first (validate by file size, never execute — avoids Windows popup)
+  // 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)
   const cfExe = process.platform === 'win32' ? CF_PATH + '.exe' : CF_PATH;
-  if (fs.existsSync(cfExe)) {
-    const size = fs.statSync(cfExe).size;
-    if (size >= MIN_CF_SIZE) return true;
+  if (!fs.existsSync(cfExe)) return false;
+  const size = fs.statSync(cfExe).size;
+  if (size < MIN_CF_SIZE) {
     fs.unlinkSync(cfExe);
+    return false;
   }
-
-  // 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;
+  return true;
 }
 
 async function installCloudflared() {

package/package.json

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

package/supervisor/tunnel.ts

@@ -10,20 +10,18 @@ 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 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;
+  // 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;
   }
-
-  // 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;
+  return paths.cloudflared;
 }
 
 export async function installCloudflared(): Promise<string> {