dsh-m 0.9.76 → 0.9.77

package/lib/core/primary-screenshots.js

@@ -1,5 +1,13 @@
 import { fetchTextLimited } from './httpx.js';
 const MANIFEST_HOST = 'raw.githubusercontent.com';
+/**
+ * 0.9.77 兜底腿（桌面机 raw 被墙实录）：raw.githubusercontent.com 直连在部分网络下
+ * TLS 握手即被 reset，而 registry 清单自身早有 default-raw → default-jsdelivr 降级链、
+ * 社区目录有 jsdelivr/npmmirror/unpkg 三路由——截图 manifest 是全市场唯一单源抓取点，
+ * 症状为「列表/README/安装全正常，唯独精选详情无截图」。此处补齐同款第二腿：
+ * jsDelivr 的 GitHub 镜像，仅当 raw 抓取层失败（含 404/超时/host guard 拒绝）时启用。
+ */
+const MIRROR_HOST = 'cdn.jsdelivr.net';
 const MANIFEST_FILE = 'screenshots.json';
 const MAX_MANIFEST_BYTES = 64 * 1024;
 const MAX_SCREENSHOTS = 8;
@@ -9,7 +17,8 @@ const OWNER_MAX = 39;
 const REPO_MAX = 100;
 const GITHUB_REPO_RE = /^[A-Za-z0-9][A-Za-z0-9-]*\/[A-Za-z0-9._-]+$/;
 const CONTROL_RE = /[\u0000-\u001f\u007f]/;
