@oadank/dsh-input-tools 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oadank/dsh-input-tools",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "private": false,
   "type": "module",
   "main": "lib/index.js",

package/scripts/install-asr.ps1

@@ -58,6 +58,49 @@ 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 - 断点续传 + 解压后校验，损坏文件自动删除重下。
+# ⚠️ PowerShell 坑：$ErrorActionPreference=Stop 时 curl/tar 写 stderr（进度/警告）会抛 NativeCommandError
+# 中断脚本（0.3.5 实测踩中）。因此所有原生命令用 cmd /c 包装 + 2>nul 吞 stderr + 临时放宽 EAP，
+# 只依据 $LASTEXITCODE 判断成败。
+function Download-Resume {
+  param([string]$Url, [string]$OutFile)
+  for ($attempt = 1; $attempt -le 3; $attempt++) {
+    Write-Host "  下载（第 $attempt 次尝试）: $Url" -ForegroundColor Yellow
+    $prevEAP = $ErrorActionPreference
+    $ErrorActionPreference = "Continue"
+    cmd /c "curl.exe -sL -C - --retry 3 --retry-delay 2 --connect-timeout 20 -o `"$OutFile`" `"$Url`" 2>nul"
+    $code = $LASTEXITCODE
+    $ErrorActionPreference = $prevEAP
+    if ($code -eq 0) { return $true }
+    Write-Host "  下载中断（exit=$code），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
+  $stripArgs = ""
+  if ($Strip -gt 0) { $stripArgs = "--strip-components=$Strip" }
+  $prevEAP = $ErrorActionPreference
+  $ErrorActionPreference = "Continue"
+  cmd /c "tar -xjf `"$Archive`" -C `"$tmpDir`" $stripArgs 2>nul"
+  $code = $LASTEXITCODE
+  $ErrorActionPreference = $prevEAP
+  if ($code -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 +122,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 +145,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

package/scripts/install-local-tts.ps1

@@ -17,6 +17,46 @@
 $ErrorActionPreference = "Stop"
 $Version = "v1.13.6"
 
+# ---- 下载/解压工具函数（2026-08-21 增强：断点续传 + 完整性校验 + 损坏自动重试）----
+# ⚠️ PowerShell 坑：$ErrorActionPreference=Stop 时 curl/tar 写 stderr 会抛 NativeCommandError（0.3.5 实测踩中）。
+# 原生命令一律 cmd /c 包装 + 2>nul + 临时放宽 EAP，只依据 $LASTEXITCODE。
+function Download-Resume {
+  param([string]$Url, [string]$OutFile)
+  for ($attempt = 1; $attempt -le 3; $attempt++) {
+    Write-Host "  下载（第 $attempt 次尝试）: $Url" -ForegroundColor Yellow
+    $prevEAP = $ErrorActionPreference
+    $ErrorActionPreference = "Continue"
+    cmd /c "curl.exe -sL -C - --retry 3 --retry-delay 2 --connect-timeout 20 -o `"$OutFile`" `"$Url`" 2>nul"
+    $code = $LASTEXITCODE
+    $ErrorActionPreference = $prevEAP
+    if ($code -eq 0) { return $true }
+    Write-Host "  下载中断（exit=$code），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
+  $stripArgs = ""
+  if ($Strip -gt 0) { $stripArgs = "--strip-components=$Strip" }
+  $prevEAP = $ErrorActionPreference
+  $ErrorActionPreference = "Continue"
+  cmd /c "tar -xjf `"$Archive`" -C `"$tmpDir`" $stripArgs 2>nul"
+  $code = $LASTEXITCODE
+  $ErrorActionPreference = $prevEAP
+  if ($code -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 +102,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 +127,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