@tongil_kim/clautunnel 1.7.1 → 1.7.3

package/dist/index.js

@@ -251,7 +251,7 @@ var require_dist = __commonJS({
 
 // src/index.ts
 import { config } from "dotenv";
-import { resolve as resolve2, dirname as dirname3 } from "path";
+import { resolve as resolve3, dirname as dirname3 } from "path";
 import { readFileSync as readFileSync6 } from "fs";
 import { fileURLToPath } from "url";
 
@@ -431,19 +431,19 @@ import { EventEmitter } from "events";
 // src/realtime/utils.ts
 var DEFAULT_TIMEOUT = 1e4;
 function subscribeWithTimeout(channel, channelName, timeout = DEFAULT_TIMEOUT) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     let lastStatus = "unknown";
     const timer = setTimeout(() => {
       console.warn(
         `[WARN] Realtime subscription timeout for ${channelName} (last status: ${lastStatus}).`
       );
-      resolve3(false);
+      resolve4(false);
     }, timeout);
     channel.subscribe((status, err) => {
       lastStatus = status;
       if (status === "SUBSCRIBED") {
         clearTimeout(timer);
-        resolve3(true);
+        resolve4(true);
       } else if (status === "CHANNEL_ERROR" || status === "CLOSED" || status === "TIMED_OUT") {
         clearTimeout(timer);
         console.warn(
@@ -452,7 +452,7 @@ function subscribeWithTimeout(channel, channelName, timeout = DEFAULT_TIMEOUT) {
         if (err) {
           console.warn(`[WARN] Error details: ${err.message || err}`);
         }
-        resolve3(false);
+        resolve4(false);
       }
     });
   });
@@ -1196,8 +1196,8 @@ var SdkSession = class extends EventEmitter2 {
           this.pendingQuestionData = questionData;
           this.emit("user-question", questionData);
           const answers = await new Promise(
-            (resolve3, reject) => {
-              const pendingRequest = { resolve: resolve3, reject };
+            (resolve4, reject) => {
+              const pendingRequest = { resolve: resolve4, reject };
               this.pendingAnswerRequest = pendingRequest;
               options.signal.addEventListener("abort", () => {
                 if (this.pendingAnswerRequest === pendingRequest) {
@@ -1255,9 +1255,9 @@ var SdkSession = class extends EventEmitter2 {
       };
       this.pendingPermissionData = requestData;
       this.emit("permission-request", requestData);
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         this.pendingPermissionRequests.set(requestId, {
-          resolve: resolve3,
+          resolve: resolve4,
           reject,
           signal: options.signal,
           toolInput: input
@@ -2910,10 +2910,10 @@ async function promptYesNo(question) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     rl.question(question, (answer) => {
       rl.close();
-      resolve3(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+      resolve4(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
     });
   });
 }
@@ -3013,6 +3013,10 @@ function getFullDiskAccessStatus(enabled, terminalApp) {
   };
 }
 
+// src/commands/start.ts
+import { existsSync as existsSync6 } from "fs";
+import { join as join7, resolve } from "path";
+
 // src/mobile/mobile-server.ts
 import { spawn as spawn2, execSync as execSync2 } from "child_process";
 import {
@@ -3110,6 +3114,11 @@ var MobileServerManager = class {
       }
       const repoDir = join5(clautunnelDir, "repo");
       if (existsSync4(repoDir)) {
+        execSync2("git checkout -- .", {
+          cwd: repoDir,
+          stdio: "pipe",
+          timeout: 1e4
+        });
         execSync2("git pull --ff-only", {
           cwd: repoDir,
           stdio: "pipe",
@@ -3246,7 +3255,7 @@ var MobileServerManager = class {
     });
     this.expoProcess.on("error", () => {
     });
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       let ready = false;
       let resolved = false;
       let qrActive = false;
@@ -3255,7 +3264,7 @@ var MobileServerManager = class {
           resolved = true;
           this.expoProcess?.stdout?.pipe(this.expoLogStream);
           this.expoProcess?.stderr?.pipe(this.expoLogStream);
-          resolve3(false);
+          resolve4(false);
         }
       }, 6e4);
       this.expoProcess?.stdout?.on("data", (data) => {
@@ -3279,7 +3288,7 @@ var MobileServerManager = class {
               clearTimeout(timeout);
               this.expoProcess?.stdout?.pipe(this.expoLogStream);
               this.expoProcess?.stderr?.pipe(this.expoLogStream);
-              resolve3(true);
+              resolve4(true);
             }
           } else {
             this.expoLogStream?.write(line + "\n");
@@ -3291,7 +3300,7 @@ var MobileServerManager = class {
         if (!resolved) {
           resolved = true;
           clearTimeout(timeout);
-          resolve3(false);
+          resolve4(false);
         }
       });
     });
@@ -3381,7 +3390,7 @@ var MobileServerManager = class {
     return line.includes("Metro waiting on") || line.includes("Logs for your project");
   }
   getNgrokTunnelUrl() {
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       const req = get("http://localhost:4040/api/tunnels", (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk);
@@ -3391,16 +3400,16 @@ var MobileServerManager = class {
             const httpsTunnel = tunnels?.find(
               (t) => t.proto === "https"
             );
-            resolve3(httpsTunnel?.public_url ?? null);
+            resolve4(httpsTunnel?.public_url ?? null);
           } catch {
-            resolve3(null);
+            resolve4(null);
           }
         });
       });
-      req.on("error", () => resolve3(null));
+      req.on("error", () => resolve4(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve3(null);
+        resolve4(null);
       });
     });
   }
@@ -3442,7 +3451,7 @@ var MobileServerManager = class {
     }
   }
   sleep(ms) {
-    return new Promise((resolve3) => setTimeout(resolve3, ms));
+    return new Promise((resolve4) => setTimeout(resolve4, ms));
   }
 };
 
@@ -3722,7 +3731,13 @@ function createStartCommand() {
           process.exit(1);
         }
         const pairingCode = pairingData.code;
-        const mobileProjectPath = config2.getMobileProjectPath();
+        let mobileProjectPath = config2.getMobileProjectPath();
+        if (!mobileProjectPath) {
+          const siblingMobile = resolve(process.cwd(), "..", "mobile");
+          if (existsSync6(join7(siblingMobile, "package.json"))) {
+            mobileProjectPath = siblingMobile;
+          }
+        }
         mobileServer = new MobileServerManager({
           mobileProjectPath,
           supabaseUrl: config2.getSupabaseUrl(),
@@ -3962,7 +3977,7 @@ function createStopCommand() {
         let attempts = 0;
         let pidFileRemoved = false;
         while (attempts < 10) {
-          await new Promise((resolve3) => setTimeout(resolve3, 500));
+          await new Promise((resolve4) => setTimeout(resolve4, 500));
           if (!pidFileExists()) {
             pidFileRemoved = true;
             break;
@@ -4059,10 +4074,10 @@ function prompt(question) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     rl.question(question, (answer) => {
       rl.close();
-      resolve3(answer);
+      resolve4(answer);
     });
   });
 }
@@ -4071,7 +4086,7 @@ function promptHidden(question) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     process.stdout.write(question);
     if (process.stdin.isTTY) {
       process.stdin.setRawMode(true);
@@ -4086,7 +4101,7 @@ function promptHidden(question) {
         }
         process.stdout.write("\n");
         rl.close();
-        resolve3(password);
+        resolve4(password);
       } else if (c === "") {
         process.exit(0);
       } else if (c === "\x7F" || c === "\b") {
@@ -4335,8 +4350,8 @@ function createSetupCommand() {
 
 // src/commands/mobile-setup.ts
 import { Command as Command8 } from "commander";
-import { existsSync as existsSync6, writeFileSync as writeFileSync4 } from "fs";
-import { join as join7, resolve } from "path";
+import { existsSync as existsSync7, writeFileSync as writeFileSync4 } from "fs";
+import { join as join8, resolve as resolve2 } from "path";
 function createMobileSetupCommand() {
   const command = new Command8("mobile-setup");
   command.description("Generate mobile app .env file from CLI credentials").action(async () => {
@@ -4346,8 +4361,8 @@ function createMobileSetupCommand() {
       config2.requireConfiguration();
       const supabaseUrl = config2.getSupabaseUrl();
       const supabaseAnonKey = config2.getSupabaseAnonKey();
-      const mobileDir = resolve(process.cwd(), "apps", "mobile");
-      if (!existsSync6(mobileDir)) {
+      const mobileDir = resolve2(process.cwd(), "apps", "mobile");
+      if (!existsSync7(mobileDir)) {
         logger.error("Could not find apps/mobile directory.");
         logger.error("");
         logger.error("Make sure you run this command from the ClauTunnel project root:");
@@ -4355,8 +4370,8 @@ function createMobileSetupCommand() {
         logger.error("  clautunnel mobile-setup");
         process.exit(1);
       }
-      const envPath = join7(mobileDir, ".env");
-      if (existsSync6(envPath)) {
+      const envPath = join8(mobileDir, ".env");
+      if (existsSync7(envPath)) {
         logger.warn("apps/mobile/.env already exists and will be overwritten.");
       }
       const envContent = [
@@ -4423,7 +4438,7 @@ function createResetCommand() {
       try {
         process.kill(pid, "SIGTERM");
         logger.info(`  - clautunnel daemon stopped (PID ${pid})`);
-        await new Promise((resolve3) => setTimeout(resolve3, 1e3));
+        await new Promise((resolve4) => setTimeout(resolve4, 1e3));
       } catch {
         logger.info("  - could not stop daemon");
       }
@@ -4621,9 +4636,9 @@ async function cleanSupabaseDb(logger) {
 // src/index.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname3(__filename);
-config({ path: resolve2(__dirname, "../.env"), quiet: true });
+config({ path: resolve3(__dirname, "../.env"), quiet: true });
 var packageJson = JSON.parse(
-  readFileSync6(resolve2(__dirname, "../package.json"), "utf-8")
+  readFileSync6(resolve3(__dirname, "../package.json"), "utf-8")
 );
 var version = packageJson.version || "0.0.0";
 var program = new Command10();