dsh-life-pack 0.3.6 → 0.3.13

package/dist/client.js

@@ -518,6 +518,112 @@ window.__ModuleLoader__.load({
 			return lines;
 		}
 		//#endregion
+		//#region src/update-queue.ts
+		/** 任一行 installing 即忙：题头检查更新禁用、行按钮全局互斥、checkAll/act 入口直接返回的同一判据。 */
+		function hasInstallingRow(rows) {
+			for (const key of Object.keys(rows)) if (rows[key]?.phase === "installing") return true;
+			return false;
+		}
+		/** 按目标顺序逐家查→装→收尾：一家收尾才起下一家；失败记 failed 继续；待重启跳过安装。
+		*
+		* 跳过安装只有一种：快照事实已是待重启（`restartPendingOf`）——由横幅点名，不在这里装第二遍。
+		* 不可装（已是最新／拦下且无安装动作）记 ready 收尾；缺席且无最新版本号记 ready 收尾（等下一次检查）。
+		* 本函数不汇总排队数、不碰他行（`patch` 只收本家 key）。
+		*/
+		async function runSerialUpdateAll(targets, deps) {
+			for (const target of targets) {
+				const current = deps.getRow(target.key);
+				deps.patch(target.key, {
+					phase: "checking",
+					outcome: current?.outcome ?? null,
+					failure: null
+				});
+				const checked = await deps.check(target);
+				if (!checked.ok) {
+					deps.patch(target.key, {
+						phase: "failed",
+						outcome: null,
+						failure: checked
+					});
+					continue;
+				}
+				if (restartPendingOf(checked.value.snapshot)) {
+					deps.patch(target.key, {
+						phase: "ready",
+						outcome: checked.value,
+						failure: null
+					});
+					continue;
+				}
+				const verdict = verdictOf(target, checked.value.snapshot);
+				if (!(verdict.action === "update" || verdict.action === "install" || verdict.action === "retry")) {
+					deps.patch(target.key, {
+						phase: "ready",
+						outcome: checked.value,
+						failure: null
+					});
+					continue;
+				}
+				deps.patch(target.key, {
+					phase: "installing",
+					outcome: checked.value,
+					failure: null
+				});
+				if (isAbsent(target)) {
+					const version = checked.value.snapshot.latestVersion;
+					if (!version) {
+						deps.patch(target.key, {
+							phase: "ready",
+							outcome: checked.value,
+							failure: null
+						});
+						continue;
+					}
+					const done = await deps.installAbsent(target, version);
+					if (done.ok) {
+						const refreshed = await deps.checkStatus(target);
+						deps.patch(target.key, refreshed.ok ? {
+							phase: "ready",
+							outcome: refreshed.value,
+							failure: null
+						} : {
+							phase: "failed",
+							outcome: null,
+							failure: refreshed
+						});
+					} else deps.patch(target.key, {
+						phase: "failed",
+						outcome: checked.value,
+						failure: {
+							...done,
+							manual: done.manual ?? checked.value.manual ?? null
+						}
+					});
+					continue;
+				}
+				const done = await deps.installPresent(target);
+				if (done.ok) {
+					const refreshed = await deps.checkStatus(target);
+					deps.patch(target.key, refreshed.ok ? {
+						phase: "ready",
+						outcome: refreshed.value,
+						failure: null
+					} : {
+						phase: "failed",
+						outcome: null,
+						failure: refreshed
+					});
+				} else deps.patch(target.key, {
+					phase: "failed",
+					outcome: checked.value,
+					failure: {
+						...done,
+						manual: done.manual ?? checked.value.manual ?? null
+					}
+				});
+			}
+		}
+		//#endregion
 		//#region src/update-panel.ts
 		/** 爱生活面板的更新界面：检查更新按钮、七家结果行、待重启横幅、缺席卡的「装上」。
 		*
@@ -794,13 +900,21 @@ window.__ModuleLoader__.load({
 			outcome: null,
 			failure: null
 		};
-		/** 面板的更新状态源：挂载时取七个目标的表，之后按需查／装（组件与按钮共用一个 face）。 */
+		/** 面板的更新状态源：挂载时取七个目标的表，之后按需查／装（组件与按钮共用一个 face）。
+		*
+		* 并发形状（#925 拍板四条，用户已确认）：
+		* - 一键全部更新按目标顺序串行（查→装→轮询到收尾，一家收尾才起下一家；失败记 failed 继续）；
+		* - 任一行 installing 时 checkAll 入口直接返回、题头禁用；
+		* - act 入口有忙直接返回（有忙拒 update-busy 且不改 rows，含同家第二点）；
+		* - 每行各自显示（patch 只写本家 key），题头不汇总排队数。
+		*/
 		function useUpdateRows(getCall) {
 			const [targets, setTargets] = react.useState([]);
 			const [rows, setRows] = react.useState({});
 			const [pollMs, setPollMs] = react.useState(1e3);
 			const [loadError, setLoadError] = react.useState(null);
 			const [checking, setChecking] = react.useState(false);
+			const [updatingAll, setUpdatingAll] = react.useState(false);
 			const [open, setOpen] = react.useState(false);
 			const alive = react.useRef(true);
 			react.useEffect(() => () => {
@@ -825,21 +939,31 @@ window.__ModuleLoader__.load({
 					[key]: next
 				}));
 			}, []);
+			const rowsRef = react.useRef(rows);
+			rowsRef.current = rows;
+			const targetsRef = react.useRef(targets);
+			targetsRef.current = targets;
+			const pollMsRef = react.useRef(pollMs);
+			pollMsRef.current = pollMs;
+			const updatingAllRef = react.useRef(false);
 			return {
 				targets,
 				rows,
 				pollMs,
 				loadError,
 				checking,
+				updatingAll,
 				open,
 				close: () => setOpen(false),
 				checkAll: react.useCallback(() => {
+					if (hasInstallingRow(rowsRef.current) || updatingAllRef.current) return;
 					setChecking(true);
 					setOpen(true);
-					const list = targets;
+					const list = targetsRef.current;
+					const snapshot = rowsRef.current;
 					for (const target of list) patch(target.key, {
 						phase: "checking",
-						outcome: rows[target.key]?.outcome ?? null,
+						outcome: snapshot[target.key]?.outcome ?? null,
 						failure: null
 					});
 					Promise.all(list.map(async (target) => {
@@ -853,15 +977,41 @@ window.__ModuleLoader__.load({
 							outcome: null,
 							failure: result
 						});
-					})).finally(() => setChecking(false));
+					})).finally(() => {
+						if (alive.current) setChecking(false);
+					});
+				}, [getCall, patch]),
+				updateAll: react.useCallback(() => {
+					if (hasInstallingRow(rowsRef.current) || updatingAllRef.current) return;
+					const list = targetsRef.current;
+					if (list.length === 0) return;
+					updatingAllRef.current = true;
+					setUpdatingAll(true);
+					setOpen(true);
+					(async () => {
+						try {
+							await runSerialUpdateAll(list, {
+								check: (target) => checkTarget(getCall(), target),
+								checkStatus: (target) => checkTarget(getCall(), target, target.phones?.status),
+								installAbsent: (target, version) => installAbsent(getCall(), target, version),
+								installPresent: (target) => updateInstalled(getCall(), target, pollMsRef.current),
+								patch,
+								getRow: (key) => rowsRef.current[key]
+							});
+							await reload();
+						} finally {
+							updatingAllRef.current = false;
+							if (alive.current) setUpdatingAll(false);
+						}
+					})();
 				}, [
 					getCall,
 					patch,
-					rows,
-					targets
+					reload
 				]),
 				act: react.useCallback((target, action) => {
-					const current = rows[target.key] ?? IDLE$1;
+					if (hasInstallingRow(rowsRef.current) || updatingAllRef.current) return;
+					const current = rowsRef.current[target.key] ?? IDLE$1;
 					if (action === "recheck") {
 						patch(target.key, {
 							phase: "checking",
@@ -907,7 +1057,7 @@ window.__ModuleLoader__.load({
 							});
 							version = checked.value.snapshot.latestVersion;
 						}
-						const result = absent ? await installAbsent(getCall(), target, version ?? "") : await updateInstalled(getCall(), target, pollMs);
+						const result = absent ? await installAbsent(getCall(), target, version ?? "") : await updateInstalled(getCall(), target, pollMsRef.current);
 						if (result.ok) {
 							const refreshed = await checkTarget(getCall(), target, target.phones?.status);
 							patch(target.key, refreshed.ok ? {
@@ -934,27 +1084,42 @@ window.__ModuleLoader__.load({
 				}, [
 					getCall,
 					patch,
-					pollMs,
-					reload,
-					rows
+					reload
 				])
 			};
 		}
-		/** 标题右侧的「检查更新」：一个按钮一次查七家（吃 `useUpdateRows` 的表）。 */
+		/** 标题右侧两件：「检查更新」一次查七家 ＋ 「全部更新」按顺序串行装（吃 `useUpdateRows` 的表）。
+		*
+		* 禁用形状（#925 第 2 条）：任一行 installing 时两件都点不得；人话沿用 `update-busy` 原句
+		* （挂在 title 上，按钮文本仍是动作名）。题头不汇总排队数：串行进度只在各行自己显示。
+		*/
 		function CheckUpdateButton(props) {
-			const { checking, checkAll, targets } = props.face;
-			const disabled = checking || targets.length === 0;
-			return react.createElement("button", {
+			const { checking, updatingAll, checkAll, updateAll, targets, rows } = props.face;
+			const busy = hasInstallingRow(rows) || updatingAll;
+			const checkDisabled = checking || updatingAll || busy || targets.length === 0;
+			const allDisabled = checking || updatingAll || busy || targets.length === 0;
+			const busyText = reasonText("update-busy");
+			return react.createElement("span", { style: PANEL_STYLE.actions }, react.createElement("button", {
 				type: "button",
-				style: disabled ? {
+				style: checkDisabled ? {
 					...PANEL_STYLE.btn,
 					opacity: .55,
 					cursor: "default"
 				} : PANEL_STYLE.btn,
-				disabled,
+				disabled: checkDisabled,
 				onClick: checkAll,
-				title: "检查总管与六家插件的版本"
-			}, checking ? "检查中…" : "检查更新");
+				title: busy ? busyText : "检查总管与六家插件的版本"
+			}, checking ? "检查中…" : "检查更新"), react.createElement("button", {
+				type: "button",
+				style: allDisabled ? {
+					...PANEL_STYLE.btn,
+					opacity: .55,
+					cursor: "default"
+				} : PANEL_STYLE.btn,
+				disabled: allDisabled,
+				onClick: updateAll,
+				title: busy ? busyText : "按顺序逐家装上更新（一家收尾才起下一家）"
+			}, updatingAll ? "更新中…" : "全部更新"));
 		}
 		/** 待重启横幅：一行总账，只点名哪几家要重启（理由与做法写在各家卡片上，见 `restartBannerText`）。 */
 		function RestartBanners(props) {
@@ -977,7 +1142,7 @@ window.__ModuleLoader__.load({
 		* 手工命令只在「装不了」或「装失败」的行显示：正常用户用不到，摊在每行上既吵又误导。
 		*/
 		function UpdateResults(props) {
-			const { targets, rows, loadError, checking, open, close } = props.face;
+			const { targets, rows, loadError, checking, updatingAll, open, close } = props.face;
 			const dialogRef = react.useRef(null);
 			react.useEffect(() => {
 				if (open) dialogRef.current?.focus();
@@ -986,6 +1151,7 @@ window.__ModuleLoader__.load({
 			if (loadError) return react.createElement("div", { style: PANEL_STYLE.reason }, "更新能力没接上：" + loadError);
 			if (targets.length === 0) return null;
 			if (shown.length === 0 && !open) return null;
+			const locked = hasInstallingRow(rows) || updatingAll;
 			const body = shown.map((target) => {
 				const row = rows[target.key];
 				const snapshot = row.outcome?.snapshot ?? null;
@@ -1026,12 +1192,13 @@ window.__ModuleLoader__.load({
 					color: "var(--dsw-alias-label-secondary, #9a9a9a)"
 				} }, busy ? "正在装，请稍候…" : verdict?.text ?? (checking ? "检查中…" : "")), buttonAction ? react.createElement("button", {
 					type: "button",
-					style: busy ? {
+					style: locked ? {
 						...PANEL_STYLE.btnPrimary,
 						opacity: .55,
 						cursor: "default"
 					} : PANEL_STYLE.btnPrimary,
-					disabled: busy,
+					disabled: locked,
+					title: locked ? reasonText("update-busy") : void 0,
 					onClick: () => {
 						props.face.act(target, buttonAction);
 					}
@@ -1078,6 +1245,7 @@ window.__ModuleLoader__.load({
 			const target = props.target;
 			const row = target ? props.face.rows[target.key] : null;
 			const busy = row?.phase === "installing";
+			const locked = busy || hasInstallingRow(props.face.rows) || props.face.updatingAll;
 			const manual = (target ? manualForDisplay(target, row?.failure?.manual ?? row?.outcome?.manual ?? null) : null) ?? props.fallbackCommand;
 			const installed = target ? target.installedVersion ?? target.runningVersion : null;
 			const state = slotStateOf(target, props.inLedger);
@@ -1097,7 +1265,7 @@ window.__ModuleLoader__.load({
 			}
 			return react.createElement("div", { style: PANEL_STYLE.reco }, react.createElement("div", null, headline), state === "absent" ? react.createElement("button", {
 				type: "button",
-				style: busy ? {
+				style: locked ? {
 					...PANEL_STYLE.btn,
 					marginTop: 8,
 					opacity: .55
@@ -1105,13 +1273,14 @@ window.__ModuleLoader__.load({
 					...PANEL_STYLE.btn,
 					marginTop: 8
 				},
-				disabled: busy,
+				disabled: locked,
+				title: locked ? reasonText("update-busy") : void 0,
 				onClick: () => {
 					if (target) props.face.act(target, "install");
 				}
 			}, busy ? "正在装，请稍候…" : "装上") : null, retryAction === "recheck" && target ? react.createElement("button", {
 				type: "button",
-				style: busy ? {
+				style: locked ? {
 					...PANEL_STYLE.btn,
 					marginTop: 8,
 					marginLeft: 8,
@@ -1121,7 +1290,8 @@ window.__ModuleLoader__.load({
 					marginTop: 8,
 					marginLeft: 8
 				},
-				disabled: busy,
+				disabled: locked,
+				title: locked ? reasonText("update-busy") : void 0,
 				onClick: () => props.face.act(target, "recheck")
 			}, ACTION_LABEL.recheck) : null, reason ? react.createElement("div", { style: PANEL_STYLE.reason }, reason) : null, react.createElement("code", { style: PANEL_STYLE.cmd }, manual));
 		}
@@ -2759,6 +2929,27 @@ window.__ModuleLoader__.load({
 					return /* @__PURE__ */ new Set([...previous, active]);
 				});
 			}, [active]);
+			/** 预热：section 一挂载，就把其余几家**错峰**挂上（隐藏面板照常挂载、只切 `hidden`），
+			*  让各家那一次配置读提前跑掉——用户点哪个页签，多半值已经在了。
+			*  错峰（每 150ms 一家）是为了不让六家子进程同时抢开工：首帧那一口气优先留给框架。
+			*  只在页签账本非空时起一次（`rows` 要等各家 slot 注入后才齐）。
+			*
+			*  **一次性**（p10 定时器门的例外依据）：每个页签只挂一次（`warmed` 闸门 ＋ 一批固定数量的定时器），
+			*  不是轮询、也不是重试——它没有「次数」可言；卸载即 `clearTimeout` 清干净。
+			*  不做轮询是本意：这里只补一次提前量，取数与刷新仍旧由各家用例自己的通道走。 */
+			const warmed = react.useRef(false);
+			const tabCount = rows.length;
+			react.useEffect(() => {
+				if (warmed.current || tabCount === 0) return;
+				warmed.current = true;
+				const STAGGER_MS = 150;
+				const timers = MANAGER_TABS.filter((tab) => rows.some((row) => row.id === tab.plugin)).map((tab, index) => setTimeout(() => {
+					setVisitedIds((previous) => previous.has(tab.plugin) ? previous : /* @__PURE__ */ new Set([...previous, tab.plugin]));
+				}, STAGGER_MS * (index + 1)));
+				return () => {
+					for (const timer of timers) clearTimeout(timer);
+				};
+			}, [tabCount]);
 			function labelFor(tab) {
 				const row = rows.find((r) => r.id === tab.plugin);
 				return row && row.label.length > 0 ? row.label : tab.title;