coderemote 0.3.6 → 0.3.8

package/README.md

@@ -45,7 +45,7 @@ cd ~/projects/my-app && coderemote up
 
 With Homebrew: `brew install coderemoteapp/tap/coderemote`.
 
-No Node.js? The install scripts use yours when there is one (20 or newer), and otherwise
+No Node.js? The install scripts use yours when there is one (22 or newer), and otherwise
 download Node.js into `~/.coderemote/runtime` for coderemote alone:
 
 ```sh
@@ -143,7 +143,7 @@ example to reuse a session token in a test.
 
 ## Requirements
 
-- **Node.js 20** or newer on **macOS** or **Windows 10/11** (Linux is expected to work but not
+- **Node.js 22** or newer on **macOS** or **Windows 10/11** (Linux is expected to work but not
   yet tested); the install scripts download it when it's missing. On Windows, terminals run
   PowerShell (`pwsh` when installed).
 - A **GitHub or Microsoft account** to sign in to Dev Tunnels

package/dist/coderemote.js

@@ -4,7 +4,7 @@
 import { execFile as execFile8, execFileSync, spawn as spawn3 } from "node:child_process";
 import { randomBytes as randomBytes3 } from "node:crypto";
 import fs14 from "node:fs";
-import net2 from "node:net";
+import net3 from "node:net";
 import os6 from "node:os";
 import path12 from "node:path";
 import { fileURLToPath } from "node:url";
@@ -532,6 +532,7 @@ var AgentHub = class extends EventEmitter {
     }
     switch (event.hook_event_name) {
       case "SessionStart":
+        if (s.state === "running" && s.turnStartedAt == null) s.state = "idle";
         break;
       case "UserPromptSubmit": {
         const text = typeof event.prompt === "string" ? event.prompt : "";
@@ -1053,6 +1054,7 @@ var LANDING_HTML = `<!doctype html>
 // ../../packages/agent-core/src/ports.js
 import { execFile as execFile3 } from "node:child_process";
 import fs6 from "node:fs/promises";
+import net from "node:net";
 import os from "node:os";
 
 // ../../packages/agent-core/src/platform.js
