@oadank/dsh-input-tools 0.3.3 → 0.3.5

package/lib/index.js

@@ -20,7 +20,7 @@
  */
 
 import { createHash, randomUUID } from 'node:crypto'
-import { mkdir, open, readFile, unlink, writeFile } from 'node:fs/promises'
+import { mkdir, open, readFile, unlink, writeFile, copyFile } from 'node:fs/promises'
 import { constants, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { fileURLToPath } from 'node:url'
@@ -34,6 +34,44 @@ const inject = ['tools', 'webServer']
 
 export { name, inject }
 
+// ──────────────────────────────────────────────────────────────
+// [0.3.4] 自带素材（下载即用）：克隆样本 + VoiceDesign 示例音频打进 npm 包 assets/，
+// 首次加载自动拷贝到 DSH_HOME 并注册，不再依赖"手动上传/在线生成"。
+// ──────────────────────────────────────────────────────────────
+const PLUGIN_ROOT = join(fileURLToPath(import.meta.url), '..', '..') // .../dsh-input-tools
+const ASSETS_DIR = join(PLUGIN_ROOT, 'assets')
+const BUNDLED_CLONE_ID = '8da38fcc-b041-4f5b-86b9-901956016f89'
+const BUNDLED_CLONE_SAMPLE = {
+  id: BUNDLED_CLONE_ID,
+  name: '小团团(60秒长样本)',
+  context: '一个魔性的少女萝莉音，说话自带沙雕搞怪和无厘头气质，像在撒娇又像在耍宝，情绪起伏很大：前一句还奶声奶气地撒娇卖萌，后一句就突然拔高音量夸张卖惨耍赖，再下一秒又贱兮兮地坏笑。尾音拖长上扬，带着气音和魔性笑声，喜欢用「臭猪」「你凶我」「哼」「嘿嘿嘿」这类咋咋呼呼的用词，语速忽快忽慢、节奏跳跃，吐字软糯清晰，傻白甜又可爱，让人听了忍不住想笑',
+}
+const VOICE_DESIGN_SAMPLE_KEYS = ['asmr', 'docu', 'elder']
+
+let bundledInitDone = false
+/** 首次加载把自带素材落地到 DSH_HOME：克隆样本 mp3 拷贝 + 首次安装自动注册小团团。 */
+async function ensureBundledAssets(config, parsed) {
+  if (bundledInitDone) return config
+  bundledInitDone = true
+  try {
+    const homeDir = process.env.DSH_HOME ?? join(homedir(), '.dsh')
+    const cloneDir = join(homeDir, 'voiceclone-samples')
+    const dstClone = join(cloneDir, BUNDLED_CLONE_ID + '.mp3')
+    try {
+      await mkdir(cloneDir, { recursive: true })
+      await copyFile(join(ASSETS_DIR, 'voiceclone-samples', BUNDLED_CLONE_ID + '.mp3'), dstClone)
+    } catch { /* 包内素材缺失或拷贝失败：跳过（不阻塞启动） */ }
+    // 仅"首次安装"（配置里还没有 voiceclone 键）时注册自带样本；用户删光的 [] 不强制
+    const parsedHasClone = parsed !== null && typeof parsed === 'object' && parsed.engines?.voiceclone !== undefined
+    const samples = config?.engines?.voiceclone?.samples
+    if (!parsedHasClone && (!Array.isArray(samples) || samples.length === 0)) {
+      config.engines.voiceclone = { ...config.engines.voiceclone, enabled: true, samples: [{ ...BUNDLED_CLONE_SAMPLE, path: dstClone }] }
+      await saveVoiceConfig(config)
+    }
+  } catch { /* 初始化失败不阻塞 */ }
+  return config
+}
+
 // ──────────────────────────────────────────────────────────────
 // 配置中心：~/.dsh/voice-config.json
 // ──────────────────────────────────────────────────────────────
@@ -95,6 +133,8 @@ async function loadVoiceConfig() {
     parsed = JSON.parse(await readFile(CONFIG_PATH, 'utf8'))
   } catch { /* 首次无配置 */ }
   cachedConfig = deepMerge(defaultVoiceConfig(), parsed)
+  // [0.3.4] 自带素材初始化（拷贝克隆样本 + 首次安装自动注册小团团）
+  await ensureBundledAssets(cachedConfig, parsed)
   // 环境变量覆盖（兼容旧配置；显式配置值优先于 env）
   const env = process.env
   if (env.TTS_XIAOMI_KEY !== undefined && cachedConfig.engines.xiaomi.apiKey === '') cachedConfig.engines.xiaomi.apiKey = env.TTS_XIAOMI_KEY
@@ -961,8 +1001,8 @@ async function apply(ctx) {
                 return sendJson(res, 404, { ok: false, error: '安装脚本不存在' })
               }
             }
