dshmarket 1.36.0 → 1.38.0

package/client/client.js

@@ -135,6 +135,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			notesNone: "该插件未提供更新说明。",
 			notesLoadFail: "暂时读不到更新说明，稍后再试。",
 			restore: "恢复",
+			restoreOnline: "换用线上版本",
 			restoreHint: "会卸载本地版本，重新安装线上版本，并保持更新检测。无法回退，请二次确认。",
 			restoreContinue: "继续更新",
 			restoreNoCatalog: "精选目录里没有这个插件，无法恢复到线上版本。可以卸载本地版，或继续用本地开发。",
@@ -603,6 +604,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			notesNone: "This plugin does not publish update notes.",
 			notesLoadFail: "Update notes are unavailable right now — try again later.",
 			restore: "Restore",
+			restoreOnline: "Use online version",
 			restoreHint: "This will uninstall the local version, reinstall the catalog version, and keep update checks. This cannot be undone — please confirm again.",
 			restoreContinue: "Continue update",
 			restoreNoCatalog: "This plugin is not in the curated catalog, so it cannot be restored. Uninstall the local copy, or keep developing it locally.",
@@ -4320,6 +4322,71 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			});
 		}
 		//#endregion
+		//#region src/client/self-check.ts
+		/**
+		* What the browser can see about the market that the server cannot.
+		*
+		* This exists because of a pattern, not a hypothesis. #293 ("市场显示空白")
+		* and #384 ("lightbox cannot be closed") are both reproducible for their
+		* reporters and for nobody else, on clean profiles, across host versions.
+		* Both investigations then stalled in the same place: I asked the reporter to
+		* open a console and paste the result of an expression. That costs a day per
+		* question, asks a non-developer to run code from a stranger, and is the one
+		* step where a report goes quiet.
+		*
+		* Meanwhile the exported log — which the issue template already asks for, and
+		* which reporters do send — describes only the server: dependencies, bundle
+		* resolution, events. Everything it says was already true of a machine where
+		* the bug does not happen. The interesting half was in a page nobody looked
+		* at.
+		*
+		* So the browser answers the questions I have actually had to ask, in the
+		* artefact people already know how to produce. Nothing here diagnoses
+		* anything on its own; it is evidence, collected before it is needed.
+		*/
+		/**
+		* How many times this module has been evaluated in this page.
+		*
+		* Module scope runs once per module instance, so >1 means the market's client
+		* bundle was loaded twice — two React copies, two of every module singleton,
+		* two portal containers. That is a specific hypothesis for #384: two React
+		* roots each attach delegated listeners to their own portal container, and a
+		* click lands on whichever container is last in `body` while the handlers
+		* live on the other one, so the buttons look present and do nothing.
+		*
+		* Counted on `window` rather than in a module variable for the obvious
+		* reason: a module variable would be duplicated along with everything else
+		* and each copy would confidently report 1.
+		*/
+		const globals = globalThis;
+		globals.__dshmarketClientLoads = (globals.__dshmarketClientLoads ?? 0) + 1;
+		/** Whether `value` looks like a browser environment worth inspecting. */
+		const hasDom = () => typeof document !== "undefined" && document.body !== null;
+		/**
+		* The browser-side section of the exported log.
+		*
+		* Deliberately facts, not verdicts. "portal containers: 2" is something a
+		* reporter can paste without judging it, and something I can act on; "your
+		* bundle is double-loaded" would be a guess printed in the user's face, and
+		* wrong the first time a host legitimately renders two markets.
+		* @returns the lines to append, or an empty array outside a browser.
+		*/
+		function clientDiagnostics() {
+			if (!hasDom()) return [];
+			const portals = document.querySelectorAll("[data-dsh-market-portal]");
+			const roots = document.querySelectorAll("[data-dsh-market-root]");
+			const last = portals.length > 0 ? portals[portals.length - 1] : null;
+			return [
+				`client bundle evaluations: ${String(globals.__dshmarketClientLoads ?? 0)}`,
+				`market roots in the document: ${String(roots.length)}`,
+				`portal containers: ${String(portals.length)}` + (last === null ? "" : ` (last one is body's last child: ${String(last === document.body.lastElementChild)})`),
+				`plugin cards rendered: ${String(document.querySelectorAll("[data-dsh-market-root] [class*=\"_card\"]").length)}`,
+				`document baseURI: ${document.baseURI}`,
+				`page URL: ${location.origin}${location.pathname}`,
+				`user agent: ${navigator.userAgent}`
+			];
+		}
+		//#endregion
 		//#region src/client/MarketSection.tsx
 		/**
 		* The Market settings section: Discover / Themes / Installed tabs over the
@@ -5404,6 +5471,21 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const [qThemes, setQThemes] = (0, react.useState)("");
 			const [qInstalled, setQInstalled] = (0, react.useState)("");
 			const [cat, setCat] = (0, react.useState)("all");
+			(0, react.useEffect)(() => {
+				const target = props.preferredSubsectionId;
+				if (target === void 0) return;
+				const separator = target.indexOf(":");
+				const kind = separator === -1 ? target : target.slice(0, separator);
+				const value = separator === -1 ? "" : target.slice(separator + 1);
+				if (kind === "installed") {
+					setTab("installed");
+					setQInstalled(value);
+				} else if (kind === "discover") {
+					setTab("discover");
+					setCat("all");
+					setQ(value);
+				}
+			}, [props.preferredSubsectionId]);
 			const [confirming, setConfirming] = (0, react.useState)(null);
 			/** The plugin whose comment thread is open, or null. */
 			const [commentsFor, setCommentsFor] = (0, react.useState)(null);
