github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fixup redirect in bidi/core (#11879)

Browse Source
This commit is contained in:
jrandolf 2024-02-08 15:22:41 +01:00 committed by GitHub
parent bfcd65d2f7
commit 59c4daa5ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/puppeteer-core/src/bidi/core/Request.ts
View File

@ -66,10 +66,11 @@ export class Request extends EventEmitter<{
new EventEmitter(this.#session) new EventEmitter(this.#session)
); );
sessionEmitter.on('network.beforeRequestSent', event => { sessionEmitter.on('network.beforeRequestSent', event => {
if (event.context !== this.#browsingContext.id) { if (
return; event.context !== this.#browsingContext.id ||
} event.request.request !== this.id ||
if (event.request.request !== this.id) { this.#redirect !== undefined
) {
return; return;
} }
this.#redirect = Request.from(this.#browsingContext, event); this.#redirect = Request.from(this.#browsingContext, event);
@ -77,10 +78,10 @@ export class Request extends EventEmitter<{
this.dispose(); this.dispose();
}); });
sessionEmitter.on('network.fetchError', event => { sessionEmitter.on('network.fetchError', event => {
if (event.context !== this.#browsingContext.id) { if (
return; event.context !== this.#browsingContext.id ||
} event.request.request !== this.id
if (event.request.request !== this.id) { ) {
return; return;
} }
this.#error = event.errorText; this.#error = event.errorText;
@ -88,14 +89,18 @@ export class Request extends EventEmitter<{
this.dispose(); this.dispose();
}); });
sessionEmitter.on('network.responseCompleted', event => { sessionEmitter.on('network.responseCompleted', event => {
if (event.context !== this.#browsingContext.id) { if (
return; event.context !== this.#browsingContext.id ||
} event.request.request !== this.id
if (event.request.request !== this.id) { ) {
return; return;
} }
this.#response = event.response; this.#response = event.response;
this.emit('success', this.#response); this.emit('success', this.#response);
// In case this is a redirect.
if (this.#response.status >= 300 && this.#response.status < 400) {
return;
}
this.dispose(); this.dispose();
}); });
} }
@ -126,7 +131,7 @@ export class Request extends EventEmitter<{
return this.#event.navigation ?? undefined; return this.#event.navigation ?? undefined;
} }
get redirect(): Request | undefined { get redirect(): Request | undefined {
return this.redirect; return this.#redirect;
} }
get response(): Bidi.Network.ResponseData | undefined { get response(): Bidi.Network.ResponseData | undefined {
return this.#response; return this.#response;