@opensteer/engine-abp 0.8.6 → 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>;
@@ -1170,6 +1176,12 @@ declare class AbpBrowserCoreEngine 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: {
@@ -1221,6 +1233,7 @@ declare class AbpBrowserCoreEngine implements BrowserCoreEngine {
     private requireSession;
     private requirePage;
     private requireFrame;
+    private ensureFrameExecutionContext;
     private requireDocument;
     private cleanupPageController;
     private throwBackgroundError;

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>;
@@ -1170,6 +1176,12 @@ declare class AbpBrowserCoreEngine 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: {
@@ -1221,6 +1233,7 @@ declare class AbpBrowserCoreEngine implements BrowserCoreEngine {
     private requireSession;
     private requirePage;
     private requireFrame;
+    private ensureFrameExecutionContext;
     private requireDocument;
     private cleanupPageController;
     private throwBackgroundError;

package/dist/index.js

@@ -1571,6 +1571,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,
@@ -1718,6 +1725,7 @@ var PAGE_CDP_METHOD_ALLOWLIST = /* @__PURE__ */ new Set([
   "IndexedDB.requestDatabase",
   "IndexedDB.requestDatabaseNames",
   "Page.addScriptToEvaluateOnNewDocument",
+  "Page.createIsolatedWorld",
   "Page.enable",
   "Page.getFrameTree",
   "Page.getLayoutMetrics",
@@ -2402,12 +2410,11 @@ function createAbpActionSettler(context) {
     }
     await beginTrackerObservation(controller);
     const tracker = await readTrackerState(controller);
+    const mainFrameUrl = controller.mainFrameRef === void 0 ? void 0 : controller.framesByCdpId.get(controller.mainFrameRef)?.currentDocument.url;
     return {
       pageRef: controller.pageRef,
       documentRef,
-      ...controller.mainFrameRef === void 0 ? {} : {
-        url: controller.framesByCdpId.get(controller.mainFrameRef)?.currentDocument.url
-      },
+      ...mainFrameUrl === void 0 ? {} : { url: mainFrameUrl },
       ...tracker === void 0 ? {} : { tracker: capturePostLoadTrackerSnapshot(tracker) }
     };
   }
@@ -5677,6 +5684,46 @@ var AbpBrowserCoreEngine = class _AbpBrowserCoreEngine {
       throw normalizeAbpError(error, controller.pageRef);
     }
   }
+  async evaluateFrame(input) {
+    const frame = this.requireFrame(input.frameRef);
+    const controller = this.requirePage(frame.pageRef);
+    const startedAt = Date.now();
+    try {
+      const executionContextId = await withTimeout(
+        this.ensureFrameExecutionContext(controller, frame.cdpFrameId),
+        input.timeoutMs
+      );
+      const serialized = JSON.stringify({
+        script: input.script,
+        args: input.args ?? []
+      });
+      const evaluated = await withTimeout(
+        controller.cdp.send("Runtime.evaluate", {
+          contextId: executionContextId,
+          expression: `(() => {
+            const input = ${serialized};
+            const evaluated = (0, eval)(input.script);
+            if (typeof evaluated === "function") {
+              return evaluated(...(input.args ?? []));
+            }
+            return evaluated;
+          })()`,
+          returnByValue: true,
+          awaitPromise: true
+        }),
+        input.timeoutMs
+      );
+      return this.createStepResult(controller.sessionRef, controller.pageRef, startedAt, {
+        frameRef: frame.frameRef,
+        documentRef: frame.currentDocument.documentRef,
+        documentEpoch: frame.currentDocument.documentEpoch,
+        events: this.drainQueuedEvents(controller.pageRef),
+        data: evaluated.result?.value
+      });
+    } catch (error) {
+      throw normalizeAbpError(error, controller.pageRef);
+    }
+  }
   async addInitScript(_input) {
     throw unsupportedCapabilityError("instrumentation.initScripts");
   }
@@ -6932,6 +6979,15 @@ var AbpBrowserCoreEngine = class _AbpBrowserCoreEngine {
     }
     return frame;
   }
+  async ensureFrameExecutionContext(controller, cdpFrameId) {
+    const isolatedWorld = await controller.cdp.send("Page.createIsolatedWorld", {
+      frameId: cdpFrameId,
+      worldName: "__opensteer_snapshot__",
+      // CDP spells this field as `grantUniveralAccess`.
+      grantUniveralAccess: true
+    });
+    return isolatedWorld.executionContextId;
+  }
   requireDocument(documentRef) {
     const document = this.documents.get(documentRef);
     if (!document) {