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: use redirectCount for redirect detection in bidi/core (#11896)

Browse Source
This commit is contained in:
jrandolf 2024-02-12 16:58:22 +01:00 committed by GitHub
parent f31be36660
commit d3f00bf032
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/puppeteer-core/src/bidi/core/BrowsingContext.ts
View File

@ -241,10 +241,11 @@ export class BrowsingContext extends EventEmitter<{
if (event.context !== this.id) {
return;
}
// Means the request is a redirect. This is handled in Request.
if (this.#requests.has(event.request.request)) {
if (event.redirectCount !== 0) {
// Means the request is a redirect. This is handled in Request.
return;
}
const request = Request.from(this, event);
this.#requests.set(request.id, request);
this.emit('request', {request});

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

@ -69,7 +69,7 @@ export class Request extends EventEmitter<{
if (
event.context !== this.#browsingContext.id ||
event.request.request !== this.id ||
this.#redirect !== undefined
event.redirectCount !== this.#event.redirectCount + 1
) {
return;
}
@ -80,7 +80,8 @@ export class Request extends EventEmitter<{
sessionEmitter.on('network.fetchError', event => {
if (
event.context !== this.#browsingContext.id ||
event.request.request !== this.id
event.request.request !== this.id ||
this.#event.redirectCount !== event.redirectCount
) {
return;
}
@ -91,7 +92,8 @@ export class Request extends EventEmitter<{
sessionEmitter.on('network.responseCompleted', event => {
if (
event.context !== this.#browsingContext.id ||
event.request.request !== this.id
event.request.request !== this.id ||
this.#event.redirectCount !== event.redirectCount
) {
return;
}