9remote 0.1.34 → 0.1.37

package/index.js

@@ -7,10 +7,9 @@ import { spawn, execSync } from "child_process";
 import path from "path";
 import { fileURLToPath } from "url";
 import fs from "fs";
-import dns from "dns/promises";
 import { getConsistentMachineId } from "./utils/machineId.js";
 import { generateApiKeyWithMachine } from "./utils/apiKey.js";
-import { loadKey, saveKey, saveState, clearState } from "./utils/state.js";
+import { loadKey, saveKey, loadState, saveState, clearState } from "./utils/state.js";
 import { createTempKey } from "./utils/token.js";
 import { checkAndUpdate } from "./utils/updateChecker.js";
 import { ensureCloudflared, spawnCloudflared, killCloudflared, resetRestartCounter } from "./utils/cloudflared.js";
@@ -26,6 +25,7 @@ const STANDALONE_SERVER = path.join(__dirname, "server.cjs");
 const DEV_SERVER = path.join(PROJECT_ROOT, "server/index.js");
 const WORKER_URL = "https://9remote.cc";
 const SERVER_PORT = 2208;
+const SHORT_ID_CHARS = "abcdefghijklmnpqrstuvwxyz23456789";
 const MAX_RESTART_ATTEMPTS = 10;
 const RESTART_WINDOW_MS = 60000; // 1 minute
 
@@ -88,6 +88,17 @@ function showBanner() {
   console.log("");
 }
 
+/**
+ * Generate short random ID for tunnel subdomain
+ */
+function generateShortId() {
+  let result = "";
+  for (let i = 0; i < 6; i++) {
+    result += SHORT_ID_CHARS.charAt(Math.floor(Math.random() * SHORT_ID_CHARS.length));
+  }
+  return result;
+}
+
 /**
  * Helper: Show QR code for connect URL
  */
@@ -305,12 +316,16 @@ async function startServerAndTunnel(selectedKey) {
     await new Promise(resolve => setTimeout(resolve, 1000));
   } catch { }
 
+  // Reuse existing shortId or generate new one
+  const existingState = loadState();
+  const shortId = existingState?.shortId || generateShortId();
+
   // Create session first
   try {
     const sessionResponse = await fetch(`${WORKER_URL}/api/session/create`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ apiKey: selectedKey })
