@shellus/way 0.6.9 → 0.6.10

package/README.md

@@ -242,6 +242,8 @@ projects:
 
 `before_backup` 失败会跳过该项目的 restic 备份并标记项目失败；`after_backup` 只在 restic 成功后执行，失败同样会标记项目失败。`--dry-run` 模式只打印钩子命令，不实际执行。钩子命令按 shell 命令执行，并会收到 `WAY_PROJECT`、`WAY_REMOTE`、`WAY_DIR`、`WAY_DRY_RUN` 环境变量。
 
+Linux 上的 hook 达到 `timeout` 后，Way 会终止对应 shell 的完整进程组；进程未在宽限期内退出时会继续强制终止，避免数据库导出、压缩或同步子进程脱离 Way 后持续运行。hook 仍应保持幂等，并自行清理失败时生成的临时文件。
+
 **项目级 Uptime Kuma 通知示例**：
 
 ```yaml
@@ -460,4 +462,4 @@ way --remote=oss restic restore <snapshot-id> --target /tmp/restore
 - 变更规范和测试要求
 - 发布流程
 
-内部开发参考：[CLAUDE.md](CLAUDE.md)
+项目维护规则：[AGENTS.md](AGENTS.md)

package/dist/cli.js

@@ -324,6 +324,7 @@ function groupUptimeKumaResults(projectResults) {
   }
   return groupedResults;
 }
+var HOOK_FORCE_KILL_DELAY_MS = 1e3;
 function normalizeHook(hook) {
   if (typeof hook === "string") return { run: hook };
   return hook;
@@ -346,6 +347,26 @@ function parseTimeout(timeout) {
       return value * 60 * 60 * 1e3;
   }
 }
+function isMissingProcessError(error) {
+  return error instanceof Error && "code" in error && error.code === "ESRCH";
+}
+function signalProcessGroup(pid, signal) {
+  try {
+    process.kill(-pid, signal);
+    return true;
+  } catch (error) {
+    if (isMissingProcessError(error)) return false;
+    throw error;
+  }
+}
+function hookTimedOut(error) {
+  return typeof error === "object" && error !== null && "timedOut" in error && error.timedOut === true;
+}
+async function terminateProcessGroup(pid) {
+  if (!signalProcessGroup(pid, "SIGTERM")) return;
+  await new Promise((resolve) => setTimeout(resolve, HOOK_FORCE_KILL_DELAY_MS));
+  signalProcessGroup(pid, "SIGKILL");
+}
 async function runProjectHooks(hooks, context) {
   if (!hooks?.length) return;
   for (const hook of hooks) {
@@ -356,10 +377,11 @@ async function runProjectHooks(hooks, context) {
       continue;
     }
     console.log(`Running ${context.label} hook for ${context.projectName}: ${normalized.run}`);
-    await execaCommand(normalized.run, {
+    const subprocess = execaCommand(normalized.run, {
       shell: true,
       stdio: "inherit",
       timeout: parseTimeout(normalized.timeout),
+      detached: process.platform !== "win32",
       env: {
         WAY_PROJECT: context.projectName,
         WAY_REMOTE: context.remote,
@@ -367,6 +389,19 @@ async function runProjectHooks(hooks, context) {
         WAY_DRY_RUN: context.dryRun ? "1" : "0"
       }
     });
+    const processGroupPid = process.platform === "win32" ? void 0 : subprocess.pid;
+    const cleanupOnExit = processGroupPid === void 0 ? void 0 : () => signalProcessGroup(processGroupPid, "SIGTERM");
+    if (cleanupOnExit) process.once("exit", cleanupOnExit);
+    try {
+      await subprocess;
+    } catch (error) {
+      if (processGroupPid !== void 0 && hookTimedOut(error)) {
+        await terminateProcessGroup(processGroupPid);
+      }
+      throw error;
+    } finally {
+      if (cleanupOnExit) process.removeListener("exit", cleanupOnExit);
+    }
   }
 }
 async function notifyUptimeKuma(result, pushUrl) {
@@ -611,7 +646,7 @@ async function daemon(options) {
 
 // src/cli.ts
 var program = new Command();
-program.name("way").version("0.6.9").description("\u7B56\u7565\u5907\u4EFD\u5DE5\u5177 - \u57FA\u4E8E restic \u7684\u7B56\u7565\u5C01\u88C5").option("--remote <name>", "\u6307\u5B9A\u4ED3\u5E93", "default").addHelpText("after", `
+program.name("way").version("0.6.10").description("\u7B56\u7565\u5907\u4EFD\u5DE5\u5177 - \u57FA\u4E8E restic \u7684\u7B56\u7565\u5C01\u88C5").option("--remote <name>", "\u6307\u5B9A\u4ED3\u5E93", "default").addHelpText("after", `
 \u793A\u4F8B:
   $ way backup                 \u6267\u884C\u6240\u6709\u9879\u76EE\u5907\u4EFD
   $ way backup data            \u53EA\u5907\u4EFD data \u9879\u76EE

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shellus/way",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "将备份作为持续运营的项目，而非一次性任务。基于 restic 的策略封装。",
   "type": "module",
   "bin": {