@@ -5475,7 +5557,13 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				setExportState("busy");
 				fetch(api("/dsh-market/logs")).then(async (res) => {
 					if (!res.ok) throw new Error(`HTTP ${String(res.status)}`);
-					const blob = await res.blob();
+					const serverText = await res.text();
+					const browser = clientDiagnostics();
+					const blob = new Blob([serverText, ...browser.length > 0 ? [
+						"## browser\n",
+						browser.join("\n"),
+						"\n"
+					] : []], { type: "text/plain;charset=utf-8" });
 					const url = URL.createObjectURL(blob);
 					const anchor = document.createElement("a");
 					anchor.href = url;
@@ -6392,7 +6480,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				});
 				setUpdateNotes(null);
 				setNotesState("loading");
-				fetch(`/dsh-market/changelog?name=${encodeURIComponent(name)}`).then((res) => res.json()).then((body) => {
+				fetch(`${api("/dsh-market/changelog")}?name=${encodeURIComponent(name)}`).then((res) => res.json()).then((body) => {
 					setUpdateNotes(body);
 					setNotesState("ready");
 				}).catch(() => setNotesState("fail"));
@@ -6427,7 +6515,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			/** Write (or clear, when empty) this plugin's note. */
 			const saveNote = (0, react.useCallback)((name, text) => {
 				setNotingName(null);
-				fetch("/dsh-market/note", {
+				fetch(api("/dsh-market/note"), {
 					method: "POST",
 					headers: { "content-type": "application/json" },
 					body: JSON.stringify({
@@ -6458,7 +6546,9 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				}))).then(({ status, body }) => {
 					if (status === 200 && body.ok) {
 						if (!body.hot) setRemovedCount((n) => n + 1);
-						clearPendingRefresh(name);
+						const neverLoadedHere = hotNames.includes(name) || refreshNames.includes(name);
+						if (body.refresh === true && !neverLoadedHere) setRefreshNames((names) => names.includes(name) ? names : names.concat(name));
+						else clearPendingRefresh(name);
 						refreshInstalled();
 					} else {
 						if (body.cancelled === true) {
@@ -6477,7 +6567,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						setInstallError((text(body.error) || humanOutput(text(body.stderr)) || "error").trim().slice(-600));
 					}
 				}).catch((error) => setInstallError(String(error))).finally(() => setRemovingName(null));
-			}, [refreshInstalled]);
+			}, [
+				refreshInstalled,
+				hotNames,
+				refreshNames
+			]);
 			/** Live enable/disable of one installed plugin (#60). `reload` opts the
 			* card-level theme flow into a page refresh so the visual result lands
 			* immediately (mirrors the use-skin reload on activate). */
@@ -6661,10 +6755,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				});
 			}, [doGroupAction, groups]);
 			const selfName = installed["dshmarket"] !== void 0 ? "dshmarket" : "dsh-market";
