dsh-wechat-remote 1.7.8 → 1.7.10

package/lib/update-download.js

@@ -5,6 +5,12 @@ import { createHash } from "node:crypto";
 import { gunzipSync } from "node:zlib";
 
 // src/update-policy.ts
+var versionPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z.-]+)?$/;
+function validVersion(value) {
+  if (typeof value !== "string" || value.length > 80) return false;
+  const match = versionPattern.exec(value);
+  return Boolean(match && !(match[4] || "").split(".").some((p) => /^0\d+$/.test(p)) && (!value.includes("+") || /^[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*$/.test(value.split("+")[1])));
+}
 function trustedReleaseAsset(asset, version) {
   if (!asset || !/^[a-f0-9]{64}$/.test(asset.sha256) || !Number.isSafeInteger(asset.bytes) || asset.bytes < 1 || asset.bytes > 32 * 1024 * 1024) return false;
   try {
@@ -14,55 +20,119 @@ function trustedReleaseAsset(asset, version) {
     return false;
   }
 }
+function trustedNpmInstaller(source) {
+  if (!source || !validVersion(source.version) || !/^[a-f0-9]{64}$/.test(source.sha256) || !Number.isSafeInteger(source.bytes) || source.bytes < 1 || source.bytes > 32 * 1024 * 1024) return false;
+  return source.url === `https://registry.npmjs.org/dsh-wechat-remote/-/dsh-wechat-remote-${source.version}.tgz`;
+}
 
 // src/update-download.ts
-async function boundedFetch(url, maxBytes, fetcher = fetch) {
+var DownloadUnavailableError = class extends Error {
+  constructor(message = "\u66F4\u65B0\u5305\u6682\u65F6\u65E0\u6CD5\u4E0B\u8F7D\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u8BD5\uFF1B\u5F53\u524D\u63D2\u4EF6\u5C1A\u672A\u66FF\u6362", options) {
+    super(message, options);
+    this.name = "DownloadUnavailableError";
+  }
+};
+var githubHosts = ["github.com", "release-assets.githubusercontent.com", "objects.githubusercontent.com"];
+async function fetchBytes(url, maxBytes, fetcher, hosts, deadline, options) {
   let next = url;
   for (let i = 0; i < 5; i++) {
+    options.signal?.throwIfAborted();
     const u = new URL(next);
-    if (u.protocol !== "https:" || u.username || u.password || u.port || !["github.com", "release-assets.githubusercontent.com", "objects.githubusercontent.com", "relay.xyxfood.xyz"].includes(u.hostname)) throw new Error("\u66F4\u65B0\u4E0B\u8F7D\u6765\u6E90\u4E0D\u53D7\u4FE1\u4EFB");
-    const res = await fetcher(next, { signal: AbortSignal.timeout(maxBytes <= 256 * 1024 ? 1e4 : 6e4), redirect: "manual" });
-    if ([301, 302, 303, 307, 308].includes(res.status)) {
-      await res.body?.cancel();
-      const location = res.headers.get("location");
-      if (!location) throw new Error("\u66F4\u65B0\u6765\u6E90\u91CD\u5B9A\u5411\u65E0\u6548");
-      next = new URL(location, next).href;
-      continue;
-    }
-    if (!res.ok || !res.body) {
-      await res.body?.cancel();
-      throw new Error("\u66F4\u65B0\u670D\u52A1\u6682\u4E0D\u53EF\u7528");
-    }
-    if (Number(res.headers.get("content-length")) > maxBytes) {
-      await res.body.cancel();
-      throw new Error("\u66F4\u65B0\u54CD\u5E94\u8D85\u8FC7\u5927\u5C0F\u9650\u5236");
-    }
-    const reader = res.body.getReader(), chunks = [];
-    let size = 0;
+    if (u.protocol !== "https:" || u.username || u.password || u.port || !hosts.includes(u.hostname)) throw new Error("\u66F4\u65B0\u4E0B\u8F7D\u6765\u6E90\u4E0D\u53D7\u4FE1\u4EFB");
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) throw new DownloadUnavailableError();
+    const controller = new AbortController();
+    const cancel = () => controller.abort(options.signal.reason);
+    options.signal?.addEventListener("abort", cancel, { once: true });
+    const totalTimer = setTimeout(() => controller.abort(new Error("\u66F4\u65B0\u4E0B\u8F7D\u8D85\u65F6")), remaining);
+    let activityTimer = setTimeout(() => controller.abort(new Error("\u66F4\u65B0\u6765\u6E90\u54CD\u5E94\u8D85\u65F6")), Math.min(remaining, options.responseTimeoutMs ?? 1e4));
+    let reader;
     try {
+      let res;
+      try {
+        res = await fetcher(next, { signal: controller.signal, redirect: "manual" });
+      } catch (cause) {
+        options.signal?.throwIfAborted();
+        throw new DownloadUnavailableError(void 0, { cause });
+      } finally {
+        clearTimeout(activityTimer);
+      }
+      if ([301, 302, 303, 307, 308].includes(res.status)) {
+        await res.body?.cancel();
+        const location = res.headers.get("location");
+        if (!location) throw new Error("\u66F4\u65B0\u6765\u6E90\u91CD\u5B9A\u5411\u65E0\u6548");
+        next = new URL(location, next).href;
+        continue;
+      }
+      if (!res.ok || !res.body) {
+        await res.body?.cancel();
+        throw new DownloadUnavailableError();
+      }
+      if (Number(res.headers.get("content-length")) > maxBytes) {
+        await res.body.cancel();
+        throw new Error("\u66F4\u65B0\u54CD\u5E94\u8D85\u8FC7\u5927\u5C0F\u9650\u5236");
+      }
+      reader = res.body.getReader();
+      activityTimer = setTimeout(() => controller.abort(new Error("\u66F4\u65B0\u4E0B\u8F7D\u957F\u65F6\u95F4\u6CA1\u6709\u8FDB\u5C55")), options.idleTimeoutMs ?? 15e3);
+      const chunks = [];
+      let size = 0;
       for (; ; ) {
-        const { done, value } = await reader.read();
+        let part;
+        try {
+          part = await reader.read();
+        } catch (cause) {
+          options.signal?.throwIfAborted();
+          throw new DownloadUnavailableError(void 0, { cause });
+        }
+        const { done, value } = part;
         if (done) break;
         size += value.length;
         if (size > maxBytes) throw new Error("\u66F4\u65B0\u54CD\u5E94\u8D85\u8FC7\u5927\u5C0F\u9650\u5236");
         chunks.push(value);
+        if (value.length) activityTimer.refresh();
       }
+      options.signal?.throwIfAborted();
+      return Buffer.concat(chunks);
     } catch (error) {
-      await reader.cancel();
+      try {
+        await reader?.cancel();
+      } catch {
+      }
       throw error;
+    } finally {
+      clearTimeout(totalTimer);
+      clearTimeout(activityTimer);
+      options.signal?.removeEventListener("abort", cancel);
+      reader?.releaseLock();
     }
-    return Buffer.concat(chunks);
   }
   throw new Error("\u66F4\u65B0\u6765\u6E90\u91CD\u5B9A\u5411\u8FC7\u591A");
 }
-function auditArchive(archive, release) {
-  if (!release.asset || archive.length !== release.asset.bytes || createHash("sha256").update(archive).digest("hex") !== release.asset.sha256) throw new Error("\u66F4\u65B0\u5305\u6821\u9A8C\u5931\u8D25\uFF0C\u672A\u4FEE\u6539\u5F53\u524D\u63D2\u4EF6");
+async function boundedFetch(url, maxBytes, fetcher = fetch) {
+  return fetchBytes(
+    url,
+    maxBytes,
+    fetcher,
+    [...githubHosts, "relay.xyxfood.xyz"],
+    Date.now() + (maxBytes <= 256 * 1024 ? 1e4 : 6e4),
+    {}
+  );
+}
+function verifyBytes(archive, expected) {
+  if (!expected || archive.length !== expected.bytes || createHash("sha256").update(archive).digest("hex") !== expected.sha256) throw new Error("\u66F4\u65B0\u5305\u6821\u9A8C\u5931\u8D25\uFF0C\u672A\u4FEE\u6539\u5F53\u524D\u63D2\u4EF6");
+}
+function visitArchive(archive, visit) {
   const tar = gunzipSync(archive, { maxOutputLength: 64 * 1024 * 1024 });
-  const seen = /* @__PURE__ */ new Set();
-  let manifest, entries = 0;
+  if (tar.length % 512 !== 0) throw new Error("\u66F4\u65B0\u5305\u8BB0\u5F55\u4E0D\u5B8C\u6574");
+  const seen = /* @__PURE__ */ new Set(), files = /* @__PURE__ */ new Set();
+  let entries = 0, ended = false;
   for (let offset = 0; offset + 512 <= tar.length; ) {
     const header = tar.subarray(offset, offset + 512);
-    if (header.every((b) => b === 0)) break;
+    if (header.every((b) => b === 0)) {
+      if (tar.subarray(offset).some((b) => b !== 0)) throw new Error("\u66F4\u65B0\u5305\u7ED3\u675F\u6807\u8BB0\u65E0\u6548");
+      ended = true;
+      break;
+    }
     if (++entries > 5e3) throw new Error("\u66F4\u65B0\u5305\u6587\u4EF6\u6570\u91CF\u5F02\u5E38");
     const field = (start, size2) => header.subarray(start, start + size2).toString("utf8").replace(/\0.*$/s, "");
     const name = (field(345, 155) ? field(345, 155) + "/" : "") + field(0, 100);
@@ -73,26 +143,82 @@ function auditArchive(archive, release) {
     const sumText = field(148, 8).trim();
     const sum = [...header].reduce((n, b, i) => n + (i >= 148 && i < 156 ? 32 : b), 0);
     if (!/^[0-7]+$/.test(sumText) || parseInt(sumText, 8) !== sum) throw new Error("\u66F4\u65B0\u5305\u5934\u6821\u9A8C\u5931\u8D25");
-    if (!name.startsWith("package/") || /[\\:\x00-\x1f]/.test(name) || name.split("/").some((part) => part === ".." || part === ".") || name.split("/").some((part) => /[. ]$/.test(part) || /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(part)) || !["0", "", "5"].includes(type) || seen.has(name.toLowerCase()) || !Number.isSafeInteger(size) || size < 0 || offset + 512 + size > tar.length) throw new Error("\u66F4\u65B0\u5305\u5305\u542B\u4E0D\u5B89\u5168\u7684\u8DEF\u5F84\u6216\u6587\u4EF6\u7C7B\u578B");
+    if (!name.startsWith("package/") || /[\\:\x00-\x1f]/.test(name) || name.split("/").some((part) => part === ".." || part === ".") || name.split("/").some((part) => /[. ]$/.test(part) || /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(part)) || !["0", "", "5"].includes(type) || seen.has(name.toLowerCase()) || !Number.isSafeInteger(size) || size < 0 || type === "5" && size !== 0 || offset + 512 + Math.ceil(size / 512) * 512 > tar.length) throw new Error("\u66F4\u65B0\u5305\u5305\u542B\u4E0D\u5B89\u5168\u7684\u8DEF\u5F84\u6216\u6587\u4EF6\u7C7B\u578B");
     seen.add(name.toLowerCase());
-    if (name === "package/package.json") {
-      if (size > 65536) throw new Error("\u66F4\u65B0\u5305\u6E05\u5355\u8FC7\u5927");
-      manifest = JSON.parse(tar.subarray(offset + 512, offset + 512 + size).toString("utf8"));
+    if (type !== "5") {
+      files.add(name);
+      visit(name, tar.subarray(offset + 512, offset + 512 + size));
     }
     offset += 512 + Math.ceil(size / 512) * 512;
   }
-  if (!manifest || manifest.name !== "@harness-remote/dsh-wechat-remote" || manifest.version !== release.version || !seen.has("package/lib/index.js") || !seen.has("package/lib/client.js")) throw new Error("\u66F4\u65B0\u5305\u540D\u79F0\u3001\u7248\u672C\u6216\u5165\u53E3\u4E0D\u5339\u914D");
+  if (!ended) throw new Error("\u66F4\u65B0\u5305\u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0");
+  return files;
+}
+function readManifest(data) {
+  if (data.length > 65536) throw new Error("\u66F4\u65B0\u5305\u6E05\u5355\u8FC7\u5927");
+  return JSON.parse(data.toString("utf8"));
+}
+function auditArchive(archive, release) {
+  verifyBytes(archive, release.asset);
+  let manifest;
+  const files = visitArchive(archive, (name, data) => {
+    if (name === "package/package.json") manifest = readManifest(data);
+  });
+  if (!manifest || manifest.name !== "@harness-remote/dsh-wechat-remote" || manifest.version !== release.version || !files.has("package/lib/index.js") || !files.has("package/lib/client.js")) throw new Error("\u66F4\u65B0\u5305\u540D\u79F0\u3001\u7248\u672C\u6216\u5165\u53E3\u4E0D\u5339\u914D");
   const scripts = manifest.scripts;
   if (["preinstall", "install", "postinstall", "prepare"].some((name) => scripts?.[name])) throw new Error("\u66F4\u65B0\u5305\u5305\u542B\u4E0D\u5141\u8BB8\u7684\u5B89\u88C5\u811A\u672C");
 }
-async function downloadRelease(release, fetcher = fetch) {
+function pluginFromInstaller(archive, release) {
+  if (!trustedNpmInstaller(release.npmInstaller)) throw new Error("\u5907\u7528\u5B89\u88C5\u5305\u6765\u6E90\u4E0D\u53D7\u4FE1\u4EFB");
+  verifyBytes(archive, release.npmInstaller);
+  let manifest, plugin;
+  visitArchive(archive, (name, data) => {
+    if (name === "package/package.json") manifest = readManifest(data);
+    if (name === "package/assets/plugin.tgz") {
+      if (data.length !== release.asset?.bytes) throw new Error("\u5185\u7F6E\u63D2\u4EF6\u5927\u5C0F\u4E0D\u5339\u914D");
+      plugin = Buffer.from(data);
+    }
+  });
+  if (!manifest || manifest.name !== "dsh-wechat-remote" || manifest.version !== release.npmInstaller.version || !plugin) throw new Error("\u5907\u7528\u5B89\u88C5\u5305\u540D\u79F0\u3001\u7248\u672C\u6216\u5185\u7F6E\u63D2\u4EF6\u4E0D\u5339\u914D");
+  auditArchive(plugin, release);
+  return plugin;
+}
+async function downloadNpmRelease(release, fetcher = fetch, options = {}) {
+  if (!trustedReleaseAsset(release.asset, release.version) || !trustedNpmInstaller(release.npmInstaller)) throw new Error("\u5907\u7528\u5B89\u88C5\u5305\u6765\u6E90\u4E0D\u53D7\u4FE1\u4EFB");
+  const source = release.npmInstaller;
+  const body = await fetchBytes(source.url, source.bytes, fetcher, ["registry.npmjs.org"], Date.now() + (options.timeoutMs ?? 6e4), options);
+  options.signal?.throwIfAborted();
+  return pluginFromInstaller(body, release);
+}
+async function downloadRelease(release, fetcher = fetch, options = {}) {
   if (!trustedReleaseAsset(release.asset, release.version)) throw new Error("\u6682\u65E0\u53EF\u9A8C\u8BC1\u7684\u6B63\u5F0F\u66F4\u65B0\u5305");
-  const body = await boundedFetch(release.asset.url, release.asset.bytes, fetcher);
+  if (release.npmInstaller !== void 0 && !trustedNpmInstaller(release.npmInstaller)) throw new Error("\u5907\u7528\u5B89\u88C5\u5305\u6765\u6E90\u4E0D\u53D7\u4FE1\u4EFB");
+  const deadline = Date.now() + (options.timeoutMs ?? 12e4);
+  let body;
+  try {
+    body = await fetchBytes(
+      release.asset.url,
+      release.asset.bytes,
+      fetcher,
+      githubHosts,
+      Math.min(deadline, Date.now() + 6e4),
+      options
+    );
+  } catch (error) {
+    options.signal?.throwIfAborted();
+    if (!(error instanceof DownloadUnavailableError) || !release.npmInstaller) throw error;
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) throw error;
+    return downloadNpmRelease(release, fetcher, { ...options, timeoutMs: Math.min(remaining, 6e4) });
+  }
   auditArchive(body, release);
   return body;
 }
 export {
+  DownloadUnavailableError,
   auditArchive,
   boundedFetch,
-  downloadRelease
+  downloadNpmRelease,
+  downloadRelease,
+  pluginFromInstaller
 };

package/lib/update-policy.js

@@ -35,13 +35,20 @@ function trustedReleaseAsset(asset, version) {
     return false;
   }
 }
+function trustedNpmInstaller(source) {
+  if (!source || !validVersion(source.version) || !/^[a-f0-9]{64}$/.test(source.sha256) || !Number.isSafeInteger(source.bytes) || source.bytes < 1 || source.bytes > 32 * 1024 * 1024) return false;
+  return source.url === `https://registry.npmjs.org/dsh-wechat-remote/-/dsh-wechat-remote-${source.version}.tgz`;
+}
 function validateCatalog(value) {
   const c = value;
   const strings = (v, max = 100) => Array.isArray(v) && v.length <= max && v.every((s) => typeof s === "string" && s.length > 0 && s.length <= 100);
   if (!c || c.schemaVersion !== 1 || typeof c.revision !== "string" || !/^[\w.-]{1,80}$/.test(c.revision) || !Number.isSafeInteger(c.issuedAt) || !Number.isSafeInteger(c.expiresAt) || c.expiresAt <= c.issuedAt || c.expiresAt - c.issuedAt > 32 * 864e5 || !Array.isArray(c.releases) || c.releases.length > 100 || !Array.isArray(c.blocked) || c.blocked.length > 100 || !strings(c.retiredDsh)) throw new Error("Invalid update catalog");
   const versions = /* @__PURE__ */ new Set();
   for (const r of c.releases) {
-    if (!r || !validVersion(r.version) || versions.has(r.version) || !["stable", "preview"].includes(r.channel) || r.channel === "stable" && versionPattern.exec(r.version)[4] || !strings(r.dsh) || !r.dsh.length || !r.dsh.every(validVersion) || !strings(r.platforms, 3) || !r.platforms.length || !r.platforms.every((p) => ["windows", "macos", "linux"].includes(p)) || !strings(r.architectures, 32) || !r.architectures.length || !r.architectures.every((a) => /^[a-z0-9_-]{1,32}$/.test(a)) || r.asset && !trustedReleaseAsset(r.asset, r.version)) throw new Error("Invalid release entry");
+    if (!r || !validVersion(r.version) || versions.has(r.version) || !["stable", "preview"].includes(r.channel) || r.channel === "stable" && versionPattern.exec(r.version)[4] || !strings(r.dsh) || !r.dsh.every(validVersion) || !strings(r.platforms, 3) || !r.platforms.every((p) => ["windows", "macos", "linux"].includes(p)) || !strings(r.architectures, 32) || !r.architectures.every((a) => /^[a-z0-9_-]{1,32}$/.test(a)) || r.asset && !trustedReleaseAsset(r.asset, r.version) || r.npmInstaller !== void 0 && (!r.asset || !trustedNpmInstaller(r.npmInstaller))) throw new Error("Invalid release entry");
+    const hasEvidence = r.dsh.length > 0 && r.platforms.length > 0 && r.architectures.length > 0;
+    const pendingPreview = r.channel === "preview" && Boolean(versionPattern.exec(r.version)[4]) && r.dsh.length === 0 && r.platforms.length === 0 && r.architectures.length === 0;
+    if (!hasEvidence && !pendingPreview) throw new Error("Invalid release evidence");
     versions.add(r.version);
     if (r.targets !== void 0) {
       if (!Array.isArray(r.targets) || !r.targets.length || r.targets.length > 12) throw new Error("Invalid release targets");
@@ -141,6 +148,7 @@ export {
   assessUpdate,
   compareVersions,
   releaseMatches,
+  trustedNpmInstaller,
   trustedReleaseAsset,
   validateCatalog
 };

package/lib/update-worker.js

@@ -92,7 +92,8 @@ function backupProfile(profile, backup) {
     filter(source, target) {
       if (!fs.lstatSync(source).isSymbolicLink()) return true;
       const type = process.platform === "win32" ? fs.statSync(source, { throwIfNoEntry: false })?.isDirectory() ? "junction" : "file" : void 0;
-      fs.symlinkSync(fs.readlinkSync(source), target, type);
+      const link = fs.readlinkSync(source);
+      fs.symlinkSync(type === "junction" ? path.resolve(path.dirname(source), link) : link, target, type);
       return false;
     }
   });
@@ -403,7 +404,7 @@ function durableSnapshot(job) {
   }
   if (fs4.existsSync(job.stateFile)) {
     const state = JSON.parse(fs4.readFileSync(job.stateFile, "utf8"));
-    result["$binding"] = createHash2("sha256").update(JSON.stringify([state.token, state.wechatBindings])).digest("hex");
+    result["$binding"] = createHash2("sha256").update(JSON.stringify([state.token, state.publicIdentityNodeId])).digest("hex");
   }
   return result;
 }
@@ -563,6 +564,7 @@ async function executeUpdate(job, progress, quiesce) {
   const emit = (phase, n, message) => progress({ phase, progress: n, message, terminal: false });
   let stopped = false, disposed = false, modified = false, newChild;
   let before = {}, sessionIds = [], readableIds = [];
+  let preexistingFailure = false;
   try {
     emit("preparing", 25, "\u51C6\u5907\u5B89\u88C5\u5DE5\u5177\uFF0C\u5F53\u524D\u8282\u70B9\u4ECD\u53EF\u4F7F\u7528");
     const runtime = await pinInstallRuntime({ executable: job.executable, cli: job.pnpm, version: INSTALL_PNPM_VERSION }, job.directory);
@@ -571,6 +573,13 @@ async function executeUpdate(job, progress, quiesce) {
     emit("checking", 50, "\u786E\u8BA4\u4F1A\u8BDD\u7A7A\u95F2\u5E76\u4FDD\u5B58\u72B6\u6001");
     const old = job.controlOrigin ? await control(job, "describe") : await describe(job);
     if (old.pluginVersion !== job.previousVersion) throw new Error("\u5F53\u524D\u63D2\u4EF6\u5728\u68C0\u67E5\u540E\u53D1\u751F\u53D8\u5316");
+    if (job.controlOrigin && job.previousVersion !== "0.0.0") {
+      try {
+        preexistingFailure = (await control(job, "health")).ready !== true;
+      } catch {
+        preexistingFailure = true;
+      }
+    }
     const list = (await beforeRpc(job, "session.list")).items;
     if (!Array.isArray(list) || list.some((s) => s.running !== false)) throw new Error("\u8BF7\u7B49\u5F85\u5168\u90E8\u4F1A\u8BDD\u7ED3\u675F\u540E\u518D\u66F4\u65B0");
     sessionIds = list.map((s) => s.sessionId).sort();
@@ -642,7 +651,7 @@ async function executeUpdate(job, progress, quiesce) {
           fs4.renameSync(job.profile, path4.join(job.directory, "profile-failed"));
           fs4.renameSync(previous, job.profile);
         }
-        if (job.previousVersion === "0.0.0") {
+        if (job.previousVersion === "0.0.0" || preexistingFailure) {
           const recovery = await import(pathToFileURL(path4.join(job.directory, "native-recovery.js")).href);
           await recovery.verifyNativeRestore(job, () => start(job), sessionIds, readableIds);
         } else {
@@ -663,7 +672,7 @@ async function executeUpdate(job, progress, quiesce) {
         return { phase: "attention", progress: 100, message: "\u81EA\u52A8\u6062\u590D\u672A\u5B8C\u6210\u3002\u5907\u4EFD\u5DF2\u4FDD\u7559\uFF0C\u8BF7\u6309\u4E3B\u673A\u66F4\u65B0\u8BB0\u5F55\u6062\u590D\uFF1B\u4E0D\u8981\u5220\u9664\u8282\u70B9\u6216\u6570\u636E\u3002", terminal: true, ok: false, rollback: false };
       }
     }
-    return { phase: "failed", progress: 100, message: (error instanceof Error ? error.message : "\u66F4\u65B0\u5931\u8D25") + (rollback ? "\uFF1B\u5DF2\u6062\u590D\u539F\u63D2\u4EF6\u3002" : "\uFF1B\u5F53\u524D\u63D2\u4EF6\u672A\u66FF\u6362\u3002"), terminal: true, ok: false, rollback };
+    return { phase: "failed", progress: 100, message: (error instanceof Error ? error.message : "\u66F4\u65B0\u5931\u8D25") + (rollback ? preexistingFailure ? "\uFF1B\u5DF2\u6062\u590D\u5B89\u88C5\u524D\u72B6\u6001\uFF0C\u539F\u6709\u63D2\u4EF6\u6545\u969C\u5C1A\u672A\u4FEE\u590D\uFF0C\u6570\u636E\u5DF2\u4FDD\u7559\u3002" : "\uFF1B\u5DF2\u6062\u590D\u539F\u63D2\u4EF6\u3002" : "\uFF1B\u5F53\u524D\u63D2\u4EF6\u672A\u66FF\u6362\u3002"), terminal: true, ok: false, rollback };
   }
 }
 async function workerMain(filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wechat-remote",
-  "version": "1.7.8",
+  "version": "1.7.10",
   "private": false,
   "description": "Agent远程管理助手：DSH 微信连接插件的一键安装与升级",
   "type": "module",