9remote 0.1.13 → 0.1.15

package/index.js

@@ -13,8 +13,7 @@ import { generateApiKeyWithMachine } from "./utils/apiKey.js";
 import { loadKey, saveKey, saveState, clearState } from "./utils/state.js";
 import { createTempKey } from "./utils/token.js";
 import { checkForUpdates } from "./utils/updateChecker.js";
-import { ensureNativeDeps } from "./utils/installer.js";
-import { ensureCloudflared, spawnCloudflared, killCloudflared } from "./utils/cloudflared.js";
+import { ensureCloudflared, spawnCloudflared, killCloudflared, resetRestartCounter } from "./utils/cloudflared.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PROJECT_ROOT = path.resolve(__dirname, "..");
@@ -174,6 +173,7 @@ function setupExitHandler(serverManager, tunnelProcess, apiKey) {
     console.log(chalk.yellow("\n\n🛑 Stopping server..."));
     serverManager.shutdown();
     tunnelProcess.kill();
+    resetRestartCounter();
     
     // Cleanup tunnel on worker
     try {
@@ -214,14 +214,9 @@ async function createNamedTunnel(apiKey) {
 async function startServerAndTunnel(selectedKey) {
   console.log(chalk.cyan("\n🚀 Starting server..."));
 
-  // Kill existing processes
+  // Kill existing cloudflared process
   try {
     killCloudflared();
-    if (process.platform === "win32") {
-      execSync("taskkill /F /IM node.exe /FI \"WINDOWTITLE eq server.js*\" 2>nul || exit 0", { stdio: "ignore" });
-    } else {
-      execSync("pkill -f 'node server.js' 2>/dev/null || true", { stdio: "ignore" });
-    }
   } catch { }
 
   // Create session first
@@ -266,13 +261,22 @@ async function startServerAndTunnel(selectedKey) {
 
   const { token, hostname: tunnelUrl } = tunnelData;
 
-  // Spawn cloudflared with token
+  // Spawn cloudflared with token and auto-restart callback
   console.log(chalk.cyan("✅ Starting tunnel..."));
   let tunnelProcess;
-  try {
-    tunnelProcess = await spawnCloudflared(token);
-  } catch (error) {
-    console.log(chalk.red(`❌ Failed to start cloudflared: ${error.message}`));
+  
+  const startTunnel = async (tunnelToken) => {
+    try {
+      tunnelProcess = await spawnCloudflared(tunnelToken, startTunnel);
+      return tunnelProcess;
+    } catch (error) {
+      console.log(chalk.red(`❌ Failed to start cloudflared: ${error.message}`));
+      return null;
+    }
+  };
+  
+  tunnelProcess = await startTunnel(token);
+  if (!tunnelProcess) {
     serverManager.shutdown();
     return null;
   }
@@ -522,16 +526,6 @@ async function autoStartDev() {
 async function start() {
   checkForUpdates();
   
-  // Ensure native dependencies are installed (first time only)
-  const depsReady = await ensureNativeDeps();
-  if (!depsReady) {
-    console.log(chalk.red("❌ Failed to install dependencies. Please try again."));
-    process.exit(1);
-  }
-  
-  // Wait a bit for symlinks to be fully created (filesystem sync)
-  await new Promise(r => setTimeout(r, 1000));
-  
   if (process.argv.includes("--auto")) {
     await autoStartDev();
   } else {

package/package.json

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

package/utils/cloudflared.js

@@ -11,6 +11,15 @@ const BIN_NAME = IS_WINDOWS ? `${BINARY_NAME}.exe` : BINARY_NAME;
 const BIN_PATH = path.join(BIN_DIR, BIN_NAME);
 const PID_FILE = path.join(os.homedir(), ".9remote", "cloudflared.pid");
 
+// Track intentional shutdown to suppress exit logs
+let isIntentionalShutdown = false;
+
+// Auto-restart configuration
+const MAX_RESTART_ATTEMPTS = 3;
+const RESTART_WINDOW_MS = 60000; // 1 minute
+let restartTimes = [];
+let restartCallback = null;
+
 const GITHUB_BASE_URL = "https://github.com/cloudflare/cloudflared/releases/latest/download";
 
 /**
@@ -152,11 +161,17 @@ const LOG_IGNORE = [
 /**
  * Spawn cloudflared tunnel
  * @param {string} tunnelToken
+ * @param {Function} onRestart - Callback when tunnel needs restart
  * @returns {ChildProcess}
  */
-export async function spawnCloudflared(tunnelToken) {
+export async function spawnCloudflared(tunnelToken, onRestart = null) {
   const binaryPath = await ensureCloudflared();
   
+  // Store restart callback
+  if (onRestart) {
+    restartCallback = onRestart;
+  }
+  
   const child = spawn(binaryPath, ["tunnel", "run", "--token", tunnelToken], {
     detached: false,
     stdio: ["ignore", "pipe", "pipe"]
@@ -172,6 +187,11 @@ export async function spawnCloudflared(tunnelToken) {
       return;
     }
     
+    // Skip errors during intentional shutdown
+    if (isIntentionalShutdown) {
+      return;
+    }
+    
     // Show connection status briefly
     if (msg.includes("Registered tunnel connection")) {
       connectionCount++;
@@ -198,8 +218,27 @@ export async function spawnCloudflared(tunnelToken) {
   });
   
   child.on("exit", (code) => {
-    if (code !== 0 && code !== null) {
+    // Only log unexpected exits
+    if (!isIntentionalShutdown && code !== 0 && code !== null) {
       console.log(`cloudflared exited with code ${code}`);
+      
+      // Auto-restart logic
+      if (restartCallback) {
+        const now = Date.now();
+        restartTimes.push(now);
+        
+        // Remove old restart times outside window
+        restartTimes = restartTimes.filter(t => t > now - RESTART_WINDOW_MS);
+        
+        if (restartTimes.length <= MAX_RESTART_ATTEMPTS) {
+          console.log(`🔄 Restarting tunnel... (attempt ${restartTimes.length}/${MAX_RESTART_ATTEMPTS})`);
+          setTimeout(() => {
+            restartCallback(tunnelToken);
+          }, 2000);
+        } else {
+          console.log(`❌ Too many tunnel restarts (${MAX_RESTART_ATTEMPTS} in ${RESTART_WINDOW_MS / 1000}s). Giving up.`);
+        }
+      }
     }
   });
   
@@ -215,12 +254,20 @@ export async function spawnCloudflared(tunnelToken) {
 export function killCloudflared() {
   try {
     if (fs.existsSync(PID_FILE)) {
+      isIntentionalShutdown = true;
       const pid = parseInt(fs.readFileSync(PID_FILE, "utf8"));
       process.kill(pid);
       fs.unlinkSync(PID_FILE);
-      console.log("✅ cloudflared stopped");
     }
   } catch (error) {
     // Silently ignore errors
   }
 }
+
+/**
+ * Reset restart counter
+ */
+export function resetRestartCounter() {
+  restartTimes = [];
+  restartCallback = null;
+}

package/utils/installer.js

@@ -1,137 +0,0 @@
-import { execSync } from "child_process";
-import ora from "ora";
-import chalk from "chalk";
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-import os from "os";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const PROJECT_ROOT = path.resolve(__dirname, "../..");
-
-/**
- * Check if running from global installation
- */
-function isGlobalInstall() {
-  // Check if we're in global node_modules
-  return PROJECT_ROOT.includes("/node_modules/9remote") || 
-         PROJECT_ROOT.includes("\\node_modules\\9remote");
-}
-
-/**
- * Get dependencies directory
- * For global install: use ~/.9remote/node_modules
- * For local dev: use project node_modules
- */
-function getDepsDir() {
-  if (isGlobalInstall()) {
-    const homeDir = os.homedir();
-    return path.join(homeDir, ".9remote");
-  }
-  return PROJECT_ROOT;
-}
-
-const DEPS_DIR = getDepsDir();
-const INSTALL_MARKER = path.join(DEPS_DIR, "node_modules", ".deps-installed");
-
-/**
- * Ensure all dependencies are installed
- * Only runs once on first launch
- */
-export async function ensureNativeDeps() {
-  // Create deps directory if needed
-  if (!fs.existsSync(DEPS_DIR)) {
-    fs.mkdirSync(DEPS_DIR, { recursive: true });
-  }
-
-  // Check if already installed
-  if (fs.existsSync(INSTALL_MARKER)) {
-    // Add deps to NODE_PATH for global install
-    if (isGlobalInstall()) {
-      const depsNodeModules = path.join(DEPS_DIR, "node_modules");
-      if (process.env.NODE_PATH) {
-        process.env.NODE_PATH = `${depsNodeModules}${path.delimiter}${process.env.NODE_PATH}`;
-      } else {
-        process.env.NODE_PATH = depsNodeModules;
-      }
-      require("module").Module._initPaths();
-    }
-    return true;
-  }
-
-  const spinner = ora("Checking dependencies...").start();
-
-  try {
-    // Check if cloudflared is installed
-    let allInstalled = true;
-    try {
-      await import("cloudflared");
-    } catch {
-      allInstalled = false;
-    }
-
-    if (allInstalled) {
-      spinner.succeed("Dependencies ready");
-      
-      // Mark as installed
-      fs.mkdirSync(path.dirname(INSTALL_MARKER), { recursive: true });
-      fs.writeFileSync(INSTALL_MARKER, new Date().toISOString());
-      
-      return true;
-    }
-
-    // Install cloudflared only (other deps are in package.json)
-    spinner.stop();
-    console.log(chalk.cyan("📦 Installing cloudflared (first time only, ~10 seconds)...\n"));
-    
-    const packageNames = ["cloudflared"];
-    
-    try {
-      console.log(chalk.gray("   Installing cloudflared..."));
-      
-      // Create package.json if in global install mode
-      if (isGlobalInstall()) {
-        const pkgJsonPath = path.join(DEPS_DIR, "package.json");
-        if (!fs.existsSync(pkgJsonPath)) {
-          fs.writeFileSync(pkgJsonPath, JSON.stringify({
-            name: "9remote-deps",
-            version: "1.0.0",
-            private: true
-          }, null, 2));
-        }
-      }
-      
-      execSync(`npm install --no-save --prefer-offline ${packageNames.join(" ")}`, {
-        cwd: DEPS_DIR,
-        stdio: "inherit"
-      });
-      console.log(chalk.green("\n✔ Cloudflared installed successfully"));
-      
-      // Add deps to NODE_PATH for global install
-      if (isGlobalInstall()) {
-        const depsNodeModules = path.join(DEPS_DIR, "node_modules");
-        if (process.env.NODE_PATH) {
-          process.env.NODE_PATH = `${depsNodeModules}${path.delimiter}${process.env.NODE_PATH}`;
-        } else {
-          process.env.NODE_PATH = depsNodeModules;
-        }
-        require("module").Module._initPaths();
-      }
-    } catch (error) {
-      console.log(chalk.red("\n✖ Failed to install dependencies"));
-      console.error(error.message);
-      console.log(chalk.yellow("\n💡 Tip: Try running with sudo if permission denied"));
-      return false;
-    }
-    
-    // Mark as installed
-    fs.mkdirSync(path.dirname(INSTALL_MARKER), { recursive: true });
-    fs.writeFileSync(INSTALL_MARKER, new Date().toISOString());
-    
-    return true;
-  } catch (error) {
-    spinner.fail("Failed to install dependencies");
-    console.error(error.message);
-    return false;
-  }
-}