@@ -1278,14 +1280,27 @@ function sessionOf(pid, table, shells) {
 async function killListener(pid, { force = false, shells } = {}) {
   if (!Number.isInteger(pid) || pid <= 1) throw new HttpError(400, "pid must be a process id");
   if (pid === process.pid) throw new HttpError(403, "the agent cannot stop itself");
-  const ports = await listPorts(shells);
-  if (!ports.some((p) => p.pid === pid)) throw new HttpError(404, "no listening process with that pid");
+  const ports = (await listPorts(shells)).filter((p) => p.pid === pid).map((p) => p.port);
+  if (!ports.length) throw new HttpError(404, "no listening process with that pid");
   try {
     process.kill(pid, force ? "SIGKILL" : "SIGTERM");
   } catch (e) {
     if (e.code === "ESRCH") throw new HttpError(404, "no listening process with that pid");
     throw e;
   }
+  return ports;
+}
+function isListening(port2, timeout = 2e3) {
+  return new Promise((resolve) => {
+    const socket = net.connect({ host: "localhost", port: port2, timeout });
+    const done = (up) => {
+      socket.destroy();
+      resolve(up);
+    };
+    socket.once("connect", () => done(true));
+    socket.once("timeout", () => done(true));
+    socket.once("error", () => done(false));
+  });
 }
 
 // ../../packages/agent-core/src/push.js
@@ -1507,7 +1522,7 @@ var PushSender = class {
 
 // ../../packages/agent-core/src/inspector.js
 import http from "node:http";
-import net from "node:net";
+import net2 from "node:net";
 import zlib from "node:zlib";
 var MAX_ENTRIES2 = 200;
 var MAX_BODY = 64 * 1024;
@@ -1641,7 +1656,7 @@ var InspectingProxy = class {
   /** WebSockets (hot reload) pass through as raw bytes; only the handshake is recorded. */
   #tunnelUpgrade(req, socket, head) {
     const entry2 = this.#record(req);
-    const upstream = net.connect({ host: "localhost", port: this.target }, () => {
+    const upstream = net2.connect({ host: "localhost", port: this.target }, () => {
       const headers = this.#headers(req);
       const lines = [`${req.method} ${req.url} HTTP/1.1`];
       for (const [k, v] of Object.entries(headers)) {
@@ -1990,7 +2005,8 @@ function createAgentServer({
   pluginInstalled = null,
   agents = new AgentHub(),
   pushStore: pushStore2 = null,
-  pushOptions = {}
+  pushOptions = {},
+  previewSweep = {}
 }) {
   const handoff = new TunnelHandoff({ token, mint: tunnelToken });
   const sandbox = new Sandbox(root2);
@@ -2140,6 +2156,36 @@ function createAgentServer({
     ports.sort((a, b) => a.port - b.port);
     return { ports, token: issued?.token ?? null, expiresAt: issued?.expiresAt ?? null };
   }
+  const { checkMs = 5e3, graceMs = 3e4, killedMs = 1500 } = previewSweep;
+  const silentSince = /* @__PURE__ */ new Map();
+  let sweeping = false;
+  async function sweepPreviews(ports = [...proxies.keys()], now = false) {
+    const forwarded = new Set(preview.list().map((p) => p.port));
+    for (const port2 of ports) {
+      const proxy = proxies.get(port2);
+      if (!proxy || !forwarded.has(proxy.port) || await isListening(port2)) {
+        silentSince.delete(port2);
+        continue;
+      }
+      if (!silentSince.has(port2)) silentSince.set(port2, Date.now());
+      if (!now && Date.now() - silentSince.get(port2) < graceMs) continue;
+      silentSince.delete(port2);
+      try {
+        await preview.unforward(proxy.port);
+      } catch {
+      }
+    }
+  }
+  const previewTimer = preview && setInterval(async () => {
+    if (sweeping || !proxies.size) return;
+    sweeping = true;
+    try {
+      await sweepPreviews();
+    } finally {
+      sweeping = false;
+    }
+  }, checkMs);
+  previewTimer?.unref();
   function shellPids() {
     return new Map(sessions.list().map((s) => [s.pid, s.id]));
   }
@@ -2259,7 +2305,9 @@ function createAgentServer({
     [Routes.portsList]: async () => ({ ports: await listPorts(shellPids()) }),
     [Routes.portsKill]: async (url, req) => {
       const { pid, force } = await readJson(req);
-      await killListener(pid, { force: force === true, shells: shellPids() });
+      const ports = await killListener(pid, { force: force === true, shells: shellPids() });
+      if (preview) setTimeout(() => sweepPreviews(ports, true).catch(() => {
+      }), killedMs).unref();
       return {};
     },
     [Routes.previewList]: async () => {
@@ -2596,6 +2644,7 @@ function createAgentServer({
   }
   server.on("close", () => {
     clearInterval(sweep);
+    clearInterval(previewTimer);
     sessions.killAll();
     for (const proxy of proxies.values()) proxy.close();
   });
@@ -3179,6 +3228,7 @@ var AgentRegistry = class {
 
 // src/tunnel-status.js
 var MACHINE_LABEL = "coderemote";
+var PROVIDER = "devtunnels";
 var CACHE_MS = 15e3;
 function parse(out) {
   return JSON.parse(out.slice(out.indexOf("{")));
@@ -3205,11 +3255,13 @@ function tunnelStatus({ devtunnel: devtunnel2, tunnelId, account, anonymous: ano
     if (cached && Date.now() - cached.at < CACHE_MS) return { ...cached.value, previewPorts: preview?.list().length ?? 0 };
     const [own, listed] = await Promise.all([
       devtunnel2("show", id, "--json"),
-      devtunnel2("list", "--labels", MACHINE_LABEL, "--json")
+      // Every tunnel, previews' too: they all count against the account's limit.
+      devtunnel2("list", "--limit", "100", "--json")
     ]);
     if (!own.ok) throw new Error(`devtunnel show failed: ${own.out.trim()}`);
     const tunnel = parse(own.out).tunnel;
-    const others = listed.ok ? (parse(listed.out).tunnels ?? []).filter((t) => t.tunnelId !== id) : [];
+    const all = listed.ok ? parse(listed.out).tunnels ?? [] : null;
+    const others = (all ?? []).filter((t) => t.tunnelId !== id && t.labels?.includes(MACHINE_LABEL));
     const shown = await Promise.all(
       others.map(async (t) => {
         const res = await devtunnel2("show", t.tunnelId, "--json");
@@ -3218,6 +3270,7 @@ function tunnelStatus({ devtunnel: devtunnel2, tunnelId, account, anonymous: ano
     );
     const machines = [machine(tunnel, true), ...shown.filter(Boolean).map((t) => machine(t, false))];
     const value = {
+      provider: PROVIDER,
       account: account() ?? null,
       tunnel: {
         id,
@@ -3229,7 +3282,9 @@ function tunnelStatus({ devtunnel: devtunnel2, tunnelId, account, anonymous: ano
         uploaded: tunnel.uploadTotal ?? null,
         downloaded: tunnel.downloadTotal ?? null
       },
-      machines
+      machines,
+      // null when the account couldn't be listed
+      quota: all && { used: all.length, limit: TUNNEL_LIMIT }
     };
     cached = { at: Date.now(), value };
     return { ...value, previewPorts: preview?.list().length ?? 0 };
@@ -3300,7 +3355,7 @@ function installCommand(installedAt) {
 // package.json
 var package_default = {
   name: "coderemote",
-  version: "0.3.6",
+  version: "0.3.8",
   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",
@@ -3341,7 +3396,7 @@ var package_default = {
     "scripts/fix-node-pty.js"
   ],
   engines: {
-    node: ">=20"
+    node: ">=22"
   },
   scripts: {
     build: "node scripts/build.js",
@@ -3665,7 +3720,7 @@ function saveConfig(cfg2) {
 }
 function portFree(port2) {
   return new Promise((resolve) => {
-    const probe = net2.createServer();
+    const probe = net3.createServer();
     probe.once("error", () => resolve(false));
     probe.listen(port2, "127.0.0.1", () => probe.close(() => resolve(true)));
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderemote",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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",
@@ -41,7 +41,7 @@
     "scripts/fix-node-pty.js"
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "scripts": {
     "build": "node scripts/build.js",