mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-07-11 23:42:22 +08:00
🐛 fix(update): 修复 Windows 更新安装卡住并将安装包落到应用目录
- Windows 安装前预检当前安装目录写权限,避免脚本启动后主进程先退出 - 已下载更新补充打开安装目录入口,便于手动执行安装包 - 更新工作区优先改为当前应用运行目录,并补充回归测试与多语言文案
This commit is contained in:
@@ -1709,6 +1709,7 @@ function App() {
|
||||
lastUpdateInfo,
|
||||
markUpdateProgressDismissed,
|
||||
muteLatestUpdate,
|
||||
openDownloadedUpdateDirectory,
|
||||
setIsAboutOpen,
|
||||
showUpdateDownloadProgress,
|
||||
updateChannel,
|
||||
@@ -4972,7 +4973,12 @@ function App() {
|
||||
<Button key="check" icon={<CloudDownloadOutlined />} onClick={() => checkForUpdates(false)}>{t('app.about.action.check_updates')}</Button>,
|
||||
<Button key="close" onClick={() => setIsAboutOpen(false)}>{t('common.close')}</Button>,
|
||||
lastUpdateInfo?.hasUpdate && !isLatestUpdateDownloaded && !isBackgroundProgressForLatestUpdate ? (
|
||||
<Button key="download" type="primary" icon={<DownloadOutlined />} onClick={() => downloadUpdate(lastUpdateInfo, false)}>{t('app.about.action.download_update')}</Button>
|
||||
<Button key="download" type="primary" icon={<DownloadOutlined />} onClick={() => downloadUpdate(lastUpdateInfo, false)}>{t('app.about.action.download_update')}</Button>
|
||||
) : null,
|
||||
isLatestUpdateDownloaded ? (
|
||||
<Button key="open-install-directory" onClick={openDownloadedUpdateDirectory}>
|
||||
{t('app.about.action.open_install_directory')}
|
||||
</Button>
|
||||
) : null,
|
||||
isLatestUpdateDownloaded ? (
|
||||
<Button key="install-direct" type="primary" icon={<DownloadOutlined />} onClick={handleInstallFromProgress}>
|
||||
@@ -6006,6 +6012,9 @@ function App() {
|
||||
</Button>
|
||||
] : (updateDownloadProgress.status === 'done' ? [
|
||||
<Button key="close" onClick={hideUpdateDownloadProgress}>{t('common.close')}</Button>,
|
||||
<Button key="open-install-directory" onClick={openDownloadedUpdateDirectory}>
|
||||
{t('app.about.action.open_install_directory')}
|
||||
</Button>,
|
||||
<Button key="install" type="primary" onClick={handleInstallFromProgress}>
|
||||
{t('app.about.action.install_update')}
|
||||
</Button>
|
||||
|
||||
@@ -183,4 +183,34 @@ describe('useAppUpdateManager', () => {
|
||||
expect(hook?.updateChannel).toBe('dev');
|
||||
expect(hook?.lastUpdateInfo?.channel).toBe('dev');
|
||||
});
|
||||
|
||||
it('opens the downloaded update directory when a package is already downloaded', async () => {
|
||||
backendApp.CheckForUpdates.mockResolvedValue({
|
||||
success: true,
|
||||
data: {
|
||||
hasUpdate: true,
|
||||
currentVersion: '0.8.1',
|
||||
latestVersion: '0.8.2',
|
||||
downloaded: true,
|
||||
assetSize: 1024,
|
||||
},
|
||||
});
|
||||
backendApp.OpenDownloadedUpdateDirectory.mockResolvedValue({
|
||||
success: true,
|
||||
message: 'opened-install-directory',
|
||||
});
|
||||
|
||||
renderHook();
|
||||
|
||||
await act(async () => {
|
||||
await hook?.checkForUpdates(false);
|
||||
});
|
||||
|
||||
await act(async () => {
|
||||
await hook?.openDownloadedUpdateDirectory();
|
||||
});
|
||||
|
||||
expect(backendApp.OpenDownloadedUpdateDirectory).toHaveBeenCalledTimes(1);
|
||||
expect(messageApi.success).toHaveBeenCalledWith('opened-install-directory');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -242,6 +242,20 @@ export const useAppUpdateManager = ({
|
||||
hideUpdateDownloadProgress();
|
||||
}, [hideUpdateDownloadProgress, lastUpdateInfo, lastUpdateKey, t, updateDownloadProgress.status]);
|
||||
|
||||
const openDownloadedUpdateDirectory = useCallback(async () => {
|
||||
const backendApp = (window as any).go?.app?.App;
|
||||
if (typeof backendApp?.OpenDownloadedUpdateDirectory !== 'function') {
|
||||
void message.error(t('app.about.message.open_install_directory_failed_with_error', { error: t('common.unknown') }));
|
||||
return;
|
||||
}
|
||||
const res = await backendApp.OpenDownloadedUpdateDirectory();
|
||||
if (!res?.success) {
|
||||
void message.error(t('app.about.message.open_install_directory_failed_with_error', { error: res?.message || t('common.unknown') }));
|
||||
return;
|
||||
}
|
||||
void message.success(res?.message || t('app.about.message.install_directory_opened_manual_replace'));
|
||||
}, [t]);
|
||||
|
||||
const checkForUpdates = useCallback(async (silent: boolean) => {
|
||||
if (updateCheckInFlightRef.current) return;
|
||||
updateCheckInFlightRef.current = true;
|
||||
@@ -523,6 +537,7 @@ export const useAppUpdateManager = ({
|
||||
lastUpdateInfo,
|
||||
markUpdateProgressDismissed,
|
||||
muteLatestUpdate,
|
||||
openDownloadedUpdateDirectory,
|
||||
setIsAboutOpen,
|
||||
showUpdateDownloadProgress,
|
||||
updateChannel,
|
||||
|
||||
@@ -34,10 +34,12 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
updateFetchLatestRelease = fetchLatestRelease
|
||||
updateFetchDevRelease = fetchDevRelease
|
||||
updateFetchReleaseSHA256 = fetchReleaseSHA256
|
||||
updateLogCheckError = func(err error) { logger.Error(err, "检查更新失败") }
|
||||
updateFetchLatestRelease = fetchLatestRelease
|
||||
updateFetchDevRelease = fetchDevRelease
|
||||
updateFetchReleaseSHA256 = fetchReleaseSHA256
|
||||
updateLogCheckError = func(err error) { logger.Error(err, "检查更新失败") }
|
||||
updateResolveInstallTarget = resolveUpdateInstallTarget
|
||||
updateLaunchInstallScript = launchUpdateScript
|
||||
)
|
||||
|
||||
type updateState struct {
|
||||
@@ -244,7 +246,18 @@ func (a *App) InstallUpdateAndRestart() connection.QueryResult {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("app.update.backend.message.no_downloaded_package", nil)}
|
||||
}
|
||||
|
||||
if err := launchUpdateScript(staged); err != nil {
|
||||
if stdRuntime.GOOS == "windows" {
|
||||
if err := ensureWindowsUpdateTargetWritable(updateResolveInstallTarget()); err != nil {
|
||||
return connection.QueryResult{
|
||||
Success: false,
|
||||
Message: a.appText("app.update.backend.message.install_launch_failed", map[string]any{
|
||||
"detail": a.localizedUpdateError(err),
|
||||
}),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if err := updateLaunchInstallScript(staged); err != nil {
|
||||
logger.Error(err, "启动更新脚本失败")
|
||||
detail := a.localizedUpdateError(err)
|
||||
msg := a.appText("app.update.backend.message.install_launch_failed", map[string]any{"detail": detail})
|
||||
@@ -956,8 +969,7 @@ func resolveLegacyUpdateWorkspaceDir() string {
|
||||
}
|
||||
|
||||
func resolveUpdateWorkspaceDir(version string) string {
|
||||
// 默认使用系统临时目录作为更新工作区,避免目录权限与锁冲突。
|
||||
// macOS 用户要求更新包默认保存在桌面:Desktop/GoNavi-<version>/。
|
||||
// macOS 更新包继续保存在桌面版本目录根级,方便用户直接处理 DMG。
|
||||
if stdRuntime.GOOS == "darwin" {
|
||||
homeDir, err := os.UserHomeDir()
|
||||
if err == nil && strings.TrimSpace(homeDir) != "" {
|
||||
@@ -967,6 +979,16 @@ func resolveUpdateWorkspaceDir(version string) string {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Windows / Linux 更新包优先落到当前应用运行目录,方便用户直接找到下载产物。
|
||||
targetPath := strings.TrimSpace(updateResolveInstallTarget())
|
||||
if targetPath != "" {
|
||||
targetDir := strings.TrimSpace(filepath.Dir(targetPath))
|
||||
if targetDir != "" && targetDir != "." {
|
||||
return targetDir
|
||||
}
|
||||
}
|
||||
|
||||
return resolveLegacyUpdateWorkspaceDir()
|
||||
}
|
||||
|
||||
@@ -1094,6 +1116,33 @@ func resolveUpdateInstallTarget() string {
|
||||
return exePath
|
||||
}
|
||||
|
||||
func ensureWindowsUpdateTargetWritable(targetExe string) error {
|
||||
targetExe = strings.TrimSpace(targetExe)
|
||||
targetDir := strings.TrimSpace(filepath.Dir(targetExe))
|
||||
if targetExe == "" || targetDir == "" || targetDir == "." {
|
||||
return localizedUpdateError{key: "app.update.backend.error.install_target_unresolved"}
|
||||
}
|
||||
|
||||
probePath := filepath.Join(targetDir, fmt.Sprintf(".gonavi-update-write-probe-%d.tmp", time.Now().UnixNano()))
|
||||
file, err := os.OpenFile(probePath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o600)
|
||||
if err != nil {
|
||||
return localizedUpdateError{
|
||||
key: "app.update.backend.error.install_target_not_writable",
|
||||
params: map[string]any{
|
||||
"path": targetDir,
|
||||
"detail": err.Error(),
|
||||
},
|
||||
}
|
||||
}
|
||||
if closeErr := file.Close(); closeErr != nil {
|
||||
logger.Warnf("关闭 Windows 更新写入探针失败:%v", closeErr)
|
||||
}
|
||||
if removeErr := os.Remove(probePath); removeErr != nil && !errors.Is(removeErr, os.ErrNotExist) {
|
||||
logger.Warnf("清理 Windows 更新写入探针失败:%v", removeErr)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) emitUpdateDownloadProgress(status string, downloaded, total int64, message string) {
|
||||
if a.ctx == nil {
|
||||
return
|
||||
|
||||
@@ -340,6 +340,87 @@ func TestDownloadUpdateUsesCurrentLanguageForBackendMessage(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureWindowsUpdateTargetWritableAcceptsWritableDirectory(t *testing.T) {
|
||||
if stdRuntime.GOOS != "windows" {
|
||||
t.Skip("windows-only update target validation")
|
||||
}
|
||||
|
||||
target := filepath.Join(t.TempDir(), "GoNavi.exe")
|
||||
if err := ensureWindowsUpdateTargetWritable(target); err != nil {
|
||||
t.Fatalf("ensureWindowsUpdateTargetWritable returned error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallUpdateAndRestartFailsBeforeLaunchWhenWindowsTargetDirIsNotWritable(t *testing.T) {
|
||||
if stdRuntime.GOOS != "windows" {
|
||||
t.Skip("windows-only update target validation")
|
||||
}
|
||||
|
||||
stagedDir := t.TempDir()
|
||||
assetPath := filepath.Join(stagedDir, "GoNavi-0.8.2-Windows-Amd64.exe")
|
||||
if err := os.WriteFile(assetPath, []byte("12345678"), 0o644); err != nil {
|
||||
t.Fatalf("WriteFile returned error: %v", err)
|
||||
}
|
||||
|
||||
app := NewApp()
|
||||
app.updateState.staged = &stagedUpdate{
|
||||
Channel: updateChannelLatest,
|
||||
Version: "0.8.2",
|
||||
AssetName: filepath.Base(assetPath),
|
||||
FilePath: assetPath,
|
||||
StagedDir: stagedDir,
|
||||
}
|
||||
|
||||
originalResolveInstallTarget := updateResolveInstallTarget
|
||||
originalLaunchInstallScript := updateLaunchInstallScript
|
||||
t.Cleanup(func() {
|
||||
updateResolveInstallTarget = originalResolveInstallTarget
|
||||
updateLaunchInstallScript = originalLaunchInstallScript
|
||||
})
|
||||
|
||||
updateResolveInstallTarget = func() string {
|
||||
return filepath.Join(stagedDir, "missing", "GoNavi.exe")
|
||||
}
|
||||
|
||||
launched := false
|
||||
updateLaunchInstallScript = func(*stagedUpdate) error {
|
||||
launched = true
|
||||
return nil
|
||||
}
|
||||
|
||||
result := app.InstallUpdateAndRestart()
|
||||
if result.Success {
|
||||
t.Fatalf("expected InstallUpdateAndRestart to fail, got %#v", result)
|
||||
}
|
||||
if launched {
|
||||
t.Fatal("expected launch script to be skipped when install target is not writable")
|
||||
}
|
||||
if !strings.Contains(result.Message, "not writable") {
|
||||
t.Fatalf("expected install target write failure in message, got %q", result.Message)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveUpdateWorkspaceDirPrefersCurrentInstallDirectory(t *testing.T) {
|
||||
if stdRuntime.GOOS == "darwin" {
|
||||
t.Skip("macOS keeps update downloads on Desktop")
|
||||
}
|
||||
|
||||
targetDir := t.TempDir()
|
||||
originalResolveInstallTarget := updateResolveInstallTarget
|
||||
t.Cleanup(func() {
|
||||
updateResolveInstallTarget = originalResolveInstallTarget
|
||||
})
|
||||
|
||||
updateResolveInstallTarget = func() string {
|
||||
return filepath.Join(targetDir, "GoNavi.exe")
|
||||
}
|
||||
|
||||
got := resolveUpdateWorkspaceDir("0.8.2")
|
||||
if got != targetDir {
|
||||
t.Fatalf("expected workspace dir %q, got %q", targetDir, got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpectedAssetNameForExecutableUsesLinuxWebKit41Suffix(t *testing.T) {
|
||||
assetName, err := expectedAssetNameForExecutable(
|
||||
"linux",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS enthält kein Updatepaket für die aktuelle Plattform",
|
||||
"app.update.backend.error.sha256sums_download_failed": "SHA256SUMS konnte nicht heruntergeladen werden: HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release stellt keine SHA256SUMS bereit",
|
||||
"app.update.backend.error.install_target_not_writable": "Das aktuelle Installationsverzeichnis ist nicht beschreibbar: {{path}} ({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "Das aktuelle Installationsverzeichnis konnte nicht ermittelt werden",
|
||||
"app.update.backend.error.update_package_not_found": "Updatepaket nicht gefunden: {{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "Auf das App-Verzeichnis kann nicht zugegriffen werden: {{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "Das aktuelle App-Verzeichnis kann nicht bestimmt werden, daher kann das Update nicht heruntergeladen werden",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS does not include the current platform update package",
|
||||
"app.update.backend.error.sha256sums_download_failed": "Failed to download SHA256SUMS: HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release did not provide SHA256SUMS",
|
||||
"app.update.backend.error.install_target_not_writable": "The current install directory is not writable: {{path}} ({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "Unable to determine the current install directory",
|
||||
"app.update.backend.error.update_package_not_found": "Update package not found: {{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "Cannot access app directory: {{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "Cannot determine the current app directory, so the update cannot be downloaded",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS に現在のプラットフォーム用更新パッケージが含まれていません",
|
||||
"app.update.backend.error.sha256sums_download_failed": "SHA256SUMS のダウンロードに失敗しました: HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release に SHA256SUMS が提供されていません",
|
||||
"app.update.backend.error.install_target_not_writable": "現在のインストール先ディレクトリに書き込めません: {{path}} ({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "現在のインストール先ディレクトリを特定できません",
|
||||
"app.update.backend.error.update_package_not_found": "更新パッケージが見つかりません: {{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "アプリディレクトリにアクセスできません: {{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "現在のアプリディレクトリを特定できないため、更新をダウンロードできません",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS не содержит пакет обновления для текущей платформы",
|
||||
"app.update.backend.error.sha256sums_download_failed": "Не удалось скачать SHA256SUMS: HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release не предоставляет SHA256SUMS",
|
||||
"app.update.backend.error.install_target_not_writable": "Текущий каталог установки недоступен для записи: {{path}} ({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "Не удалось определить текущий каталог установки",
|
||||
"app.update.backend.error.update_package_not_found": "Пакет обновления не найден: {{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "Нет доступа к каталогу приложения: {{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "Не удалось определить текущий каталог приложения, поэтому обновление нельзя скачать",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS 未包含当前平台更新包",
|
||||
"app.update.backend.error.sha256sums_download_failed": "下载 SHA256SUMS 失败:HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release 未提供 SHA256SUMS",
|
||||
"app.update.backend.error.install_target_not_writable": "当前安装目录不可写:{{path}}({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "无法确定当前安装目录",
|
||||
"app.update.backend.error.update_package_not_found": "未找到更新包:{{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "无法访问应用目录:{{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "无法确定当前应用目录,无法下载更新",
|
||||
|
||||
@@ -2877,6 +2877,8 @@
|
||||
"app.update.backend.error.sha256_missing_current_package": "SHA256SUMS 未包含目前平台更新套件",
|
||||
"app.update.backend.error.sha256sums_download_failed": "下載 SHA256SUMS 失敗:HTTP {{status}}",
|
||||
"app.update.backend.error.sha256sums_missing": "Release 未提供 SHA256SUMS",
|
||||
"app.update.backend.error.install_target_not_writable": "目前安裝目錄不可寫:{{path}}({{detail}})",
|
||||
"app.update.backend.error.install_target_unresolved": "無法確定目前安裝目錄",
|
||||
"app.update.backend.error.update_package_not_found": "未找到更新套件:{{name}}",
|
||||
"app.update.backend.message.app_directory_unavailable": "無法存取應用程式目錄:{{path}}",
|
||||
"app.update.backend.message.app_directory_unresolved_download": "無法判斷目前應用程式目錄,因此無法下載更新",
|
||||
|
||||
Reference in New Issue
Block a user