dsh-session-guard 4.0.2 → 4.1.11

package/cordis.patch.yml

@@ -1,10 +1,10 @@
-# dsh-session-guard bundle patch：一行装配进 profile。
-#
-# host 半（src/index.js）注册 sessionGuard 服务（冗余端口，供 input-traffic 适配）、
-# 高峰自动会话门（taskControl.pause/resume，缺失时回退锁等待队列）、
-# /session-guard/* 路由与 设置→插件→session-guard 子板块（简单开关）。
-# 浏览器半（src/client/index.js，经 package.json dsh.client 声明）提供
-# 高峰状态徽标 + 无 input-traffic 时的回退冻结按钮。
-- insert:
-    - id: session-guard
-      name: dsh-session-guard
+# dsh-session-guard bundle patch：一行装配进 profile。
+#
+# host 半（src/index.js）注册 sessionGuard 服务（冗余端口，供 input-traffic 适配）、
+# 高峰自动会话门（taskControl.pause/resume，缺失时回退锁等待队列）、
+# /session-guard/* 路由与 设置→插件→session-guard 子板块（简单开关）。
+# 浏览器半（src/client/index.js，经 package.json dsh.client 声明）提供
+# 高峰状态徽标 + 无 input-traffic 时的回退冻结按钮。
+- insert:
+    - id: session-guard
+      name: dsh-session-guard

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-session-guard",
-  "version": "4.0.0",
+  "version": "4.1.11",
   "main": "./src/index.js",
   "description": "高峰自动会话门：step 级门控 + 周末模式 + 高峰自动暂停 + 官方源二维判定 + 会话级冻结 + 后端自动重试。",
   "engines": {

package/lib/client.js

@@ -66,11 +66,17 @@ window.__ModuleLoader__.load({
 		* 轮询 host 的 /session-guard/status（全局当前阶段），显示 高峰/谷时/周末；
 		* 高峰期按二维判定区分「只拦官方」与「全部暂停」（文案见 badge-text.ts）。
 		* 仅展示，不做任何队列/会话动作；冻结按钮由 input-traffic 经桥接管（D6/D8）。
+		*
+		* 自适应退避（universal-rc）：视口宽度不足（< PEAK_BADGE_MIN_VIEWPORT，窄窗/
+		* 分屏）或新空会话（sessionId 未落盘为 undefined）→ 整体退避隐藏。
 		*/
 		const POLL_MS$1 = 15e3;
+		/** 视口宽度退避阈值：低于此值隐藏徽标（窄窗/分屏下输入区放不下）。 */
+		const PEAK_BADGE_MIN_VIEWPORT = 960;
 		/** 状态徽标：轮询全局阶段，显示 高峰/谷时/周末（enabled 关闭或请求失败时静默隐藏）。 */
 		function StatusBadge({ sessionId }) {
 			const [status, setStatus] = (0, react.useState)(null);
+			const [viewportNarrow, setViewportNarrow] = (0, react.useState)(() => typeof window !== "undefined" && window.innerWidth < PEAK_BADGE_MIN_VIEWPORT);
 			injectClientCss();
 			(0, react.useEffect)(() => {
 				if (!sessionId) return;
@@ -88,6 +94,12 @@ window.__ModuleLoader__.load({
 					clearInterval(timer);
 				};
 			}, [sessionId]);
+			(0, react.useEffect)(() => {
+				const onResize = () => setViewportNarrow(window.innerWidth < PEAK_BADGE_MIN_VIEWPORT);
+				window.addEventListener("resize", onResize);
+				return () => window.removeEventListener("resize", onResize);
+			}, []);
+			if (viewportNarrow) return null;
 			if (!status || !status.enabled) return null;
 			const cls = status.phase === "peak" ? "sg-peak" : status.phase === "weekend" ? "sg-weekend" : "sg-off";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -603,6 +615,82 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/shell-overlay.tsx
+		/**
+		* dsh-session-guard — 无设置页宿主（0.1.0/0.1.1）的兜底配置入口。
+		*
+		* 壳级 `shell.overlay` 席位渲染：右下角固定齿轮钮，点开固定定位浮层承载
+		* SessionGuardCard（page 形态，默认展开）。配置存储全在 host 侧（settings
+		* 服务），浮层与宿主设置页解耦——壳再老也不影响读写。有设置页的宿主上
+		* 该齿轮与行配置卡/家族 tab 并存，作为全局快捷入口。
+		*/
+		function ShellSettingsEntry(props) {
+			const [open, setOpen] = (0, react.useState)(false);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				style: {
+					position: "fixed",
+					right: 16,
+					bottom: 64,
+					zIndex: 1e4
+				},
+				children: [
+					open && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						onClick: () => setOpen(false),
+						style: {
+							position: "fixed",
+							top: 0,
+							left: 0,
+							right: 0,
+							bottom: 0,
+							background: "rgba(0,0,0,.45)",
+							zIndex: 1e4
+						}
+					}),
+					open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						style: {
+							position: "fixed",
+							top: "6vh",
+							left: "50%",
+							transform: "translateX(-50%)",
+							width: "min(760px, 92vw)",
+							maxHeight: "84vh",
+							overflowY: "auto",
+							zIndex: 10001
+						},
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							onClick: () => setOpen(false),
+							style: {
+								position: "sticky",
+								top: 6,
+								float: "right",
+								marginRight: 8,
+								zIndex: 2
+							},
+							children: "✕ 关闭"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SessionGuardCard, { scope: props.scope })]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						title: "会话守护设置",
+						onClick: () => setOpen((state) => !state),
+						style: {
+							width: 40,
+							height: 40,
+							borderRadius: "50%",
+							border: "1px solid rgba(127,127,127,.4)",
+							background: "rgba(30,30,32,.85)",
+							color: "inherit",
+							cursor: "pointer",
+							fontSize: 16,
+							boxShadow: "0 4px 16px rgba(0,0,0,.35)"
+						},
+						children: "🛡"
+					})
+				]
+			});
+		}
+		//#endregion
 		//#region src/client/family-section.tsx
 		/**
 		* dsh-session-guard — 家族节接管组件（fallback host section）。
@@ -616,17 +704,24 @@ window.__ModuleLoader__.load({
 		* 与 thinking-levels 的 FamilySettingsSection 的差别仅在不需要 thinking-
 		* levels 自己的卡（宿主不在了，它的卡也不在）：渲染循环没有 own-tab 特例。
 		*/
