diff --git a/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts b/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts index 6bed75438f0..f9be89d6fc1 100644 --- a/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts +++ b/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts @@ -8,6 +8,7 @@ import type { } from '../../../../../shared/browser/element-grab/browser-grab-types' import type { BrowserContextMenuRequestedEvent } from '../../../../../shared/browser/guest-lifecycle/browser-guest-events' import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types' +import type { BrowserPageLoadingOwner } from '@/lib/browser/browser-page-loading-ownership' import type { GrabModeHook } from '../annotate/useGrabMode' import type { BrowserOverlayViewport } from './browser-annotation-geometry' @@ -18,6 +19,12 @@ export type BrowserTabPageState = Partial< > > +export type BrowserPageStateWriter = ( + pageId: string, + updates: BrowserTabPageState, + loadingOwner?: BrowserPageLoadingOwner +) => void + export type BrowserPageUrlSetter = ( tabId: string, url: string, diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-loading.test.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-loading.test.ts new file mode 100644 index 00000000000..43d24901c24 --- /dev/null +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-loading.test.ts @@ -0,0 +1,206 @@ +// @vitest-environment happy-dom +import { act, cleanup } from '@testing-library/react' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { useAppStore } from '@/store' +import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api' +import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' +import type { BrowserTabInfo } from '../../../../../shared/browser/runtime/runtime-browser-contracts' +import { + currentPage, + deferred, + failedTab, + renderNavigation, + page +} from './remote-browser-page-navigation.test-fixture' + +vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: vi.fn() })) +beforeEach(() => vi.mocked(callRuntimeRpc).mockReset()) +afterEach(cleanup) + +function applyNativeLoading(loading: boolean): void { + useAppStore.setState((state) => + applyWebSessionTabsSnapshot( + state, + { + worktree: 'worktree-a', + publicationEpoch: 'loading-test', + snapshotVersion: 1, + activeTabType: 'browser', + activeTabId: 'host-tab', + activeGroupId: 'host-group', + tabs: [ + { + type: 'browser', + id: 'host-tab', + browserWorkspaceId: 'workspace-a', + browserPageId: 'remote-page-a', + url: 'about:blank', + title: 'New Tab', + loading, + canGoBack: false, + canGoForward: false, + isActive: true, + loadError: null, + certificateFailure: null + } + ] + }, + 'environment-a', + 100 + ) + ) +} + +describe('remote command loading ownership', () => { + it.each([ + ['synthetic', true, false], + ['explicit', true, true], + ['native', true, true], + ['native', false, true] + ] as const)( + 'settles only %s loading after local updates=%s', + async (owner, edit, expectedLoading) => { + const { result, busy } = renderNavigation(1, 'mailto:help@example.test') + act(() => applyNativeLoading(false)) + const read = deferred<{ tab: BrowserTabInfo }>() + vi.mocked(callRuntimeRpc).mockImplementation(async (_target, method) => { + if (method === 'browser.reload') { + return { url: 'about:blank', title: 'New Tab' } + } + if (method === 'browser.tabShow') { + return read.promise + } + return undefined + }) + let command!: Promise + await act(async () => { + command = result.current.runRemoteNavigation('browser.reload') + }) + expect(currentPage().loading).toBe(true) + const before = useAppStore.getState() + const changed = vi.fn() + const unsubscribe = useAppStore.subscribe(changed) + act(() => { + if (owner === 'native') { + applyNativeLoading(true) + } + if (owner === 'explicit') { + useAppStore.getState().updateBrowserPageState('page-a', { loading: true }) + } + }) + unsubscribe() + expect(useAppStore.getState().browserPagesByWorkspace).toBe(before.browserPagesByWorkspace) + expect(useAppStore.getState().browserTabsByWorktree).toBe(before.browserTabsByWorktree) + expect(changed).not.toHaveBeenCalled() + if (edit) { + act(() => { + result.current.submitAddressBar() + useAppStore.getState().setBrowserPageViewportPreset('page-a', 'mobile-s') + }) + expect(currentPage().loadError).toMatchObject({ + code: 0, + validatedUrl: 'mailto:help@example.test' + }) + } + await act(async () => { + read.resolve({ tab: { ...failedTab('stale'), title: 'Stale result' } }) + await command + }) + expect(currentPage().loading).toBe(expectedLoading) + expect(currentPage().title).toBe('New Tab') + expect(currentPage().url).toBe('about:blank') + expect(busy).toHaveBeenLastCalledWith(false) + expect(useAppStore.getState().browserCertificateFailuresByPageId['page-a']).toBeUndefined() + if (edit) { + expect(currentPage().loadError).toMatchObject({ + code: 0, + validatedUrl: 'mailto:help@example.test' + }) + expect(currentPage().viewportPresetId).toBe('mobile-s') + } + } + ) + + it('discharges synthetic loading across external ABA without admitting the old read', async () => { + const { session, tokens } = renderNavigation() + const token = tokens.createOperationToken('remote-page-a')! + act(() => session.setPageLoading(token, true, useAppStore.getState().updateBrowserPageState)) + const read = deferred<{ tab: BrowserTabInfo }>() + vi.mocked(callRuntimeRpc).mockReturnValueOnce(read.promise) + const pending = session.refreshTabInfo(token) + act(() => { + useAppStore.getState().updateBrowserPageState('page-a', { loadError: failedTab().loadError }) + useAppStore.getState().updateBrowserPageState('page-a', { loadError: null }) + session.setPageLoading(token, false, useAppStore.getState().updateBrowserPageState) + }) + await act(async () => { + read.resolve({ tab: failedTab('stale') }) + expect(await pending).toBeNull() + }) + expect(currentPage().loading).toBe(false) + expect(currentPage().loadError).toBeNull() + expect(currentPage().url).toBe('about:blank') + }) + + it('does not claim an explicit equal loading write from a synchronous store subscriber', () => { + const { session, tokens } = renderNavigation() + const token = tokens.createOperationToken('remote-page-a')! + const unsubscribe = useAppStore.subscribe(() => { + useAppStore.getState().updateBrowserPageState('page-a', { loading: true }) + }) + act(() => session.setPageLoading(token, true, useAppStore.getState().updateBrowserPageState)) + unsubscribe() + act(() => session.setPageLoading(token, false, useAppStore.getState().updateBrowserPageState)) + expect(currentPage().loading).toBe(true) + }) + + it.each([100, 1000])('native takeover visits no unrelated records at N=%s', async (count) => { + const { session, tokens } = renderNavigation() + act(() => applyNativeLoading(false)) + const token = tokens.createOperationToken('remote-page-a')! + act(() => session.setPageLoading(token, true, useAppStore.getState().updateBrowserPageState)) + const read = deferred<{ tab: BrowserTabInfo }>() + vi.mocked(callRuntimeRpc).mockReturnValueOnce(read.promise) + const pending = session.refreshTabInfo(token) + const unrelated = Object.fromEntries( + Array.from({ length: count }, (_, index) => { + const workspaceId = `unrelated-${index}` + return [workspaceId, [{ ...page(`other-${index}`), workspaceId, worktreeId: 'other' }]] + }) + ) + let enumerations = 0 + let unrelatedReads = 0 + const pages = new Proxy( + { ...useAppStore.getState().browserPagesByWorkspace, ...unrelated }, + { + ownKeys(target) { + enumerations += 1 + return Reflect.ownKeys(target) + }, + get(target, key, receiver) { + if (typeof key === 'string' && key.startsWith('unrelated-')) { + unrelatedReads += 1 + } + // SAFETY: preserve ordinary record access while counting unrelated lookups. + return Reflect.get(target, key, receiver) + } + } + ) + useAppStore.setState({ browserPagesByWorkspace: pages }) + const changed = vi.fn() + const unsubscribe = useAppStore.subscribe(changed) + act(() => applyNativeLoading(true)) + unsubscribe() + expect(enumerations).toBe(0) + expect(unrelatedReads).toBe(0) + expect(useAppStore.getState().browserPagesByWorkspace).toBe(pages) + expect(changed).not.toHaveBeenCalled() + await act(async () => { + read.resolve({ tab: failedTab('stale') }) + expect(await pending).toBeNull() + session.setPageLoading(token, false, useAppStore.getState().updateBrowserPageState) + }) + expect(currentPage().loading).toBe(true) + expect(currentPage().loadError).toBeNull() + }) +}) diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-navigation.test-fixture.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-navigation.test-fixture.ts new file mode 100644 index 00000000000..e66ce8445d0 --- /dev/null +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-navigation.test-fixture.ts @@ -0,0 +1,166 @@ +import { renderHook } from '@testing-library/react' +import { expect, vi } from 'vitest' +import { useAppStore } from '@/store' +import { findPage } from '@/store/slices/browser/pages/browser-page-records' +import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' +import type { BrowserPage } from '../../../../../shared/browser-workspace-types' +import type { BrowserTabInfo } from '../../../../../shared/browser/runtime/runtime-browser-contracts' +import { useRemoteBrowserPageNavigation } from './use-remote-browser-page-navigation' +import { + readRemoteBrowserPage, + readRemoteBrowserPageObservation +} from './remote-browser-page-observation' +import { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle' +import type { RemoteBrowserScreencastSubscribe } from './remote-browser-screencast-subscription' + +export function page(id = 'page-a'): BrowserPage { + return { + id, + workspaceId: 'workspace-a', + worktreeId: 'worktree-a', + url: 'about:blank', + title: 'New Tab', + loading: false, + faviconUrl: null, + canGoBack: false, + canGoForward: false, + loadError: null, + createdAt: 1 + } +} + +export function failedTab(challengeId = 'challenge-x'): BrowserTabInfo { + return { + browserPageId: 'remote-page-a', + index: 0, + active: true, + url: 'https://selfsigned.test/', + title: 'TLS', + loadError: { + code: -202, + description: 'ERR_CERT_AUTHORITY_INVALID', + validatedUrl: 'https://selfsigned.test/' + }, + certificateFailure: { + challengeId, + browserPageId: 'remote-page-a', + errorCode: -202, + error: 'ERR_CERT_AUTHORITY_INVALID', + origin: 'https://selfsigned.test', + displayHost: 'selfsigned.test', + canProceed: true, + observedAt: 1 + } + } +} + +export function deferred() { + let resolve!: (value: T) => void + let reject!: (error: unknown) => void + const promise = new Promise((done, fail) => { + resolve = done + reject = fail + }) + return { promise, resolve, reject } +} + +export function renderNavigation(count = 1, addressBarValue = 'about:blank') { + const pages = Array.from({ length: count }, (_, index) => + page(index ? `page-${index}` : 'page-a') + ) + const first = pages[0] + useAppStore.setState({ + browserPagesByWorkspace: { 'workspace-a': pages }, + browserTabsByWorktree: { + 'worktree-a': [ + { + ...first, + id: 'workspace-a', + activePageId: 'page-a', + pageIds: pages.map((entry) => entry.id) + } + ] + }, + unifiedTabsByWorktree: {}, + browserCertificateFailuresByPageId: {}, + browserUrlHistory: [], + remoteBrowserPageHandlesByPageId: { + 'page-a': { environmentId: 'environment-a', remotePageId: 'remote-page-a' } + } + }) + const identity = { mounted: true, active: true, environmentId: 'environment-a' } + const paneIdentity = { + isMounted: () => identity.mounted, + isActive: () => identity.active, + getTabId: () => 'page-a', + getEnvironmentId: () => identity.environmentId, + browserPageExists: (pageId) => + Boolean(readRemoteBrowserPage(useAppStore.getState(), 'workspace-a', pageId)) + } + let project: (tab: BrowserTabInfo) => void = () => {} + const subscribe = vi.fn(async () => ({ unsubscribe: vi.fn() })) + const lifecycle = new RemoteBrowserStreamLifecycle({ + identity: paneIdentity, + subscribeScreencast: subscribe, + waitForViewportSize: async () => ({ width: 800, height: 600 }), + readViewportSize: () => ({ width: 800, height: 600 }), + syncViewport: async () => {}, + getDeviceScaleFactor: () => 1, + setStatus: vi.fn(), + clearFrame: vi.fn(), + handleFrameBytes: vi.fn(), + callRpc: callRuntimeRpc, + getWorktreeSelector: () => 'worktree-a', + getCurrentUrl: () => currentPage().url, + readCurrentObservation: () => + readRemoteBrowserPageObservation(useAppStore.getState(), 'workspace-a', 'page-a'), + readStoredHandle: () => ({ environmentId: 'environment-a', remotePageId: 'remote-page-a' }), + writeStoredHandle: vi.fn(), + removeStoredHandle: vi.fn(), + applyTabInfo: (tab) => project(tab), + closeMissingRemotePage: vi.fn() + }) + const { session, tokens } = lifecycle + tokens.setRemotePage('remote-page-a') + const closeMissing = vi.fn() + const busy = vi.fn() + const notice = vi.fn() + const hook = renderHook(() => + useRemoteBrowserPageNavigation({ + browserTab: first, + stagedPage: false, + addressBarValue, + setAddressBarValueFromPage: vi.fn(), + lifecycle, + runtimeWorktree: 'worktree-a', + runtimeTarget: () => ({ kind: 'environment', environmentId: identity.environmentId }), + createRemoteOperationToken: () => tokens.createOperationToken(), + isCurrentRemoteOperationToken: (token) => tokens.isCurrent(token), + closeMissingRemotePage: closeMissing, + onSetUrl: useAppStore.getState().setBrowserPageUrl, + onUpdatePageState: useAppStore.getState().updateBrowserPageState, + setPaneNotice: notice, + setPaneBusy: busy + }) + ) + project = (tab) => hook.result.current.applyRemoteTabInfo(tab) + return { ...hook, lifecycle, subscribe, session, tokens, identity, busy, notice, closeMissing } +} + +export function currentPage(): BrowserPage { + return findPage(useAppStore.getState().browserPagesByWorkspace, 'page-a')! +} + +export function expectPending(challengeId = 'challenge-x') { + expect(currentPage().url).toBe('https://selfsigned.test/') + expect(currentPage().loadError).toEqual({ + code: -202, + description: 'ERR_CERT_AUTHORITY_INVALID', + validatedUrl: 'https://selfsigned.test/' + }) + expect(useAppStore.getState().browserCertificateFailuresByPageId['page-a']).toMatchObject({ + challengeId, + browserPageId: 'remote-page-a', + canProceed: true + }) +} diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-observation.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-observation.ts index 6b23c1a34e6..890bd6f42ca 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-observation.ts +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-observation.ts @@ -2,6 +2,7 @@ import type { BrowserPage, BrowserCertificateFailure } from '../../../../../shared/browser-workspace-types' +import { readBrowserPageLoadingOwner } from '@/lib/browser/browser-page-loading-ownership' type BrowserObservationState = { browserPagesByWorkspace: Record @@ -21,8 +22,6 @@ export function readRemoteBrowserPageObservation( workspaceId: string, pageId: string ): readonly unknown[] { - return [ - readRemoteBrowserPage(state, workspaceId, pageId), - state.browserCertificateFailuresByPageId[pageId] - ] + const page = readRemoteBrowserPage(state, workspaceId, pageId) + return [page, state.browserCertificateFailuresByPageId[pageId], readBrowserPageLoadingOwner(page)] } diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx index 6e08a893906..946c053e580 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx @@ -21,7 +21,7 @@ import { import type { BrowserChromeShortcutScope, BrowserPageUrlSetter, - BrowserTabPageState + BrowserPageStateWriter } from '../describe-page/browser-page-types' import type { RemoteBrowserPaneNotice } from './remote-browser-page-input-model' import { useRemoteBrowserPageLifecycle } from './use-remote-browser-page-lifecycle' @@ -57,7 +57,7 @@ export function RemoteBrowserPagePane({ worktreeId: string isActive: boolean chromeShortcutScope: BrowserChromeShortcutScope - onUpdatePageState: (tabId: string, updates: BrowserTabPageState) => void + onUpdatePageState: BrowserPageStateWriter onSetUrl: BrowserPageUrlSetter }): React.JSX.Element { const addressBarInputRef = useRef(null) diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts index 726e188cbfe..a0967e11000 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts @@ -1,4 +1,6 @@ import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' +import type { BrowserPageLoadingOwner } from '@/lib/browser/browser-page-loading-ownership' +import type { BrowserPageStateWriter } from '../describe-page/browser-page-types' import '../../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' @@ -41,7 +43,7 @@ export class RemoteBrowserPageSession { private nextObservationId = 0 private appliedObservationId = 0 private observationAnchor: readonly unknown[] | null = null - private loadingGeneration: number | null = null + private loadingOwner: BrowserPageLoadingOwner | null = null constructor(private readonly deps: RemoteBrowserPageSessionDeps) {} @@ -50,7 +52,7 @@ export class RemoteBrowserPageSession { this.cancelTabInfoRefresh() } - private observeExternalChanges(): void { + private observeExternalChanges(): readonly unknown[] { const current = this.deps.readCurrentObservation() if ( this.observationAnchor && @@ -58,9 +60,13 @@ export class RemoteBrowserPageSession { this.observationAnchor.some((value, index) => value !== current[index])) ) { this.observationGeneration += 1 - this.loadingGeneration = null + if (this.loadingOwner && current[2] !== this.loadingOwner) { + this.loadingOwner.active = false + this.loadingOwner = null + } } this.observationAnchor = current + return current } private applyObservedWrite(write: () => void): void { @@ -74,17 +80,18 @@ export class RemoteBrowserPageSession { setPageLoading( token: RemoteBrowserOperationToken, loading: boolean, - update: (pageId: string, state: { loading: boolean }) => void + update: BrowserPageStateWriter ): void { if (!this.deps.tokens.isCurrent(token)) { return } - this.observeExternalChanges() - if (!loading && this.loadingGeneration !== this.observationGeneration) { + const observation = this.observeExternalChanges() + if (!loading && (!this.loadingOwner || observation[2] !== this.loadingOwner)) { return } - this.applyObservedWrite(() => update(token.tabId, { loading })) - this.loadingGeneration = loading ? this.observationGeneration : null + const owner = loading ? { active: true } : undefined + this.loadingOwner = owner ?? null + this.applyObservedWrite(() => update(token.tabId, { loading }, owner)) } captureTabInfoAdmission(token: RemoteBrowserOperationToken): { @@ -118,7 +125,7 @@ export class RemoteBrowserPageSession { this.applyObservedWrite(() => { this.deps.applyTabInfo(tab) this.appliedObservationId = id - this.loadingGeneration = null + this.loadingOwner = null onApplied?.(tab) }) return true diff --git a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts index 7adf46eed88..769c9fc1b92 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts +++ b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.test.ts @@ -1,174 +1,22 @@ // @vitest-environment happy-dom -import { act, cleanup, renderHook } from '@testing-library/react' +import { act, cleanup } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store' import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api' -import { findPage } from '@/store/slices/browser/pages/browser-page-records' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import type { BrowserPage } from '../../../../../shared/browser-workspace-types' import type { BrowserTabInfo } from '../../../../../shared/browser/runtime/runtime-browser-contracts' -import { useRemoteBrowserPageNavigation } from './use-remote-browser-page-navigation' + import { - readRemoteBrowserPage, - readRemoteBrowserPageObservation -} from './remote-browser-page-observation' -import { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle' -import type { RemoteBrowserScreencastSubscribe } from './remote-browser-screencast-subscription' + page, + failedTab, + deferred, + renderNavigation, + currentPage, + expectPending +} from './remote-browser-page-navigation.test-fixture' vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: vi.fn() })) -function page(id = 'page-a'): BrowserPage { - return { - id, - workspaceId: 'workspace-a', - worktreeId: 'worktree-a', - url: 'about:blank', - title: 'New Tab', - loading: false, - faviconUrl: null, - canGoBack: false, - canGoForward: false, - loadError: null, - createdAt: 1 - } -} - -function failedTab(challengeId = 'challenge-x'): BrowserTabInfo { - return { - browserPageId: 'remote-page-a', - index: 0, - active: true, - url: 'https://selfsigned.test/', - title: 'TLS', - loadError: { - code: -202, - description: 'ERR_CERT_AUTHORITY_INVALID', - validatedUrl: 'https://selfsigned.test/' - }, - certificateFailure: { - challengeId, - browserPageId: 'remote-page-a', - errorCode: -202, - error: 'ERR_CERT_AUTHORITY_INVALID', - origin: 'https://selfsigned.test', - displayHost: 'selfsigned.test', - canProceed: true, - observedAt: 1 - } - } -} - -function deferred() { - let resolve!: (value: T) => void - let reject!: (error: unknown) => void - const promise = new Promise((done, fail) => { - resolve = done - reject = fail - }) - return { promise, resolve, reject } -} - -function renderNavigation(count = 1) { - const pages = Array.from({ length: count }, (_, index) => - page(index ? `page-${index}` : 'page-a') - ) - const first = pages[0] - useAppStore.setState({ - browserPagesByWorkspace: { 'workspace-a': pages }, - browserTabsByWorktree: { - 'worktree-a': [ - { - ...first, - id: 'workspace-a', - activePageId: 'page-a', - pageIds: pages.map((entry) => entry.id) - } - ] - }, - unifiedTabsByWorktree: {}, - browserCertificateFailuresByPageId: {}, - browserUrlHistory: [], - remoteBrowserPageHandlesByPageId: { - 'page-a': { environmentId: 'environment-a', remotePageId: 'remote-page-a' } - } - }) - const identity = { mounted: true, active: true, environmentId: 'environment-a' } - const paneIdentity = { - isMounted: () => identity.mounted, - isActive: () => identity.active, - getTabId: () => 'page-a', - getEnvironmentId: () => identity.environmentId, - browserPageExists: (pageId) => - Boolean(readRemoteBrowserPage(useAppStore.getState(), 'workspace-a', pageId)) - } - let project: (tab: BrowserTabInfo) => void = () => {} - const subscribe = vi.fn(async () => ({ unsubscribe: vi.fn() })) - const lifecycle = new RemoteBrowserStreamLifecycle({ - identity: paneIdentity, - subscribeScreencast: subscribe, - waitForViewportSize: async () => ({ width: 800, height: 600 }), - readViewportSize: () => ({ width: 800, height: 600 }), - syncViewport: async () => {}, - getDeviceScaleFactor: () => 1, - setStatus: vi.fn(), - clearFrame: vi.fn(), - handleFrameBytes: vi.fn(), - callRpc: callRuntimeRpc, - getWorktreeSelector: () => 'worktree-a', - getCurrentUrl: () => currentPage().url, - readCurrentObservation: () => - readRemoteBrowserPageObservation(useAppStore.getState(), 'workspace-a', 'page-a'), - readStoredHandle: () => ({ environmentId: 'environment-a', remotePageId: 'remote-page-a' }), - writeStoredHandle: vi.fn(), - removeStoredHandle: vi.fn(), - applyTabInfo: (tab) => project(tab), - closeMissingRemotePage: vi.fn() - }) - const { session, tokens } = lifecycle - tokens.setRemotePage('remote-page-a') - const closeMissing = vi.fn() - const busy = vi.fn() - const notice = vi.fn() - const hook = renderHook(() => - useRemoteBrowserPageNavigation({ - browserTab: first, - stagedPage: false, - addressBarValue: 'about:blank', - setAddressBarValueFromPage: vi.fn(), - lifecycle, - runtimeWorktree: 'worktree-a', - runtimeTarget: () => ({ kind: 'environment', environmentId: identity.environmentId }), - createRemoteOperationToken: () => tokens.createOperationToken(), - isCurrentRemoteOperationToken: (token) => tokens.isCurrent(token), - closeMissingRemotePage: closeMissing, - onSetUrl: useAppStore.getState().setBrowserPageUrl, - onUpdatePageState: useAppStore.getState().updateBrowserPageState, - setPaneNotice: notice, - setPaneBusy: busy - }) - ) - project = (tab) => hook.result.current.applyRemoteTabInfo(tab) - return { ...hook, lifecycle, subscribe, session, tokens, identity, busy, notice, closeMissing } -} - -function currentPage(): BrowserPage { - return findPage(useAppStore.getState().browserPagesByWorkspace, 'page-a')! -} - -function expectPending(challengeId = 'challenge-x') { - expect(currentPage().url).toBe('https://selfsigned.test/') - expect(currentPage().loadError).toEqual({ - code: -202, - description: 'ERR_CERT_AUTHORITY_INVALID', - validatedUrl: 'https://selfsigned.test/' - }) - expect(useAppStore.getState().browserCertificateFailuresByPageId['page-a']).toMatchObject({ - challengeId, - browserPageId: 'remote-page-a', - canProceed: true - }) -} - beforeEach(() => vi.mocked(callRuntimeRpc).mockReset()) afterEach(() => { cleanup() @@ -326,7 +174,9 @@ describe('remote browser authoritative page state', () => { const { result } = renderNavigation() act(() => result.current.applyRemoteTabInfo(failedTab())) const reload = deferred() - vi.mocked(callRuntimeRpc).mockReturnValue(reload.promise) + vi.mocked(callRuntimeRpc).mockImplementation(async (_target, method) => + method === 'browser.reload' ? reload.promise : undefined + ) let pending!: Promise await act(async () => { pending = result.current.runRemoteNavigation('browser.reload') @@ -381,7 +231,10 @@ describe('remote browser authoritative page state', () => { commandStarted = true throw new Error('ERR_NAME_NOT_RESOLVED (-105)') } - return commandStarted ? read.promise : { tab: failedTab() } + if (method === 'browser.tabShow') { + return commandStarted ? read.promise : { tab: failedTab() } + } + return undefined }) try { lifecycle.open() diff --git a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.ts b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.ts index 418409eb6d9..0bf0af227b7 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.ts +++ b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-navigation.ts @@ -9,7 +9,10 @@ import type { BrowserTabInfo } from '../../../../../shared/browser/runtime/runti import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types' import type { RemoteBrowserOperationToken } from './remote-browser-stream-tokens' import type { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle' -import type { BrowserPageUrlSetter, BrowserTabPageState } from '../describe-page/browser-page-types' +import type { + BrowserPageUrlSetter, + BrowserPageStateWriter +} from '../describe-page/browser-page-types' import { getBrowserDisplayTitle, toDisplayUrl } from '../describe-page/browser-page-url-display' import type { RemoteBrowserPaneNotice, @@ -44,7 +47,7 @@ export function useRemoteBrowserPageNavigation({ isCurrentRemoteOperationToken: (token: RemoteBrowserOperationToken) => boolean closeMissingRemotePage: (remotePageId?: string | null) => void onSetUrl: BrowserPageUrlSetter - onUpdatePageState: (tabId: string, updates: BrowserTabPageState) => void + onUpdatePageState: BrowserPageStateWriter setPaneNotice: (notice: RemoteBrowserPaneNotice | null) => void setPaneBusy: (busy: boolean) => void }): { diff --git a/src/renderer/src/lib/browser/browser-page-loading-ownership.ts b/src/renderer/src/lib/browser/browser-page-loading-ownership.ts new file mode 100644 index 00000000000..2f95e267a37 --- /dev/null +++ b/src/renderer/src/lib/browser/browser-page-loading-ownership.ts @@ -0,0 +1,39 @@ +import type { BrowserPage } from '../../../../shared/browser-workspace-types' + +export type BrowserPageLoadingOwner = { active: boolean } + +const loadingOwners = new WeakMap() + +export function readBrowserPageLoadingOwner( + page: BrowserPage | undefined +): BrowserPageLoadingOwner | undefined { + const owner = page && loadingOwners.get(page) + return owner?.active ? owner : undefined +} + +export function revokeBrowserPageLoadingOwner(page: BrowserPage): void { + const owner = loadingOwners.get(page) + if (owner) { + owner.active = false + loadingOwners.delete(page) + } +} + +export function preserveBrowserPageLoadingOwner(previous: BrowserPage, next: BrowserPage): void { + const owner = readBrowserPageLoadingOwner(previous) + if (owner && previous !== next) { + loadingOwners.delete(previous) + loadingOwners.set(next, owner) + } +} + +export function assignBrowserPageLoadingOwner( + previous: BrowserPage, + next: BrowserPage, + owner?: BrowserPageLoadingOwner +): void { + revokeBrowserPageLoadingOwner(previous) + if (owner?.active) { + loadingOwners.set(next, owner) + } +} diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-browser-records.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-browser-records.ts index 6fb2f9687e0..5d2d33a82a8 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/apply-browser-records.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-browser-records.ts @@ -1,4 +1,8 @@ import type { applyTerminalRecordUpdates } from './apply-terminal-records' +import { + preserveBrowserPageLoadingOwner, + revokeBrowserPageLoadingOwner +} from '@/lib/browser/browser-page-loading-ownership' import { browserCertificateFailureEqual, optionalRuntimeBrowserPlacementsEqual, @@ -49,6 +53,7 @@ export function applyBrowserRecordUpdates(context: BrowserRecordContext) { if (nextBrowserPageIds.has(page.id)) { continue } + revokeBrowserPageLoadingOwner(page) if (nextBrowserCertificateFailuresByPageId[page.id]) { nextBrowserCertificateFailuresByPageId = nextBrowserCertificateFailuresByPageId === state.browserCertificateFailuresByPageId @@ -77,11 +82,20 @@ export function applyBrowserRecordUpdates(context: BrowserRecordContext) { for (const { page, + previousPage, + preservesLoading, certificateFailure, remotePageId, browserProfileId, placement } of mirroredBrowserTabs) { + if (previousPage) { + if (preservesLoading) { + preserveBrowserPageLoadingOwner(previousPage, page) + } else { + revokeBrowserPageLoadingOwner(previousPage) + } + } const current = nextBrowserPagesByWorkspace[page.workspaceId] ?? [] if (!sameBrowserPages(current, [page])) { nextBrowserPagesByWorkspace = diff --git a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-browser-tabs.ts b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-browser-tabs.ts index f47fc580b4f..bb33f8654b8 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-browser-tabs.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-browser-tabs.ts @@ -221,6 +221,8 @@ export function buildMirroredBrowserTabs( return { workspace, page, + previousPage: existing?.page, + preservesLoading: clientHostsMirroredBrowserPage(tab), certificateFailure: tab.certificateFailure ?? null, remotePageId: tab.browserPageId, ...(tab.browserProfileId ? { browserProfileId: tab.browserProfileId } : {}), diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts index 2e40169902f..93ab3ca17cf 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts @@ -185,6 +185,8 @@ export type MirroredTerminalTab = { export type MirroredBrowserTab = { workspace: BrowserWorkspace page: BrowserPage + previousPage?: BrowserPage + preservesLoading: boolean certificateFailure: BrowserCertificateFailure | null remotePageId: string browserProfileId?: string diff --git a/src/renderer/src/store/slices/browser/browser-slice-contract.ts b/src/renderer/src/store/slices/browser/browser-slice-contract.ts index fe5f62d6496..626801b2db7 100644 --- a/src/renderer/src/store/slices/browser/browser-slice-contract.ts +++ b/src/renderer/src/store/slices/browser/browser-slice-contract.ts @@ -1,4 +1,5 @@ import type { StateCreator } from 'zustand' +import type { BrowserPageLoadingOwner } from '@/lib/browser/browser-page-loading-ownership' import type { ManagedBrowserProfileOwner } from '../../../../../shared/browser/profiles/browser-profile-scope' /** What a new tab opens on; a partition only when it must not be derived from the profile. */ @@ -187,8 +188,16 @@ export type BrowserSlice = { options?: { surfacePane?: boolean } ) => void consumeAddressBarFocusRequest: (pageId: string) => boolean - updateBrowserTabPageState: (pageId: string, updates: BrowserTabPageState) => void - updateBrowserPageState: (pageId: string, updates: BrowserTabPageState) => void + updateBrowserTabPageState: ( + pageId: string, + updates: BrowserTabPageState, + loadingOwner?: BrowserPageLoadingOwner + ) => void + updateBrowserPageState: ( + pageId: string, + updates: BrowserTabPageState, + loadingOwner?: BrowserPageLoadingOwner + ) => void setBrowserPageCertificateFailure: ( pageId: string, failure: BrowserCertificateFailure | null diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-state-actions.ts b/src/renderer/src/store/slices/browser/pages/browser-page-state-actions.ts index abaabb9b1f4..79718fc4db3 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-state-actions.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-state-actions.ts @@ -1,5 +1,10 @@ import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from '../browser-slice-contract' import type { AppState } from '../../../types' +import { + assignBrowserPageLoadingOwner, + preserveBrowserPageLoadingOwner, + revokeBrowserPageLoadingOwner +} from '@/lib/browser/browser-page-loading-ownership' import '../../../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../../../shared/browser/browser-blank-page' import { @@ -29,9 +34,10 @@ export function createBrowserPageStateActions( | 'setBrowserPageUrl' > { return { - updateBrowserTabPageState: (pageId, updates) => get().updateBrowserPageState(pageId, updates), + updateBrowserTabPageState: (pageId, updates, loadingOwner) => + get().updateBrowserPageState(pageId, updates, loadingOwner), - updateBrowserPageState: (pageId, updates) => { + updateBrowserPageState: (pageId, updates, loadingOwner) => { set((s) => { const page = findPage(s.browserPagesByWorkspace, pageId) if (!page) { @@ -63,6 +69,11 @@ export function createBrowserPageStateActions( const unifiedLabelNeedsRepair = unifiedIndex !== -1 && unifiedTabs[unifiedIndex]?.label !== nextPage.title const pageStateUnchanged = browserPageEqual(nextPage, page) + if (updates.loading === undefined) { + preserveBrowserPageLoadingOwner(page, pageStateUnchanged ? page : nextPage) + } else { + assignBrowserPageLoadingOwner(page, pageStateUnchanged ? page : nextPage, loadingOwner) + } const currentPages = s.browserPagesByWorkspace[workspace.id] ?? [] const mirroredWorkspace = pageStateUnchanged ? mirrorWorkspaceFromActivePage(workspace, currentPages) @@ -192,6 +203,7 @@ export function createBrowserPageStateActions( } // Keep document URL blank at navigation sink too; committing grants here leaks to persistence, publication and address bar. const nextPageUrl = page.docLocation ? ORCA_BROWSER_BLANK_URL : nextUrl + revokeBrowserPageLoadingOwner(page) const nextPages = (s.browserPagesByWorkspace[workspace.id] ?? []).map((entry) => entry.id === pageId ? { diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-viewport-actions.ts b/src/renderer/src/store/slices/browser/pages/browser-page-viewport-actions.ts index 7c3076387aa..2117a92d616 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-viewport-actions.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-viewport-actions.ts @@ -1,5 +1,6 @@ import type { BrowserSlice, BrowserSliceSet } from '../browser-slice-contract' import { findPage, findWorkspace } from './browser-page-records' +import { preserveBrowserPageLoadingOwner } from '@/lib/browser/browser-page-loading-ownership' export function createBrowserPageViewportActions( set: BrowserSliceSet @@ -15,9 +16,14 @@ export function createBrowserPageViewportActions( if (!workspace) { return s } - const nextPages = (s.browserPagesByWorkspace[workspace.id] ?? []).map((entry) => - entry.id === pageId ? { ...entry, viewportPresetId } : entry - ) + const nextPages = (s.browserPagesByWorkspace[workspace.id] ?? []).map((entry) => { + if (entry.id !== pageId) { + return entry + } + const nextPage = { ...entry, viewportPresetId } + preserveBrowserPageLoadingOwner(entry, nextPage) + return nextPage + }) return { browserPagesByWorkspace: { ...s.browserPagesByWorkspace,