shine-code-submit 1.0.4 → 1.0.6

package/src/hook/main.ts

@@ -6,8 +6,8 @@
 import { ensureDirs } from "../shared/paths";
 import { readToken } from "../shared/pidfile";
 import { writeSpoolFile } from "../shared/spool";
-import { BASE_URL, PUBLIC_BASE_URL, HOOK_POST_TIMEOUT_MS } from "../shared/config";
-import { ensureDaemon, openBrowser } from "../shared/daemonctl";
+import { BASE_URL, PUBLIC_BASE_URL, HOOK_POST_TIMEOUT_MS, SERVICE_VERSION } from "../shared/config";
+import { ensureDaemon, openBrowser, spawnDaemon, stopDaemon } from "../shared/daemonctl";
 import type { HookEvent, HookEventType } from "../shared/types";
 
 const VALID_TYPES: HookEventType[] = [
@@ -122,16 +122,24 @@ async function readStdin(): Promise<unknown> {
 async function forward(event: HookEvent): Promise<void> {
   const token = readToken();
   const url = `${BASE_URL}/api/hook/${event.type}`;
-  if (await postOnce(url, event, token)) return;
+  const r = await postOnce(url, event, token);
+  if (r.ok) {
+    // 升级检测:daemon 版本旧 → 停旧启新(不等 ready;本次事件已入库 + 已落 spool,新 daemon 起来后回捞后续)
+    if (r.version && r.version !== SERVICE_VERSION) {
+      await stopDaemon();
+      spawnDaemon();
+    }
+    return;
+  }
   // 热转发失败 → 故障路径
   await ensureDaemon();
-  // 重读 token（拉起后 pid 文件已更新）
+  // 重读 token(拉起后 pid 文件已更新)
   await postOnce(url, event, readToken() ?? token);
 }
 
-async function postOnce(url: string, event: HookEvent, token: string | null): Promise<boolean> {
+async function postOnce(url: string, event: HookEvent, token: string | null): Promise<{ ok: boolean; version?: string }> {
   try {
-    await fetch(url, {
+    const res = await fetch(url, {
       method: "POST",
       headers: {
         "content-type": "application/json",
@@ -140,9 +148,10 @@ async function postOnce(url: string, event: HookEvent, token: string | null): Pr
       body: JSON.stringify(event),
       signal: AbortSignal.timeout(HOOK_POST_TIMEOUT_MS),
     });
-    return true; // 到达 daemon 即视为成功（事件也已落盘，回捞兜底）
+    const data = (await res.json().catch(() => ({}))) as { version?: string };
+    return { ok: true, version: data.version }; // 到达 daemon 即视为成功(事件也已落盘,回捞兜底);顺带读 version
   } catch {
-    return false;
+    return { ok: false };
   }
 }
 

package/src/install/main.ts

@@ -7,8 +7,8 @@ import { spawn } from "node:child_process";
 import { ensureBun } from "./bun";
 import { cacheDir, deployPlugin } from "./deploy";
 import { enablePlugin, registerMarketplace, registerPlugin, unregisterAll } from "./register";
-import { BASE_URL, PUBLIC_BASE_URL, SERVICE_VERSION } from "../shared/config";
-import { isOursAlive, openBrowser } from "../shared/daemonctl";
+import { PUBLIC_BASE_URL, SERVICE_VERSION } from "../shared/config";
+import { isOursAlive, openBrowser, probeDaemon, stopDaemon } from "../shared/daemonctl";
 import { ensureDirs } from "../shared/paths";
 import { readPidFile } from "../shared/pidfile";
 
@@ -78,14 +78,21 @@ async function runStatus(): Promise<void> {
   }
 }
 
-/** 用显式 bunPath 拉 daemon。不调 daemonctl.spawnDaemon——它用 process.execPath,install 场景是 node 会出错。 */
+/** 用显式 bunPath 拉 daemon。不调 daemonctl.spawnDaemon——它用 process.execPath,install 场景是 node 会出错。
+ *  版本感知:已是当前 SERVICE_VERSION 则复用;旧版在跑则停旧启新(daemon 自守,必须先停后启);没跑则直接启。 */
 async function startDaemonWithBun(bunPath: string, cachePath: string): Promise<void> {
-  if (await isOursAlive()) {
-    console.log("[shine-code-submit] daemon 已在运行,跳过启动");
+  const probe = await probeDaemon();
+  if (probe.alive && probe.version === SERVICE_VERSION) {
+    console.log(`[shine-code-submit] daemon 已是最新 v${SERVICE_VERSION},跳过启动`);
     return;
   }
+  if (probe.alive) {
+    console.log(`[shine-code-submit] daemon 旧版 v${probe.version} 运行中,重启到 v${SERVICE_VERSION}...`);
+    await stopDaemon();
+  } else {
+    console.log("[shine-code-submit] 启动 daemon...");
+  }
   const daemonSrc = join(cachePath, "src", "daemon", "main.ts");
-  console.log("[shine-code-submit] 启动 daemon...");
   try {
     const child = spawn(bunPath, ["run", daemonSrc], {
       detached: true,
@@ -103,7 +110,8 @@ async function startDaemonWithBun(bunPath: string, cachePath: string): Promise<v
   const deadline = Date.now() + 10_000;
   while (Date.now() < deadline) {
     await sleep(200);
-    if (await isOursAlive()) {
+    const p = await probeDaemon();
+    if (p.alive && p.version === SERVICE_VERSION) {
       console.log("[shine-code-submit] daemon 已就绪");
       return;
     }
@@ -113,33 +121,6 @@ async function startDaemonWithBun(bunPath: string, cachePath: string): Promise<v
   );
 }
 
-async function stopDaemon(): Promise<void> {
-  const pid = readPidFile();
-  if (!pid) {
-    console.log("[shine-code-submit] daemon 未运行(无 pid 文件)");
-    return;
-  }
-  if (await isOursAlive()) {
-    try {
-      await fetch(`${BASE_URL}/api/shutdown`, {
-        method: "POST",
-        headers: { authorization: `Bearer ${pid.token}` },
-      });
-    } catch {
-      /* ignore */
-    }
-    await sleep(1000);
-    if (await isOursAlive()) {
-      try {
-        process.kill(pid.pid);
-      } catch {
-        /* ignore */
-      }
-    }
-  }
-  console.log("[shine-code-submit] daemon 已停止");
-}
-
 function openDashboard(): void {
   const pid = readPidFile();
   const url = pid ? `${PUBLIC_BASE_URL}/ui?t=${pid.token}` : `${PUBLIC_BASE_URL}/ui`;

package/src/shared/daemonctl.ts

@@ -4,20 +4,27 @@ import { spawn } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { BASE_URL, HEALTH_POLL_TIMEOUT_MS, HEALTH_POLL_INTERVAL_MS, SERVICE_NAME } from "./config";
+import { BASE_URL, HEALTH_POLL_TIMEOUT_MS, HEALTH_POLL_INTERVAL_MS, SERVICE_NAME, SERVICE_VERSION } from "./config";
+import { readPidFile, removePidFile } from "./pidfile";
 
-/** 探活 + 认自己人：service 字段必须匹配，防端口被无关程序占用误判。 */
-export async function isOursAlive(timeoutMs = 400): Promise<boolean> {
+/** 探活 + 认自己人 + 取版本:service 必须匹配(防端口被无关程序占用误判),顺便读 version。 */
+export async function probeDaemon(timeoutMs = 400): Promise<{ alive: boolean; version?: string }> {
   try {
     const res = await fetch(`${BASE_URL}/api/health`, { signal: AbortSignal.timeout(timeoutMs) });
-    if (!res.ok) return false;
-    const data = (await res.json()) as { service?: string };
-    return data?.service === SERVICE_NAME;
+    if (!res.ok) return { alive: false };
+    const data = (await res.json()) as { service?: string; version?: string };
+    if (data?.service !== SERVICE_NAME) return { alive: false };
+    return { alive: true, version: data.version };
   } catch {
-    return false;
+    return { alive: false };
   }
 }
 
+/** 探活 + 认自己人(只看存活,不比版本)。向后兼容;需比版本用 probeDaemon。 */
+export async function isOursAlive(timeoutMs = 400): Promise<boolean> {
+  return (await probeDaemon(timeoutMs)).alive;
+}
+
 /**
  * detached 拉起 daemon。
  * 优先级：env 覆盖 > 同目录 daemon 二进制（二进制模式）> bun run src/daemon/main.ts（源码模式）。
@@ -55,14 +62,42 @@ export function spawnDaemon(): void {
   }
 }
 
-/** 确保 daemon 就绪：不在则拉起并轮询至 ready（或超时）。 */
+/** 停 daemon:POST /api/shutdown(优雅) → sleep 1s → 仍活强杀 → 清 stale pid 文件。 */
+export async function stopDaemon(): Promise<void> {
+  const pid = readPidFile();
+  if (!pid) return;
+  if (await isOursAlive()) {
+    try {
+      await fetch(`${BASE_URL}/api/shutdown`, {
+        method: "POST",
+        headers: { authorization: `Bearer ${pid.token}` },
+      });
+    } catch {
+      /* ignore */
+    }
+    await sleep(1000);
+    if (await isOursAlive()) {
+      try {
+        process.kill(pid.pid);
+      } catch {
+        /* ignore */
+      }
+    }
+  }
+  removePidFile();
+}
+
+/** 确保 daemon 就绪且版本 == 当前 SERVICE_VERSION:没跑则拉起;旧版在跑则停旧启新(daemon 自守,必须先停后启)。 */
 export async function ensureDaemon(): Promise<boolean> {
-  if (await isOursAlive()) return true;
+  const probe = await probeDaemon();
+  if (probe.alive && probe.version === SERVICE_VERSION) return true;
+  if (probe.alive) await stopDaemon(); // 旧版:先停,新的才起得来
   spawnDaemon();
   const deadline = Date.now() + HEALTH_POLL_TIMEOUT_MS;
   while (Date.now() < deadline) {
     await sleep(HEALTH_POLL_INTERVAL_MS);
-    if (await isOursAlive()) return true;
+    const p = await probeDaemon();
+    if (p.alive && p.version === SERVICE_VERSION) return true;
   }
   return false;
 }

package/src/shared/updater.ts

@@ -0,0 +1,73 @@
+// 自动更新:查 npm registry 最新版本,有新版 spawn detached `npx shine-code-submit@latest install` 升级。
+// daemon 启动时 + 定时调 autoUpdateIfNeeded。全程静默(try/catch),绝不影响 daemon。
+//
+// 升级链路:npx 拉 latest 包 → install CLI 部署新版到 cache + 注册 → startDaemonWithBun(1.0.5)
+// 检测旧 daemon 版本不匹配 → stopDaemon 停旧 → 启新 daemon。daemon 退出不影响 npx install(detached)。
+import { spawn } from "node:child_process";
+import { SERVICE_NAME, SERVICE_VERSION } from "./config";
+import { readSettings, writeSettings } from "../daemon/settings";
+
+const REGISTRY_LATEST = `https://registry.npmjs.org/${SERVICE_NAME}/latest`;
+const NPM_REGISTRY = "https://registry.npmjs.org/";
+
+/** semver 大于:a > b 才 true(相等 false)。只升级不降级,避免本地比 npm 新(如发版前 build)时误降级。 */
+function versionGt(a: string, b: string): boolean {
+  const pa = a.split(".").map((x) => parseInt(x, 10) || 0);
+  const pb = b.split(".").map((x) => parseInt(x, 10) || 0);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const x = pa[i] ?? 0;
+    const y = pb[i] ?? 0;
+    if (x > y) return true;
+    if (x < y) return false;
+  }
+  return false;
+}
+
+export interface UpdateCheck {
+  latest?: string;
+  current: string;
+  hasUpdate: boolean;
+}
+
+/** 查 npm registry 最新版本。失败返回 hasUpdate:false(不抛)。 */
+export async function checkForUpdate(): Promise<UpdateCheck> {
+  try {
+    const res = await fetch(REGISTRY_LATEST, { signal: AbortSignal.timeout(5000) });
+    if (!res.ok) return { current: SERVICE_VERSION, hasUpdate: false };
+    const data = (await res.json()) as { version?: string };
+    const latest = data.version;
+    if (!latest) return { current: SERVICE_VERSION, hasUpdate: false };
+    return { latest, current: SERVICE_VERSION, hasUpdate: versionGt(latest, SERVICE_VERSION) };
+  } catch {
+    return { current: SERVICE_VERSION, hasUpdate: false };
+  }
+}
+
+/**
+ * 自动更新:读 settings(autoUpdate 开关),有新版 spawn detached npx install。
+ * 返回 {updated, latest}。全程 try/catch 静默——绝不影响 daemon。
+ * - autoUpdate===false → 跳过。
+ * - 有新版 → spawn `npx --yes --registry=官方 shine-code-submit@latest install`(detached,不阻塞)。
+ * - 无论是否升级,都缓存 latestVersion 到 settings(dashboard 显示用)。
+ */
+export async function autoUpdateIfNeeded(force = false): Promise<{ updated: boolean; latest?: string }> {
+  try {
+    const s = readSettings();
+    if (!force && s.autoUpdate === false) return { updated: false };
+    const check = await checkForUpdate();
+    // 缓存 latestVersion(dashboard 显示当前/最新版本)
+    if (check.latest && check.latest !== s.latestVersion) {
+      writeSettings({ ...s, latestVersion: check.latest });
+    }
+    if (!check.hasUpdate) return { updated: false, latest: check.latest };
+    // 有新版:spawn detached npx install(官方 registry 确保 latest,npmmirror 有同步延迟)
+    spawn(
+      "npx",
+      ["--yes", `--registry=${NPM_REGISTRY}`, `${SERVICE_NAME}@latest`, "install"],
+      { detached: true, stdio: "ignore", windowsHide: true, shell: true },
+    ).unref();
+    return { updated: true, latest: check.latest };
+  } catch {
+    return { updated: false };
+  }
+}