mirror of
https://github.com/stablyai/orca.git
synced 2026-11-18 20:06:10 +00:00
fix(browser): make reload report offline failures and work on pages that never loaded (#41347)
Agent reload treated did-fail-load as success, so it returned ok while the page showed a network error page; it now reports the page's load error like goto. A restored page stopped before its first commit holds only Chromium's initial empty entry, so native reload did nothing: the Reload button now navigates to the saved URL, and agent reload fails fast instead of waiting 10s and claiming success.
This commit is contained in:
@@ -60,6 +60,7 @@ vi.mock('../../cdp/commands/cdp-bridge', async () => {
|
||||
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import {
|
||||
createSucceedWith,
|
||||
mockBrowserManager,
|
||||
mockWebContents,
|
||||
overrideBridgeWebContentsLookup,
|
||||
@@ -106,4 +107,31 @@ describe('AgentBrowserBridge', () => {
|
||||
expect.objectContaining({ expression: 'sideEffect()' })
|
||||
)
|
||||
})
|
||||
|
||||
it('reports a reload that lands on a network error page as a failure', async () => {
|
||||
const wc = mockWebContents(100)
|
||||
const listeners = new Map<string, () => void>()
|
||||
wc.on.mockImplementation((event: string, listener: () => void) =>
|
||||
listeners.set(event, listener)
|
||||
)
|
||||
Object.assign(wc, {
|
||||
reload: vi.fn(() => queueMicrotask(() => listeners.get('did-fail-load')?.()))
|
||||
})
|
||||
webContentsFromIdMock.mockReturnValue(wc)
|
||||
createSucceedWith(execFileMock, stdinWrites)({})
|
||||
bridge = new AgentBrowserBridge(
|
||||
mockBrowserManager(undefined, undefined, {
|
||||
getBrowserPageLoadError: vi.fn(() => ({
|
||||
code: -106,
|
||||
description: 'ERR_INTERNET_DISCONNECTED',
|
||||
validatedUrl: 'https://example.com'
|
||||
}))
|
||||
})
|
||||
)
|
||||
bridge.setActiveTab(100)
|
||||
|
||||
await expect(bridge.reload(undefined, 'tab-1')).rejects.toThrow(
|
||||
'ERR_INTERNET_DISCONNECTED (-106)'
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
getBrowserPasskeyRequest
|
||||
} from '../../webauthn/browser-passkey-requests'
|
||||
import { formatBrowserPasskeyRequest } from '../../../../shared/browser-passkey-request'
|
||||
import { browserGuestHasNothingToReload } from '../../../../shared/browser/guest-lifecycle/browser-guest-reloadability'
|
||||
import { cancelBrowserWebAuthnAccountRequests } from '../../webauthn/browser-webauthn-account-picker'
|
||||
import { captureRemoteCliBrowserRevocation } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import {
|
||||
@@ -232,6 +233,12 @@ export abstract class AgentBrowserBridgeUtilityCommands extends AgentBrowserBrid
|
||||
if (!wc) {
|
||||
throw new BrowserError('browser_no_tab', 'Tab is no longer available')
|
||||
}
|
||||
if (browserGuestHasNothingToReload({ url: wc.getURL(), loading: wc.isLoading() })) {
|
||||
throw new BrowserError(
|
||||
'browser_error',
|
||||
'Nothing to reload: this page never finished loading. Navigate to its URL instead.'
|
||||
)
|
||||
}
|
||||
wc.reload()
|
||||
await new Promise<void>((resolve) => {
|
||||
let settled = false
|
||||
@@ -261,6 +268,14 @@ export abstract class AgentBrowserBridgeUtilityCommands extends AgentBrowserBrid
|
||||
fallbackTimer.unref()
|
||||
}
|
||||
})
|
||||
// did-fail-load also ends the wait; the page then shows an error document, not a reload.
|
||||
const loadError = this.browserManager.getBrowserPageLoadError(target.browserPageId)
|
||||
if (loadError) {
|
||||
throw new BrowserError(
|
||||
'browser_error',
|
||||
`Reload failed: ${loadError.description} (${loadError.code})`
|
||||
)
|
||||
}
|
||||
return { url: wc.getURL(), title: wc.getTitle() }
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
import { issueBrowserGuestNavigation } from '../host-guest/browser-guest-metadata-cache'
|
||||
import {
|
||||
cachedBrowserGuestMetadata,
|
||||
issueBrowserGuestNavigation
|
||||
} from '../host-guest/browser-guest-metadata-cache'
|
||||
import { BROWSER_GUEST_RECOVERY_ERROR_CODE } from '../host-guest/browser-page-guest-recovery'
|
||||
import { browserGuestHasNothingToReload } from '../../../../../shared/browser/guest-lifecycle/browser-guest-reloadability'
|
||||
|
||||
export type BrowserReloadTrigger = 'button' | 'reload' | 'hard-reload'
|
||||
|
||||
@@ -31,7 +35,11 @@ export function resolveBrowserReloadIntent(
|
||||
return trigger === 'hard-reload' ? 'hard-reload' : 'reload'
|
||||
}
|
||||
|
||||
export type BrowserPageWebviewReloadResult = 'reloaded' | 'guest-missing' | 'not-ready'
|
||||
export type BrowserPageWebviewReloadResult =
|
||||
| 'reloaded'
|
||||
| 'guest-missing'
|
||||
| 'not-ready'
|
||||
| 'nothing-to-reload'
|
||||
|
||||
/** getWebContentsId separates destroyed guests needing recovery from live pre-dom-ready guests already loading; reload throws for both. */
|
||||
export function reloadBrowserPageWebview(
|
||||
@@ -44,6 +52,11 @@ export function reloadBrowserPageWebview(
|
||||
return 'guest-missing'
|
||||
}
|
||||
try {
|
||||
// A restored page stopped before its first commit holds only the initial empty entry.
|
||||
const metadata = cachedBrowserGuestMetadata(webview)
|
||||
if (metadata && !metadata.errorPage && browserGuestHasNothingToReload(metadata)) {
|
||||
return 'nothing-to-reload'
|
||||
}
|
||||
if (ignoreCache) {
|
||||
issueBrowserGuestNavigation(webview, () => webview.reloadIgnoringCache())
|
||||
} else {
|
||||
|
||||
+40
-1
@@ -1,8 +1,12 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { act, renderHook } from '@testing-library/react'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { BrowserPage } from '../../../../../shared/browser-workspace-types'
|
||||
import { useBrowserPageReloadActions } from './use-browser-page-reload-actions'
|
||||
import {
|
||||
acceptBrowserGuestMetadata,
|
||||
clearBrowserGuestMetadata
|
||||
} from '../host-guest/browser-guest-metadata-cache'
|
||||
|
||||
vi.mock('@/hooks/useShortcutLabel', () => ({ useShortcutLabel: () => '' }))
|
||||
|
||||
@@ -22,6 +26,7 @@ function createBrowserTab(overrides: Partial<BrowserPage> = {}): BrowserPage {
|
||||
}
|
||||
|
||||
function createWebview(overrides: Partial<Electron.WebviewTag> = {}): Electron.WebviewTag {
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reload hook calls only the webview methods stubbed here.
|
||||
return {
|
||||
getWebContentsId: vi.fn(() => 42),
|
||||
reload: vi.fn(),
|
||||
@@ -32,6 +37,8 @@ function createWebview(overrides: Partial<Electron.WebviewTag> = {}): Electron.W
|
||||
}
|
||||
|
||||
describe('useBrowserPageReloadActions', () => {
|
||||
afterEach(clearBrowserGuestMetadata)
|
||||
|
||||
it('does not strand loading when a live guest rejects reload before it is ready', () => {
|
||||
const webview = createWebview({
|
||||
reload: vi.fn(() => {
|
||||
@@ -51,4 +58,36 @@ describe('useBrowserPageReloadActions', () => {
|
||||
act(() => view.result.current.runReloadTrigger('button'))
|
||||
expect(onUpdatePageStateRef.current).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('navigates a restored page that never committed to its saved URL', () => {
|
||||
// Main publishes an empty URL for a guest that stopped before its first commit.
|
||||
acceptBrowserGuestMetadata({
|
||||
browserPageId: 'page-a',
|
||||
webContentsId: 42,
|
||||
revision: 1,
|
||||
navigationRevision: 0,
|
||||
kind: 'stop',
|
||||
url: '',
|
||||
title: '',
|
||||
loading: false,
|
||||
canGoBack: false,
|
||||
canGoForward: false,
|
||||
errorPage: false,
|
||||
loadError: null,
|
||||
hasCertificateFailure: false
|
||||
})
|
||||
const webview = createWebview({ addEventListener: vi.fn(), removeEventListener: vi.fn() })
|
||||
const view = renderHook(() =>
|
||||
useBrowserPageReloadActions({
|
||||
browserTab: createBrowserTab({ url: 'https://example.test/restored' }),
|
||||
webviewRef: { current: webview },
|
||||
retryGuestRecoveryRef: { current: vi.fn() },
|
||||
onUpdatePageStateRef: { current: vi.fn() }
|
||||
})
|
||||
)
|
||||
|
||||
act(() => view.result.current.runReloadTrigger('button'))
|
||||
expect(webview.reload).not.toHaveBeenCalled()
|
||||
expect(webview.src).toBe('https://example.test/restored')
|
||||
})
|
||||
})
|
||||
|
||||
+21
-18
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useMemo, useState, type MutableRefObject } from 'react'
|
||||
import { useShortcutLabel } from '@/hooks/useShortcutLabel'
|
||||
import { useLatestHandler } from '@/lib/use-latest-handler'
|
||||
import { useTranslate } from '@/i18n/use-translate'
|
||||
import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types'
|
||||
import {
|
||||
@@ -39,24 +40,26 @@ export function useBrowserPageReloadActions({
|
||||
() => ({ loading: browserTab.loading, loadErrorCode: browserTab.loadError?.code ?? null }),
|
||||
[browserTab.loading, browserTab.loadError]
|
||||
)
|
||||
const reloadWebviewOrRecoverGuest = useCallback(
|
||||
(ignoreCache: boolean) => {
|
||||
const webview = webviewRef.current
|
||||
if (!webview) {
|
||||
return
|
||||
}
|
||||
const result = reloadBrowserPageWebview(webview, { ignoreCache })
|
||||
if (result === 'not-ready') {
|
||||
return
|
||||
}
|
||||
onUpdatePageStateRef.current(browserTab.id, { loading: true })
|
||||
if (result === 'guest-missing') {
|
||||
// Why: reload cannot revive a destroyed guest (STA-3448) — recreate it instead.
|
||||
retryGuestRecoveryRef.current()
|
||||
}
|
||||
},
|
||||
[browserTab.id, onUpdatePageStateRef, retryGuestRecoveryRef, webviewRef]
|
||||
)
|
||||
// Stable so shortcut listeners don't re-register on every page-state update.
|
||||
const reloadWebviewOrRecoverGuest = useLatestHandler((ignoreCache: boolean) => {
|
||||
const webview = webviewRef.current
|
||||
if (!webview) {
|
||||
return
|
||||
}
|
||||
const result = reloadBrowserPageWebview(webview, { ignoreCache })
|
||||
if (result === 'not-ready') {
|
||||
return
|
||||
}
|
||||
if (result === 'nothing-to-reload') {
|
||||
retryBrowserTabLoad(webview, browserTab, onUpdatePageStateRef.current)
|
||||
return
|
||||
}
|
||||
onUpdatePageStateRef.current(browserTab.id, { loading: true })
|
||||
if (result === 'guest-missing') {
|
||||
// Why: reload cannot revive a destroyed guest (STA-3448) — recreate it instead.
|
||||
retryGuestRecoveryRef.current()
|
||||
}
|
||||
})
|
||||
const runReloadTrigger = useCallback(
|
||||
(trigger: BrowserReloadTrigger) => {
|
||||
const webview = webviewRef.current
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
/** Chromium's reload is a silent no-op when nothing ever committed and no navigation is pending. */
|
||||
export function browserGuestHasNothingToReload(guest: { url: string; loading: boolean }): boolean {
|
||||
return guest.url === '' && !guest.loading
|
||||
}
|
||||
Reference in New Issue
Block a user