dsh-calibguard 0.3.0 → 0.3.2

package/README.en.md

@@ -76,7 +76,7 @@ once (depends on network and pip mirror).
 > You can also pre-warm, or install offline, by running the same installer manually (idempotent):
 >
 > ```powershell
-> node setup.mjs                          # bundled engine → npm model shards → venv → deps → self-check
+> node setup.mjs                          # bundled engine → model release asset → venv → deps → self-check
 > node setup.mjs --from D:\CalibGuard-GUI.zip   # use an already-downloaded release zip (offline)
 > node setup.mjs --dest D:\CG_GUI         # custom location (then configure engineRoot)
 > ```

package/README.md

@@ -69,7 +69,7 @@
 > 想提前预热、或断网/锁网环境需要离线安装，也可以手动跑安装器（同一套逻辑，幂等）：
 >
 > ```powershell
-> node setup.mjs                          # 一键：下载 → 解压 → venv → 依赖 → 自检
+> node setup.mjs                          # 一键：内置引擎 → 下载模型 → venv → 依赖 → 自检
 > node setup.mjs --from D:\CalibGuard-GUI.zip   # 用已下载的发行包，不联网
 > node setup.mjs --dest D:\CG_GUI         # 装到自定义位置（之后配置 engineRoot）
 > ```
@@ -81,7 +81,7 @@
 
 1. **DSH**（DeepSeek Harness）0.1.5-rc.2 实测可用；
 2. **Python**：无需预装——没有 64 位 3.10–3.12 时安装器会自动下载便携版（缓存在 `~/.dsh/calibguard-tools`，可用 `--no-portable-python` 关闭）；
