@xevy/heny-connect 0.2.0 → 0.3.0

package/windows/heny-connect-tray.ps1

@@ -1,10 +1,7 @@
 param(
-  [Parameter(Mandatory = $true)]
-  [string] $NodePath,
-
-  [Parameter(Mandatory = $true)]
-  [string] $CliPath,
-
+  [Parameter(Mandatory = $true)][string] $NodePath,
+  [Parameter(Mandatory = $true)][string] $CliPath,
+  [Parameter(Mandatory = $true)][string] $HomePath,
   [string] $IconPath,
   [switch] $Install,
   [switch] $Uninstall
@@ -13,21 +10,23 @@ param(
 $ErrorActionPreference = "Stop"
 $taskName = "HenyConnect"
 $powershellPath = Join-Path $env:SystemRoot "System32\WindowsPowerShell\v1.0\powershell.exe"
+$statusPath = Join-Path $HomePath "worker-status.json"
+$trayStatusPath = Join-Path $HomePath "tray-status.json"
+$pausePath = Join-Path $HomePath "paused"
+$stopPath = Join-Path $HomePath "stopping"
 if (-not $IconPath) { $IconPath = Join-Path $PSScriptRoot "heny.ico" }
 
 function Get-TaskArguments {
-  return "-NoLogo -NoProfile -STA -ExecutionPolicy Bypass -WindowStyle Hidden -File `"$PSCommandPath`" -NodePath `"$NodePath`" -CliPath `"$CliPath`" -IconPath `"$IconPath`""
+  return "-NoLogo -NoProfile -STA -ExecutionPolicy Bypass -WindowStyle Hidden -File `"$PSCommandPath`" -NodePath `"$NodePath`" -CliPath `"$CliPath`" -HomePath `"$HomePath`" -IconPath `"$IconPath`""
 }
 
 function Install-HenyTask {
   param([bool] $StartNow)
-
   $existing = Get-ScheduledTask -TaskName $taskName -ErrorAction SilentlyContinue
   if ($existing) {
     Stop-ScheduledTask -TaskName $taskName -ErrorAction SilentlyContinue
     Unregister-ScheduledTask -TaskName $taskName -Confirm:$false
   }
-
   $currentUser = [Security.Principal.WindowsIdentity]::GetCurrent().Name
   $action = New-ScheduledTaskAction -Execute $powershellPath -Argument (Get-TaskArguments)
   $trigger = New-ScheduledTaskTrigger -AtLogOn -User $currentUser
@@ -55,10 +54,7 @@ if ($Install) {
 
 $createdNew = $false
 $mutex = [Threading.Mutex]::new($true, "Local\HenyConnectTray", [ref] $createdNew)
-if (-not $createdNew) {
-  $mutex.Dispose()
-  exit 0
-}
+if (-not $createdNew) { $mutex.Dispose(); exit 0 }
 
 Add-Type -AssemblyName System.Windows.Forms
 Add-Type -AssemblyName System.Drawing
@@ -69,212 +65,161 @@ $iconPaused = [Drawing.Icon]::new((Join-Path $PSScriptRoot "heny-paused.ico"))
 $iconError = [Drawing.Icon]::new((Join-Path $PSScriptRoot "heny-error.ico"))
 $notifyIcon = [Windows.Forms.NotifyIcon]::new()
 $notifyIcon.Icon = $iconPaused
-$notifyIcon.Text = "Heny Connect - Connecting"
+$notifyIcon.Text = "Heny Connect - Browser starting"
 $notifyIcon.Visible = $true
 
 $menu = [Windows.Forms.ContextMenuStrip]::new()
 $titleItem = [Windows.Forms.ToolStripMenuItem]::new("Heny Connect")
 $titleItem.Enabled = $false
 $titleItem.Font = [Drawing.Font]::new($titleItem.Font, [Drawing.FontStyle]::Bold)
-$statusItem = [Windows.Forms.ToolStripMenuItem]::new("Status: Connecting...")
+$statusItem = [Windows.Forms.ToolStripMenuItem]::new("Status: Browser starting")
 $statusItem.Enabled = $false
+$actionItem = [Windows.Forms.ToolStripMenuItem]::new("Current action: None")
+$actionItem.Enabled = $false
 $openItem = [Windows.Forms.ToolStripMenuItem]::new("Open Heny")
 $pauseItem = [Windows.Forms.ToolStripMenuItem]::new("Pause")
 $reconnectItem = [Windows.Forms.ToolStripMenuItem]::new("Reconnect now")
 $startItem = [Windows.Forms.ToolStripMenuItem]::new("Start at sign-in")
-$startItem.CheckOnClick = $false
 $startItem.Checked = [bool] (Get-ScheduledTask -TaskName $taskName -ErrorAction SilentlyContinue)
 $quitItem = [Windows.Forms.ToolStripMenuItem]::new("Quit")
-
-$null = $menu.Items.Add($titleItem)
-$null = $menu.Items.Add($statusItem)
-$null = $menu.Items.Add([Windows.Forms.ToolStripSeparator]::new())
-$null = $menu.Items.Add($openItem)
-$null = $menu.Items.Add($pauseItem)
-$null = $menu.Items.Add($reconnectItem)
-$null = $menu.Items.Add($startItem)
-$null = $menu.Items.Add([Windows.Forms.ToolStripSeparator]::new())
-$null = $menu.Items.Add($quitItem)
+foreach ($item in @($titleItem, $statusItem, $actionItem, [Windows.Forms.ToolStripSeparator]::new(), $openItem, $pauseItem, $reconnectItem, $startItem, [Windows.Forms.ToolStripSeparator]::new(), $quitItem)) { $null = $menu.Items.Add($item) }
 $notifyIcon.ContextMenuStrip = $menu
 
-$script:paused = $false
-$script:heartbeatProcess = $null
-$script:heartbeatState = $null
-$script:nextHeartbeat = Get-Date
-$script:lastStatus = "connecting"
+$script:workerProcess = $null
+$script:nextStart = Get-Date
+$script:paused = Test-Path -LiteralPath $pausePath
 $script:exiting = $false
 
 function Set-HenyStatus {
-  param(
-    [ValidateSet("available", "paused", "connecting", "error")]
-    [string] $State,
-    [string] $Detail
-  )
-
+  param([string] $State, [string] $Action)
   $label = switch ($State) {
     "available" { "Available" }
+    "working" { "Working" }
     "paused" { "Paused" }
-    "connecting" { "Connecting..." }
-    "error" { "Connection error" }
+    "pausing" { "Pausing" }
+    "browser_starting" { "Browser starting" }
+    "error" { "Error" }
+    "offline" { "Offline" }
+    default { "Connecting" }
   }
   $statusItem.Text = "Status: $label"
-  if ($Detail) { $statusItem.ToolTipText = $Detail }
+  $actionItem.Text = if ($Action) { "Current action: $Action" } else { "Current action: None" }
   $notifyIcon.Text = "Heny Connect - $label"
-  $notifyIcon.Icon = switch ($State) {
-    "available" { $iconAvailable }
-    "error" { $iconError }
-    default { $iconPaused }
-  }
-  $script:lastStatus = $State
+  $notifyIcon.Icon = if ($State -in @("available", "working")) { $iconAvailable } elseif ($State -eq "error") { $iconError } else { $iconPaused }
+}
+
+function Write-TrayStatus {
+  param([string] $State, [int] $ExitCode = 0, [string] $Detail = "")
+  @{ state = $State; exitCode = $ExitCode; detail = $Detail.Substring(0, [Math]::Min(200, $Detail.Length)); updatedAt = [DateTime]::UtcNow.ToString("o") } | ConvertTo-Json -Compress | Set-Content -LiteralPath $trayStatusPath -Encoding UTF8
 }
 
 function Get-HenyUrl {
   try {
-    $homePath = if ($env:HENY_CONNECT_HOME) { $env:HENY_CONNECT_HOME } else { [Environment]::GetFolderPath("UserProfile") }
-    $statePath = Join-Path $homePath ".heny-connect.json"
-    $state = Get-Content -LiteralPath $statePath -Raw | ConvertFrom-Json
+    $state = Get-Content -LiteralPath (Join-Path $HomePath ".heny-connect.json") -Raw | ConvertFrom-Json
     return ([string] $state.server).TrimEnd("/") + "/desktop"
-  } catch {
-    return "https://heny.vyte.dev/desktop"
-  }
+  } catch { return "https://heny.vyte.dev/desktop" }
 }
 
-function Stop-HeartbeatProcess {
-  if (-not $script:heartbeatProcess) { return }
+function Stop-Worker {
+  if (-not $script:workerProcess) { return }
   try {
-    if (-not $script:heartbeatProcess.HasExited) {
-      $script:heartbeatProcess.Kill()
-      $script:heartbeatProcess.WaitForExit(2000) | Out-Null
+    if (-not $script:workerProcess.HasExited) {
+      New-Item -ItemType Directory -Path $HomePath -Force | Out-Null
+      Set-Content -LiteralPath $pausePath -Value "paused" -NoNewline
+      Set-Content -LiteralPath $stopPath -Value "stop" -NoNewline
+      $limit = (Get-Date).AddSeconds(5)
+      while (-not $script:workerProcess.HasExited -and (Get-Date) -lt $limit) {
+        try {
+          $state = Get-Content -LiteralPath $statusPath -Raw | ConvertFrom-Json
+          if ($state.state -eq "paused") { break }
+        } catch {}
+        Start-Sleep -Milliseconds 200
+      }
+      if (-not $script:workerProcess.HasExited) {
+        & taskkill.exe /PID ([string] $script:workerProcess.Id) /T /F 2>$null | Out-Null
+        $script:workerProcess.WaitForExit(2000) | Out-Null
+      }
     }
-    $script:heartbeatProcess.Dispose()
+    $script:workerProcess.Dispose()
   } catch {}
-  $script:heartbeatProcess = $null
-  $script:heartbeatState = $null
+  $script:workerProcess = $null
 }
 
-function Start-Heartbeat {
-  param(
-    [ValidateSet("available", "offline")]
-    [string] $State = "available"
-  )
-
-  if ($script:heartbeatProcess) { return }
-  $detail = if ($State -eq "offline") { "$env:COMPUTERNAME`: paused in tray" } else { "$env:COMPUTERNAME`: browser ready" }
+function Start-Worker {
+  if ($script:workerProcess -or $script:paused -or $script:exiting) { return }
+  Remove-Item -LiteralPath $stopPath -Force -ErrorAction SilentlyContinue
   $startInfo = [Diagnostics.ProcessStartInfo]::new()
   $startInfo.FileName = $NodePath
-  $startInfo.Arguments = "`"$CliPath`" heartbeat --state $State --detail `"$detail`""
+  $startInfo.Arguments = "`"$CliPath`" run"
   $startInfo.UseShellExecute = $false
   $startInfo.CreateNoWindow = $true
   $startInfo.WindowStyle = [Diagnostics.ProcessWindowStyle]::Hidden
-  $startInfo.RedirectStandardOutput = $true
-  $startInfo.RedirectStandardError = $true
+  $startInfo.EnvironmentVariables["HENY_CONNECT_HOME"] = $HomePath
   $process = [Diagnostics.Process]::new()
   $process.StartInfo = $startInfo
   try {
-    if (-not $process.Start()) { throw "The heartbeat process did not start." }
-    $script:heartbeatProcess = $process
-    $script:heartbeatState = $State
-    if ($State -eq "available") { Set-HenyStatus -State "connecting" -Detail "Contacting Heny" }
+    if (-not $process.Start()) { throw "The worker did not start." }
+    $script:workerProcess = $process
+    Write-TrayStatus -State "worker_started"
+    Set-HenyStatus -State "browser_starting"
   } catch {
     $process.Dispose()
-    Set-HenyStatus -State "error" -Detail $_.Exception.Message
-    $script:nextHeartbeat = (Get-Date).AddSeconds(30)
+    Write-TrayStatus -State "worker_start_failed" -ExitCode -1 -Detail $_.Exception.Message
+    Set-HenyStatus -State "error"
+    $script:nextStart = (Get-Date).AddSeconds(15)
   }
 }
 
-function Complete-Heartbeat {
-  if (-not $script:heartbeatProcess -or -not $script:heartbeatProcess.HasExited) { return }
-  $process = $script:heartbeatProcess
-  $state = $script:heartbeatState
-  $stdout = $process.StandardOutput.ReadToEnd().Trim()
-  $stderr = $process.StandardError.ReadToEnd().Trim()
-  $exitCode = $process.ExitCode
-  $process.Dispose()
-  $script:heartbeatProcess = $null
-  $script:heartbeatState = $null
-  $script:nextHeartbeat = (Get-Date).AddSeconds(30)
-
-  if ($exitCode -eq 0) {
-    if ($state -eq "offline" -or $script:paused) {
-      Set-HenyStatus -State "paused" -Detail "Paused on this computer"
-    } else {
-      Set-HenyStatus -State "available" -Detail "Connected to Heny"
-    }
-    return
-  }
-
-  $detail = if ($stderr) { $stderr } elseif ($stdout) { $stdout } else { "Heartbeat exited with code $exitCode" }
-  $previousStatus = $script:lastStatus
-  Set-HenyStatus -State "error" -Detail $detail
-  if ($previousStatus -ne "error") {
-    $notifyIcon.ShowBalloonTip(4000, "Heny Connect", $detail, [Windows.Forms.ToolTipIcon]::Warning)
-  }
+function Request-Pause {
+  New-Item -ItemType Directory -Path $HomePath -Force | Out-Null
+  Set-Content -LiteralPath $pausePath -Value "paused" -NoNewline
+  $script:paused = $true
+  $pauseItem.Text = "Resume"
+  Set-HenyStatus -State "pausing"
 }
 
-function Send-OfflineAndWait {
-  Stop-HeartbeatProcess
-  $startInfo = [Diagnostics.ProcessStartInfo]::new()
-  $startInfo.FileName = $NodePath
-  $startInfo.Arguments = "`"$CliPath`" heartbeat --state offline --detail `"$env:COMPUTERNAME`: tray closed`""
-  $startInfo.UseShellExecute = $false
-  $startInfo.CreateNoWindow = $true
-  $startInfo.WindowStyle = [Diagnostics.ProcessWindowStyle]::Hidden
-  $process = [Diagnostics.Process]::Start($startInfo)
-  if ($process) {
-    $process.WaitForExit(10000) | Out-Null
-    if (-not $process.HasExited) { $process.Kill() }
-    $process.Dispose()
-  }
+function Request-Resume {
+  Remove-Item -LiteralPath $pausePath -Force -ErrorAction SilentlyContinue
+  Remove-Item -LiteralPath $stopPath -Force -ErrorAction SilentlyContinue
+  $script:paused = $false
+  $pauseItem.Text = "Pause"
+  $script:nextStart = Get-Date
+  Set-HenyStatus -State "browser_starting"
 }
 
-$openHeny = {
-  Start-Process (Get-HenyUrl)
-}
+$openHeny = { Start-Process (Get-HenyUrl) }
 $openItem.Add_Click($openHeny)
 $notifyIcon.Add_DoubleClick($openHeny)
-
-$pauseItem.Add_Click({
-  if ($script:paused) {
-    $script:paused = $false
-    $pauseItem.Text = "Pause"
-    $script:nextHeartbeat = Get-Date
-    Set-HenyStatus -State "connecting" -Detail "Resuming"
-  } else {
-    $script:paused = $true
-    $pauseItem.Text = "Resume"
-    Stop-HeartbeatProcess
-    Start-Heartbeat -State "offline"
-  }
-})
-
-$reconnectItem.Add_Click({
-  $script:paused = $false
-  $pauseItem.Text = "Pause"
-  Stop-HeartbeatProcess
-  $script:nextHeartbeat = Get-Date
-  Set-HenyStatus -State "connecting" -Detail "Reconnecting"
-})
+$pauseItem.Add_Click({ if ($script:paused) { Request-Resume } else { Request-Pause } })
+$reconnectItem.Add_Click({ Request-Pause; Stop-Worker; Request-Resume })
 
 $startItem.Add_Click({
   try {
     if ($startItem.Checked) {
       Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
       $startItem.Checked = $false
-      $notifyIcon.ShowBalloonTip(2500, "Heny Connect", "Start at sign-in is off.", [Windows.Forms.ToolTipIcon]::Info)
     } else {
       Install-HenyTask -StartNow $false
       $startItem.Checked = $true
-      $notifyIcon.ShowBalloonTip(2500, "Heny Connect", "Start at sign-in is on.", [Windows.Forms.ToolTipIcon]::Info)
     }
-  } catch {
-    Set-HenyStatus -State "error" -Detail $_.Exception.Message
-  }
+  } catch { Set-HenyStatus -State "error" }
 })
 
 $quitItem.Add_Click({
   $script:exiting = $true
   $timer.Stop()
-  Send-OfflineAndWait
+  Request-Pause
+  $limit = (Get-Date).AddSeconds(5)
+  while ((Get-Date) -lt $limit) {
+    try {
+      $state = Get-Content -LiteralPath $statusPath -Raw | ConvertFrom-Json
+      if ($state.state -eq "paused") { break }
+    } catch {}
+    Start-Sleep -Milliseconds 200
+  }
+  Stop-Worker
+  Remove-Item -LiteralPath $pausePath -Force -ErrorAction SilentlyContinue
+  Remove-Item -LiteralPath $stopPath -Force -ErrorAction SilentlyContinue
   $notifyIcon.Visible = $false
   [Windows.Forms.Application]::ExitThread()
 })
@@ -282,19 +227,32 @@ $quitItem.Add_Click({
 $timer = [Windows.Forms.Timer]::new()
 $timer.Interval = 1000
 $timer.Add_Tick({
-  Complete-Heartbeat
-  if (-not $script:paused -and -not $script:heartbeatProcess -and (Get-Date) -ge $script:nextHeartbeat) {
-    Start-Heartbeat -State "available"
+  if ($script:workerProcess -and $script:workerProcess.HasExited) {
+    $code = $script:workerProcess.ExitCode
+    Write-TrayStatus -State "worker_exited" -ExitCode $code
+    $script:workerProcess.Dispose()
+    $script:workerProcess = $null
+    if (-not $script:paused) {
+      Set-HenyStatus -State "error"
+      $script:nextStart = if ($code -in @(2, 3)) { [DateTime]::MaxValue } else { (Get-Date).AddSeconds(15) }
+    }
   }
+  if ($script:workerProcess) {
+    try {
+      $state = Get-Content -LiteralPath $statusPath -Raw | ConvertFrom-Json
+      if ($script:paused -and $state.state -ne "paused") { Set-HenyStatus -State "pausing" } else { Set-HenyStatus -State ([string] $state.state) -Action ([string] $state.currentAction) }
+    } catch {}
+  } elseif ($script:paused) { Set-HenyStatus -State "paused" }
+  if (-not $script:paused -and -not $script:workerProcess -and (Get-Date) -ge $script:nextStart) { Start-Worker }
 })
 $timer.Start()
-Start-Heartbeat -State "available"
+if ($script:paused) { Set-HenyStatus -State "paused"; $pauseItem.Text = "Resume" } else { Start-Worker }
 
 try {
   [Windows.Forms.Application]::Run()
 } finally {
   $timer.Stop()
-  Stop-HeartbeatProcess
+  Stop-Worker
   $notifyIcon.Visible = $false
   $notifyIcon.Dispose()
   $menu.Dispose()