dsh-windows-tray 1.0.6 → 1.0.8

package/install.ps1

@@ -16,7 +16,7 @@ param(
 $ErrorActionPreference = 'Stop'
 $pkgRoot = $PSScriptRoot
 $dst = Join-Path $env:USERPROFILE '.dsh\launcher'
-$logDir = Join-Path $env:USERPROFILE '.dsh\logs'
+$logDir = Join-Path (Join-Path $env:USERPROFILE '.dsh\logs') 'dsh-windows-tray'   # 插件专属日志目录 (release-standards §3.1)
 
 Write-Host '== DSH 系统托盘 一键部署 ==' -ForegroundColor Cyan
 

package/launcher/dsh-actions.ps1

@@ -11,9 +11,9 @@ $ErrorActionPreference = 'Stop'
 . (Join-Path $PSScriptRoot 'dsh-lib.ps1')
 
 $logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
+Initialize-LogDir
 function Log([string]$msg) {
-    $line = ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg)
-    Add-Content -Path $logFile -Value $line -ErrorAction SilentlyContinue
+    Write-DshLog -Path $logFile -Message $msg
 }
 
 try {

package/launcher/dsh-lib.ps1

@@ -9,10 +9,10 @@ $BIN     = 'D:\Program Files (x86)\dsh\node_modules\@deepseek-ai\dsh\lib\bin.js'
 $WORKDIR = 'D:\Program Files (x86)\dsh'
 $PORT    = 3088
 $URL     = "http://127.0.0.1:$PORT"
-$LOG_DIR = "$env:USERPROFILE\.dsh\logs"
+$LOG_DIR = Join-Path (Join-Path $env:USERPROFILE '.dsh\logs') 'dsh-windows-tray'   # 本插件专属日志目录 (logs\<插件名>\, 边界规则见 release-standards §3.1)
 $WT      = "$env:LOCALAPPDATA\Microsoft\WindowsApps\wt.exe"
 $PWSH    = 'D:\Program Files (x86)\PowerShell-7.6.4\pwsh.exe'
-$TRAY_VERSION = '1.0.6'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
+$TRAY_VERSION = '1.0.8'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
 $TRAY_PKG     = 'dsh-windows-tray'   # npm 包名 (托盘自更新)
 $TRAY_SCRIPT = Join-Path $PSScriptRoot 'dsh-tray.ps1'
 
@@ -26,6 +26,54 @@ function Test-Port([int]$port) {
     finally { $client.Close() }
 }
 
+# ---- 可观测性: 统一日志写入/轮转/迁移 (release-standards §3.1 模板 v1, 2026-08-30) ----
+$LOG_ROTATE_BYTES = 5MB   # 轮转阈值 (保险机制: 托盘日志量级一年几十 KB, 极少触发; 设计原则=失败就放弃, 简单优先)
+$LOG_ARCHIVE_KEEP = 5     # 归档保留数
+
+# 带轮转的日志写入: 任何失败静默降级, 绝不阻断主流程
+function Write-DshLog([string]$Path, [string]$Message) {
+    try {
+        if ((Test-Path $Path) -and (Get-Item $Path).Length -gt $LOG_ROTATE_BYTES) { Invoke-LogRotate $Path }
+    } catch { }
+    try {
+        Add-Content -Path $Path -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $Message) -ErrorAction SilentlyContinue
+    } catch { }
+}
+
+# 大小超限归档: rename 失败(被占用/权限)=本轮放弃继续追加, 下次写入重试; 同秒冲突追加 -PID 兜底; 成功后立即 trim 归档
+function Invoke-LogRotate([string]$Path) {
+    try {
+        $dir = Split-Path $Path -Parent
+        $base = [System.IO.Path]::GetFileNameWithoutExtension($Path)
+        $newName = "$base-$(Get-Date -Format 'yyyyMMdd-HHmmss').log"
+        if (Test-Path (Join-Path $dir $newName)) { $newName = "$base-$(Get-Date -Format 'yyyyMMdd-HHmmss')-$PID.log" }
+        Rename-Item -LiteralPath $Path -NewName $newName -ErrorAction Stop
+        $archives = @(Get-ChildItem $dir -Filter "$base-*.log" -ErrorAction SilentlyContinue | Sort-Object LastWriteTime)
+        if ($archives.Count -gt $LOG_ARCHIVE_KEEP) {
+            $archives | Select-Object -First ($archives.Count - $LOG_ARCHIVE_KEEP) | Remove-Item -Force -ErrorAction SilentlyContinue
+        }
+    } catch { }
+}
+
+# 幂等启动清扫: 把 logs 根目录的已知遗留文件迁入本插件目录。
+# 必须每次启动执行而非一次性迁移——自更新过渡窗口内, 旧版代码(升级前拉起的 updater)仍往根目录写
+function Initialize-LogDir {
+    param(
+        [string]$Root = (Join-Path $env:USERPROFILE '.dsh\logs'),
+        [string]$Target = $LOG_DIR,
+        [string[]]$Legacy = @('dsh-tray.log', 'dsh-tray-actions.log', 'dsh-update-npm.log', 'dsh-update-deploy.log', 'web-menu.out.log', 'web-menu.err.log')
+    )
+    New-Item -ItemType Directory -Force -Path $Target | Out-Null
+    if ([System.IO.Path]::GetFullPath($Root) -eq [System.IO.Path]::GetFullPath($Target)) { return }
+    foreach ($name in $Legacy) {
+        $src = Join-Path $Root $name
+        if (-not (Test-Path $src)) { continue }
+        $dst = Join-Path $Target $name
+        if (Test-Path $dst) { $dst = Join-Path $Target ("$([System.IO.Path]::GetFileNameWithoutExtension($name))-root-$(Get-Date -Format 'yyyyMMdd-HHmmss').log") }
+        Move-Item -LiteralPath $src -Destination $dst -Force -ErrorAction SilentlyContinue
+    }
+}
+
 function Get-WebPid {
     @((Get-NetTCPConnection -LocalPort $PORT -State Listen -ErrorAction SilentlyContinue).OwningProcess | Select-Object -Unique)
 }

