fluxy-bot 0.5.52 → 0.5.54

package/bin/cli.js

@@ -140,6 +140,8 @@ class Stepper {
     this.frame = 0;
     this.interval = null;
     this.done = false;
+    this.infoLines = [];   // extra lines shown below the progress bar
+    this._totalLines = 0;  // total lines rendered last frame (for cursor rewind)
   }
 
   start() {
@@ -151,11 +153,16 @@ class Stepper {
     this.render();
   }
 
+  setInfo(lines) {
+    this.infoLines = lines || [];
+    this.render();
+  }
+
   render() {
     if (this.done) return;
 
-    if (this.current > 0 || this.frame > 0) {
-      process.stdout.write(`\x1b[${this.steps.length + 2}A`);
+    if (this._totalLines > 0) {
+      process.stdout.write(`\x1b[${this._totalLines}A`);
     }
 
     const ratio = this.current / this.steps.length;
@@ -171,6 +178,19 @@ class Stepper {
     }
 
     console.log(`\n  ${progressBar(ratio)}  ${c.dim}${Math.round(ratio * 100)}%${c.reset}`);
+
+    // steps + blank + progress = steps.length + 2, plus info lines
+    let lineCount = this.steps.length + 2;
+
+    if (this.infoLines.length) {
+      console.log('');
+      for (const line of this.infoLines) {
+        console.log(line);
+      }
+      lineCount += 1 + this.infoLines.length;
+    }
+
+    this._totalLines = lineCount;
   }
 
   advance() {
@@ -182,7 +202,15 @@ class Stepper {
     this.done = true;
     if (this.interval) clearInterval(this.interval);
 
-    process.stdout.write(`\x1b[${this.steps.length + 2}A`);
+    if (this._totalLines > 0) {
+      process.stdout.write(`\x1b[${this._totalLines}A`);
+    }
+    // Clear all previously rendered lines
+    for (let i = 0; i < this._totalLines; i++) {
+      process.stdout.write('\x1b[2K\n');
+    }
+    process.stdout.write(`\x1b[${this._totalLines}A`);
+
     for (const step of this.steps) {
       console.log(`  ${c.blue}✔${c.reset}  ${step}`);
     }
@@ -325,7 +353,7 @@ async function installCloudflared() {
 
 // ── Boot server ──
 
-function bootServer() {
+function bootServer({ onTunnelUp, onReady } = {}) {
   return new Promise((resolve, reject) => {
     const child = spawn(
       process.execPath,
@@ -337,6 +365,7 @@ function bootServer() {
     let relayUrl = null;
     let resolved = false;
     let stderrBuf = '';
+    let tunnelFired = false;
 
     // Vite warmup tracking
     let viteWarmResolve;
@@ -345,6 +374,8 @@ function bootServer() {
     const doResolve = () => {
       if (resolved) return;
       resolved = true;
+      if (!tunnelFired && onTunnelUp) onTunnelUp();
+      if (onReady) onReady();
       const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
       resolve({
         child,
@@ -358,7 +389,10 @@ function bootServer() {
       const text = data.toString();
 
       const tunnelMatch = text.match(/__TUNNEL_URL__=(\S+)/);
-      if (tunnelMatch) tunnelUrl = tunnelMatch[1];
+      if (tunnelMatch) {
+        tunnelUrl = tunnelMatch[1];
+        if (!tunnelFired && onTunnelUp) { tunnelFired = true; onTunnelUp(tunnelUrl); }
+      }
 
       const relayMatch = text.match(/__RELAY_URL__=(\S+)/);
       if (relayMatch) relayUrl = relayMatch[1];
@@ -432,9 +466,25 @@ async function init() {
 
   // Server + Tunnel
   stepper.advance();
+  const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
   let result;
   try {
-    result = await bootServer();
+    result = await bootServer({
+      onTunnelUp: (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}`,
+          ]);
+        }
+      },
+      onReady: () => {
+        stepper.setInfo([]);
+        stepper.advance();  // Verifying connection done
+      },
+    });
   } catch (err) {
     stepper.finish();
     console.error(`\n  ${c.red}Server failed to start:${c.reset}`);
@@ -442,8 +492,6 @@ async function init() {
     process.exit(1);
   }
   const { child, tunnelUrl, relayUrl, viteWarm } = result;
-  stepper.advance(); // Connecting tunnel done
-  stepper.advance(); // Verifying connection done
 
   // Wait for Vite to finish pre-transforming all modules (with timeout)
   await Promise.race([viteWarm, new Promise(r => setTimeout(r, 30_000))]);
@@ -523,9 +571,24 @@ async function start() {
   stepper.advance(); // config exists
   stepper.advance(); // starting
 
+  const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
   let result;
   try {
-    result = await bootServer();
+    result = await bootServer({
+      onTunnelUp: (url) => {
+        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}`,
+          ]);
+        }
+      },
+      onReady: () => {
+        stepper.setInfo([]);
+        stepper.advance();  // Verifying connection done
+      },
+    });
   } catch (err) {
     stepper.finish();
     console.error(`\n  ${c.red}Server failed to start:${c.reset}`);
@@ -533,8 +596,6 @@ async function start() {
     process.exit(1);
   }
   const { child, tunnelUrl, relayUrl, viteWarm } = result;
-  stepper.advance(); // Connecting tunnel done
-  stepper.advance(); // Verifying connection done
 
   // Wait for Vite to finish pre-transforming all modules (with timeout)
   await Promise.race([viteWarm, new Promise(r => setTimeout(r, 30_000))]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.5.52",
+  "version": "0.5.54",
   "releaseNotes": [
     "Fixed some bugs to iOs ",
     "2. ",