From bee933dd72fcdd6675927cc8ad45e3d891f469fd Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Wed, 30 Jul 2025 11:59:41 +0800 Subject: [PATCH] fix(AppUpdater): simplify error logging and update version check logic (#8656) * fix(AppUpdater): simplify error logging and update version check logic - Updated error logging to use a more concise format. - Changed logging messages for update events to be more consistent. - Modified the update check logic to return null when no update is available. - Enhanced the app initialization hook to include update availability in the state dispatch. * fix(useAppInit): simplify update state dispatch logic by removing update availability check --- src/main/services/AppUpdater.ts | 13 ++++--------- src/renderer/src/pages/settings/AboutSettings.tsx | 5 +---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index 4c565b4d2b..1836759a13 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -31,17 +31,12 @@ export default class AppUpdater { } autoUpdater.on('error', (error) => { - // 简单记录错误信息和时间戳 - logger.error('更新异常', { - message: error.message, - stack: error.stack, - time: new Date().toISOString() - }) + logger.error('update error', error as Error) mainWindow.webContents.send(IpcChannel.UpdateError, error) }) autoUpdater.on('update-available', (releaseInfo: UpdateInfo) => { - logger.info('检测到新版本', releaseInfo) + logger.info('update available', releaseInfo) mainWindow.webContents.send(IpcChannel.UpdateAvailable, releaseInfo) }) @@ -65,7 +60,7 @@ export default class AppUpdater { autoUpdater.on('update-downloaded', (releaseInfo: UpdateInfo) => { mainWindow.webContents.send(IpcChannel.UpdateDownloaded, releaseInfo) this.releaseInfo = releaseInfo - logger.info('下载完成', releaseInfo) + logger.info('update downloaded', releaseInfo) }) if (isWin) { @@ -242,7 +237,7 @@ export default class AppUpdater { return { currentVersion: this.autoUpdater.currentVersion, - updateInfo: this.updateCheckResult?.updateInfo + updateInfo: this.updateCheckResult?.isUpdateAvailable ? this.updateCheckResult?.updateInfo : null } } catch (error) { logger.error('Failed to check for update:', error as Error) diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx index a97cfa7d74..5ebc2ae4a9 100644 --- a/src/renderer/src/pages/settings/AboutSettings.tsx +++ b/src/renderer/src/pages/settings/AboutSettings.tsx @@ -96,9 +96,6 @@ const AboutSettings: FC = () => { }) } - // don't support downgrade, so we only check if the version is different - const hasNewVersion = update?.info?.version && version ? update.info.version !== version : false - const currentChannelByVersion = [ { pattern: `-${UpgradeChannel.BETA}.`, channel: UpgradeChannel.BETA }, @@ -267,7 +264,7 @@ const AboutSettings: FC = () => { )} - {hasNewVersion && update.info && ( + {update.info && update.available && (