coderemote 0.3.0 → 0.3.2

package/README.md

@@ -97,7 +97,7 @@ coderemote stop                  # stop the agent for this folder (--all: every
 coderemote serve                 # share on 127.0.0.1 only, no tunnel (local testing)
 coderemote requests [PORT]       # requests that reached a previewed port (--grep, --failed, --json)
 coderemote request <ID>          # headers and bodies of one request (--show-secrets, --json)
-coderemote rotate-token          # revoke every paired device
+coderemote rotate-token          # revoke every paired device, stop running agents
 coderemote login                 # sign in again (--microsoft, or --device-code without a browser)
 coderemote update                # install the latest version (`up` says when there's one)
 coderemote help                  # all options

package/dist/coderemote.js

@@ -4,6 +4,7 @@
 import { execFile as execFile5, spawn as spawn3 } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import fs8 from "node:fs";
+import net2 from "node:net";
 import os4 from "node:os";
 import path7 from "node:path";
 import { fileURLToPath } from "node:url";
@@ -434,11 +435,11 @@ async function listeningSockets() {
   return sockets;
 }
 async function processTable() {
-  const out = await run("ps", ["-A", "-ww", "-o", "pid=,ppid=,command="]);
+  const out = await run("ps", ["-A", "-ww", "-o", "pid=,ppid=,tty=,command="]);
   const table = /* @__PURE__ */ new Map();
   for (const line of out.split("\n")) {
-    const m = line.match(/^\s*(\d+)\s+(\d+)\s+(.*)$/);
-    if (m) table.set(parseInt(m[1], 10), { ppid: parseInt(m[2], 10), command: m[3] });
+    const m = line.match(/^\s*(\d+)\s+(\d+)\s+(\S+)\s+(.*)$/);
+    if (m) table.set(parseInt(m[1], 10), { ppid: parseInt(m[2], 10), tty: /^\?+$/.test(m[3]) ? null : m[3], command: m[4] });
   }
   return table;
 }
@@ -476,6 +477,8 @@ async function listPorts(shells = /* @__PURE__ */ new Map()) {
       command: table.get(s.pid)?.command ?? s.name,
       cwd: null,
       session: sessionOf(s.pid, table, shells),
+      // Started from a terminal (a dev server) rather than by launchd, an app or a daemon.
+      terminal: table.get(s.pid)?.tty != null,
       self: s.pid === process.pid,
       agent: s.pid === process.pid || AGENT_COMMAND.test(table.get(s.pid)?.command ?? "")
     });