-function manifestUrl(github) {
+/** owner/repo 校验与归一（GITHUB_REPO_RE 与 registry 同款）；非法输入返回 null（零抓取）。 */
+function repoSlug(github) {
     const value = typeof github === 'string' ? github.trim() : '';
     if (!GITHUB_REPO_RE.test(value))
         return null;
@@ -18,9 +27,25 @@ function manifestUrl(github) {
     const repo = value.slice(slash + 1);
     if (owner.length > OWNER_MAX || repo.length > REPO_MAX || repo === '.' || repo === '..')
         return null;
-    return `https://${MANIFEST_HOST}/${owner}/${repo}/HEAD/${MANIFEST_FILE}`;
+    return `${owner}/${repo}`;
+}
+/**
+ * raw 规范形（/HEAD/ = 默认分支）。它同时是 parseManifest 的路径解析基址：无论哪条腿供数，
+ * 返回的图片 URL 一律落在 *.githubusercontent.com——恰好通过客户端 safeScreenshots 图床白名单
+ * （main.jsx 只放行 github.com / *.githubusercontent.com），镜像腿若原样回 jsdelivr URL 会被
+ * 客户端整体过滤、白修。
+ */
+function rawManifestUrl(slug) {
+    return `https://${MANIFEST_HOST}/${slug}/HEAD/${MANIFEST_FILE}`;
 }
-function screenshotUrl(manifest, rawPath) {
+/**
+ * jsDelivr 镜像形（@HEAD 与 raw /HEAD/ 同义，默认分支，实测可用）。镜像存在 CDN 缓存滞后
+ * （registry default-jsdelivr 同款取舍，可用 purge.jsdelivr.net 手动清缓存），截图属低频变更元数据，可接受。
+ */
+function mirrorManifestUrl(slug) {
+    return `https://${MIRROR_HOST}/gh/${slug}@HEAD/${MANIFEST_FILE}`;
+}
+function screenshotUrl(baseUrl, rawPath) {
     if (typeof rawPath !== 'string')
         return null;
     const path = rawPath.trim();
@@ -35,10 +60,10 @@ function screenshotUrl(manifest, rawPath) {
     const segments = path.split('/');
     if (segments.some((part) => part === '' || part === '.' || part === '..'))
         return null;
-    const base = new URL('.', manifest);
+    const base = new URL('.', baseUrl);
     return new URL(segments.map((part) => encodeURIComponent(part)).join('/'), base).toString();
 }
-function parseManifest(text, manifestUrl) {
+function parseManifest(text, baseUrl) {
     let parsed;
     try {
         parsed = JSON.parse(text);
@@ -50,14 +75,14 @@ function parseManifest(text, manifestUrl) {
         return [];
     const result = [];
     for (const path of parsed) {
-        const url = screenshotUrl(manifestUrl, path);
+        const url = screenshotUrl(baseUrl, path);
         if (!url)
             return [];
         result.push(url);
     }
     return result;
 }
-function assertManifestHost(raw, isRedirectHop) {
+function assertManifestHost(raw, isRedirectHop, allowedHost) {
     let url;
     try {
         url = new URL(raw);
@@ -65,14 +90,31 @@ function assertManifestHost(raw, isRedirectHop) {
     catch {
         throw new Error(isRedirectHop ? 'screenshot manifest redirect URL is invalid' : 'invalid screenshot manifest request URL');
     }
-    if (url.protocol !== 'https:' || url.hostname !== MANIFEST_HOST || url.username || url.password || url.port) {
+    if (url.protocol !== 'https:' || url.hostname !== allowedHost || url.username || url.password || url.port) {
         throw new Error(isRedirectHop
-            ? 'screenshot manifest redirects must remain on raw.githubusercontent.com'
-            : 'screenshot manifest request URL must be https://raw.githubusercontent.com');
+            ? `screenshot manifest redirects must remain on ${allowedHost}`
+            : `screenshot manifest request URL must be https://${allowedHost}`);
     }
 }
+/** 单腿抓取：每腿独立逐跳 host guard（初始跳 + 重定向都不许离开本腿源），5s / 64KB 上限逐腿独立生效。 */
+async function fetchManifestLeg(fetchText, url, allowedHost) {
+    let hop = 0;
+    return fetchText(url, {
+        timeoutMs: 5_000,
+        maxBytes: MAX_MANIFEST_BYTES,
+        headers: { accept: 'application/json' },
+        onRequest: (hopUrl) => {
+            // 逐跳 host guard；错误文案区分初始跳与重定向跳，避免调试误导（评审建议落盘）。
+            const isRedirectHop = hop > 0;
+            hop += 1;
+            assertManifestHost(hopUrl, isRedirectHop, allowedHost);
+        },
+    });
+}
 /**
  * Read an author-owned root screenshots.json without consulting Community Catalog.
+ * 两腿链：raw 抓取层失败 → jsDelivr 镜像；两腿全败 → 空图库。解析层的「空」是权威结果
+ * （两腿读的是同一 repo 文件，镜像不会有不同内容），不再触发兜底。
  * All network access is bounded, and a rejected/empty manifest degrades to no gallery.
  */
 export function createPrimaryScreenshotReader(options = {}) {
@@ -81,10 +123,11 @@ export function createPrimaryScreenshotReader(options = {}) {
     const cache = new Map();
     const flights = new Map();
     return async (github) => {
-        const url = manifestUrl(github);
-        if (!url)
+        const slug = repoSlug(github);
+        if (!slug)
             return [];
-        const key = url.toLowerCase();
+        const rawUrl = rawManifestUrl(slug);
+        const key = rawUrl.toLowerCase();
         const timestamp = now();
         for (const [cachedKey, value] of cache) {
             if (value.expiresAt <= timestamp)
@@ -98,24 +141,20 @@ export function createPrimaryScreenshotReader(options = {}) {
             return [...(await pending)];
         const flight = (async () => {
             let screenshots = [];
-            let hop = 0;
             try {
-                const text = await fetchText(url, {
-                    timeoutMs: 5_000,
-                    maxBytes: MAX_MANIFEST_BYTES,
-                    headers: { accept: 'application/json' },
-                    onRequest: (hopUrl) => {
-                        // 逐跳 host guard；错误文案区分初始跳与重定向跳，避免调试误导（评审建议落盘）。
-                        const isRedirectHop = hop > 0;
-                        hop += 1;
-                        assertManifestHost(hopUrl, isRedirectHop);
-                    },
-                });
-                screenshots = parseManifest(text, url);
+                const text = await fetchManifestLeg(fetchText, rawUrl, MANIFEST_HOST);
+                screenshots = parseManifest(text, rawUrl);
             }
             catch {
-                // Images are optional metadata: a missing/unavailable manifest must not block detail/install.
-                screenshots = [];
+                try {
+                    const mirrorUrl = mirrorManifestUrl(slug);
+                    const text = await fetchManifestLeg(fetchText, mirrorUrl, MIRROR_HOST);
+                    screenshots = parseManifest(text, rawUrl);
+                }
+                catch {
+                    // Images are optional metadata: a missing/unavailable manifest must not block detail/install.
+                    screenshots = [];
+                }
             }
             cache.set(key, {
                 screenshots,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.9.76",
+  "version": "0.9.77",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",