fluxy-bot 0.7.7 → 0.8.0

package/bin/cli.js

@@ -18,7 +18,11 @@ const BIN_DIR = path.join(DATA_DIR, 'bin');
 const CF_PATH = path.join(BIN_DIR, 'cloudflared');
 
 const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf-8'));
-const [, , command, subcommand] = process.argv;
+const args = process.argv.slice(2);
+const command = args[0];
+const subcommand = args[1];
+const flags = new Set(args.filter(a => a.startsWith('--')));
+const HOSTED = flags.has('--hosted');
 
 // ── Daemon constants & helpers ──
 
@@ -828,15 +832,18 @@ function bootServer({ onTunnelUp, onReady } = {}) {
 // ── Main flows ──
 
 async function init() {
-  banner();
+  if (!HOSTED) banner();
 
   createConfig();
   writeVersionFile(pkg.version);
 
-  // Interactive tunnel mode selection
-  console.log('');
-  const tunnelMode = await chooseTunnelMode();
-  console.log('');
+  // --hosted: non-interactive, quick tunnel, no prompts
+  const tunnelMode = HOSTED ? 'quick' : await (async () => {
+    console.log('');
+    const mode = await chooseTunnelMode();
+    console.log('');
+    return mode;
+  })();
 
   // Update config with chosen mode
   const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
@@ -858,6 +865,11 @@ async function init() {
   const canDaemon = hasDaemonSupport();
   const hasTunnelInit = tunnelMode !== 'off';
 
+  // Hosted mode: simple log lines instead of animated stepper
+  const log = HOSTED
+    ? (msg) => console.log(`[fluxy] ${msg}`)
+    : null;
+
   const steps = [
     'Creating config',
     ...(hasTunnelInit ? ['Installing cloudflared'] : []),
@@ -867,40 +879,53 @@ async function init() {
     ...(canDaemon ? ['Setting up auto-start daemon'] : []),
   ];
 
-  const stepper = new Stepper(steps);
-  stepper.start();
+  const stepper = HOSTED ? null : new Stepper(steps);
+  if (stepper) stepper.start();
 
   // Config already created
-  stepper.advance();
+  if (log) log('Config created');
+  if (stepper) stepper.advance();
 
   // Cloudflared (skip for named — already installed during setup, skip for off — no tunnel)
   if (hasTunnelInit && tunnelMode !== 'named') {
+    if (log) log('Installing cloudflared...');
     await installCloudflared();
+    if (log) log('Cloudflared ready');
   }
-  if (hasTunnelInit) stepper.advance();
+  if (hasTunnelInit && stepper) stepper.advance();
 
   // Server + Tunnel
-  stepper.advance();
+  if (log) log('Starting server...');
+  if (stepper) stepper.advance();
   let result;
   try {
     result = await bootServer({
       onTunnelUp: hasTunnelInit ? (url) => {
-        stepper.advance();  // Connecting tunnel done
-        // Show the direct URL while waiting for the custom domain to become reachable
-        if (config.relay?.url) {
-          stepper.setInfo([
-            `  ${c.dim}Waiting for ${c.reset}${c.white}${config.relay.url.replace('https://', '')}${c.reset}${c.dim} to become reachable (can take up to 2 min)${c.reset}`,
-            `  ${c.dim}In the meanwhile you can access:${c.reset} ${c.blue}${link(url)}${c.reset}`,
-          ]);
+        if (log) log(`Tunnel up: ${url}`);
+        if (stepper) {
+          stepper.advance();  // Connecting tunnel done
+          if (config.relay?.url) {
+            stepper.setInfo([
+              `  ${c.dim}Waiting for ${c.reset}${c.white}${config.relay.url.replace('https://', '')}${c.reset}${c.dim} to become reachable (can take up to 2 min)${c.reset}`,
+              `  ${c.dim}In the meanwhile you can access:${c.reset} ${c.blue}${link(url)}${c.reset}`,
+            ]);
+          }
         }
       } : undefined,
       onReady: hasTunnelInit ? () => {
-        stepper.setInfo([]);
-        stepper.advance();  // Verifying connection done
+        if (log) log('Connection verified');
+        if (stepper) {
+          stepper.setInfo([]);
+          stepper.advance();  // Verifying connection done
+        }
       } : undefined,
     });
   } catch (err) {
-    stepper.finish();
+    if (stepper) stepper.finish();
+    if (HOSTED) {
+      console.error(JSON.stringify({ error: err.message }));
+      process.exit(1);
+    }
     console.error(`\n  ${c.red}Server failed to start:${c.reset}`);
     console.error(`  ${c.dim}${err.message}${c.reset}\n`);
     process.exit(1);
@@ -908,11 +933,13 @@ async function init() {
   let { child, tunnelUrl, relayUrl, tunnelFailed, viteWarm } = result;
 
   // Wait for Vite to finish pre-transforming all modules (with timeout)
+  if (log) log('Preparing dashboard...');
   await Promise.race([viteWarm, new Promise(r => setTimeout(r, 30_000))]);
-  stepper.advance();
+  if (stepper) stepper.advance();
 
   // Install daemon (systemd on Linux, launchd on macOS)
   if (canDaemon) {
+    if (log) log('Installing daemon...');
     await killAndWait(child);
     const nodePath = process.execPath;
     const realHome = os.homedir();
@@ -924,6 +951,7 @@ async function init() {
     // Wait for the daemon's supervisor to get a new tunnel URL
     // (the old one died with the temp server we just killed)
     if (res.status === 0 && hasTunnelInit) {
+      if (log) log('Waiting for daemon tunnel URL...');
       let daemonTunnelUrl = null;
       for (let i = 0; i < 30; i++) {
         await new Promise((r) => setTimeout(r, 1000));
@@ -943,8 +971,19 @@ async function init() {
       } catch {}
     }
 
-    stepper.advance();
-    stepper.finish();
+    if (stepper) {
+      stepper.advance();
+      stepper.finish();
+    }
+
+    if (HOSTED) {
+      // Machine-readable output for the provisioning script
+      const result = { tunnelUrl, status: tunnelFailed ? 'tunnel_failed' : 'ok' };
+      if (res.status === 0) result.daemon = true;
+      console.log(`__HOSTED_READY__=${JSON.stringify(result)}`);
+      process.exit(res.status ?? 0);
+    }
+
     if (!hasTunnelInit) {
       privateNetworkMessage(config.port);
     } else if (tunnelFailed) {
@@ -961,8 +1000,11 @@ async function init() {
     process.exit(res.status ?? 0);
   }
 
-  stepper.finish();
-  if (!hasTunnelInit) {
+  if (stepper) stepper.finish();
+  if (HOSTED) {
+    const result = { tunnelUrl, status: tunnelFailed ? 'tunnel_failed' : 'ok' };
+    console.log(`__HOSTED_READY__=${JSON.stringify(result)}`);
+  } else if (!hasTunnelInit) {
     privateNetworkMessage(config.port);
   } else if (tunnelFailed) {
     tunnelFailedMessage(tunnelUrl);