comp-hub 0.28.4 → 0.28.5

package/bin/lib/startup.js

@@ -1,183 +1,183 @@
-const path = require("path");
-const fs = require("fs");
-const { spawn } = require("child_process");
-const { httpPost } = 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
-  };
-}
-
-// ---- 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)];
-  const child = spawn(process.execPath, [masterEntry, ...masterArgs], {
-    stdio: "ignore",
-    detached: true,
-    windowsHide: true,
-    cwd,
-    env: {
-      ...process.env,
-      COMP_HUB_VERSION: pkg.version
-    }
-  });
-
-  child.unref();
-
-  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;
-
-  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 });
-}
-
-module.exports = { main };
+const path = require("path");
+const fs = require("fs");
+const { spawn } = require("child_process");
+const { httpPost } = 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
+  };
+}
+
+// ---- 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)];
+  const child = spawn(process.execPath, [masterEntry, ...masterArgs], {
+    stdio: "ignore",
+    detached: true,
+    windowsHide: true,
+    cwd,
+    env: {
+      ...process.env,
+      COMP_HUB_VERSION: pkg.version
+    }
+  });
+
+  child.unref();
+
+  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;
+
+  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 });
+}
+
+module.exports = { main };

package/bin/lib/utils.js

@@ -1,112 +1,112 @@
-const path = require("path");
-const fs = require("fs");
-const crypto = require("crypto");
-const { MASTER_RUNTIME_FILE } = require("./constants");
-
-const projectRoot = path.resolve(__dirname, "../..");
-
-function readJson(p) {
-  return JSON.parse(fs.readFileSync(p, "utf8"));
-}
-
-/**
- * 加载项目根目录的 .comphub.json 或 .comphub.js
- * 作为命令行参数的 fallback，优先级低于 CLI 选项
- */
-function loadComphubConfig(cwd) {
-  const jsonPath = path.join(cwd, ".comphub.json");
-  const jsPath = path.join(cwd, ".comphub.js");
-
-  try {
-    if (fs.existsSync(jsonPath)) {
-      return readJson(jsonPath);
-    }
-  } catch {
-    /* corrupted json, try js */
-  }
-
-  try {
-    if (fs.existsSync(jsPath)) {
-      const mod = require(jsPath);
-      return mod.default || mod;
-    }
-  } catch {
-    /* ignore */
-  }
-
-  return {};
-}
-
-function getLocalPkgInfo() {
-  const pkgPath = path.join(projectRoot, "package.json");
-  const pkg = readJson(pkgPath);
-  const entry = path.join(projectRoot, pkg.main || "dist/index.js");
-  return { pkg, entry };
-}
-
-function computeHash(dir) {
-  return crypto.createHash("sha256").update(dir).digest("hex").slice(0, 8);
-}
-
-async function readMasterRuntime() {
-  try {
-    if (fs.existsSync(MASTER_RUNTIME_FILE)) {
-      const data = JSON.parse(fs.readFileSync(MASTER_RUNTIME_FILE, "utf8"));
-      try {
-        process.kill(data.pid, 0);
-        // PID 存活不一定是 master 进程（PID 可能被复用），
-        // 额外通过健康检查确认端口确实在服务
-        const alive = await checkMasterAlive(data.managementPort);
-        if (alive) return data;
-      } catch {
-        /* PID not found */
-      }
-      try {
-        fs.unlinkSync(MASTER_RUNTIME_FILE);
-      } catch {
-        /* best effort */
-      }
-    }
-  } catch {
-    /* corrupted file */
-  }
-  return null;
-}
-
-function checkMasterAlive(port) {
-  const { ADMIN_API } = require("./constants");
-  const http = require("http");
-  return new Promise(resolve => {
-    const req = http.get(`http://localhost:${port}${ADMIN_API.HEALTH}`, res => {
-      let body = "";
-      res.on("data", chunk => (body += chunk));
-      res.on("end", () => {
-        try {
-          const json = JSON.parse(body);
-          resolve(typeof json.status === "string");
-        } catch {
-          resolve(false);
-        }
-      });
-    });
-    req.on("error", () => resolve(false));
-    req.setTimeout(2000, () => {
-      req.destroy();
-      resolve(false);
-    });
-  });
-}
-
-const colors = {
-  cyan: s => `\x1b[36m${s}\x1b[0m`,
-  green: s => `\x1b[32m${s}\x1b[0m`,
-  white: s => `\x1b[37m${s}\x1b[0m`,
-  yellow: s => `\x1b[33m${s}\x1b[0m`,
-  red: s => `\x1b[31m${s}\x1b[0m`
-};
-
-function apiUrl(port, pathname) {
-  return `http://localhost:${port}${pathname}`;
-}
-
-module.exports = { getLocalPkgInfo, computeHash, projectRoot, readMasterRuntime, loadComphubConfig, colors, apiUrl };
+const path = require("path");
+const fs = require("fs");
+const crypto = require("crypto");
+const { MASTER_RUNTIME_FILE } = require("./constants");
+
+const projectRoot = path.resolve(__dirname, "../..");
+
+function readJson(p) {
+  return JSON.parse(fs.readFileSync(p, "utf8"));
+}
+
+/**
+ * 加载项目根目录的 .comphub.json 或 .comphub.js
+ * 作为命令行参数的 fallback，优先级低于 CLI 选项
+ */
+function loadComphubConfig(cwd) {
+  const jsonPath = path.join(cwd, ".comphub.json");
+  const jsPath = path.join(cwd, ".comphub.js");
+
+  try {
+    if (fs.existsSync(jsonPath)) {
+      return readJson(jsonPath);
+    }
+  } catch {
+    /* corrupted json, try js */
+  }
+
+  try {
+    if (fs.existsSync(jsPath)) {
+      const mod = require(jsPath);
+      return mod.default || mod;
+    }
+  } catch {
+    /* ignore */
+  }
+
+  return {};
+}
+
+function getLocalPkgInfo() {
+  const pkgPath = path.join(projectRoot, "package.json");
+  const pkg = readJson(pkgPath);
+  const entry = path.join(projectRoot, pkg.main || "dist/index.js");
+  return { pkg, entry };
+}
+
+function computeHash(dir) {
+  return crypto.createHash("sha256").update(dir).digest("hex").slice(0, 8);
+}
+
+async function readMasterRuntime() {
+  try {
+    if (fs.existsSync(MASTER_RUNTIME_FILE)) {
+      const data = JSON.parse(fs.readFileSync(MASTER_RUNTIME_FILE, "utf8"));
+      try {
+        process.kill(data.pid, 0);
+        // PID 存活不一定是 master 进程（PID 可能被复用），
+        // 额外通过健康检查确认端口确实在服务
+        const alive = await checkMasterAlive(data.managementPort);
+        if (alive) return data;
+      } catch {
+        /* PID not found */
+      }
+      try {
+        fs.unlinkSync(MASTER_RUNTIME_FILE);
+      } catch {
+        /* best effort */
+      }
+    }
+  } catch {
+    /* corrupted file */
+  }
+  return null;
+}
+
+function checkMasterAlive(port) {
+  const { ADMIN_API } = require("./constants");
+  const http = require("http");
+  return new Promise(resolve => {
+    const req = http.get(`http://localhost:${port}${ADMIN_API.HEALTH}`, res => {
+      let body = "";
+      res.on("data", chunk => (body += chunk));
+      res.on("end", () => {
+        try {
+          const json = JSON.parse(body);
+          resolve(typeof json.status === "string");
+        } catch {
+          resolve(false);
+        }
+      });
+    });
+    req.on("error", () => resolve(false));
+    req.setTimeout(2000, () => {
+      req.destroy();
+      resolve(false);
+    });
+  });
+}
+
+const colors = {
+  cyan: s => `\x1b[36m${s}\x1b[0m`,
+  green: s => `\x1b[32m${s}\x1b[0m`,
+  white: s => `\x1b[37m${s}\x1b[0m`,
+  yellow: s => `\x1b[33m${s}\x1b[0m`,
+  red: s => `\x1b[31m${s}\x1b[0m`
+};
+
+function apiUrl(port, pathname) {
+  return `http://localhost:${port}${pathname}`;
+}
+
+module.exports = { getLocalPkgInfo, computeHash, projectRoot, readMasterRuntime, loadComphubConfig, colors, apiUrl };