claude-relay 2.2.4 → 2.3.0

package/README.md

@@ -182,6 +182,9 @@ If push registration fails: check whether your browser trusts HTTPS and whether
 ```bash
 npx claude-relay              # Default (port 2633)
 npx claude-relay -p 8080      # Specify port
+npx claude-relay -y           # Skip interactive prompts (accept defaults)
+npx claude-relay -y --pin 123456
+                              # Non-interactive with PIN (for scripts/CI)
 npx claude-relay --no-https   # Disable HTTPS
 npx claude-relay --no-update  # Skip update check
 npx claude-relay --debug      # Enable debug panel
@@ -189,6 +192,9 @@ npx claude-relay --add .      # Add current directory to running daemon
 npx claude-relay --add /path  # Add a project by path
 npx claude-relay --remove .   # Remove a project
 npx claude-relay --list       # List registered projects
+npx claude-relay --shutdown   # Stop the running daemon
+npx claude-relay --dangerously-skip-permissions
+                              # Bypass all permission prompts (PIN required during setup)
 ```
 
 ## Requirements
@@ -236,6 +242,12 @@ For a detailed sequence diagram, daemon structure, and design decisions, refer t
 
 ---
 
+## Contributors
+
+<a href="https://github.com/chadbyte/claude-relay/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=chadbyte/claude-relay" />
+</a>
+
 ## Contributing
 
 Bug fixes and typos are welcome. For feature suggestions, please open an issue first:

package/bin/cli.js

@@ -6,7 +6,7 @@ var path = require("path");
 var { execSync, execFileSync, spawn } = require("child_process");
 var qrcode = require("qrcode-terminal");
 var net = require("net");
-var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc } = require("../lib/config");
+var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
 var { generateAuthToken } = require("../lib/server");
 
@@ -32,6 +32,7 @@ var shutdownMode = false;
 var addPath = null;
 var removePath = null;
 var listMode = false;
