thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: use RxJS for wait for Navigation (#11024)

Browse Source
This commit is contained in:
Nikolay Vitkov 2023-09-26 15:02:18 +02:00 committed by GitHub
parent c502ca89e4
commit aa16ab1cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packages/puppeteer-core/src/bidi/Frame.ts
View File

@ -16,6 +16,15 @@
import * as Bidi from 'chromium-bidi/lib/cjs/protocol/protocol.js';
import {
type Observable,
firstValueFrom,
from,
fromEvent,
merge,
raceWith,
switchMap,
} from '../../third_party/rxjs/rxjs.js';
import {type CDPSession} from '../api/CDPSession.js';
import {
Frame,
@ -30,9 +39,9 @@ import {type Awaitable} from '../common/types.js';
import {
UTILITY_WORLD_NAME,
setPageContent,
waitForEvent,
waitWithTimeout,
} from '../common/util.js';
import {timeout} from '../common/util.js';
import {Deferred} from '../util/Deferred.js';
import {disposeSymbol} from '../util/disposable.js';
@ -70,7 +79,7 @@ export class BidiFrame extends Frame {
#page: BidiPage;
#context: BrowsingContext;
#timeoutSettings: TimeoutSettings;
#abortDeferred = Deferred.create<Error>();
#abortDeferred = Deferred.create<never>();
#disposed = false;
sandboxes: SandboxChart;
override _id: string;
@ -201,48 +210,32 @@ export class BidiFrame extends Frame {
): Promise<BidiHTTPResponse | null> {
const {
waitUntil = 'load',
timeout = this.#timeoutSettings.navigationTimeout(),
timeout: ms = this.#timeoutSettings.navigationTimeout(),
} = options;
const waitUntilEvent = lifeCycleToSubscribedEvent.get(
getWaitUntilSingle(waitUntil)
) as string;
const [info] = await Deferred.race([
// TODO(lightning00blade): Should also keep tack of
// navigationAborted and navigationFailed
Promise.all([
waitForEvent<Bidi.BrowsingContext.NavigationInfo>(
const info = await firstValueFrom(
merge(
fromEvent(
this.#context,
waitUntilEvent,
() => {
return true;
},
timeout,
this.#abortDeferred.valueOrThrow()
Bidi.ChromiumBidi.BrowsingContext.EventNames.NavigationStarted
).pipe(
switchMap(() => {
return fromEvent(
this.#context,
waitUntilEvent
) as Observable<Bidi.BrowsingContext.NavigationInfo>;
})
),
waitForEvent(
fromEvent(
this.#context,
Bidi.ChromiumBidi.BrowsingContext.EventNames.NavigationStarted,
() => {
return true;
},
timeout,
this.#abortDeferred.valueOrThrow()
),
]),
waitForEvent<Bidi.BrowsingContext.NavigationInfo>(
this.#context,
Bidi.ChromiumBidi.BrowsingContext.EventNames.FragmentNavigated,
() => {
return true;
},
timeout,
this.#abortDeferred.valueOrThrow()
).then(info => {
return [info, undefined];
}),
]);
Bidi.ChromiumBidi.BrowsingContext.EventNames.FragmentNavigated
) as Observable<Bidi.BrowsingContext.NavigationInfo>
).pipe(raceWith(timeout(ms), from(this.#abortDeferred.valueOrThrow())))
);
return this.#page.getNavigationResponse(info.navigation);
}