+      body: JSON.stringify({ apiKey: selectedKey, shortId })
     });
     
     if (!sessionResponse.ok) {
@@ -435,65 +450,13 @@ async function startServerAndTunnel(selectedKey) {
   }
   
 
-  // Wait for tunnel to be ready
   console.log(ORANGE(`✅ Tunnel URL: ${tunnelUrl}`));
-  
-  const maxWaitTime = 60000;
-  const checkInterval = 2000;
-  const maxRetries = Math.floor(maxWaitTime / checkInterval);
-  let tunnelReady = false;
-  
-  // Resolve IP using Cloudflare DNS to bypass local cache
-  const hostname = new URL(tunnelUrl).hostname;
-  let resolvedIp = null;
-  
-  for (let i = 0; i < maxRetries; i++) {
-    try {
-      // Resolve DNS using Cloudflare DNS server (bypass local cache)
-      if (!resolvedIp) {
-        const resolver = new dns.Resolver();
-        resolver.setServers(["1.1.1.1", "1.0.0.1"]);
-        const addresses = await resolver.resolve4(hostname);
-        if (addresses.length > 0) {
-          resolvedIp = addresses[0];
-        }
-      }
-      
-      if (resolvedIp) {
-        // Use curl with --resolve to bypass DNS cache and SSL issues
-        const curlResult = execSync(
-          `curl -s --max-time 5 --resolve "${hostname}:443:${resolvedIp}" "${tunnelUrl}/api/health"`,
-          { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
-        );
-        if (curlResult.includes("ok")) {
-          tunnelReady = true;
-          break;
-        } else {
-        }
-      }
-    } catch (err) {
-    }
-    
-    const spinners = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-    process.stdout.write(`\r${ORANGE("   Waiting for tunnel")} ${ORANGE(spinners[i % spinners.length])} ${chalk.gray(`(${i * 2}s)`)}`);
-    
-    await new Promise(r => setTimeout(r, checkInterval));
-  }
-  
-  process.stdout.write("\r" + " ".repeat(50) + "\r");
-  
-  if (!tunnelReady) {
-    console.log(chalk.red("❌ Tunnel connection timeout"));
-    serverManager.shutdown();
-    tunnelProcess.kill();
-    return null;
-  }
-  
   console.log(ORANGE(`✅ Connection established`));
 
-  // Save state
+  // Save state (persist shortId for reuse on restart)
   saveState({
     apiKey: selectedKey,
+    shortId,
     tunnelUrl,
     serverPid: serverManager.getProcess()?.pid,
     tunnelPid: tunnelProcess.pid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9remote",
-  "version": "0.1.34",
+  "version": "0.1.37",
   "type": "module",
   "description": "Remote terminal access from anywhere",
   "main": "index.js",

package/utils/cloudflared.js

@@ -183,44 +183,40 @@ export async function spawnCloudflared(tunnelToken, onRestart = null) {
     stdio: ["ignore", "pipe", "pipe"]
   });
   
-  // Reset intentional shutdown flag immediately after spawn
-  // This ensures auto-restart works if cloudflared crashes
   isIntentionalShutdown = false;
   console.log(`✅ Cloudflared spawned with PID: ${child.pid}`);
   
-  let connectionCount = 0;
-  
-  const handleLog = (data) => {
-    const msg = data.toString().trim();
-    
-    // Skip ignored messages
-    if (LOG_IGNORE.some(pattern => msg.includes(pattern))) {
-      return;
-    }
-    
-    // Skip errors during intentional shutdown
-    if (isIntentionalShutdown) {
-      return;
-    }
-    
-    // Show connection status briefly
-    if (msg.includes("Registered tunnel connection")) {
-      connectionCount++;
-      if (connectionCount <= 4) {
-        process.stdout.write(`\r   ✔ Connection ${connectionCount}/4 established`);
-        if (connectionCount === 4) {
-          process.stdout.write("\n");
+  // Wait for 4 connections before resolving (tunnel is truly ready)
+  await new Promise((resolve, reject) => {
+    let connectionCount = 0;
+    let resolved = false;
+    const timeout = setTimeout(() => {
+      if (!resolved) { resolved = true; resolve(child); }
+    }, 90000);
+
+    const handleLog = (data) => {
+      const msg = data.toString().trim();
+      if (LOG_IGNORE.some(pattern => msg.includes(pattern))) return;
+      if (isIntentionalShutdown) return;
+      if (msg.includes("Registered tunnel connection")) {
+        connectionCount++;
+        if (connectionCount <= 4) {
+          process.stdout.write(`\r   ✔ Connection ${connectionCount}/4 established`);
+          if (connectionCount === 4) {
+            process.stdout.write("\n");
+            if (!resolved) { resolved = true; clearTimeout(timeout); resolve(child); }
+          }
         }
+        return;
       }
-      return;
-    }
-    
-    // Suppress all other cloudflared logs
-  };
-  
-  child.stdout.on("data", handleLog);
-  child.stderr.on("data", handleLog);
-  
+    };
+
+    child.stdout.on("data", handleLog);
+    child.stderr.on("data", handleLog);
+    child.on("error", (err) => { if (!resolved) { resolved = true; clearTimeout(timeout); reject(err); } });
+    child.on("exit", (code) => { if (!resolved) { resolved = true; clearTimeout(timeout); reject(new Error(`cloudflared exited with code ${code}`)); } });
+  });
+
   child.on("error", (error) => {
     console.error("❌ cloudflared error:", error);
   });