-            // VoiceDesign 官方示例音频：用真实的 MiMo-V2.5-TTS-VoiceDesign 模型生成（instruct=音色描述 / text=正文），缓存到 ~/.dsh/voice-design-samples/
-            // 注意：必须走 voicedesign 模型（user=音色描述，无 voice 参数）才是真音色，绝不能降级到 edge 假造
+            // VoiceDesign 官方示例音频：[0.3.4] 优先读插件包自带素材（assets/，mp3 下载即用），
+            // 包内缺失才回退到"小米模型在线生成 + 缓存到 ~/.dsh/voice-design-samples/ 的 wav"。
             if (url.pathname === '/asr/voice-design-samples' && req.method === 'GET') {
               const cfg = await loadVoiceConfig()
               const homeDir = process.env.DSH_HOME ?? join(homedir(), '.dsh')
@@ -986,20 +1026,29 @@ async function apply(ctx) {
               ]
               const results = []
               for (const s of samples) {
-                const wavPath = join(sampleDir, `${s.key}.wav`)
-                let wavBytes = null
-                try { wavBytes = await readFile(wavPath) } catch { /* 首次/缓存失效 → 用真实模型重新生成 */ }
-                if (wavBytes === null) {
+                // 1) 包内自带 mp3（首选，下载即用）
+                let bytes = null
+                try { bytes = await readFile(join(ASSETS_DIR, 'voice-design-samples', `${s.key}.mp3`)) } catch { /* 包内无 → 回退 */ }
+                let mediaType = 'audio/mpeg'
+                if (bytes === null) {
+                  // 2) 缓存 wav（在线生成过）
+                  const wavPath = join(sampleDir, `${s.key}.wav`)
+                  try { bytes = await readFile(wavPath) } catch { /* 继续回退 */ }
+                  mediaType = 'audio/wav'
+                }
+                if (bytes === null) {
+                  // 3) 在线生成（key 缺失会失败，示例跳过）
                   try {
                     const syn = await synthesizeXiaomiVoiceDesign(s.text, { context: s.instruct }, cfg)
                     if (syn === null) throw new Error('voicedesign synth failed')
-                    wavBytes = Buffer.from(syn.data)
+                    bytes = Buffer.from(syn.data)
+                    mediaType = 'audio/wav'
                     await mkdir(sampleDir, { recursive: true })
-                    await writeFile(wavPath, wavBytes)
-                  } catch { /* 模型生成失败（如 key 缺失）→ 该示例跳过，绝不降级假音频 */ }
+                    await writeFile(join(sampleDir, `${s.key}.wav`), bytes)
+                  } catch { /* 模型生成失败 → 跳过 */ }
                 }
-                if (wavBytes !== null) {
-                  results.push({ key: s.key, title: s.title, mediaType: 'audio/wav', data: wavBytes.toString('base64') })
+                if (bytes !== null) {
+                  results.push({ key: s.key, title: s.title, mediaType, data: bytes.toString('base64') })
                 }
               }
               return sendJson(res, 200, { ok: results.length > 0, samples: results })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oadank/dsh-input-tools",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "private": false,
   "type": "module",
   "main": "lib/index.js",
@@ -13,6 +13,7 @@
   "files": [
     "lib",
     "scripts",
+    "assets",
     "README.md",
     "cordis.patch.yml"
   ],

package/scripts/install-asr.ps1

@@ -58,6 +58,39 @@ New-Item -ItemType Directory -Force -Path "$InstallDir\models" | Out-Null
 New-Item -ItemType Directory -Force -Path "$InstallDir\bin" | Out-Null
 New-Item -ItemType Directory -Force -Path "$InstallDir\tmp" | Out-Null
 
+# ---- 1b. 下载/解压工具函数（2026-08-21 增强：断点续传 + 完整性校验 + 损坏自动重试）----
+# 之前 XDN 实测：GitHub 大文件下载中断 → 只下了 42.7MB/230MB → tar 报 Truncated → 脚本抛错退出，
+# 用户只看到"跑到最后报错"毫无提示。现在 curl -C - 断点续传 + 解压后校验，损坏文件自动删除重下。
+function Download-Resume {
+  param([string]$Url, [string]$OutFile)
+  for ($attempt = 1; $attempt -le 3; $attempt++) {
+    Write-Host "  下载（第 $attempt 次尝试）: $Url" -ForegroundColor Yellow
+    # Windows 10+ 自带 curl.exe；-C - 断点续传；--retry 网络层重试
+    & curl.exe -L -C - --retry 3 --retry-delay 2 --connect-timeout 20 -o $OutFile $Url 2>$null
+    if ($LASTEXITCODE -eq 0) { return $true }
+    Write-Host "  下载中断（exit=$LASTEXITCODE），3 秒后重试..." -ForegroundColor Yellow
+    Start-Sleep -Seconds 3
+  }
+  return $false
+}
+function Expand-TarBz2 {
+  param([string]$Archive, [string]$Dest, [int]$Strip = 0)
+  $tmpDir = Join-Path $Dest ".extract-tmp"
+  New-Item -ItemType Directory -Force -Path $tmpDir | Out-Null
+  $tarArgs = @('-xjf', $Archive, '-C', $tmpDir)
+  if ($Strip -gt 0) { $tarArgs += "--strip-components=$Strip" }
+  tar @tarArgs 2>$null
+  if ($LASTEXITCODE -ne 0) {
+    Write-Host "  解压失败：压缩包损坏或不完整（$Archive）" -ForegroundColor Red
+    Remove-Item -Recurse -Force $tmpDir -ErrorAction SilentlyContinue
+    Remove-Item -Force $Archive -ErrorAction SilentlyContinue
+    return $false
+  }
+  Get-ChildItem $tmpDir | Move-Item -Destination $Dest -Force -ErrorAction SilentlyContinue
+  Remove-Item -Recurse -Force $tmpDir -ErrorAction SilentlyContinue
+  return $true
+}
+
 # ---- 2. 检查 ffmpeg（ASR 转码必需）----
 Write-Host "`n[1/4] 检查 ffmpeg..." -ForegroundColor Yellow
 $ffmpeg = Get-Command ffmpeg -ErrorAction SilentlyContinue
@@ -79,12 +112,15 @@ Write-Host "`n[2/4] 下载 sherpa-onnx $Version ..." -ForegroundColor Yellow
 $pkgUrl = "https://github.com/k2-fsa/sherpa-onnx/releases/download/$Version/sherpa-onnx-$Version-win-x64-shared-MD-Release.tar.bz2"
 $pkgFile = "$InstallDir\tmp\sherpa-onnx.tar.bz2"
 if (-not (Test-Path "$InstallDir\bin\sherpa-onnx-offline.exe")) {
-  if (-not (Test-Path $pkgFile)) {
-    Write-Host "  下载 $pkgUrl"
-    Invoke-WebRequest -Uri $pkgUrl -OutFile $pkgFile -UseBasicParsing
+  if (-not (Download-Resume $pkgUrl $pkgFile)) {
+    Write-Host "  sherpa-onnx 下载失败（网络不稳定）。请检查网络后重跑本脚本" -ForegroundColor Red
+    exit 1
   }
   Write-Host "  解压..."
-  tar -xjf $pkgFile -C "$InstallDir\tmp"
+  if (-not (Expand-TarBz2 $pkgFile "$InstallDir\tmp")) {
+    Write-Host "  sherpa-onnx 压缩包损坏已删除，请重跑本脚本自动重新下载" -ForegroundColor Red
+    exit 1
+  }
   # 解压后目录结构：sherpa-onnx-v1.13.6-win-x64-shared-MD-Release/ 内含 bin/ lib/
   $extracted = Get-ChildItem "$InstallDir\tmp" -Directory | Where-Object { $_.Name -like "sherpa-onnx-*win*" } | Select-Object -First 1
   if ($extracted) {
@@ -99,19 +135,28 @@ if (-not (Test-Path "$InstallDir\bin\sherpa-onnx-offline.exe")) {
   Write-Host "  sherpa-onnx 已存在，跳过下载" -ForegroundColor Green
 }
 
-# ---- 4. 下载 SenseVoice 模型 ----
+# ---- 4. 下载 SenseVoice 模型（断点续传 + 完整性校验）----
 Write-Host "`n[3/4] 下载 SenseVoice int8 模型..." -ForegroundColor Yellow
 $modelDir = "$InstallDir\models\sensevoice-int8"
 $modelUrl = "https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-int8-2025-09-09.tar.bz2"
 $modelFile = "$InstallDir\tmp\sensevoice.tar.bz2"
 if (-not (Test-Path "$modelDir\model.int8.onnx")) {
-  if (-not (Test-Path $modelFile)) {
-    Write-Host "  下载 $modelUrl"
-    Invoke-WebRequest -Uri $modelUrl -OutFile $modelFile -UseBasicParsing
+  if (-not (Download-Resume $modelUrl $modelFile)) {
+    Write-Host "  SenseVoice 模型下载失败（网络不稳定）。请检查网络后重跑本脚本" -ForegroundColor Red
+    exit 1
   }
   New-Item -ItemType Directory -Force -Path $modelDir | Out-Null
   Write-Host "  解压模型..."
-  tar -xjf $modelFile -C $modelDir --strip-components=1
+  if (-not (Expand-TarBz2 $modelFile $modelDir 1)) {
+    Write-Host "  模型压缩包损坏已删除，请重跑本脚本自动重新下载" -ForegroundColor Red
+    exit 1
+  }
+  if (-not (Test-Path "$modelDir\model.int8.onnx")) {
+    Write-Host "  解压后未找到 model.int8.onnx（压缩包异常），已清理。请重跑本脚本" -ForegroundColor Red
+    Remove-Item -Recurse -Force $modelDir -ErrorAction SilentlyContinue
+    Remove-Item -Force $modelFile -ErrorAction SilentlyContinue
+    exit 1
+  }
   Write-Host "  模型解压完成" -ForegroundColor Green
 } else {
   Write-Host "  模型已存在，跳过下载" -ForegroundColor Green
@@ -168,7 +213,7 @@ const server = http.createServer(async (req, res) => {
     res.writeHead(404); res.end();
   }
 });
-server.listen(PORT, () => console.log('[ASR] listening on ' + PORT));
+server.listen(PORT, '127.0.0.1', () => console.log('[ASR] listening on 127.0.0.1:' + PORT));
 "@
 # 服务脚本用 .cjs：插件包 package.json 声明了 "type":"module"，.js 会被当 ESM 解析导致 require 报错
 # （2026-08-21 XDN 实测：asr-service.js 抛 ReferenceError: require is not defined）

package/scripts/install-local-tts.ps1

@@ -17,6 +17,36 @@
 $ErrorActionPreference = "Stop"
 $Version = "v1.13.6"
 
+# ---- 下载/解压工具函数（2026-08-21 增强：断点续传 + 完整性校验 + 损坏自动重试）----
+function Download-Resume {
+  param([string]$Url, [string]$OutFile)
+  for ($attempt = 1; $attempt -le 3; $attempt++) {
+    Write-Host "  下载（第 $attempt 次尝试）: $Url" -ForegroundColor Yellow
+    & curl.exe -L -C - --retry 3 --retry-delay 2 --connect-timeout 20 -o $OutFile $Url 2>$null
+    if ($LASTEXITCODE -eq 0) { return $true }
+    Write-Host "  下载中断（exit=$LASTEXITCODE），3 秒后重试..." -ForegroundColor Yellow
+    Start-Sleep -Seconds 3
+  }
+  return $false
+}
+function Expand-TarBz2 {
+  param([string]$Archive, [string]$Dest, [int]$Strip = 0)
+  $tmpDir = Join-Path $Dest ".extract-tmp"
+  New-Item -ItemType Directory -Force -Path $tmpDir | Out-Null
+  $tarArgs = @('-xjf', $Archive, '-C', $tmpDir)
+  if ($Strip -gt 0) { $tarArgs += "--strip-components=$Strip" }
+  tar @tarArgs 2>$null
+  if ($LASTEXITCODE -ne 0) {
+    Write-Host "  解压失败：压缩包损坏或不完整（$Archive）" -ForegroundColor Red
+    Remove-Item -Recurse -Force $tmpDir -ErrorAction SilentlyContinue
+    Remove-Item -Force $Archive -ErrorAction SilentlyContinue
+    return $false
+  }
+  Get-ChildItem $tmpDir | Move-Item -Destination $Dest -Force -ErrorAction SilentlyContinue
+  Remove-Item -Recurse -Force $tmpDir -ErrorAction SilentlyContinue
+  return $true
+}
+
 # ---- 0. 自动推导安装目录：脚本在 <插件包>/scripts/，安装到 <插件包>/sherpa-onnx/ ----
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $PluginRoot = Split-Path -Parent $ScriptDir
@@ -62,12 +92,15 @@ $pkgUrl = "https://github.com/k2-fsa/sherpa-onnx/releases/download/$Version/sher
 $pkgFile = "$InstallDir\tmp\sherpa-onnx.tar.bz2"
 if (-not (Test-Path "$InstallDir\bin\sherpa-onnx-offline-tts.exe")) {
   if (-not (Test-Path "$InstallDir\bin\sherpa-onnx-offline.exe")) {
-    if (-not (Test-Path $pkgFile)) {
-      Write-Host "  下载 $pkgUrl"
-      Invoke-WebRequest -Uri $pkgUrl -OutFile $pkgFile -UseBasicParsing
+    if (-not (Download-Resume $pkgUrl $pkgFile)) {
+      Write-Host "  sherpa-onnx 下载失败（网络不稳定）。请检查网络后重跑本脚本" -ForegroundColor Red
+      exit 1
     }
     Write-Host "  解压..."
-    tar -xjf $pkgFile -C "$InstallDir\tmp"
+    if (-not (Expand-TarBz2 $pkgFile "$InstallDir\tmp")) {
+      Write-Host "  sherpa-onnx 压缩包损坏已删除，请重跑本脚本自动重新下载" -ForegroundColor Red
+      exit 1
+    }
     $extracted = Get-ChildItem "$InstallDir\tmp" -Directory | Where-Object { $_.Name -like "sherpa-onnx-*win*" } | Select-Object -First 1
     if ($extracted) {
       Copy-Item "$($extracted.FullName)\bin\*" "$InstallDir\bin\" -Force
@@ -84,19 +117,28 @@ if (-not (Test-Path "$InstallDir\bin\sherpa-onnx-offline-tts.exe")) {
   Write-Host "  sherpa-onnx 已存在，跳过下载" -ForegroundColor Green
 }
 
-# ---- 4. 下载 MeloTTS 中文模型 ----
+# ---- 4. 下载 MeloTTS 中文模型（断点续传 + 完整性校验）----
 Write-Host "`n[3/3] 下载中文 MeloTTS VITS 模型..." -ForegroundColor Yellow
 $modelDir = "$InstallDir\models\melo"
 $modelUrl = "https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-melo-tts-zh_en.tar.bz2"
 $modelFile = "$InstallDir\tmp\melo.tar.bz2"
 if (-not (Test-Path "$modelDir\model.onnx")) {
-  if (-not (Test-Path $modelFile)) {
-    Write-Host "  下载 $modelUrl"
-    Invoke-WebRequest -Uri $modelUrl -OutFile $modelFile -UseBasicParsing
+  if (-not (Download-Resume $modelUrl $modelFile)) {
+    Write-Host "  MeloTTS 模型下载失败（网络不稳定）。请检查网络后重跑本脚本" -ForegroundColor Red
+    exit 1
   }
   New-Item -ItemType Directory -Force -Path $modelDir | Out-Null
   Write-Host "  解压模型..."
-  tar -xjf $modelFile -C $modelDir --strip-components=1
+  if (-not (Expand-TarBz2 $modelFile $modelDir 1)) {
+    Write-Host "  模型压缩包损坏已删除，请重跑本脚本自动重新下载" -ForegroundColor Red
+    exit 1
+  }
+  if (-not (Test-Path "$modelDir\model.onnx")) {
+    Write-Host "  解压后未找到 model.onnx（压缩包异常），已清理。请重跑本脚本" -ForegroundColor Red
+    Remove-Item -Recurse -Force $modelDir -ErrorAction SilentlyContinue
+    Remove-Item -Force $modelFile -ErrorAction SilentlyContinue
+    exit 1
+  }
   Write-Host "  模型解压完成" -ForegroundColor Green
 } else {
   Write-Host "  模型已存在，跳过下载" -ForegroundColor Green