dsh-her 0.2.0 → 0.3.0

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/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,13 @@ import { join } from 'node:path';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
+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,6 +78,8 @@ 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. */
@@ -87,8 +95,8 @@ export async function fetchManifest(base) {
  * 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()}）的身体程序`);
@@ -116,22 +124,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/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;
 }

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/voice/models.js

@@ -4,6 +4,7 @@
  * the cloud (cosyvoice.ts). Design: docs/语音方案.md.
  */
 import { execFile } from 'node:child_process';
+import { systemTar } from "../platform.js";
 import { createWriteStream, existsSync, mkdirSync, renameSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { Readable } from 'node:stream';
@@ -59,7 +60,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,7 @@ import { createHash } from 'node:crypto';
 import { existsSync } from 'node:fs';
 import { mkdir, rm, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
+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) => {
@@ -51,7 +52,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.0",
   "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",