comp-hub 0.42.5 → 0.42.7

package/bin/lib/commands.js

@@ -1,173 +1,173 @@
-const { httpGet, httpPost } = require("./http");
-const { ADMIN_API, DEFAULT_PORT } = require("./constants");
-const { readMasterRuntime, colors, apiUrl } = require("./utils");
-const { green, yellow, cyan, white, red } = colors;
-
-function formatUptime(seconds) {
-  const UNITS = [
-    { label: "d", divisor: 86400 },
-    { label: "h", divisor: 3600 },
-    { label: "m", divisor: 60 },
-    { label: "s", divisor: 1 }
-  ];
-
-  let remaining = Math.floor(seconds);
-  const parts = [];
-
-  for (const { label, divisor } of UNITS) {
-    if (remaining >= divisor) {
-      const value = Math.floor(remaining / divisor);
-      remaining = remaining % divisor;
-      parts.push(`${value}${label}`);
-    }
-  }
-
-  return parts.length > 0 ? parts.join(" ") : "0s";
-}
-
-async function resolveMasterPort(opts) {
-  // 用户明确指定了端口，直接使用
-  if (opts.port != null) {
-    return opts.port;
-  }
-  // 从 runtime 文件读取 master 实际端口
-  const runtime = await readMasterRuntime();
-  if (runtime) {
-    return runtime.managementPort;
-  }
-  // 兜底：默认端口
-  return DEFAULT_PORT;
-}
-
-async function statusCommand(opts) {
-  const masterPort = await resolveMasterPort(opts);
-  const runtime = await readMasterRuntime();
-  const displayPort = runtime ? runtime.publicPort : masterPort;
-
-  console.log(`\n${yellow("●")} Master Status\n`);
-
-  const health = await httpGet(apiUrl(masterPort, ADMIN_API.HEALTH));
-  if (!health.ok || !health.body || typeof health.body.status !== "string") {
-    console.error(`${red("✗")} Master service is not running`);
-    process.exit(1);
-  }
-
-  const info = health.body;
-  const statusIcon = info.status === "running" ? green("●") : cyan("●");
-
-  console.log(`  ${green("Status")}      ${statusIcon} ${info.status}`);
-  console.log(`  ${green("Version")}     ${white(info.version)}`);
-  console.log(`  ${green("Uptime")}      ${white(formatUptime(info.uptime))}`);
-  console.log(`  ${green("Projects")}    ${white(info.projects)}`);
-  console.log("");
-
-  const projects = await httpGet(apiUrl(masterPort, ADMIN_API.PROJECTS));
-  if (projects.ok && projects.body) {
-    const list = projects.body.projects;
-    if (Array.isArray(list) && list.length > 0) {
-      console.log(`  ${yellow("▸")} Registered Projects (${list.length}):`);
-      console.log("  " + white("─".repeat(56)));
-      for (const p of list) {
-        console.log(`    ${green("hash")}     ${white(p.hash)}`);
-        console.log(`    ${green("path")}     ${white(p.cwd)}`);
-        // console.log(`    ${green('port')}     ${p.port}`);
-        // if (p.subPort) console.log(`    ${green('subPort')}  ${p.subPort}`);
-        console.log(`    ${green("url")}      ${cyan(`http://localhost:${displayPort}/${p.hash}/main/`)}`);
-        console.log("  " + white("─".repeat(56)));
-      }
-    } else {
-      console.log(`  ${white("─".repeat(58))}`);
-      console.log(`      ${white("(No registered projects)")}`);
-      console.log(`  ${white("─".repeat(58))}`);
-    }
-  }
-  console.log("");
-  process.exit(0);
-}
-
-async function stopCommand(hash, opts) {
-  const masterPort = await resolveMasterPort(opts);
-
-  if (opts.all) {
-    const projects = await httpGet(apiUrl(masterPort, ADMIN_API.PROJECTS));
-    if (!projects.ok || !projects.body) {
-      console.error(`${red("✗")} Cannot connect to master service`);
-      process.exit(1);
-    }
-    const list = projects.body.projects;
-    if (!Array.isArray(list) || list.length === 0) {
-      console.log(`${yellow("ℹ")} No running projects`);
-      process.exit(0);
-    }
-    console.log(`\n${yellow("▸")} Stopping all ${list.length} projects...\n`);
-    for (const p of list) {
-      const res = await httpPost(apiUrl(masterPort, ADMIN_API.DEREGISTER), { hash: p.hash });
-      if (res.ok) {
-        console.log(`  ${green("✓")} Stopped: ${p.hash} (${p.cwd})`);
-      } else {
-        console.error(`  ${red("✗")} Failed to stop: ${p.hash} - ${res.error}`);
-      }
-    }
-    console.log("");
-    process.exit(0);
-  }
-
-  if (!hash) {
-    console.error(`${red("✗")} Please specify project hash or use --all to stop all projects`);
-    console.error(`   Usage: comphub stop <hash>`);
-    console.error(`   Usage: comphub stop --all`);
-    process.exit(1);
-  }
-
-  console.log(`\n${yellow("▸")} Stopping project ${hash}...`);
-  const res = await httpPost(apiUrl(masterPort, ADMIN_API.DEREGISTER), { hash });
-  if (res.ok) {
-    console.log(`  ${green("✓")} Stopped: ${hash}\n`);
-  } else {
-    console.error(`  ${red("✗")} Failed to stop: ${res.error}\n`);
-    process.exit(1);
-  }
-  process.exit(0);
-}
-
-async function killCommand(opts) {
-  const masterPort = await resolveMasterPort(opts);
-  console.log(`\n${yellow("▸")} Shutting down master process...\n`);
-
-  const res = await httpPost(apiUrl(masterPort, ADMIN_API.SHUTDOWN), {});
-  if (res.ok) {
-    console.log(`${green("✓")} Master process has been shut down\n`);
-  } else {
-    console.error(`${red("✗")} Shutdown failed: ${res.error}\n`);
-    process.exit(1);
-  }
-  process.exit(0);
-}
-
-async function fixCommand() {
-  const fs = require("fs");
-  const { MASTER_RUNTIME_FILE } = require("./constants");
-
-  console.log(`\n${yellow("▸")} Checking master runtime...\n`);
-
-  const runtime = await readMasterRuntime();
-  if (runtime) {
-    console.log(`  ${green("✓")} Master is running normally on port ${runtime.publicPort}\n`);
-    process.exit(0);
-  }
-
-  if (fs.existsSync(MASTER_RUNTIME_FILE)) {
-    try {
-      fs.unlinkSync(MASTER_RUNTIME_FILE);
-      console.log(`  ${green("✓")} Removed stale runtime file\n`);
-    } catch {
-      console.error(`  ${red("✗")} Failed to remove runtime file\n`);
-      process.exit(1);
-    }
-  } else {
-    console.log(`  ${yellow("ℹ")} No stale runtime file found\n`);
-  }
-  process.exit(0);
-}
-
-module.exports = { formatUptime, resolveMasterPort, statusCommand, stopCommand, killCommand, fixCommand };
+const { httpGet, httpPost } = require("./http");
+const { ADMIN_API, DEFAULT_PORT } = require("./constants");
+const { readMasterRuntime, colors, apiUrl } = require("./utils");
+const { green, yellow, cyan, white, red } = colors;
+
+function formatUptime(seconds) {
+  const UNITS = [
+    { label: "d", divisor: 86400 },
+    { label: "h", divisor: 3600 },
+    { label: "m", divisor: 60 },
+    { label: "s", divisor: 1 }
+  ];
+
+  let remaining = Math.floor(seconds);
+  const parts = [];
+
+  for (const { label, divisor } of UNITS) {
+    if (remaining >= divisor) {
+      const value = Math.floor(remaining / divisor);
+      remaining = remaining % divisor;
+      parts.push(`${value}${label}`);
+    }
+  }
+
+  return parts.length > 0 ? parts.join(" ") : "0s";
+}
+
+async function resolveMasterPort(opts) {
+  // 用户明确指定了端口，直接使用
+  if (opts.port != null) {
+    return opts.port;
+  }
+  // 从 runtime 文件读取 master 实际端口
+  const runtime = await readMasterRuntime();
+  if (runtime) {
+    return runtime.managementPort;
+  }
+  // 兜底：默认端口
+  return DEFAULT_PORT;
+}
+
+async function statusCommand(opts) {
+  const masterPort = await resolveMasterPort(opts);
+  const runtime = await readMasterRuntime();
+  const displayPort = runtime ? runtime.publicPort : masterPort;
+
+  console.log(`\n${yellow("●")} Master Status\n`);
+
+  const health = await httpGet(apiUrl(masterPort, ADMIN_API.HEALTH));
+  if (!health.ok || !health.body || typeof health.body.status !== "string") {
+    console.error(`${red("✗")} Master service is not running`);
+    process.exit(1);
+  }
+
+  const info = health.body;
+  const statusIcon = info.status === "running" ? green("●") : cyan("●");
+
+  console.log(`  ${green("Status")}      ${statusIcon} ${info.status}`);
+  console.log(`  ${green("Version")}     ${white(info.version)}`);
+  console.log(`  ${green("Uptime")}      ${white(formatUptime(info.uptime))}`);
+  console.log(`  ${green("Projects")}    ${white(info.projects)}`);
+  console.log("");
+
+  const projects = await httpGet(apiUrl(masterPort, ADMIN_API.PROJECTS));
+  if (projects.ok && projects.body) {
+    const list = projects.body.projects;
+    if (Array.isArray(list) && list.length > 0) {
+      console.log(`  ${yellow("▸")} Registered Projects (${list.length}):`);
+      console.log("  " + white("─".repeat(56)));
+      for (const p of list) {
+        console.log(`    ${green("hash")}     ${white(p.hash)}`);
+        console.log(`    ${green("path")}     ${white(p.cwd)}`);
+        // console.log(`    ${green('port')}     ${p.port}`);
+        // if (p.subPort) console.log(`    ${green('subPort')}  ${p.subPort}`);
+        console.log(`    ${green("url")}      ${cyan(`http://localhost:${displayPort}/${p.hash}/main/`)}`);
+        console.log("  " + white("─".repeat(56)));
+      }
+    } else {
+      console.log(`  ${white("─".repeat(58))}`);
+      console.log(`      ${white("(No registered projects)")}`);
+      console.log(`  ${white("─".repeat(58))}`);
+    }
+  }
+  console.log("");
+  process.exit(0);
+}
+
+async function stopCommand(hash, opts) {
+  const masterPort = await resolveMasterPort(opts);
+
+  if (opts.all) {
+    const projects = await httpGet(apiUrl(masterPort, ADMIN_API.PROJECTS));
+    if (!projects.ok || !projects.body) {
+      console.error(`${red("✗")} Cannot connect to master service`);
+      process.exit(1);
+    }
+    const list = projects.body.projects;
+    if (!Array.isArray(list) || list.length === 0) {
+      console.log(`${yellow("ℹ")} No running projects`);
+      process.exit(0);
+    }
+    console.log(`\n${yellow("▸")} Stopping all ${list.length} projects...\n`);
+    for (const p of list) {
+      const res = await httpPost(apiUrl(masterPort, ADMIN_API.DEREGISTER), { hash: p.hash });
+      if (res.ok) {
+        console.log(`  ${green("✓")} Stopped: ${p.hash} (${p.cwd})`);
+      } else {
+        console.error(`  ${red("✗")} Failed to stop: ${p.hash} - ${res.error}`);
+      }
+    }
+    console.log("");
+    process.exit(0);
+  }
+
+  if (!hash) {
+    console.error(`${red("✗")} Please specify project hash or use --all to stop all projects`);
+    console.error(`   Usage: comphub stop <hash>`);
+    console.error(`   Usage: comphub stop --all`);
+    process.exit(1);
+  }
+
+  console.log(`\n${yellow("▸")} Stopping project ${hash}...`);
+  const res = await httpPost(apiUrl(masterPort, ADMIN_API.DEREGISTER), { hash });
+  if (res.ok) {
+    console.log(`  ${green("✓")} Stopped: ${hash}\n`);
+  } else {
+    console.error(`  ${red("✗")} Failed to stop: ${res.error}\n`);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+async function killCommand(opts) {
+  const masterPort = await resolveMasterPort(opts);
+  console.log(`\n${yellow("▸")} Shutting down master process...\n`);
+
+  const res = await httpPost(apiUrl(masterPort, ADMIN_API.SHUTDOWN), {});
+  if (res.ok) {
+    console.log(`${green("✓")} Master process has been shut down\n`);
+  } else {
+    console.error(`${red("✗")} Shutdown failed: ${res.error}\n`);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+async function fixCommand() {
+  const fs = require("fs");
+  const { MASTER_RUNTIME_FILE } = require("./constants");
+
+  console.log(`\n${yellow("▸")} Checking master runtime...\n`);
+
+  const runtime = await readMasterRuntime();
+  if (runtime) {
+    console.log(`  ${green("✓")} Master is running normally on port ${runtime.publicPort}\n`);
+    process.exit(0);
+  }
+
+  if (fs.existsSync(MASTER_RUNTIME_FILE)) {
+    try {
+      fs.unlinkSync(MASTER_RUNTIME_FILE);
+      console.log(`  ${green("✓")} Removed stale runtime file\n`);
+    } catch {
+      console.error(`  ${red("✗")} Failed to remove runtime file\n`);
+      process.exit(1);
+    }
+  } else {
+    console.log(`  ${yellow("ℹ")} No stale runtime file found\n`);
+  }
+  process.exit(0);
+}
+
+module.exports = { formatUptime, resolveMasterPort, statusCommand, stopCommand, killCommand, fixCommand };

package/bin/lib/constants.js

@@ -1,22 +1,22 @@
-const path = require("path");
-const os = require("os");
-
-const DEFAULT_PORT = 5478;
-
-const MASTER_RUNTIME_FILE = path.join(os.tmpdir(), ".comphub", "master.json");
-
-const ADMIN_API = {
-  PREFIX: "/__master__",
-  HEALTH: "/__master__/health",
-  REGISTER: "/__master__/register",
-  DEREGISTER: "/__master__/deregister",
-  PROJECTS: "/__master__/projects",
-  SHUTDOWN: "/__master__/shutdown"
-};
-
-const POLL_INTERVAL = 500;
-const MAX_RETRIES = 40;
-const HTTP_TIMEOUT_GET = 2000;
-const HTTP_TIMEOUT_POST = 5000;
-
-module.exports = { DEFAULT_PORT, MASTER_RUNTIME_FILE, ADMIN_API, POLL_INTERVAL, MAX_RETRIES, HTTP_TIMEOUT_GET, HTTP_TIMEOUT_POST };
+const path = require("path");
+const os = require("os");
+
+const DEFAULT_PORT = 5478;
+
+const MASTER_RUNTIME_FILE = path.join(os.tmpdir(), ".comphub", "master.json");
+
+const ADMIN_API = {
+  PREFIX: "/__master__",
+  HEALTH: "/__master__/health",
+  REGISTER: "/__master__/register",
+  DEREGISTER: "/__master__/deregister",
+  PROJECTS: "/__master__/projects",
+  SHUTDOWN: "/__master__/shutdown"
+};
+
+const POLL_INTERVAL = 500;
+const MAX_RETRIES = 40;
+const HTTP_TIMEOUT_GET = 2000;
+const HTTP_TIMEOUT_POST = 5000;
+
+module.exports = { DEFAULT_PORT, MASTER_RUNTIME_FILE, ADMIN_API, POLL_INTERVAL, MAX_RETRIES, HTTP_TIMEOUT_GET, HTTP_TIMEOUT_POST };

package/bin/lib/http.js

@@ -1,130 +1,130 @@
-const http = require("http");
-const { HTTP_TIMEOUT_GET, HTTP_TIMEOUT_POST } = require("./constants");
-const { apiUrl } = require("./utils");
-
-function parseBody(raw) {
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return raw;
-  }
-}
-
-function httpGet(url) {
-  return new Promise(resolve => {
-    const req = http.get(url, res => {
-      let body = "";
-      res.on("data", chunk => (body += chunk));
-      res.on("end", () => resolve({ ok: true, status: res.statusCode, body: parseBody(body) }));
-    });
-    req.on("error", err => resolve({ ok: false, error: err.message }));
-    req.setTimeout(HTTP_TIMEOUT_GET, () => {
-      req.destroy();
-      resolve({ ok: false, error: "请求超时" });
-    });
-  });
-}
-
-function httpPost(url, data) {
-  return new Promise(resolve => {
-    const postData = JSON.stringify(data);
-    const urlObj = new URL(url);
-    const options = {
-      hostname: urlObj.hostname,
-      port: urlObj.port,
-      path: urlObj.pathname,
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Content-Length": Buffer.byteLength(postData)
-      }
-    };
-    const req = http.request(options, res => {
-      let body = "";
-      res.on("data", chunk => (body += chunk));
-      res.on("end", () => {
-        try {
-          resolve({ ok: true, body: JSON.parse(body) });
-        } catch {
-          resolve({ ok: false, error: "Invalid JSON response" });
-        }
-      });
-    });
-    req.on("error", err => resolve({ ok: false, error: err.message }));
-    req.setTimeout(HTTP_TIMEOUT_POST, () => {
-      req.destroy();
-      resolve({ ok: false, error: "请求超时" });
-    });
-    req.write(postData);
-    req.end();
-  });
-}
-
-/**
- * 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 };
+const http = require("http");
+const { HTTP_TIMEOUT_GET, HTTP_TIMEOUT_POST } = require("./constants");
+const { apiUrl } = require("./utils");
+
+function parseBody(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+}
+
+function httpGet(url) {
+  return new Promise(resolve => {
+    const req = http.get(url, res => {
+      let body = "";
+      res.on("data", chunk => (body += chunk));
+      res.on("end", () => resolve({ ok: true, status: res.statusCode, body: parseBody(body) }));
+    });
+    req.on("error", err => resolve({ ok: false, error: err.message }));
+    req.setTimeout(HTTP_TIMEOUT_GET, () => {
+      req.destroy();
+      resolve({ ok: false, error: "请求超时" });
+    });
+  });
+}
+
+function httpPost(url, data) {
+  return new Promise(resolve => {
+    const postData = JSON.stringify(data);
+    const urlObj = new URL(url);
+    const options = {
+      hostname: urlObj.hostname,
+      port: urlObj.port,
+      path: urlObj.pathname,
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(postData)
+      }
+    };
+    const req = http.request(options, res => {
+      let body = "";
+      res.on("data", chunk => (body += chunk));
+      res.on("end", () => {
+        try {
+          resolve({ ok: true, body: JSON.parse(body) });
+        } catch {
+          resolve({ ok: false, error: "Invalid JSON response" });
+        }
+      });
+    });
+    req.on("error", err => resolve({ ok: false, error: err.message }));
+    req.setTimeout(HTTP_TIMEOUT_POST, () => {
+      req.destroy();
+      resolve({ ok: false, error: "请求超时" });
+    });
+    req.write(postData);
+    req.end();
+  });
+}
+
+/**
+ * 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 };