fluxy-bot 0.1.6 → 0.1.8

package/bin/cli.js

@@ -140,14 +140,22 @@ function createConfig() {
   }
 }
 
+const MIN_CF_SIZE = 10 * 1024 * 1024; // 10 MB — valid cloudflared is ~30-50 MB
+
 function hasCloudflared() {
-  try {
-    const cmd = process.platform === 'win32' ? 'where cloudflared' : 'which cloudflared';
-    execSync(cmd, { stdio: 'ignore' });
-    return true;
-  } catch {}
+  // 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;
-  return fs.existsSync(cfExe);
+  if (!fs.existsSync(cfExe)) return false;
+  const size = fs.statSync(cfExe).size;
+  if (size < MIN_CF_SIZE) {
+    fs.unlinkSync(cfExe);
+    return false;
+  }
+  return true;
 }
 
 async function installCloudflared() {
@@ -156,11 +164,14 @@ async function installCloudflared() {
   fs.mkdirSync(BIN_DIR, { recursive: true });
 
   const platform = os.platform();
-  const arch = os.arch();
+  // os.arch() returns Node's arch, not the OS. Use PROCESSOR_ARCHITECTURE on Windows for real OS arch.
+  const arch = platform === 'win32'
+    ? (process.env.PROCESSOR_ARCHITECTURE || os.arch()).toLowerCase()
+    : os.arch();
   let url;
 
   if (platform === 'win32') {
-    url = arch === 'arm64'
+    url = arch.includes('arm')
       ? 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-arm64.exe'
       : 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe';
   } else if (platform === 'darwin') {

package/package.json

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

package/supervisor/tunnel.ts

@@ -7,11 +7,21 @@ import { log } from '../shared/logger.js';
 
 let proc: ChildProcess | null = null;
 
+const MIN_CF_SIZE = 10 * 1024 * 1024; // 10 MB — valid cloudflared is ~30-50 MB
+
 function findBinary(): string | null {
-  const cmd = process.platform === 'win32' ? 'where cloudflared' : 'which cloudflared';
-  try { execSync(cmd, { stdio: 'ignore' }); return 'cloudflared'; } catch {}
-  if (fs.existsSync(paths.cloudflared)) return paths.cloudflared;
-  return 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;
 }
 
 export async function installCloudflared(): Promise<string> {
@@ -21,11 +31,14 @@ export async function installCloudflared(): Promise<string> {
   const dir = path.dirname(paths.cloudflared);
   fs.mkdirSync(dir, { recursive: true });
 
-  const p = os.platform(), a = os.arch();
+  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 === 'arm64' ? 'arm64' : 'amd64'}.exe`;
+  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`;