comp-hub 0.31.1 → 0.31.2

package/bin/cli.js

@@ -15,6 +15,7 @@ program
   .name("comphub")
   .option("-p, --port <number>", "Startup port", portArg)
   .option("-d, --dir <path>", "Resource directory relative path")
+  .option("-l, --log-level <level>", "Log level: debug, info, warn, error (default: info)", "error")
   .version(pkg.version, "-v, --version", "Show version")
   .addOption(new Option("--allow-debug", "Enable debug mode").hideHelp())
   .addOption(new Option("--api <url>", "API URL").hideHelp())

package/bin/lib/startup.js

@@ -18,7 +18,8 @@ function mergeConfig(opts, cwd) {
     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
+    port: opts.port,
+    logLevel: opts.logLevel || fileConfig.logLevel || "info"
   };
 }
 
@@ -33,7 +34,7 @@ async function waitForMasterRuntime() {
   return null;
 }
 
-async function spawnMaster(publicPort, pkg, cwd) {
+async function spawnMaster(publicPort, pkg, cwd, _opts) {
   const masterEntry = path.join(projectRoot, "dist/master.js");
 
   if (!fs.existsSync(masterEntry)) {
@@ -41,10 +42,8 @@ async function spawnMaster(publicPort, pkg, cwd) {
   }
 
   const masterArgs = ["--port", String(publicPort), "--public-port", String(publicPort)];
-  const child = spawn(process.execPath, [masterEntry, ...masterArgs], {
-    stdio: "ignore",
-    detached: true,
-    windowsHide: true,
+  const child = spawn(process.execPath, ["--no-deprecation", masterEntry, ...masterArgs], {
+    stdio: "inherit",
     cwd,
     env: {
       ...process.env,
@@ -52,7 +51,17 @@ async function spawnMaster(publicPort, pkg, cwd) {
     }
   });
 
-  child.unref();
+  // 转发父进程信号，确保 Ctrl+C 时 master 也能优雅退出
+  ["SIGINT", "SIGTERM"].forEach(sig => {
+    process.on(sig, () => {
+      child.kill(sig);
+    });
+  });
+
+  // Master 退出时 CLI 也跟着退出
+  child.on("exit", (code) => {
+    process.exit(code || 0);
+  });
 
   const runtime = await waitForMasterRuntime();
   if (!runtime) {
@@ -60,7 +69,7 @@ async function spawnMaster(publicPort, pkg, cwd) {
     throw new Error("Master startup timeout");
   }
 
-  return runtime;
+  return { runtime, child };
 }
 
 /**
@@ -70,6 +79,7 @@ async function spawnMaster(publicPort, pkg, cwd) {
 async function ensureMasterRunning(opts, pkg) {
   let portMismatch = false;
   let runningPublicPort = 0;
+  let masterChild = null;
 
   const existingRuntime = await readMasterRuntime();
 
@@ -80,15 +90,17 @@ async function ensureMasterRunning(opts, pkg) {
       portMismatch = true;
       runningPublicPort = existingRuntime.publicPort;
     }
-    return { runtime: existingRuntime, portMismatch, runningPublicPort };
+    return { runtime: existingRuntime, portMismatch, runningPublicPort, masterChild };
   }
 
-  // 启动新 master
+  // 启动新 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 };
+  const { runtime, child } = await spawnMaster(publicPort, pkg, process.cwd(), opts);
+  masterChild = child;
+
+  return { runtime, portMismatch, runningPublicPort, masterChild };
 }
 
 // ---- Registration ----
@@ -102,6 +114,7 @@ async function registerProject(masterPort, hash, cwd, opts) {
   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) {
@@ -170,7 +183,7 @@ async function main(pkg, opts) {
 
   console.log(`${green("✓")} ${pkg.name} v${pkg.version}`);
 
-  const { runtime, portMismatch, runningPublicPort } = await ensureMasterRunning(opts, pkg);
+  const { runtime, portMismatch, runningPublicPort, masterChild } = await ensureMasterRunning(opts, pkg);
 
   const masterPort = runtime.managementPort;
   const displayPort = runtime.publicPort;
@@ -178,6 +191,13 @@ async function main(pkg, opts) {
   await registerProject(masterPort, hash, cwd, opts);
 
   printBanner(pkg, cwd, hash, displayPort, opts, { portMismatch, runningPublicPort });
+
+  // 如果是新启动的 master（非复用已有），CLI 进程保持前台运行以显示服务日志
+  // masterChild 已通过 stdio:inherit + 移除 unref() 绑定到当前终端，事件循环不会退出
+  // Ctrl+C 时会通过 spawnMaster 中的信号处理优雅关闭
+  if (masterChild) {
+    console.log(`\n  Press ${cyan("Ctrl+C")} to stop\n`);
+  }
 }
 
 module.exports = { mergeConfig, main };