+		const NO_TABS = [];
 		function GuardFamilySection(props) {
-			const tabs = (0, react.useSyncExternalStore)(props.hooks.tabs.subscribe, props.hooks.tabs.getSnapshot);
+			const raw = props.hooks?.tabs;
+			const [polled, setPolled] = (0, react.useState)(() => raw?.getSnapshot() ?? NO_TABS);
+			(0, react.useEffect)(() => {
+				if (props.useTabs !== void 0 || raw === void 0) return;
+				return raw.subscribe(() => setPolled(raw.getSnapshot()));
+			});
+			const tabs = props.useTabs !== void 0 ? props.useTabs((value) => value) : polled;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				style: {
 					display: "grid",
 					gap: "12px"
 				},
-				children: tabs.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: props.renderSlot("dsh-family.tab", {}, {
+				children: tabs.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: props.renderSlot ? props.renderSlot("dsh-family.tab", {}, {
 					only: row.id,
 					fallback: null
-				}) }, row.id))
+				}) : props.renderContributor?.(row.id) ?? null }, row.id))
 			});
 		}
 		//#endregion
@@ -641,6 +736,9 @@ window.__ModuleLoader__.load({
 		*   桥接 host 会话门；本插件客户端不注册任何按钮，避免与 input-traffic 冲突。
 		* - 0.1.7：旧的插件设置卡已随席位删除 —— 设置表单由 host
 		*   侧 Config 的 `.volatile()` 字段自动生成。
+		* - 跨版本（universal-rc）：持久设置经 configForms(0.1.7+)/settingsScope(≤0.1.5)
+		*   双代腰产出同形 scope；无设置页宿主（0.1.0/0.1.1）经 shell.overlay 浮窗
+		*   齿轮提供配置入口（配置存储全在 host 侧，浮层与宿主设置页解耦）。
 		*
 		* 构建：tsdown → lib/client.js（__ModuleLoader__.load 注册，与 input-traffic 同构）。
 		*/
@@ -648,60 +746,140 @@ window.__ModuleLoader__.load({
 		const FAMILY_SECTION_ID = "dsh-family";
 		/** 家族子席位 key（与 thinking-levels 的声明严格一致）。 */
 		const FAMILY_CHILD_KEY = "dsh-family.tab";
+		/** 让位宽限：声明批内 TL 的注册微秒级落账，此延迟后查账本足以分辨「TL 在场」。 */
+		const FAMILY_YIELD_MS = 500;
 		/**
-		* 接管宽限期：等宿主（以及排名更前的贡献方）先落座。下载量排名 guard(1522)
-		* 高于 session-steward(1090) → guard 宽限期更短、先尝试接管；并发冲突由
-		* ui-slots 的「同 id 同 priority 重复注册抛错」仲裁，后到者放弃即可。
+		* 客户端所需服务：slots（状态徽标）+ locale。持久设置走双代腰
+		* （registerSettingsFaces）：configForms 为 0.1.7+ 独有，顶层注入会在
+		* 0.1.0/0.1.1（无此服务）上让整段 apply 静默死。
 		*/
-		const FAMILY_HOST_GRACE_MS = 2e3;
-		/** 客户端所需服务：slots（状态徽标）+ locale + configForms（共用 tab 设置卡）。 */
-		const inject = [
-			"slots",
-			"locale",
-			"configForms"
-		];
-		function apply(ctx) {
-			ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
-				name: "conversation.input.right",
-				id: "session-guard-pause",
-				order: 20,
-				locale: "session-guard"
-			}, PauseButton));
-			ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
-				name: "conversation.input.right",
-				id: "session-guard-status",
-				order: 40,
-				locale: "session-guard"
-			}, StatusBadge));
+		const inject = ["slots", "locale"];
+		/** 单面注册护栏：某条宿主线上未知槽名/缺服务的同步异常不得带走其它面。 */
+		function safe(tag, fn) {
+			try {
+				fn();
+			} catch (error) {
+				console.warn(`dsh-session-guard: client surface '${tag}' failed:`, error);
+			}
+		}
+		/**
+		* 双代持久设置腰（移植 input-traffic registerSettingsFaces）：两个 scoped
+		* 子注入各自产出同形 scope 后回调；0.2.0 两代并存时以 configForms 先到为准
+		* （mounted 位防双挂载，ui-slots 同 id 仲裁兜底）。
+		*/
+		function registerSettingsFaces(ctx, onScope) {
+			let mounted = false;
+			ctx.inject(["configForms"], (sctx) => {
+				if (mounted) return;
+				mounted = true;
+				onScope(sctx.configForms.get("session-guard"), "configForms");
+			});
+			ctx.inject(["settingsScope"], (sctx) => {
+				if (mounted) return;
+				mounted = true;
+				onScope(sctx.settingsScope.bind({ namespace: "session-guard" }), "settingsScope");
+			});
+		}
+		/** 两张配置卡（family tab + bundle 详情页）挂载；scope 由双代腰产出。 */
+		function mountConfigCards(ctx, scope) {
 			ctx.slots.inject("dsh-family.tab", () => ctx.slots.register({
 				name: "dsh-family.tab",
 				id: "session-guard",
 				order: 20,
 				label: "会话守护门禁",
 				locale: "session-guard",
-				inject: () => ({ scope: ctx.configForms.get("session-guard") })
+				inject: () => ({ scope })
 			}, SessionGuardCard));
 			ctx.slots.inject("plugins.bundle.config", () => ctx.slots.register({
 				name: "plugins.bundle.config",
 				key: "dsh-session-guard",
-				inject: () => ({ scope: ctx.configForms.get("session-guard") })
+				inject: () => ({ scope })
 			}, SessionGuardCard));
-			setTimeout(() => {
-				if (ctx.slots.entries("settings.section").some((e) => e.options.id === FAMILY_SECTION_ID)) return;
-				try {
-					ctx.slots.register({
-						name: "settings.section",
-						id: FAMILY_SECTION_ID,
-						order: 40,
-						label: () => "起子插件设置",
-						inject: () => makeGuardFamilyTabsHooks(ctx.slots),
-						children: { [FAMILY_CHILD_KEY]: {
-							kind: "list",
-							scope: "root"
-						} }
-					}, GuardFamilySection);
-				} catch {}
-			}, FAMILY_HOST_GRACE_MS);
+		}
+		function apply(ctx) {
+			safe("conversation.input.right/pause", () => ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
+				name: "conversation.input.right",
+				id: "session-guard-pause",
+				order: 20,
+				locale: "session-guard"
+			}, PauseButton)));
+			safe("conversation.input.right/status", () => ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
+				name: "conversation.input.right",
+				id: "session-guard-status",
+				order: 40,
+				locale: "session-guard"
+			}, StatusBadge)));
+			registerSettingsFaces(ctx, (scope, generation) => {
+				safe(`config-cards/${generation}`, () => {
+					mountConfigCards(ctx, scope);
+					ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
+						name: "settings.plugin.item",
+						id: "session-guard",
+						key: "session-guard",
+						order: 60,
+						locale: "session-guard",
+						inject: () => ({ scope })
+					}, SessionGuardCard));
+				});
+				safe("shell.overlay", () => ctx.slots.inject("shell.overlay", () => ctx.slots.register({
+					name: "shell.overlay",
+					id: "session-guard-settings"
+				}, () => ShellSettingsEntry({ scope }))));
+			});
+			safe("family-section-election", () => {
+				console.log("[dsh-session-guard] election: registering settings.section inject (apply-time)");
+				ctx.slots.inject("settings.section", () => {
+					console.log("[dsh-session-guard] election: factory fired (settings.section declared)");
+					setTimeout(() => {
+						if (ctx.slots.entries("settings.section").some((e) => e.options.id === FAMILY_SECTION_ID)) {
+							console.log("[dsh-session-guard] election: dsh-family already seated — stand down");
+							return;
+						}
+						const base = {
+							name: "settings.section",
+							id: FAMILY_SECTION_ID,
+							order: 40,
+							priority: 10,
+							label: () => "起子插件设置",
+							inject: () => ({
+								hooks: makeGuardFamilyTabsHooks(ctx.slots),
+								renderContributor
+							})
+						};
+						try {
+							ctx.slots.register({
+								...base,
+								children: { [FAMILY_CHILD_KEY]: {
+									kind: "list",
+									scope: "root"
+								} }
+							}, GuardFamilySection);
+							console.log("[dsh-session-guard] family takeover registered (children declared)");
+						} catch (error) {
+							console.log(`[dsh-session-guard] children decl conflict (${error instanceof Error ? error.message : error}); registering without children`);
+							try {
+								ctx.slots.register(base, GuardFamilySection);
+								console.log("[dsh-session-guard] family takeover registered (no children)");
+							} catch (secondary) {
+								console.log(`[dsh-session-guard] family takeover abandoned: ${secondary instanceof Error ? secondary.message : secondary}`);
+							}
+						}
+					}, FAMILY_YIELD_MS);
+				});
+			});
+		}
+		/** 直接挂载面（≤0.1.5 壳无 renderSlot 的降级）：从账本原始条目现挂激活卡。
+		* entries 每代都带 component + inject（ui-slots SlotCore.entries 原始记录）；
+		* 任何失败（条目消失/抛错 inject）降级为 null，不炸接管节。 */
+		function renderContributor(id) {
+			try {
+				const entry = ctx.slots.entries(FAMILY_CHILD_KEY).find((e) => e.options.id === id);
+				if (entry === void 0 || typeof entry.component !== "function") return null;
+				const injected = typeof entry.inject === "function" ? entry.inject() : void 0;
+				return (0, react.createElement)(entry.component, injected ?? {});
+			} catch {
+				return null;
+			}
 		}
 		/** 接管节的账本投影 hooks（与 thinking-levels 的 FamilySectionInjected 同形）。 */
 		function makeGuardFamilyTabsHooks(slots) {