contactsheet 0.1.0 → 0.1.2

package/dist/cli.js

@@ -29,6 +29,7 @@ function loadConfig(cwd, flags) {
     // 末尾斜杠去掉,后面一律靠 `${target}/xxx` 拼
     target: String(pick("target") ?? DEFAULT_TARGET).replace(/\/+$/, ""),
     port,
+    portExplicit: flags.port !== void 0,
     appDir: pick("appDir") ?? detectAppDir(projectRoot),
     designDir: pick("designDir") ?? DEFAULT_DESIGN_DIR
   };
@@ -515,6 +516,10 @@ async function runInit(cwd, flags) {
   console.log("  1. \u7167\u5E38\u8D77\u4F60\u81EA\u5DF1\u7684 dev server(next dev),\u786E\u8BA4\u5B83\u5728 " + cfg.target);
   console.log("  2. \u53E6\u5F00\u4E00\u4E2A\u7EC8\u7AEF:npx contactsheet");
   console.log(`  3. \u6253\u5F00 http://localhost:${cfg.port}/__cs`);
+  console.log("");
+  console.log("\u7AEF\u53E3\u90FD\u53EF\u4EE5\u6362:dev server \u4E0D\u5728 " + cfg.target + " \u5C31 --target <url>,");
+  console.log(`  ${cfg.port} \u88AB\u5360\u5C31 --port <n>(\u6216\u6539 contactsheet.config.json \u540E\u91CD\u8DD1 init,MCP/hook \u4F1A\u8DDF\u7740\u6362)\u3002`);
+  console.log(`  ${cfg.port} \u88AB\u522B\u7684\u8FDB\u7A0B\u5360\u7740\u65F6,contactsheet \u4F1A\u81EA\u52A8\u987A\u5EF6\u5230\u4E0B\u4E00\u4E2A\u7A7A\u95F2\u7AEF\u53E3\u5E76\u63D0\u793A\u3002`);
 }
 function assertNextProject(root) {
   const pkgPath = join(root, "package.json");
@@ -543,11 +548,21 @@ function detectAppDir2(root) {
 contactsheet v1 \u53EA\u652F\u6301 App Router(\u753B\u677F\u8DEF\u7531\u8981\u6CE8\u5165\u5230 app \u76EE\u5F55\u91CC)\u3002Pages Router \u9879\u76EE\u6682\u65F6\u7528\u4E0D\u4E86\u3002`
   );
 }
+function detectDevTarget(root) {
+  try {
+    const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
+    const dev = pkg.scripts?.["dev"] ?? "";
+    const m = dev.match(/(?:-p|--port)[ =](\d{2,5})/) ?? dev.match(/\bPORT=(\d{2,5})/);
+    if (m && m[1] !== "3000") return `http://localhost:${m[1]}`;
+  } catch {
+  }
+  return null;
+}
 function writeConfigFile(root, appDir, flags) {
   const file = join(root, "contactsheet.config.json");
   const existing = readJsonObject(file) ?? {};
   const resolved = {
-    target: pickString(flags.target, existing["target"], DEFAULT_TARGET2),
+    target: pickString(flags.target, existing["target"], detectDevTarget(root) ?? DEFAULT_TARGET2),
     port: pickNumber(flags.port, existing["port"], DEFAULT_PORT2),
     appDir: pickString(flags.appDir, existing["appDir"], appDir),
     designDir: pickString(flags.designDir, existing["designDir"], DEFAULT_DESIGN_DIR2)
@@ -1550,19 +1565,14 @@ async function startServer(cfg) {
     s.on("close", () => sockets.delete(s));
   });
   const host = cfg.host ?? "127.0.0.1";
-  await new Promise((resolve2, reject) => {
-    server.once("error", reject);
-    server.listen(cfg.port, host, () => {
-      server.off("error", reject);
-      resolve2();
-    });
-  });
+  const port = await listenWithFallback(server, cfg, host);
   if (host !== "127.0.0.1" && host !== "localhost") {
     console.warn(
-      `[contactsheet] \u26A0\uFE0F  \u76D1\u542C\u5728 ${host}:${cfg.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`
+      `[contactsheet] \u26A0\uFE0F  \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`
     );
   }
   return {
+    port,
     async close() {
       closeAll();
       proxyLog.close();
@@ -1637,6 +1647,53 @@ function downPage(target) {
 function escapeHtml(s) {
   return s.replace(/[&<>"]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
 }
+async function occupiedBySameProject(cfg, port) {
+  try {
+    const ctl = AbortSignal.timeout(800);
+    const r = await fetch(`http://127.0.0.1:${port}/__cs/api/state`, { signal: ctl });
+    if (!r.ok) return false;
+    const data = await r.json();
+    return data?.projectRoot === cfg.projectRoot;
+  } catch {
+    return false;
+  }
+}
+async function listenWithFallback(server, cfg, host) {
+  const tryListen = (port) => new Promise((resolve2, reject) => {
+    const onErr = (err) => {
+      if (err.code === "EADDRINUSE") resolve2(false);
+      else reject(err);
+    };
+    server.once("error", onErr);
+    server.listen(port, host, () => {
+      server.off("error", onErr);
+      resolve2(true);
+    });
+  });
+  if (await tryListen(cfg.port)) return cfg.port;
+  if (await occupiedBySameProject(cfg, cfg.port)) {
+    console.log(
+      `[contactsheet] \u672C\u9879\u76EE\u5DF2\u7ECF\u6709\u4E00\u4E2A contactsheet \u5728\u8DD1\u4E86,\u76F4\u63A5\u7528\u5B83:http://localhost:${cfg.port}/__cs`
+    );
+    process.exit(0);
+  }
+  if (cfg.portExplicit) {
+    throw new Error(
+      `\u7AEF\u53E3 ${cfg.port} \u88AB\u5176\u4ED6\u8FDB\u7A0B\u5360\u7528\u3002\u6362\u4E00\u4E2A --port,\u6216\u627E\u51FA\u5360\u7528\u8005:lsof -nP -iTCP:${cfg.port} -sTCP:LISTEN`
+    );
+  }
+  for (let p = cfg.port + 1; p <= cfg.port + 20; p++) {
+    if (await tryListen(p)) {
+      console.warn(
+        `[contactsheet] \u26A0\uFE0F  \u7AEF\u53E3 ${cfg.port} \u88AB\u5360,\u5DF2\u987A\u5EF6\u5230 ${p} \u2192 http://localhost:${p}/__cs
+   \u6CE8\u610F:\u6362\u7AEF\u53E3 = \u6362\u6D4F\u89C8\u5668\u6E90\u3002\u753B\u677F\u4F4D\u7F6E/\u6298\u53E0/\u5E95\u8272\u8FD9\u4E9B\u672C\u673A\u8BB0\u5FC6\u6309\u6E90\u9694\u79BB,\u8FD9\u4E2A\u7AEF\u53E3\u4E0B\u662F\u5168\u65B0\u7684;
+   .mcp.json \u4E0E hook \u4ECD\u6307\u5411 ${cfg.port}\u3002\u60F3\u8981\u7A33\u5B9A,\u8BF7\u91CA\u653E ${cfg.port},\u6216\u6539 config \u7684 port \u540E\u91CD\u8DD1 npx contactsheet init\u3002`
+      );
+      return p;
+    }
+  }
+  throw new Error(`\u4ECE ${cfg.port} \u5F80\u4E0A\u8FDE\u8BD5 20 \u4E2A\u7AEF\u53E3\u90FD\u88AB\u5360,\u7528 --port \u6307\u5B9A\u4E00\u4E2A\u7A7A\u95F2\u7AEF\u53E3`);
+}
 
 // src/watch/index.ts
 import path7 from "node:path";
@@ -1743,7 +1800,7 @@ async function up(flags) {
     () => startWatcher(cfg, (entries) => broadcast({ type: "registry", entries }))
   );
   const server = await startServer(cfg);
-  banner(cfg);
+  banner(cfg, server.port);
   let closing = false;
   const shutdown = async (sig) => {
     if (closing) return;
@@ -1772,9 +1829,9 @@ async function quiet(fn) {
   } catch {
   }
 }
-function banner(cfg) {
+function banner(cfg, port) {
   console.log(`
-  contactsheet   http://localhost:${cfg.port}/__cs
+  contactsheet   http://localhost:${port}/__cs
   \u4EE3\u7406\u76EE\u6807       ${cfg.target}
   \u753B\u677F\u76EE\u5F55       ${cfg.designDir}/   \xB7   app \u76EE\u5F55 ${cfg.appDir}/
   Ctrl-C \u9000\u51FA