From 5887649891ea9cf1d7b3afbcf7196620ceb20ab2 Mon Sep 17 00:00:00 2001
From: Alex Rudenko <OrKoN@users.noreply.github.com>
Date: Fri, 6 Oct 2023 12:38:44 +0200
Subject: [PATCH] fix: avoid double subscription to frame manager in Page
 (#11091)

---
 packages/puppeteer-core/src/cdp/Page.ts | 36 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/packages/puppeteer-core/src/cdp/Page.ts b/packages/puppeteer-core/src/cdp/Page.ts
index 7d191d9c..8379d64c 100644
--- a/packages/puppeteer-core/src/cdp/Page.ts
+++ b/packages/puppeteer-core/src/cdp/Page.ts
@@ -246,7 +246,16 @@ export class CdpPage extends Page {
     this.#coverage = new Coverage(client);
     this.#viewport = null;
 
-    this.#setupEventListeners();
+    for (const [eventName, handler] of this.#frameManagerHandlers) {
+      this.#frameManager.on(eventName, handler);
+    }
+
+    for (const [eventName, handler] of this.#networkManagerHandlers) {
+      // TODO: Remove any.
+      this.#frameManager.networkManager.on(eventName, handler as any);
+    }
+
+    this.#setupPrimaryTargetListeners();
 
     this.#tabSession?.on(CDPSessionEvent.Swapped, async newSession => {
       this.#client = newSession;
@@ -264,7 +273,7 @@ export class CdpPage extends Page {
       this.#tracing.updateClient(newSession);
       this.#coverage.updateClient(newSession);
       await this.#frameManager.swapFrameTree(newSession);
-      this.#setupEventListeners();
+      this.#setupPrimaryTargetListeners();
     });
     this.#tabSession?.on(CDPSessionEvent.Ready, session => {
       assert(session instanceof CdpCDPSession);
@@ -278,27 +287,22 @@ export class CdpPage extends Page {
     });
   }
 
-  #setupEventListeners() {
+  /**
+   * Sets up listeners for the primary target. The primary target can change
+   * during a navigation to a prerended page.
+   */
+  #setupPrimaryTargetListeners() {
     this.#client.on(CDPSessionEvent.Ready, this.#onAttachedToTarget);
 
-    this.#target
-      ._targetManager()
-      .on(TargetManagerEvent.TargetGone, this.#onDetachedFromTarget);
-
-    for (const [eventName, handler] of this.#frameManagerHandlers) {
-      this.#frameManager.on(eventName, handler);
-    }
-
-    for (const [eventName, handler] of this.#networkManagerHandlers) {
-      // TODO: Remove any.
-      this.#frameManager.networkManager.on(eventName, handler as any);
-    }
-
     for (const [eventName, handler] of this.#sessionHandlers) {
       // TODO: Remove any.
       this.#client.on(eventName, handler as any);
     }
 
+    this.#target
+      ._targetManager()
+      .on(TargetManagerEvent.TargetGone, this.#onDetachedFromTarget);
+
     this.#target._isClosedDeferred
       .valueOrThrow()
       .then(() => {