dsh-life-pack 0.3.21 → 0.3.22

package/dist/client.js

@@ -560,11 +560,36 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/update-queue.ts
+		/** 一键全部更新的串行队列与并发门禁（纯函数：无 DOM、无 react；面板钩子与单测共用同一份）。
+		*
+		* 拍板出处（#925 决议，用户已逐条确认，不可改语义）：
+		* 1. 一键排队串行：按目标顺序逐家查→装→轮询到收尾，一家收尾才起下一家；失败一家记 failed
+		*    继续下一家；单家重试走行按钮 recheck/retry；删并行发起与交叉轮询。
+		* 2. 安装中题头点不得：任一行 installing 时题头检查更新禁用；人话沿用 reasonText('update-busy') 原句。
+		* 3. 行按钮全局互斥：installing 行自锁，其余行禁用不进队列；act 入口有忙拒 update-busy 且不改 rows。
+		* 4. 进度各行自显：每行各自显示，他行保持 phase；题头不汇总排队数；待重启跳过安装继续下一家。
+		*
+		* 本文件只管「排队形状与忙判据」：传输动作由调用方注入（查／装／轮询的真实现住 `update-client.ts`，
+		* 面板钩子转交，单测给假件），故改坏串行形状必被门禁逮到。
+		*
+		* 忙判据的另一半（#980）：忙时什么被拦、什么不被拦——批量入口（查／装／一键）被拦，
+		* 对话框重开（只读进度、不干活）永远不被拦。两者同住这里，面板与单测共用同一份。
+		*/
 		/** 任一行 installing 即忙：题头检查更新禁用、行按钮全局互斥、checkAll/act 入口直接返回的同一判据。 */
 		function hasInstallingRow(rows) {
 			for (const key of Object.keys(rows)) if (rows[key]?.phase === "installing") return true;
 			return false;
 		}