@@ -1478,7 +1481,7 @@ function parse(out) {
   return JSON.parse(out.slice(out.indexOf("{")));
 }
 function machineName(description) {
-  return (description || "").replace(/^(coderemote|vsremote)\s+/, "").replace(/\.local$/, "") || null;
+  return (description || "").replace(/^(coderemote|vsremote)\s+/, "").replace(/\.local\b/, "") || null;
 }
 function machine(tunnel, current) {
   return {
@@ -1587,7 +1590,7 @@ function installCommand(installedAt) {
 // package.json
 var package_default = {
   name: "coderemote",
-  version: "0.3.0",
+  version: "0.3.2",
   description: "Use your computer from your iPhone: files, git and a real terminal over a secure Microsoft Dev Tunnel. No SSH, no port forwarding, no VPN.",
   keywords: [
     "remote",
@@ -1935,12 +1938,23 @@ function loadConfig() {
     cfg2.token = randomBytes(32).toString("base64url");
     saveConfig(cfg2);
   }
+  if (cfg2.tunnelId && !cfg2.tunnels) {
+    cfg2.tunnels = { [DEFAULT_PORT]: cfg2.tunnelId };
+    saveConfig(cfg2);
+  }
   return cfg2;
 }
 function saveConfig(cfg2) {
   fs8.mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
   fs8.writeFileSync(CONFIG_FILE, JSON.stringify(cfg2, null, 2), { mode: 384 });
 }
+function portFree(port2) {
+  return new Promise((resolve) => {
+    const probe = net2.createServer();
+    probe.once("error", () => resolve(false));
+    probe.listen(port2, "127.0.0.1", () => probe.close(() => resolve(true)));
+  });
+}
 function listen(token, port2, root2, tunnelToken, preview, status2) {
   const server = createAgentServer({ token, root: root2, tunnelToken, preview, tunnelStatus: status2 });
   return new Promise((resolve, reject) => {
@@ -2009,20 +2023,22 @@ function applyAccess(tunnelId, anonymous2) {
   return anonymous2 ? devtunnel("access", "create", tunnelId, "--anonymous") : devtunnel("access", "reset", tunnelId);
 }
 async function ensureTunnel(cfg2, port2, anonymous2) {
-  if (cfg2.tunnelId) {
+  const known = cfg2.tunnels?.[port2];
+  if (known) {
     const [updated, access] = await Promise.all([
-      devtunnel("update", cfg2.tunnelId, "--expiration", "30d", "--add-labels", MACHINE_LABEL),
-      applyAccess(cfg2.tunnelId, anonymous2)
+      devtunnel("update", known, "--expiration", "30d", "--add-labels", MACHINE_LABEL),
+      applyAccess(known, anonymous2)
     ]);
     if (updated.ok) {
       if (!access.ok) throw new Error(`devtunnel access failed:
 ${access.out}`);
-      return cfg2.tunnelId;
+      return known;
     }
     if (!/not found/i.test(updated.out)) throw new Error(`devtunnel update failed:
 ${updated.out}`);
   }
-  const createArgs = ["create", "--expiration", "30d", "-d", `coderemote ${os4.hostname()}`, "--labels", MACHINE_LABEL, "--json"];
+  const name = port2 === DEFAULT_PORT ? os4.hostname() : `${os4.hostname()} :${port2}`;
+  const createArgs = ["create", "--expiration", "30d", "-d", `coderemote ${name}`, "--labels", MACHINE_LABEL, "--json"];
   if (anonymous2) createArgs.push("--allow-anonymous");
   const created = await devtunnel(...createArgs);
   if (!created.ok) throw new Error(`devtunnel create failed:
@@ -2033,7 +2049,8 @@ ${created.out}`);
   const portRes = await devtunnel("port", "create", tunnelId, "-p", String(port2), "--protocol", "http");
   if (!portRes.ok) throw new Error(`devtunnel port create failed:
 ${portRes.out}`);
-  cfg2.tunnelId = tunnelId;
+  cfg2.tunnels = { ...cfg2.tunnels, [port2]: tunnelId };
+  if (port2 === DEFAULT_PORT) cfg2.tunnelId = tunnelId;
   saveConfig(cfg2);
   return tunnelId;
 }
@@ -2117,7 +2134,7 @@ var USAGE = `Usage: coderemote <command> [options]
   status               list running agents and their terminal sessions
   kill <id>... | --all kill terminal sessions (an id prefix is enough)
   stop [--all]         stop the agent for this folder (or every agent)
-  rotate-token         revoke every paired device
+  rotate-token         revoke every paired device and stop running agents
   update               install the latest coderemote (up says when there's one)
   requests [PORT]      list the requests that reached a previewed port, oldest first;
                        --grep TEXT, --failed (errors, 4xx and 5xx), --limit N (default 50)
@@ -2131,7 +2148,8 @@ var USAGE = `Usage: coderemote <command> [options]
 
 Options:
   --root DIR           folder to share (default: current folder)
-  --port N             local port (default: ${DEFAULT_PORT})
+  --port N             local port (default: the first free one from ${DEFAULT_PORT}; each port
+                       keeps its own tunnel URL, so a folder pairs once per port)
   --allow-anonymous    up: skip the sign-in, the pairing token alone grants access
                        (alias --no-auth)
   --web                up: also run \`code tunnel\` and print a vscode.dev link that opens
@@ -2149,11 +2167,32 @@ var root = path7.resolve(flag("--root") ?? process.cwd());
 var cfg = loadConfig();
 var registry = new AgentRegistry(path7.join(CONFIG_DIR, "agents"));
 async function start({ tunnel }) {
-  const running = registry.list().find((a) => a.port === port);
-  if (running) {
-    console.error(`An agent already runs on port ${port} for ${running.root} (pid ${running.pid}).`);
-    console.error("Stop it with `coderemote stop --all`, or pick another port with --port.");
-    process.exit(1);
+  const agents = registry.list();
+  if (flag("--port")) {
+    const running = agents.find((a) => a.port === port);
+    if (running) {
+      console.error(`An agent already runs on port ${port} for ${running.root} (pid ${running.pid}).`);
+      console.error("Stop it with `coderemote stop --all`, or pick another port with --port.");
+      process.exit(1);
+    }
+  } else {
+    const sharing = agents.find((a) => a.root === root);
+    if (sharing) {
+      console.error(`${root} is already shared on port ${sharing.port} (pid ${sharing.pid}).`);
+      console.error("Stop it with `coderemote stop`, or start another one with --port.");
+      process.exit(1);
+    }
+    const taken = async (p) => agents.some((a) => a.port === p) || !await portFree(p);
+    const remembered = cfg.folderPorts?.[root];
+    if (remembered && !await taken(remembered)) port = remembered;
+    else {
+      const claimed = new Set(Object.values(cfg.folderPorts ?? {}));
+      while (claimed.has(port) || await taken(port)) port++;
+    }
+    if (port !== remembered) {
+      cfg.folderPorts = { ...cfg.folderPorts, [root]: port };
+      saveConfig(cfg);
+    }
   }
   let server;
   let tunnelId;
@@ -2193,7 +2232,7 @@ async function start({ tunnel }) {
     account = user;
     spinner.succeed();
     spinner.start("Connecting to the relay");
-    const known = cfg.tunnelId;
+    const known = cfg.tunnels?.[port];
     let hosting = known ? hostTunnel(known, port) : null;
     hosting?.catch(() => {
     });
@@ -2356,7 +2395,13 @@ Token: ${cfg.token}`);
   case "rotate-token": {
     cfg.token = randomBytes(32).toString("base64url");
     saveConfig(cfg);
-    console.log("Token rotated. Re-pair your devices, and restart running agents.");
+    const agents = registry.list();
+    for (const agent of agents) {
+      process.kill(agent.pid, "SIGTERM");
+      console.log(`stopped agent for ${agent.root} (pid ${agent.pid})`);
+    }
+    console.log("Token rotated. Re-pair your devices.");
+    if (agents.length) console.log("Run `coderemote up` again in each folder above; each keeps its tunnel URL.");
     break;
   }
   case "login": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderemote",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Use your computer from your iPhone: files, git and a real terminal over a secure Microsoft Dev Tunnel. No SSH, no port forwarding, no VPN.",
   "keywords": [
     "remote",