chore: detach on userSession only

puppeteer · Mar 26, 2024 · 36bbdbf · 36bbdbf
1 parent ae53ee1
commit 36bbdbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/puppeteer-core/src/bidi/CDPSession.ts b/packages/puppeteer-core/src/bidi/CDPSession.ts
@@ -20,13 +20,15 @@ export class BidiCdpSession extends CDPSession {
   static sessions = new Map<string, BidiCdpSession>();
 
   #detached = false;
+  #userCreated: boolean;
   readonly #connection: BidiConnection | undefined = undefined;
   readonly #sessionId = Deferred.create<string>();
   readonly frame: BidiFrame;
 
-  constructor(frame: BidiFrame, sessionId?: string) {
+  constructor(frame: BidiFrame, sessionId?: string, userCreated = false) {
     super();
     this.frame = frame;
+    this.#userCreated = userCreated;
     if (!this.frame.page().browser().cdpSupported) {
       return;
     }
@@ -86,10 +88,13 @@ export class BidiCdpSession extends CDPSession {
     if (this.#connection === undefined || this.#detached) {
       return;
     }
+
     try {
-      await this.frame.client.send('Target.detachFromTarget', {
-        sessionId: this.id(),
-      });
+      if (this.#userCreated) {
+        await this.frame.client.send('Target.detachFromTarget', {
+          sessionId: this.id(),
+        });
+      }
     } finally {
       BidiCdpSession.sessions.delete(this.id());
       this.#detached = true;

diff --git a/packages/puppeteer-core/src/bidi/Frame.ts b/packages/puppeteer-core/src/bidi/Frame.ts
@@ -472,7 +472,7 @@ export class BidiFrame extends Frame {
       flatten: true,
     });
     await this.browsingContext.subscribe([Bidi.ChromiumBidi.BiDiModule.Cdp]);
-    return new BidiCdpSession(this, sessionId);
+    return new BidiCdpSession(this, sessionId, true);
   }
 
   @throwIfDetached