dsh-life-pack 0.3.59 → 0.3.60

package/dist/client.js

@@ -471,7 +471,7 @@ window.__ModuleLoader__.load({
 			path: "/api/ilife-manager"
 		};
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/config.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/config.js
 		const DEFAULT_PANEL_POLL_MS = 1e3;
 		function assertPrefix(value, role) {
 			if (typeof value !== "string" || value.length === 0) throw new Error("[dsh-plugin-update] " + role + " 非法：须为非空字符串（收到 " + JSON.stringify(value) + "）");
@@ -492,7 +492,7 @@ window.__ModuleLoader__.load({
 			return buildPhoneNames(prefix).logAppend;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/redaction.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/redaction.js
 		const COPY_BUDGET_CHARS = 1500;
 		const REDACTED_PATH = "<路径>";
 		const REDACTED_SECRET = "<脱敏>";
@@ -556,7 +556,7 @@ window.__ModuleLoader__.load({
 			return truncateForCopy(scrubWithoutBudget(flat));
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/service.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/service.js
 		function updateError(code) {
 			return Object.assign(new Error(code), { code });
 		}
@@ -643,7 +643,7 @@ window.__ModuleLoader__.load({
 			return 0;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/lang.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/lang.js
 		function normalizeLangTag(tag) {
 			if (typeof tag !== "string") return "zh";
 			const s = tag.trim().toLowerCase().replace(/_/g, "-");
@@ -785,7 +785,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/bilingual.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/bilingual.js
 		const BILINGUAL_STRINGS = {
 			"entry.label.idle": {
 				en: "Check for updates",
@@ -2432,7 +2432,7 @@ window.__ModuleLoader__.load({
 		}
 		const BILINGUAL_CSS = [".dsh-upd-bi{display:inline;overflow-wrap:anywhere}", ".dsh-upd-bi [lang]{overflow-wrap:anywhere}"].join("\n");
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/changelog.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/changelog.js
 		const CHANGELOG_MAX_CHARS = 65536;
 		const CHANGELOG_ALL_CATEGORIES = [
 			"Added",
@@ -3540,7 +3540,7 @@ ${note}${blocks.join("\n")}
 			}
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/log-events.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/log-events.js
 		const LOG_EVENT_CALL = "host.call";
 		const LOG_EVENT_CALL_FAIL = "host.call.fail";
 		const LOG_EVENT_INSTALL_EXEC = "update.install.exec";
@@ -3791,7 +3791,7 @@ ${note}${blocks.join("\n")}
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/codes.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/codes.js
 		const BLOCKED_REASONS = [
 			"unknown-profile",
 			"channel-mismatch",
@@ -3825,7 +3825,7 @@ ${note}${blocks.join("\n")}
 			return typeof code === "string" && isOneOf(CHECK_SIDE_FAILURE_CODES, code.trim());
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/panel.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/panel.js
 		function normalizePanelTheme(value) {
 			return value === "archive" ? "archive" : "default";
 		}
@@ -4048,6 +4048,29 @@ ${note}${blocks.join("\n")}
 			if (typeof fallback === "string" && fallback.trim()) return fallback.trim();
 			return INTERNAL_CODE;
 		}
+		function replyIsCheckExpired(reply) {
+			if (!reply || typeof reply !== "object") return false;
+			const kind = reply["errorKind"];
+			if (typeof kind === "string" && kind.trim() === "check-expired") return true;
+			const err = reply["error"];
+			return typeof err === "string" && err.trim() === "check-expired";
+		}
+		function thrownIsCheckExpired(err) {
+			if (typeof err === "string") return err.trim() === "check-expired";
+			if (err instanceof Error) {
+				if (err.message.trim() === "check-expired") return true;
+				const code = err.code;
+				return typeof code === "string" && code.trim() === "check-expired";
+			}
+			if (err && typeof err === "object" && !Array.isArray(err)) {
+				const rec = err;
+				const e = typeof rec["error"] === "string" ? rec["error"].trim() : "";
+				const k = typeof rec["errorKind"] === "string" ? rec["errorKind"].trim() : "";
+				const c = typeof rec["code"] === "string" ? rec["code"].trim() : "";
+				return e === "check-expired" || k === "check-expired" || c === "check-expired";
+			}
+			return false;
+		}
 		function redactForCopy(text) {
 			return sanitizeForCopy(text);
 		}
@@ -5037,7 +5060,7 @@ ${UPDATE_PANEL_ARCHIVE_CSS}` : UPDATE_PANEL_CSS}</style>
 ${body}`;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/entry.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/entry.js
 		const UPDATE_ENTRY_CSS = [
 			".dsh-upd-entry{display:inline-flex;align-items:center;gap:8px;font:13px/1.6 var(--dsh-update-font-sans,system-ui,\"Microsoft YaHei\",sans-serif);font-size:var(--dsh-update-entry-font-size,13px);color:var(--dsh-update-text,#1f2937)}",
 			".dsh-upd-entry-btn{font:inherit;border:1px solid var(--dsh-update-border,#d1d5db);border-radius:var(--dsh-update-entry-border-radius,6px);",
@@ -5151,7 +5174,7 @@ ${body}`;
 			}
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/panel-batch.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/panel-batch.js
 		const BATCH_PANEL_POLL = {
 			defaultMs: 1500,
 			minMs: 250
@@ -6670,7 +6693,7 @@ ${body}`;
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.0/node_modules/dsh-plugin-update/dist/entry-batch.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/entry-batch.js
 		function isObject$1(value) {
 			return !!value && typeof value === "object" && !Array.isArray(value);
 		}
@@ -7585,93 +7608,93 @@ ${body}`;
 				}
 			}
 			async function doInstall() {
-				if (!receipt) try {
-					const checked = await call(phoneNames.updateCheck, queueArgs());
-					if (!mounted) return;
-					applyStatusReply(checked, "check");
-				} catch (err) {
+				for (let attempt = 0; attempt < 2; attempt += 1) {
+					if (!receipt) {
+						const prevLatch = latch;
+						try {
+							const checked = await call(phoneNames.updateCheck, queueArgs());
+							if (!mounted) return;
+							applyStatusReply(checked, "check");
+						} catch (err) {
+							if (!mounted) return;
+							if (thrownBusy(err)) {
+								await refresh();
+								return;
+							}
+							const env = currentEnvPair();
+							setLatch({
+								code: "check-failed",
+								kind: null,
+								detail: thrownDetail(err),
+								diag: null,
+								requestId: null,
+								checkId: null,
+								runningVersion: snapshot?.runningVersion ?? null,
+								installedVersion: snapshot?.installedVersion ?? null,
+								latestVersion: snapshot?.latestVersion ?? null,
+								targetVersion: null,
+								hostKind: env.hostKind,
+								profileName: env.profileName,
+								source: "check",
+								volatile: false,
+								atMs: latchNow()
+							});
+							return;
+						}
+						if (!mounted) return;
+						if (!receipt) {
+							if (latch === prevLatch) clearLatch();
+							return;
+						}
+					}
 					if (!mounted) return;
-					if (thrownBusy(err)) {
-						await refresh();
+					requestId = randomRequestId();
+					pollCount = 0;
+					pollCapped = false;
+					let reply;
+					try {
+						reply = await call(phoneNames.updateInstall, {
+							checkId: receipt.checkId,
+							requestId,
+							...queueArgs()
+						});
+					} catch (err) {
+						if (!mounted) return;
+						if (thrownBusy(err)) {
+							await refresh();
+							return;
+						}
+						if (thrownIsCheckExpired(err) && attempt === 0) {
+							receipt = null;
+							continue;
+						}
+						const env = currentEnvPair();
+						setLatch({
+							code: "install-failed",
+							kind: null,
+							detail: thrownDetail(err),
+							diag: null,
+							requestId,
+							checkId: receipt?.checkId ?? null,
+							runningVersion: snapshot?.runningVersion ?? null,
+							installedVersion: snapshot?.installedVersion ?? null,
+							latestVersion: snapshot?.latestVersion ?? null,
+							targetVersion: null,
+							hostKind: env.hostKind,
+							profileName: env.profileName,
+							source: "install",
+							volatile: false,
+							atMs: latchNow()
+						});
 						return;
 					}
-					const env = currentEnvPair();
-					setLatch({
-						code: "check-failed",
-						kind: null,
-						detail: thrownDetail(err),
-						diag: null,
-						requestId: null,
-						checkId: null,
-						runningVersion: snapshot?.runningVersion ?? null,
-						installedVersion: snapshot?.installedVersion ?? null,
-						latestVersion: snapshot?.latestVersion ?? null,
-						targetVersion: null,
-						hostKind: env.hostKind,
-						profileName: env.profileName,
-						source: "check",
-						volatile: false,
-						atMs: latchNow()
-					});
-					return;
-				}
-				if (!mounted) return;
-				if (!receipt) {
-					const env = currentEnvPair();
-					setLatch({
-						code: "check-expired",
-						kind: "check-expired",
-						detail: null,
-						diag: null,
-						requestId,
-						checkId: null,
-						runningVersion: snapshot?.runningVersion ?? null,
-						installedVersion: snapshot?.installedVersion ?? null,
-						latestVersion: snapshot?.latestVersion ?? null,
-						targetVersion: null,
-						hostKind: env.hostKind,
-						profileName: env.profileName,
-						source: "install",
-						volatile: false,
-						atMs: latchNow()
-					});
-					return;
-				}
-				requestId = randomRequestId();
-				pollCount = 0;
-				pollCapped = false;
-				try {
-					const reply = await call(phoneNames.updateInstall, {
-						checkId: receipt.checkId,
-						requestId,
-						...queueArgs()
-					});
 					if (!mounted) return;
-					applyStatusReply(reply, "install");
-				} catch (err) {
-					if (!mounted) return;
-					if (thrownBusy(err)) {
-						await refresh();
-						return;
+					if (replyIsCheckExpired(reply) && attempt === 0) {
+						receipt = null;
+						continue;
 					}
-					const env = currentEnvPair();
-					setLatch({
-						code: "install-failed",
-						kind: null,
-						detail: thrownDetail(err),
-						diag: null,
-						requestId,
-						checkId: receipt?.checkId ?? null,
-						runningVersion: snapshot?.runningVersion ?? null,
-						installedVersion: snapshot?.installedVersion ?? null,
-						latestVersion: snapshot?.latestVersion ?? null,
-						targetVersion: null,
-						hostKind: env.hostKind,
-						profileName: env.profileName,
-						source: "install",
-						volatile: false,
-						atMs: latchNow()
-					});
+					applyStatusReply(reply, "install");
+					return;
 				}
 			}
 			function diagText() {
@@ -10619,7 +10642,7 @@ ${body}`;
 			}, react.createElement("span", { style: S.morePkg }, row.pkg), react.createElement("span", { style: S.moreDesc }, row.desc), react.createElement("span", { style: S.moreIcon }, react.createElement(ExternalIcon, null)))));
 		}
 		/** 版本胶囊那一行字：只在这里拼一次，屏上与用例读的是同一串。 */
-		const MANAGER_VERSION_TEXT = "dsh-life-pack · 0.3.59";
+		const MANAGER_VERSION_TEXT = "dsh-life-pack · 0.3.60";
 		/** 右下角那本书离面板两沿的距离：用户口径「一直处于面板右下角、不随列表滑动消失」
 		*  ⇒ sticky 吸附（面板相对，视口多大都落在面板角上）；INSET＝右沿，BOTTOM＝底沿。 */
 		const MANUAL_ENTRY_INSET = 16;