dshmarket 1.12.0 → 1.12.2

package/README.md

@@ -17,6 +17,10 @@ One-click themes — install, switch live, no restart:
 
 ![Themes tab](assets/themes-en.png)
 
+On dsh 0.1.0-rc.7 and newer the market puts its own option where the host keeps every other plugin's — no YAML:
+
+![Settings card](assets/settings-en.png)
+
 ## Install
 
 ```sh
@@ -72,8 +76,9 @@ Installs prefer npm tarballs over full-repo GitHub downloads whenever a plugin p
 
 ## Roadmap & feedback
 
-- Planned features live on the [Roadmap](https://github.com/orgs/dsh-market/projects/1) — every item welcomes community PRs (drop a note in the linked issue before starting)
-- File bugs and ideas as [issues](https://github.com/dsh-market/dsh-market/issues); attaching the market's "Export log" makes diagnosis 10x faster
+- **Bugs** go in [issues](https://github.com/dsh-market/dsh-market/issues) — attaching the market's "Export log" makes diagnosis roughly ten times faster
+- **Feature ideas** go on the [Roadmap](https://github.com/orgs/dsh-market/projects/1). Issues are kept for things that are broken, so a proposal filed as an issue gets moved there and closed; the discussion stays where you wrote it either way
+- Every roadmap item welcomes community PRs — say so on the item before starting, so two people don't build it twice
 
 ## Data source
 

package/README.zh.md

@@ -17,6 +17,10 @@
 
 ![主题](assets/themes-zh.png)
 
+dsh 0.1.0-rc.7 起，市场自己的选项也放在宿主统一管理插件配置的地方——不用改 YAML：
+
+![设置卡片](assets/settings-zh.png)
+
 ## 安装
 
 ```sh
@@ -69,8 +73,9 @@ dsh plugin --profile web add dshmarket
 
 ## 路线图与反馈
 
