comp-hub 0.42.2 → 0.42.3

package/bin/cli.js

@@ -52,4 +52,8 @@ program.action(async () => {
   }
 });
 
-program.parse();
+// parseAsync 确保异步 action（如 main 中 await new Promise）完成后进程才退出
+program.parseAsync().catch(err => {
+  console.error(`✗ CLI error: ${err.message}`);
+  process.exit(1);
+});

package/bin/lib/http.js

@@ -1,5 +1,6 @@
 const http = require("http");
 const { HTTP_TIMEOUT_GET, HTTP_TIMEOUT_POST } = require("./constants");
+const { apiUrl } = require("./utils");
 
 function parseBody(raw) {
   try {
@@ -59,4 +60,71 @@ function httpPost(url, data) {
   });
 }
 
-module.exports = { httpGet, httpPost };
+/**
+ * SSE 日志流 — 连接 master 的 /__master__/projects/:hash/logs 端点
+ * 持续输出 MidwayJS 子进程的实时日志到终端
+ * 返回一个 Promise，在连接关闭时 resolve
+ */
+function streamLogs(url, _hash) {
+  return new Promise((resolve, reject) => {
+    const urlObj = new URL(url);
+    const options = {
+      hostname: urlObj.hostname,
+      port: urlObj.port,
+      path: urlObj.pathname,
+      method: "GET",
+      headers: { Accept: "text/event-stream" }
+    };
+
+    const req = http.request(options, res => {
+      if (res.statusCode !== 200) {
+        reject(new Error(`SSE connection failed (HTTP ${res.statusCode})`));
+        return;
+      }
+
+      let buffer = "";
+
+      res.on("data", chunk => {
+        buffer += chunk.toString();
+        // SSE 格式: "data: <json>\n\n"
+        const events = buffer.split("\n\n");
+        buffer = events.pop() || ""; // 保留不完整的最后一个事件
+
+        for (const event of events) {
+          const dataLine = event.startsWith("data: ") ? event.slice(6) : event;
+          try {
+            const line = JSON.parse(dataLine);
+            // 直接输出日志内容（已有换行符）
+            process.stdout.write(line);
+          } catch {
+            // 非 JSON 数据，忽略
+          }
+        }
+      });
+
+      res.on("end", () => {
+        resolve();
+      });
+
+      res.on("error", err => {
+        reject(err);
+      });
+    });
+
+    req.on("error", err => {
+      reject(err);
+    });
+
+    req.setTimeout(0); // 无超时限制
+    req.end();
+  });
+}
+
+/**
+ * 从 master 注销项目（Ctrl+C 时通知 master 停止对应 MidwayJS 子进程）
+ */
+function deregisterProject(masterPort, hash) {
+  return httpPost(apiUrl(masterPort, "/__master__/deregister"), { hash });
+}
+
+module.exports = { httpGet, httpPost, streamLogs, deregisterProject };

package/bin/lib/startup.js

@@ -1,7 +1,7 @@
 const path = require("path");
 const fs = require("fs");
 const { spawn } = require("child_process");
-const { httpPost } = require("./http");
+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");
@@ -34,7 +34,7 @@ async function waitForMasterRuntime() {
   return null;
 }
 
-async function spawnMaster(publicPort, pkg, cwd, _opts) {
+async function spawnMaster(publicPort, pkg, cwd) {
   const masterEntry = path.join(projectRoot, "dist/master.js");
 
   if (!fs.existsSync(masterEntry)) {
@@ -42,8 +42,12 @@ async function spawnMaster(publicPort, pkg, cwd, _opts) {
   }
 
   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",
+    stdio: ["inherit", "pipe", "pipe"],
     cwd,
     env: {
       ...process.env,
@@ -51,6 +55,32 @@ async function spawnMaster(publicPort, pkg, cwd, _opts) {
     }
   });
 
+  // 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, () => {
@@ -60,6 +90,10 @@ async function spawnMaster(publicPort, pkg, cwd, _opts) {
 
   // Master 退出时 CLI 也跟着退出
   child.on("exit", code => {
+    // 输出剩余的 pending 数据
+    if (stdoutPending && !/^\[[0-9a-f]{8}\]/.test(stdoutPending)) {
+      process.stdout.write(stdoutPending);
+    }
     process.exit(code || 0);
   });
 
@@ -69,7 +103,7 @@ async function spawnMaster(publicPort, pkg, cwd, _opts) {
     throw new Error("Master startup timeout");
   }
 
-  return { runtime, child };
+  return { runtime };
 }
 
 /**
@@ -79,7 +113,6 @@ async function spawnMaster(publicPort, pkg, cwd, _opts) {
 async function ensureMasterRunning(opts, pkg) {
   let portMismatch = false;
   let runningPublicPort = 0;
-  let masterChild = null;
 
   const existingRuntime = await readMasterRuntime();
 
@@ -90,17 +123,16 @@ async function ensureMasterRunning(opts, pkg) {
       portMismatch = true;
       runningPublicPort = existingRuntime.publicPort;
     }
-    return { runtime: existingRuntime, portMismatch, runningPublicPort, masterChild };
+    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, child } = await spawnMaster(publicPort, pkg, process.cwd(), opts);
-  masterChild = child;
+  const { runtime } = await spawnMaster(publicPort, pkg, process.cwd());
 
-  return { runtime, portMismatch, runningPublicPort, masterChild };
+  return { runtime, portMismatch, runningPublicPort };
 }
 
 // ---- Registration ----
@@ -183,7 +215,7 @@ async function main(pkg, opts) {
 
   console.log(`${green("✓")} ${pkg.name} v${pkg.version}`);
 
-  const { runtime, portMismatch, runningPublicPort, masterChild } = await ensureMasterRunning(opts, pkg);
+  const { runtime, portMismatch, runningPublicPort } = await ensureMasterRunning(opts, pkg);
 
   const masterPort = runtime.managementPort;
   const displayPort = runtime.publicPort;
@@ -192,11 +224,30 @@ async function main(pkg, 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`);
+  // 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}`);
   }
 }