dudu-converter-cli 1.0.5 → 1.0.7

package/web/dist/install.ps1

@@ -1,8 +1,11 @@
-# 嘟嘟转换器（dudu-converter-cli）Windows 一键安装脚本（PowerShell 5.1+）
-# 用法：irm https://duduer.com/install.ps1 | iex
+# DuDu Converter (dudu-converter-cli) Windows installer (PowerShell 5.1+)
+# Usage: $w=New-Object Net.WebClient;$w.Encoding=[Text.Encoding]::UTF8;iex $w.DownloadString('https://duduer.com/install.ps1')
+# NOTE: All messages are in English to avoid encoding issues in PS 5.1 (Chinese Windows defaults to GBK console).
+#       The Chinese user experience lives in the web UI at http://127.0.0.1:3456
 $ErrorActionPreference = 'Stop'
 
-# 修复中文输出乱码（irm|iex 场景下 PowerShell 默认编码非 UTF-8）
+# Ensure UTF-8 console (for any Chinese output from Node.js subprocesses like `converter autostart enable`)
+try { chcp.com 65001 | Out-Null } catch { }
 try {
   [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
   $OutputEncoding = [System.Text.Encoding]::UTF8
@@ -14,11 +17,11 @@ function Say($msg) { Write-Host $msg -ForegroundColor Green }
 function Warn($msg) { Write-Host $msg -ForegroundColor Yellow }
 function Show-Manual {
   Write-Host ''
-  Warn '自动安装未完成，可按以下步骤手动安装：'
-  Write-Host '  1. 打开 https://nodejs.org 下载并安装 Node.js 18 或更高版本（安装时保持默认选项）'
-  Write-Host '  2. 重新打开 PowerShell，执行: npm install -g dudu-converter-cli'
-  Write-Host '  3. 启动服务: converter start'
-  Write-Host '  4. 浏览器访问 http://127.0.0.1:3456'
+  Warn 'Automatic installation did not complete. Manual steps:'
+  Write-Host '  1. Download Node.js 18+ from https://nodejs.org (or a CN mirror like https://mirrors.ustc.edu.cn/node/) and install'
+  Write-Host '  2. Open a NEW PowerShell window, run: npm install -g dudu-converter-cli'
+  Write-Host '  3. Start the service:  converter start'
+  Write-Host '  4. Open http://127.0.0.1:3456 in your browser'
 }
 function Die($msg) { Write-Host $msg -ForegroundColor Red; Show-Manual; exit 1 }
 
@@ -38,54 +41,66 @@ function Refresh-Path {
 }
 
 if (Test-Node) {
-  Say "检测到 Node $(node -v)，满足要求（需 18+），跳过安装"
+  Say "Found Node $(node -v) (18+ required) - skipping Node installation"
 } else {
-  Say '未检测到 Node.js 18+，准备安装…'
+  Say 'Node.js 18+ not found, installing...'
   if (Get-Command winget -ErrorAction SilentlyContinue) {
     winget install --id OpenJS.NodeJS.LTS --accept-source-agreements --accept-package-agreements
-    if ($LASTEXITCODE -ne 0) { Die 'Node.js 安装失败' }
+    if ($LASTEXITCODE -ne 0) { Die 'Node.js installation via winget failed' }
   }
   elseif (Get-Command choco -ErrorAction SilentlyContinue) {
     choco install nodejs-lts -y
-    if ($LASTEXITCODE -ne 0) { Die 'Node.js 安装失败' }
+    if ($LASTEXITCODE -ne 0) { Die 'Node.js installation via Chocolatey failed' }
   }
   elseif (Get-Command scoop -ErrorAction SilentlyContinue) {
     scoop install nodejs-lts
-    if ($LASTEXITCODE -ne 0) { Die 'Node.js 安装失败' }
+    if ($LASTEXITCODE -ne 0) { Die 'Node.js installation via Scoop failed' }
   }
   else {
-    Say '未检测到 winget / choco / scoop，直接下载 Node.js 官方安装包…'
+    Say 'No package manager found, downloading Node.js installer directly...'
     $nodeArch = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
-    $msiUrl = "https://nodejs.org/dist/v22.20.0/node-v22.20.0-$nodeArch.msi"
+    # CN mirror first (USTC, tested ~0.1s), fallback to official
     $msiFile = Join-Path $env:TEMP 'dudu-node-installer.msi'
-    Invoke-WebRequest -Uri $msiUrl -OutFile $msiFile -UseBasicParsing
-    Say '正在安装 Node.js（可能弹出系统授权窗口，请点「是」）…'
+    $mirrors = @(
+      "https://mirrors.ustc.edu.cn/node/v22.20.0/node-v22.20.0-$nodeArch.msi",
+      "https://nodejs.org/dist/v22.20.0/node-v22.20.0-$nodeArch.msi"
+    )
+    $downloaded = $false
+    foreach ($u in $mirrors) {
+      try {
+        Say "  Trying: $u"
+        Invoke-WebRequest -Uri $u -OutFile $msiFile -UseBasicParsing
+        $downloaded = $true
+        break
+      } catch { Warn '  Mirror unreachable, trying next...' }
+    }
+    if (-not $downloaded) { Die 'Node.js download failed from all mirrors' }
+    Say 'Installing Node.js (a UAC prompt may appear, click "Yes")...'
     Start-Process msiexec.exe -ArgumentList '/i', $msiFile, '/qn' -Verb RunAs -Wait
   }
-  # 刚安装的 Node 不会出现在当前会话的 PATH 中，需从注册表重新加载
   Refresh-Path
-  if (-not (Test-Node)) { Die 'Node.js 安装后仍未检测到，请重新打开 PowerShell 再执行本脚本' }
+  if (-not (Test-Node)) { Die 'Node.js installed but not detected. Please reopen PowerShell and re-run this script' }
 }
 
-Say "正在安装嘟嘟转换器（$PackageSpec）…"
+Say "Installing DuDu Converter ($PackageSpec)..."
 npm install -g $PackageSpec
-if ($LASTEXITCODE -ne 0) { Die '安装失败，请检查网络后重试' }
+if ($LASTEXITCODE -ne 0) { Die 'npm install failed. Please check your network and retry' }
 
 Refresh-Path
 $converter = Get-Command converter -ErrorAction SilentlyContinue
-if (-not $converter) { Die '安装完成但找不到 converter 命令，请重新打开 PowerShell 后执行：converter start' }
-Say "安装成功：converter $(converter --version)"
+if (-not $converter) { Die 'Installed but converter command not found. Please reopen PowerShell and run: converter start' }
+Say "Installed: converter $(converter --version)"
 
 if ($env:NO_START -eq '1') {
-  Say '已跳过启动。之后可随时运行：converter start'
+  Say 'Skipped startup. Run anytime: converter start'
   exit 0
 }
 
-Say '正在开启开机自启…'
+Say 'Enabling auto-start on login...'
 converter autostart enable
-if ($LASTEXITCODE -ne 0) { Warn '开机自启开启失败（不影响本次使用），可稍后在终端执行：converter autostart enable' }
+if ($LASTEXITCODE -ne 0) { Warn 'Auto-start setup failed (non-fatal). Run later: converter autostart enable' }
 
-Say '正在启动服务，浏览器将自动打开…'
+Say 'Starting service, browser will open...'
 Start-Process -FilePath 'cmd.exe' -ArgumentList '/c', 'converter', 'start'
 Start-Sleep -Seconds 2
-Say '完成！若浏览器未自动打开，请访问 http://127.0.0.1:3456'
+Say 'Done! If browser did not open, visit http://127.0.0.1:3456'

package/web/dist/install.sh

@@ -33,12 +33,14 @@ if command -v node >/dev/null 2>&1; then
   fi
 fi
 if [ "$node_major" -lt 18 ]; then
-  # 裸机也全自动：直接下载 Node.js 官方 pkg 安装（不依赖 Homebrew）
+  # 裸机也全自动：直接下载 Node.js pkg 安装（不依赖 Homebrew）。
+  # 国内网络优先走中科大镜像（实测 0.1s 响应），失败自动回退官方源
   NODE_VERSION="22.20.0"
-  NODE_PKG_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.pkg"
   PKG_FILE="${TMPDIR:-/tmp}/dudu-node-installer.pkg"
-  say "未检测到 Node.js 18+，正在下载官方安装包（约 70MB）…"
-  curl -fsSL "$NODE_PKG_URL" -o "$PKG_FILE" || die "Node.js 安装包下载失败，请检查网络后重试，或到 https://nodejs.org 下载安装"
+  say "未检测到 Node.js 18+，正在下载安装包（约 70MB，国内镜像加速）…"
+  curl -fsSL --connect-timeout 8 "https://mirrors.ustc.edu.cn/node/v${NODE_VERSION}/node-v${NODE_VERSION}.pkg" -o "$PKG_FILE" \
+    || curl -fsSL --connect-timeout 8 "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.pkg" -o "$PKG_FILE" \
+    || die "Node.js 安装包下载失败。国内镜像与官方源均不可达，请检查网络后重试，或到 https://nodejs.org 下载安装"
   say "正在安装 Node.js（可能需要输入一次开机密码）…"
   sudo installer -pkg "$PKG_FILE" -target / || die "Node.js 安装失败，请到 https://nodejs.org 手动安装后重跑本脚本"
   rm -f "$PKG_FILE"