@sfmc-bds/bds-tools 0.1.0 → 0.2.0-beta.0

package/dist/paths.d.ts

@@ -1,17 +1,22 @@
 /**
  * paths.ts — 路径常量 & 加载 bds_updater.json
  *
- * ROOT_DIR = 项目根,通过 SDK 统一解析(env SFMC_ROOT > __dirname 上溯)。
- * SCRIPT_DIR = bds-tools/ 内部 dist 目录,bds 的 PID / log / cache 文件落盘处。
+ * ROOT_DIR = 项目/数据根,通过 SDK 统一解析(env SFMC_ROOT > __dirname 上溯)。
+ * STATE_DIR / LOG_PATH 等运行态路径一律走 SDK stateDir / logFile,勿再手写 ".sfmc"。
  */
 import { type BdsUpdaterConfig } from "@sfmc-bds/sdk/node/config";
-/** 项目根目录:bds-tools 的上一级。统一通过 SDK 解析,SEA / npm 一致。 */
+/** 项目根目录:bds-tools 的上一级。统一通过 SDK 解析。 */
 export declare const ROOT_DIR: string;
 export declare const CFG_PATH: string;
+/** 运行态目录(相对数据根，勿落在 bds-tools/dist) */
+export declare const STATE_DIR: string;
 export declare const LOG_PATH: string;
 export declare const VERSION_CACHE: string;
 export declare const PID_FILE: string;
+/** 更新中途失败可恢复的回滚标记 */
 export declare const ROLLBACK_MARKER: string;
+/** 确保 .sfmc 运行态目录存在(PID 写入等不经 writeJson 的路径需要) */
+export declare function ensureStateDir(): void;
 /** 加载并解析 bds_updater.json。
  *  启动时 ensure 文件存在,避免 wizard 没跑时 bds_updater.json 缺失导致 loadConfig 抛错。 */
 export declare function loadConfig(): BdsUpdaterConfig;

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AAOnC,qDAAqD;AACrD,eAAO,MAAM,QAAQ,EAAE,MAAiE,CAAC;AACzF,eAAO,MAAM,QAAQ,EAAE,MAAiD,CAAC;AACzE,eAAO,MAAM,QAAQ,EAAE,MAA4C,CAAC;AACpE,eAAO,MAAM,aAAa,EAAE,MAAqD,CAAC;AAClF,eAAO,MAAM,QAAQ,EAAE,MAA0C,CAAC;AAClE,eAAO,MAAM,eAAe,EAAE,MAA4D,CAAC;AAE3F;yEACyE;AACzE,wBAAgB,UAAU,IAAI,gBAAgB,CAQ7C;AAED,yBAAyB;AACzB,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,gBAAgB,CAAC;CACvB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,gBAAgB,GAAG,QAAQ,CAS5D;AAED,gBAAgB;AAChB,wBAAgB,QAAQ,IAAI,IAAI,CAM/B"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AAOnC,wCAAwC;AACxC,eAAO,MAAM,QAAQ,EAAE,MAAiE,CAAC;AACzF,eAAO,MAAM,QAAQ,EAAE,MAAiD,CAAC;AAEzE,sCAAsC;AACtC,eAAO,MAAM,SAAS,EAAE,MAA2B,CAAC;AACpD,eAAO,MAAM,QAAQ,EAAE,MAAwC,CAAC;AAChE,eAAO,MAAM,aAAa,EAAE,MAAuD,CAAC;AACpF,eAAO,MAAM,QAAQ,EAAE,MAAwC,CAAC;AAChE,qBAAqB;AACrB,eAAO,MAAM,eAAe,EAAE,MAA0D,CAAC;AAEzF,kDAAkD;AAClD,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED;yEACyE;AACzE,wBAAgB,UAAU,IAAI,gBAAgB,CAO7C;AAED,yBAAyB;AACzB,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,gBAAgB,CAAC;CACvB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,gBAAgB,GAAG,QAAQ,CAS5D;AAED,gBAAgB;AAChB,wBAAgB,QAAQ,IAAI,IAAI,CAM/B"}

package/dist/paths.js

@@ -1,47 +1,61 @@
-/**
- * paths.ts — 路径常量 & 加载 bds_updater.json
- *
- * ROOT_DIR = 项目根,通过 SDK 统一解析(env SFMC_ROOT > __dirname 上溯)。
- * SCRIPT_DIR = bds-tools/ 内部 dist 目录,bds 的 PID / log / cache 文件落盘处。
- */
-import { configPath, ensureJsonConfig, resolveRuntimeRoot, } from "@sfmc-bds/sdk/node/config";
+import {
+  configPath,
+  DEFAULT_BDS_UPDATER_CONFIG,
+  loadEnsuredConfig,
+  logFile,
+  resolveRuntimeRoot,
+  stateDir
+} from "@sfmc-bds/sdk/node/config";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 const __filename = fileURLToPath(import.meta.url);
 const SCRIPT_DIR = path.dirname(__filename);
