dsh-her 0.2.0 → 0.3.1

package/README.md

@@ -14,7 +14,7 @@
 | M3 外形包与姿势图 | ✅ mac 通过（[记录](docs/M3记录.md)）；用合成测试包验证，"想看 JK" 全流程跑通；待真实素材校准 |
 | M4 内置记忆 | ✅ mac 通过（[记录](docs/M4记录.md)）；换全新会话仍记得，删掉的事不再提 |
 | M5 向导与管理页 | ✅ mac 通过（[记录](docs/M5记录.md)）；dsh 侧栏"她"：7 步向导 + 管理页。身体的下载安装挪到 M6 |
-| M6 打磨与发布 | 进行中（[记录](docs/M6记录.md)）：mac 身体打包、一键下载安装和自动更新、Edge 声音不再依赖系统 Python；签名公证、Windows、省电待做 |
+| M6 打磨与发布 | 进行中（[记录](docs/M6记录.md)）：mac 身体打包、一键下载安装和自动更新、Edge 声音不再依赖系统 Python；Windows 身体打包和安装已写好、等实测（[Windows适配](docs/Windows适配.md)）；签名公证、省电待做 |
 
 ## 组成
 

package/lib/body-release.json

@@ -0,0 +1,19 @@
+{
+  "base": "https://github.com/AIcivilization/dsh-her/releases/download/v0.3.1/",
+  "manifest": {
+    "format": "dsh-her-body@1",
+    "version": "0.3.0",
+    "assets": {
+      "darwin-arm64": {
+        "file": "dsh-her-body-0.3.0-darwin-arm64.zip",
+        "size": 148276980,
+        "sha256": "e648aa5f4d4776e0c591bf31f617ffec23084fb6fafd918e4d5a0552484ffceb"
+      },
+      "win32-x64": {
+        "file": "dsh-her-body-0.3.0-win32-x64.zip",
+        "size": 213762814,
+        "sha256": "f29c9be0e75efee1d76ed020c981398d883d0c3d59dd8362c8d49556ec58d3d3"
+      }
+    }
+  }
+}

package/lib/dsh/body-install.js

@@ -6,6 +6,8 @@
  *   { "format": "dsh-her-body@1", "version": "0.1.0",
  *     "assets": { "darwin-arm64": { "file": "dsh-her-body-0.1.0-darwin-arm64.zip", "size": …, "sha256": "…" } } }
  *
+ * The app is `dsh-her.app` on macOS and a `dsh-her` folder with
+ * `dsh-her.exe` on Windows (body/scripts/package.mjs makes both).
  * `<home>/body/current.json` says which version is installed. A download
  * that does not match its SHA-256 is thrown away; the previous version stays
  * until the new one is in place, and one older version is kept to go back to.
@@ -17,9 +19,15 @@ import { join } from 'node:path';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
+import { fileURLToPath } from 'node:url';
+import { fetchChecked, httpFetch, NetError } from "../net.js";
+import { systemTar } from "../platform.js";
 const run = promisify(execFile);
 export const MANIFEST = 'body-latest.json';
-const APP = 'dsh-her.app';
+/** The app inside a release zip (and in `<home>/body/<version>/`). */
+export const appName = (platform = process.platform) => (platform === 'win32' ? 'dsh-her' : 'dsh-her.app');
+/** Platforms with a body in the release. */
+const PACKAGED = new Set(['darwin', 'win32']);
 /** This computer's asset key in the manifest. */
 export const platformKey = (platform = process.platform, arch = process.arch) => `${platform}-${arch}`;
 /** -1, 0, 1: "0.1.0-dev.0" < "0.1.0" < "0.1.1" < "0.2.0". */
@@ -72,23 +80,63 @@ export function installedPlan(home) {
         return undefined;
     if (process.platform === 'darwin')
         return { binary: join(installed.app, 'Contents', 'MacOS', 'Electron'), args: [], cwd: join(installed.app, '..') };
+    if (process.platform === 'win32')
+        return { binary: join(installed.app, 'dsh-her.exe'), args: [], cwd: installed.app };
     return undefined;
 }
 /** `base` + file: the release's download address ends with a slash, or the file is appended after one. */
 const at = (base, file) => `${base.replace(/\/?$/, '/')}${file}`;
