@opensteer/engine-playwright 0.8.6 → 0.8.7

package/dist/index.d.cts

@@ -1021,6 +1021,7 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
     private readonly pageByPlaywrightPage;
     private readonly pendingPopupOpeners;
     private readonly preassignedPopupPageRefs;
+    private readonly queuedPopupOpenedPages;
     private readonly actionSettler;
     private pageCounter;
     private frameCounter;
@@ -1213,6 +1214,7 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
     private handleContextPage;
     private handleAttachedInitialPage;
     private initializePageController;
+    private queuePopupOpenedEvent;
     private handleFrameAttached;
     private handleFrameDetached;
     private handleFrameNavigated;

package/dist/index.d.ts

@@ -1021,6 +1021,7 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
     private readonly pageByPlaywrightPage;
     private readonly pendingPopupOpeners;
     private readonly preassignedPopupPageRefs;
+    private readonly queuedPopupOpenedPages;
     private readonly actionSettler;
     private pageCounter;
     private frameCounter;
@@ -1213,6 +1214,7 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
     private handleContextPage;
     private handleAttachedInitialPage;
     private initializePageController;
+    private queuePopupOpenedEvent;
     private handleFrameAttached;
     private handleFrameDetached;
     private handleFrameNavigated;

package/dist/index.js

@@ -3990,6 +3990,7 @@ var PlaywrightBrowserCoreEngine = class _PlaywrightBrowserCoreEngine {
   pageByPlaywrightPage = /* @__PURE__ */ new WeakMap();
   pendingPopupOpeners = /* @__PURE__ */ new WeakMap();
   preassignedPopupPageRefs = /* @__PURE__ */ new WeakMap();
+  queuedPopupOpenedPages = /* @__PURE__ */ new WeakSet();
   actionSettler = createPlaywrightActionSettler({
     flushPendingPageTasks: (sessionRef) => this.flushPendingPageTasks(sessionRef),
     flushDomUpdateTask: (controller) => this.flushDomUpdateTask(controller),
@@ -5359,17 +5360,19 @@ var PlaywrightBrowserCoreEngine = class _PlaywrightBrowserCoreEngine {
     page.on(
       "popup",
       (popupPage) => this.runControllerEvent(controller, () => {
-        const popupPageRef = createPageRef(`playwright-${++this.pageCounter}`);
-        this.preassignedPopupPageRefs.set(popupPage, popupPageRef);
-        this.pendingPopupOpeners.set(popupPage, controller.pageRef);
-        this.queueEvent(
+        const existingPopupController = this.pageByPlaywrightPage.get(popupPage);
+        const popupPageRef = existingPopupController?.pageRef ?? createPageRef(`playwright-${++this.pageCounter}`);
+        if (!existingPopupController) {
+          this.preassignedPopupPageRefs.set(popupPage, popupPageRef);
+          this.pendingPopupOpeners.set(popupPage, controller.pageRef);
+        } else if (existingPopupController.openerPageRef === void 0) {
+          existingPopupController.openerPageRef = controller.pageRef;
+        }
+        this.queuePopupOpenedEvent(
           controller.pageRef,
-          this.createEvent({
-            kind: "popup-opened",
-            sessionRef: controller.sessionRef,
-            pageRef: popupPageRef,
-            openerPageRef: controller.pageRef
-          })
+          popupPage,
+          popupPageRef,
+          controller.sessionRef
         );
       })
     );
@@ -5430,10 +5433,31 @@ var PlaywrightBrowserCoreEngine = class _PlaywrightBrowserCoreEngine {
       const openerController = pendingOpenerPageRef !== void 0 ? this.pages.get(pendingOpenerPageRef) : opener ? this.pageByPlaywrightPage.get(opener) : void 0;
       if (openerController) {
         controller.openerPageRef = openerController.pageRef;
+        this.queuePopupOpenedEvent(
+          openerController.pageRef,
+          page,
+          controller.pageRef,
+          controller.sessionRef
+        );
       }
     }
     return controller;
   }
+  queuePopupOpenedEvent(openerPageRef, popupPage, popupPageRef, sessionRef) {
+    if (this.queuedPopupOpenedPages.has(popupPage)) {
+      return;
+    }
+    this.queuedPopupOpenedPages.add(popupPage);
+    this.queueEvent(
+      openerPageRef,
+      this.createEvent({
+        kind: "popup-opened",
+        sessionRef,
+        pageRef: popupPageRef,
+        openerPageRef
+      })
+    );
+  }
   handleFrameAttached(controller, frameId, parentFrameId) {
     if (controller.framesByCdpId.has(frameId)) {
       return;