dsh-model 0.23.2 → 0.23.3

package/README.en.md

@@ -163,6 +163,7 @@ See the [design doc](docs/DESIGN.md) (Chinese).
 - Meant for personal use: one account of your own per provider; do not use it to serve others.
 - Using subscription and WorkBuddy credentials outside the official clients may break the providers' terms and put the account at risk. Decide for yourself.
 - Windows 10 / 11 (x64, ARM64), macOS and Linux, Node ≥ 20.
+- Downloading the engine needs GitHub: setup uses the system proxy (Windows, macOS) or `HTTPS_PROXY` automatically; if it still cannot connect it says why, and you can pass `--proxy <url>` or download the file yourself and set `DSH_MODEL_ENGINE_ARCHIVE`.
 - Windows: the background services start at sign-in with no window. If an antivirus blocks them (the program is gone or will not start), trust `%USERPROFILE%\.dsh-model` and run `dsh-model repair`.
 
 ## License

package/README.md

@@ -163,6 +163,7 @@ dsh · 编辑器 · 脚本 ──Bearer key──▶ 引擎 127.0.0.1:8317/v1（
 - 适合个人使用：每家用自己的一个账号，不要拿来对外提供服务。
 - 订阅和 WorkBuddy 的凭据在官方客户端之外使用，可能不符合服务商的条款，账号有风险，请自行判断。
 - 支持 Windows 10 / 11（x64、ARM64）、macOS、Linux，需要 Node ≥ 20。
+- 下载引擎要连 GitHub：setup 会自动用上系统代理（Windows、macOS）或 `HTTPS_PROXY`；连不上时会说明原因，可以用 `--proxy <地址>` 指定代理，或手动下载后设置 `DSH_MODEL_ENGINE_ARCHIVE`。
 - Windows：后台服务登录后自动运行、不弹窗口。如果被杀毒软件拦下（程序不见了或启动不了），把 `%USERPROFILE%\.dsh-model` 加入信任，再执行 `dsh-model repair`。
 
 ## License

package/dist/commands/engine.js

