Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions src-tauri/src/desktop/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@ use tauri_plugin_dialog::DialogExt;
const DEFAULT_ARCHIVE_NAME: &str = "sable-diagnostics.zip";

#[tauri::command]
pub fn export_diagnostics(
pub async fn export_diagnostics(
app: AppHandle<crate::BrowserEngine>,
frontend_logs: Option<String>,
) -> Result<Option<String>, String> {
let Some(path) = app
.dialog()
let (sender, receiver) = tokio::sync::oneshot::channel();
app.dialog()
.file()
.set_file_name(DEFAULT_ARCHIVE_NAME)
.add_filter("ZIP archive", &["zip"])
.blocking_save_file()
.save_file(move |path| {
let _ = sender.send(path);
});

let Some(path) = receiver
.await
.map_err(|error| format!("Save dialog did not return a result: {error}"))?
else {
return Ok(None);
};
Expand Down
14 changes: 10 additions & 4 deletions src-tauri/src/desktop/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ use tauri::AppHandle;
use tauri_plugin_dialog::DialogExt;

#[tauri::command]
pub fn save_download(
pub async fn save_download(
app: AppHandle<crate::BrowserEngine>,
filename: String,
bytes: Vec<u8>,
) -> Result<bool, String> {
let Some(path) = app
.dialog()
let (sender, receiver) = tokio::sync::oneshot::channel();
app.dialog()
.file()
.set_file_name(&filename)
.blocking_save_file()
.save_file(move |path| {
let _ = sender.send(path);
});

let Some(path) = receiver
.await
.map_err(|error| format!("Save dialog did not return a result: {error}"))?
else {
return Ok(false);
};
Expand Down
2 changes: 1 addition & 1 deletion src/app/generated/tauri/commands.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Auto-generated TypeScript bindings for Tauri commands
* Generated by tauri-typegen v0.5.0
* Generated at: 2026-07-31T11:14:58.599659+00:00
* Generated at: 2026-08-05T12:41:11.731056+00:00
* Generator: none
*
* Do not edit manually - regenerate using: cargo tauri-typegen generate
Expand Down
2 changes: 1 addition & 1 deletion src/app/generated/tauri/events.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Auto-generated TypeScript bindings for Tauri commands
* Generated by tauri-typegen v0.5.0
* Generated at: 2026-07-31T11:14:58.602356+00:00
* Generated at: 2026-08-05T12:41:11.732167+00:00
* Generator: none
*
* Do not edit manually - regenerate using: cargo tauri-typegen generate
Expand Down
2 changes: 1 addition & 1 deletion src/app/generated/tauri/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Auto-generated TypeScript bindings for Tauri commands
* Generated by tauri-typegen v0.5.0
* Generated at: 2026-07-31T11:14:58.603222+00:00
* Generated at: 2026-08-05T12:41:11.732351+00:00
* Generator: none
*
* Do not edit manually - regenerate using: cargo tauri-typegen generate
Expand Down
2 changes: 1 addition & 1 deletion src/app/generated/tauri/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Auto-generated TypeScript bindings for Tauri commands
* Generated by tauri-typegen v0.5.0
* Generated at: 2026-07-31T11:14:58.596290+00:00
* Generated at: 2026-08-05T12:41:11.729365+00:00
* Generator: none
*
* Do not edit manually - regenerate using: cargo tauri-typegen generate
Expand Down
10 changes: 9 additions & 1 deletion src/app/pages/client/DesktopUpdater.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useAtomValue, useSetAtom, Provider } from 'jotai';
import { globalBannersAtom } from '$state/globalBanners';
import { triggerUpdateCheckAtom } from '$state/desktopUpdate';
import { DesktopUpdatePill } from '$components/tauri/DesktopUpdatePill';
import { getDebugLogger } from '$utils/debugLogger';
import { DesktopUpdater } from './DesktopUpdater';

const { checkFn } = vi.hoisted(() => ({ checkFn: vi.fn<() => Promise<unknown>>() }));
Expand Down Expand Up @@ -156,8 +157,9 @@ describe('DesktopUpdater', () => {

it('retries when downloadAndInstall fails', async () => {
const update = makeUpdate('4.0.0');
const debugLog = vi.spyOn(getDebugLogger(), 'log');
update.downloadAndInstall
.mockRejectedValueOnce(new Error('eacces'))
.mockRejectedValueOnce({ message: 'permission denied' })
.mockResolvedValueOnce(undefined);
checkFn.mockResolvedValue(update);

Expand All @@ -178,6 +180,12 @@ describe('DesktopUpdater', () => {
await waitFor(() => {
expect(screen.getByRole('button', { name: 'Download & Install' })).toBeInTheDocument();
});
expect(debugLog).toHaveBeenCalledWith(
'error',
'network',
'DesktopUpdater',
'Failed to install update: permission denied'
);

fireEvent.click(screen.getByRole('button', { name: 'Download & Install' }));
await waitFor(() => expect(update.downloadAndInstall).toHaveBeenCalledTimes(2));
Expand Down
16 changes: 14 additions & 2 deletions src/app/pages/client/DesktopUpdater.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { Update } from '@tauri-apps/plugin-updater';
import { isDesktopTauri } from '$utils/platform';
import { autoUpdateCheckAtom } from '$state/autoUpdateCheck';
import { createLogger } from '$utils/debug';
import { getDebugLogger } from '$utils/debugLogger';
import { hasCustomDesktopTitlebar } from '$utils/tauriTitlebar';
import { useDesktopSetting } from '$state/hooks/desktopSettings';
import { ArrowUp } from '$components/icons/phosphor';
Expand All @@ -19,6 +20,17 @@ import {
const log = createLogger('DesktopUpdater');
const UPDATE_POLL_INTERVAL_MS = 300_000; // 5 minutes

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}`);
};

export function DesktopUpdater() {
const autoUpdateCheck = useAtomValue(autoUpdateCheckAtom);
const triggerCount = useAtomValue(triggerUpdateCheckAtom);
Expand Down Expand Up @@ -92,7 +104,7 @@ export function DesktopUpdater() {
setLastChecked(new Date().toISOString());
if (!hasCustomDesktopTitlebar(useCustomTitleBar)) setBannerVisible(true);
} catch (err) {
log.error('Desktop update check failed', err);
logUpdaterError('Desktop update check failed', err);
if (mounted) {
if (!hasUpdateRef.current) {
setPhase({ type: 'idle' });
Expand Down Expand Up @@ -179,7 +191,7 @@ export function DesktopUpdater() {
pendingUpdateRef.current = null;
closePendingUpdate(updateInfo);
} catch (err) {
log.error('Failed to install update', err);
logUpdaterError('Failed to install update', err);
setIsDownloading(false);
setIsInstalling(false);
installStartedRef.current = false;
Expand Down
Loading