-			const updatableNames = Object.keys(installed).filter((name) => name !== selfName && !updatedNames.includes(name) && updates[name] && updates[name].updateAvailable);
+			const batchUpdatableNames = Object.keys(installed).filter((name) => name !== selfName && !updatedNames.includes(name) && updates[name] && updates[name].updateAvailable).filter((name) => updates[name]?.restoreRequired !== true);
 			const installedOtherCount = Object.keys(installed).filter((name) => name !== selfName).length;
 			const doUpdateAll = (0, react.useCallback)(() => {
-				const names = updatableNames.slice();
+				const names = batchUpdatableNames.slice();
 				setUpdatingAll(true);
 				const next = () => {
 					const name = names.shift();
@@ -6675,7 +6769,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					doUpdate(name).then(next, next);
 				};
 				next();
-			}, [updatableNames, doUpdate]);
+			}, [batchUpdatableNames, doUpdate]);
 			const finishRestore = (0, react.useCallback)((body) => {
 				const errors = Array.isArray(body.errors) ? body.errors : [];
 				const unportable = Array.isArray(body.unportable) ? body.unportable : [];
@@ -7433,18 +7527,20 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 									}),
 									(() => {
 										const self = installed["dshmarket"] !== void 0 ? "dshmarket" : "dsh-market";
-										return updates[self] && updates[self].updateAvailable && !updatedNames.includes(self) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+										const status = updates[self];
+										return status && status.updateAvailable && !updatedNames.includes(self) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 											variant: "primary",
 											size: "sm",
 											disabled: updatingName !== null || busyUrl !== null,
 											onClick: () => {
 												setTab("installed");
-												doUpdate(self);
+												if (status.restoreRequired === true) askRestore(self);
+												else doUpdate(self);
 											},
-											children: updatingName === self ? t("updating") : t("marketUpdate")
+											children: updatingName === self ? t("updating") : status.restoreRequired === true ? t("restoreOnline") : t("marketUpdate")
 										});
 									})(),
-									updatableNames.length >= 2 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									batchUpdatableNames.length >= 2 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 										variant: "primary",
 										size: "sm",
 										disabled: updatingAll || updatingName !== null || busyUrl !== null || removingName !== null,
@@ -7452,7 +7548,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 											setTab("installed");
 											doUpdateAll();
 										},
-										children: updatingAll ? t("updating") : t("updateAll") + " (" + updatableNames.length + ")"
+										children: updatingAll ? t("updating") : t("updateAll") + " (" + batchUpdatableNames.length + ")"
 									})
 								]
 							}),
@@ -8804,8 +8900,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 														size: "sm",
 														className: Market_module_css_default.warnBtn,
 														disabled: updatingName !== null,
-														onClick: () => doUpdate(name),
-														children: t("update")
+														onClick: () => {
+															if (status.restoreRequired === true) askRestore(name);
+															else doUpdate(name);
+														},
+														children: status.restoreRequired === true ? t("restoreOnline") : t("update")
 													}) : localDev ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 														className: Market_module_css_default.metaTag,
 														title: t("linkedDev"),
@@ -8820,7 +8919,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 														className: Market_module_css_default.dangerBtn,
 														disabled: true,
 														children: t("uninstalling")
