@noob-stupid/dsh-plugin-console 0.5.17 → 0.5.19

package/lib/server/routes/install.js

@@ -3,7 +3,7 @@
 
 import { installJobView } from '../domain/install.js'
 import { runInstallJob } from '../domain/install-job.js'
-import { githubRepoInfo } from '../domain/market.js'
+import { fetchRepoPackageEx, githubRepoInfo, subpackageCandidates } from '../domain/market.js'
 import { runSkillInstallJob } from '../domain/skills.js'
 import { probeGitmodules, resolveInstallKind, runSuiteInstallJob } from '../domain/suite.js'
 import { sendError, sendJson } from '../infra/httpd.js'
@@ -83,10 +83,15 @@ async function routeInstall(req, res, rc) {
     // 套装通道兜底：探测说有、clone 下来却没有 .gitmodules（假阳性 / 仓库已重构）时
     // 回落普通插件安装，而不是给用户一个「未找到 .gitmodules」的失败。
     const runSuiteThenFallback = async () => {
-      const result = await runSuiteInstallJob(job, ctx)
+      // 0.5.19：套装作业入口自己也有一道判据（根包/子包已发布 → 不克隆整个仓库），它需要真实探测：
+      // 显式「安装套装」（前端 hasSuite=true 的卡片）走的就是这条路，不经过 install-job 的候选循环。
+      const result = await runSuiteInstallJob(job, ctx, {
+        probes: { fetchRepoPackageEx, subpackageCandidates, probeGitmodules },
+      })
       if (result?.notASuite !== true) return
       job.kind = 'plugin'
-      job.suiteNote = '仓库实际内容与探测不符（没有 .gitmodules），已自动回落普通插件安装'
+      // 回落文案一律用 result.reason：克隆失败与"内容不符"是两回事，不能都报成后者（用户会被带偏）
+      job.suiteNote = result.reason ?? '仓库实际内容与探测不符（没有 .gitmodules），已自动回落普通插件安装'
       await runInstallJob(job, ctx)
     }
     // 后台执行：请求立即返回，安装不受客户端断开/离开面板影响

package/lib/server/routes/sources.js

@@ -401,6 +401,85 @@ async function routeSources(req, res, rc) {
       sendJson(res, 200, { ok: true, sources: maskSources(sources) })
       return
     }
+    if (action === 'add-archive') {
+      // archive 通道源（批次 C-⑨）：模板必须含 {owner}/{repo}（{branch} 可选）
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const urlTemplate = typeof body.urlTemplate === 'string' ? body.urlTemplate.trim() : ''
+      if (!urlTemplate.includes('{owner}') || !urlTemplate.includes('{repo}')) {
+        sendError(res, 400, 'archive 源模板必须同时包含 {owner} 与 {repo} 占位符（{branch} 可选）')
+        return
+      }
+      if (!isAllowedGitSourceUrl(urlTemplate)) {
+        sendError(res, 400, 'archive 源地址必须是 https://（或本机/私网 http://、file://）的合法 URL')
+        return
+      }
+      if ((sources.archiveSources ?? []).some((s) => s.urlTemplate === urlTemplate)) {
+        sendError(res, 400, '该 archive 源已存在')
+        return
+      }
+      sources.archiveSources = [...(sources.archiveSources ?? []), {
+        id: `arc-${Date.now().toString(36)}`,
+        name: name || urlTemplate,
+        urlTemplate,
+        primary: (sources.archiveSources ?? []).length === 0,
+      }]
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'edit-archive') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const name = typeof body.name === 'string' ? body.name.trim() : ''
+      const urlTemplate = typeof body.urlTemplate === 'string' ? body.urlTemplate.trim() : ''
+      if (!urlTemplate.includes('{owner}') || !urlTemplate.includes('{repo}')) {
+        sendError(res, 400, 'archive 源模板必须同时包含 {owner} 与 {repo} 占位符（{branch} 可选）')
+        return
+      }
+      if (!isAllowedGitSourceUrl(urlTemplate)) {
+        sendError(res, 400, 'archive 源地址必须是 https://（或本机/私网 http://、file://）的合法 URL')
+        return
+      }
+      const target = (sources.archiveSources ?? []).find((s) => s.id === id)
+      if (!target) {
+        sendError(res, 404, '没有这个 archive 源')
+        return
+      }
+      target.name = name || urlTemplate
+      target.urlTemplate = urlTemplate
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'set-archive-primary') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.archiveSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个 archive 源')
+        return
+      }
+      for (const s of list) s.primary = s.id === id
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
+    if (action === 'remove-archive') {
+      const id = typeof body.id === 'string' ? body.id : ''
+      const list = sources.archiveSources ?? []
+      if (!list.some((s) => s.id === id)) {
+        sendError(res, 404, '没有这个 archive 源')
+        return
+      }
+      const rest = list.filter((s) => s.id !== id)
+      if (rest.length === 0) {
+        sendError(res, 400, '至少保留一个 archive 源（可先添加自建镜像再删除默认源）')
+        return
+      }
+      if (!rest.some((s) => s.primary)) rest[0].primary = true
+      sources.archiveSources = rest
+      await writeSources(sources)
+      sendJson(res, 200, { ok: true, sources: maskSources(sources) })
+      return
+    }
     if (action === 'reset') {
       const defaults = JSON.parse(JSON.stringify(DEFAULT_SOURCES))
       setMarketIndexCache(null)
@@ -430,7 +509,7 @@ async function routeSources(req, res, rc) {
       sendJson(res, 200, { ok: true, sources: maskSources(sources) })
       return
     }
-    sendError(res, 400, '未知操作（add / edit / set-primary / remove / add-search / remove-search / add-index / edit-index / set-index-primary / remove-index / set-index-merge / add-git / edit-git / set-git-primary / remove-git / gitee-setup / gitee-clear / reset）')
+    sendError(res, 400, '未知操作（add / edit / set-primary / remove / add-search / remove-search / add-index / edit-index / set-index-primary / remove-index / set-index-merge / add-git / edit-git / set-git-primary / remove-git / add-archive / edit-archive / set-archive-primary / remove-archive / gitee-setup / gitee-clear / reset）')
     return
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noob-stupid/dsh-plugin-console",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "description": "DSH 框架升级安全与插件升级门控：一键升级、失败自动回滚、升级后回滚上版、旧插件不适配自动禁用；内置多源插件市场为发现层，插件源全部可自定义，可指向公司内网私有源 / 私有索引 / 本地 Git 仓库，纯内网离线可用 | Framework upgrade safety & plugin version gating for DSH, with a customizable multi-source plugin market: point every source at internal mirrors or a local file:// repo for intranet-only, offline installs.",
   "repository": {
     "type": "git",