@tongil_kim/clautunnel 1.3.2 → 1.3.4

package/dist/index.js

@@ -2624,6 +2624,7 @@ import {
 import { join as join5 } from "path";
 import { homedir as homedir5 } from "os";
 import { get } from "http";
+import qrcode from "qrcode-terminal";
 var REPO_URL = "https://github.com/TongilKim/ClauTunnel.git";
 var DEFAULT_MOBILE_DIR = join5(homedir5(), ".clautunnel", "mobile");
 var MobileServerManager = class {
@@ -2789,38 +2790,40 @@ var MobileServerManager = class {
     this.expoProcess.on("error", () => {
     });
     return new Promise((resolve3) => {
-      let qrDetected = false;
-      let qrFinished = false;
+      let ready = false;
       let resolved = false;
+      let qrActive = false;
       const timeout = setTimeout(() => {
         if (!resolved) {
           resolved = true;
           this.expoProcess?.stdout?.pipe(this.expoLogStream);
           this.expoProcess?.stderr?.pipe(this.expoLogStream);
-          resolve3(qrDetected);
+          resolve3(false);
         }
-      }, 3e4);
+      }, 6e4);
       this.expoProcess?.stdout?.on("data", (data) => {
         const text = data.toString();
         const lines = text.split("\n");
         for (const line of lines) {
-          if (qrFinished) {
+          if (ready) {
             this.expoLogStream?.write(line + "\n");
             continue;
           }
           if (this.isQrCodeLine(line)) {
-            qrDetected = true;
+            qrActive = true;
+            process.stdout.write(line + "\n");
+          } else if (qrActive && !this.isExpoReadyLine(line) && line.trim()) {
             process.stdout.write(line + "\n");
-          } else if (qrDetected && this.isExpoReadyLine(line)) {
+          } else if (this.isExpoReadyLine(line)) {
             process.stdout.write(line + "\n");
-            qrFinished = true;
+            ready = true;
             if (!resolved) {
               resolved = true;
               clearTimeout(timeout);
+              this.expoProcess?.stdout?.pipe(this.expoLogStream);
+              this.expoProcess?.stderr?.pipe(this.expoLogStream);
               resolve3(true);
             }
-          } else if (qrDetected && !qrFinished) {
-            process.stdout.write(line + "\n");
           } else {
             this.expoLogStream?.write(line + "\n");
           }
@@ -2870,6 +2873,16 @@ var MobileServerManager = class {
       await this.stop();
       return { started: false, error: "Failed to start Expo server" };
     }
+    const expoUrl = `exp+${tunnelUrl}`;
+    console.log("");
+    console.log("  Scan with Expo Go:");
+    qrcode.generate(expoUrl, { small: true }, (code) => {
+      for (const line of code.split("\n")) {
+        console.log(`  ${line}`);
+      }
+    });
+    console.log(`  ${expoUrl}`);
+    console.log("");
     return { started: true, tunnelUrl };
   }
   async stop() {