aaden-cli 1.6.124 → 1.6.125

package/AadenDeploy/windowsDesktop.sh

@@ -103,9 +103,31 @@ public static class AadenIdle {
   }
   [AadenIdle]::Seconds()
 }
-function Get-LatestRelease {
+# 最新版本：先读 S3（POS-36，发版 workflow 上传，和 GitHub Release 同一份 latest.yml）；
+# S3 读不到才退回 GitHub Releases（仓库改私有前的退路）。S3 的 latest.yml 带 sha512，下载后校验
+function Get-LatestDesktop {
   [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-  Invoke-RestMethod 'https://api.github.com/repos/innerken-gmbh/aaden-vue-app/releases/latest' -UseBasicParsing -TimeoutSec 30
+  $base = 'https://aaden-backend.s3.eu-central-1.amazonaws.com/desktop/win/'
+  try {
+    $res = Invoke-WebRequest ($base + 'latest.yml') -UseBasicParsing -TimeoutSec 30
+    $yml = [Text.Encoding]::UTF8.GetString($res.RawContentStream.ToArray())
+    $version = [regex]::Match($yml, '(?m)^version:\s*(\S+)').Groups[1].Value
+    $name = [regex]::Match($yml, '(?m)^path:\s*(\S+)').Groups[1].Value
+    $sha512 = [regex]::Match($yml, '(?m)^sha512:\s*(\S+)').Groups[1].Value
+    $size = [regex]::Match($yml, '(?m)^\s+size:\s*(\d+)').Groups[1].Value
+    if ($version -and $name -and $sha512) {
+      return [pscustomobject]@{ Source = 's3'; Version = $version; Name = $name; Url = $base + $name; Sha512 = $sha512; Size = [long]$size }
+    }
+  } catch { }
+  $r = Invoke-RestMethod 'https://api.github.com/repos/innerken-gmbh/aaden-vue-app/releases/latest' -UseBasicParsing -TimeoutSec 30
+  $asset = $r.assets | Where-Object { $_.name -like '*.exe' } | Select-Object -First 1
+  if (-not $asset) { throw "release $($r.tag_name) has no .exe" }
+  [pscustomobject]@{ Source = 'github'; Version = $r.tag_name.TrimStart('v'); Name = $asset.name; Url = $asset.browser_download_url; Sha512 = $null; Size = [long]$asset.size }
+}
+function Get-Sha512Base64($path) {
+  $hex = (Get-FileHash $path -Algorithm SHA512).Hash
+  $bytes = [byte[]](0..($hex.Length / 2 - 1) | ForEach-Object { [Convert]::ToByte($hex.Substring($_ * 2, 2), 16) })
+  [Convert]::ToBase64String($bytes)
 }
 EOF
 
@@ -128,7 +150,7 @@ $pending = Join-Path $env:LOCALAPPDATA 'aaden-updater\pending'
 if (Test-Path $pending) { "updater_pending=$((Get-ChildItem $pending | ForEach-Object { $_.Name }) -join ',')" } else { 'updater_pending=none' }
 $startup = [Environment]::GetFolderPath('Startup')
 "startup_run_hidden=$(Test-Path (Join-Path $startup 'run_hidden.vbs'))"
-try { $r = Get-LatestRelease; "latest_release=$($r.tag_name)" } catch { "latest_release=? $_" }
+try { $l = Get-LatestDesktop; "latest=$($l.Version) source=$($l.Source)" } catch { "latest=? $_" }
 EOF
 
 read -r -d '' PS_UPDATE <<'EOF'
@@ -140,17 +162,19 @@ if ($other.Count) { "ABORT: Aaden Desktop is running in another session ($(($oth
 $idle = Get-IdleSeconds
 "idle_seconds=$idle"
 if ($idle -lt __MIN_IDLE__) { "BUSY: last keyboard/mouse input $idle s ago (< __MIN_IDLE__ s), not touching it"; exit 22 }
-$r = Get-LatestRelease
-$latest = $r.tag_name.TrimStart('v')
-"latest=$latest"
+$l = Get-LatestDesktop
+$latest = $l.Version
+"latest=$latest source=$($l.Source)"
 if ($current -eq $latest) { 'UP_TO_DATE'; exit 0 }
-$asset = $r.assets | Where-Object { $_.name -like '*.exe' } | Select-Object -First 1
-if (-not $asset) { "ABORT: release $($r.tag_name) has no .exe"; exit 23 }
-$file = Join-Path $env:TEMP $asset.name
-Invoke-WebRequest $asset.browser_download_url -OutFile $file -UseBasicParsing -TimeoutSec 900
+$file = Join-Path $env:TEMP $l.Name
+Invoke-WebRequest $l.Url -OutFile $file -UseBasicParsing -TimeoutSec 900
 $size = (Get-Item $file).Length
-"downloaded $($asset.name) $size bytes"
-if ($size -ne $asset.size) { "ABORT: size mismatch, expected $($asset.size)"; exit 23 }
+"downloaded $($l.Name) $size bytes"
+if ($l.Size -and $size -ne $l.Size) { "ABORT: size mismatch, expected $($l.Size)"; exit 23 }
+if ($l.Sha512) {
+  if ((Get-Sha512Base64 $file) -ne $l.Sha512) { 'ABORT: sha512 mismatch, not installing'; exit 23 }
+  'sha512 ok'
+}
 # 下载可能要几分钟，动手前再确认一次没人在用
 $idle = Get-IdleSeconds
 if ($idle -lt __MIN_IDLE__) { "BUSY after download: last input $idle s ago, not touching it"; exit 22 }

package/dist/index.js

@@ -19355,7 +19355,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.124"};
+module.exports = {"i8":"1.6.125"};
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.124",
+  "version": "1.6.125",
   "description": "",
   "main": "dist/index.js",
   "scripts": {