fix: use non-force close for BrowsingContext.close

src/bidiMapper/domains/context/browsingContextImpl.ts

@@ -828,4 +828,8 @@ export class BrowsingContextImpl {
       },
     };
   }
+
+  async close(): Promise<void> {
+    await this.#cdpTarget.cdpClient.sendCommand('Page.close');
+  }
 }

src/bidiMapper/domains/context/browsingContextProcessor.ts

@@ -510,32 +510,30 @@ export class BrowsingContextProcessor {
   async process_browsingContext_close(
     commandParams: BrowsingContext.CloseParameters
   ): Promise<Message.EmptyResult> {
-    const browserCdpClient = this.#cdpConnection.browserClient();
-
     const context = this.#browsingContextStorage.getContext(
       commandParams.context
     );
+
     if (!context.isTopLevelContext()) {
       throw new Message.InvalidArgumentException(
         `Non top-level browsing context ${context.id} cannot be closed.`
       );
     }
 
+    const browserCdpClient = this.#cdpConnection.browserClient();
     const detachedFromTargetPromise = new Promise<void>((resolve) => {
       const onContextDestroyed = (
-        eventParams: Protocol.Target.DetachedFromTargetEvent
+        event: Protocol.Target.DetachedFromTargetEvent
       ) => {
-        if (eventParams.targetId === commandParams.context) {
+        if (event.targetId === commandParams.context) {
           browserCdpClient.off('Target.detachedFromTarget', onContextDestroyed);
           resolve();
         }
       };
       browserCdpClient.on('Target.detachedFromTarget', onContextDestroyed);
     });
 
-    await browserCdpClient.sendCommand('Target.closeTarget', {
-      targetId: commandParams.context,
-    });
+    await context.close();
 
     // Sometimes CDP command finishes before `detachedFromTarget` event,
     // sometimes after. Wait for the CDP command to be finished, and then wait

tests/test_browsing_context.py

@@ -429,14 +429,12 @@ async def test_browsingContext_close_browsingContext_closed(
         websocket, context_id):
     await subscribe(websocket, ["browsingContext.contextDestroyed"])
 
-    await send_JSON_command(
-        websocket, {
-            "id": 12,
-            "method": "browsingContext.close",
-            "params": {
-                "context": context_id
-            }
-        })
+    command_id = await send_JSON_command(websocket, {
+        "method": "browsingContext.close",
+        "params": {
+            "context": context_id
+        }
+    })
 
     # Assert "browsingContext.contextCreated" event emitted.
     resp = await read_JSON_message(websocket)
@@ -450,9 +448,8 @@ async def test_browsingContext_close_browsingContext_closed(
         }
     }
 
-    # Assert command done.
     resp = await read_JSON_message(websocket)
-    assert resp == {"id": 12, "result": {}}
+    assert resp == {"id": command_id, "result": {}}
 
     result = await get_tree(websocket)
 

tests/test_realm.py

@@ -120,14 +120,12 @@ async def test_realm_realmDestroyed_sandbox(websocket, context_id):
             }
         })
 
-    await send_JSON_command(
-        websocket, {
-            "id": 22,
-            "method": "browsingContext.close",
-            "params": {
-                "context": context_id,
-            }
-        })
+    await send_JSON_command(websocket, {
+        "method": "browsingContext.close",
+        "params": {
+            "context": context_id,
+        }
+    })
 
     response = await read_JSON_message(websocket)