@noob-stupid/dsh-plugin-console 0.3.18 → 0.3.19

package/lib/client.js

@@ -136,6 +136,7 @@ window.__ModuleLoader__.load({
 			loadingDetails: "正在读取详情…",
 			githubLoggedIn: "已登录 GitHub：",
 			githubCornerOut: "未登录 GitHub",
+			hubUpdateAvailable: "下载更新",
 					searchInstalledPlaceholder: "搜索已安装插件（名称或 id）",
 			extraFilter: "已装",
 			extraFilterAll: "全部",
@@ -370,6 +371,7 @@ window.__ModuleLoader__.load({
 			readmeLabel: "Readme summary",
 			loadingDetails: "Reading details…",
 			githubLoggedIn: "GitHub signed in: ",
+                    hubUpdateAvailable: "Download update",
 			githubCornerOut: "Not signed in to GitHub",
 					searchInstalledPlaceholder: "Search installed plugins (name or id)",
 			extraFilter: "Installed",
@@ -763,7 +765,7 @@ window.__ModuleLoader__.load({
 		/** monorepo 子包列表：git trees 递归列出 packages 目录下的 package.json，逐个取 npm 包名（上限 24 个）。 */
 		async function fetchSubpackages(repo, branch) {
 			const data = await githubFetch(`https://api.github.com/repos/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(branch)}?recursive=1`);
-			const paths = (data.tree ?? []).filter((node) => node.type === "blob" && /^packages\/[^/]+\/package\.json$/u.test(node.path)).map((node) => node.path);
+			const paths = (data.tree ?? []).filter((node) => node.type === "blob" && /^(?:packages|examples|plugins|skills|apps|extensions|src|lib)\/[^/]+\/package\.json$/u.test(node.path)).map((node) => node.path);
 			if (paths.length === 0) return [];
 			const out = [];
 			for (const path of paths.slice(0, 24)) {
@@ -771,7 +773,7 @@ window.__ModuleLoader__.load({
 				if (text === null) continue;
 				try {
 					const pkg = JSON.parse(text);
-					if (pkg && typeof pkg.name === "string") out.push({ dir: path.split("/")[1], name: pkg.name });
+					if (pkg && typeof pkg.name === "string") out.push({ dir: path.split("/")[1], path: path.split("/").slice(0, -1).join("/"), name: pkg.name });
 				} catch {}
 			}
 			return out;
@@ -858,6 +860,8 @@ window.__ModuleLoader__.load({
 			const [frameworkUpgrading, setFrameworkUpgrading] = react.useState(false);
 			// 框架升级进度（重连后恢复显示）：{status, message}
 			const [frameworkStatus, setFrameworkStatus] = react.useState(null);
+			// Hub 自身更新：仅在检测到远程新版时显示下载/更新按钮
+			const [selfUpdate, setSelfUpdate] = react.useState(null);
 			// 进度条步骤（与 host 脚本 SetState 的阶段对应）
 			const FW_STEPS = [
 				{ key: "starting", label: t("fwStepBackup") },
@@ -1066,6 +1070,22 @@ window.__ModuleLoader__.load({
 				};
 				run();
 			}, [market, state]);
+			// Hub 自身更新检测：只在远程 npm 有更新时显示按钮
+			react.useEffect(() => {
+				if (state.status !== "ready") return;
+				const current = state.data.selfVersion ?? null;
+				if (!current) return;
+				call("/plugin-console/check-update", { packageName: "@noob-stupid/dsh-plugin-console" }).then(
+					(data) => {
+						if (data && data.error === null && typeof data.latest === "string" && data.latest !== current) {
+							setSelfUpdate({ latest: data.latest });
+						} else {
+							setSelfUpdate(null);
+						}
+					},
+					() => setSelfUpdate(null),
+				);
+			}, [state]);
 			// 搜索源菜单：点击外部收起
 			react.useEffect(() => {
 				if (!sourceMenuOpen) return;
@@ -1629,6 +1649,11 @@ window.__ModuleLoader__.load({
 					startSuiteJob(item);
 					return;
 				}
+				if (item.subpackagePath && typeof item.packageName === "string" && item.packageName !== "") {
+					// monorepo 子包：搜索结果带 packageName，按 npm 包名安装
+					startJob(item.fullName, item.packageName, item.source ?? "github");
+					return;
+				}
 				startJob(item.fullName, null, item.source ?? "github");
 			};
 			/** 停用/启用已安装技能（写入官方调用策略 frontmatter，可逆）。 */
@@ -2073,8 +2098,8 @@ window.__ModuleLoader__.load({
 								onClick: () => doToggleSkill(detailSkillName, detailSkillDisabled),
 							}, togglingSkill === detailSkillName ? t("installingLocal") : (detailSkillDisabled ? t("skillEnable") : t("skillDisable")))
 							: null,
-						info.privateRoot ? el("div", null,
-							el("p", { className: styles.status, "data-error": "true" }, t("privateRootHint")),
+						(info.privateRoot || !info.hasPackageJson) ? el("div", null,
+							info.privateRoot ? el("p", { className: styles.status, "data-error": "true" }, t("privateRootHint")) : null,
 							el("p", { className: styles.status }, t("subpackagesTitle") + "："),
 							subpackages === null ? null
 								: subpackages.status === "loading"
@@ -2159,6 +2184,12 @@ window.__ModuleLoader__.load({
 							? t("marketTitle")
 							: t("marketTitleOther").replace("{source}", sourceDisplayName(searchSource)))),
 					el("div", { id: "pc-ghwrap", className: styles.ghwrap },
+selfUpdate !== null ? el("button", {
+type: "button",
+className: styles.ghpill,
+title: t("hubUpdateAvailable") + " v" + selfUpdate.latest,
+onClick: () => window.open(`https://github.com/Noob-stupid/dsh-plugin-hub/releases/tag/v${selfUpdate.latest}`, "_blank")
+}, "⬇ " + t("hubUpdateAvailable") + " v" + selfUpdate.latest) : null,
 						el("button", {
 							type: "button",
 							className: styles.ghpill,

package/lib/index.js

@@ -1450,7 +1450,7 @@ async function fetchRepoPackage(repo, branch) {
  * profile 目录由 pnpm 管理；若用 npm 写入会与 pnpm 的目录重建互相破坏
  * （曾导致入口链接丢失、DSH 启动崩溃）。registry 走国内镜像。
  */
-async function pnpmInstall(profileDir, spec, registry = 'https://registry.npmmirror.com', timeout = 90000) {
+async function pnpmInstall(profileDir, spec, registry = 'https://registry.npmmirror.com', timeout = 90000, signal = null) {
   const args = ['pnpm', 'add', spec, '--registry', registry]
   const opts = {
     cwd: profileDir,
@@ -1486,7 +1486,7 @@ async function pnpmInstall(profileDir, spec, registry = 'https://registry.npmmir
  * 零依赖包可完整安装；带依赖包记录未补齐列表（不阻塞，供面板提示）。
  * 返回 { version, missingDeps }；失败抛错由调用方落入 next 通道。
  */
-async function curlManualInstall(profileDir, packageName, registries) {
+async function curlManualInstall(profileDir, packageName, registries, signal = null) {
   let meta = null
   let metaError = null
   for (const reg of registries) {
@@ -1509,8 +1509,8 @@ async function curlManualInstall(profileDir, packageName, registries) {
   mkdirSync(tmp, { recursive: true })
   try {
     const tgz = join(tmp, 'pkg.tgz')
-    await execFileAsync(bin, ['-s', '-L', '-m', '60', '-o', tgz, tarball], { timeout: 70000, windowsHide: true })
-    await execFileAsync('tar', ['-xzf', tgz, '-C', tmp], { timeout: 30000, windowsHide: true })
+    await execFileAsync(bin, ['-s', '-L', '-m', '60', '-o', tgz, tarball], { timeout: 70000, windowsHide: true, ...(signal ? { signal } : {}) })
+    await execFileAsync('tar', ['-xzf', tgz, '-C', tmp], { timeout: 30000, windowsHide: true, ...(signal ? { signal } : {}) })
     const pkgPath = join(tmp, 'package')
     // 盒子实验：解压后先验证，通过才覆盖正式位置（失败保留旧版本，服务不中断）
     const box = verifyPackageBox(pkgPath, profileDir, packageName)
@@ -1532,6 +1532,34 @@ async function curlManualInstall(profileDir, packageName, registries) {
   }
 }
 
+/** 安装通道并行竞速：pnpm 与 curl 同时尝试，先成功者生效；失败方被 abort 不干扰。 */
+async function raceInstallChannels(profileDir, name, registries) {
+  const controller = new AbortController()
+  const signal = controller.signal
+  const pnpmTask = (async () => {
+    let lastError = null
+    for (const registry of registries) {
+      try {
+        await pnpmInstall(profileDir, name, registry, 90000, signal)
+        return { channel: 'pnpm', info: null }
+      } catch (error) {
+        lastError = error
+        if (signal.aborted) throw error
+      }
+    }
+    throw lastError ?? new Error('pnpm 通道失败')
+  })()
+  const curlTask = (async () => {
+    const info = await curlManualInstall(profileDir, name, registries, signal)
+    return { channel: 'curl', info }
+  })()
+  const waitSuccess = (promise) => promise.then((value) => ({ value }), () => new Promise(() => {}))
+  const timeout = new Promise((resolve) => setTimeout(() => resolve(null), 120000))
+  const winner = await Promise.race([waitSuccess(pnpmTask), waitSuccess(curlTask), timeout])
+  controller.abort()
+  return winner ? winner.value : null
+}
+
 /**
  * 盒子实验验证：解压后的包目录先通过静态校验再允许覆盖正式位置。
  * - package.json 必须可解析且 name 与安装目标一致
@@ -2208,7 +2236,7 @@ async function fetchSubpackageNames(repo, branch, auth) {
   try {
     const data = await githubJson(`${GITHUB_API}/repos/${repo}/git/trees/${encodeURIComponent(branch)}?recursive=1`, undefined, auth)
     const paths = (data.tree ?? [])
-      .filter((node) => node.type === 'blob' && /^packages\/[^/]+\/package\.json$/u.test(node.path))
+      .filter((node) => node.type === 'blob' && /^(?:packages|examples|plugins|skills|apps|extensions|src|lib)\/[^/]+\/package\.json$/u.test(node.path))
       .map((node) => node.path)
     // 并行读取：黑洞期单条最坏 40s，24 条串行会拖到十几分钟
     const results = await Promise.all(paths.slice(0, 24).map(async (path) => {
@@ -2216,7 +2244,7 @@ async function fetchSubpackageNames(repo, branch, auth) {
       if (bodyText === null) return null
       try {
         const pkg = JSON.parse(bodyText)
-        if (pkg && typeof pkg.name === 'string') return { dir: path.split('/')[1], name: pkg.name }
+        if (pkg && typeof pkg.name === 'string') return { dir: path.split('/')[1], path: path.split('/').slice(0, -1).join('/'), name: pkg.name }
       } catch {}
       return null
     }))
@@ -2431,6 +2459,32 @@ async function runInstallJob(job, ctx) {
     for (let index = 0; index < candidates.length && installedName === null; index += 1) {
       if (Date.now() > deadline) break
       const name = candidates[index]
+        // 加法优化：包已在 node_modules 且名字匹配时，不再重复安装/触发 EPERM，直接进入启用流程
+        if (installedName === null) {
+          const existingTarget = join(profileDir, 'node_modules', name, 'package.json')
+          if (existsSync(existingTarget)) {
+            try {
+              const existingPkg = JSON.parse(readFileSync(existingTarget, 'utf8'))
+              if (existingPkg && existingPkg.name === name) {
+                installedName = name
+                job.curlNote = `已检测到本地已安装 ${name}@${existingPkg.version ?? '?'}，跳过重复下载`
+              }
+            } catch {}
+          }
+        }
+        // 加法并行竞速：pnpm 与 curl 同时启动，先成功者生效；失败方 abort，不影响后续串行通道
+        if (installedName === null && !subpackageMode && !expanded) {
+          const raced = await raceInstallChannels(profileDir, name, registries)
+          if (raced) {
+            installedName = name
+            if (raced.channel === 'curl') {
+              const racedInfo = raced.info
+              const stillMissing = await backfillMissingDeps(profileDir, racedInfo.missingDeps, registries)
+              job.curlNote = `已通过并行 curl 通道安装 v${racedInfo.version}${stillMissing.length > 0 ? `（依赖仍未补齐：${stillMissing.join('、')}，网络恢复后建议重新安装）` : '（捆绑依赖已补齐）'}`
+              if (racedInfo.boxNote) job.curlNote += `（盒子验证：${racedInfo.boxNote}）`
+            }
+          }
+        }
       // 通道 1..n：配置的软件源依次尝试（每源 90 秒封顶）
       for (let ri = 0; ri < registries.length && installedName === null; ri += 1) {
         try {
@@ -2677,7 +2731,13 @@ async function handle(ctx, req, res) {
     // 框架升级检测与适配（备份快照 + 重打框架补丁），try 包裹不阻塞 state 返回
     let framework = null
     try { framework = detectFrameworkUpgrade(ctx) } catch {}
-    sendJson(res, 200, { ok: true, entries, patchPath, compat, installJobs: jobs, recentFailures, github: { loggedIn: auth.loggedIn, login: auth.login }, patch: { disables: patch.disables, forced: patch.forced, inserts: patch.inserts }, framework })
+    let selfVersion = null
+    try {
+      const selfRequire = createRequire(import.meta.url)
+      const selfPkg = JSON.parse(readFileSync(selfRequire.resolve('../package.json'), 'utf8'))
+      selfVersion = typeof selfPkg.version === 'string' ? selfPkg.version : null
+    } catch {}
+    sendJson(res, 200, { ok: true, entries, patchPath, compat, installJobs: jobs, recentFailures, github: { loggedIn: auth.loggedIn, login: auth.login }, patch: { disables: patch.disables, forced: patch.forced, inserts: patch.inserts }, framework, selfVersion })
     return
   }
 
@@ -3035,6 +3095,48 @@ async function handle(ctx, req, res) {
       )
       items = normalizePlatformItems(data.items ?? [], 'main').map((item) => ({ ...item, source: 'github' }))
       items = await enrichItems(items)
+      // monorepo 子包增强（OpenViking/examples/dsh-memory-plugin 等可按子包名搜到）
+      if (raw !== '' && !body.skills) {
+        try {
+          const codeData = await githubJson(
+            `${GITHUB_API}/search/code?q=${encodeURIComponent(`${raw} filename:package.json`)}`,
+            req.signal,
+            auth.token,
+          )
+          const subItems = []
+          for (const hit of (codeData.items ?? []).slice(0, 10)) {
+            const hitPath = typeof hit.path === 'string' ? hit.path : ''
+            if (!/^(?:packages|examples|plugins|skills|apps|extensions|src|lib)\/[^/]+\/package\.json$/u.test(hitPath)) continue
+            const repoName = hit.repository?.full_name ?? ''
+            if (!repoName) continue
+            const dir = hitPath.split('/').slice(0, -1).join('/')
+            let packageName = dir.split('/').slice(-1)[0]
+            try {
+              const pkgText = await rawTextWithFallback(repoName, 'main', hitPath)
+              if (pkgText !== null) {
+                const pkg = JSON.parse(pkgText)
+                if (pkg && typeof pkg.name === 'string') packageName = pkg.name
+              }
+            } catch {}
+            subItems.push({
+              fullName: repoName,
+              description: `子包：${dir}`,
+              htmlUrl: `https://github.com/${repoName}/tree/main/${dir}`,
+              stars: 0,
+              updatedAt: '',
+              defaultBranch: 'main',
+              topics: [],
+              source: 'github',
+              subpackagePath: dir,
+              packageName,
+            })
+            if (subItems.length >= 5) break
+          }
+          for (const sub of subItems) {
+            if (!items.some((x) => x.fullName === sub.fullName)) items.push(sub)
+          }
+        } catch {}
+      }
     }
     items = items.filter((item) => item.fullName !== '')
     sendJson(res, 200, { ok: true, query, items, authenticated: auth.loggedIn, source })

package/package.json

@@ -1,39 +1,39 @@
-{
-    "name": "@noob-stupid/dsh-plugin-console",
-    "version": "0.3.18",
-    "description": "DSH plugin management panel & marketplace: one-click enable/disable, multi-source market (GitHub/Gitee/custom), static-index market (500+ plugins / 300 skills), skills, suites, and one-click framework upgrade.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Noob-stupid/dsh-plugin-hub"
-    },
-    "type": "module",
-    "main": "./lib/index.js",
-    "exports": {
-        ".": "./lib/index.js",
-        "./client": "./lib/client.js",
-        "./package.json": "./package.json"
-    },
-    "keywords": [
-        "dsh-plugin",
-        "deepseek-harness",
-        "plugin-manager"
-    ],
-    "dsh": {
-        "bundle": {
-            "patch": "./cordis.patch.yml"
-        },
-        "client": {
-            "platform": "web",
-            "inject": [
-                "@deepseek-ai/dsh-client-runtime",
-                "@deepseek-ai/dsh-client-locale",
-                "@deepseek-ai/dsh-client-ui-settings"
-            ]
-        }
-    },
-    "files": [
-        "lib",
-        "cordis.patch.yml"
-    ],
-    "license": "MIT"
-}
+{
+    "name": "@noob-stupid/dsh-plugin-console",
+    "version": "0.3.19",
+    "description": "DSH plugin management panel & marketplace: one-click enable/disable, multi-source market (GitHub/Gitee/custom), static-index market (500+ plugins / 300 skills), skills, suites, and one-click framework upgrade.",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Noob-stupid/dsh-plugin-hub"
+    },
+    "type": "module",
+    "main": "./lib/index.js",
+    "exports": {
+        ".": "./lib/index.js",
+        "./client": "./lib/client.js",
+        "./package.json": "./package.json"
+    },
+    "keywords": [
+        "dsh-plugin",
+        "deepseek-harness",
+        "plugin-manager"
+    ],
+    "dsh": {
+        "bundle": {
+            "patch": "./cordis.patch.yml"
+        },
+        "client": {
+            "platform": "web",
+            "inject": [
+                "@deepseek-ai/dsh-client-runtime",
+                "@deepseek-ai/dsh-client-locale",
+                "@deepseek-ai/dsh-client-ui-settings"
+            ]
+        }
+    },
+    "files": [
+        "lib",
+        "cordis.patch.yml"
+    ],
+    "license": "MIT"
+}