+		/** 忙时拒绝的那枚失败：码与人话都取 `update-busy` 原句（#678/#740 冻结文案，本文件不写第二套话）。 */
+		function updateBusyFailure(targetKey) {
+			return {
+				ok: false,
+				code: "update-busy",
+				message: reasonText("update-busy"),
+				details: { target: targetKey },
+				manual: null
+			};
+		}
 		/** 批量入口点不得：一键串行中、任一行安装中、检查轮未收尾，三者任一即拦。
 		*
 		* 面板 `checkAll`／`updateAll`／`act` 共用同一判据：双轮同时写同一行即错（#980：
@@ -931,6 +956,11 @@ window.__ModuleLoader__.load({
 			if (!detail) return null;
 			return react.createElement("code", { style: PANEL_STYLE.cmd }, "宿主原话：" + detail);
 		}
+		/** 忙注那一行（票 #989）：守卫拦下点击时的可视回响。题头与缺席卡共用这一块，口径一处。 */
+		function busyNoteLine(note) {
+			if (!note) return null;
+			return react.createElement("div", { style: PANEL_STYLE.dialogNote }, note);
+		}
 		const ROW_TONE = {
 			update: {
 				mark: "↑",
@@ -989,6 +1019,9 @@ window.__ModuleLoader__.load({
 		* - 任一行 installing 时 checkAll 入口直接返回、题头禁用；
 		* - act 入口有忙直接返回（有忙拒 update-busy 且不改 rows，含同家第二点）；
 		* - 每行各自显示（patch 只写本家 key），题头不汇总排队数。
+		*
+		* 票 #989 补一条：上面三处"直接返回"必须留可视回响（忙注或行级失败），
+		* 与"禁用的才点不得，点得动的必有回响"对齐——静默吞点击即红。
 		*/
 		function useUpdateRows(getCall) {
 			const [targets, setTargets] = react.useState([]);
@@ -997,6 +1030,7 @@ window.__ModuleLoader__.load({
 			const [loadError, setLoadError] = react.useState(null);
 			const [checking, setChecking] = react.useState(false);
 			const [updatingAll, setUpdatingAll] = react.useState(false);
+			const [busyNote, setBusyNote] = react.useState(null);
 			const [open, setOpen] = react.useState(false);
 			const alive = react.useRef(true);
 			react.useEffect(() => () => {
@@ -1068,6 +1102,7 @@ window.__ModuleLoader__.load({
 				reload(true);
 			}, [reload]);
 			const patch = react.useCallback((key, next) => {
+				setBusyNote(null);
 				setRows((previous) => ({
 					...previous,
 					[key]: next
@@ -1085,12 +1120,17 @@ window.__ModuleLoader__.load({
 				loadError,
 				checking,
 				updatingAll,
+				busyNote,
 				open,
 				retry,
 				close: () => setOpen(resolveDialogOpen("hide")),
 				showProgress: () => setOpen(resolveDialogOpen("show")),
 				checkAll: react.useCallback(() => {
-					if (batchBlocked()) return;
+					if (batchBlocked()) {
+						setBusyNote(reasonText("update-busy"));
+						return;
+					}
+					setBusyNote(null);
 					setChecking(true);
 					setOpen(resolveDialogOpen("show"));
 					const list = targetsRef.current;
@@ -1120,9 +1160,16 @@ window.__ModuleLoader__.load({
 					batchBlocked
 				]),
 				updateAll: react.useCallback(() => {
-					if (batchBlocked()) return;
+					if (batchBlocked()) {
+						setBusyNote(reasonText("update-busy"));
+						return;
+					}
 					const list = targetsRef.current;
-					if (list.length === 0) return;
+					if (list.length === 0) {
+						setBusyNote(reasonText("update-busy"));
+						return;
+					}
+					setBusyNote(null);
 					updatingAllRef.current = true;
 					setUpdatingAll(true);
 					setOpen(resolveDialogOpen("show"));
@@ -1149,7 +1196,14 @@ window.__ModuleLoader__.load({
 					batchBlocked
 				]),
 				act: react.useCallback((target, action) => {
-					if (batchBlocked()) return;
+					if (batchBlocked()) {
+						const current = rowsRef.current[target.key] ?? IDLE$1;
+						patch(target.key, {
+							...current,
+							failure: updateBusyFailure(target.key)
+						});
+						return;
+					}
 					const current = rowsRef.current[target.key] ?? IDLE$1;
 					if (action === "recheck") {
 						patch(target.key, {
@@ -1177,48 +1231,62 @@ window.__ModuleLoader__.load({
 						failure: null
 					});
 					(async () => {
-						const absent = isAbsent(target);
-						let version = current.outcome?.snapshot.latestVersion ?? null;
-						if (absent && version === null) {
-							const checked = await checkTarget(getCall(), target);
-							if (!checked.ok) {
+						try {
+							const absent = isAbsent(target);
+							let version = current.outcome?.snapshot.latestVersion ?? null;
+							if (absent && version === null) {
+								const checked = await checkTarget(getCall(), target);
+								if (!checked.ok) {
+									patch(target.key, {
+										phase: "failed",
+										outcome: null,
+										failure: checked
+									});
+									return;
+								}
 								patch(target.key, {
+									phase: "installing",
+									outcome: checked.value,
+									failure: null
+								});
+								version = checked.value.snapshot.latestVersion;
+							}
+							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 ? {
+									phase: "ready",
+									outcome: refreshed.value,
+									failure: null
+								} : {
 									phase: "failed",
 									outcome: null,
-									failure: checked
+									failure: refreshed
 								});
+								await reload(false);
 								return;
 							}
 							patch(target.key, {
-								phase: "installing",
-								outcome: checked.value,
-								failure: null
+								phase: "failed",
+								outcome: current.outcome,
+								failure: {
+									...result,
+									manual: result.manual ?? current.outcome?.manual ?? null
+								}
 							});
-							version = checked.value.snapshot.latestVersion;
-						}
-						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 ? {
-								phase: "ready",
-								outcome: refreshed.value,
-								failure: null
-							} : {
+						} catch (error) {
+							patch(target.key, {
 								phase: "failed",
-								outcome: null,
-								failure: refreshed
+								outcome: current.outcome,
+								failure: {
+									ok: false,
+									code: "internal",
+									message: reasonText("internal"),
+									details: { detail: String(error?.message ?? error) },
+									manual: current.outcome?.manual ?? null
+								}
 							});
-							await reload(false);
-							return;
 						}
-						patch(target.key, {
-							phase: "failed",
-							outcome: current.outcome,
-							failure: {
-								...result,
-								manual: result.manual ?? current.outcome?.manual ?? null
-							}
-						});
 					})();
 				}, [
 					getCall,
@@ -1391,7 +1459,7 @@ window.__ModuleLoader__.load({
 				onClick: () => showProgress()
 			}, "查看进度")) : null;
 			const dialogNote = installingNow ? "安装在后台继续：关掉这块不会中断它。点「查看进度」可随时重新打开。" : checking ? "正在检查更新：关掉这块不会中断它，查完点「查看进度」看结果。" : "安装在宿主后台继续：关掉这块不会中断它。再点「检查更新」看最新进度。";
-			return react.createElement("div", null, react.createElement(RestartBanners, { face: props.face }), progressStrip, open ? react.createElement("div", {
+			return react.createElement("div", null, react.createElement(RestartBanners, { face: props.face }), busyNoteLine(props.face.busyNote), progressStrip, open ? react.createElement("div", {
 				style: PANEL_STYLE.overlay,
 				role: "presentation",
 				onClick: () => close()
@@ -1451,7 +1519,7 @@ window.__ModuleLoader__.load({
 					break;
 				default: headline = target.packageName + " " + String(installed) + " 已安装，插件包里也有注册代码，但它的设置页没有加载到面板：重启 DSH 后再看这个页签；仍然这样，就在 DSH 日志里找它的报错。";
 			}
-			return react.createElement("div", { style: PANEL_STYLE.reco }, react.createElement("div", null, headline), state === "absent" ? react.createElement("button", {
+			return react.createElement("div", { style: PANEL_STYLE.reco }, busyNoteLine(props.face.busyNote), react.createElement("div", null, headline), state === "absent" ? react.createElement("button", {
 				type: "button",
 				style: locked ? {
 					...PANEL_STYLE.btn,
@@ -3110,7 +3178,7 @@ window.__ModuleLoader__.load({
 			}, 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.21";
+		const MANAGER_VERSION_TEXT = "dsh-life-pack · 0.3.22";
 		/** 爱生活面板：总设置区 ＋ 检查更新（七家）＋ 爱生活页签条（slot 驱动）＋ 技能设置页投影/缺席卡。 */
 		function LifePackSection(props) {
 			const tabsId = react.useId();