-/** 项目根目录:bds-tools 的上一级。统一通过 SDK 解析,SEA / npm 一致。 */
-export const ROOT_DIR = resolveRuntimeRoot(path.resolve(SCRIPT_DIR, "..", ".."));
-export const CFG_PATH = configPath(ROOT_DIR, "bds_updater.json");
-export const LOG_PATH = path.join(SCRIPT_DIR, "update.log");
-export const VERSION_CACHE = path.join(SCRIPT_DIR, ".version_cache.json");
-export const PID_FILE = path.join(SCRIPT_DIR, ".bds.pid");
-export const ROLLBACK_MARKER = path.join(SCRIPT_DIR, ".last_update_rollback.json");
-/** 加载并解析 bds_updater.json。
- *  启动时 ensure 文件存在,避免 wizard 没跑时 bds_updater.json 缺失导致 loadConfig 抛错。 */
-export function loadConfig() {
-    const cfg = ensureJsonConfig(ROOT_DIR, "bds_updater.json", {});
-    delete cfg._comment;
-    return cfg;
+const ROOT_DIR = resolveRuntimeRoot(path.resolve(SCRIPT_DIR, "..", ".."));
+const CFG_PATH = configPath(ROOT_DIR, "bds_updater.json");
+const STATE_DIR = stateDir(ROOT_DIR);
+const LOG_PATH = logFile(ROOT_DIR, "bds-update");
+const VERSION_CACHE = path.join(STATE_DIR, "bds-version-cache.json");
+const PID_FILE = path.join(STATE_DIR, "bds.pid");
+const ROLLBACK_MARKER = path.join(STATE_DIR, "last_update_rollback.json");
+function ensureStateDir() {
+  fs.mkdirSync(STATE_DIR, { recursive: true });
 }
-export function resolvePaths(cfg) {
-    const bds_path = path.resolve(cfg.bds_path || process.cwd());
-    const backup_dir = path.resolve(cfg.backup_dir || path.join(bds_path, "..", "backups"));
-    const relativeBackup = path.relative(bds_path, backup_dir);
-    if (relativeBackup === "" || (!relativeBackup.startsWith("..") && !path.isAbsolute(relativeBackup))) {
-        throw new Error("backup_dir must be outside bds_path so deployment cannot delete the backup");
-    }
-    const preserve = Array.isArray(cfg.preserve) ? cfg.preserve : [];
-    return { bds_path, backup_dir, preserve, cfg };
+function loadConfig() {
+  return loadEnsuredConfig(
+    ROOT_DIR,
+    "bds_updater.json",
+    "bds_updater",
+    { ...DEFAULT_BDS_UPDATER_CONFIG }
+  );
 }
-/** 删除 PID 文件 */
-export function clearPid() {
-    try {
-        if (fs.existsSync(PID_FILE))
-            fs.unlinkSync(PID_FILE);
-    }
-    catch {
-        /* ignore */
-    }
+function resolvePaths(cfg) {
+  const bds_path = path.resolve(cfg.bds_path || process.cwd());
+  const backup_dir = path.resolve(cfg.backup_dir || path.join(bds_path, "..", "backups"));
+  const relativeBackup = path.relative(bds_path, backup_dir);
+  if (relativeBackup === "" || !relativeBackup.startsWith("..") && !path.isAbsolute(relativeBackup)) {
+    throw new Error("backup_dir must be outside bds_path so deployment cannot delete the backup");
+  }
+  const preserve = Array.isArray(cfg.preserve) ? cfg.preserve : [];
+  return { bds_path, backup_dir, preserve, cfg };
 }
-//# sourceMappingURL=paths.js.map
+function clearPid() {
+  try {
+    if (fs.existsSync(PID_FILE)) fs.unlinkSync(PID_FILE);
+  } catch {
+  }
+}
+export {
+  CFG_PATH,
+  LOG_PATH,
+  PID_FILE,
+  ROLLBACK_MARKER,
+  ROOT_DIR,
+  STATE_DIR,
+  VERSION_CACHE,
+  clearPid,
+  ensureStateDir,
+  loadConfig,
+  resolvePaths
+};
+//# sourceMappingURL=paths.js.map

package/dist/paths.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,UAAU,GAAW,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AACpD,qDAAqD;AACrD,MAAM,CAAC,MAAM,QAAQ,GAAW,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACzF,MAAM,CAAC,MAAM,QAAQ,GAAW,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;AACzE,MAAM,CAAC,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,aAAa,GAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAClE,MAAM,CAAC,MAAM,eAAe,GAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,4BAA4B,CAAC,CAAC;AAE3F;yEACyE;AACzE,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,gBAAgB,CAC1B,QAAQ,EACR,kBAAkB,EAClB,EAAE,CACH,CAAC;IACF,OAAO,GAAG,CAAC,QAAQ,CAAC;IACpB,OAAO,GAAG,CAAC;AACb,CAAC;AAUD,MAAM,UAAU,YAAY,CAAC,GAAqB;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACxF,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3D,IAAI,cAAc,KAAK,EAAE,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QACpG,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;AACjD,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,QAAQ;IACtB,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;AACH,CAAC"}
+{
+  "version": 3,
+  "sources": ["../src/paths.ts"],
+  "sourcesContent": ["/**\n * paths.ts \u2014 \u8DEF\u5F84\u5E38\u91CF & \u52A0\u8F7D bds_updater.json\n *\n * ROOT_DIR = \u9879\u76EE/\u6570\u636E\u6839,\u901A\u8FC7 SDK \u7EDF\u4E00\u89E3\u6790(env SFMC_ROOT > __dirname \u4E0A\u6EAF)\u3002\n * STATE_DIR / LOG_PATH \u7B49\u8FD0\u884C\u6001\u8DEF\u5F84\u4E00\u5F8B\u8D70 SDK stateDir / logFile,\u52FF\u518D\u624B\u5199 \".sfmc\"\u3002\n */\n\nimport {\n  configPath,\n  DEFAULT_BDS_UPDATER_CONFIG,\n  loadEnsuredConfig,\n  logFile,\n  resolveRuntimeRoot,\n  stateDir,\n  type BdsUpdaterConfig,\n} from \"@sfmc-bds/sdk/node/config\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\nconst __filename = fileURLToPath(import.meta.url);\nconst SCRIPT_DIR: string = path.dirname(__filename);\n/** \u9879\u76EE\u6839\u76EE\u5F55:bds-tools \u7684\u4E0A\u4E00\u7EA7\u3002\u7EDF\u4E00\u901A\u8FC7 SDK \u89E3\u6790\u3002 */\nexport const ROOT_DIR: string = resolveRuntimeRoot(path.resolve(SCRIPT_DIR, \"..\", \"..\"));\nexport const CFG_PATH: string = configPath(ROOT_DIR, \"bds_updater.json\");\n\n/** \u8FD0\u884C\u6001\u76EE\u5F55(\u76F8\u5BF9\u6570\u636E\u6839\uFF0C\u52FF\u843D\u5728 bds-tools/dist) */\nexport const STATE_DIR: string = stateDir(ROOT_DIR);\nexport const LOG_PATH: string = logFile(ROOT_DIR, \"bds-update\");\nexport const VERSION_CACHE: string = path.join(STATE_DIR, \"bds-version-cache.json\");\nexport const PID_FILE: string = path.join(STATE_DIR, \"bds.pid\");\n/** \u66F4\u65B0\u4E2D\u9014\u5931\u8D25\u53EF\u6062\u590D\u7684\u56DE\u6EDA\u6807\u8BB0 */\nexport const ROLLBACK_MARKER: string = path.join(STATE_DIR, \"last_update_rollback.json\");\n\n/** \u786E\u4FDD .sfmc \u8FD0\u884C\u6001\u76EE\u5F55\u5B58\u5728(PID \u5199\u5165\u7B49\u4E0D\u7ECF writeJson \u7684\u8DEF\u5F84\u9700\u8981) */\nexport function ensureStateDir(): void {\n  fs.mkdirSync(STATE_DIR, { recursive: true });\n}\n\n/** \u52A0\u8F7D\u5E76\u89E3\u6790 bds_updater.json\u3002\n *  \u542F\u52A8\u65F6 ensure \u6587\u4EF6\u5B58\u5728,\u907F\u514D wizard \u6CA1\u8DD1\u65F6 bds_updater.json \u7F3A\u5931\u5BFC\u81F4 loadConfig \u629B\u9519\u3002 */\nexport function loadConfig(): BdsUpdaterConfig {\n  return loadEnsuredConfig(\n    ROOT_DIR,\n    \"bds_updater.json\",\n    \"bds_updater\",\n    { ...DEFAULT_BDS_UPDATER_CONFIG } as Record<string, unknown>\n  ) as BdsUpdaterConfig;\n}\n\n/** \u89E3\u6790\u540E\u7684 BDS \u8DEF\u5F84 / \u5907\u4EFD\u76EE\u5F55 */\nexport interface BdsPaths {\n  bds_path: string;\n  backup_dir: string;\n  preserve: string[];\n  cfg: BdsUpdaterConfig;\n}\n\nexport function resolvePaths(cfg: BdsUpdaterConfig): BdsPaths {\n  const bds_path = path.resolve(cfg.bds_path || process.cwd());\n  const backup_dir = path.resolve(cfg.backup_dir || path.join(bds_path, \"..\", \"backups\"));\n  const relativeBackup = path.relative(bds_path, backup_dir);\n  if (relativeBackup === \"\" || (!relativeBackup.startsWith(\"..\") && !path.isAbsolute(relativeBackup))) {\n    throw new Error(\"backup_dir must be outside bds_path so deployment cannot delete the backup\");\n  }\n  const preserve = Array.isArray(cfg.preserve) ? cfg.preserve : [];\n  return { bds_path, backup_dir, preserve, cfg };\n}\n\n/** \u5220\u9664 PID \u6587\u4EF6 */\nexport function clearPid(): void {\n  try {\n    if (fs.existsSync(PID_FILE)) fs.unlinkSync(PID_FILE);\n  } catch {\n    /* ignore */\n  }\n}\n"],
+  "mappings": "AAOA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AACP,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,qBAAqB;AAE9B,MAAM,aAAa,cAAc,YAAY,GAAG;AAChD,MAAM,aAAqB,KAAK,QAAQ,UAAU;AAE3C,MAAM,WAAmB,mBAAmB,KAAK,QAAQ,YAAY,MAAM,IAAI,CAAC;AAChF,MAAM,WAAmB,WAAW,UAAU,kBAAkB;AAGhE,MAAM,YAAoB,SAAS,QAAQ;AAC3C,MAAM,WAAmB,QAAQ,UAAU,YAAY;AACvD,MAAM,gBAAwB,KAAK,KAAK,WAAW,wBAAwB;AAC3E,MAAM,WAAmB,KAAK,KAAK,WAAW,SAAS;AAEvD,MAAM,kBAA0B,KAAK,KAAK,WAAW,2BAA2B;AAGhF,SAAS,iBAAuB;AACrC,KAAG,UAAU,WAAW,EAAE,WAAW,KAAK,CAAC;AAC7C;AAIO,SAAS,aAA+B;AAC7C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,EAAE,GAAG,2BAA2B;AAAA,EAClC;AACF;AAUO,SAAS,aAAa,KAAiC;AAC5D,QAAM,WAAW,KAAK,QAAQ,IAAI,YAAY,QAAQ,IAAI,CAAC;AAC3D,QAAM,aAAa,KAAK,QAAQ,IAAI,cAAc,KAAK,KAAK,UAAU,MAAM,SAAS,CAAC;AACtF,QAAM,iBAAiB,KAAK,SAAS,UAAU,UAAU;AACzD,MAAI,mBAAmB,MAAO,CAAC,eAAe,WAAW,IAAI,KAAK,CAAC,KAAK,WAAW,cAAc,GAAI;AACnG,UAAM,IAAI,MAAM,4EAA4E;AAAA,EAC9F;AACA,QAAM,WAAW,MAAM,QAAQ,IAAI,QAAQ,IAAI,IAAI,WAAW,CAAC;AAC/D,SAAO,EAAE,UAAU,YAAY,UAAU,IAAI;AAC/C;AAGO,SAAS,WAAiB;AAC/B,MAAI;AACF,QAAI,GAAG,WAAW,QAAQ,EAAG,IAAG,WAAW,QAAQ;AAAA,EACrD,QAAQ;AAAA,EAER;AACF;",
+  "names": []
+}

package/dist/qqutil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qqutil.d.ts","sourceRoot":"","sources":["../src/qqutil.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,0BAA0B;AAC1B,wBAAgB,iBAAiB,IAAI,OAAO,CAQ3C;AA6CD,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1D;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYlE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlF"}
+{"version":3,"file":"qqutil.d.ts","sourceRoot":"","sources":["../src/qqutil.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuBH,0BAA0B;AAC1B,wBAAgB,iBAAiB,IAAI,OAAO,CAO3C;AA6CD,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1D;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYlE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlF"}

package/dist/qqutil.js

@@ -1,101 +1,104 @@
-/**
- * qqutil.ts — QQ 通知工具 (基于 LLBot HTTP OneBot 11)
- *
- * 改进:
- *  - sendTimeout 提供总超时，避免通知发送挂死主流程
- *  - 静默模式 (失败不抛出)，保证主流程不被通知干扰
- */
+import {
+  configPath,
+  modulePath,
+  readJson
+} from "@sfmc-bds/sdk/node/config";
 import http from "node:http";
-import { configPath, modulePath, readJson } from "@sfmc-bds/sdk/node/config";
-import { ROOT_DIR } from "./paths.js";
 import { log } from "./log.js";
+import { ROOT_DIR } from "./paths.js";
 let cachedCfg = null;
 function getConfig() {
-    if (cachedCfg)
-        return cachedCfg;
-    cachedCfg = (readJson(configPath(ROOT_DIR, "qq_config.json")) ?? {});
-    return cachedCfg;
+  if (cachedCfg) return cachedCfg;
+  cachedCfg = readJson(configPath(ROOT_DIR, "qq_config.json")) ?? {};
+  return cachedCfg;
 }
-/** 检查 qq-bridge 模块是否启用 */
-export function isQqBridgeEnabled() {
-    const catalog = readJson(modulePath(ROOT_DIR, "catalog.json"));
-    const lock = readJson(modulePath(ROOT_DIR, "module-lock.json"));
-    if (!catalog || !lock)
-        return true; // 模块目录缺失则保守视为可用
-    const mod = catalog.modules?.find((m) => m.id === "qq-bridge" || m.configKey === "qq_bridge");
-    return mod ? lock.modules?.[mod.id ?? ""]?.enabled === true : false;
+function isQqBridgeEnabled() {
+  const catalog = readJson(modulePath(ROOT_DIR, "catalog.json"));
+  const lock = readJson(modulePath(ROOT_DIR, "module-lock.json"));
+  if (!catalog || !lock) return true;
+  const mod = catalog.modules?.find((m) => m.id === "qq-bridge" || m.configKey === "qq_bridge");
+  return mod ? lock.modules?.[mod.id ?? ""]?.enabled === true : false;
 }
-function sendToLLBot(payload, timeoutMs = 5_000) {
-    const cfg = getConfig();
-    const url = new URL(cfg.llbot_http || "http://127.0.0.1:3000");
-    const data = JSON.stringify(payload);
-    return new Promise((resolve, reject) => {
-        const req = http.request({
-            hostname: url.hostname,
-            port: url.port || 3000,
-            path: "/send_group_msg",
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                "Content-Length": Buffer.byteLength(data),
-            },
-            timeout: timeoutMs,
-        }, (res) => {
-            let body = "";
-            res.on("data", (c) => (body += c));
-            res.on("end", () => {
-                if (res.statusCode === 200)
-                    resolve();
-                else
-                    reject(new Error(`LLBot HTTP ${res.statusCode}: ${body.slice(0, 200)}`));
-            });
-        });
-        req.on("timeout", () => {
-            req.destroy(new Error(`LLBot 超时 ${timeoutMs}ms`));
+function sendToLLBot(payload, timeoutMs = 5e3) {
+  const cfg = getConfig();
+  const url = new URL(cfg.llbot_http || "http://127.0.0.1:3000");
+  const data = JSON.stringify(payload);
+  return new Promise((resolve, reject) => {
+    const req = http.request(
+      {
+        hostname: url.hostname,
+        port: url.port || 3e3,
+        path: "/send_group_msg",
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(data)
+        },
+        timeout: timeoutMs
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (c) => body += c);
+        res.on("end", () => {
+          if (res.statusCode === 200) resolve();
+          else reject(new Error(`LLBot HTTP ${res.statusCode}: ${body.slice(0, 200)}`));
         });
-        req.on("error", reject);
-        req.write(data);
-        req.end();
+      }
+    );
+    req.on("timeout", () => {
+      req.destroy(new Error(`LLBot \u8D85\u65F6 ${timeoutMs}ms`));
     });
+    req.on("error", reject);
+    req.write(data);
+    req.end();
+  });
 }
 async function safeSend(label, fn) {
-    try {
-        await fn();
-    }
-    catch (e) {
-        log.warn(`[QQ] ${label} 失败: ${e.message}`);
-    }
+  try {
+    await fn();
+  } catch (e) {
+    log.warn(`[QQ] ${label} \u5931\u8D25: ${e.message}`);
+  }
 }
-export async function sendText(text) {
-    const cfg = getConfig();
-    if (!isQqBridgeEnabled() || !cfg.qq_group_id) {
-        log.warn("[QQ] qq-bridge 未启用或 qq_group_id 缺失");
-        return;
-    }
-    await safeSend("sendText", () => sendToLLBot({
-        group_id: parseInt(cfg.qq_group_id ?? "0", 10),
-        message: [{ type: "text", data: { text } }],
-    }));
+async function sendText(text) {
+  const cfg = getConfig();
+  if (!isQqBridgeEnabled() || !cfg.qq_group_id) {
+    log.warn("[QQ] qq-bridge \u672A\u542F\u7528\u6216 qq_group_id \u7F3A\u5931");
+    return;
+  }
+  await safeSend(
+    "sendText",
+    () => sendToLLBot({
+      group_id: parseInt(cfg.qq_group_id ?? "0", 10),
+      message: [{ type: "text", data: { text } }]
+    })
+  );
 }
-export async function sendMixed(segments) {
-    const cfg = getConfig();
-    if (!isQqBridgeEnabled() || !cfg.qq_group_id) {
-        log.warn("[QQ] qq-bridge 未启用或 qq_group_id 缺失");
-        return;
-    }
-    await safeSend("sendMixed", () => sendToLLBot({
-        group_id: parseInt(cfg.qq_group_id ?? "0", 10),
-        message: segments,
-    }));
+async function sendMixed(segments) {
+  const cfg = getConfig();
+  if (!isQqBridgeEnabled() || !cfg.qq_group_id) {
+    log.warn("[QQ] qq-bridge \u672A\u542F\u7528\u6216 qq_group_id \u7F3A\u5931");
+    return;
+  }
+  await safeSend(
+    "sendMixed",
+    () => sendToLLBot({
+      group_id: parseInt(cfg.qq_group_id ?? "0", 10),
+      message: segments
+    })
+  );
 }
-export async function sendWithImage(text, base64Img) {
-    const segments = [];
-    if (text)
-        segments.push({ type: "text", data: { text } });
-    if (base64Img)
-        segments.push({ type: "image", data: { file: `base64://${base64Img}` } });
-    if (segments.length === 0)
-        return;
-    await sendMixed(segments);
+async function sendWithImage(text, base64Img) {
+  const segments = [];
+  if (text) segments.push({ type: "text", data: { text } });
+  if (base64Img) segments.push({ type: "image", data: { file: `base64://${base64Img}` } });
+  if (segments.length === 0) return;
+  await sendMixed(segments);
 }
-//# sourceMappingURL=qqutil.js.map
+export {
+  isQqBridgeEnabled,
+  sendMixed,
+  sendText,
+  sendWithImage
+};
+//# sourceMappingURL=qqutil.js.map

package/dist/qqutil.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"qqutil.js","sourceRoot":"","sources":["../src/qqutil.ts"],"names":[],"mappings":"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"}
+{
+  "version": 3,
+  "sources": ["../src/qqutil.ts"],
+  "sourcesContent": ["/**\n * qqutil.ts \u2014 QQ \u901A\u77E5\u5DE5\u5177 (\u57FA\u4E8E LLBot HTTP OneBot 11)\n *\n * \u6539\u8FDB:\n *  - sendTimeout \u63D0\u4F9B\u603B\u8D85\u65F6\uFF0C\u907F\u514D\u901A\u77E5\u53D1\u9001\u6302\u6B7B\u4E3B\u6D41\u7A0B\n *  - \u9759\u9ED8\u6A21\u5F0F (\u5931\u8D25\u4E0D\u629B\u51FA)\uFF0C\u4FDD\u8BC1\u4E3B\u6D41\u7A0B\u4E0D\u88AB\u901A\u77E5\u5E72\u6270\n */\n\nimport {\n  configPath,\n  modulePath,\n  readJson,\n  type Catalog,\n  type ModuleLock,\n  type QQBridgeConfig,\n} from \"@sfmc-bds/sdk/node/config\";\nimport http from \"node:http\";\nimport { log } from \"./log.js\";\nimport { ROOT_DIR } from \"./paths.js\";\n\ntype QqConfig = Pick<QQBridgeConfig, \"llbot_http\" | \"qq_group_id\">;\n\nlet cachedCfg: QqConfig | null = null;\nfunction getConfig(): QqConfig {\n  if (cachedCfg) return cachedCfg;\n  cachedCfg = (readJson<QQBridgeConfig>(configPath(ROOT_DIR, \"qq_config.json\")) ?? {}) as QqConfig;\n  return cachedCfg;\n}\n\n/** \u68C0\u67E5 qq-bridge \u6A21\u5757\u662F\u5426\u542F\u7528 */\nexport function isQqBridgeEnabled(): boolean {\n  const catalog = readJson<Catalog>(modulePath(ROOT_DIR, \"catalog.json\"));\n  const lock = readJson<ModuleLock>(modulePath(ROOT_DIR, \"module-lock.json\"));\n  if (!catalog || !lock) return true; // \u6A21\u5757\u76EE\u5F55\u7F3A\u5931\u5219\u4FDD\u5B88\u89C6\u4E3A\u53EF\u7528\n  const mod = catalog.modules?.find((m) => m.id === \"qq-bridge\" || m.configKey === \"qq_bridge\") as\n    { id?: string } | undefined;\n  return mod ? lock.modules?.[mod.id ?? \"\"]?.enabled === true : false;\n}\n\nfunction sendToLLBot(payload: unknown, timeoutMs = 5_000): Promise<void> {\n  const cfg = getConfig();\n  const url = new URL(cfg.llbot_http || \"http://127.0.0.1:3000\");\n  const data = JSON.stringify(payload);\n  return new Promise((resolve, reject) => {\n    const req = http.request(\n      {\n        hostname: url.hostname,\n        port: url.port || 3000,\n        path: \"/send_group_msg\",\n        method: \"POST\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n          \"Content-Length\": Buffer.byteLength(data),\n        },\n        timeout: timeoutMs,\n      },\n      (res) => {\n        let body = \"\";\n        res.on(\"data\", (c) => (body += c));\n        res.on(\"end\", () => {\n          if (res.statusCode === 200) resolve();\n          else reject(new Error(`LLBot HTTP ${res.statusCode}: ${body.slice(0, 200)}`));\n        });\n      }\n    );\n    req.on(\"timeout\", () => {\n      req.destroy(new Error(`LLBot \u8D85\u65F6 ${timeoutMs}ms`));\n    });\n    req.on(\"error\", reject);\n    req.write(data);\n    req.end();\n  });\n}\n\nasync function safeSend(label: string, fn: () => Promise<void>): Promise<void> {\n  try {\n    await fn();\n  } catch (e) {\n    log.warn(`[QQ] ${label} \u5931\u8D25: ${(e as Error).message}`);\n  }\n}\n\nexport async function sendText(text: string): Promise<void> {\n  const cfg = getConfig();\n  if (!isQqBridgeEnabled() || !cfg.qq_group_id) {\n    log.warn(\"[QQ] qq-bridge \u672A\u542F\u7528\u6216 qq_group_id \u7F3A\u5931\");\n    return;\n  }\n  await safeSend(\"sendText\", () =>\n    sendToLLBot({\n      group_id: parseInt(cfg.qq_group_id ?? \"0\", 10),\n      message: [{ type: \"text\", data: { text } }],\n    })\n  );\n}\n\nexport async function sendMixed(segments: unknown[]): Promise<void> {\n  const cfg = getConfig();\n  if (!isQqBridgeEnabled() || !cfg.qq_group_id) {\n    log.warn(\"[QQ] qq-bridge \u672A\u542F\u7528\u6216 qq_group_id \u7F3A\u5931\");\n    return;\n  }\n  await safeSend(\"sendMixed\", () =>\n    sendToLLBot({\n      group_id: parseInt(cfg.qq_group_id ?? \"0\", 10),\n      message: segments,\n    })\n  );\n}\n\nexport async function sendWithImage(text: string, base64Img: string): Promise<void> {\n  const segments: unknown[] = [];\n  if (text) segments.push({ type: \"text\", data: { text } });\n  if (base64Img) segments.push({ type: \"image\", data: { file: `base64://${base64Img}` } });\n  if (segments.length === 0) return;\n  await sendMixed(segments);\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/recovery.js

@@ -1,45 +1,34 @@
-/**
- * recovery.ts — 手动触发回滚
- *
- * 用法: node recovery.js
- * 读取 ROLLBACK_MARKER，然后从备份恢复 preserve 项。
- */
-import { readRollbackMarker, rollbackFromBackup } from "./rollback.js";
+import { isMainModule } from "./is-main.js";
 import { log, closeLog } from "./log.js";
 import { clearPid } from "./paths.js";
+import { readRollbackMarker, rollbackFromBackup } from "./rollback.js";
 async function run() {
-    const m = readRollbackMarker();
-    if (!m) {
-        log.warn("未发现回滚标记，无需恢复。");
-        return;
-    }
-    log.info(`发现回滚标记: 时间 ${new Date(m.timestamp).toISOString()}`);
-    log.info(`目标: 从 ${m.backup_dir} 恢复 ${m.preserve.length} 项到 ${m.bds_path}`);
-    const result = rollbackFromBackup(m);
-    if (!result.ok) {
-        log.error(`回滚失败: ${result.reason}`);
-        process.exit(1);
-    }
-    // 清理 pid 文件
-    clearPid();
-    log.info("回滚完成，请手动检查并启动 BDS。");
+  const m = readRollbackMarker();
+  if (!m) {
+    log.warn("\u672A\u53D1\u73B0\u56DE\u6EDA\u6807\u8BB0\uFF0C\u65E0\u9700\u6062\u590D\u3002");
+    return;
+  }
+  log.info(`\u53D1\u73B0\u56DE\u6EDA\u6807\u8BB0: \u65F6\u95F4 ${new Date(m.timestamp).toISOString()}`);
+  log.info(`\u76EE\u6807: \u4ECE ${m.backup_dir} \u6062\u590D ${m.preserve.length} \u9879\u5230 ${m.bds_path}`);
+  const result = rollbackFromBackup(m);
+  if (!result.ok) {
+    log.error(`\u56DE\u6EDA\u5931\u8D25: ${result.reason}`);
+    process.exit(1);
+  }
+  clearPid();
+  log.info("\u56DE\u6EDA\u5B8C\u6210\uFF0C\u8BF7\u624B\u52A8\u68C0\u67E5\u5E76\u542F\u52A8 BDS\u3002");
 }
 function isMain() {
-    if (require.main === module)
-        return true;
-    const entry = process.argv[1] ?? "";
-    return entry.endsWith("recovery.js") || entry.endsWith("recovery.ts");
+  return isMainModule(import.meta.url);
 }
 if (isMain()) {
-    run()
-        .then(() => {
-        closeLog();
-        process.exit(0);
-    })
-        .catch((e) => {
-        log.error(`未捕获错误: ${e.message}`);
-        closeLog();
-        process.exit(1);
-    });
+  run().then(() => {
+    closeLog();
+    process.exit(0);
+  }).catch((e) => {
+    log.error(`\u672A\u6355\u83B7\u9519\u8BEF: ${e.message}`);
+    closeLog();
+    process.exit(1);
+  });
 }
-//# sourceMappingURL=recovery.js.map
+//# sourceMappingURL=recovery.js.map

package/dist/recovery.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,KAAK,UAAU,GAAG;IAChB,MAAM,CAAC,GAAG,kBAAkB,EAAE,CAAC;IAC/B,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1B,OAAO;IACT,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC9D,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,YAAY;IACZ,QAAQ,EAAE,CAAC;IACX,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,MAAM;IACb,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,OAAO,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;AACxE,CAAC;AAED,IAAI,MAAM,EAAE,EAAE,CAAC;IACb,GAAG,EAAE;SACF,IAAI,CAAC,GAAG,EAAE;QACT,QAAQ,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,GAAG,CAAC,KAAK,CAAC,UAAW,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5C,QAAQ,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{
+  "version": 3,
+  "sources": ["../src/recovery.ts"],
+  "sourcesContent": ["/**\n * recovery.ts \u2014 \u624B\u52A8\u89E6\u53D1\u56DE\u6EDA\n *\n * \u7528\u6CD5: node recovery.js\n * \u8BFB\u53D6 ROLLBACK_MARKER\uFF0C\u7136\u540E\u4ECE\u5907\u4EFD\u6062\u590D preserve \u9879\u3002\n */\n\nimport { isMainModule } from \"./is-main.js\";\nimport { log, closeLog } from \"./log.js\";\nimport { clearPid } from \"./paths.js\";\nimport { readRollbackMarker, rollbackFromBackup } from \"./rollback.js\";\n\nasync function run(): Promise<void> {\n  const m = readRollbackMarker();\n  if (!m) {\n    log.warn(\"\u672A\u53D1\u73B0\u56DE\u6EDA\u6807\u8BB0\uFF0C\u65E0\u9700\u6062\u590D\u3002\");\n    return;\n  }\n  log.info(`\u53D1\u73B0\u56DE\u6EDA\u6807\u8BB0: \u65F6\u95F4 ${new Date(m.timestamp).toISOString()}`);\n  log.info(`\u76EE\u6807: \u4ECE ${m.backup_dir} \u6062\u590D ${m.preserve.length} \u9879\u5230 ${m.bds_path}`);\n\n  const result = rollbackFromBackup(m);\n  if (!result.ok) {\n    log.error(`\u56DE\u6EDA\u5931\u8D25: ${result.reason}`);\n    process.exit(1);\n  }\n  // \u6E05\u7406 pid \u6587\u4EF6\n  clearPid();\n  log.info(\"\u56DE\u6EDA\u5B8C\u6210\uFF0C\u8BF7\u624B\u52A8\u68C0\u67E5\u5E76\u542F\u52A8 BDS\u3002\");\n}\n\nfunction isMain(): boolean {\n  return isMainModule(import.meta.url);\n}\n\nif (isMain()) {\n  run()\n    .then(() => {\n      closeLog();\n      process.exit(0);\n    })\n    .catch((e) => {\n      log.error(`\u672A\u6355\u83B7\u9519\u8BEF: ${(e as Error).message}`);\n      closeLog();\n      process.exit(1);\n    });\n}\n"],
+  "mappings": "AAOA,SAAS,oBAAoB;AAC7B,SAAS,KAAK,gBAAgB;AAC9B,SAAS,gBAAgB;AACzB,SAAS,oBAAoB,0BAA0B;AAEvD,eAAe,MAAqB;AAClC,QAAM,IAAI,mBAAmB;AAC7B,MAAI,CAAC,GAAG;AACN,QAAI,KAAK,gFAAe;AACxB;AAAA,EACF;AACA,MAAI,KAAK,sDAAc,IAAI,KAAK,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE;AAC5D,MAAI,KAAK,wBAAS,EAAE,UAAU,iBAAO,EAAE,SAAS,MAAM,iBAAO,EAAE,QAAQ,EAAE;AAEzE,QAAM,SAAS,mBAAmB,CAAC;AACnC,MAAI,CAAC,OAAO,IAAI;AACd,QAAI,MAAM,6BAAS,OAAO,MAAM,EAAE;AAClC,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,WAAS;AACT,MAAI,KAAK,0FAAoB;AAC/B;AAEA,SAAS,SAAkB;AACzB,SAAO,aAAa,YAAY,GAAG;AACrC;AAEA,IAAI,OAAO,GAAG;AACZ,MAAI,EACD,KAAK,MAAM;AACV,aAAS;AACT,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC,EACA,MAAM,CAAC,MAAM;AACZ,QAAI,MAAM,mCAAW,EAAY,OAAO,EAAE;AAC1C,aAAS;AACT,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC;AACL;",
+  "names": []
+}

package/dist/rollback.d.ts

@@ -5,7 +5,7 @@
  * 主流程任意阶段失败时，尝试反向恢复 preserves 到 BDS_PATH，
  * 然后从备份重新放回 preserve 内容，恢复旧配置。
  *
- * 持久化: ROLLBACK_MARKER (BDSTools/.last_update_rollback.json) 用于跨进程记录。
+ * 持久化: <SFMC_ROOT>/.sfmc/last_update_rollback.json 用于跨进程记录。
  */
 import { getDirSize } from "./fsx.js";
 export interface RollbackMarker {

package/dist/rollback.js

@@ -1,87 +1,68 @@
-/**
- * rollback.ts — 回滚支持
- *
- * 在更新开始前记录: 当前 BDS 目录 + 备份目录。
- * 主流程任意阶段失败时，尝试反向恢复 preserves 到 BDS_PATH，
- * 然后从备份重新放回 preserve 内容，恢复旧配置。
- *
- * 持久化: ROLLBACK_MARKER (BDSTools/.last_update_rollback.json) 用于跨进程记录。
- */
 import { readJson, writeJson } from "@sfmc-bds/sdk/node/config";
 import fs from "node:fs";
 import path from "node:path";
 import { ROLLBACK_MARKER } from "./paths.js";
 import { copyDirSync, getDirSize, emptyDirSync } from "./fsx.js";
 import { log } from "./log.js";
-/** 在备份完成后调用: 记录快照指示符。 */
-export function writeRollbackMarker(marker) {
-    try {
-        writeJson(ROLLBACK_MARKER, marker);
-        log.info(`[回滚] 已记录回滚标记 -> ${ROLLBACK_MARKER}`);
-    }
-    catch (e) {
-        log.warn(`[回滚] 无法写入标记: ${e.message}`);
-    }
+function writeRollbackMarker(marker) {
+  try {
+    writeJson(ROLLBACK_MARKER, marker);
+    log.info(`[\u56DE\u6EDA] \u5DF2\u8BB0\u5F55\u56DE\u6EDA\u6807\u8BB0 -> ${ROLLBACK_MARKER}`);
+  } catch (e) {
+    log.warn(`[\u56DE\u6EDA] \u65E0\u6CD5\u5199\u5165\u6807\u8BB0: ${e.message}`);
+  }
 }
-export function clearRollbackMarker() {
-    try {
-        if (fs.existsSync(ROLLBACK_MARKER))
-            fs.unlinkSync(ROLLBACK_MARKER);
-    }
-    catch {
-        /* ignore */
-    }
+function clearRollbackMarker() {
+  try {
+    if (fs.existsSync(ROLLBACK_MARKER)) fs.unlinkSync(ROLLBACK_MARKER);
+  } catch {
+  }
 }
-export function readRollbackMarker() {
-    return readJson(ROLLBACK_MARKER) ?? null;
+function readRollbackMarker() {
+  return readJson(ROLLBACK_MARKER) ?? null;
 }
-/**
- * 紧急回滚: 把 preserve 项从 backup_dir 拷回 bds_path。
- * 用法: 在 catch 分支调用，如果主流程失败导致 BDS 目录破坏。
- */
-export function rollbackFromBackup(marker) {
-    const { bds_path, backup_dir, preserve } = marker;
-    if (!fs.existsSync(backup_dir)) {
-        return { ok: false, reason: `备份目录不存在: ${backup_dir}` };
+function rollbackFromBackup(marker) {
+  const { bds_path, backup_dir, preserve } = marker;
+  if (!fs.existsSync(backup_dir)) {
+    return { ok: false, reason: `\u5907\u4EFD\u76EE\u5F55\u4E0D\u5B58\u5728: ${backup_dir}` };
+  }
+  log.warn(`[\u56DE\u6EDA] \u5F00\u59CB\u6062\u590D ${preserve.length} \u9879\u5230 ${bds_path}`);
+  for (const item of preserve) {
+    const src = path.join(backup_dir, item);
+    const dest = path.join(bds_path, item);
+    if (!fs.existsSync(src)) {
+      log.warn(`[\u56DE\u6EDA] \u8DF3\u8FC7 (\u5907\u4EFD\u4E2D\u4E0D\u5B58\u5728): ${item}`);
+      continue;
     }
-    log.warn(`[回滚] 开始恢复 ${preserve.length} 项到 ${bds_path}`);
-    for (const item of preserve) {
-        const src = path.join(backup_dir, item);
-        const dest = path.join(bds_path, item);
-        if (!fs.existsSync(src)) {
-            log.warn(`[回滚] 跳过 (备份中不存在): ${item}`);
-            continue;
-        }
-        try {
-            // 先确保目标目录存在 (BDS 目录可能已被解压覆盖为空)
-            const destDir = path.dirname(dest);
-            if (!fs.existsSync(destDir))
-                fs.mkdirSync(destDir, { recursive: true });
-            if (fs.statSync(src).isDirectory()) {
-                // 先删除目标，再复制目录
-                if (fs.existsSync(dest))
-                    emptyDirSync(dest);
-                copyDirSync(src, dest);
-            }
-            else {
-                fs.copyFileSync(src, dest);
-            }
-            log.info(`[回滚] 已恢复: ${item}`);
-        }
-        catch (e) {
-            log.warn(`[回滚] 恢复失败 ${item}: ${e.message}`);
-        }
+    try {
+      const destDir = path.dirname(dest);
+      if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
+      if (fs.statSync(src).isDirectory()) {
+        if (fs.existsSync(dest)) emptyDirSync(dest);
+        copyDirSync(src, dest);
+      } else {
+        fs.copyFileSync(src, dest);
+      }
+      log.info(`[\u56DE\u6EDA] \u5DF2\u6062\u590D: ${item}`);
+    } catch (e) {
+      log.warn(`[\u56DE\u6EDA] \u6062\u590D\u5931\u8D25 ${item}: ${e.message}`);
     }
-    return { ok: true };
+  }
+  return { ok: true };
 }
-/** 检查 BDS_PATH 中关键文件是否都还在 (更新后完整性 sanity check) */
-export function verifyBdsInstall(bds_path, expected) {
-    const missing = [];
-    for (const f of expected) {
-        if (!fs.existsSync(path.join(bds_path, f)))
-            missing.push(f);
-    }
-    return { ok: missing.length === 0, missing };
+function verifyBdsInstall(bds_path, expected) {
+  const missing = [];
+  for (const f of expected) {
+    if (!fs.existsSync(path.join(bds_path, f))) missing.push(f);
+  }
+  return { ok: missing.length === 0, missing };
 }
-export { getDirSize };
-//# sourceMappingURL=rollback.js.map
+export {
+  clearRollbackMarker,
+  getDirSize,
+  readRollbackMarker,
+  rollbackFromBackup,
+  verifyBdsInstall,
+  writeRollbackMarker
+};
+//# sourceMappingURL=rollback.js.map