dshmarket 1.36.0 → 1.37.0

package/client/client.js

@@ -4320,6 +4320,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
@@ -5475,7 +5540,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 +6463,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 +6498,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 +6529,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 +6550,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). */