+/**
+ * The release's manifest, from GitHub itself (through the system proxy when
+ * there is one), never from a mirror: it carries the checksums that make a
+ * mirror's zip safe to use.
+ */
 export async function fetchManifest(base) {
-    const res = await fetch(at(base, MANIFEST), { redirect: 'follow', signal: AbortSignal.timeout(20_000) });
+    let res;
+    try {
+        res = await httpFetch(at(base, MANIFEST), { redirect: 'follow', signal: AbortSignal.timeout(20_000) });
+    }
+    catch (error) {
+        throw new NetError(at(base, MANIFEST), error);
+    }
     if (!res.ok)
         throw new Error(`读不到发布信息（${res.status}）：${at(base, MANIFEST)}`);
     return validateManifest(await res.json());
 }
+/**
+ * The manifest of this plugin's own release, put into the npm package when it
+ * was published (scripts/embed-body-release.mjs). The npm registry (and its
+ * mirrors) is reachable where GitHub is not, so a first install can still
+ * know what to download and how to check it.
+ */
+export function bundledRelease(file = fileURLToPath(new URL('../body-release.json', import.meta.url))) {
+    try {
+        const { base, manifest } = JSON.parse(readFileSync(file, 'utf8'));
+        return typeof base === 'string' && base.startsWith('https://github.com/') ? { base, manifest: validateManifest(manifest) } : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** What to install: the newest release on GitHub, or, when GitHub cannot be reached, this plugin's own. */
+export async function latestRelease(base) {
+    try {
+        return { manifest: await fetchManifest(base), base };
+    }
+    catch (error) {
+        const bundled = bundledRelease();
+        if (error instanceof NetError && bundled !== undefined)
+            return bundled;
+        throw error;
+    }
+}
 /**
  * Download this computer's asset of `manifest`, check it, unpack it next to
  * the installed version and make it current. Progress in bytes.
  */
 export async function install(home, base, manifest, onProgress) {
-    if (process.platform !== 'darwin')
-        throw new Error('这个系统的身体程序还没有发布（现在只有 macOS 版）');
+    if (!PACKAGED.has(process.platform))
+        throw new Error('这个系统的身体程序还没有发布（现在有 macOS 和 Windows 版）');
     const asset = manifest.assets[platformKey()];
     if (asset === undefined)
         throw new Error(`发布里没有这台电脑（${platformKey()}）的身体程序`);
@@ -96,7 +144,8 @@ export async function install(home, base, manifest, onProgress) {
     const downloads = join(root, 'download');
     mkdirSync(downloads, { recursive: true });
     const zip = join(downloads, asset.file);
-    const res = await fetch(at(base, asset.file), { redirect: 'follow' });
+    // From GitHub, or a mirror when GitHub cannot be reached: the size and SHA-256 below decide either way.
+    const res = await fetchChecked(at(base, asset.file));
     if (!res.ok || res.body === null)
         throw new Error(`下载失败（${res.status}）`);
     const hash = createHash('sha256');
@@ -116,22 +165,31 @@ export async function install(home, base, manifest, onProgress) {
     const unpacking = `${target}.unpacking`;
     rmSync(unpacking, { recursive: true, force: true });
     mkdirSync(unpacking, { recursive: true });
-    // ditto keeps the app's symlinks, permissions and signature.
-    await run('ditto', ['-x', '-k', zip, unpacking], { timeout: 300_000 });
-    if (!existsSync(join(unpacking, APP)))
+    // macOS: ditto keeps the app's symlinks, permissions and signature. Windows: the system tar reads zip.
+    if (process.platform === 'darwin')
+        await run('ditto', ['-x', '-k', zip, unpacking], { timeout: 300_000 });
+    else
+        await run(systemTar(), ['-xf', zip, '-C', unpacking], { timeout: 300_000 });
+    if (!existsSync(join(unpacking, appName())))
         throw new Error('下载的包里没有身体程序');
     rmSync(target, { recursive: true, force: true });
     renameSync(unpacking, target);
     rmSync(zip, { force: true });
     const previous = installedBody(home);
-    const installed = { version: manifest.version, app: join(target, APP), installedAt: new Date().toISOString() };
+    const installed = { version: manifest.version, app: join(target, appName()), installedAt: new Date().toISOString() };
     writeFileSync(join(root, 'current.json.tmp'), `${JSON.stringify(installed, null, 2)}\n`);
     renameSync(join(root, 'current.json.tmp'), join(root, 'current.json'));
     // Keep this version and the one before it; older ones go.
     for (const entry of readdirSync(root)) {
         const keep = entry === manifest.version || entry === previous?.version || entry === 'download' || entry.endsWith('.json');
-        if (!keep)
+        if (keep)
+            continue;
+        try {
             rmSync(join(root, entry), { recursive: true, force: true });
+        }
+        catch {
+            // Windows keeps a running program's files locked: that old version goes next time.
+        }
     }
     return installed;
 }

package/lib/dsh/body-launcher.js

@@ -42,7 +42,7 @@ export function launchBody(plan, env) {
     const childEnv = { ...process.env, DSH_HER_URL: env.url, DSH_HER_TOKEN: env.token, DSH_HER_HOME: env.home };
     delete childEnv.ELECTRON_RUN_AS_NODE;
     const args = env.pack === '' ? plan.args : [...plan.args, '--pack', env.pack];
-    const child = spawn(plan.binary, args, { cwd: plan.cwd, env: childEnv, detached: true, stdio: 'ignore' });
+    const child = spawn(plan.binary, args, { cwd: plan.cwd, env: childEnv, detached: true, stdio: 'ignore', windowsHide: true });
     child.unref();
     return child.pid;
 }

package/lib/dsh/config.js

@@ -1,4 +1,5 @@
 import Schema from '@deepseek-ai/schemastery';
+import { DEFAULT_MIRRORS } from "../net.js";
 import { DEFAULT_VOICE, SAMPLE_PERSONA } from "../core/index.js";
 export const Config = Schema.object({
     home: Schema.string().default('~/.dsh-her').description('dsh-her home (characters, packs, voice models)'),
@@ -16,6 +17,7 @@ export const Config = Schema.object({
         pack: Schema.string().default('').description('Appearance pack directory (empty = body default)'),
         releases: Schema.string().default('https://github.com/AIcivilization/dsh-her/releases/latest/download/').description('Where the body app is downloaded from (the folder with body-latest.json)'),
         useDev: Schema.boolean().default(true).description('Use the development body in the repository when there is one (off: like a release install)'),
+        mirrors: Schema.array(String).default([...DEFAULT_MIRRORS]).description('GitHub mirrors tried when github.com cannot be reached (body, voice models, Ming); files are checked by size and SHA-256. Empty: GitHub only'),
     }).default({}),
     voice: Schema.object({
         enabled: Schema.boolean().default(true).description('Her voice; off = she only writes'),

package/lib/dsh/plugin.js

@@ -39,13 +39,14 @@ import { PROTOCOL_VERSION } from "../protocol/index.js";
 import { BrainServer } from "../server/brain-server.js";
 import { API_BASE, apiHandlers, handle } from "./api.js";
 import { bodyRunning, findDevBody, launchBody } from "./body-launcher.js";
-import { compareVersions, fetchManifest, install, installedBody, installedPlan } from "./body-install.js";
+import { compareVersions, install, installedBody, installedPlan, latestRelease } from "./body-install.js";
 import { IDLE_IMPORT } from "./import-status.js";
 import { DESK_DIR, newProject, sceneDir } from "../core/workshop.js";
 import { exampleFile, examples, exportProject, findProject, importProject, listProjects, prepareImport, projectStatus, saveProject } from "./workshop.js";
 import { HerSession } from "./her-session.js";
 import { heardText, SpeechQueue } from "../voice/speech-queue.js";
 import { Voice } from "../voice/voice.js";
+import { setMirrors } from "../net.js";
 import { defaultIdleMinutes, MingVoice } from "../voice/ming.js";
 import { MING_STEPS, OwnVoices, prepareRecording } from "../voice/ming-voices.js";
 const SERVICES = ['agents', 'agentDefaultModel', 'workspaceRegistry', 'sessionTitle', 'sessionQuery', 'llm'];
@@ -95,6 +96,7 @@ const UPDATE_CHECK_MS = 6 * 60 * 60_000;
 const STUCK_AFTER_MS = 20_000;
 export function apply(ctx, config) {
     const paths = herPaths(config.home);
+    setMirrors(config.body.mirrors);
     const cid = config.character.id;
     const dir = join(paths.characters, cid);
     let services;
@@ -284,14 +286,14 @@ export function apply(ctx, config) {
             return;
         installState = { ...installState, state: 'checking' };
         try {
-            const manifest = await fetchManifest(config.body.releases);
+            const { manifest, base } = await latestRelease(config.body.releases);
             installState = { ...installState, latest: manifest.version };
             if (before !== undefined && compareVersions(manifest.version, before.version) <= 0) {
                 installState = { ...installState, state: 'idle' };
                 return;
             }
             installState = { ...installState, state: 'downloading', done: 0, total: 0 };
-            const installed = await install(paths.root, config.body.releases, manifest, (done, total) => {
+            const installed = await install(paths.root, base, manifest, (done, total) => {
                 installState = { ...installState, state: done < total ? 'downloading' : 'installing', done, total };
             });
             installState = { ...installState, state: 'idle', installed: installed.version, restart: before !== undefined && (server?.bodies.length ?? 0) > 0 };

package/lib/net.js

@@ -0,0 +1,113 @@
+/**
+ * Downloads that work on the networks her users are on.
+ *
+ * - Inside the DSH desktop app, requests go through Electron's `net.fetch`:
+ *   Chromium's network stack, which follows the system proxy settings the
+ *   way a browser does (Node's own fetch ignores them, so a computer that
+ *   reaches GitHub only through Clash or the like got "fetch failed").
+ *   Elsewhere (the dsh command line) it is Node's fetch.
+ * - A GitHub download that cannot connect is tried again through mirrors
+ *   (`body.mirrors`, prefixes such as `https://ghfast.top/`). Mirrors are
+ *   third parties: only files whose size and SHA-256 the caller knows in
+ *   advance should come through them, and every caller here checks both.
+ * - A failure says what went wrong in plain words (no bare "fetch failed").
+ */
+import { createRequire } from 'node:module';
+/** Mirror prefixes tried, in order, after github.com itself. */
+export const DEFAULT_MIRRORS = ['https://ghfast.top/', 'https://gh-proxy.com/'];
+let mirrors = DEFAULT_MIRRORS;
+let systemFetch;
+/** The plugin's `body.mirrors` setting (an empty list: GitHub only). */
+export function setMirrors(list) {
+    mirrors = list.map(m => m.trim()).filter(m => /^https:\/\/\S+\/$/.test(m));
+}
+/** Electron's net.fetch when this runs inside the DSH desktop app. */
+function viaSystem() {
+    if (systemFetch === undefined) {
+        try {
+            const electron = createRequire(import.meta.url)('electron');
+            systemFetch = typeof electron === 'object' && typeof electron.net?.fetch === 'function' ? electron.net.fetch.bind(electron.net) : null;
+        }
+        catch {
+            systemFetch = null;
+        }
+    }
+    return systemFetch ?? undefined;
+}
+/** fetch, through the system proxy when it can. */
+export async function httpFetch(url, init = {}) {
+    const system = viaSystem();
+    if (system !== undefined) {
+        try {
+            return await system(url, init);
+        }
+        catch (error) {
+            if (error.name === 'AbortError' || error.name === 'TimeoutError')
+                throw error;
+            // Electron's stack could not; Node's may (a proxy that only Node sees, through its own settings).
+        }
+    }
+    return fetch(url, init);
+}
+/** Where to try `url`: itself, then each mirror when it is a GitHub download. */
+export function candidates(url, list = mirrors) {
+    return [url, ...(isGithub(url) ? list.map(m => `${m}${url}`) : [])];
+}
+const isGithub = (url) => /^https:\/\/(github\.com|objects\.githubusercontent\.com|release-assets\.githubusercontent\.com)\//.test(url);
+/**
+ * The response for `url`, from GitHub or, if that cannot connect, a mirror.
+ * Only for files the caller checks (size and SHA-256) before using them.
+ * Throws a NetError explaining the first failure.
+ */
+export async function fetchChecked(url, init = {}) {
+    let first;
+    for (const candidate of candidates(url)) {
+        try {
+            const res = await httpFetch(candidate, { redirect: 'follow', ...init });
+            // A mirror that answers with an error page is no better than one that does not answer.
+            if (res.ok || candidate === url && res.status === 404)
+                return res;
+            first ??= new Error(`HTTP ${res.status}`);
+        }
+        catch (error) {
+            if (error.name === 'AbortError')
+                throw error;
+            first ??= error;
+        }
+    }
+    throw new NetError(url, first);
+}
+/** A download that failed, with the reason in Chinese for the page. */
+export class NetError extends Error {
+    constructor(url, cause) {
+        super(explain(url, cause), { cause });
+        this.name = 'NetError';
+    }
+}
+/** "连不上 github.com：…" from fetch's error (its `cause` carries the system's code). */
+export function explain(url, error) {
+    const host = (() => {
+        try {
+            return new URL(url).host;
+        }
+        catch {
+            return url;
+        }
+    })();
+    const e = error;
+    const code = e?.cause?.code ?? e?.code ?? '';
+    const detail = `${code}${e?.cause?.message ?? e?.message ?? ''}`;
+    const github = /github/.test(host);
+    const tip = github ? '如果你平时通过代理上 GitHub，打开代理软件的"系统代理"再试；没有代理也会自动换镜像下载，都不行时可以在插件设置 body.mirrors 里换一个镜像。' : '检查一下网络再试。';
+    if (/HTTP \d+/.test(detail))
+        return `${host} 返回了错误（${detail.match(/HTTP \d+/)[0]}）。${tip}`;
+    if (/ENOTFOUND|EAI_AGAIN|NAME_NOT_RESOLVED/.test(detail))
+        return `找不到 ${host}（域名解析失败）。${tip}`;
+    if (/ECONNRESET|ECONNREFUSED|CONNECTION_RESET|CONNECTION_REFUSED|CONNECTION_CLOSED/.test(detail))
+        return `连不上 ${host}（连接被拒绝或被重置）。${tip}`;
+    if (/TIMEOUT|ETIMEDOUT|TIMED_OUT|Timeout/i.test(detail))
+        return `连接 ${host} 超时。${tip}`;
+    if (/CERT|SSL|TLS|SIGNATURE|SELF_SIGNED|UNABLE_TO_VERIFY/i.test(detail))
+        return `和 ${host} 的加密连接出错（证书不对，可能被网络或代理拦截了）。${tip}`;
+    return `连不上 ${host}（${detail || '网络错误'}）。${tip}`;
+}

package/lib/platform.js

@@ -0,0 +1,12 @@
+/**
+ * Small differences between operating systems the plugin runs on.
+ */
+import { join } from 'node:path';
+/**
+ * The system's own bsdtar (macOS, Windows 10+). On Windows it is named by its
+ * full path: a `tar` earlier on PATH (Git for Windows ships GNU tar) reads
+ * `C:\…` as a remote host and fails.
+ */
+export function systemTar(platform = process.platform) {
+    return platform === 'win32' ? join(process.env.SystemRoot ?? 'C:\\Windows', 'System32', 'tar.exe') : 'tar';
+}

package/lib/types/dsh/body-install.d.ts

@@ -6,12 +6,16 @@
  *   { "format": "dsh-her-body@1", "version": "0.1.0",
  *     "assets": { "darwin-arm64": { "file": "dsh-her-body-0.1.0-darwin-arm64.zip", "size": …, "sha256": "…" } } }
  *
+ * The app is `dsh-her.app` on macOS and a `dsh-her` folder with
+ * `dsh-her.exe` on Windows (body/scripts/package.mjs makes both).
  * `<home>/body/current.json` says which version is installed. A download
  * that does not match its SHA-256 is thrown away; the previous version stays
  * until the new one is in place, and one older version is kept to go back to.
  */
 import type { LaunchPlan } from './body-launcher.ts';
 export declare const MANIFEST = "body-latest.json";
+/** The app inside a release zip (and in `<home>/body/<version>/`). */
+export declare const appName: (platform?: string) => "dsh-her" | "dsh-her.app";
 export interface BodyAsset {
     file: string;
     size: number;
@@ -24,7 +28,7 @@ export interface BodyManifest {
 }
 export interface Installed {
     version: string;
-    /** The app (macOS: dsh-her.app) inside `<home>/body/<version>/`. */
+    /** The app (macOS: dsh-her.app; Windows: the dsh-her folder) inside `<home>/body/<version>/`. */
     app: string;
     installedAt: string;
 }
@@ -50,7 +54,27 @@ export declare function validateManifest(value: unknown): BodyManifest;
 export declare function installedBody(home: string): Installed | undefined;
 /** How to start the installed body. */
 export declare function installedPlan(home: string): LaunchPlan | undefined;
+/**
+ * The release's manifest, from GitHub itself (through the system proxy when
+ * there is one), never from a mirror: it carries the checksums that make a
+ * mirror's zip safe to use.
+ */
 export declare function fetchManifest(base: string): Promise<BodyManifest>;
+/**
+ * The manifest of this plugin's own release, put into the npm package when it
+ * was published (scripts/embed-body-release.mjs). The npm registry (and its
+ * mirrors) is reachable where GitHub is not, so a first install can still
+ * know what to download and how to check it.
+ */
+export declare function bundledRelease(file?: string): {
+    manifest: BodyManifest;
+    base: string;
+} | undefined;
+/** What to install: the newest release on GitHub, or, when GitHub cannot be reached, this plugin's own. */
+export declare function latestRelease(base: string): Promise<{
+    manifest: BodyManifest;
+    base: string;
+}>;
 /**
  * Download this computer's asset of `manifest`, check it, unpack it next to
  * the installed version and make it current. Progress in bytes.

package/lib/types/dsh/config.d.ts

@@ -25,6 +25,8 @@ export interface HerConfig {
         releases: string;
         /** Start the development body in the repository when there is one (off: behave like a release install). */
         useDev: boolean;
+        /** Prefixes put before a GitHub address when GitHub cannot be reached (net.ts); every file through them is checked. */
+        mirrors: string[];
     };
     voice: VoiceConfig & {
         /** How the body listens: one utterance per shortcut press, or all the time. */

package/lib/types/net.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Downloads that work on the networks her users are on.
+ *
+ * - Inside the DSH desktop app, requests go through Electron's `net.fetch`:
+ *   Chromium's network stack, which follows the system proxy settings the
+ *   way a browser does (Node's own fetch ignores them, so a computer that
+ *   reaches GitHub only through Clash or the like got "fetch failed").
+ *   Elsewhere (the dsh command line) it is Node's fetch.
+ * - A GitHub download that cannot connect is tried again through mirrors
+ *   (`body.mirrors`, prefixes such as `https://ghfast.top/`). Mirrors are
+ *   third parties: only files whose size and SHA-256 the caller knows in
+ *   advance should come through them, and every caller here checks both.
+ * - A failure says what went wrong in plain words (no bare "fetch failed").
+ */
+/** Mirror prefixes tried, in order, after github.com itself. */
+export declare const DEFAULT_MIRRORS: readonly string[];
+/** The plugin's `body.mirrors` setting (an empty list: GitHub only). */
+export declare function setMirrors(list: readonly string[]): void;
+/** fetch, through the system proxy when it can. */
+export declare function httpFetch(url: string, init?: RequestInit): Promise<Response>;
+/** Where to try `url`: itself, then each mirror when it is a GitHub download. */
+export declare function candidates(url: string, list?: readonly string[]): string[];
+/**
+ * The response for `url`, from GitHub or, if that cannot connect, a mirror.
+ * Only for files the caller checks (size and SHA-256) before using them.
+ * Throws a NetError explaining the first failure.
+ */
+export declare function fetchChecked(url: string, init?: RequestInit): Promise<Response>;
+/** A download that failed, with the reason in Chinese for the page. */
+export declare class NetError extends Error {
+    constructor(url: string, cause: unknown);
+}
+/** "连不上 github.com：…" from fetch's error (its `cause` carries the system's code). */
+export declare function explain(url: string, error: unknown): string;

package/lib/types/platform.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Small differences between operating systems the plugin runs on.
+ */
+/**
+ * The system's own bsdtar (macOS, Windows 10+). On Windows it is named by its
+ * full path: a `tar` earlier on PATH (Git for Windows ships GNU tar) reads
+ * `C:\…` as a remote host and fails.
+ */
+export declare function systemTar(platform?: string): string;

package/lib/types/voice/models.d.ts

@@ -9,6 +9,8 @@ export interface ModelSpec {
     name: string;
     url: string;
     bytes: number;
+    /** Checked before use: the file may come through a mirror (net.ts). */
+    sha256: string;
     archive: boolean;
 }
 export declare const MODELS: readonly ModelSpec[];

package/lib/voice/ming.js

@@ -25,6 +25,7 @@ import { Readable, Transform } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import { fileURLToPath } from 'node:url';
 import { wavFromPcm16 } from "../core/index.js";
+import { fetchChecked } from "../net.js";
 import { MING_MODEL, MING_MODEL_BYTES } from "./ming-model.js";
 import { installUv, run, uvEnv } from "./uv.js";
 const PYTHON_DIR = join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'python');
@@ -312,7 +313,7 @@ export class MingVoice {
 }
 /** One file from `url` into `target`, checked against its size and SHA-256 before it takes the file's place. */
 async function download(url, target, file, onProgress) {
-    const res = await fetch(url, { redirect: 'follow', signal: AbortSignal.timeout(3_600_000) });
+    const res = await fetchChecked(url, { signal: AbortSignal.timeout(3_600_000) });
     if (!res.ok || res.body === null)
         throw new Error(`HTTP ${res.status}`);
     const hash = createHash('sha256');

package/lib/voice/models.js

@@ -4,6 +4,9 @@
  * the cloud (cosyvoice.ts). Design: docs/语音方案.md.
  */
 import { execFile } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { fetchChecked } from "../net.js";
+import { systemTar } from "../platform.js";
 import { createWriteStream, existsSync, mkdirSync, renameSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { Readable } from 'node:stream';
@@ -16,6 +19,7 @@ export const MODELS = [
         name: 'sherpa-onnx-sense-voice-zh-en-ja-ko-yue-int8-2025-09-09',
         url: `${RELEASES}/asr-models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-int8-2025-09-09.tar.bz2`,
         bytes: 165_783_878,
+        sha256: '7305f7905bfcf77fa0b39388a313f3da35c68d971661a65475b56fb2162c8e63',
         archive: true,
     },
     {
@@ -23,6 +27,7 @@ export const MODELS = [
         name: 'silero_vad.onnx',
         url: `${RELEASES}/asr-models/silero_vad.onnx`,
         bytes: 643_854,
+        sha256: '9e2449e1087496d8d4caba907f23e0bd3f78d91fa552479bb9c23ac09cbb1fd6',
         archive: false,
     },
 ];
@@ -38,18 +43,24 @@ export function missingModels(modelsDir) {
  */
 export async function fetchModel(modelsDir, spec, onProgress) {
     mkdirSync(modelsDir, { recursive: true });
-    const response = await fetch(spec.url);
+    const response = await fetchChecked(spec.url);
     if (!response.ok || response.body === null)
         throw new Error(`下载失败 ${spec.url}（HTTP ${response.status}）`);
-    const total = Number(response.headers.get('content-length') ?? spec.bytes);
+    const total = spec.bytes;
     const partial = join(modelsDir, `${spec.name}.download`);
     let received = 0;
+    const hash = createHash('sha256');
     const body = Readable.fromWeb(response.body);
     body.on('data', (chunk) => {
         received += chunk.byteLength;
+        hash.update(chunk);
         onProgress?.(received, total);
     });
     await pipeline(body, createWriteStream(partial));
+    if (received !== spec.bytes || hash.digest('hex') !== spec.sha256) {
+        rmSync(partial, { force: true });
+        throw new Error(`下载的 ${spec.name} 校验不对（可能没下完或被改过），已经删掉，下次再试`);
+    }
     if (!spec.archive) {
         renameSync(partial, modelPath(modelsDir, spec));
         return;
@@ -59,7 +70,7 @@ export async function fetchModel(modelsDir, spec, onProgress) {
     mkdirSync(staging, { recursive: true });
     try {
         // bsdtar ships with macOS and Windows 10+, and reads bzip2 itself.
-        await promisify(execFile)('tar', ['-xjf', partial, '-C', staging]);
+        await promisify(execFile)(systemTar(), ['-xjf', partial, '-C', staging]);
         renameSync(join(staging, spec.name), modelPath(modelsDir, spec));
     }
     finally {

package/lib/voice/uv.js

@@ -10,6 +10,8 @@ import { createHash } from 'node:crypto';
 import { existsSync } from 'node:fs';
 import { mkdir, rm, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import { fetchChecked } from "../net.js";
+import { systemTar } from "../platform.js";
 export function run(cmd, args, timeout, env) {
     return new Promise((resolve, reject) => {
         execFile(cmd, args, { timeout, maxBuffer: 8 << 20, ...(env === undefined ? {} : { env: { ...process.env, ...env } }) }, (error, stdout, stderr) => {
@@ -41,7 +43,7 @@ export async function installUv(uvHome) {
     const found = [join(dir, 'uv'), join(dir, 'uv.exe'), join(dir, asset.file.replace(/\.(tar\.gz|zip)$/, ''), 'uv')].find(p => existsSync(p));
     if (found !== undefined)
         return found;
-    const res = await fetch(`https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/${asset.file}`, { redirect: 'follow', signal: AbortSignal.timeout(300_000) });
+    const res = await fetchChecked(`https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/${asset.file}`, { signal: AbortSignal.timeout(300_000) });
     if (!res.ok)
         throw new Error(`下载 uv 失败（${res.status}）`);
     const bytes = Buffer.from(await res.arrayBuffer());
@@ -51,7 +53,7 @@ export async function installUv(uvHome) {
     const archive = join(dir, asset.file);
     await writeFile(archive, bytes);
     // tar reads both the .tar.gz and (Windows 10+) the .zip.
-    await run('tar', ['-xf', archive, '-C', dir], 120_000);
+    await run(systemTar(), ['-xf', archive, '-C', dir], 120_000);
     await rm(archive, { force: true });
     const uv = [join(dir, 'uv'), join(dir, 'uv.exe'), join(dir, asset.file.replace(/\.(tar\.gz|zip)$/, ''), 'uv')].find(p => existsSync(p));
     if (uv === undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-her",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "A desktop companion for DeepSeek Harness (dsh): she lives on your real desktop (on top of your windows or inside the wallpaper), talks with you by voice and remembers you. · DSH 桌面女友：住在你真正的桌面上，能语音聊天、记得你。",
   "type": "module",
   "main": "lib/index.js",
@@ -34,7 +34,7 @@
     "test": "node --test --disable-warning=ExperimentalWarning \"tests/*.test.ts\"",
     "voice:models": "node --disable-warning=ExperimentalWarning scripts/fetch-voice-models.ts",
     "voice:bench": "node --disable-warning=ExperimentalWarning scripts/voice-bench.ts",
-    "prepack": "npm run build"
+    "prepack": "npm run build && node scripts/embed-body-release.mjs"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",