@1e0zj/dsh-plugin-mall 0.1.4 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1e0zj/dsh-plugin-mall",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "dsh 插件市场：搜索 GitHub dsh-plugin 话题下的插件仓库，一键安装到本地 dsh profile（agent 工具 + 设置页插件市场 tab）",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -30,8 +30,6 @@ window.__ModuleLoader__.load({
       ".mkt_btnDanger:hover:not(:disabled){border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary)}",
       ".mkt_btnSm{padding:3px 10px;font-size:12px}",
       ".mkt_error{color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}",
-      ".mkt_columns{display:grid;grid-template-columns:1fr 320px;gap:14px;align-items:start}",
-      "@media (max-width:860px){.mkt_columns{grid-template-columns:1fr}}",
       ".mkt_list{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;align-items:stretch;min-width:0}",
       "@media (max-width:820px){.mkt_list{grid-template-columns:minmax(0,1fr)}}",
       ".mkt_listHead{grid-column:1/-1;font-size:12px;color:var(--dsw-alias-label-tertiary)}",
@@ -41,7 +39,7 @@ window.__ModuleLoader__.load({
       ".mkt_meta{font-size:12px;color:var(--dsw-alias-label-tertiary)}",
       ".mkt_desc{font-size:12.5px;color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere}",
       ".mkt_cardActions{display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin-top:auto;padding-top:4px}",
-      ".mkt_rail{display:flex;flex-direction:column;gap:10px;min-width:0}",
+      ".mkt_cardActions .mkt_btn{text-decoration:none}",
       ".mkt_panelTitle{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);margin:0}",
       ".mkt_pre{font-family:Consolas,Monaco,monospace;font-size:11.5px;line-height:16px;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-bg-secondary,#f6f7f8);border-radius:6px;padding:8px;max-height:220px;overflow:auto;white-space:pre-wrap;word-break:break-all}",
       ".mkt_ok{color:var(--dsw-alias-state-success-primary,#2f855a)}",
@@ -49,8 +47,8 @@ window.__ModuleLoader__.load({
       ".mkt_link{color:var(--dsw-alias-state-business-primary);font-size:12px;text-decoration:none;cursor:pointer}",
       ".mkt_installedHead{display:flex;align-items:center;gap:8px;width:100%;background:none;border:0;padding:0;margin:0;cursor:pointer;font:inherit;text-align:left}",
       ".mkt_installedHead:hover .mkt_panelTitle{color:var(--dsw-alias-state-business-primary)}",
-      ".mkt_depList{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:6px 14px;margin-top:8px}",
-      "@media (max-width:820px){.mkt_depList{grid-template-columns:minmax(0,1fr)}}",
+      ".mkt_installedToggle{margin-left:auto}",
+      ".mkt_depList{display:flex;flex-direction:column;gap:6px;margin-top:8px}",
       ".mkt_depRow{display:flex;justify-content:space-between;align-items:center;gap:8px}",
     ].join("\n");
     var tagId = "@1e0zj/dsh-plugin-mall/market-tab.css";
@@ -131,6 +129,15 @@ window.__ModuleLoader__.load({
     function RepoCard(props) {
       var item = props.item;
       var installing = props.installing === true;
+      var job = props.installJob;
+      var installLabel = "安装";
+      var installDisabled = installing;
+      if (!installing && job) {
+        if (job.status === "running") { installLabel = "安装中…"; installDisabled = true; }
+        else if (job.status === "completed") { installLabel = "✓ 已装 · 重启生效"; installDisabled = true; }
+        else if (job.status === "failed") { installLabel = "安装失败 · 见任务日志"; }
+        else { installLabel = "已取消 · 重试"; }
+      }
       return h("div", { className: "mkt_card" },
         h("div", { className: "mkt_cardHead" },
           h("span", { className: "mkt_name" }, item.fullName),
@@ -142,43 +149,13 @@ window.__ModuleLoader__.load({
         item.description ? h("div", { className: "mkt_desc" }, clip(item.description, 180)) : null,
         h("div", { className: "mkt_meta" }, "更新 " + (item.updatedAt || "").slice(0, 10)),
         h("div", { className: "mkt_cardActions" },
-          h("button", { className: "mkt_btn mkt_btnPrimary", disabled: installing, onClick: function () { props.onInstall(item.fullName); } },
-            installing ? "安装中…" : "安装"),
-          h("button", { className: "mkt_btn", onClick: function () { props.onInfo(item.fullName); } }, "详情")
+          h("button", { className: "mkt_btn mkt_btnPrimary", disabled: installDisabled, onClick: function () { props.onInstall(item.fullName); } },
+            installLabel),
+          h("a", { className: "mkt_btn", href: item.htmlUrl, target: "_blank", rel: "noreferrer" }, "前往仓库 ↗")
         )
       );
     }
 
-    // ── info panel ──────────────────────────────────────────────────────────
-    function InfoPanel(props) {
-      var info = props.info;
-      if (!info) return null;
-      var data = info.data;
-      return h("div", { className: "mkt_card" },
-        h("p", { className: "mkt_panelTitle" }, "仓库详情"),
-        info.loading ? h("div", { className: "mkt_meta" }, "加载中…")
-          : info.error ? h("div", { className: "mkt_error" }, info.error)
-          : !data ? null
-          : h(React.Fragment, null,
-            h("div", { className: "mkt_name" }, data.meta.fullName),
-            h("div", { className: "mkt_desc" }, clip(data.meta.description, 240)),
-            h("div", { className: "mkt_meta" },
-              "★" + data.meta.stars + " · " + (data.meta.language || "-") + " · " + (data.meta.license || "-") + " · 分支 " + data.meta.defaultBranch),
-            data.packageJson == null
-              ? h("div", { className: "mkt_meta" }, "package.json: 未找到（可能不是 npm 插件）")
-              : h(React.Fragment, null,
-                h("div", { className: "mkt_meta" }, "package.json: " + (data.packageJson.name || "?") + "@" + (data.packageJson.version || "?")),
-                data.packageJson.dshBundlePatch != null
-                  ? h("div", { className: "mkt_ok" }, "✓ dsh.bundle 宿主插件")
-                  : data.packageJson.dshClientPlatform != null
-                    ? h("div", { className: "mkt_ok" }, "✓ dsh.client 浏览器UI插件")
-                    : h("div", { className: "mkt_meta" }, "⚠ 无 bundle/client 声明，装上是普通依赖")),
-            h("button", { className: "mkt_btn mkt_btnPrimary", onClick: function () { props.onInstall(data.meta.fullName); } }, "安装 github:" + data.meta.fullName),
-            h("a", { className: "mkt_link", href: data.meta.htmlUrl, target: "_blank", rel: "noreferrer" }, "打开仓库 ↗")
-          )
-      );
-    }
-
     // ── jobs panel ──────────────────────────────────────────────────────────
     function JobsPanel(props) {
       var ids = Object.keys(props.jobs);
@@ -220,7 +197,7 @@ window.__ModuleLoader__.load({
         },
           h("span", { className: "mkt_panelTitle" }, "已装插件"),
           h("span", { className: "mkt_badge" }, count + " 个"),
-          h("span", { className: "mkt_meta" }, open ? "收起 ▲" : "展开 ▼")
+          h("span", { className: "mkt_meta mkt_installedToggle" }, open ? "收起 ▲" : "展开 ▼")
         ),
         installed.error
           ? h("div", { className: "mkt_error" }, installed.error)
@@ -259,9 +236,6 @@ window.__ModuleLoader__.load({
       var _error = useState(null);
       var error = _error[0];
       var setError = _error[1];
-      var _info = useState(null);
-      var info = _info[0];
-      var setInfo = _info[1];
       var _installed = useState(null);
       var installed = _installed[0];
       var setInstalled = _installed[1];
@@ -291,15 +265,6 @@ window.__ModuleLoader__.load({
         });
       }, [call, query, sort]);
 
-      var doInfo = useCallback(function (repo) {
-        setInfo({ repo: repo, loading: true });
-        call("info", { repo: repo }).then(function (value) {
-          setInfo({ repo: repo, data: value });
-        }).catch(function (e) {
-          setInfo({ repo: repo, error: errorText(e) });
-        });
-      }, [call]);
-
       var refreshInstalled = useCallback(function () {
         call("installed", {}).then(function (value) {
           setInstalled(value);
@@ -361,6 +326,10 @@ window.__ModuleLoader__.load({
         refreshInstalled();
       }, [refreshInstalled]);
 
+      // 活动任务置顶（紧跟已装面板，点安装立刻看到进度）；全部静止后归档到底部当日志。
+      var jobsActive = false;
+      for (var jid in jobs) { if (jobs[jid] && jobs[jid].status === "running") { jobsActive = true; break; } }
+
       return h("div", { className: "mkt_root" },
         h("div", { className: "mkt_head" },
           h("div", { className: "mkt_title" }, "插件市场"),
@@ -388,30 +357,30 @@ window.__ModuleLoader__.load({
         ),
         error ? h("div", { className: "mkt_error" }, error) : null,
         h(InstalledPanel, { installed: installed, removing: removing, onUninstall: doUninstall }),
-        h("div", { className: "mkt_columns" },
-          h("div", { className: "mkt_list" },
-            results == null
-              ? h("div", { className: "mkt_meta mkt_listHead" }, loading ? "正在加载最热插件…" : "—")
-              : results.items.length === 0
-                ? h("div", { className: "mkt_meta mkt_listHead" }, "没有匹配的仓库。")
-                : h(React.Fragment, null,
-                  h("div", { className: "mkt_meta mkt_listHead" }, "共 " + results.total + " 个仓库（显示 " + results.items.length + " 个）"),
-                  results.items.map(function (item) {
-                    return h(RepoCard, {
-                      key: item.fullName,
-                      item: item,
-                      installing: installing[item.fullName] === true,
-                      onInstall: doInstall,
-                      onInfo: doInfo,
-                    });
-                  })
-                )
-          ),
-          h("div", { className: "mkt_rail" },
-            h(InfoPanel, { info: info, onInstall: doInstall }),
-            h(JobsPanel, { jobs: jobs })
-          )
-        )
+        jobsActive ? h(JobsPanel, { jobs: jobs }) : null,
+        h("div", { className: "mkt_list" },
+          results == null
+            ? h("div", { className: "mkt_meta mkt_listHead" }, loading ? "正在加载最热插件…" : "—")
+            : results.items.length === 0
+              ? h("div", { className: "mkt_meta mkt_listHead" }, "没有匹配的仓库。")
+              : h(React.Fragment, null,
+                h("div", { className: "mkt_meta mkt_listHead" }, "共 " + results.total + " 个仓库（显示 " + results.items.length + " 个）"),
+                results.items.map(function (item) {
+                  var installJob = null;
+                  for (var jobId in jobs) {
+                    if (jobs[jobId] && jobs[jobId].spec === "github:" + item.fullName) { installJob = jobs[jobId]; break; }
+                  }
+                  return h(RepoCard, {
+                    key: item.fullName,
+                    item: item,
+                    installing: installing[item.fullName] === true,
+                    installJob: installJob,
+                    onInstall: doInstall,
+                  });
+                })
+              )
+        ),
+        jobsActive ? null : h(JobsPanel, { jobs: jobs })
       );
     }
 

package/src/installer.js

@@ -218,19 +218,26 @@ export function removeClientRow(profileDir, packageName) {
 // ── build-script allow-listing ──────────────────────────────────────────────
 
 /** Extract package names from pnpm's "Ignored build scripts: ..." output. */
+/** Valid npm package name (scoped or bare) — anything else is not a name. */
+const NPM_NAME_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/i;
+
 function parseIgnoredBuilds(output) {
   const names = new Set();
-  const pattern = /(?:Ignored build scripts|allowBuilds|onlyBuiltDependencies)\s*:\s*([^\n]+)/gi;
+  // Only pnpm's own notice line is a parsing source. "allowBuilds" also
+  // appears in pnpm's advice/error text (never followed by a name list), and
+  // matching it fed error echoes into the allow-list, corrupting the YAML.
+  const pattern = /(?:Ignored build scripts|onlyBuiltDependencies)\s*:\s*([^\n]+)/gi;
   let match;
   while ((match = pattern.exec(output)) !== null) {
     for (const raw of match[1].split(",")) {
-      const trimmed = raw.trim();
-      if (trimmed.length === 0) continue;
-      // Strip a trailing @version so `foo@1.2.3` -> `foo`, `@s/n@1.0.0` -> `@s/n`.
-      const name = trimmed.includes("@") && !trimmed.startsWith("@")
-        ? trimmed.split("@").slice(0, -1).join("@")
-        : trimmed.replace(/@[^@/]+$/, "");
-      if (name.length > 0) names.add(name);
+      const candidate = raw.trim();
+      if (candidate.length === 0) continue;
+      // Strip a trailing @version or @tarball-url so `foo@1.2.3` -> `foo`,
+      // `@s/n@1.0.0` -> `@s/n`, `@s/n@https://…` -> `@s/n`. Whatever remains
+      // must be a valid npm name; pnpm error echoes ("9 | - pkg", advice
+      // sentences) are dropped instead of being written to the YAML.
+      const name = candidate.replace(/@(?:[\w.+-]+|https?:\/\/\S+|file:\S+|link:\S+|github:\S+)$/, "");
+      if (NPM_NAME_RE.test(name)) names.add(name);
     }
   }
   return [...names];
@@ -238,6 +245,8 @@ function parseIgnoredBuilds(output) {
 
 /** Merge new names into the profile's pnpm-workspace.yaml `allowBuilds` list. */
 function ensureAllowBuilds(profileDir, names) {
+  const valid = names.filter((name) => NPM_NAME_RE.test(name));
+  if (valid.length === 0) return;
   const workspacePath = join(profileDir, "pnpm-workspace.yaml");
   let content = existsSync(workspacePath)
     ? readFileSync(workspacePath, "utf8")
@@ -246,22 +255,24 @@ function ensureAllowBuilds(profileDir, names) {
   const keyIndex = lines.findIndex((line) => /^allowBuilds\s*:/.test(line));
   if (keyIndex === -1) {
     if (!content.endsWith("\n")) content += "\n";
-    content += `\nallowBuilds:\n${names.map((name) => `  - ${name}`).join("\n")}\n`;
+    // Quote every entry: a bare `@scope/name` starts with YAML's reserved
+    // `@` indicator and fails to parse.
+    content += `\nallowBuilds:\n${valid.map((name) => `  - '${name}'`).join("\n")}\n`;
   } else {
     const existing = new Set();
     let insertIndex = keyIndex + 1;
     for (let index = keyIndex + 1; index < lines.length; index++) {
       const item = /^\s*-\s+(.+?)\s*$/.exec(lines[index]);
       if (item) {
-        existing.add(item[1]);
+        existing.add(item[1].replace(/^['"](.*)['"]$/, "$1"));
         insertIndex = index + 1;
         continue;
       }
       if (/^\S/.test(lines[index])) break;
     }
-    const additions = names.filter((name) => !existing.has(name));
+    const additions = valid.filter((name) => !existing.has(name));
     if (additions.length > 0) {
-      lines.splice(insertIndex, 0, ...additions.map((name) => `  - ${name}`));
+      lines.splice(insertIndex, 0, ...additions.map((name) => `  - '${name}'`));
       content = lines.join("\n");
     }
   }