@@ -45,9 +45,9 @@ async function upgrade(ctx, requested) {
     let asset = version === manifest.version ? manifest.assets[target] : undefined;
     if (!asset) {
         warn(L(`v${version} 不在本版 dsh-model 的锁定清单里，校验值取自上游发布的 checksums.txt`, `v${version} is not pinned by this dsh-model; using the checksum from the upstream checksums.txt`));
-        asset = await fetchUpstreamAsset(manifest, version, target);
+        asset = await fetchUpstreamAsset(manifest, version, target, { proxy: all.config.proxy });
     }
-    await installVersion(ctx, version, asset);
+    await installVersion(ctx, version, asset, { proxy: all.config.proxy });
     ok(L(`v${version} 已下载并校验`, `v${version} downloaded and verified`));
     await trialRun(ctx, all, versionBinary(ctx, version));
     ok(L('试运行通过', 'Trial run passed'));

package/dist/commands/setup.js

@@ -164,10 +164,10 @@ export async function ensureEngine(ctx, all, opts = {}) {
     const manifest = await loadManifest();
     const target = platformTarget();
     const version = config.engine.version ?? manifest.version;
-    const asset = version === manifest.version ? manifest.assets[target] : await fetchUpstreamAsset(manifest, version, target);
+    const asset = version === manifest.version ? manifest.assets[target] : await fetchUpstreamAsset(manifest, version, target, { proxy: config.proxy });
     if (!asset)
         throw new DshModelError('unsupported_platform', L(`引擎没有 ${target} 的发布包`, `No engine build for ${target}`));
-    const installed = await installVersion(ctx, version, asset);
+    const installed = await installVersion(ctx, version, asset, { proxy: config.proxy });
     if ((await currentVersion(ctx)) !== version)
         await activateVersion(ctx, version);
     config.engine.version = version;

package/dist/engine/install.js

@@ -3,13 +3,12 @@
 // 只信任仓库里 engine-manifest.json 的 sha256；校验不过直接失败。
 // 版本目录 engine/versions/<v>/，current 软链指向在用版本，升级与回滚只切软链。
 // Windows：发布包是 zip、程序叫 cli-proxy-api.exe；建软链要管理员，所以 current 用目录联接（junction），不需要权限。
-import { createWriteStream } from 'node:fs';
 import { chmod, mkdir, readFile, readlink, rename, rm, symlink, unlink } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
-import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
-import { DshModelError } from '../errors.js';
+import { DshModelError, isDshModelError } from '../errors.js';
 import { L } from '../i18n.js';
+import { downloadFile, downloadText } from '../util/download.js';
 import { run } from '../util/exec.js';
 import { ensureDir, exists, sha256 } from '../util/fs.js';
 import { PKG_ROOT } from '../util/pkg.js';
@@ -44,13 +43,19 @@ export async function currentVersion(ctx) {
     }
 }
 /** 从上游发布的 checksums.txt 取某版本的资产（engine upgrade <ver> 指定了清单外版本时用） */
-export async function fetchUpstreamAsset(manifest, version, target) {
+export async function fetchUpstreamAsset(manifest, version, target, opts = {}) {
     const base = `https://github.com/${manifest.repo}/releases/download/v${version}`;
     const file = assetFileName(version, target);
-    const res = await fetch(`${base}/checksums.txt`);
-    if (!res.ok)
-        throw new DshModelError('engine_version_not_found', L(`找不到引擎版本 v${version}（HTTP ${res.status}）`, `Engine version v${version} not found (HTTP ${res.status})`));
-    const line = (await res.text()).split('\n').find((l) => l.trim().endsWith(file));
+    let text;
+    try {
+        text = await downloadText(`${base}/checksums.txt`, join(tmpdir(), `dsh-model-checksums-${process.pid}-${Date.now()}.txt`), opts);
+    }
+    catch (error) {
+        if (isDshModelError(error) && error.code === 'download_not_found')
+            throw new DshModelError('engine_version_not_found', L(`找不到引擎版本 v${version}`, `Engine version v${version} not found`));
+        throw error;
+    }
+    const line = text.split('\n').find((l) => l.trim().endsWith(file));
     const sha = line?.trim().split(/\s+/)[0];
     if (!sha || !/^[0-9a-f]{64}$/.test(sha))
         throw new DshModelError('engine_checksum_missing', L(`v${version} 的 checksums.txt 里没有 ${file}`, `${file} is missing from v${version} checksums.txt`));
@@ -60,7 +65,7 @@ export async function fetchUpstreamAsset(manifest, version, target) {
  * 安装某版本到 versions/<v>/（已装就跳过）。返回是否真的装了。
  * DSH_MODEL_ENGINE_ARCHIVE 可指向本地 tar.gz（离线 / 测试），同样要过 sha256 校验。
  */
-export async function installVersion(ctx, version, asset) {
+export async function installVersion(ctx, version, asset, opts = {}) {
     const bin = versionBinary(ctx, version);
     if (await exists(bin))
         return false;
@@ -75,10 +80,14 @@ export async function installVersion(ctx, version, asset) {
             data = await readFile(local);
         }
         else {
-            const res = await fetch(asset.url);
-            if (!res.ok || !res.body)
-                throw new DshModelError('engine_download_failed', L(`下载引擎失败：HTTP ${res.status}`, `Engine download failed: HTTP ${res.status}`), asset.url);
-            await pipeline(Readable.fromWeb(res.body), createWriteStream(archive, { mode: 0o600 }));
+            try {
+                await downloadFile(asset.url, archive, opts);
+            }
+            catch (error) {
+                if (isDshModelError(error))
+                    throw new DshModelError('engine_download_failed', L(`下载引擎失败：${error.message.replace(/^下载失败：|^Download failed: /, '')}`, `Engine download failed: ${error.message.replace(/^下载失败：|^Download failed: /, '')}`), error.hint);
+                throw error;
+            }
             data = await readFile(archive);
         }
         const actual = sha256(data);

package/dist/util/download.js

@@ -0,0 +1,69 @@
+// util/download.ts — 下载文件（引擎发布包、checksums.txt）
+//
+// Node 的 fetch 不走系统代理，也不认 HTTPS_PROXY。国内直连 GitHub 的下载地址经常不通，
+// Windows 上 setup 只报一句 "fetch failed"（实测）。所以设了代理时改用系统自带的 curl 走代理
+// （macOS、Linux 都有；Windows 10 1803 起自带 curl.exe），没有 curl 再退回 fetch。
+// 下载的内容一律由调用方按清单里的 sha256 校验，走哪条路都一样可信。
+import { createWriteStream } from 'node:fs';
+import { readFile, rm } from 'node:fs/promises';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { DshModelError } from '../errors.js';
+import { L } from '../i18n.js';
+import { run, which } from './exec.js';
+import { redactProxy } from './proxy.js';
+/** fetch 抛的错里真正的原因（"fetch failed" 的 cause：ENOTFOUND、ECONNRESET、UND_ERR_CONNECT_TIMEOUT…） */
+export function fetchCause(error) {
+    const e = error;
+    const cause = e?.cause?.code ?? e?.cause?.message;
+    return cause ? `${e.message ?? 'fetch failed'}（${cause}）` : String(e?.message ?? error);
+}
+/** 连不上时怎么办：开代理、指定代理，或手动下载后用本地文件 */
+export function downloadHint(url, proxy) {
+    return proxy
+        ? L(`经代理 ${redactProxy(proxy)} 也没下载成功：确认代理软件开着、能打开 GitHub；或换一个代理（dsh-model setup --proxy <地址>）。也可以手动下载 ${url}，把环境变量 DSH_MODEL_ENGINE_ARCHIVE 设成下载好的文件路径，再执行 dsh-model setup`, `Still failed through the proxy ${redactProxy(proxy)}: check the proxy app is running and can reach GitHub, or use another one (dsh-model setup --proxy <url>). You can also download ${url} yourself, set the environment variable DSH_MODEL_ENGINE_ARCHIVE to the file's path, and run dsh-model setup again`)
+        : L(`连不上 GitHub（下载引擎要用）。用代理的话：打开代理软件的"系统代理"，或执行 dsh-model setup --proxy http://127.0.0.1:7890（换成你的代理端口）。也可以手动下载 ${url}，把环境变量 DSH_MODEL_ENGINE_ARCHIVE 设成下载好的文件路径，再执行 dsh-model setup`, `Cannot reach GitHub (needed to download the engine). If you use a proxy: turn on its "system proxy", or run dsh-model setup --proxy http://127.0.0.1:7890 (your proxy's port). You can also download ${url} yourself, set the environment variable DSH_MODEL_ENGINE_ARCHIVE to the file's path, and run dsh-model setup again`);
+}
+/** 下载到 dest。HTTP 404 抛 code=download_not_found，其余失败抛 download_failed（带原因和建议） */
+export async function downloadFile(url, dest, opts = {}) {
+    const curl = opts.proxy ? await which('curl') : null;
+    if (opts.proxy && curl) {
+        // --noproxy ''：只用这里指定的代理，不受环境里 NO_PROXY 的影响
+        const r = await run(curl, ['-fsSL', '--retry', '2', '--connect-timeout', '20', '--proxy', opts.proxy, '--noproxy', '', '-o', dest, url], { timeoutMs: 10 * 60_000 });
+        if (r.code === 0)
+            return;
+        await rm(dest, { force: true });
+        // curl -f：HTTP 4xx/5xx 退出码 22，stderr 里有 "The requested URL returned error: 404"
+        if (/\b404\b/.test(r.stderr))
+            throw new DshModelError('download_not_found', L(`没有这个文件：${url}`, `No such file: ${url}`));
+        throw new DshModelError('download_failed', L(`下载失败：${r.stderr.trim() || `curl 退出码 ${r.code}`}`, `Download failed: ${r.stderr.trim() || `curl exit code ${r.code}`}`), downloadHint(url, opts.proxy));
+    }
+    let res;
+    try {
+        res = await fetch(url, { signal: AbortSignal.timeout(10 * 60_000) });
+    }
+    catch (error) {
+        throw new DshModelError('download_failed', L(`下载失败：${fetchCause(error)}`, `Download failed: ${fetchCause(error)}`), downloadHint(url, opts.proxy));
+    }
+    if (res.status === 404)
+        throw new DshModelError('download_not_found', L(`没有这个文件：${url}`, `No such file: ${url}`));
+    if (!res.ok || !res.body)
+        throw new DshModelError('download_failed', L(`下载失败：HTTP ${res.status}`, `Download failed: HTTP ${res.status}`), downloadHint(url, opts.proxy));
+    try {
+        await pipeline(Readable.fromWeb(res.body), createWriteStream(dest, { mode: 0o600 }));
+    }
+    catch (error) {
+        await rm(dest, { force: true });
+        throw new DshModelError('download_failed', L(`下载中断：${fetchCause(error)}`, `Download interrupted: ${fetchCause(error)}`), downloadHint(url, opts.proxy));
+    }
+}
+/** 下载一个小文本文件（checksums.txt） */
+export async function downloadText(url, tmpFile, opts = {}) {
+    try {
+        await downloadFile(url, tmpFile, opts);
+        return await readFile(tmpFile, 'utf8');
+    }
+    finally {
+        await rm(tmpFile, { force: true });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "description": "Daily check-in credits claimed for you (Trae, Qoder, WorkBuddy China), one OpenAI-compatible address that relays every model, and free or subscription model sources (SiliconFlow, Gemini, Codex, Kimi, Ollama…). For DeepSeek Harness (dsh) and any OpenAI-compatible tool. 每天自动签到领积分 · 一个地址中转所有模型 · 免费和订阅模型随你接。",
   "keywords": [
     "siliconflow",