comp-hub 0.42.6 → 0.42.7

package/bin/lib/startup.js

@@ -1,254 +1,254 @@
-const path = require("path");
-const fs = require("fs");
-const { spawn } = require("child_process");
-const { httpPost, streamLogs, deregisterProject } = require("./http");
-const { computeHash, projectRoot, readMasterRuntime, loadComphubConfig, colors, apiUrl } = require("./utils");
-const { cyan, green, white, yellow, red } = colors;
-const { ADMIN_API, POLL_INTERVAL, MAX_RETRIES, DEFAULT_PORT } = require("./constants");
-const getPort = require("get-port");
-
-// ---- Config ----
-
-function mergeConfig(opts, cwd) {
-  // 加载项目配置文件，作为命令行参数的 fallback
-  const fileConfig = loadComphubConfig(cwd);
-  // 优先级：命令行 > 配置文件 > 默认值
-  return {
-    dir: opts.dir || fileConfig.dir || "./",
-    api: opts.api || fileConfig.api,
-    allowDebug: opts.allowDebug != null ? opts.allowDebug : fileConfig.allowDebug != null ? fileConfig.allowDebug : false,
-    proxy: opts.proxy || fileConfig.proxy,
-    port: opts.port,
-    logLevel: opts.logLevel || fileConfig.logLevel || "info"
-  };
-}
-
-// ---- Master lifecycle ----
-
-async function waitForMasterRuntime() {
-  for (let i = 0; i < MAX_RETRIES; i++) {
-    const runtime = await readMasterRuntime();
-    if (runtime) return runtime;
-    await new Promise(r => setTimeout(r, POLL_INTERVAL));
-  }
-  return null;
-}
-
-async function spawnMaster(publicPort, pkg, cwd) {
-  const masterEntry = path.join(projectRoot, "dist/master.js");
-
-  if (!fs.existsSync(masterEntry)) {
-    throw new Error("Master entry file not found, startup failed");
-  }
-
-  const masterArgs = ["--port", String(publicPort), "--public-port", String(publicPort)];
-  // 不再使用 stdio:inherit，改为 pipe stdout/stderr：
-  // - stdin: inherit（Ctrl+C 信号需要）
-  // - stdout: pipe（过滤掉 MidwayJS 子进程日志，只保留 master 自身消息）
-  // - stderr: pipe（转发给 CLI 用于崩溃诊断）
-  const child = spawn(process.execPath, ["--no-deprecation", masterEntry, ...masterArgs], {
-    stdio: ["inherit", "pipe", "pipe"],
-    cwd,
-    env: {
-      ...process.env,
-      COMP_HUB_VERSION: pkg.version
-    }
-  });
-
-  // stdout 行缓冲（跨 data 事件的未完成行）
-  let stdoutPending = "";
-
-  // 转发 stderr 给 CLI（用于崩溃诊断）
-  if (child.stderr) {
-    child.stderr.on("data", chunk => {
-      process.stderr.write(chunk);
-    });
-  }
-
-  // 过滤 stdout：只转发 master 自身消息，跳过带 [hash] 前缀的 MidwayJS 子进程日志
-  // MidwayJS 日志会通过 SSE 按项目过滤后展示
-  if (child.stdout) {
-    child.stdout.on("data", chunk => {
-      stdoutPending += chunk.toString();
-      const lines = stdoutPending.split("\n");
-      stdoutPending = lines.pop() || ""; // 保留不完整行
-      for (const line of lines) {
-        // 跳过 [8位hex_hash] 前缀的行（属于 MidwayJS 子进程日志）
-        if (!/^\[[0-9a-f]{8}\]/.test(line)) {
-          process.stdout.write(line + "\n");
-        }
-      }
-    });
-  }
-
-  // 转发父进程信号，确保 Ctrl+C 时 master 也能优雅退出
-  ["SIGINT", "SIGTERM"].forEach(sig => {
-    process.on(sig, () => {
-      child.kill(sig);
-    });
-  });
-
-  // Master 退出时 CLI 也跟着退出
-  child.on("exit", code => {
-    // 输出剩余的 pending 数据
-    if (stdoutPending && !/^\[[0-9a-f]{8}\]/.test(stdoutPending)) {
-      process.stdout.write(stdoutPending);
-    }
-    process.exit(code || 0);
-  });
-
-  const runtime = await waitForMasterRuntime();
-  if (!runtime) {
-    child.kill();
-    throw new Error("Master startup timeout");
-  }
-
-  return { runtime };
-}
-
-/**
- * 确保 master 在运行，返回运行时信息。
- * 如果已在运行则复用，否则 spawn 新的 master 进程。
- */
-async function ensureMasterRunning(opts, pkg) {
-  let portMismatch = false;
-  let runningPublicPort = 0;
-
-  const existingRuntime = await readMasterRuntime();
-
-  if (existingRuntime) {
-    // Master 已在运行，检查用户指定的端口是否匹配
-    const expectedPort = opts.port != null ? opts.port : existingRuntime.publicPort;
-    if (opts.port != null && existingRuntime.publicPort !== expectedPort) {
-      portMismatch = true;
-      runningPublicPort = existingRuntime.publicPort;
-    }
-    return { runtime: existingRuntime, portMismatch, runningPublicPort };
-  }
-
-  // 启动新 master（前台运行，日志输出到终端）
-  const portHint = opts.port != null ? opts.port : DEFAULT_PORT;
-  const publicPort = await getPort({ port: getPort.makeRange(portHint, portHint + 100) });
-
-  const { runtime } = await spawnMaster(publicPort, pkg, process.cwd());
-
-  return { runtime, portMismatch, runningPublicPort };
-}
-
-// ---- Registration ----
-
-async function registerProject(masterPort, hash, cwd, opts) {
-  const body = {
-    hash,
-    cwd,
-    dir: opts.dir || "./"
-  };
-  if (opts.api) body.api = opts.api;
-  if (opts.allowDebug) body.allowDebug = true;
-  if (opts.proxy) body.proxy = opts.proxy;
-  if (opts.logLevel) body.logLevel = opts.logLevel;
-
-  const res = await httpPost(apiUrl(masterPort, ADMIN_API.REGISTER), body);
-  if (!res.ok) {
-    throw new Error(res.error || "Registration failed");
-  }
-  console.log(`${green("✓")} Project registered (hash: ${hash})`);
-  return res;
-}
-
-// ---- Banner ----
-
-function printBanner(pkg, cwd, hash, displayPort, opts, { portMismatch, runningPublicPort }) {
-  const url = `http://localhost:${displayPort}/${hash}/main/`;
-
-  const lines = [
-    "",
-    cyan("   ██████╗  ██████╗  ███╗   ███╗ ██████╗       ██╗  ██╗ ██╗   ██╗ ██████╗ "),
-    cyan("  ██╔════╝ ██╔═══██╗ ████╗ ████║ ██╔══██╗      ██║  ██║ ██║   ██║ ██╔══██╗"),
-    cyan("  ██║      ██║   ██║ ██╔████╔██║ ██████╔╝      ███████║ ██║   ██║ ██████╔╝"),
-    cyan("  ██║      ██║   ██║ ██║╚██╔╝██║ ██╔═══╝       ██╔══██║ ██║   ██║ ██╔══██╗"),
-    cyan("  ╚██████╗ ╚██████╔╝ ██║ ╚═╝ ██║ ██║           ██║  ██║ ╚██████╔╝ ██████╔╝"),
-    cyan("   ╚═════╝  ╚═════╝  ╚═╝     ╚═╝ ╚═╝           ╚═╝  ╚═╝  ╚═════╝  ╚═════╝ "),
-    "",
-    "",
-    `  ${green("Version")}  ${pkg.version}`,
-    `  ${green("Project")}  ${cwd}`,
-    `  ${green("Hash")}     ${hash}`,
-    `  ${green("Port")}     ${displayPort}`,
-    "",
-    `  ${yellow("URL")}      ${cyan(url)}`,
-    "",
-    white("  ─────────────────────────────────────────────"),
-    "",
-    `  ${"comphub status".padEnd(30)}View all projects`,
-    `  ${`comphub stop    ${hash}`.padEnd(30)}Stop current project`,
-    `  ${"comphub stop    --all".padEnd(30)}Stop all projects`,
-    `  ${"comphub kill".padEnd(30)}Shutdown master`,
-    ""
-  ];
-
-  if (portMismatch) {
-    lines.push(
-      white("  ─────────────────────────────────────────────"),
-      "",
-      red(`  ⚠ Master is already running on port ${runningPublicPort}, ignoring -p ${opts.port}`),
-      red(`    To change port, please run comphub kill first`),
-      ""
-    );
-  }
-
-  console.log(lines.join("\n"));
-}
-
-// ---- Main ----
-
-async function main(pkg, opts) {
-  if (!fs.existsSync(path.join(process.cwd(), "package.json"))) {
-    console.error(`${red("✗")} Current directory is not a Node.js project`);
-    process.exit(1);
-  }
-
-  const cwd = process.cwd();
-  const hash = computeHash(cwd);
-
-  opts = mergeConfig(opts, cwd);
-
-  console.log(`${green("✓")} ${pkg.name} v${pkg.version}`);
-
-  const { runtime, portMismatch, runningPublicPort } = await ensureMasterRunning(opts, pkg);
-
-  const masterPort = runtime.managementPort;
-  const displayPort = runtime.publicPort;
-
-  await registerProject(masterPort, hash, cwd, opts);
-
-  printBanner(pkg, cwd, hash, displayPort, opts, { portMismatch, runningPublicPort });
-
-  // Ctrl+C / kill 时通知 master 注销本项目，使 MidwayJS 子进程能够停止
-  let deregistered = false;
-  const cleanup = async () => {
-    if (deregistered) return;
-    deregistered = true;
-    try {
-      await deregisterProject(masterPort, hash);
-    } catch {
-      // 忽略注销失败（master 可能已关闭）
-    }
-    process.exit(0);
-  };
-  process.on("SIGINT", cleanup);
-  process.on("SIGTERM", cleanup);
-
-  // 统一通过 SSE 实时接收本项目 MidwayJS 子进程日志（按 hash 过滤）
-  // 第一个 CLI（spawn master 的）不再通过 stdio:inherit 看到其他项目的日志
-  console.log(`\n  ${white("─")} Streaming logs from MidwayJS (${hash}) ${white("─")}\n`);
-
-  const logsUrl = `http://localhost:${masterPort}/__master__/projects/${hash}/logs`;
-  try {
-    await streamLogs(logsUrl, hash);
-  } catch (err) {
-    console.error(`\n  ${red("✗")} Log stream error: ${err.message}`);
-  }
-}
-
-module.exports = { mergeConfig, main };
+const path = require("path");
+const fs = require("fs");
+const { spawn } = require("child_process");
+const { httpPost, streamLogs, deregisterProject } = require("./http");
+const { computeHash, projectRoot, readMasterRuntime, loadComphubConfig, colors, apiUrl } = require("./utils");
+const { cyan, green, white, yellow, red } = colors;
+const { ADMIN_API, POLL_INTERVAL, MAX_RETRIES, DEFAULT_PORT } = require("./constants");
+const getPort = require("get-port");
+
+// ---- Config ----
+
+function mergeConfig(opts, cwd) {
+  // 加载项目配置文件，作为命令行参数的 fallback
+  const fileConfig = loadComphubConfig(cwd);
+  // 优先级：命令行 > 配置文件 > 默认值
+  return {
+    dir: opts.dir || fileConfig.dir || "./",
+    api: opts.api || fileConfig.api,
+    allowDebug: opts.allowDebug != null ? opts.allowDebug : fileConfig.allowDebug != null ? fileConfig.allowDebug : false,
+    proxy: opts.proxy || fileConfig.proxy,
+    port: opts.port,
+    logLevel: opts.logLevel || fileConfig.logLevel || "info"
+  };
+}
+
+// ---- Master lifecycle ----
+
+async function waitForMasterRuntime() {
+  for (let i = 0; i < MAX_RETRIES; i++) {
+    const runtime = await readMasterRuntime();
+    if (runtime) return runtime;
+    await new Promise(r => setTimeout(r, POLL_INTERVAL));
+  }
+  return null;
+}
+
+async function spawnMaster(publicPort, pkg, cwd) {
+  const masterEntry = path.join(projectRoot, "dist/master.js");
+
+  if (!fs.existsSync(masterEntry)) {
+    throw new Error("Master entry file not found, startup failed");
+  }
+
+  const masterArgs = ["--port", String(publicPort), "--public-port", String(publicPort)];
+  // 不再使用 stdio:inherit，改为 pipe stdout/stderr：
+  // - stdin: inherit（Ctrl+C 信号需要）
+  // - stdout: pipe（过滤掉 MidwayJS 子进程日志，只保留 master 自身消息）
+  // - stderr: pipe（转发给 CLI 用于崩溃诊断）
+  const child = spawn(process.execPath, ["--no-deprecation", masterEntry, ...masterArgs], {
+    stdio: ["inherit", "pipe", "pipe"],
+    cwd,
+    env: {
+      ...process.env,
+      COMP_HUB_VERSION: pkg.version
+    }
+  });
+
+  // stdout 行缓冲（跨 data 事件的未完成行）
+  let stdoutPending = "";
+
+  // 转发 stderr 给 CLI（用于崩溃诊断）
+  if (child.stderr) {
+    child.stderr.on("data", chunk => {
+      process.stderr.write(chunk);
+    });
+  }
+
+  // 过滤 stdout：只转发 master 自身消息，跳过带 [hash] 前缀的 MidwayJS 子进程日志
+  // MidwayJS 日志会通过 SSE 按项目过滤后展示
+  if (child.stdout) {
+    child.stdout.on("data", chunk => {
+      stdoutPending += chunk.toString();
+      const lines = stdoutPending.split("\n");
+      stdoutPending = lines.pop() || ""; // 保留不完整行
+      for (const line of lines) {
+        // 跳过 [8位hex_hash] 前缀的行（属于 MidwayJS 子进程日志）
+        if (!/^\[[0-9a-f]{8}\]/.test(line)) {
+          process.stdout.write(line + "\n");
+        }
+      }
+    });
+  }
+
+  // 转发父进程信号，确保 Ctrl+C 时 master 也能优雅退出
+  ["SIGINT", "SIGTERM"].forEach(sig => {
+    process.on(sig, () => {
+      child.kill(sig);
+    });
+  });
+
+  // Master 退出时 CLI 也跟着退出
+  child.on("exit", code => {
+    // 输出剩余的 pending 数据
+    if (stdoutPending && !/^\[[0-9a-f]{8}\]/.test(stdoutPending)) {
+      process.stdout.write(stdoutPending);
+    }
+    process.exit(code || 0);
+  });
+
+  const runtime = await waitForMasterRuntime();
+  if (!runtime) {
+    child.kill();
+    throw new Error("Master startup timeout");
+  }
+
+  return { runtime };
+}
+
+/**
+ * 确保 master 在运行，返回运行时信息。
+ * 如果已在运行则复用，否则 spawn 新的 master 进程。
+ */
+async function ensureMasterRunning(opts, pkg) {
+  let portMismatch = false;
+  let runningPublicPort = 0;
+
+  const existingRuntime = await readMasterRuntime();
+
+  if (existingRuntime) {
+    // Master 已在运行，检查用户指定的端口是否匹配
+    const expectedPort = opts.port != null ? opts.port : existingRuntime.publicPort;
+    if (opts.port != null && existingRuntime.publicPort !== expectedPort) {
+      portMismatch = true;
+      runningPublicPort = existingRuntime.publicPort;
+    }
+    return { runtime: existingRuntime, portMismatch, runningPublicPort };
+  }
+
+  // 启动新 master（前台运行，日志输出到终端）
+  const portHint = opts.port != null ? opts.port : DEFAULT_PORT;
+  const publicPort = await getPort({ port: getPort.makeRange(portHint, portHint + 100) });
+
+  const { runtime } = await spawnMaster(publicPort, pkg, process.cwd());
+
+  return { runtime, portMismatch, runningPublicPort };
+}
+
+// ---- Registration ----
+
+async function registerProject(masterPort, hash, cwd, opts) {
+  const body = {
+    hash,
+    cwd,
+    dir: opts.dir || "./"
+  };
+  if (opts.api) body.api = opts.api;
+  if (opts.allowDebug) body.allowDebug = true;
+  if (opts.proxy) body.proxy = opts.proxy;
+  if (opts.logLevel) body.logLevel = opts.logLevel;
+
+  const res = await httpPost(apiUrl(masterPort, ADMIN_API.REGISTER), body);
+  if (!res.ok) {
+    throw new Error(res.error || "Registration failed");
+  }
+  console.log(`${green("✓")} Project registered (hash: ${hash})`);
+  return res;
+}
+
+// ---- Banner ----
+
+function printBanner(pkg, cwd, hash, displayPort, opts, { portMismatch, runningPublicPort }) {
+  const url = `http://localhost:${displayPort}/${hash}/main/`;
+
+  const lines = [
+    "",
+    cyan("   ██████╗  ██████╗  ███╗   ███╗ ██████╗       ██╗  ██╗ ██╗   ██╗ ██████╗ "),
+    cyan("  ██╔════╝ ██╔═══██╗ ████╗ ████║ ██╔══██╗      ██║  ██║ ██║   ██║ ██╔══██╗"),
+    cyan("  ██║      ██║   ██║ ██╔████╔██║ ██████╔╝      ███████║ ██║   ██║ ██████╔╝"),
+    cyan("  ██║      ██║   ██║ ██║╚██╔╝██║ ██╔═══╝       ██╔══██║ ██║   ██║ ██╔══██╗"),
+    cyan("  ╚██████╗ ╚██████╔╝ ██║ ╚═╝ ██║ ██║           ██║  ██║ ╚██████╔╝ ██████╔╝"),
+    cyan("   ╚═════╝  ╚═════╝  ╚═╝     ╚═╝ ╚═╝           ╚═╝  ╚═╝  ╚═════╝  ╚═════╝ "),
+    "",
+    "",
+    `  ${green("Version")}  ${pkg.version}`,
+    `  ${green("Project")}  ${cwd}`,
+    `  ${green("Hash")}     ${hash}`,
+    `  ${green("Port")}     ${displayPort}`,
+    "",
+    `  ${yellow("URL")}      ${cyan(url)}`,
+    "",
+    white("  ─────────────────────────────────────────────"),
+    "",
+    `  ${"comphub status".padEnd(30)}View all projects`,
+    `  ${`comphub stop    ${hash}`.padEnd(30)}Stop current project`,
+    `  ${"comphub stop    --all".padEnd(30)}Stop all projects`,
+    `  ${"comphub kill".padEnd(30)}Shutdown master`,
+    ""
+  ];
+
+  if (portMismatch) {
+    lines.push(
+      white("  ─────────────────────────────────────────────"),
+      "",
+      red(`  ⚠ Master is already running on port ${runningPublicPort}, ignoring -p ${opts.port}`),
+      red(`    To change port, please run comphub kill first`),
+      ""
+    );
+  }
+
+  console.log(lines.join("\n"));
+}
+
+// ---- Main ----
+
+async function main(pkg, opts) {
+  if (!fs.existsSync(path.join(process.cwd(), "package.json"))) {
+    console.error(`${red("✗")} Current directory is not a Node.js project`);
+    process.exit(1);
+  }
+
+  const cwd = process.cwd();
+  const hash = computeHash(cwd);
+
+  opts = mergeConfig(opts, cwd);
+
+  console.log(`${green("✓")} ${pkg.name} v${pkg.version}`);
+
+  const { runtime, portMismatch, runningPublicPort } = await ensureMasterRunning(opts, pkg);
+
+  const masterPort = runtime.managementPort;
+  const displayPort = runtime.publicPort;
+
+  await registerProject(masterPort, hash, cwd, opts);
+
+  printBanner(pkg, cwd, hash, displayPort, opts, { portMismatch, runningPublicPort });
+
+  // Ctrl+C / kill 时通知 master 注销本项目，使 MidwayJS 子进程能够停止
+  let deregistered = false;
+  const cleanup = async () => {
+    if (deregistered) return;
+    deregistered = true;
+    try {
+      await deregisterProject(masterPort, hash);
+    } catch {
+      // 忽略注销失败（master 可能已关闭）
+    }
+    process.exit(0);
+  };
+  process.on("SIGINT", cleanup);
+  process.on("SIGTERM", cleanup);
+
+  // 统一通过 SSE 实时接收本项目 MidwayJS 子进程日志（按 hash 过滤）
+  // 第一个 CLI（spawn master 的）不再通过 stdio:inherit 看到其他项目的日志
+  console.log(`\n  ${white("─")} Streaming logs from MidwayJS (${hash}) ${white("─")}\n`);
+
+  const logsUrl = `http://localhost:${masterPort}/__master__/projects/${hash}/logs`;
+  try {
+    await streamLogs(logsUrl, hash);
+  } catch (err) {
+    console.error(`\n  ${red("✗")} Log stream error: ${err.message}`);
+  }
+}
+
+module.exports = { mergeConfig, main };