From de0f5c88122a29f2042993428f17341ba13d8aea Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Mon, 3 Aug 2026 21:16:31 +0200 Subject: [PATCH] fix: show desktop update errors --- src/app/pages/client/DesktopUpdater.test.tsx | 15 +++++-- src/app/pages/client/DesktopUpdater.tsx | 45 +++++++++++++++++--- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/app/pages/client/DesktopUpdater.test.tsx b/src/app/pages/client/DesktopUpdater.test.tsx index ccae75e22..05c095f68 100644 --- a/src/app/pages/client/DesktopUpdater.test.tsx +++ b/src/app/pages/client/DesktopUpdater.test.tsx @@ -2,7 +2,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { useAtomValue, useSetAtom, Provider } from 'jotai'; import { globalBannersAtom } from '$state/globalBanners'; -import { triggerUpdateCheckAtom } from '$state/desktopUpdate'; +import { triggerUpdateCheckAtom, updatePhaseAtom } from '$state/desktopUpdate'; import { DesktopUpdatePill } from '$components/tauri/DesktopUpdatePill'; import { getDebugLogger } from '$utils/debugLogger'; import { DesktopUpdater } from './DesktopUpdater'; @@ -33,6 +33,7 @@ function BannersProbe() { {banners.map((b) => (
{b.title} + {b.description} @@ -56,6 +57,11 @@ function CheckNowButton() { ); } +function UpdatePhaseProbe() { + const phase = useAtomValue(updatePhaseAtom); + return {phase.type}; +} + function makeUpdate(version: string) { return { version, @@ -168,6 +174,7 @@ describe('DesktopUpdater', () => { + ); @@ -178,7 +185,7 @@ describe('DesktopUpdater', () => { fireEvent.click(screen.getByRole('button', { name: 'Download & Install' })); await waitFor(() => expect(update.downloadAndInstall).toHaveBeenCalledTimes(1)); await waitFor(() => { - expect(screen.getByRole('button', { name: 'Download & Install' })).toBeInTheDocument(); + expect(screen.getByText('Update Failed')).toBeInTheDocument(); }); expect(debugLog).toHaveBeenCalledWith( 'error', @@ -186,8 +193,10 @@ describe('DesktopUpdater', () => { 'DesktopUpdater', 'Failed to install update: permission denied' ); + expect(screen.getByText('permission denied')).toBeInTheDocument(); + expect(screen.getByTestId('update-phase')).toHaveTextContent('ready'); - fireEvent.click(screen.getByRole('button', { name: 'Download & Install' })); + fireEvent.click(screen.getByRole('button', { name: 'Retry' })); await waitFor(() => expect(update.downloadAndInstall).toHaveBeenCalledTimes(2)); await screen.findByTestId('banner-desktop-update-restart'); }); diff --git a/src/app/pages/client/DesktopUpdater.tsx b/src/app/pages/client/DesktopUpdater.tsx index fe02f69c0..f3c3c38ea 100644 --- a/src/app/pages/client/DesktopUpdater.tsx +++ b/src/app/pages/client/DesktopUpdater.tsx @@ -20,15 +20,21 @@ import { const log = createLogger('DesktopUpdater'); const UPDATE_POLL_INTERVAL_MS = 300_000; // 5 minutes +const getUpdaterErrorMessage = (error: unknown): string => + error instanceof Error + ? error.message + : typeof error === 'object' && error !== null && 'message' in error + ? String(error.message) + : String(error); + const logUpdaterError = (message: string, error: unknown): void => { log.error(message, error); - const detail = - error instanceof Error - ? error.message - : typeof error === 'object' && error !== null && 'message' in error - ? String(error.message) - : String(error); - getDebugLogger().log('error', 'network', 'DesktopUpdater', `${message}: ${detail}`); + getDebugLogger().log( + 'error', + 'network', + 'DesktopUpdater', + `${message}: ${getUpdaterErrorMessage(error)}` + ); }; export function DesktopUpdater() { @@ -41,6 +47,7 @@ export function DesktopUpdater() { const [isDownloading, setIsDownloading] = useState(false); const [isInstalled, setIsInstalled] = useState(false); const [isInstalling, setIsInstalling] = useState(false); + const [installError, setInstallError] = useState(null); const [dismissed, setDismissed] = useState(false); const [useCustomTitleBar] = useDesktopSetting('useCustomTitleBar'); const hasUpdateRef = useRef(false); @@ -157,6 +164,7 @@ export function DesktopUpdater() { if (!updateInfo || installStartedRef.current) return; installStartedRef.current = true; try { + setInstallError(null); setIsDownloading(true); setPhase({ type: 'downloading', progress: 0 }); @@ -192,8 +200,10 @@ export function DesktopUpdater() { closePendingUpdate(updateInfo); } catch (err) { logUpdaterError('Failed to install update', err); + setInstallError(getUpdaterErrorMessage(err)); setIsDownloading(false); setIsInstalling(false); + setPhase({ type: 'ready', version: updateInfo.version }); installStartedRef.current = false; } }, [closePendingUpdate, updateInfo, setPhase]); @@ -235,6 +245,26 @@ export function DesktopUpdater() { }; } + if (installError) { + return { + id: 'desktop-update-ready', + priority: 200, + icon: ArrowUp, + title: 'Update Failed', + description: installError, + primaryAction: { + label: 'Retry', + variant: 'Primary', + onClick: handleInstall, + }, + secondaryAction: { + label: 'Later', + variant: 'Secondary', + onClick: handleDismiss, + }, + }; + } + return { id: 'desktop-update-ready', priority: 200, @@ -263,6 +293,7 @@ export function DesktopUpdater() { isDownloading, isInstalled, isInstalling, + installError, handleInstall, handleRestart, handleDismiss,