package/launcher/dsh-tray.ps1

@@ -42,9 +42,9 @@ public static extern int SetCurrentProcessExplicitAppUserModelID([MarshalAs(Unma
 [void][DSH.NativeShell]::SetCurrentProcessExplicitAppUserModelID('DSH.WindowsTray')
 
 $logFile = Join-Path $LOG_DIR 'dsh-tray.log'
+Initialize-LogDir
 function Log([string]$msg) {
-    $line = ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg)
-    Add-Content -Path $logFile -Value $line -ErrorAction SilentlyContinue
+    Write-DshLog -Path $logFile -Message $msg
 }
 
 # ---- 图标: 官方鲸鱼 .ico; 缺失时回退为纯色圆点 ----
@@ -272,7 +272,7 @@ function Find-NpmCmd {
 function Get-LatestTrayVersion {
     $npm = Find-NpmCmd
     if (-not $npm) { Log '自更新: npm 未找到'; return '' }
-    $tmp = Join-Path $LOG_DIR 'tray-npm-view.txt'
+    $tmp = Join-Path $env:TEMP 'tray-npm-view.txt'
     Remove-Item $tmp -Force -ErrorAction SilentlyContinue
     $cmdLine = '/c ""' + $npm + '" view ' + $TRAY_PKG + ' version > "' + $tmp + '" 2>nul "'
     $psi = New-Object System.Diagnostics.ProcessStartInfo

package/launcher/dsh-update.ps1

@@ -11,8 +11,9 @@ $ErrorActionPreference = 'Stop'
 . (Join-Path $PSScriptRoot 'dsh-lib.ps1')
 
 $logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
+Initialize-LogDir
 function Log([string]$msg) {
-    Add-Content -Path $logFile -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg) -ErrorAction SilentlyContinue
+    Write-DshLog -Path $logFile -Message $msg
 }
 
 function Find-NpmCmd {
@@ -44,6 +45,22 @@ function Run-HiddenCmd([string]$cmdLine, [int]$timeoutMs = 0) {
     return $p.ExitCode
 }
 
+# pwsh 版隐藏执行: $ArgList 为 -NoProfile 之后的完整参数串 (如 '-ExecutionPolicy Bypass -Command "..."');
+# 输出经 Out-File 统一 UTF-8 (cmd >> 重定向会写 GBK, 含中文的输出回读成乱码); 退出码由命令文本自行 exit 决定
+function Run-HiddenPwsh([string]$PwshExe, [string]$ArgList, [int]$timeoutMs = 0) {
+    $psi = New-Object System.Diagnostics.ProcessStartInfo
+    $psi.FileName = $PwshExe
+    $psi.Arguments = "-NoProfile " + $ArgList
+    $psi.UseShellExecute = $false
+    $psi.CreateNoWindow = $true
+    $p = [System.Diagnostics.Process]::Start($psi)
+    if ($timeoutMs -gt 0) {
+        $p.WaitForExit($timeoutMs) | Out-Null
+        if (-not $p.HasExited) { $p.Kill(); return -1 }
+    } else { $p.WaitForExit() }
+    return $p.ExitCode
+}
+
 # 结果气泡 (临时 NotifyIcon, 更新脚本自身无托盘)
 function Show-Balloon([string]$text, [string]$icon = 'Info') {
     try {
@@ -71,6 +88,7 @@ if (-not $npm) {
 }
 
 # 1) 安装最新包 (全局; 输出落盘, 失败可查因 — 旧版 2>nul 黑洞)
+#    npm 输出为英文, cmd 重定向 ANSI 编码即 ASCII, 无乱码风险; 含中文输出的 deploy 步骤走 Run-HiddenPwsh (UTF-8)
 $npmLog = Join-Path $LOG_DIR 'dsh-update-npm.log'
 Remove-Item $npmLog -Force -ErrorAction SilentlyContinue
 $installCmd = '/c ""' + $npm + '" install -g ' + $TRAY_PKG + ' >> "' + $npmLog + '" 2>&1 "'
@@ -83,8 +101,8 @@ if ($code -ne 0) {
 }
 Log 'npm install -g 完成'
 
-# 2) 定位新包根目录
-$rootTmp = Join-Path $LOG_DIR 'tray-npm-root.txt'
+# 2) 定位新包根目录 (临时文件走 TEMP, 不落日志目录 — logs 根/插件目录禁止散文件)
+$rootTmp = Join-Path $env:TEMP 'tray-npm-root.txt'
 Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
 $rootCmd = '/c ""' + $npm + '" root -g > "' + $rootTmp + '" 2>nul "'
 Run-HiddenCmd $rootCmd | Out-Null
@@ -101,17 +119,18 @@ if (-not (Test-Path $newInstall)) {
 }
 
 # 3) 运行新包 install.ps1 (重新部署 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
+#    v1.0.8: 改用全流合并 *>&1 — 2>&1 捕不到 Write-Host 信息流, 中文经隐形控制台编码变 '?';
+#    $InformationPreference='Continue' 让信息流进管道, Out-File 统一 UTF-8
 #    v1.0.5: 显式传本机适配值 (取自点源的 dsh-lib, install 不必重新探测; 自定义安装位置必需)
 $dshRoot = Split-Path $DSH_CMD -Parent
 $deployLog = Join-Path $LOG_DIR 'dsh-update-deploy.log'
 Remove-Item $deployLog -Force -ErrorAction SilentlyContinue
-$deployCmd = '/c ""' + $PWSH + '" -NoProfile -ExecutionPolicy Bypass -File "' + $newInstall + '" -Auto -NoTrayStart' +
-    ' -DshRoot "' + $dshRoot + '"' +
-    ' -Port ' + $PORT +
-    ' -NodePath "' + $NODE + '"' +
-    ' -PwshPath "' + $PWSH + '"' +
-    ' >> "' + $deployLog + '" 2>&1 "'
-$code = Run-HiddenCmd $deployCmd 120000
+$deployPwsh = '-ExecutionPolicy Bypass -Command "$InformationPreference=''Continue''; $ErrorActionPreference=''Continue''; try { & ''' + $newInstall + ''' -Auto -NoTrayStart' +
+    ' -DshRoot ''' + $dshRoot + ''' -Port ' + $PORT +
+    ' -NodePath ''' + $NODE + ''' -PwshPath ''' + $PWSH + ''' *>&1 |' +
+    ' Out-File -FilePath ''' + $deployLog + ''' -Encoding utf8 } catch {' +
+    ' $_ | Out-File -FilePath ''' + $deployLog + ''' -Append -Encoding utf8; exit 1 }; exit 0'
+$code = Run-HiddenPwsh $PWSH $deployPwsh 120000
 if ($code -ne 0) {
     Log "自更新失败: install.ps1 退出码 $code (输出: $deployLog)"
     Get-Content $deployLog -Tail 5 -ErrorAction SilentlyContinue | ForEach-Object { Log "  deploy> $_" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-windows-tray",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "DSH (DeepSeek Harness) Windows 系统托盘: 蓝/灰鲸鱼状态图标 + Web/TUI 一键启停控制。纯 PowerShell + WinForms, 零依赖。",
   "license": "MIT",
   "author": "jankin_lv",