-													}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [localDev && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+													}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [localDev && status?.restoreRequired !== true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 														variant: "outline",
 														size: "sm",
 														disabled: removingName !== null || busyUrl !== null || updatingName !== null,
@@ -9334,7 +9433,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			return {
 				updateAvailable: own.updateAvailable === true,
 				latest: own.latest ?? null,
-				channelSwitch: own.channelSwitch ?? null
+				channelSwitch: own.channelSwitch ?? null,
+				restoreRequired: own.restoreRequired === true
 			};
 		}
 		/**
@@ -9356,6 +9456,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const [status, setStatus] = (0, react.useState)(null);
 			const [update, setUpdate] = (0, react.useState)(null);
 			const [phase, setPhase] = (0, react.useState)("idle");
+			const [restoreConfirming, setRestoreConfirming] = (0, react.useState)(false);
 			const [purge, setPurge] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)(null);
 			/**
@@ -9405,6 +9506,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				})).json();
 			}, []);
 			const onUpdate = (0, react.useCallback)((force = false) => {
+				setRestoreConfirming(false);
 				setPhase("working");
 				setError(null);
 				setStale(false);
@@ -9412,6 +9514,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					try {
 						const body = await post(api("/dsh-market/update"), {
 							name: "dshmarket",
+							...update?.restoreRequired === true ? { restore: true } : {},
 							...force ? { force: true } : {}
 						});
 						if (body.ok === true) setPhase("updated");
@@ -9425,7 +9528,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						setPhase("failed");
 					}
 				})();
-			}, [post, t]);
+			}, [
+				post,
+				t,
+				update?.restoreRequired
+			]);
 			const onRemove = (0, react.useCallback)(() => {
 				setPhase("working");
 				setError(null);
@@ -9531,13 +9638,26 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 				variant: "primary",
 				size: "sm",
 				disabled: busy,
-				onClick: () => onUpdate()
-			}, t("setSelfUpdate")) : update?.channelSwitch != null ? (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				onClick: () => {
+					if (update.restoreRequired) setRestoreConfirming(true);
+					else onUpdate();
+				}
+			}, update.restoreRequired ? t("restoreOnline") : t("setSelfUpdate")) : update?.channelSwitch != null ? (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 				variant: "outline",
 				size: "sm",
 				disabled: busy,
 				onClick: () => onUpdate()
-			}, t("setChannelSwitch")) : null) : null, status?.selfManaged === true ? row(t("setChannel"), t(CHANNEL_HINT[status.channel]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.channels ?? ["stable", "beta"]).map((id) => (0, react.createElement)("button", {
+			}, t("setChannelSwitch")) : null) : null, status?.selfManaged === true && restoreConfirming ? (0, react.createElement)("div", { className: Market_module_css_default.setConfirm }, (0, react.createElement)("div", { className: Market_module_css_default.setHint }, t("restoreHint")), (0, react.createElement)("div", { className: Market_module_css_default.setActions }, (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				variant: "ghost",
+				size: "sm",
+				onClick: () => {
+					setRestoreConfirming(false);
+				}
+			}, t("setSelfCancel")), (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				variant: "primary",
+				size: "sm",
+				onClick: () => onUpdate()
+			}, t("restoreContinue")))) : null, status?.selfManaged === true ? row(t("setChannel"), t(CHANNEL_HINT[status.channel]), (0, react.createElement)("div", { className: Market_module_css_default.setSeg }, (status?.channels ?? ["stable", "beta"]).map((id) => (0, react.createElement)("button", {
 				key: id,
 				type: "button",
 				className: status?.channel === id ? `${Market_module_css_default.setSegBtn} ${Market_module_css_default.setSegOn}` : Market_module_css_default.setSegBtn,
@@ -9648,14 +9768,15 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 					label: () => t("nav"),
 					locale: NS,
 					inject: () => ({ t })
-				}, () => (0, react.createElement)(MarketSection, {
+				}, (ownerProps = {}) => (0, react.createElement)(MarketSection, {
 					t,
 					locale: ctx.locale,
 					theme: ctx.theme,
 					themeStore: {
 						subscribe: (cb) => ctx.on("theme/change", cb),
 						getSnapshot: () => ctx.theme.getTheme()
-					}
+					},
+					preferredSubsectionId: ownerProps.preferredSubsectionId
 				}));
 				if (typeof off === "function") retireSection = off;
 				return off;