claude-relay 2.2.2 → 2.2.3

package/bin/cli.js

@@ -312,6 +312,33 @@ function getLocalIP() {
 }
 
 // --- Certs ---
+function isRoutableIP(addr) {
+  if (addr.startsWith("10.")) return true;
+  if (addr.startsWith("192.168.")) return true;
+  if (addr.startsWith("100.")) {
+    var second = parseInt(addr.split(".")[1], 10);
+    return second >= 64 && second <= 127; // CGNAT (Tailscale)
+  }
+  if (addr.startsWith("172.")) {
+    var second = parseInt(addr.split(".")[1], 10);
+    return second >= 16 && second <= 31;
+  }
+  return false;
+}
+
+function getAllIPs() {
+  var ips = [];
+  var ifaces = os.networkInterfaces();
+  for (var addrs of Object.values(ifaces)) {
+    for (var j = 0; j < addrs.length; j++) {
+      if (addrs[j].family === "IPv4" && !addrs[j].internal && isRoutableIP(addrs[j].address)) {
+        ips.push(addrs[j].address);
+      }
+    }
+  }
+  return ips;
+}
+
 function ensureCerts(ip) {
   var homeDir = os.homedir();
   var certDir = path.join(homeDir, ".claude-relay", "certs");
@@ -336,21 +363,29 @@ function ensureCerts(ip) {
     if (!fs.existsSync(caRoot)) caRoot = null;
   } catch (e) {}
 
+  // Collect all IPv4 addresses (Tailscale + LAN)
+  var allIPs = getAllIPs();
+
   if (fs.existsSync(keyPath) && fs.existsSync(certPath)) {
     var needRegen = false;
-    if (ip && ip !== "localhost") {
-      try {
-        var certText = execFileSync("openssl", ["x509", "-in", certPath, "-text", "-noout"], { encoding: "utf8" });
-        if (certText.indexOf(ip) === -1) needRegen = true;
-      } catch (e) {}
-    }
+    try {
+      var certText = execFileSync("openssl", ["x509", "-in", certPath, "-text", "-noout"], { encoding: "utf8" });
+      for (var i = 0; i < allIPs.length; i++) {
+        if (certText.indexOf(allIPs[i]) === -1) {
+          needRegen = true;
+          break;
+        }
+      }
+    } catch (e) { needRegen = true; }
     if (!needRegen) return { key: keyPath, cert: certPath, caRoot: caRoot };
   }
 
   fs.mkdirSync(certDir, { recursive: true });
 
   var domains = ["localhost", "127.0.0.1", "::1"];
-  if (ip && ip !== "localhost") domains.push(ip);
+  for (var i = 0; i < allIPs.length; i++) {
+    if (domains.indexOf(allIPs[i]) === -1) domains.push(allIPs[i]);
+  }
 
   try {
     execSync(
@@ -1435,22 +1470,6 @@ function showSetupGuide(config, ip, goBack) {
   var wantRemote = false;
   var wantPush = false;
 
-  // If everything is already set up, skip straight to QR
-  var tsReady = getTailscaleIP() !== null;
-  var mcReady = hasMkcert();
-  if (tsReady && mcReady && config.tls) {
-    console.clear();
-    printLogo();
-    log("");
-    log(sym.pointer + "  " + a.bold + "Setup Notifications" + a.reset);
-    log(sym.bar);
-    log(sym.done + "  " + a.green + "Tailscale" + a.reset + a.dim + " · " + getTailscaleIP() + a.reset);
-    log(sym.done + "  " + a.green + "HTTPS" + a.reset + a.dim + " · mkcert installed" + a.reset);
-    log(sym.bar);
-    showSetupQR();
-    return;
-  }
-
   console.clear();
   printLogo();
   log("");
@@ -1564,10 +1583,19 @@ function showSetupGuide(config, ip, goBack) {
 
   function showSetupQR() {
     var tsIP = getTailscaleIP();
+    var lanIP = null;
+    if (!wantRemote) {
+      var allIPs = getAllIPs();
+      for (var j = 0; j < allIPs.length; j++) {
+        if (!allIPs[j].startsWith("100.")) { lanIP = allIPs[j]; break; }
+      }
+    }
+    var setupIP = wantRemote ? (tsIP || ip) : (lanIP || ip);
+    var setupQuery = wantRemote ? "" : "?mode=lan";
     // Always use HTTP onboarding URL for QR/setup when TLS is active
     var setupUrl = config.tls
-      ? "http://" + (tsIP || ip) + ":" + (config.port + 1) + "/setup"
-      : "http://" + (tsIP || ip) + ":" + config.port + "/setup";
+      ? "http://" + setupIP + ":" + (config.port + 1) + "/setup" + setupQuery
+      : "http://" + setupIP + ":" + config.port + "/setup" + setupQuery;
     log(sym.pointer + "  " + a.bold + "Continue on your device" + a.reset);
     log(sym.bar + "  " + a.dim + "Scan the QR code or open:" + a.reset);
     log(sym.bar + "  " + a.bold + setupUrl + a.reset);
@@ -1576,7 +1604,7 @@ function showSetupGuide(config, ip, goBack) {
       var lines = code.split("\n").map(function (l) { return "  " + sym.bar + "  " + l; }).join("\n");
       console.log(lines);
       log(sym.bar);
-      if (tsIP) {
+      if (wantRemote) {
         log(sym.bar + "  " + a.dim + "Can't connect? Make sure Tailscale is installed on your phone too." + a.reset);
       } else {
         log(sym.bar + "  " + a.dim + "Can't connect? Your phone must be on the same Wi-Fi network." + a.reset);

package/lib/pages.js

@@ -40,7 +40,7 @@ function pinPageHtml() {
     '</script></div></body></html>';
 }
 
-function setupPageHtml(httpsUrl, httpUrl, hasCert) {
+function setupPageHtml(httpsUrl, httpUrl, hasCert, lanMode) {
   return `<!DOCTYPE html><html lang="en"><head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover">
@@ -195,6 +195,7 @@ h1{color:#DA7756;font-size:22px;margin:0 0 4px;text-align:center}
   <div class="step-desc">Install Claude Relay as an app for quick access and a full-screen experience.</div>
 
   <div class="platform-ios">
+    <div class="check-status warn">On iOS, push notifications only work from the installed app. This step is required.</div>
     <div id="ios-not-safari" class="check-status warn" style="display:none">You must use <b>Safari</b> to install. Open this page in Safari first.</div>
     <div id="ios-safari-steps">
       <div class="instruction"><div class="inst-num">1</div>
@@ -237,6 +238,7 @@ h1{color:#DA7756;font-size:22px;margin:0 0 4px;text-align:center}
   </div>
 
   <div id="pwa-status" class="check-status pending">After installing, open Claude Relay from your home screen to continue setup.</div>
+  <button class="skip-link" id="pwa-skip" onclick="nextStep()" style="display:none">Skip for now</button>
 </div>
 
 <!-- Step 3: Push Notifications -->
@@ -270,6 +272,7 @@ h1{color:#DA7756;font-size:22px;margin:0 0 4px;text-align:center}
 var httpsUrl = ${JSON.stringify(httpsUrl)};
 var httpUrl = ${JSON.stringify(httpUrl)};
 var hasCert = ${hasCert ? 'true' : 'false'};
+var lanMode = ${lanMode ? 'true' : 'false'};
 var isHttps = location.protocol === "https:";
 var ua = navigator.userAgent;
 var isIOS = /iPhone|iPad|iPod/.test(ua);
@@ -326,10 +329,17 @@ if (isStandalone && localStorage.getItem("setup-pending")) {
 
 function buildSteps(hasPushSub) {
   steps = [];
-  if (!isTailscale && !isLocal) steps.push("tailscale");
+  if (!isTailscale && !isLocal && !lanMode) steps.push("tailscale");
   if (hasCert && !isHttps) steps.push("cert");
-  if (!isStandalone) steps.push("pwa");
-  if ((isHttps || isLocal) && !hasPushSub) steps.push("push");
+  if (isAndroid) {
+    // Android: push first (works in browser), then PWA as optional
+    if ((isHttps || isLocal) && !hasPushSub) steps.push("push");
+    if (!isStandalone) steps.push("pwa");
+  } else {
+    // iOS: PWA required for push, so install first
+    if (!isStandalone) steps.push("pwa");
+    if ((isHttps || isLocal) && !hasPushSub) steps.push("push");
+  }
   steps.push("done");
 
   // Trigger HTTPS check now that steps are built
@@ -350,6 +360,14 @@ function buildSteps(hasPushSub) {
     localStorage.setItem("setup-pending", String(stepsBeforePwa + 1));
   }
 
+  // Android: PWA is optional, show skip button and update text
+  if (isAndroid && steps.indexOf("pwa") !== -1) {
+    var pwaSkip = document.getElementById("pwa-skip");
+    var pwaStatus = document.getElementById("pwa-status");
+    if (pwaSkip) pwaSkip.style.display = "block";
+    if (pwaStatus) pwaStatus.textContent = "Optional: install for quick access and full-screen experience.";
+  }
+
   // Push: show warning if not on HTTPS
   if (!isHttps && !isLocal) {
     pushBtn.style.display = "none";
@@ -393,7 +411,7 @@ function showStep(idx) {
 function nextStep() {
   // After cert step on HTTP, redirect to HTTPS for remaining steps
   if (!isHttps && steps[currentStep] === "cert") {
-    location.replace(httpsUrl + "/setup");
+    location.replace(httpsUrl + "/setup" + (lanMode ? "?mode=lan" : ""));
     return;
   }
   if (currentStep < steps.length - 1) showStep(currentStep + 1);
@@ -616,7 +634,7 @@ if (!isHttps && !isLocal) {
     var ac = new AbortController();
     setTimeout(function() { ac.abort(); }, 3000);
     fetch(info.httpsUrl + "/info", { signal: ac.signal, mode: "no-cors" })
-      .then(function() { location.replace(info.httpsUrl + "/setup"); })
+      .then(function() { location.replace(info.httpsUrl + "/setup" + (lanMode ? "?mode=lan" : "")); })
       .catch(function() { init(); });
   }).catch(function() { init(); });
 } else {

package/lib/server.js

@@ -202,16 +202,17 @@ function createServer(opts) {
     }
 
     // Setup page
-    if (req.url === "/setup" && req.method === "GET") {
+    if (fullUrl === "/setup" && req.method === "GET") {
       var host = req.headers.host || "localhost";
       var hostname = host.split(":")[0];
       var protocol = tlsOptions ? "https" : "http";
       var setupUrl = protocol + "://" + hostname + ":" + portNum;
+      var lanMode = /[?&]mode=lan/.test(req.url);
       res.writeHead(200, {
         "Content-Type": "text/html; charset=utf-8",
         "Access-Control-Allow-Origin": "*",
       });
-      res.end(setupPageHtml(setupUrl, setupUrl, !!caContent));
+      res.end(setupPageHtml(setupUrl, setupUrl, !!caContent, lanMode));
       return;
     }
 
@@ -364,8 +365,9 @@ function createServer(opts) {
         var hostname = host.split(":")[0];
         var httpsSetupUrl = "https://" + hostname + ":" + portNum;
         var httpSetupUrl = "http://" + hostname + ":" + (portNum + 1);
+        var lanMode = /[?&]mode=lan/.test(req.url);
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-        res.end(setupPageHtml(httpsSetupUrl, httpSetupUrl, !!caContent));
+        res.end(setupPageHtml(httpsSetupUrl, httpSetupUrl, !!caContent, lanMode));
         return;
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-relay",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "claude-relay": "./bin/cli.js"