dsh-plugin-discovery 1.2.4 → 1.2.5

package/README.md

@@ -52,7 +52,7 @@ github:hjhcos/dsh-plugin-discovery
 
 详见 [`CHANGELOG.md`](./CHANGELOG.md)。每次发版会同步推送 GitHub / Gitee 并发布 npm。
 
-当前：**1.2.4** — 修复风险豁免 Typert 签名；版本不兼容时推荐相近/兼容插件。
+当前：**1.2.5** — 构建脚本拦截时可在面板内确认批准并重试；版本不兼容时推荐相近插件。
 
 ## 功能
 
@@ -62,6 +62,7 @@ github:hjhcos/dsh-plugin-discovery
 - **远程目录更新**：优先 Gitee raw JSON，失败再试 GitHub；按 `version` 写入 `$DSH_HOME/cache/...`
 - **插件自更新**：启动/打开面板时检查 npm 最新版（Gitee `package.json` 兜底）；有新版本可自动或一键更新
 - **不兼容引导**：安装 peer 不匹配时展示真实错误、复制、风险豁免重试，并推荐精选替代包
+- **构建脚本批准**：pnpm 拦截依赖 install 脚本（如 `ssh2`）时，可在面板确认后代为批准并重试
 - 关键词搜索（全部 / npm / GitHub）与链接解析安装
 - 安装三态：未安装 / 安装中 / 已安装
 - 中英文界面

package/client.js

