fix: offer recovery for blank desktop windows

React render failures now show a localized reload page, and renderer crashes offer native reload confirmation. Record renderer and load failures in existing diagnostics without automatic retry loops. Reload may lose unsaved input; the intermittent failure cause remains unconfirmed.

Release note: Recover from desktop rendering failures using a visible Reload action instead of being left without a recovery entry point.
This commit is contained in:
mesalogo
2026-09-15 08:07:08 +08:00
parent d4f1668c9b
commit b755951ecd
10 changed files with 339 additions and 14 deletions
+90 -2
View File
@@ -1,5 +1,6 @@
import { describe, expect, it, vi } from 'vitest'
import { createMainWindow, resolveWindowIcon } from './window'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { createMainWindow, loadMainWindow, resolveWindowIcon } from './window'
import { dialog } from 'electron'
const electronMocks = vi.hoisted(() => ({
options: [] as Array<Record<string, unknown>>,
@@ -9,11 +10,14 @@ const electronMocks = vi.hoisted(() => ({
vi.mock('electron', () => ({
app: {
isPackaged: false,
getLocale: vi.fn(() => 'en-US'),
getAppPath: vi.fn(() => 'C:\\source')
},
BrowserWindow: class {
webContents = {
on: vi.fn(),
reload: vi.fn(),
isDestroyed: vi.fn(() => false),
setWindowOpenHandler: vi.fn()
}
@@ -22,6 +26,9 @@ vi.mock('electron', () => ({
}
setIcon = vi.fn()
isDestroyed = vi.fn(() => false)
loadURL = vi.fn(async () => undefined)
loadFile = vi.fn(async () => undefined)
once = vi.fn()
hide = vi.fn()
on = vi.fn(
@@ -40,11 +47,92 @@ vi.mock('electron', () => ({
isEmpty: vi.fn(() => false)
}))
},
dialog: { showMessageBox: vi.fn(async () => ({ response: 1 })) },
shell: {
openExternal: vi.fn()
}
}))
afterEach(() => {
vi.restoreAllMocks()
vi.unstubAllEnvs()
})
describe('window recovery', () => {
function setup(shouldQuit = () => false) {
const observe = vi.fn()
const observedWindow = createMainWindow(shouldQuit, observe)
const listeners = vi.mocked(observedWindow.webContents.on).mock.calls as unknown as Array<[string, unknown]>
const gone = listeners.find(([event]) => event === 'render-process-gone')![1] as
(event: unknown, details: { reason: string; exitCode: number }) => void
vi.spyOn(console, 'error').mockImplementation(() => undefined)
return { window: observedWindow, gone, observe, listeners }
}
it('logs a crash and reloads only after explicit confirmation, without duplicate dialogs', async () => {
let respond!: (value: { response: number; checkboxChecked: boolean }) => void
vi.mocked(dialog.showMessageBox).mockReturnValueOnce(new Promise(resolve => { respond = resolve }))
const { window, gone, observe } = setup()
const before = vi.mocked(dialog.showMessageBox).mock.calls.length
gone({}, { reason: 'oom', exitCode: 9 })
gone({}, { reason: 'crashed', exitCode: 1 })
expect(dialog.showMessageBox).toHaveBeenCalledTimes(before + 1)
expect(window.webContents.reload).not.toHaveBeenCalled()
expect(observe).toHaveBeenCalledWith(expect.objectContaining({ code: 'desktop.renderer.gone' }))
respond({ response: 0, checkboxChecked: false })
await vi.waitFor(() => expect(window.webContents.reload).toHaveBeenCalledOnce())
gone({}, { reason: 'crashed', exitCode: 1 })
await Promise.resolve()
expect(window.webContents.reload).toHaveBeenCalledOnce()
})
it('does not recover clean exits or shutdown, or reload a window destroyed during the dialog', async () => {
let quitting = false
const { window, gone, observe } = setup(() => quitting)
gone({}, { reason: 'clean-exit', exitCode: 0 })
quitting = true
gone({}, { reason: 'crashed', exitCode: 1 })
expect(observe).not.toHaveBeenCalled()
quitting = false
vi.mocked(dialog.showMessageBox).mockResolvedValueOnce({ response: 0, checkboxChecked: false })
gone({}, { reason: 'crashed', exitCode: 1 })
vi.mocked(window.isDestroyed).mockReturnValue(true)
await Promise.resolve()
expect(window.webContents.reload).not.toHaveBeenCalled()
})
it('handles dialog rejection and allows a later user-driven recovery', async () => {
const { window, gone } = setup()
vi.mocked(dialog.showMessageBox).mockRejectedValueOnce(new Error('dialog unavailable'))
gone({}, { reason: 'crashed', exitCode: 1 })
await vi.waitFor(() => expect(console.error).toHaveBeenCalledWith('GoodBuddy renderer recovery failed', expect.any(Error)))
vi.mocked(dialog.showMessageBox).mockResolvedValueOnce({ response: 0, checkboxChecked: false })
gone({}, { reason: 'crashed', exitCode: 1 })
await vi.waitFor(() => expect(window.webContents.reload).toHaveBeenCalledOnce())
})
it('records main-frame load failures but ignores aborted navigation and subframes', () => {
const { listeners, observe } = setup()
const failed = listeners.find(([event]) => event === 'did-fail-load')![1] as
(event: unknown, code: number, description: string, url: string, main: boolean) => void
failed({}, -3, 'aborted', '', true)
failed({}, -6, 'missing', '', false)
expect(observe).not.toHaveBeenCalled()
failed({}, -6, 'missing', '', true)
expect(observe).toHaveBeenCalledWith(expect.objectContaining({ code: 'desktop.renderer.load-failed' }))
})
it.each([true, false])('consumes rejected load promises (development=%s)', async development => {
vi.stubEnv('ELECTRON_RENDERER_URL', development ? 'http://localhost:5173' : '')
const { window } = setup()
vi.mocked(development ? window.loadURL : window.loadFile).mockRejectedValueOnce(new Error('load failed'))
loadMainWindow(window, true)
await vi.waitFor(() => expect(console.error).toHaveBeenCalledWith('GoodBuddy window load rejected', expect.any(Error)))
if (development) expect(window.loadURL).toHaveBeenCalledWith('http://localhost:5173/?storageUpgrade=1')
else expect(window.loadFile).toHaveBeenCalledWith(expect.any(String), { query: { storageUpgrade: '1' } })
})
})
describe('createMainWindow', () => {
it('disables the system frame while preserving renderer isolation', () => {
createMainWindow(() => false)