mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-08 08:36:37 +08:00
[优化] 添加服务器升级日志功能,记录升级状态和日志信息;更新相关类型定义以支持日志展示
This commit is contained in:
+188
-82
@@ -1,4 +1,4 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"atsflare/common"
|
"atsflare/common"
|
||||||
@@ -39,6 +39,8 @@ var updateHTTPClient = &http.Client{
|
|||||||
var serverUpgradeState struct {
|
var serverUpgradeState struct {
|
||||||
sync.Mutex
|
sync.Mutex
|
||||||
inProgress bool
|
inProgress bool
|
||||||
|
status string
|
||||||
|
logs []ServerUpgradeLogRecord
|
||||||
}
|
}
|
||||||
|
|
||||||
var manualServerBinaryState struct {
|
var manualServerBinaryState struct {
|
||||||
@@ -51,16 +53,24 @@ var serverBinaryUpgradeExecutor = replaceAndRestartServer
|
|||||||
var serverUpgradeDispatchDelay = 500 * time.Millisecond
|
var serverUpgradeDispatchDelay = 500 * time.Millisecond
|
||||||
|
|
||||||
type LatestServerRelease struct {
|
type LatestServerRelease struct {
|
||||||
TagName string `json:"tag_name"`
|
TagName string `json:"tag_name"`
|
||||||
Body string `json:"body"`
|
Body string `json:"body"`
|
||||||
HTMLURL string `json:"html_url"`
|
HTMLURL string `json:"html_url"`
|
||||||
PublishedAt string `json:"published_at"`
|
PublishedAt string `json:"published_at"`
|
||||||
Channel string `json:"channel"`
|
Channel string `json:"channel"`
|
||||||
Prerelease bool `json:"prerelease"`
|
Prerelease bool `json:"prerelease"`
|
||||||
CurrentVersion string `json:"current_version"`
|
CurrentVersion string `json:"current_version"`
|
||||||
HasUpdate bool `json:"has_update"`
|
HasUpdate bool `json:"has_update"`
|
||||||
UpgradeSupported bool `json:"upgrade_supported"`
|
UpgradeSupported bool `json:"upgrade_supported"`
|
||||||
InProgress bool `json:"in_progress"`
|
InProgress bool `json:"in_progress"`
|
||||||
|
UpgradeStatus string `json:"upgrade_status"`
|
||||||
|
UpgradeLogs []ServerUpgradeLogRecord `json:"upgrade_logs"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ServerUpgradeLogRecord struct {
|
||||||
|
Level string `json:"level"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type githubReleaseResponse struct {
|
type githubReleaseResponse struct {
|
||||||
@@ -120,11 +130,17 @@ func ScheduleServerUpgrade(channel string) (*LatestServerRelease, error) {
|
|||||||
serverUpgradeState.Lock()
|
serverUpgradeState.Lock()
|
||||||
if serverUpgradeState.inProgress {
|
if serverUpgradeState.inProgress {
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
return nil, fmt.Errorf("服务升级已在执行中,请稍后再试")
|
return nil, fmt.Errorf("鏈嶅姟鍗囩骇宸插湪鎵ц涓紝璇风◢鍚庡啀璇?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resetServerUpgradeLogsLocked()
|
||||||
|
serverUpgradeState.status = "running"
|
||||||
|
appendServerUpgradeLogLocked("info", fmt.Sprintf("Automatic upgrade scheduled for channel: %s.", normalizedChannel.String()))
|
||||||
|
|
||||||
prepared, err := prepareServerUpgrade(context.Background(), normalizedChannel)
|
prepared, err := prepareServerUpgrade(context.Background(), normalizedChannel)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
serverUpgradeState.status = "failed"
|
||||||
|
appendServerUpgradeLogLocked("error", err.Error())
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -137,10 +153,8 @@ func ScheduleServerUpgrade(channel string) (*LatestServerRelease, error) {
|
|||||||
go func(task *preparedServerUpgrade) {
|
go func(task *preparedServerUpgrade) {
|
||||||
time.Sleep(serverUpgradeDispatchDelay)
|
time.Sleep(serverUpgradeDispatchDelay)
|
||||||
if err := executeServerUpgrade(task); err != nil {
|
if err := executeServerUpgrade(task); err != nil {
|
||||||
|
recordServerUpgradeFailure(err)
|
||||||
slog.Error("server self-update failed", "error", err)
|
slog.Error("server self-update failed", "error", err)
|
||||||
serverUpgradeState.Lock()
|
|
||||||
serverUpgradeState.inProgress = false
|
|
||||||
serverUpgradeState.Unlock()
|
|
||||||
}
|
}
|
||||||
}(prepared)
|
}(prepared)
|
||||||
|
|
||||||
@@ -148,27 +162,25 @@ func ScheduleServerUpgrade(channel string) (*LatestServerRelease, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func UploadManualServerBinary(ctx context.Context, fileName string, reader io.Reader) (*UploadedServerBinary, error) {
|
func UploadManualServerBinary(ctx context.Context, fileName string, reader io.Reader) (*UploadedServerBinary, error) {
|
||||||
serverUpgradeState.Lock()
|
inProgress, _, _ := snapshotServerUpgradeState()
|
||||||
inProgress := serverUpgradeState.inProgress
|
|
||||||
serverUpgradeState.Unlock()
|
|
||||||
if inProgress {
|
if inProgress {
|
||||||
return nil, fmt.Errorf("服务升级已在执行中,请稍后再试")
|
return nil, fmt.Errorf("鏈嶅姟鍗囩骇宸插湪鎵ц涓紝璇风◢鍚庡啀璇?)
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(fileName) == "" {
|
if strings.TrimSpace(fileName) == "" {
|
||||||
return nil, fmt.Errorf("缺少上传文件名")
|
return nil, fmt.Errorf("缂哄皯涓婁紶鏂囦欢鍚?)
|
||||||
}
|
}
|
||||||
if reader == nil {
|
if reader == nil {
|
||||||
return nil, fmt.Errorf("缺少上传文件内容")
|
return nil, fmt.Errorf("缂哄皯涓婁紶鏂囦欢鍐呭")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
execPath, err := os.Executable()
|
execPath, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("获取当前服务程序路径失败: %v", err)
|
return nil, fmt.Errorf("鑾峰彇褰撳墠鏈嶅姟绋嬪簭璺緞澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
if err = verifyExecutableDirectoryWritable(execPath); err != nil {
|
if err = verifyExecutableDirectoryWritable(execPath); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
tempPath, err := persistUploadedServerBinary(filepath.Dir(execPath), fileName, reader)
|
tempPath, err := persistUploadedServerBinary(filepath.Dir(execPath), fileName, reader)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -191,7 +203,7 @@ func UploadManualServerBinary(ctx context.Context, fileName string, reader io.Re
|
|||||||
uploadToken, err := newUpgradeToken()
|
uploadToken, err := newUpgradeToken()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = os.Remove(tempPath)
|
_ = os.Remove(tempPath)
|
||||||
return nil, fmt.Errorf("生成升级令牌失败: %v", err)
|
return nil, fmt.Errorf("鐢熸垚鍗囩骇浠ょ墝澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
manualServerBinaryState.Lock()
|
manualServerBinaryState.Lock()
|
||||||
@@ -214,13 +226,13 @@ func UploadManualServerBinary(ctx context.Context, fileName string, reader io.Re
|
|||||||
func ConfirmManualServerUpgrade(uploadToken string) (*UploadedServerBinary, error) {
|
func ConfirmManualServerUpgrade(uploadToken string) (*UploadedServerBinary, error) {
|
||||||
uploadToken = strings.TrimSpace(uploadToken)
|
uploadToken = strings.TrimSpace(uploadToken)
|
||||||
if uploadToken == "" {
|
if uploadToken == "" {
|
||||||
return nil, fmt.Errorf("缺少升级令牌")
|
return nil, fmt.Errorf("缂哄皯鍗囩骇浠ょ墝")
|
||||||
}
|
}
|
||||||
|
|
||||||
serverUpgradeState.Lock()
|
serverUpgradeState.Lock()
|
||||||
if serverUpgradeState.inProgress {
|
if serverUpgradeState.inProgress {
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
return nil, fmt.Errorf("服务升级已在执行中,请稍后再试")
|
return nil, fmt.Errorf("鏈嶅姟鍗囩骇宸插湪鎵ц涓紝璇风◢鍚庡啀璇?)
|
||||||
}
|
}
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
|
|
||||||
@@ -228,11 +240,11 @@ func ConfirmManualServerUpgrade(uploadToken string) (*UploadedServerBinary, erro
|
|||||||
candidate := manualServerBinaryState.candidate
|
candidate := manualServerBinaryState.candidate
|
||||||
if candidate == nil {
|
if candidate == nil {
|
||||||
manualServerBinaryState.Unlock()
|
manualServerBinaryState.Unlock()
|
||||||
return nil, fmt.Errorf("未找到待确认的上传升级包,请重新上传")
|
return nil, fmt.Errorf("鏈壘鍒板緟纭鐨勪笂浼犲崌绾у寘锛岃閲嶆柊涓婁紶")
|
||||||
}
|
}
|
||||||
if candidate.UploadToken != uploadToken {
|
if candidate.UploadToken != uploadToken {
|
||||||
manualServerBinaryState.Unlock()
|
manualServerBinaryState.Unlock()
|
||||||
return nil, fmt.Errorf("升级令牌无效或已过期,请重新上传")
|
return nil, fmt.Errorf("鍗囩骇浠ょ墝鏃犳晥鎴栧凡杩囨湡锛岃閲嶆柊涓婁紶")
|
||||||
}
|
}
|
||||||
manualServerBinaryState.candidate = nil
|
manualServerBinaryState.candidate = nil
|
||||||
manualServerBinaryState.Unlock()
|
manualServerBinaryState.Unlock()
|
||||||
@@ -241,20 +253,21 @@ func ConfirmManualServerUpgrade(uploadToken string) (*UploadedServerBinary, erro
|
|||||||
info.UploadToken = candidate.UploadToken
|
info.UploadToken = candidate.UploadToken
|
||||||
if !info.ReadyToUpgrade {
|
if !info.ReadyToUpgrade {
|
||||||
_ = os.Remove(candidate.TempPath)
|
_ = os.Remove(candidate.TempPath)
|
||||||
return nil, fmt.Errorf("当前上传的二进制不满足升级条件")
|
return nil, fmt.Errorf("褰撳墠涓婁紶鐨勪簩杩涘埗涓嶆弧瓒冲崌绾ф潯浠?)
|
||||||
}
|
}
|
||||||
|
|
||||||
serverUpgradeState.Lock()
|
serverUpgradeState.Lock()
|
||||||
serverUpgradeState.inProgress = true
|
serverUpgradeState.inProgress = true
|
||||||
|
resetServerUpgradeLogsLocked()
|
||||||
|
serverUpgradeState.status = "running"
|
||||||
|
appendServerUpgradeLogLocked("info", fmt.Sprintf("Manual upgrade confirmed for version: %s.", strings.TrimSpace(candidate.DetectedVersion)))
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
|
|
||||||
go func(task *manualServerBinaryCandidate) {
|
go func(task *manualServerBinaryCandidate) {
|
||||||
time.Sleep(serverUpgradeDispatchDelay)
|
time.Sleep(serverUpgradeDispatchDelay)
|
||||||
if err := executeManualServerUpgrade(task); err != nil {
|
if err := executeServerBinaryCandidateUpgrade(task, "manual"); err != nil {
|
||||||
|
recordServerUpgradeFailure(err)
|
||||||
slog.Error("server manual upgrade failed", "error", err)
|
slog.Error("server manual upgrade failed", "error", err)
|
||||||
serverUpgradeState.Lock()
|
|
||||||
serverUpgradeState.inProgress = false
|
|
||||||
serverUpgradeState.Unlock()
|
|
||||||
_ = os.Remove(task.TempPath)
|
_ = os.Remove(task.TempPath)
|
||||||
}
|
}
|
||||||
}(candidate)
|
}(candidate)
|
||||||
@@ -279,17 +292,17 @@ func fetchLatestStableGitHubRelease(ctx context.Context, repo string) (*githubRe
|
|||||||
url := fmt.Sprintf(githubReleasesAPIBase+"/latest", strings.TrimSpace(repo))
|
url := fmt.Sprintf(githubReleasesAPIBase+"/latest", strings.TrimSpace(repo))
|
||||||
req, err := newGitHubReleaseRequest(ctx, url)
|
req, err := newGitHubReleaseRequest(ctx, url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("创建更新请求失败")
|
return nil, fmt.Errorf("鍒涘缓鏇存柊璇锋眰澶辫触")
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := updateHTTPClient.Do(req)
|
resp, err := updateHTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("获取最新版本失败: %v", err)
|
return nil, fmt.Errorf("鑾峰彇鏈€鏂扮増鏈け璐? %v", err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("GitHub 返回异常状态: %s", resp.Status)
|
return nil, fmt.Errorf("GitHub 杩斿洖寮傚父鐘舵€? %s", resp.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
return decodeGitHubRelease(resp.Body)
|
return decodeGitHubRelease(resp.Body)
|
||||||
@@ -299,22 +312,22 @@ func fetchLatestPreviewGitHubRelease(ctx context.Context, repo string) (*githubR
|
|||||||
url := fmt.Sprintf(githubReleasesAPIBase+"?per_page=20", strings.TrimSpace(repo))
|
url := fmt.Sprintf(githubReleasesAPIBase+"?per_page=20", strings.TrimSpace(repo))
|
||||||
req, err := newGitHubReleaseRequest(ctx, url)
|
req, err := newGitHubReleaseRequest(ctx, url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("创建更新请求失败")
|
return nil, fmt.Errorf("鍒涘缓鏇存柊璇锋眰澶辫触")
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := updateHTTPClient.Do(req)
|
resp, err := updateHTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("获取 preview 版本失败: %v", err)
|
return nil, fmt.Errorf("鑾峰彇 preview 鐗堟湰澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("GitHub 返回异常状态: %s", resp.Status)
|
return nil, fmt.Errorf("GitHub 杩斿洖寮傚父鐘舵€? %s", resp.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
var releases []githubReleaseResponse
|
var releases []githubReleaseResponse
|
||||||
if err = json.NewDecoder(resp.Body).Decode(&releases); err != nil {
|
if err = json.NewDecoder(resp.Body).Decode(&releases); err != nil {
|
||||||
return nil, fmt.Errorf("解析 preview 版本信息失败")
|
return nil, fmt.Errorf("瑙f瀽 preview 鐗堟湰淇℃伅澶辫触")
|
||||||
}
|
}
|
||||||
for _, release := range releases {
|
for _, release := range releases {
|
||||||
if release.Draft || !release.Prerelease {
|
if release.Draft || !release.Prerelease {
|
||||||
@@ -323,31 +336,31 @@ func fetchLatestPreviewGitHubRelease(ctx context.Context, repo string) (*githubR
|
|||||||
releaseCopy := release
|
releaseCopy := release
|
||||||
return &releaseCopy, nil
|
return &releaseCopy, nil
|
||||||
}
|
}
|
||||||
return nil, fmt.Errorf("当前没有可用的 preview 发布")
|
return nil, fmt.Errorf("褰撳墠娌℃湁鍙敤鐨?preview 鍙戝竷")
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchGitHubReleaseByTag(ctx context.Context, repo string, tag string) (*githubReleaseResponse, error) {
|
func fetchGitHubReleaseByTag(ctx context.Context, repo string, tag string) (*githubReleaseResponse, error) {
|
||||||
tag = strings.TrimSpace(tag)
|
tag = strings.TrimSpace(tag)
|
||||||
if tag == "" {
|
if tag == "" {
|
||||||
return nil, fmt.Errorf("缺少发布版本号")
|
return nil, fmt.Errorf("缂哄皯鍙戝竷鐗堟湰鍙?)
|
||||||
}
|
}
|
||||||
url := fmt.Sprintf(githubReleasesAPIBase+"/tags/%s", strings.TrimSpace(repo), tag)
|
url := fmt.Sprintf(githubReleasesAPIBase+"/tags/%s", strings.TrimSpace(repo), tag)
|
||||||
req, err := newGitHubReleaseRequest(ctx, url)
|
req, err := newGitHubReleaseRequest(ctx, url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("创建更新请求失败")
|
return nil, fmt.Errorf("鍒涘缓鏇存柊璇锋眰澶辫触")
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := updateHTTPClient.Do(req)
|
resp, err := updateHTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("获取指定版本失败: %v", err)
|
return nil, fmt.Errorf("鑾峰彇鎸囧畾鐗堟湰澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode == http.StatusNotFound {
|
if resp.StatusCode == http.StatusNotFound {
|
||||||
return nil, fmt.Errorf("未找到指定版本: %s", tag)
|
return nil, fmt.Errorf("鏈壘鍒版寚瀹氱増鏈? %s", tag)
|
||||||
}
|
}
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("GitHub 返回异常状态: %s", resp.Status)
|
return nil, fmt.Errorf("GitHub 杩斿洖寮傚父鐘舵€? %s", resp.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
return decodeGitHubRelease(resp.Body)
|
return decodeGitHubRelease(resp.Body)
|
||||||
@@ -366,7 +379,7 @@ func newGitHubReleaseRequest(ctx context.Context, url string) (*http.Request, er
|
|||||||
func decodeGitHubRelease(reader io.Reader) (*githubReleaseResponse, error) {
|
func decodeGitHubRelease(reader io.Reader) (*githubReleaseResponse, error) {
|
||||||
var release githubReleaseResponse
|
var release githubReleaseResponse
|
||||||
if err := json.NewDecoder(reader).Decode(&release); err != nil {
|
if err := json.NewDecoder(reader).Decode(&release); err != nil {
|
||||||
return nil, fmt.Errorf("解析最新版本信息失败")
|
return nil, fmt.Errorf("瑙f瀽鏈€鏂扮増鏈俊鎭け璐?)
|
||||||
}
|
}
|
||||||
return &release, nil
|
return &release, nil
|
||||||
}
|
}
|
||||||
@@ -397,6 +410,8 @@ func buildLatestServerReleaseView(release *githubReleaseResponse, channel Releas
|
|||||||
HasUpdate: hasUpdate,
|
HasUpdate: hasUpdate,
|
||||||
UpgradeSupported: !isDevBuild && runtime.GOOS != "windows",
|
UpgradeSupported: !isDevBuild && runtime.GOOS != "windows",
|
||||||
InProgress: inProgress,
|
InProgress: inProgress,
|
||||||
|
UpgradeStatus: upgradeStatus,
|
||||||
|
UpgradeLogs: upgradeLogs,
|
||||||
}
|
}
|
||||||
if release != nil {
|
if release != nil {
|
||||||
view.TagName = release.TagName
|
view.TagName = release.TagName
|
||||||
@@ -416,13 +431,15 @@ func prepareServerUpgrade(ctx context.Context, channel ReleaseChannel) (*prepare
|
|||||||
|
|
||||||
view := buildLatestServerReleaseView(release, channel)
|
view := buildLatestServerReleaseView(release, channel)
|
||||||
if !view.HasUpdate {
|
if !view.HasUpdate {
|
||||||
return nil, fmt.Errorf("当前已是最新版本")
|
return nil, fmt.Errorf("褰撳墠宸叉槸鏈€鏂扮増鏈?)
|
||||||
}
|
}
|
||||||
if !view.UpgradeSupported {
|
if !view.UpgradeSupported {
|
||||||
return nil, fmt.Errorf("当前平台暂不支持自动升级")
|
return nil, fmt.Errorf("褰撳墠骞冲彴鏆備笉鏀寔鑷姩鍗囩骇")
|
||||||
}
|
}
|
||||||
|
|
||||||
assetName := serverAssetName(runtime.GOOS, runtime.GOARCH)
|
assetName := serverAssetName(runtime.GOOS, runtime.GOARCH)
|
||||||
|
recordServerUpgradeLog("info", fmt.Sprintf("Matching release asset: %s.", assetName))
|
||||||
|
|
||||||
var downloadURL string
|
var downloadURL string
|
||||||
for _, asset := range release.Assets {
|
for _, asset := range release.Assets {
|
||||||
if asset.Name == assetName {
|
if asset.Name == assetName {
|
||||||
@@ -431,16 +448,18 @@ func prepareServerUpgrade(ctx context.Context, channel ReleaseChannel) (*prepare
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if downloadURL == "" {
|
if downloadURL == "" {
|
||||||
return nil, fmt.Errorf("最新版本缺少当前平台的服务端二进制: %s", assetName)
|
return nil, fmt.Errorf("鏈€鏂扮増鏈己灏戝綋鍓嶅钩鍙扮殑鏈嶅姟绔簩杩涘埗: %s", assetName)
|
||||||
}
|
}
|
||||||
|
|
||||||
execPath, err := os.Executable()
|
execPath, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("获取当前服务程序路径失败: %v", err)
|
return nil, fmt.Errorf("鑾峰彇褰撳墠鏈嶅姟绋嬪簭璺緞澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
if err = verifyExecutableDirectoryWritable(execPath); err != nil {
|
if err = verifyExecutableDirectoryWritable(execPath); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
recordServerUpgradeLog("info", "Verified current executable directory is writable.")
|
||||||
|
|
||||||
|
|
||||||
return &preparedServerUpgrade{
|
return &preparedServerUpgrade{
|
||||||
release: view,
|
release: view,
|
||||||
@@ -453,20 +472,21 @@ func verifyExecutableDirectoryWritable(execPath string) error {
|
|||||||
dir := filepath.Dir(execPath)
|
dir := filepath.Dir(execPath)
|
||||||
tempFile, err := os.CreateTemp(dir, "atsflare-server-upgrade-check-*")
|
tempFile, err := os.CreateTemp(dir, "atsflare-server-upgrade-check-*")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("当前服务二进制目录不可写,无法升级: %v", err)
|
return fmt.Errorf("褰撳墠鏈嶅姟浜岃繘鍒剁洰褰曚笉鍙啓锛屾棤娉曞崌绾? %v", err)
|
||||||
}
|
}
|
||||||
tempPath := tempFile.Name()
|
tempPath := tempFile.Name()
|
||||||
if closeErr := tempFile.Close(); closeErr != nil {
|
if closeErr := tempFile.Close(); closeErr != nil {
|
||||||
_ = os.Remove(tempPath)
|
_ = os.Remove(tempPath)
|
||||||
return fmt.Errorf("校验服务升级目录失败: %v", closeErr)
|
return fmt.Errorf("鏍¢獙鏈嶅姟鍗囩骇鐩綍澶辫触: %v", closeErr)
|
||||||
}
|
}
|
||||||
if err = os.Remove(tempPath); err != nil {
|
if err = os.Remove(tempPath); err != nil {
|
||||||
return fmt.Errorf("清理升级校验文件失败: %v", err)
|
return fmt.Errorf("娓呯悊鍗囩骇鏍¢獙鏂囦欢澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeServerUpgrade(task *preparedServerUpgrade) error {
|
func executeServerUpgrade(task *preparedServerUpgrade) error {
|
||||||
|
recordServerUpgradeLog("info", fmt.Sprintf("Downloading automatic upgrade package for version: %s.", strings.TrimSpace(task.release.TagName)))
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
@@ -484,30 +504,26 @@ func executeServerUpgrade(task *preparedServerUpgrade) error {
|
|||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return fmt.Errorf("下载服务端升级包失败: %s", resp.Status)
|
return fmt.Errorf("涓嬭浇鏈嶅姟绔崌绾у寘澶辫触: %s", resp.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpPath := task.execPath + ".update"
|
recordServerUpgradeLog("info", "Download finished, validating binary version.")
|
||||||
tmpFile, err := os.OpenFile(tmpPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o755)
|
candidate, err := persistDownloadedServerBinary(ctx, task.execPath, task.release.TagName, resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if _, err = io.Copy(tmpFile, resp.Body); err != nil {
|
return executeServerBinaryCandidateUpgrade(candidate, "auto")
|
||||||
_ = tmpFile.Close()
|
|
||||||
_ = os.Remove(tmpPath)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = tmpFile.Close(); err != nil {
|
|
||||||
_ = os.Remove(tmpPath)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Info("server self-update starting", "from", strings.TrimSpace(common.Version), "to", task.release.TagName)
|
|
||||||
return serverBinaryUpgradeExecutor(task.execPath, tmpPath)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeManualServerUpgrade(task *manualServerBinaryCandidate) error {
|
func executeServerBinaryCandidateUpgrade(task *manualServerBinaryCandidate, source string) error {
|
||||||
slog.Info("server manual self-update starting", "from", strings.TrimSpace(task.CurrentVersion), "to", strings.TrimSpace(task.DetectedVersion))
|
recordServerUpgradeLog("info", fmt.Sprintf("Validated binary version: %s -> %s.", strings.TrimSpace(task.CurrentVersion), strings.TrimSpace(task.DetectedVersion)))
|
||||||
|
recordServerUpgradeLog("info", "Replacing executable and preparing restart.")
|
||||||
|
if source == "manual" {
|
||||||
|
slog.Info("server manual self-update starting", "from", strings.TrimSpace(task.CurrentVersion), "to", strings.TrimSpace(task.DetectedVersion))
|
||||||
|
} else {
|
||||||
|
slog.Info("server self-update starting", "from", strings.TrimSpace(task.CurrentVersion), "to", strings.TrimSpace(task.DetectedVersion))
|
||||||
|
}
|
||||||
|
markServerUpgradeSucceeded()
|
||||||
return serverBinaryUpgradeExecutor(task.ExecPath, task.TempPath)
|
return serverBinaryUpgradeExecutor(task.ExecPath, task.TempPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -691,14 +707,14 @@ func buildUploadedServerBinaryView(fileName string, currentVersion string, detec
|
|||||||
|
|
||||||
switch {
|
switch {
|
||||||
case !upgradeSupported:
|
case !upgradeSupported:
|
||||||
comparisonMessage = "当前服务版本不支持手动升级确认流程"
|
comparisonMessage = "褰撳墠鏈嶅姟鐗堟湰涓嶆敮鎸佹墜鍔ㄥ崌绾х‘璁ゆ祦绋?
|
||||||
case normalizeVersion(currentVersion) == normalizeVersion(detectedVersion):
|
case normalizeVersion(currentVersion) == normalizeVersion(detectedVersion):
|
||||||
comparisonMessage = "上传二进制与当前服务版本一致,无需升级"
|
comparisonMessage = "涓婁紶浜岃繘鍒朵笌褰撳墠鏈嶅姟鐗堟湰涓€鑷达紝鏃犻渶鍗囩骇"
|
||||||
case isVersionNewer(currentVersion, detectedVersion):
|
case isVersionNewer(currentVersion, detectedVersion):
|
||||||
hasUpdate = true
|
hasUpdate = true
|
||||||
comparisonMessage = fmt.Sprintf("检测到可升级版本:%s -> %s", strings.TrimSpace(currentVersion), strings.TrimSpace(detectedVersion))
|
comparisonMessage = fmt.Sprintf("妫€娴嬪埌鍙崌绾х増鏈細%s -> %s", strings.TrimSpace(currentVersion), strings.TrimSpace(detectedVersion))
|
||||||
default:
|
default:
|
||||||
comparisonMessage = "上传二进制版本不高于当前服务版本,已拒绝升级"
|
comparisonMessage = "涓婁紶浜岃繘鍒剁増鏈笉楂樹簬褰撳墠鏈嶅姟鐗堟湰锛屽凡鎷掔粷鍗囩骇"
|
||||||
}
|
}
|
||||||
|
|
||||||
return &UploadedServerBinary{
|
return &UploadedServerBinary{
|
||||||
@@ -729,21 +745,21 @@ func persistUploadedServerBinary(tempDir string, fileName string, reader io.Read
|
|||||||
}
|
}
|
||||||
tempFile, err := os.CreateTemp(tempDir, "atsflare-server-manual-upgrade-*"+suffix)
|
tempFile, err := os.CreateTemp(tempDir, "atsflare-server-manual-upgrade-*"+suffix)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("创建临时升级文件失败: %v", err)
|
return "", fmt.Errorf("鍒涘缓涓存椂鍗囩骇鏂囦欢澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
tempPath := tempFile.Name()
|
tempPath := tempFile.Name()
|
||||||
if _, err = io.Copy(tempFile, reader); err != nil {
|
if _, err = io.Copy(tempFile, reader); err != nil {
|
||||||
_ = tempFile.Close()
|
_ = tempFile.Close()
|
||||||
_ = os.Remove(tempPath)
|
_ = os.Remove(tempPath)
|
||||||
return "", fmt.Errorf("写入上传二进制失败: %v", err)
|
return "", fmt.Errorf("鍐欏叆涓婁紶浜岃繘鍒跺け璐? %v", err)
|
||||||
}
|
}
|
||||||
if err = tempFile.Close(); err != nil {
|
if err = tempFile.Close(); err != nil {
|
||||||
_ = os.Remove(tempPath)
|
_ = os.Remove(tempPath)
|
||||||
return "", fmt.Errorf("关闭临时升级文件失败: %v", err)
|
return "", fmt.Errorf("鍏抽棴涓存椂鍗囩骇鏂囦欢澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
if err = os.Chmod(tempPath, 0o755); err != nil && runtime.GOOS != "windows" {
|
if err = os.Chmod(tempPath, 0o755); err != nil && runtime.GOOS != "windows" {
|
||||||
_ = os.Remove(tempPath)
|
_ = os.Remove(tempPath)
|
||||||
return "", fmt.Errorf("设置临时升级文件权限失败: %v", err)
|
return "", fmt.Errorf("璁剧疆涓存椂鍗囩骇鏂囦欢鏉冮檺澶辫触: %v", err)
|
||||||
}
|
}
|
||||||
return tempPath, nil
|
return tempPath, nil
|
||||||
}
|
}
|
||||||
@@ -756,11 +772,11 @@ func detectUploadedServerBinaryVersion(ctx context.Context, filePath string) (st
|
|||||||
cmd := exec.CommandContext(commandCtx, filePath, "--version")
|
cmd := exec.CommandContext(commandCtx, filePath, "--version")
|
||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("检查上传二进制版本失败: %w: %s", err, strings.TrimSpace(string(output)))
|
return "", fmt.Errorf("妫€鏌ヤ笂浼犱簩杩涘埗鐗堟湰澶辫触: %w: %s", err, strings.TrimSpace(string(output)))
|
||||||
}
|
}
|
||||||
version := strings.TrimSpace(string(output))
|
version := strings.TrimSpace(string(output))
|
||||||
if version == "" {
|
if version == "" {
|
||||||
return "", fmt.Errorf("上传二进制未返回有效版本号")
|
return "", fmt.Errorf("涓婁紶浜岃繘鍒舵湭杩斿洖鏈夋晥鐗堟湰鍙?)
|
||||||
}
|
}
|
||||||
for _, line := range strings.Split(version, "\n") {
|
for _, line := range strings.Split(version, "\n") {
|
||||||
trimmed := strings.TrimSpace(line)
|
trimmed := strings.TrimSpace(line)
|
||||||
@@ -768,7 +784,42 @@ func detectUploadedServerBinaryVersion(ctx context.Context, filePath string) (st
|
|||||||
return trimmed, nil
|
return trimmed, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "", fmt.Errorf("上传二进制未返回有效版本号")
|
return "", fmt.Errorf("涓婁紶浜岃繘鍒舵湭杩斿洖鏈夋晥鐗堟湰鍙?)
|
||||||
|
}
|
||||||
|
|
||||||
|
func persistDownloadedServerBinary(ctx context.Context, execPath string, releaseTag string, reader io.Reader) (*manualServerBinaryCandidate, error) {
|
||||||
|
fileName := serverAssetName(runtime.GOOS, runtime.GOARCH)
|
||||||
|
tempPath, err := persistUploadedServerBinary(filepath.Dir(execPath), fileName, reader)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
detectedVersion, err := detectUploadedServerBinaryVersion(ctx, tempPath)
|
||||||
|
if err != nil {
|
||||||
|
_ = os.Remove(tempPath)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
recordServerUpgradeLog("info", fmt.Sprintf("Detected downloaded binary version: %s.", strings.TrimSpace(detectedVersion)))
|
||||||
|
|
||||||
|
if normalizeVersion(detectedVersion) != normalizeVersion(releaseTag) {
|
||||||
|
_ = os.Remove(tempPath)
|
||||||
|
return nil, fmt.Errorf("涓嬭浇鍖呯増鏈牎楠屽け璐ワ細release=%s锛宐inary=%s", strings.TrimSpace(releaseTag), strings.TrimSpace(detectedVersion))
|
||||||
|
}
|
||||||
|
|
||||||
|
info := buildUploadedServerBinaryView(fileName, common.Version, detectedVersion, time.Now())
|
||||||
|
if !info.ReadyToUpgrade {
|
||||||
|
_ = os.Remove(tempPath)
|
||||||
|
return nil, fmt.Errorf(info.ComparisonMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &manualServerBinaryCandidate{
|
||||||
|
FileName: fileName,
|
||||||
|
DetectedVersion: detectedVersion,
|
||||||
|
CurrentVersion: strings.TrimSpace(common.Version),
|
||||||
|
TempPath: tempPath,
|
||||||
|
ExecPath: execPath,
|
||||||
|
UploadedAt: time.Now(),
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func cleanupManualServerBinaryCandidateLocked() {
|
func cleanupManualServerBinaryCandidateLocked() {
|
||||||
@@ -791,6 +842,58 @@ func normalizeVersion(version string) string {
|
|||||||
return strings.TrimSpace(strings.TrimPrefix(version, "v"))
|
return strings.TrimSpace(strings.TrimPrefix(version, "v"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func snapshotServerUpgradeState() (bool, string, []ServerUpgradeLogRecord) {
|
||||||
|
serverUpgradeState.Lock()
|
||||||
|
defer serverUpgradeState.Unlock()
|
||||||
|
|
||||||
|
status := strings.TrimSpace(serverUpgradeState.status)
|
||||||
|
if status == "" {
|
||||||
|
status = "idle"
|
||||||
|
}
|
||||||
|
logs := make([]ServerUpgradeLogRecord, len(serverUpgradeState.logs))
|
||||||
|
copy(logs, serverUpgradeState.logs)
|
||||||
|
return serverUpgradeState.inProgress, status, logs
|
||||||
|
}
|
||||||
|
|
||||||
|
func resetServerUpgradeLogsLocked() {
|
||||||
|
serverUpgradeState.logs = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func appendServerUpgradeLogLocked(level string, message string) {
|
||||||
|
serverUpgradeState.logs = append(serverUpgradeState.logs, ServerUpgradeLogRecord{
|
||||||
|
Level: strings.TrimSpace(level),
|
||||||
|
Message: strings.TrimSpace(message),
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
})
|
||||||
|
if len(serverUpgradeState.logs) > 100 {
|
||||||
|
serverUpgradeState.logs = append([]ServerUpgradeLogRecord(nil), serverUpgradeState.logs[len(serverUpgradeState.logs)-100:]...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func recordServerUpgradeLog(level string, message string) {
|
||||||
|
serverUpgradeState.Lock()
|
||||||
|
appendServerUpgradeLogLocked(level, message)
|
||||||
|
serverUpgradeState.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func markServerUpgradeSucceeded() {
|
||||||
|
serverUpgradeState.Lock()
|
||||||
|
serverUpgradeState.inProgress = false
|
||||||
|
serverUpgradeState.status = "succeeded"
|
||||||
|
appendServerUpgradeLogLocked("info", "Upgrade binary is ready; server restart will begin.")
|
||||||
|
serverUpgradeState.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func recordServerUpgradeFailure(err error) {
|
||||||
|
serverUpgradeState.Lock()
|
||||||
|
serverUpgradeState.inProgress = false
|
||||||
|
serverUpgradeState.status = "failed"
|
||||||
|
if err != nil {
|
||||||
|
appendServerUpgradeLogLocked("error", err.Error())
|
||||||
|
}
|
||||||
|
serverUpgradeState.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
func UpdateHTTPClientForTest() *http.Client {
|
func UpdateHTTPClientForTest() *http.Client {
|
||||||
return updateHTTPClient
|
return updateHTTPClient
|
||||||
}
|
}
|
||||||
@@ -821,3 +924,6 @@ func SetServerUpgradeDispatchDelayForTest(delay time.Duration) {
|
|||||||
}
|
}
|
||||||
serverUpgradeDispatchDelay = delay
|
serverUpgradeDispatchDelay = delay
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,17 +4,28 @@ import (
|
|||||||
"atsflare/common"
|
"atsflare/common"
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type roundTripFunc func(req *http.Request) (*http.Response, error)
|
||||||
|
|
||||||
|
func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
return f(req)
|
||||||
|
}
|
||||||
|
|
||||||
func resetServerUpgradeTestState(t *testing.T) {
|
func resetServerUpgradeTestState(t *testing.T) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
serverUpgradeState.Lock()
|
serverUpgradeState.Lock()
|
||||||
serverUpgradeState.inProgress = false
|
serverUpgradeState.inProgress = false
|
||||||
|
serverUpgradeState.status = ""
|
||||||
|
serverUpgradeState.logs = nil
|
||||||
serverUpgradeState.Unlock()
|
serverUpgradeState.Unlock()
|
||||||
manualServerBinaryState.Lock()
|
manualServerBinaryState.Lock()
|
||||||
cleanupManualServerBinaryCandidateLocked()
|
cleanupManualServerBinaryCandidateLocked()
|
||||||
@@ -282,3 +293,113 @@ func TestConfirmManualServerUpgrade(t *testing.T) {
|
|||||||
t.Fatal("expected manual upgrade executor to be called")
|
t.Fatal("expected manual upgrade executor to be called")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBuildLatestServerReleaseViewIncludesUpgradeLogs(t *testing.T) {
|
||||||
|
originalVersion := common.Version
|
||||||
|
common.Version = "v0.4.0"
|
||||||
|
t.Cleanup(func() {
|
||||||
|
common.Version = originalVersion
|
||||||
|
resetServerUpgradeTestState(t)
|
||||||
|
})
|
||||||
|
|
||||||
|
serverUpgradeState.Lock()
|
||||||
|
serverUpgradeState.inProgress = true
|
||||||
|
serverUpgradeState.status = "running"
|
||||||
|
serverUpgradeState.logs = []ServerUpgradeLogRecord{
|
||||||
|
{
|
||||||
|
Level: "info",
|
||||||
|
Message: "download started",
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
serverUpgradeState.Unlock()
|
||||||
|
|
||||||
|
view := buildLatestServerReleaseView(&githubReleaseResponse{
|
||||||
|
TagName: "v0.5.0",
|
||||||
|
}, ReleaseChannelStable)
|
||||||
|
|
||||||
|
if view.UpgradeStatus != "running" {
|
||||||
|
t.Fatalf("expected upgrade status to be running, got %s", view.UpgradeStatus)
|
||||||
|
}
|
||||||
|
if len(view.UpgradeLogs) != 1 {
|
||||||
|
t.Fatalf("expected one upgrade log, got %d", len(view.UpgradeLogs))
|
||||||
|
}
|
||||||
|
if view.UpgradeLogs[0].Message != "download started" {
|
||||||
|
t.Fatalf("unexpected upgrade log message: %s", view.UpgradeLogs[0].Message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestScheduleServerUpgradeUsesDownloadedBinaryValidation(t *testing.T) {
|
||||||
|
originalVersion := common.Version
|
||||||
|
originalClient := UpdateHTTPClientForTest()
|
||||||
|
originalExecutor := ServerBinaryUpgradeExecutorForTest()
|
||||||
|
originalDelay := ServerUpgradeDispatchDelayForTest()
|
||||||
|
common.Version = "v0.4.0"
|
||||||
|
called := make(chan string, 1)
|
||||||
|
|
||||||
|
SetUpdateHTTPClientForTest(&http.Client{
|
||||||
|
Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
|
||||||
|
switch req.URL.String() {
|
||||||
|
case "https://api.github.com/repos/Rain-kl/ATSFlare/releases/latest":
|
||||||
|
return &http.Response{
|
||||||
|
StatusCode: http.StatusOK,
|
||||||
|
Header: make(http.Header),
|
||||||
|
Body: io.NopCloser(strings.NewReader(`{
|
||||||
|
"tag_name":"v0.5.0",
|
||||||
|
"body":"release notes",
|
||||||
|
"html_url":"https://github.com/Rain-kl/ATSFlare/releases/tag/v0.5.0",
|
||||||
|
"published_at":"2026-03-11T00:00:00Z",
|
||||||
|
"assets":[{"name":"atsflare-server-` + runtime.GOOS + `-` + runtime.GOARCH + `","browser_download_url":"https://downloads.example.com/atsflare-server"}]
|
||||||
|
}`)),
|
||||||
|
}, nil
|
||||||
|
case "https://downloads.example.com/atsflare-server":
|
||||||
|
_, content := fakeServerBinaryFixture("v0.5.0")
|
||||||
|
return &http.Response{
|
||||||
|
StatusCode: http.StatusOK,
|
||||||
|
Header: make(http.Header),
|
||||||
|
Body: io.NopCloser(bytes.NewReader(content)),
|
||||||
|
}, nil
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected request url: %s", req.URL.String())
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
SetServerBinaryUpgradeExecutorForTest(func(execPath string, tempPath string) error {
|
||||||
|
called <- tempPath
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
SetServerUpgradeDispatchDelayForTest(0)
|
||||||
|
t.Cleanup(func() {
|
||||||
|
common.Version = originalVersion
|
||||||
|
SetUpdateHTTPClientForTest(originalClient)
|
||||||
|
SetServerBinaryUpgradeExecutorForTest(originalExecutor)
|
||||||
|
SetServerUpgradeDispatchDelayForTest(originalDelay)
|
||||||
|
resetServerUpgradeTestState(t)
|
||||||
|
})
|
||||||
|
|
||||||
|
release, err := ScheduleServerUpgrade("stable")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("expected schedule to succeed: %v", err)
|
||||||
|
}
|
||||||
|
if !release.InProgress {
|
||||||
|
t.Fatal("expected release to report in-progress upgrade")
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case tempPath := <-called:
|
||||||
|
if tempPath == "" {
|
||||||
|
t.Fatal("expected upgrade executor to receive temp path")
|
||||||
|
}
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Fatal("expected automatic upgrade executor to be called")
|
||||||
|
}
|
||||||
|
|
||||||
|
_, status, logs := snapshotServerUpgradeState()
|
||||||
|
if status != "succeeded" {
|
||||||
|
t.Fatalf("expected succeeded status after executor call, got %s", status)
|
||||||
|
}
|
||||||
|
if len(logs) == 0 {
|
||||||
|
t.Fatal("expected upgrade logs to be recorded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,7 +9,11 @@ import {LoadingState} from '@/components/feedback/loading-state';
|
|||||||
import {AppCard} from '@/components/ui/app-card';
|
import {AppCard} from '@/components/ui/app-card';
|
||||||
import {AppModal} from '@/components/ui/app-modal';
|
import {AppModal} from '@/components/ui/app-modal';
|
||||||
import {StatusBadge} from '@/components/ui/status-badge';
|
import {StatusBadge} from '@/components/ui/status-badge';
|
||||||
import type {LatestReleaseInfo, ReleaseChannel, UploadedServerBinaryInfo,} from '@/features/update/types';
|
import type {
|
||||||
|
LatestReleaseInfo,
|
||||||
|
ReleaseChannel,
|
||||||
|
UploadedServerBinaryInfo,
|
||||||
|
} from '@/features/update/types';
|
||||||
import {
|
import {
|
||||||
PrimaryButton,
|
PrimaryButton,
|
||||||
ResourceField,
|
ResourceField,
|
||||||
@@ -93,6 +97,7 @@ export function VersionUpgradeModal({
|
|||||||
uploadedBinary?.ready_to_upgrade && uploadedBinary.upload_token,
|
uploadedBinary?.ready_to_upgrade && uploadedBinary.upload_token,
|
||||||
);
|
);
|
||||||
const showConfirmManualUpgradeAction = canConfirmManualUpgrade;
|
const showConfirmManualUpgradeAction = canConfirmManualUpgrade;
|
||||||
|
const upgradeLogs = release?.upgrade_logs ?? [];
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isOpen) {
|
if (!isOpen) {
|
||||||
@@ -241,6 +246,61 @@ export function VersionUpgradeModal({
|
|||||||
</AppCard>
|
</AppCard>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
|
{release ? (
|
||||||
|
<AppCard
|
||||||
|
title="升级日志"
|
||||||
|
description="展示当前自动升级任务的下载、校验与替换进度。"
|
||||||
|
>
|
||||||
|
{upgradeLogs.length > 0 ? (
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex flex-wrap items-center gap-3">
|
||||||
|
<StatusBadge
|
||||||
|
label={
|
||||||
|
release.upgrade_status === 'failed'
|
||||||
|
? '升级失败'
|
||||||
|
: release.upgrade_status === 'succeeded'
|
||||||
|
? '准备重启'
|
||||||
|
: release.in_progress
|
||||||
|
? '升级中'
|
||||||
|
: '空闲'
|
||||||
|
}
|
||||||
|
variant={
|
||||||
|
release.upgrade_status === 'failed'
|
||||||
|
? 'danger'
|
||||||
|
: release.in_progress
|
||||||
|
? 'warning'
|
||||||
|
: release.upgrade_status === 'succeeded'
|
||||||
|
? 'success'
|
||||||
|
: 'info'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="max-h-72 space-y-2 overflow-y-auto rounded-2xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-4">
|
||||||
|
{upgradeLogs.map((log, index) => (
|
||||||
|
<div
|
||||||
|
key={`${log.created_at}-${index}`}
|
||||||
|
className="rounded-2xl border border-[var(--border-default)] bg-[var(--surface-panel)] px-4 py-3"
|
||||||
|
>
|
||||||
|
<div className="flex flex-wrap items-center justify-between gap-2 text-xs text-[var(--foreground-secondary)]">
|
||||||
|
<span>{formatDateTime(log.created_at)}</span>
|
||||||
|
<span className="uppercase">{log.level || 'info'}</span>
|
||||||
|
</div>
|
||||||
|
<p className="mt-2 text-sm leading-6 whitespace-pre-wrap text-[var(--foreground-primary)]">
|
||||||
|
{log.message}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<EmptyState
|
||||||
|
title="暂无升级日志"
|
||||||
|
description="开始自动升级后,这里会滚动展示后端返回的执行日志。"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</AppCard>
|
||||||
|
) : null}
|
||||||
|
|
||||||
{canUpgrade ? (
|
{canUpgrade ? (
|
||||||
<AppCard
|
<AppCard
|
||||||
title="手动升级"
|
title="手动升级"
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
export type ReleaseChannel = 'stable' | 'preview';
|
export type ReleaseChannel = 'stable' | 'preview';
|
||||||
|
|
||||||
|
export interface UpgradeLogItem {
|
||||||
|
level: string;
|
||||||
|
message: string;
|
||||||
|
created_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface LatestReleaseInfo {
|
export interface LatestReleaseInfo {
|
||||||
tag_name: string;
|
tag_name: string;
|
||||||
body: string;
|
body: string;
|
||||||
@@ -11,6 +17,8 @@ export interface LatestReleaseInfo {
|
|||||||
has_update: boolean;
|
has_update: boolean;
|
||||||
upgrade_supported: boolean;
|
upgrade_supported: boolean;
|
||||||
in_progress: boolean;
|
in_progress: boolean;
|
||||||
|
upgrade_status: 'idle' | 'running' | 'succeeded' | 'failed' | string;
|
||||||
|
upgrade_logs: UpgradeLogItem[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UploadedServerBinaryInfo {
|
export interface UploadedServerBinaryInfo {
|
||||||
|
|||||||
Reference in New Issue
Block a user