@@ -63,6 +63,13 @@ window.__ModuleLoader__.load({
 			riskAltTitle: "推荐改用兼容插件",
 			riskAltDesc: "以下精选包更可能匹配当前 DSH 版本，可直接安装代替强行豁免：",
 			riskAltInstall: "安装推荐",
+			buildTitle: "需要批准依赖构建脚本",
+			buildDesc:
+				"安装「{spec}」时，pnpm 拦截了以下依赖的安装脚本（常用于编译原生模块）。批准后将以你的用户权限执行这些脚本，并重试安装。",
+			buildAck: "我已了解风险，允许这些依赖运行安装脚本并重试",
+			buildCancel: "取消",
+			buildConfirm: "批准并重试安装",
+			buildWorking: "正在批准并重试…",
 			browseRecommend: "为你推荐",
 			browseCategory: "分类浏览",
 			browseSearch: "在线搜索",
@@ -157,6 +164,13 @@ window.__ModuleLoader__.load({
 			riskAltTitle: "Try a compatible plugin instead",
 			riskAltDesc: "These curated packages are more likely to match this DSH version:",
 			riskAltInstall: "Install recommended",
+			buildTitle: "Dependency build scripts need approval",
+			buildDesc:
+				"Installing “{spec}” was blocked because pnpm ignored build scripts for: the packages listed below (often native modules). Approving runs those scripts as your user and retries the install.",
+			buildAck: "I understand and allow these packages to run install scripts",
+			buildCancel: "Cancel",
+			buildConfirm: "Approve and retry",
+			buildWorking: "Approving and retrying…",
 			browseRecommend: "For you",
 			browseCategory: "Categories",
 			browseSearch: "Online search",
@@ -930,6 +944,10 @@ window.__ModuleLoader__.load({
 			const [riskOpen, setRiskOpen] = React.useState(false);
 			const [riskAck, setRiskAck] = React.useState(false);
 			const [riskBusy, setRiskBusy] = React.useState(false);
+			const [buildPrompt, setBuildPrompt] = React.useState(null);
+			const [buildOpen, setBuildOpen] = React.useState(false);
+			const [buildAck, setBuildAck] = React.useState(false);
+			const [buildBusy, setBuildBusy] = React.useState(false);
 			const [busy, setBusy] = React.useState(false);
 			const [resolveInput, setResolveInput] = React.useState("");
 			const [installDetail, setInstallDetail] = React.useState("");
@@ -978,6 +996,24 @@ window.__ModuleLoader__.load({
 				setRiskAck(false);
 			}, [riskBusy]);
 
+			const openBuildPrompt = React.useCallback((res, item) => {
+				const pending = Array.isArray(res && res.pendingBuilds) ? res.pendingBuilds.filter(Boolean) : [];
+				if (!(res && res.needsBuildApproval) || !pending.length) return;
+				setBuildAck(false);
+				setBuildPrompt({
+					spec: (res && res.installSpec) || (item && (item.installSpec || item.spec)) || "",
+					item: item || null,
+					pendingBuilds: pending,
+				});
+				setBuildOpen(true);
+			}, []);
+
+			const closeBuildPrompt = React.useCallback(() => {
+				if (buildBusy) return;
+				setBuildOpen(false);
+				setBuildAck(false);
+			}, [buildBusy]);
+
 			const refreshInstalled = React.useCallback(async () => {
 				if (!api || typeof api.listInstalled !== "function") return;
 				try {
@@ -1241,11 +1277,13 @@ window.__ModuleLoader__.load({
 									detail: errText,
 								});
 								setError(errText);
-								openRiskPrompt(res, {
+								const jobItem = {
 									spec: job.spec,
 									installSpec: job.spec,
 									title: job.packageName || job.spec,
-								});
+								};
+								openBuildPrompt(res, jobItem);
+								openRiskPrompt(res, jobItem);
 							}
 						} catch (e) {
 							if (cancelled) return;
@@ -1365,11 +1403,13 @@ window.__ModuleLoader__.load({
 								detail: errText,
 							});
 							setError(errText);
-							openRiskPrompt(installed, {
+							const resolveItem = {
 								spec: res.spec,
 								installSpec: res.spec,
 								title: (res.inspection && res.inspection.name) || res.spec,
-							});
+							};
+							openBuildPrompt(installed, resolveItem);
+							openRiskPrompt(installed, resolveItem);
 						}
 					} else {
 						setResults([]);
@@ -1383,10 +1423,14 @@ window.__ModuleLoader__.load({
 				}
 			};
 
-			const onInstall = async (item) => {
+			const onInstall = async (item, installOpts) => {
 				const spec = item.installSpec || item.spec;
+				const approvedBuilds = Array.isArray(installOpts && installOpts.approvedBuilds)
+					? installOpts.approvedBuilds.filter(Boolean)
+					: [];
 				const current = resolveItemStatus(item, installedNames, jobs);
-				if (!spec || current.status === "installed" || current.status === "installing") return;
+				if (!spec || current.status === "installed") return;
+				if (current.status === "installing" && !approvedBuilds.length) return;
 				const requestId = newRequestId();
 				upsertJob(requestId, {
 					status: "installing",
@@ -1399,7 +1443,10 @@ window.__ModuleLoader__.load({
 				setMessage("");
 				setError("");
 				try {
-					const res = await api.install(spec, { requestId });
+					const res = await api.install(spec, {
+						requestId,
+						...(approvedBuilds.length ? { approvedBuilds } : {}),
+					});
 					if (res && res.alreadyInstalled) {
 						finishJob(requestId, {
 							status: "installed",
@@ -1426,6 +1473,7 @@ window.__ModuleLoader__.load({
 							detail: errText,
 						});
 						setError(errText);
+						openBuildPrompt(res, item);
 						openRiskPrompt(res, item);
 					}
 				} catch (e) {
@@ -1476,6 +1524,29 @@ window.__ModuleLoader__.load({
 				}
 			};
 
+			const confirmBuildInstall = async () => {
+				if (!buildPrompt || !buildAck || !api) return;
+				const pending = Array.isArray(buildPrompt.pendingBuilds) ? buildPrompt.pendingBuilds.filter(Boolean) : [];
+				if (!pending.length) return;
+				setBuildBusy(true);
+				setMessage("");
+				try {
+					const item = buildPrompt.item || {
+						spec: buildPrompt.spec,
+						installSpec: buildPrompt.spec,
+						title: buildPrompt.spec,
+					};
+					setBuildOpen(false);
+					setBuildAck(false);
+					setError("");
+					await onInstall(item, { approvedBuilds: pending });
+				} catch (e) {
+					setError((e && e.message) || String(e));
+				} finally {
+					setBuildBusy(false);
+				}
+			};
+
 			const installRecommendedAlt = async (alt) => {
 				if (!alt || riskBusy) return;
 				const item = {
@@ -1959,6 +2030,78 @@ window.__ModuleLoader__.load({
 						: null,
 				),
 				),
+				buildOpen && buildPrompt
+					? h(
+							"div",
+							{
+								style: styles.riskOverlay,
+								onClick: (e) => {
+									if (e.target === e.currentTarget) closeBuildPrompt();
+								},
+							},
+							h(
+								"div",
+								{
+									style: styles.riskDialog,
+									role: "dialog",
+									"aria-modal": "true",
+									onClick: (e) => e.stopPropagation(),
+								},
+								h("h2", { style: styles.riskTitle }, t("buildTitle")),
+								h(
+									"p",
+									{ style: styles.riskDesc },
+									format(t("buildDesc"), { spec: buildPrompt.spec || "" }),
+								),
+								h(
+									"div",
+									{ style: styles.riskAltBox },
+									h(
+										"div",
+										{ style: styles.riskAltList },
+										...(Array.isArray(buildPrompt.pendingBuilds) ? buildPrompt.pendingBuilds : []).map(
+											(name) =>
+												h("div", { key: name, style: styles.riskAltSpec }, name),
+										),
+									),
+								),
+								h(
+									"label",
+									{ style: styles.riskAckRow },
+									h("input", {
+										type: "checkbox",
+										checked: buildAck,
+										disabled: buildBusy,
+										onChange: (e) => setBuildAck(!!e.target.checked),
+									}),
+									h("span", null, t("buildAck")),
+								),
+								h(
+									"div",
+									{ style: styles.riskFooter },
+									h(
+										Btn,
+										{
+											size: "sm",
+											variant: "outline",
+											disabled: buildBusy,
+											onClick: closeBuildPrompt,
+										},
+										t("buildCancel"),
+									),
+									h(
+										Btn,
+										{
+											size: "sm",
+											disabled: buildBusy || !buildAck,
+											onClick: () => void confirmBuildInstall(),
+										},
+										buildBusy ? t("buildWorking") : t("buildConfirm"),
+									),
+								),
+							),
+						)
+					: null,
 				riskOpen && riskPrompt
 					? h(
 							"div",
@@ -2324,6 +2467,8 @@ window.__ModuleLoader__.load({
 							code: value && value.code,
 							incompatible: value && value.incompatible,
 							needsRiskExemption: !!(value && value.needsRiskExemption),
+							pendingBuilds: value && value.pendingBuilds,
+							needsBuildApproval: !!(value && value.needsBuildApproval),
 							recommendations: value && value.recommendations,
 							installSpec: (value && value.installSpec) || spec,
 						};
@@ -2368,6 +2513,8 @@ window.__ModuleLoader__.load({
 							code: value && value.code,
 							incompatible: value && value.incompatible,
 							needsRiskExemption: !!(value && value.needsRiskExemption),
+							pendingBuilds: value && value.pendingBuilds,
+							needsBuildApproval: !!(value && value.needsBuildApproval),
 							recommendations: value && value.recommendations,
 							installSpec: value && value.installSpec,
 							packageName: value && value.packageName,

package/index.js

@@ -501,6 +501,28 @@ function extractIncompatibility(result) {
 	};
 }
 
+/** pnpm 11 拦截依赖安装脚本时，失败结果带 pendingBuilds；需用户确认后经 approvedBuilds 重试。 */
+function extractBuildBlock(result) {
+	const pendingBuilds = Array.isArray(result?.pendingBuilds)
+		? [...new Set(result.pendingBuilds.map((name) => String(name || "").trim()).filter(Boolean))]
+		: [];
+	const kind = result?.packageResult?.kind || null;
+	const code = result?.error?.code || null;
+	const blocked =
+		kind === "build-blocked" ||
+		code === "build-blocked" ||
+		/ERR_PNPM_IGNORED_BUILDS|Ignored build scripts/i.test(String(result?.packageResult?.output || ""));
+	return {
+		pendingBuilds,
+		needsBuildApproval: blocked && pendingBuilds.length > 0,
+	};
+}
+
+function normalizeApprovedBuilds(value) {
+	if (!Array.isArray(value)) return [];
+	return [...new Set(value.map((name) => String(name || "").trim()).filter(Boolean))];
+}
+
 /** 安装失败时从精选目录推荐相近/同标签插件，优先给出可替代的当前生态包。 */
 function buildFailureRecommendations(catalog, failedSpec, limit = 4) {
 	const failed = String(failedSpec || "").trim();
@@ -1269,10 +1291,12 @@ class PluginDiscoveryService extends TypertRemoteService {
 			}
 			return `${text}。可改试精选目录中的相近插件：${alts.join("、")}`;
 		};
+		const approvedBuilds = normalizeApprovedBuilds(opts.approvedBuilds);
 		try {
 			const result = await this.ctx.pluginManager.installBundle(trimmed, {
 				requestId,
 				enabled: true,
+				...(approvedBuilds.length ? { approvedBuilds } : {}),
 			});
 			const packageName = result?.bundle || pre.name || trimmed;
 			const application = result?.application;
@@ -1281,6 +1305,7 @@ class PluginDiscoveryService extends TypertRemoteService {
 				? formatChangeFailure(result, application || "failed")
 				: `「${packageName}」安装完成（${application || "applied"} / ${result?.stage || "install"}）`;
 			const incompat = failed ? extractIncompatibility(result) : {};
+			const buildBlock = failed ? extractBuildBlock(result) : {};
 			const recommendations =
 				failed && (incompat.needsRiskExemption || incompat.code === "incompatible-version")
 					? buildFailureRecommendations(this.getCatalog(), trimmed, 4)
@@ -1299,9 +1324,15 @@ class PluginDiscoveryService extends TypertRemoteService {
 				message,
 				detail: failed ? rawMessage : undefined,
 				logPath: failed ? result?.packageResult?.logPath : undefined,
-				code: incompat.code || undefined,
+				code:
+					incompat.code ||
+					(buildBlock.needsBuildApproval ? "build-blocked" : undefined) ||
+					undefined,
 				incompatible: incompat.incompatible || undefined,
 				needsRiskExemption: incompat.needsRiskExemption === true,
+				pendingBuilds: buildBlock.pendingBuilds || undefined,
+				needsBuildApproval: buildBlock.needsBuildApproval === true,
+				approvedBuilds: approvedBuilds.length ? approvedBuilds : result?.approvedBuilds,
 				recommendations,
 				installSpec: trimmed,
 				result,
@@ -1371,6 +1402,7 @@ class PluginDiscoveryService extends TypertRemoteService {
 			const failed = settled.application === "failed" || settled.application === "cancelled";
 			const failText = failed ? formatChangeFailure(settled, settled.application) : "";
 			const incompat = failed ? extractIncompatibility(settled) : {};
+			const buildBlock = failed ? extractBuildBlock(settled) : {};
 			const failedSpec =
 				(Array.isArray(incompat.incompatible) && incompat.incompatible[0]
 					? `${incompat.incompatible[0].name}@${incompat.incompatible[0].version}`
@@ -1395,9 +1427,14 @@ class PluginDiscoveryService extends TypertRemoteService {
 				message,
 				detail: failed ? failText : undefined,
 				logPath: failed ? settled?.packageResult?.logPath : undefined,
-				code: incompat.code || undefined,
+				code:
+					incompat.code ||
+					(buildBlock.needsBuildApproval ? "build-blocked" : undefined) ||
+					undefined,
 				incompatible: incompat.incompatible || undefined,
 				needsRiskExemption: incompat.needsRiskExemption === true,
+				pendingBuilds: buildBlock.pendingBuilds || undefined,
+				needsBuildApproval: buildBlock.needsBuildApproval === true,
 				recommendations,
 				installSpec: failedSpec || undefined,
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-discovery",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "type": "module",
   "description": "Discover and install community DSH bundles from the sidebar: newbie essentials, recommendations, categories, self-update, and npm/GitHub search.",
   "author": "hjhcos",