tt-help-cli-ycl 1.4.160 → 1.4.161

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.160",
+  "version": "1.4.161",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {
@@ -48,4 +48,4 @@
   "devDependencies": {
     "better-sqlite3": "^12.10.0"
   }
-}
+}

package/src/watchdog/upgrader.js

@@ -705,10 +705,22 @@ export async function runUpgradeMode(argv) {
     `[upgrade-proc] 开始下载新版: npm install -g ${PACKAGE}@latest ...`,
   );
   const beforeVersion = getVersion(); // 下载前版本，用于验证 npm install 真正生效
-  const result = await performUpgrade();
+  let result = await performUpgrade();
+  if (!result.success && /EBUSY|resource busy/i.test(result.output)) {
+    // Windows 实测：运行中的 node/watchdog 或其 cwd 在包目录内时，npm 覆盖文件报 EBUSY。
+    // 此刻升级已势在必行（版本差已确认），终止旧 watchdog 释放文件锁后重试安装。
+    console.error(
+      `[upgrade-proc] 包目录被运行进程锁定（EBUSY），终止旧 watchdog 释放锁后重试安装...`,
+    );
+    const lockSnapshot = await snapshotAllProcesses();
+    const lockDescPids = listDescendantPids(lockSnapshot, oldPid, process.pid);
+    await terminateProcess(oldPid, 5000);
+    await killPidList(lockDescPids, "[upgrade-proc] 已停止旧 watchdog 释放包目录锁");
+    result = await performUpgrade();
+  }
   if (!result.success) {
     const err = result.output.substring(0, 300);
-    console.error(`[upgrade-proc] 下载失败，保持当前版本运行: ${err}`);
+    console.error(`[upgrade-proc] 下载失败，保持当前状态: ${err}`);
     process.exit(1);
   }