-- 功能规划见 [Roadmap](https://github.com/orgs/dsh-market/projects/1)，每一项都欢迎社区 PR（动手前在对应 issue 里说一声）
-- Bug 与建议请提 [issue](https://github.com/dsh-market/dsh-market/issues)，附上市场页面的「导出日志」能让排查快十倍
+- **Bug** 提 [issue](https://github.com/dsh-market/dsh-market/issues)，附上市场页面的「导出日志」能让排查快十倍
+- **功能建议**放 [Roadmap](https://github.com/orgs/dsh-market/projects/1)。issues 只留「坏掉的东西」，所以提成 issue 的建议会被移到那边并关闭；讨论仍留在你写的地方
+- 路线图上的每一项都欢迎社区 PR——动手前在对应条目里说一声，免得两个人重复造
 
 ## 数据源
 

package/client/client.js

@@ -889,6 +889,46 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			readmeShotsCache.set(cacheKey, task);
 			return task;
 		}
+		/**
+		* The human-readable part of a failed command's output.
+		*
+		* pnpm's ndjson reporter writes one JSON object per progress tick, and a
+		* large `github:` download emits thousands of them. When a failure matches
+		* none of the known signatures there is no diagnosis to show, so the UI
+		* falls back to the tail of stdout/stderr — which for exactly that case is
+		* 600 characters of `{"name":"pnpm:fetching-progress","downloaded":…}`.
+		* The user is handed machine noise at the one moment they need a sentence
+		* (#148, and the same shape behind #161).
+		*
+		* Progress objects are dropped; anything else — including JSON carrying a
+		* real message — is kept, because an unrecognized failure is precisely when
+		* throwing information away is most expensive.
+		*/
+		function humanOutput(raw) {
+			const lines = raw.split(/\r?\n/);
+			const kept = [];
+			for (const line of lines) {
+				const trimmed = line.trim();
+				if (trimmed === "") continue;
+				if (!trimmed.startsWith("{")) {
+					kept.push(line);
+					continue;
+				}
+				try {
+					const parsed = JSON.parse(trimmed);
+					const name = typeof parsed.name === "string" ? parsed.name : "";
+					if (parsed.err !== void 0 || typeof parsed.message === "string") {
+						kept.push(line);
+						continue;
+					}
+					if (name.startsWith("pnpm:")) continue;
+					kept.push(line);
+				} catch {
+					kept.push(line);
+				}
+			}
+			return kept.join("\n").trim();
+		}
 		//#endregion
 		//#region src/client/InstallToast.tsx
 		/**
@@ -927,155 +967,155 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			document.head.appendChild(tag);
 		}
 		var Market_module_css_default = {
+			"dragHandle": "eGUBIq_dragHandle",
+			"row1": "eGUBIq_row1",
+			"src": "eGUBIq_src",
 			"sub": "eGUBIq_sub",
-			"nm": "eGUBIq_nm",
+			"actWhy": "eGUBIq_actWhy",
+			"grid": "eGUBIq_grid",
+			"dot": "eGUBIq_dot",
+			"depLine": "eGUBIq_depLine",
+			"backupGrid": "eGUBIq_backupGrid",
+			"specTagFile": "eGUBIq_specTagFile",
+			"assignRow": "eGUBIq_assignRow",
+			"card": "eGUBIq_card",
+			"staleAction": "eGUBIq_staleAction",
+			"setTitle": "eGUBIq_setTitle",
+			"viewOn": "eGUBIq_viewOn",
+			"tabs": "eGUBIq_tabs",
 			"err": "eGUBIq_err",
+			"backupInput": "eGUBIq_backupInput",
+			"bannerHint": "eGUBIq_bannerHint",
+			"grow": "eGUBIq_grow",
+			"diagBadgeOfficial": "eGUBIq_diagBadgeOfficial",
+			"diagBadgeShadow": "eGUBIq_diagBadgeShadow",
+			"cmd": "eGUBIq_cmd",
+			"bar": "eGUBIq_bar",
+			"catsToggle": "eGUBIq_catsToggle",
+			"deprecate": "eGUBIq_deprecate",
+			"irow": "eGUBIq_irow",
+			"diagRow": "eGUBIq_diagRow",
+			"inlineInput": "eGUBIq_inlineInput",
+			"panelNote": "eGUBIq_panelNote",
+			"pagerPages": "eGUBIq_pagerPages",
+			"swatches": "eGUBIq_swatches",
 			"setDesc": "eGUBIq_setDesc",
+			"sectAction": "eGUBIq_sectAction",
+			"setRow": "eGUBIq_setRow",
+			"backupWarn": "eGUBIq_backupWarn",
+			"dragging": "eGUBIq_dragging",
+			"tag": "eGUBIq_tag",
 			"diagKey": "eGUBIq_diagKey",
-			"grid": "eGUBIq_grid",
-			"collapseIcon": "eGUBIq_collapseIcon",
-			"root": "eGUBIq_root",
-			"depBadge": "eGUBIq_depBadge",
-			"dshmSlide": "eGUBIq_dshmSlide",
-			"groupAddPanel": "eGUBIq_groupAddPanel",
-			"catsToggle": "eGUBIq_catsToggle",
-			"bannerIcon": "eGUBIq_bannerIcon",
-			"diagSection": "eGUBIq_diagSection",
-			"groupHead": "eGUBIq_groupHead",
-			"diagBadgeOfficial": "eGUBIq_diagBadgeOfficial",
-			"ovByTag": "eGUBIq_ovByTag",
-			"sectionOverview": "eGUBIq_sectionOverview",
-			"backupCard": "eGUBIq_backupCard",
-			"diagSummaryMeta": "eGUBIq_diagSummaryMeta",
 			"diagSummary": "eGUBIq_diagSummary",
-			"empty": "eGUBIq_empty",
+			"diagBadgeCommunity": "eGUBIq_diagBadgeCommunity",
+			"setCard": "eGUBIq_setCard",
 			"modalNote": "eGUBIq_modalNote",
-			"descTight": "eGUBIq_descTight",
-			"topBtn": "eGUBIq_topBtn",
-			"actWarn": "eGUBIq_actWarn",
-			"assignRow": "eGUBIq_assignRow",
-			"catsCollapsed": "eGUBIq_catsCollapsed",
-			"switch": "eGUBIq_switch",
-			"assignSelect": "eGUBIq_assignSelect",
-			"orphBadge": "eGUBIq_orphBadge",
-			"fixFallbackText": "eGUBIq_fixFallbackText",
-			"setRevert": "eGUBIq_setRevert",
-			"barFill": "eGUBIq_barFill",
-			"groupMembers": "eGUBIq_groupMembers",
-			"diagIndex": "eGUBIq_diagIndex",
-			"diagList": "eGUBIq_diagList",
-			"fixFallback": "eGUBIq_fixFallback",
-			"setTitle": "eGUBIq_setTitle",
-			"backupCheck": "eGUBIq_backupCheck",
+			"act": "eGUBIq_act",
+			"specTag": "eGUBIq_specTag",
 			"top": "eGUBIq_top",
-			"loading": "eGUBIq_loading",
-			"dragging": "eGUBIq_dragging",
-			"progress": "eGUBIq_progress",
-			"backupCheckList": "eGUBIq_backupCheckList",
-			"depLine": "eGUBIq_depLine",
-			"diagBundle": "eGUBIq_diagBundle",
-			"sectAction": "eGUBIq_sectAction",
-			"av": "eGUBIq_av",
-			"groupMember": "eGUBIq_groupMember",
-			"diagPage": "eGUBIq_diagPage",
-			"switchKnob": "eGUBIq_switchKnob",
-			"deprecate": "eGUBIq_deprecate",
-			"diagSummaryItem": "eGUBIq_diagSummaryItem",
-			"pagerPages": "eGUBIq_pagerPages",
+			"srcBtn": "eGUBIq_srcBtn",
+			"irowMissing": "eGUBIq_irowMissing",
+			"diagMeta": "eGUBIq_diagMeta",
+			"actBroken": "eGUBIq_actBroken",
+			"star": "eGUBIq_star",
+			"tab": "eGUBIq_tab",
+			"backupCard": "eGUBIq_backupCard",
+			"cats": "eGUBIq_cats",
+			"body": "eGUBIq_body",
+			"dshmSlide": "eGUBIq_dshmSlide",
+			"orphBadge": "eGUBIq_orphBadge",
+			"themesGrid": "eGUBIq_themesGrid",
+			"on": "eGUBIq_on",
+			"catsWrap": "eGUBIq_catsWrap",
+			"catsCollapsed": "eGUBIq_catsCollapsed",
 			"ovArrow": "eGUBIq_ovArrow",
-			"sp": "eGUBIq_sp",
-			"diagVal": "eGUBIq_diagVal",
-			"orphRow": "eGUBIq_orphRow",
-			"title": "eGUBIq_title",
-			"dragHandle": "eGUBIq_dragHandle",
-			"src": "eGUBIq_src",
-			"tabSearch": "eGUBIq_tabSearch",
-			"version": "eGUBIq_version",
-			"viewOn": "eGUBIq_viewOn",
 			"groupName": "eGUBIq_groupName",
-			"diagBadgeShadow": "eGUBIq_diagBadgeShadow",
-			"body": "eGUBIq_body",
+			"ovFrom": "eGUBIq_ovFrom",
+			"fixFallbackText": "eGUBIq_fixFallbackText",
+			"nm": "eGUBIq_nm",
+			"actLive": "eGUBIq_actLive",
+			"backupMessage": "eGUBIq_backupMessage",
+			"setHint": "eGUBIq_setHint",
+			"hiddenFile": "eGUBIq_hiddenFile",
+			"collapseIcon": "eGUBIq_collapseIcon",
+			"orphRow": "eGUBIq_orphRow",
+			"foot": "eGUBIq_foot",
 			"viewBar": "eGUBIq_viewBar",
-			"setLabel": "eGUBIq_setLabel",
-			"catsWrap": "eGUBIq_catsWrap",
+			"groupHead": "eGUBIq_groupHead",
+			"tabSearch": "eGUBIq_tabSearch",
+			"av": "eGUBIq_av",
+			"root": "eGUBIq_root",
+			"diagVal": "eGUBIq_diagVal",
+			"titleRow": "eGUBIq_titleRow",
+			"switch": "eGUBIq_switch",
+			"diagBundle": "eGUBIq_diagBundle",
+			"warnLine": "eGUBIq_warnLine",
+			"actWarn": "eGUBIq_actWarn",
+			"specTagGit": "eGUBIq_specTagGit",
+			"progress": "eGUBIq_progress",
 			"viewBtn": "eGUBIq_viewBtn",
-			"barWave": "eGUBIq_barWave",
+			"diagEmpty": "eGUBIq_diagEmpty",
+			"backupActions": "eGUBIq_backupActions",
+			"setHead": "eGUBIq_setHead",
+			"loading": "eGUBIq_loading",
+			"dragOver": "eGUBIq_dragOver",
+			"backupCheckList": "eGUBIq_backupCheckList",
 			"groupHint": "eGUBIq_groupHint",
-			"spec": "eGUBIq_spec",
-			"cmd": "eGUBIq_cmd",
+			"fixFallback": "eGUBIq_fixFallback",
+			"setRevert": "eGUBIq_setRevert",
+			"assignSelect": "eGUBIq_assignSelect",
+			"diagSection": "eGUBIq_diagSection",
+			"pager": "eGUBIq_pager",
+			"pageInfo": "eGUBIq_pageInfo",
+			"spin": "eGUBIq_spin",
+			"groupCreate": "eGUBIq_groupCreate",
+			"pct": "eGUBIq_pct",
+			"pageEllipsis": "eGUBIq_pageEllipsis",
+			"diagPage": "eGUBIq_diagPage",
+			"version": "eGUBIq_version",
+			"title": "eGUBIq_title",
+			"tabSearchRow": "eGUBIq_tabSearchRow",
 			"shot": "eGUBIq_shot",
-			"groupRow": "eGUBIq_groupRow",
-			"panelNote": "eGUBIq_panelNote",
+			"descTight": "eGUBIq_descTight",
+			"head": "eGUBIq_head",
 			"switchOn": "eGUBIq_switchOn",
-			"setHead": "eGUBIq_setHead",
-			"desc": "eGUBIq_desc",
-			"setRow": "eGUBIq_setRow",
-			"collapseTitle": "eGUBIq_collapseTitle",
+			"switchKnob": "eGUBIq_switchKnob",
+			"collapseHead": "eGUBIq_collapseHead",
+			"groupMember": "eGUBIq_groupMember",
+			"setLabel": "eGUBIq_setLabel",
 			"ovRow": "eGUBIq_ovRow",
-			"swatches": "eGUBIq_swatches",
-			"hiddenFile": "eGUBIq_hiddenFile",
-			"warnLine": "eGUBIq_warnLine",
-			"backupWarn": "eGUBIq_backupWarn",
-			"diagRow": "eGUBIq_diagRow",
-			"actBroken": "eGUBIq_actBroken",
-			"dragOver": "eGUBIq_dragOver",
-			"catsRow": "eGUBIq_catsRow",
-			"themesGrid": "eGUBIq_themesGrid",
-			"staleAction": "eGUBIq_staleAction",
-			"irow": "eGUBIq_irow",
-			"card": "eGUBIq_card",
-			"backupGrid": "eGUBIq_backupGrid",
-			"foot": "eGUBIq_foot",
-			"groupActions": "eGUBIq_groupActions",
-			"act": "eGUBIq_act",
-			"groupCreate": "eGUBIq_groupCreate",
-			"backupInput": "eGUBIq_backupInput",
-			"setLabelBox": "eGUBIq_setLabelBox",
-			"ovFrom": "eGUBIq_ovFrom",
-			"srcBtn": "eGUBIq_srcBtn",
-			"spin": "eGUBIq_spin",
+			"diagAlert": "eGUBIq_diagAlert",
+			"banner": "eGUBIq_banner",
 			"diagCount": "eGUBIq_diagCount",
-			"tab": "eGUBIq_tab",
-			"star": "eGUBIq_star",
-			"bar": "eGUBIq_bar",
-			"tag": "eGUBIq_tag",
-			"collapseBody": "eGUBIq_collapseBody",
-			"diagBadgeCommunity": "eGUBIq_diagBadgeCommunity",
-			"pageEllipsis": "eGUBIq_pageEllipsis",
+			"okState": "eGUBIq_okState",
+			"barFill": "eGUBIq_barFill",
+			"collapseTitle": "eGUBIq_collapseTitle",
 			"owner": "eGUBIq_owner",
-			"specTag": "eGUBIq_specTag",
-			"specTagGit": "eGUBIq_specTagGit",
+			"diagIndex": "eGUBIq_diagIndex",
+			"collapseBody": "eGUBIq_collapseBody",
+			"catsRow": "eGUBIq_catsRow",
 			"shots": "eGUBIq_shots",
-			"inlineInput": "eGUBIq_inlineInput",
-			"titleRow": "eGUBIq_titleRow",
-			"backupMessage": "eGUBIq_backupMessage",
-			"on": "eGUBIq_on",
-			"actWhy": "eGUBIq_actWhy",
-			"pager": "eGUBIq_pager",
-			"setHint": "eGUBIq_setHint",
-			"head": "eGUBIq_head",
-			"actLive": "eGUBIq_actLive",
-			"tabSearchRow": "eGUBIq_tabSearchRow",
-			"row1": "eGUBIq_row1",
-			"diagArrow": "eGUBIq_diagArrow",
-			"diagAlert": "eGUBIq_diagAlert",
-			"backupActions": "eGUBIq_backupActions",
-			"bannerHint": "eGUBIq_bannerHint",
-			"cats": "eGUBIq_cats",
-			"grow": "eGUBIq_grow",
-			"dot": "eGUBIq_dot",
+			"empty": "eGUBIq_empty",
+			"groupAddPanel": "eGUBIq_groupAddPanel",
+			"backupCheck": "eGUBIq_backupCheck",
+			"setLabelBox": "eGUBIq_setLabelBox",
 			"switchMixed": "eGUBIq_switchMixed",
-			"diagEmpty": "eGUBIq_diagEmpty",
-			"okState": "eGUBIq_okState",
-			"tabs": "eGUBIq_tabs",
-			"diagMeta": "eGUBIq_diagMeta",
-			"banner": "eGUBIq_banner",
-			"specTagFile": "eGUBIq_specTagFile",
-			"setCard": "eGUBIq_setCard",
-			"pct": "eGUBIq_pct",
-			"pageInfo": "eGUBIq_pageInfo",
-			"collapseHead": "eGUBIq_collapseHead",
-			"irowMissing": "eGUBIq_irowMissing"
+			"groupActions": "eGUBIq_groupActions",
+			"diagSummaryItem": "eGUBIq_diagSummaryItem",
+			"diagArrow": "eGUBIq_diagArrow",
+			"depBadge": "eGUBIq_depBadge",
+			"bannerIcon": "eGUBIq_bannerIcon",
+			"desc": "eGUBIq_desc",
+			"spec": "eGUBIq_spec",
+			"diagSummaryMeta": "eGUBIq_diagSummaryMeta",
+			"diagList": "eGUBIq_diagList",
+			"barWave": "eGUBIq_barWave",
+			"sectionOverview": "eGUBIq_sectionOverview",
+			"topBtn": "eGUBIq_topBtn",
+			"sp": "eGUBIq_sp",
+			"groupRow": "eGUBIq_groupRow",
+			"groupMembers": "eGUBIq_groupMembers",
+			"ovByTag": "eGUBIq_ovByTag"
 		};
 		//#endregion
 		//#region src/client/Diagnostics.tsx
@@ -2740,7 +2780,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							names: body.ignoredBuilds.map(String)
 						});
 						const text = (v) => typeof v === "string" ? v : v && typeof v.text === "string" ? v.text : v == null ? "" : JSON.stringify(v);
-						const detail = text(body.error) || [text(body.stderr), text(body.stdout)].filter(Boolean).join("\n").trim() || "exit " + body.exitCode;
+						const detail = text(body.error) || humanOutput([text(body.stderr), text(body.stdout)].filter(Boolean).join("\n")) || "exit " + body.exitCode;
 						setInstallError(t("installFail") + ": " + plugin.name + " — " + detail.trim().slice(-600));
 					}
 				}).catch(() => {});
@@ -2850,7 +2890,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							names: body.ignoredBuilds.map(String)
 						});
 						const text = (v) => typeof v === "string" ? v : v && typeof v.text === "string" ? v.text : v == null ? "" : JSON.stringify(v);
-						const detail = text(body.error) || [text(body.stderr), text(body.stdout)].filter(Boolean).join("\n").trim() || "exit " + body.exitCode;
+						const detail = text(body.error) || humanOutput([text(body.stderr), text(body.stdout)].filter(Boolean).join("\n")) || "exit " + body.exitCode;
 						setInstallError(t("updateFail") + ": " + name + " — " + detail.trim().slice(-600));
 					}
 				}).catch((error) => setInstallError(t("updateFail") + ": " + String(error))).finally(() => setUpdatingName(null));
@@ -2896,7 +2936,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							return;
 						}
 						const text = (v) => typeof v === "string" ? v : v && typeof v.text === "string" ? v.text : v == null ? "" : JSON.stringify(v);
-						setInstallError((text(body.error) || text(body.stderr) || "error").trim().slice(-600));
+						setInstallError((text(body.error) || humanOutput(text(body.stderr)) || "error").trim().slice(-600));
 					}
 				}).catch((error) => setInstallError(String(error))).finally(() => setRemovingName(null));
 			}, [refreshInstalled]);