-3. **引擎**：插件自带；模型权重会自动从 npm 镜像下载。也可用 `--from` 指定 CG 发行包，或把 `engineRoot` 指向已有 `CG_GUI/`。
+3. **引擎**：插件自带；模型权重会自动从本仓库 Release 下载（自动镜像回退）。也可用 `--from` 指定 CG 发行包，或把 `engineRoot` 指向已有 `CG_GUI/`。
 
 ### 方式 0：桌面端「添加插件」（最省事，推荐）
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-calibguard",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -48,6 +48,7 @@
     }
   },
   "scripts": {
+    "prepack": "node -e \"const fs=require('fs');for(const d of ['bridge','engine']){if(!fs.existsSync(d))continue;for(const f of fs.readdirSync(d,{withFileTypes:true})){if(f.isDirectory()&&f.name==='__pycache__')fs.rmSync(d+'/'+f.name,{recursive:true,force:true});else if(f.isFile()&&f.name.endsWith('.pyc'))fs.rmSync(d+'/'+f.name,{force:true});}}\"",
     "test": "node --test",
     "setup": "node setup.mjs",
     "link-dsh": "node scripts/link-dsh.mjs",

package/setup.mjs

@@ -35,7 +35,7 @@ const PY_MIN = 10
 const PY_MAX = 12
 
 /** 引擎下载的镜像前缀：GitHub 直连失败时依次重试。 */
-const ENGINE_MIRRORS = ['https://ghproxy.cn/', 'https://gh-proxy.com/', 'https://ghfast.top/']
+const ENGINE_MIRRORS = ['https://gh-proxy.com/', 'https://ghfast.top/', 'https://ghproxy.cn/']
 /** pip 索引：默认清华镜像，失败回退官方 PyPI。 */
 const DEFAULT_PIP_INDEX = 'https://pypi.tuna.tsinghua.edu.cn/simple'
 const OFFICIAL_PIP_INDEX = 'https://pypi.org/simple'
@@ -86,6 +86,9 @@ const MODEL_URL = 'https://github.com/maomitgd2006/dsh-CalibGuard/releases/downl
 /** 完整模型的 SHA-256（与 CG 发行包里的 model.safetensors 完全一致）。 */
 const MODEL_SHA256 = '2f088a00c1a08c9331a58de2b9adc9bb7ace8f28a2491ee7b699f41c7b7efc65'
 
+/** 模型压缩包的合理大小下限（防止镜像返回错误页被当成压缩包）。 */
+const MODEL_ZIP_MIN_BYTES = 400 * 1024 ** 2
+
 /** 文件 SHA-256（流式，避免大文件占内存）。 */
 function sha256File(file) {
   return new Promise((resolvePromise, rejectPromise) => {
@@ -98,9 +101,9 @@ function sha256File(file) {
 }
 
 /**
- * 准备模型权重：下载本仓库 Release 里的模型压缩包 → 校验 SHA-256 → 缓存到
+ * 准备模型权重：下载本仓库 Release 里的模型压缩包 → 校验尺寸/SHA-256 → 缓存到
  * `~/.dsh/calibguard-tools/model-cache` → 复制进引擎目录。
- * 支持断点续传、ghproxy 镜像；已缓存时秒级完成。
+ * 每个镜像都会完整尝试（下载 → 解压 → 校验），坏镜像不会污染结果；已缓存时秒级完成。
  */
 async function fetchModelWeights(dest) {
   const cacheDir = join(toolsDir(), 'model-cache')
@@ -114,42 +117,48 @@ async function fetchModelWeights(dest) {
     modelFile = cachedModel
   } else {
     const zipPath = join(cacheDir, 'calibguard-model-1.0.0.zip')
+    const unpacked = join(cacheDir, 'unpacked')
     let lastError = null
     for (const url of mirroredUrls(MODEL_URL)) {
       try {
         log(`下载模型权重（约 442 MB）：${url}`)
         await download(url, zipPath)
+        const size = statSync(zipPath).size
+        if (size < MODEL_ZIP_MIN_BYTES) {
+          throw new SetupError(`下载内容异常（${bytes(size)}，预期约 442 MB，可能是镜像错误页）`)
+        }
+        rmSync(unpacked, { recursive: true, force: true })
+        mkdirSync(unpacked, { recursive: true })
+        extract(zipPath, unpacked)
+        const found = findBinary(unpacked, 'model.safetensors')
+        if (!found) throw new SetupError('模型压缩包里没有 model.safetensors')
+        const actual = await sha256File(found)
+        if (actual !== MODEL_SHA256) throw new SetupError(`模型 SHA-256 不匹配：${actual}`)
+        deleteFile(cachedModel)
+        try {
+          renameSync(found, cachedModel)
+        } catch {
+          copyFileSync(found, cachedModel)
+        }
+        rmSync(unpacked, { recursive: true, force: true })
+        deleteFile(zipPath)
+        modelFile = cachedModel
         lastError = null
+        log(`✓ 模型已缓存：${cachedModel}`)
         break
       } catch (error) {
         lastError = error
-        warn(`下载源失败：${String(error.message).split('\n')[0]}`)
+        warn(`下载源失败：${String(error.message).split('\n')[0]}，换下一个源…`)
+        deleteFile(zipPath)
         deleteFile(`${zipPath}.part`)
+        rmSync(unpacked, { recursive: true, force: true })
       }
     }
-    if (lastError) {
-      throw new SetupError(`模型下载失败：${lastError.message}\n`
+    if (!modelFile) {
+      throw new SetupError(`模型下载失败：${lastError?.message ?? '未知错误'}\n`
         + `可以重试（支持断点续传），或手动下载后放到：${cachedModel}\n`
         + '（下载地址：https://github.com/maomitgd2006/dsh-CalibGuard/releases/tag/model-v1.0.0）')
     }
-    const unpacked = join(cacheDir, 'unpacked')
-    rmSync(unpacked, { recursive: true, force: true })
-    mkdirSync(unpacked, { recursive: true })
-    extract(zipPath, unpacked)
-    const found = findBinary(unpacked, 'model.safetensors')
-    if (!found) throw new SetupError(`模型压缩包里没有 model.safetensors：${unpacked}`)
-    const actual = await sha256File(found)
-    if (actual !== MODEL_SHA256) throw new SetupError(`模型 SHA-256 不匹配：${actual}`)
-    deleteFile(cachedModel)
-    try {
-      renameSync(found, cachedModel)
-    } catch {
-      copyFileSync(found, cachedModel)
-    }
-    rmSync(unpacked, { recursive: true, force: true })
-    deleteFile(zipPath)
-    modelFile = cachedModel
-    log(`✓ 模型已缓存：${cachedModel}`)
   }
 
   log(`写入引擎目录：${finalPath}`)
@@ -680,11 +689,15 @@ async function main() {
         for (const candidate of candidates) {
           try {
             await download(candidate, downloadedZip)
+            if (statSync(downloadedZip).size < 100 * 1024 ** 2) {
+              throw new SetupError('下载内容明显偏小，可能是镜像错误页')
+            }
             lastError = null
             break
           } catch (error) {
             lastError = error
             warn(`下载源失败：${String(error.message).split('\n')[0]}`)
+            rmSync(downloadedZip, { force: true })
             rmSync(`${downloadedZip}.part`, { force: true })
           }
         }