contactsheet 0.1.3 → 0.1.4

package/dist/cli.js

@@ -1581,7 +1581,14 @@ async function startServer(cfg) {
     s.on("close", () => sockets.delete(s));
   });
   const host = cfg.host ?? "127.0.0.1";
-  const port = await listenWithFallback(server, cfg, host);
+  let twin = null;
+  const port = await listenWithFallback(server, cfg, host, (t) => {
+    twin = t;
+    t.on("connection", (sock) => {
+      sockets.add(sock);
+      sock.on("close", () => sockets.delete(sock));
+    });
+  });
   if (host !== "127.0.0.1" && host !== "localhost") {
     console.warn(
       warn(`\u76D1\u542C\u5728 ${host}:${port} \u2014\u2014 \u753B\u5E03\u65E0\u9274\u6743,\u540C\u7F51\u7EDC\u7684\u4EFB\u4F55\u4EBA\u90FD\u80FD\u8BFB\u4F60\u7684\u6279\u6CE8\u3001\u5E76\u5411\u4F60\u7684 Claude Code \u4F1A\u8BDD\u63A8\u9001\u6D88\u606F\u3002\u53EA\u5728\u53EF\u4FE1\u7F51\u7EDC\u8FD9\u4E48\u505A\u3002`)
@@ -1593,6 +1600,9 @@ async function startServer(cfg) {
       closeAll();
       proxyLog.close();
       proxy.close();
+      if (twin) {
+        await new Promise((r) => twin.close(() => r()));
+      }
       await new Promise((resolve2) => {
         const fallback = setTimeout(resolve2, 2e3);
         for (const s of sockets) s.destroy();
@@ -1674,18 +1684,34 @@ async function occupiedBySameProject(cfg, port) {
     return false;
   }
 }
-async function listenWithFallback(server, cfg, host) {
-  const tryListen = (port) => new Promise((resolve2, reject) => {
+async function listenWithFallback(server, cfg, host, onTwin) {
+  const listenOnce = (srv, port, h) => new Promise((resolve2, reject) => {
     const onErr = (err) => {
-      if (err.code === "EADDRINUSE") resolve2(false);
+      if (err.code === "EADDRINUSE") resolve2("busy");
+      else if (err.code === "EADDRNOTAVAIL" || err.code === "EAFNOSUPPORT") resolve2("nofam");
       else reject(err);
     };
-    server.once("error", onErr);
-    server.listen(port, host, () => {
-      server.off("error", onErr);
-      resolve2(true);
+    srv.once("error", onErr);
+    srv.listen(port, h, () => {
+      srv.off("error", onErr);
+      resolve2("ok");
     });
   });
+  const tryListen = async (port) => {
+    const main2 = await listenOnce(server, port, host);
+    if (main2 !== "ok") return false;
+    if (host !== "127.0.0.1") return true;
+    const t = http.createServer(server.listeners("request")[0]);
+    for (const l of server.listeners("upgrade")) t.on("upgrade", l);
+    const r = await listenOnce(t, port, "::1");
+    if (r === "ok") {
+      onTwin(t);
+      return true;
+    }
+    if (r === "nofam") return true;
+    await new Promise((res) => server.close(() => res()));
+    return false;
+  };
   if (await tryListen(cfg.port)) return cfg.port;
   if (await occupiedBySameProject(cfg, cfg.port)) {
     console.log(