dsh-windows-tray 1.0.2 → 1.0.3

package/launcher/dsh-update.ps1

@@ -1,116 +1,116 @@
-# dsh-update.ps1 —— 托盘自更新执行器 (由托盘菜单「更新到最新版」触发, 独立隐藏进程)
-# 流程: npm install -g 最新包 -> 运行新包 install.ps1 (重新部署+改写路径+快捷方式) -> 杀旧托盘 -> 起新托盘
-# 失败时旧托盘不受影响 (旧托盘在最后一步才被终止)
-param(
-    [int]$OldPid = 0
-)
-$ErrorActionPreference = 'Stop'
-. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
-
-$logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
-function Log([string]$msg) {
-    Add-Content -Path $logFile -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg) -ErrorAction SilentlyContinue
-}
-
-function Find-NpmCmd {
-    if ($NODE -and (Test-Path $NODE)) {
-        $p = Join-Path (Split-Path $NODE -Parent) 'npm.cmd'
-        if (Test-Path $p) { return $p }
-    }
-    $c = Get-Command npm.cmd -ErrorAction SilentlyContinue
-    if ($c) { return $c.Source }
-    $c2 = Get-Command npm -ErrorAction SilentlyContinue
-    if ($c2) { return $c2.Source }
-    return $null
-}
-
-# 隐藏执行 cmd /c (CreateNoWindow: 不弹黑窗), 可选超时
-function Run-HiddenCmd([string]$cmdLine, [int]$timeoutMs = 0) {
-    $psi = New-Object System.Diagnostics.ProcessStartInfo
-    $psi.FileName = $env:ComSpec
-    $psi.Arguments = $cmdLine
-    $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 {
-        Add-Type -AssemblyName System.Windows.Forms
-        Add-Type -AssemblyName System.Drawing
-        $n = New-Object System.Windows.Forms.NotifyIcon
-        $n.Icon = [System.Drawing.SystemIcons]::Information
-        $n.Visible = $true
-        $n.BalloonTipTitle = 'DSH 系统托盘'
-        $n.BalloonTipText = $text
-        $n.BalloonTipIcon = [System.Windows.Forms.ToolTipIcon]::$icon
-        $n.ShowBalloonTip(5000)
-        Start-Sleep -Seconds 6
-        $n.Visible = $false
-        $n.Dispose()
-    } catch { }
-}
-
-Log '自更新开始'
-$npm = Find-NpmCmd
-if (-not $npm) {
-    Log '自更新失败: npm 未找到'
-    Show-Balloon '自更新失败：npm 未找到' 'Error'
-    exit 1
-}
-
-# 1) 安装最新包 (全局)
-$code = Run-HiddenCmd ('/c ""' + $npm + '" install -g ' + $TRAY_PKG + ' 2>nul "', 180000)
-if ($code -ne 0) {
-    Log "自更新失败: npm install 退出码 $code"
-    Show-Balloon '自更新失败：npm install 出错，详见日志' 'Error'
-    exit 1
-}
-Log 'npm install -g 完成'
-
-# 2) 定位新包根目录
-$rootTmp = Join-Path $LOG_DIR 'tray-npm-root.txt'
-Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
-Run-HiddenCmd ('/c ""' + $npm + '" root -g > "' + $rootTmp + '" 2>nul "') | Out-Null
-$globalRoot = ''
-if (Test-Path $rootTmp) {
-    $globalRoot = (Get-Content $rootTmp -Raw).Trim()
-    Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
-}
-$newInstall = Join-Path $globalRoot ($TRAY_PKG + '\install.ps1')
-if (-not (Test-Path $newInstall)) {
-    Log "自更新失败: 未找到新包 $newInstall"
-    Show-Balloon '自更新失败：未找到新包（npm 全局目录）' 'Error'
-    exit 1
-}
-
-# 3) 运行新包 install.ps1 (重新部署 + 探测回填 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
-$code = Run-HiddenCmd ('/c ""' + $PWSH + '" -NoProfile -ExecutionPolicy Bypass -File "' + $newInstall + '" -Auto -NoTrayStart 2>nul "', 120000)
-if ($code -ne 0) {
-    Log "自更新失败: install.ps1 退出码 $code"
-    Show-Balloon '自更新失败：部署出错，详见日志' 'Error'
-    exit 1
-}
-Log '新版本部署完成'
-
-# 4) 杀旧托盘 -> 起新托盘
-if ($OldPid -gt 0) {
-    Stop-Process -Id $OldPid -Force -ErrorAction SilentlyContinue
-    Log "旧托盘已停止 (PID $OldPid)"
-}
-Start-Sleep -Milliseconds 500
-$newTray = Join-Path $env:USERPROFILE '.dsh\launcher\dsh-tray.ps1'
-if (Test-Path $PWSH) {
-    Start-Process -FilePath $PWSH -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', $newTray) -WindowStyle Hidden | Out-Null
-} else {
-    Start-Process -FilePath 'powershell.exe' -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', $newTray) -WindowStyle Hidden | Out-Null
-}
-Log '新托盘已启动'
-Show-Balloon '托盘已更新并自动重启 ✓'
+# dsh-update.ps1 —— 托盘自更新执行器 (由托盘菜单「更新到最新版」触发, 独立隐藏进程)
+# 流程: npm install -g 最新包 -> 运行新包 install.ps1 (重新部署+改写路径+快捷方式) -> 杀旧托盘 -> 起新托盘
+# 失败时旧托盘不受影响 (旧托盘在最后一步才被终止)
+param(
+    [int]$OldPid = 0
+)
+$ErrorActionPreference = 'Stop'
+. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
+
+$logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
+function Log([string]$msg) {
+    Add-Content -Path $logFile -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg) -ErrorAction SilentlyContinue
+}
+
+function Find-NpmCmd {
+    if ($NODE -and (Test-Path $NODE)) {
+        $p = Join-Path (Split-Path $NODE -Parent) 'npm.cmd'
+        if (Test-Path $p) { return $p }
+    }
+    $c = Get-Command npm.cmd -ErrorAction SilentlyContinue
+    if ($c) { return $c.Source }
+    $c2 = Get-Command npm -ErrorAction SilentlyContinue
+    if ($c2) { return $c2.Source }
+    return $null
+}
+
+# 隐藏执行 cmd /c (CreateNoWindow: 不弹黑窗), 可选超时
+function Run-HiddenCmd([string]$cmdLine, [int]$timeoutMs = 0) {
+    $psi = New-Object System.Diagnostics.ProcessStartInfo
+    $psi.FileName = $env:ComSpec
+    $psi.Arguments = $cmdLine
+    $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 {
+        Add-Type -AssemblyName System.Windows.Forms
+        Add-Type -AssemblyName System.Drawing
+        $n = New-Object System.Windows.Forms.NotifyIcon
+        $n.Icon = [System.Drawing.SystemIcons]::Information
+        $n.Visible = $true
+        $n.BalloonTipTitle = 'DSH 系统托盘'
+        $n.BalloonTipText = $text
+        $n.BalloonTipIcon = [System.Windows.Forms.ToolTipIcon]::$icon
+        $n.ShowBalloonTip(5000)
+        Start-Sleep -Seconds 6
+        $n.Visible = $false
+        $n.Dispose()
+    } catch { }
+}
+
+Log '自更新开始'
+$npm = Find-NpmCmd
+if (-not $npm) {
+    Log '自更新失败: npm 未找到'
+    Show-Balloon '自更新失败：npm 未找到' 'Error'
+    exit 1
+}
+
+# 1) 安装最新包 (全局)
+$code = Run-HiddenCmd ('/c ""' + $npm + '" install -g ' + $TRAY_PKG + ' 2>nul "', 180000)
+if ($code -ne 0) {
+    Log "自更新失败: npm install 退出码 $code"
+    Show-Balloon '自更新失败：npm install 出错，详见日志' 'Error'
+    exit 1
+}
+Log 'npm install -g 完成'
+
+# 2) 定位新包根目录
+$rootTmp = Join-Path $LOG_DIR 'tray-npm-root.txt'
+Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
+Run-HiddenCmd ('/c ""' + $npm + '" root -g > "' + $rootTmp + '" 2>nul "') | Out-Null
+$globalRoot = ''
+if (Test-Path $rootTmp) {
+    $globalRoot = (Get-Content $rootTmp -Raw).Trim()
+    Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
+}
+$newInstall = Join-Path $globalRoot ($TRAY_PKG + '\install.ps1')
+if (-not (Test-Path $newInstall)) {
+    Log "自更新失败: 未找到新包 $newInstall"
+    Show-Balloon '自更新失败：未找到新包（npm 全局目录）' 'Error'
+    exit 1
+}
+
+# 3) 运行新包 install.ps1 (重新部署 + 探测回填 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
+$code = Run-HiddenCmd ('/c ""' + $PWSH + '" -NoProfile -ExecutionPolicy Bypass -File "' + $newInstall + '" -Auto -NoTrayStart 2>nul "', 120000)
+if ($code -ne 0) {
+    Log "自更新失败: install.ps1 退出码 $code"
+    Show-Balloon '自更新失败：部署出错，详见日志' 'Error'
+    exit 1
+}
+Log '新版本部署完成'
+
+# 4) 杀旧托盘 -> 起新托盘
+if ($OldPid -gt 0) {
+    Stop-Process -Id $OldPid -Force -ErrorAction SilentlyContinue
+    Log "旧托盘已停止 (PID $OldPid)"
+}
+Start-Sleep -Milliseconds 500
+$newTray = Join-Path $env:USERPROFILE '.dsh\launcher\dsh-tray.ps1'
+if (Test-Path $PWSH) {
+    Start-Process -FilePath $PWSH -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', $newTray) -WindowStyle Hidden | Out-Null
+} else {
+    Start-Process -FilePath 'powershell.exe' -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', $newTray) -WindowStyle Hidden | Out-Null
+}
+Log '新托盘已启动'
+Show-Balloon '托盘已更新并自动重启 ✓'
 exit 0

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "dsh-windows-tray",
-  "version": "1.0.2",
-  "description": "DSH (DeepSeek Harness) Windows 系统托盘: 蓝/灰鲸鱼状态图标 + Web/TUI 一键启停控制。纯 PowerShell + WinForms, 零依赖。",
-  "license": "MIT",
-  "author": "jankin_lv",
-  "keywords": [
-    "dsh",
-    "deepseek",
-    "harness",
-    "tray",
-    "notifyicon",
-    "windows",
-    "powershell",
-    "system-tray"
-  ],
-  "os": [
-    "win32"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "launcher/",
-    "build/",
-    "docs/",
-    "bin/",
-    "install.ps1",
-    "README.md",
-    "LICENSE"
-  ],
-  "bin": {
-    "dsh-tray": "bin/dsh-tray.js"
-  },
-  "private": false
-}
+{
+  "name": "dsh-windows-tray",
+  "version": "1.0.3",
+  "description": "DSH (DeepSeek Harness) Windows 系统托盘: 蓝/灰鲸鱼状态图标 + Web/TUI 一键启停控制。纯 PowerShell + WinForms, 零依赖。",
+  "license": "MIT",
+  "author": "jankin_lv",
+  "keywords": [
+    "dsh",
+    "deepseek",
+    "harness",
+    "tray",
+    "notifyicon",
+    "windows",
+    "powershell",
+    "system-tray"
+  ],
+  "os": [
+    "win32"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "files": [
+    "launcher/",
+    "build/",
+    "docs/",
+    "bin/",
+    "install.ps1",
+    "README.md",
+    "LICENSE"
+  ],
+  "bin": {
+    "dsh-tray": "bin/dsh-tray.js"
+  },
+  "private": false
+}