+var dangerouslySkipPermissions = false;
 
 for (var i = 0; i < args.length; i++) {
   if (args[i] === "-p" || args[i] === "--port") {
@@ -62,6 +63,8 @@ for (var i = 0; i < args.length; i++) {
     i++;
   } else if (args[i] === "--list") {
     listMode = true;
+  } else if (args[i] === "--dangerously-skip-permissions") {
+    dangerouslySkipPermissions = true;
   } else if (args[i] === "-h" || args[i] === "--help") {
     console.log("Usage: claude-relay [-p|--port <port>] [--no-https] [--no-update] [--debug] [-y|--yes] [--pin <pin>] [--shutdown]");
     console.log("       claude-relay --add <path>     Add a project to the running daemon");
@@ -79,6 +82,8 @@ for (var i = 0; i < args.length; i++) {
     console.log("  --add <path>       Add a project directory (use '.' for current)");
     console.log("  --remove <path>    Remove a project directory");
     console.log("  --list             List all registered projects");
+    console.log("  --dangerously-skip-permissions");
+    console.log("                     Bypass all permission prompts (requires --pin)");
     process.exit(0);
   }
 }
@@ -270,6 +275,10 @@ function stopDaemonWatcher() {
   }
 }
 
+var _restartAttempts = 0;
+var MAX_RESTART_ATTEMPTS = 5;
+var _restartBackoffStart = 0;
+
 function onDaemonDied() {
   stopDaemonWatcher();
   // Clean up stdin in case a prompt is active
@@ -278,11 +287,117 @@ function onDaemonDied() {
     process.stdin.pause();
     process.stdin.removeAllListeners("data");
   } catch (e) {}
+
+  // Check if this was a crash (crash.json exists) vs intentional shutdown
+  var crashInfo = readCrashInfo();
+  if (!crashInfo) {
+    // Intentional shutdown, no restart
+    log("");
+    log(sym.warn + "  " + a.yellow + "Server has been shut down." + a.reset);
+    log(a.dim + "     Run " + a.reset + "npx claude-relay" + a.dim + " to start again." + a.reset);
+    log("");
+    process.exit(0);
+    return;
+  }
+
+  // Reset backoff counter if enough time has passed since last restart burst
+  var now = Date.now();
+  if (_restartBackoffStart && now - _restartBackoffStart > 60000) {
+    _restartAttempts = 0;
+  }
+
+  _restartAttempts++;
+  if (_restartAttempts > MAX_RESTART_ATTEMPTS) {
+    log("");
+    log(sym.warn + "  " + a.red + "Server crashed too many times (" + MAX_RESTART_ATTEMPTS + " attempts). Giving up." + a.reset);
+    if (crashInfo.reason) {
+      log(a.dim + "     " + crashInfo.reason.split("\n")[0] + a.reset);
+    }
+    log(a.dim + "     Check logs: " + a.reset + logPath());
+    log("");
+    process.exit(1);
+    return;
+  }
+
+  if (_restartAttempts === 1) _restartBackoffStart = now;
+
   log("");
-  log(sym.warn + "  " + a.yellow + "Server has been shut down." + a.reset);
-  log(a.dim + "     Run " + a.reset + "npx claude-relay" + a.dim + " to start again." + a.reset);
+  log(sym.warn + "  " + a.yellow + "Server crashed. Restarting... (" + _restartAttempts + "/" + MAX_RESTART_ATTEMPTS + ")" + a.reset);
+  if (crashInfo.reason) {
+    log(a.dim + "     " + crashInfo.reason.split("\n")[0] + a.reset);
+  }
+
+  // Re-fork the daemon from saved config
+  restartDaemonFromConfig();
+}
+
+async function restartDaemonFromConfig() {
+  var lastConfig = loadConfig();
+  if (!lastConfig || !lastConfig.projects) {
+    log(a.red + "     No config found. Cannot restart." + a.reset);
+    process.exit(1);
+    return;
+  }
+
+  clearStaleConfig();
+
+  // Wait for port to be released
+  var targetPort = lastConfig.port || port;
+  var waited = 0;
+  while (waited < 3000) {
+    var free = await isPortFree(targetPort);
+    if (free) break;
+    await new Promise(function (resolve) { setTimeout(resolve, 300); });
+    waited += 300;
+  }
+
+  // Rebuild config (preserve everything except pid)
+  var newConfig = {
+    pid: null,
+    port: targetPort,
+    pinHash: lastConfig.pinHash || null,
+    tls: lastConfig.tls !== undefined ? lastConfig.tls : useHttps,
+    debug: lastConfig.debug || false,
+    keepAwake: lastConfig.keepAwake || false,
+    dangerouslySkipPermissions: lastConfig.dangerouslySkipPermissions || false,
+    projects: (lastConfig.projects || []).filter(function (p) {
+      return fs.existsSync(p.path);
+    }),
+  };
+
+  ensureConfigDir();
+  saveConfig(newConfig);
+
+  var daemonScript = path.join(__dirname, "..", "lib", "daemon.js");
+  var logFile = logPath();
+  var logFd = fs.openSync(logFile, "a");
+
+  var child = spawn(process.execPath, [daemonScript], {
+    detached: true,
+    windowsHide: true,
+    stdio: ["ignore", logFd, logFd],
+    env: Object.assign({}, process.env, {
+      CLAUDE_RELAY_CONFIG: configPath(),
+    }),
+  });
+  child.unref();
+  fs.closeSync(logFd);
+
+  newConfig.pid = child.pid;
+  saveConfig(newConfig);
+
+  // Wait and verify
+  await new Promise(function (resolve) { setTimeout(resolve, 1200); });
+  var alive = await isDaemonAliveAsync(newConfig);
+  if (!alive) {
+    log(a.red + "     Restart failed. Check logs: " + a.reset + logFile);
+    process.exit(1);
+    return;
+  }
+  var ip = getLocalIP();
+  log(sym.done + "  " + a.green + "Server restarted successfully." + a.reset);
   log("");
-  process.exit(0);
+  showMainMenu(newConfig, ip);
 }
 
 // --- Network ---
@@ -1098,6 +1213,7 @@ async function forkDaemon(pin, keepAwake, extraProjects) {
     tls: hasTls,
     debug: debugMode,
     keepAwake: keepAwake,
+    dangerouslySkipPermissions: dangerouslySkipPermissions,
     projects: allProjects,
   };
 
@@ -1176,6 +1292,7 @@ async function restartDaemonWithTLS(config, callback) {
     tls: true,
     debug: config.debug || false,
     keepAwake: config.keepAwake || false,
+    dangerouslySkipPermissions: config.dangerouslySkipPermissions || false,
     projects: config.projects || [],
   };
 
@@ -1938,8 +2055,16 @@ var currentVersion = require("../package.json").version;
     // No daemon running — first-time setup
     if (autoYes) {
       var pin = cliPin || null;
+      if (dangerouslySkipPermissions && !pin) {
+        console.error("  " + sym.warn + "  " + a.red + "--dangerously-skip-permissions requires --pin <pin>" + a.reset);
+        process.exit(1);
+        return;
+      }
       console.log("  " + sym.done + "  Auto-accepted disclaimer");
       console.log("  " + sym.done + "  PIN: " + (pin ? "Enabled" : "Skipped"));
+      if (dangerouslySkipPermissions) {
+        console.log("  " + sym.warn + "  " + a.yellow + "Skip permissions mode enabled" + a.reset);
+      }
       var autoRc = loadClayrc();
       var autoRestorable = (autoRc.recentProjects || []).filter(function (p) {
         return p.path !== cwd && fs.existsSync(p.path);
@@ -1950,6 +2075,12 @@ var currentVersion = require("../package.json").version;
       await forkDaemon(pin, false, autoRestorable.length > 0 ? autoRestorable : undefined);
     } else {
       setup(function (pin, keepAwake) {
+        if (dangerouslySkipPermissions && !pin) {
+          log(sym.warn + "  " + a.red + "--dangerously-skip-permissions requires a PIN." + a.reset);
+          log(a.dim + "     Please set a PIN to use skip permissions mode." + a.reset);
+          process.exit(1);
+          return;
+        }
         // Check ~/.clayrc for previous projects to restore
         var rc = loadClayrc();
         var restorable = (rc.recentProjects || []).filter(function (p) {

package/lib/config.js

@@ -5,6 +5,7 @@ var net = require("net");
 
 var CONFIG_DIR = path.join(os.homedir(), ".claude-relay");
 var CLAYRC_PATH = path.join(os.homedir(), ".clayrc");
+var CRASH_INFO_PATH = path.join(CONFIG_DIR, "crash.json");
 
 function configPath() {
   return path.join(CONFIG_DIR, "daemon.json");
@@ -105,6 +106,32 @@ function clearStaleConfig() {
   }
 }
 
+// --- Crash info ---
+
+function crashInfoPath() {
+  return CRASH_INFO_PATH;
+}
+
+function writeCrashInfo(info) {
+  try {
+    ensureConfigDir();
+    fs.writeFileSync(CRASH_INFO_PATH, JSON.stringify(info));
+  } catch (e) {}
+}
+
+function readCrashInfo() {
+  try {
+    var data = fs.readFileSync(CRASH_INFO_PATH, "utf8");
+    return JSON.parse(data);
+  } catch (e) {
+    return null;
+  }
+}
+
+function clearCrashInfo() {
+  try { fs.unlinkSync(CRASH_INFO_PATH); } catch (e) {}
+}
+
 // --- ~/.clayrc (recent projects persistence) ---
 
 function clayrcPath() {
@@ -183,6 +210,10 @@ module.exports = {
   isDaemonAliveAsync: isDaemonAliveAsync,
   generateSlug: generateSlug,
   clearStaleConfig: clearStaleConfig,
+  crashInfoPath: crashInfoPath,
+  writeCrashInfo: writeCrashInfo,
+  readCrashInfo: readCrashInfo,
+  clearCrashInfo: clearCrashInfo,
   clayrcPath: clayrcPath,
   loadClayrc: loadClayrc,
   saveClayrc: saveClayrc,

package/lib/daemon.js

@@ -2,7 +2,7 @@
 
 var fs = require("fs");
 var path = require("path");
-var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc } = require("./config");
+var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo } = require("./config");
 var { createIPCServer } = require("./ipc");
 var { createServer } = require("./server");
 
@@ -43,6 +43,23 @@ try {
   if (!fs.existsSync(caRoot)) caRoot = null;
 } catch (e) {}
 
+// --- Resolve LAN IP for share URL ---
+var os2 = require("os");
+var lanIp = (function () {
+  var ifaces = os2.networkInterfaces();
+  for (var addrs of Object.values(ifaces)) {
+    for (var i = 0; i < addrs.length; i++) {
+      if (addrs[i].family === "IPv4" && !addrs[i].internal && addrs[i].address.startsWith("100.")) return addrs[i].address;
+    }
+  }
+  for (var addrs of Object.values(ifaces)) {
+    for (var i = 0; i < addrs.length; i++) {
+      if (addrs[i].family === "IPv4" && !addrs[i].internal) return addrs[i].address;
+    }
+  }
+  return null;
+})();
+
 // --- Create multi-project server ---
 var relay = createServer({
   tlsOptions: tlsOptions,
@@ -50,6 +67,8 @@ var relay = createServer({
   pinHash: config.pinHash || null,
   port: config.port,
   debug: config.debug || false,
+  dangerouslySkipPermissions: config.dangerouslySkipPermissions || false,
+  lanHost: lanIp ? lanIp + ":" + config.port : null,
 });
 
 // --- Register projects ---
@@ -179,6 +198,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
 // --- Start listening ---
 relay.server.on("error", function (err) {
   console.error("[daemon] Server error:", err.message);
+  writeCrashInfo({
+    reason: "Server error: " + err.message,
+    pid: process.pid,
+    time: Date.now(),
+  });
   process.exit(1);
 });
 
@@ -191,6 +215,23 @@ relay.server.listen(config.port, function () {
   // Update PID in config
   config.pid = process.pid;
   saveConfig(config);
+
+  // Check for crash info from a previous crash and notify clients
+  var crashInfo = readCrashInfo();
+  if (crashInfo) {
+    console.log("[daemon] Recovered from crash at", new Date(crashInfo.time).toISOString());
+    console.log("[daemon] Crash reason:", crashInfo.reason);
+    // Delay notification so clients have time to reconnect
+    setTimeout(function () {
+      relay.broadcastAll({
+        type: "toast",
+        level: "warn",
+        message: "Server recovered from a crash and was automatically restarted.",
+        detail: crashInfo.reason || null,
+      });
+    }, 3000);
+    clearCrashInfo();
+  }
 });
 
 // --- HTTP onboarding server (only when TLS is active) ---
@@ -233,6 +274,8 @@ function gracefulShutdown() {
     }
   } catch (e) {}
 
+  relay.destroyAll();
+
   if (relay.onboardingServer) {
     relay.onboardingServer.close();
   }
@@ -258,5 +301,10 @@ if (process.platform === "win32") {
 
 process.on("uncaughtException", function (err) {
   console.error("[daemon] Uncaught exception:", err);
+  writeCrashInfo({
+    reason: err ? (err.stack || err.message || String(err)) : "unknown",
+    pid: process.pid,
+    time: Date.now(),
+  });
   gracefulShutdown();
 });

package/lib/pages.js

@@ -549,6 +549,12 @@ function pushDone() {
   pushStatus.className = "check-status ok";
   pushStatus.textContent = "Push notifications enabled!";
   fireConfetti();
+  navigator.serviceWorker.ready.then(function(reg) {
+    reg.showNotification("\ud83c\udf89 Welcome to Claude Relay!", {
+      body: "\ud83d\udd14 You\u2019ll be notified when Claude responds.",
+      tag: "claude-welcome",
+    });
+  }).catch(function() {});
   setTimeout(function() { nextStep(); }, 1200);
 }
 
@@ -582,10 +588,16 @@ function enablePush() {
         });
     })
     .then(function(sub) {
+      var prevEndpoint = localStorage.getItem("push-endpoint");
+      localStorage.setItem("push-endpoint", sub.endpoint);
+      var payload = { subscription: sub.toJSON() };
+      if (prevEndpoint && prevEndpoint !== sub.endpoint) {
+        payload.replaceEndpoint = prevEndpoint;
+      }
       return fetch("/api/push-subscribe", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(sub.toJSON()),
+        body: JSON.stringify(payload),
       });
     })
     .then(pushDone)
@@ -683,6 +695,8 @@ function dashboardPageHtml(projects, version) {
     '<div class="subtitle">Select a project</div>' +
     '<div class="cards">' + cards + '</div>' +
     '<div class="footer">v' + escapeHtml(version || "") + '</div>' +
+    '<script>var s=window.matchMedia("(display-mode:standalone)").matches||navigator.standalone;' +
+    'if(s&&!localStorage.getItem("setup-done")){var t=/^100\\./.test(location.hostname);location.replace("/setup"+(t?"":"?mode=lan"));}</script>' +
     '</body></html>';
 }