@opensteer/engine-playwright 0.8.5 → 0.8.7

package/dist/index.d.cts

@@ -770,6 +770,12 @@ interface BrowserInspector {
         readonly args?: readonly unknown[];
         readonly timeoutMs?: number;
     }): Promise<StepResult<unknown>>;
+    evaluateFrame(input: {
+        readonly frameRef: FrameRef;
+        readonly script: string;
+        readonly args?: readonly unknown[];
+        readonly timeoutMs?: number;
+    }): Promise<StepResult<unknown>>;
 }
 interface SessionTransportExecutor {
     readonly capabilities: Readonly<BrowserCapabilities>;
@@ -1015,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;
@@ -1191,6 +1198,12 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
         readonly args?: readonly unknown[];
         readonly timeoutMs?: number;
     }): Promise<StepResult<unknown>>;
+    evaluateFrame(input: {
+        readonly frameRef: FrameRef;
+        readonly script: string;
+        readonly args?: readonly unknown[];
+        readonly timeoutMs?: number;
+    }): Promise<StepResult<unknown>>;
     addInitScript(input: BrowserInitScriptInput): Promise<BrowserInitScriptRegistration>;
     registerRoute(input: BrowserRouteRegistrationInput): Promise<BrowserRouteRegistration>;
     executeRequest(input: {
@@ -1201,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

@@ -770,6 +770,12 @@ interface BrowserInspector {
         readonly args?: readonly unknown[];
         readonly timeoutMs?: number;
     }): Promise<StepResult<unknown>>;
+    evaluateFrame(input: {
+        readonly frameRef: FrameRef;
+        readonly script: string;
+        readonly args?: readonly unknown[];
+        readonly timeoutMs?: number;
+    }): Promise<StepResult<unknown>>;
 }
 interface SessionTransportExecutor {
     readonly capabilities: Readonly<BrowserCapabilities>;
@@ -1015,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;
@@ -1191,6 +1198,12 @@ declare class PlaywrightBrowserCoreEngine implements BrowserCoreEngine {
         readonly args?: readonly unknown[];
         readonly timeoutMs?: number;
     }): Promise<StepResult<unknown>>;
+    evaluateFrame(input: {
+        readonly frameRef: FrameRef;
+        readonly script: string;
+        readonly args?: readonly unknown[];
+        readonly timeoutMs?: number;
+    }): Promise<StepResult<unknown>>;
     addInitScript(input: BrowserInitScriptInput): Promise<BrowserInitScriptRegistration>;
     registerRoute(input: BrowserRouteRegistrationInput): Promise<BrowserRouteRegistration>;
     executeRequest(input: {
@@ -1201,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

@@ -1576,6 +1576,13 @@ async function waitForActionBoundary(input) {
       continue;
     }
     if (crossDocument) {
+      if (!postLoadTrackerIsSettled(
+        await input.readTrackerState(),
+        DEFAULT_POST_LOAD_TRACKER_QUIET_WINDOW_MS
+      )) {
+        await delay(Math.min(pollIntervalMs, Math.max(0, deadline - Date.now())));
+        continue;
+      }
       return {
         trigger,
         crossDocument,
@@ -3983,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),
@@ -4948,6 +4956,39 @@ var PlaywrightBrowserCoreEngine = class _PlaywrightBrowserCoreEngine {
       throw normalizePlaywrightError(error, controller.pageRef);
     }
   }
+  async evaluateFrame(input) {
+    const frameState = this.requireFrame(input.frameRef);
+    const controller = this.requirePage(frameState.pageRef);
+    const startedAt = Date.now();
+    const frame = this.requireLiveFrame(input.frameRef);
+    try {
+      const result = await withTimeout(
+        frame.evaluate(
+          ({ script, args }) => {
+            const evaluated = (0, eval)(script);
+            if (typeof evaluated === "function") {
+              return evaluated(...args ?? []);
+            }
+            return evaluated;
+          },
+          {
+            script: input.script,
+            args: input.args ?? []
+          }
+        ),
+        input.timeoutMs
+      );
+      return this.createStepResult(controller.sessionRef, controller.pageRef, startedAt, {
+        frameRef: frameState.frameRef,
+        documentRef: frameState.currentDocument.documentRef,
+        documentEpoch: frameState.currentDocument.documentEpoch,
+        events: this.drainQueuedEvents(controller.pageRef),
+        data: result
+      });
+    } catch (error) {
+      throw normalizePlaywrightError(error, controller.pageRef);
+    }
+  }
   async addInitScript(input) {
     if (!hasCapability(this.capabilities, "instrumentation.initScripts")) {
       throw unsupportedCapabilityError("instrumentation.initScripts");
@@ -5319,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
         );
       })
     );
@@ -5390,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;