dshmarket 1.5.0 → 1.5.1

package/README.md

@@ -55,6 +55,11 @@ Installs prefer npm tarballs over full-repo GitHub downloads whenever a plugin p
 
 **This repo is the market app, not the catalog.** The plugin list comes from the curated [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin) registry — to get your plugin listed in the market, open a PR **there** (one entry in the list; the site and this market pick it up automatically, usually within a day). Please don't PR plugin entries against this repo.
 
+## 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
+
 ## Data source
 
 Live from [awesome-dsh-plugin.com/plugins.json](https://awesome-dsh-plugin.com/plugins.json) — curated entries, npm mapping, and star counts refreshed daily by CI — with a bundled snapshot as offline fallback.

package/README.zh.md

@@ -55,6 +55,11 @@ dsh plugin --profile web add dshmarket
 
 **这个仓库是市场应用本身，不是插件目录。** 市场里的插件列表来自精选列表 [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)——想让你的插件上架，请去**那边**提 PR（在列表里加一条即可，站点和本市场会自动收录，通常一天内生效）。请不要往本仓库提插件条目。
 
+## 路线图与反馈
+
+- 功能规划见 [Roadmap](https://github.com/orgs/dsh-market/projects/1)，每一项都欢迎社区 PR（动手前在对应 issue 里说一声）
+- Bug 与建议请提 [issue](https://github.com/dsh-market/dsh-market/issues)，附上市场页面的「导出日志」能让排查快十倍
+
 ## 数据源
 
 实时来自 [awesome-dsh-plugin.com/plugins.json](https://awesome-dsh-plugin.com/plugins.json)——精选条目、npm 映射、star 数由 CI 每日刷新——内置快照做离线兜底。

package/client/client.js

@@ -327,16 +327,56 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			}
 			return ids;
 		}
+		/**
+		* Repo identities stated by the dependency SPEC itself (github: installs) —
+		* hard evidence of where the package came from, unlike the name-derived
+		* mirror in depIdentities, which is only a matching aid.
+		*/
+		function depSpecRepoIds(spec) {
+			const ids = /* @__PURE__ */ new Set();
+			const m = /github:([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)(?:#path:\/([A-Za-z0-9_./-]+))?/i.exec(spec);
+			if (m !== null) {
+				ids.add(m[1].toLowerCase());
+				if (m[2] !== void 0) ids.add(`${m[1].toLowerCase()}#path:/${m[2].toLowerCase()}`);
+			}
+			return ids;
+		}
+		/** Repo identity of a registry entry's source url (repo or repo#path form). */
+		function entryRepoIds(plugin) {
+			const ids = /* @__PURE__ */ new Set();
+			const m = /^https:\/\/github\.com\/([^/]+\/[^/]+?)(?:\/tree\/[^/]+\/(.+?))?\/?$/.exec(plugin.url);
+			if (m !== null) ids.add(m[2] !== void 0 ? `${m[1].toLowerCase()}#path:/${m[2].toLowerCase()}` : m[1].toLowerCase());
+			return ids;
+		}
+		/**
+		* The curated registry lists distinct plugins sharing one name — twelve
+		* name-groups at the time of #66 (both dsh-usage-stats, four dsh-memory…).
+		* A name coincidence must not survive contradicting repo evidence: when the
+		* dependency's spec pins a github repo AND the entry states one, the repos
+		* decide — the loose name/npm identities only apply when at least one side
+		* carries no repo evidence (npm installs, non-github entries).
+		*/
+		function sameSourceConflict(plugin, spec) {
+			const entry = entryRepoIds(plugin);
+			const dep = depSpecRepoIds(spec);
+			if (entry.size === 0 || dep.size === 0) return false;
+			for (const id of dep) if (entry.has(id)) return false;
+			return true;
+		}
 		/** The installed dependency name a registry entry corresponds to, or null. */
 		function matchInstalledName(plugin, installed) {
 			const ids = entryIdentities(plugin);
-			for (const [name, spec] of Object.entries(installed)) for (const id of depIdentities(name, String(spec))) if (ids.has(id)) return name;
+			for (const [name, spec] of Object.entries(installed)) {
+				if (sameSourceConflict(plugin, String(spec))) continue;
+				for (const id of depIdentities(name, String(spec))) if (ids.has(id)) return name;
+			}
 			return null;
 		}
 		/** The registry entry an installed dependency corresponds to, or undefined. */
 		function entryForDep(plugins, name, spec) {
 			const ids = depIdentities(name, String(spec));
 			return plugins.find((plugin) => {
+				if (sameSourceConflict(plugin, String(spec))) return false;
 				for (const id of entryIdentities(plugin)) if (ids.has(id)) return true;
 				return false;
 			});
@@ -402,86 +442,86 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			document.head.appendChild(tag);
 		}
 		var Market_module_css_default = {
-			"spec": "eGUBIq_spec",
-			"spin": "eGUBIq_spin",
-			"tag": "eGUBIq_tag",
-			"src": "eGUBIq_src",
-			"okState": "eGUBIq_okState",
-			"cats": "eGUBIq_cats",
-			"staleAction": "eGUBIq_staleAction",
+			"star": "eGUBIq_star",
+			"barWave": "eGUBIq_barWave",
+			"filterBtnOn": "eGUBIq_filterBtnOn",
 			"filterTitle": "eGUBIq_filterTitle",
-			"filterBtn": "eGUBIq_filterBtn",
-			"owner": "eGUBIq_owner",
-			"sect": "eGUBIq_sect",
-			"err": "eGUBIq_err",
-			"catsToggle": "eGUBIq_catsToggle",
-			"card": "eGUBIq_card",
-			"catsWrap": "eGUBIq_catsWrap",
-			"warnBtn": "eGUBIq_warnBtn",
-			"root": "eGUBIq_root",
-			"catsRow": "eGUBIq_catsRow",
-			"dot": "eGUBIq_dot",
-			"swatches": "eGUBIq_swatches",
-			"loading": "eGUBIq_loading",
-			"act": "eGUBIq_act",
-			"catsCollapsed": "eGUBIq_catsCollapsed",
+			"cmd": "eGUBIq_cmd",
+			"sp": "eGUBIq_sp",
+			"descTight": "eGUBIq_descTight",
 			"actWarn": "eGUBIq_actWarn",
-			"body": "eGUBIq_body",
-			"cmdSummary": "eGUBIq_cmdSummary",
-			"barWave": "eGUBIq_barWave",
-			"star": "eGUBIq_star",
-			"dangerBtn": "eGUBIq_dangerBtn",
-			"title": "eGUBIq_title",
+			"staleAction": "eGUBIq_staleAction",
+			"pageBtn": "eGUBIq_pageBtn",
+			"actBroken": "eGUBIq_actBroken",
+			"pageInfo": "eGUBIq_pageInfo",
+			"actLive": "eGUBIq_actLive",
+			"catsCollapsed": "eGUBIq_catsCollapsed",
 			"actWhy": "eGUBIq_actWhy",
-			"progress": "eGUBIq_progress",
+			"loading": "eGUBIq_loading",
+			"sizeLabel": "eGUBIq_sizeLabel",
+			"cats": "eGUBIq_cats",
+			"bar": "eGUBIq_bar",
+			"pager": "eGUBIq_pager",
+			"titleRow": "eGUBIq_titleRow",
 			"on": "eGUBIq_on",
-			"restart": "eGUBIq_restart",
+			"filterOption": "eGUBIq_filterOption",
 			"dangerArmed": "eGUBIq_dangerArmed",
-			"foot": "eGUBIq_foot",
-			"grid": "eGUBIq_grid",
-			"tabs": "eGUBIq_tabs",
-			"empty": "eGUBIq_empty",
-			"warnLine": "eGUBIq_warnLine",
-			"sp": "eGUBIq_sp",
-			"dshmSlide": "eGUBIq_dshmSlide",
-			"sizeBtn": "eGUBIq_sizeBtn",
-			"pageEllipsis": "eGUBIq_pageEllipsis",
-			"pageInfo": "eGUBIq_pageInfo",
+			"sect": "eGUBIq_sect",
 			"pct": "eGUBIq_pct",
-			"desc": "eGUBIq_desc",
-			"pageBtn": "eGUBIq_pageBtn",
-			"filterWrap": "eGUBIq_filterWrap",
-			"sizeLabel": "eGUBIq_sizeLabel",
-			"cmd": "eGUBIq_cmd",
-			"actLive": "eGUBIq_actLive",
-			"themesGrid": "eGUBIq_themesGrid",
+			"cancelBtn": "eGUBIq_cancelBtn",
 			"pagerSize": "eGUBIq_pagerSize",
+			"dot": "eGUBIq_dot",
+			"restart": "eGUBIq_restart",
+			"sub": "eGUBIq_sub",
+			"top": "eGUBIq_top",
+			"catsRow": "eGUBIq_catsRow",
+			"src": "eGUBIq_src",
+			"okState": "eGUBIq_okState",
+			"dangerBtn": "eGUBIq_dangerBtn",
+			"catsToggle": "eGUBIq_catsToggle",
+			"barFill": "eGUBIq_barFill",
+			"tabs": "eGUBIq_tabs",
+			"sizeOn": "eGUBIq_sizeOn",
+			"modalNote": "eGUBIq_modalNote",
+			"av": "eGUBIq_av",
+			"grid": "eGUBIq_grid",
+			"warnBtn": "eGUBIq_warnBtn",
+			"desc": "eGUBIq_desc",
+			"cmdSummary": "eGUBIq_cmdSummary",
+			"dshmSlide": "eGUBIq_dshmSlide",
+			"filterGroup": "eGUBIq_filterGroup",
 			"irow": "eGUBIq_irow",
+			"foot": "eGUBIq_foot",
+			"row1": "eGUBIq_row1",
 			"filterPanel": "eGUBIq_filterPanel",
-			"filterGroup": "eGUBIq_filterGroup",
-			"titleRow": "eGUBIq_titleRow",
-			"searchInline": "eGUBIq_searchInline",
-			"barFill": "eGUBIq_barFill",
-			"cmdDetails": "eGUBIq_cmdDetails",
-			"filterOption": "eGUBIq_filterOption",
 			"nm": "eGUBIq_nm",
+			"spec": "eGUBIq_spec",
+			"spin": "eGUBIq_spin",
+			"card": "eGUBIq_card",
 			"pagerPages": "eGUBIq_pagerPages",
-			"modalNote": "eGUBIq_modalNote",
-			"grow": "eGUBIq_grow",
-			"pager": "eGUBIq_pager",
-			"row1": "eGUBIq_row1",
+			"pageEllipsis": "eGUBIq_pageEllipsis",
+			"sizeBtn": "eGUBIq_sizeBtn",
 			"head": "eGUBIq_head",
-			"descTight": "eGUBIq_descTight",
+			"catsWrap": "eGUBIq_catsWrap",
 			"tab": "eGUBIq_tab",
-			"bar": "eGUBIq_bar",
-			"sub": "eGUBIq_sub",
-			"av": "eGUBIq_av",
-			"actBroken": "eGUBIq_actBroken",
-			"top": "eGUBIq_top",
+			"themesGrid": "eGUBIq_themesGrid",
+			"grow": "eGUBIq_grow",
+			"progress": "eGUBIq_progress",
+			"swatches": "eGUBIq_swatches",
+			"owner": "eGUBIq_owner",
+			"title": "eGUBIq_title",
+			"root": "eGUBIq_root",
+			"searchInline": "eGUBIq_searchInline",
+			"warnLine": "eGUBIq_warnLine",
+			"empty": "eGUBIq_empty",
+			"filterBtn": "eGUBIq_filterBtn",
 			"pageOn": "eGUBIq_pageOn",
-			"sizeOn": "eGUBIq_sizeOn",
-			"cancelBtn": "eGUBIq_cancelBtn",
-			"filterBtnOn": "eGUBIq_filterBtnOn"
+			"body": "eGUBIq_body",
+			"filterWrap": "eGUBIq_filterWrap",
+			"act": "eGUBIq_act",
+			"err": "eGUBIq_err",
+			"cmdDetails": "eGUBIq_cmdDetails",
+			"tag": "eGUBIq_tag"
 		};
 		//#endregion
 		//#region src/client/MarketSection.tsx
@@ -649,7 +689,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			const [pageSize, setPageSize] = (0, react.useState)(DEFAULT_PAGE_SIZE);
 			/** Determinate percent parsed from pnpm's Progress line, when available. */
 			const [progressPct, setProgressPct] = (0, react.useState)(null);
-			/** Blocked build scripts from the last install: enables approve-and-retry (#6). */
+			/**
+			* Blocked build scripts from the last install or update: enables
+			* approve-and-retry (#6; updates in #69). Exactly one of `plugin`
+			* (retry installs it) / `updateName` (retry re-runs the update) is set.
+			*/
 			const [buildsSkipped, setBuildsSkipped] = (0, react.useState)(null);
 			const [updatingAll, setUpdatingAll] = (0, react.useState)(false);
 			const [updatedNames, setUpdatedNames] = (0, react.useState)([]);
@@ -724,7 +768,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			}, [bootId]);
 			(0, react.useEffect)(() => {
 				if (bootId === null) return;
-				if (doneUrls.length === 0 && updatedNames.length === 0 && removedCount === 0) return;
+				if (doneUrls.length === 0 && updatedNames.length === 0 && removedCount === 0) {
+					sessionStorage.removeItem("dshm-restart");
+					return;
+				}
 				sessionStorage.setItem("dshm-restart", JSON.stringify({
 					boot: bootId,
 					doneUrls,
@@ -911,6 +958,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							setActivationWarnings(warns);
 						}
 						if (body.hot) {
+							setDoneUrls((urls) => urls.filter((url) => url !== plugin.url));
 							setHotUrls((urls) => urls.includes(plugin.url) ? urls : urls.concat(plugin.url));
 							setHotNames((names) => names.includes(plugin.name) ? names : names.concat(plugin.name));
 						} else setDoneUrls((urls) => urls.includes(plugin.url) ? urls : urls.concat(plugin.url));
@@ -1026,6 +1074,10 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							return;
 						}
 						if (body.stale === true) setStaleName(name);
+						if (Array.isArray(body.ignoredBuilds) && body.ignoredBuilds.length > 0) setBuildsSkipped({
+							updateName: name,
+							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;
 						setInstallError(t("updateFail") + ": " + name + " — " + detail.trim().slice(-600));
@@ -1549,15 +1601,16 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 							size: "sm",
 							disabled: busyUrl !== null,
 							onClick: () => {
-								const { plugin, names } = buildsSkipped;
+								const { plugin, updateName, names } = buildsSkipped;
 								setBuildsSkipped(null);
 								fetch("/dsh-market/approve-builds", {
 									method: "POST",
 									headers: { "content-type": "application/json" },
 									body: JSON.stringify({ packages: names })
 								}).then((res) => res.json()).then((body) => {
-									if (body.ok) doInstall(plugin);
-									else setInstallError(String(body.error || "approve failed"));
+									if (!body.ok) setInstallError(String(body.error || "approve failed"));
+									else if (plugin !== void 0) doInstall(plugin);
+									else if (updateName !== void 0) doUpdate(updateName);
 								}).catch((error) => setInstallError(String(error)));
 							},
 							children: t("approveBuilds")