fix(agent): use default context if mainframe

agent/main/lib/Frame.ts

@@ -259,7 +259,6 @@ export default class Frame extends TypedEventEmitter<IFrameEvents> implements IF
     expression: string,
     options?: {
       isolateFromWebPageEnvironment?: boolean;
-      usePageDefaultContextId?: boolean;
       shouldAwaitExpression?: boolean;
       retriesWaitingForLoad?: number;
       returnByValue?: boolean;
@@ -277,16 +276,19 @@ export default class Frame extends TypedEventEmitter<IFrameEvents> implements IF
     }
 
     const isolateFromWebPageEnvironment = options?.isolateFromWebPageEnvironment ?? false;
-    const contextId = options?.usePageDefaultContextId
-      ? undefined
-      : await this.waitForContextId(isolateFromWebPageEnvironment);
+    let contextId: number | undefined;
 
     try {
-      if (!contextId && !options?.usePageDefaultContextId) {
-        const notFound: any = new Error('Could not find a valid context for this request');
-        notFound.code = ContextNotFoundCode;
-        throw notFound;
+      // We only need to find context id when running in isolated mode, or in a frame other than the main frame.
+      if (isolateFromWebPageEnvironment || this !== this.page.mainFrame) {
+        contextId = await this.waitForContextId(isolateFromWebPageEnvironment);
+        if (!contextId) {
+          const notFound: any = new Error('Could not find a valid context for this request');
+          notFound.code = ContextNotFoundCode;
+          throw notFound;
+        }
       }
+
       const result: Protocol.Runtime.EvaluateResponse = await this.devtoolsSession.send(
         'Runtime.evaluate',
         {
@@ -790,7 +792,7 @@ export default class Frame extends TypedEventEmitter<IFrameEvents> implements IF
     try {
       if (!this.isAttached) return;
 
-      // If an isolated world with the same worldName already exists chromium will reuse that world, 
+      // If an isolated world with the same worldName already exists chromium will reuse that world,
       // so calling this multiple times is safe, and can be used as creative way to get id of existing context.
       // We need this because our isolated world is created with `Page.addScriptToEvaluateOnNewDocument`
       // of which we don't know the contextId (since we are running with Runtime disabled to prevent detection).

agent/main/lib/FramesManager.ts

@@ -334,7 +334,7 @@ export default class FramesManager extends TypedEventEmitter<IFrameManagerEvents
     refresh?: boolean;
   }): Promise<number | undefined> {
     const devtoolsSession = opts.devtoolsSession ?? this.devtoolsSession;
-    const contextId = new Resolvable<number>(3e3);
+    const contextId = new Resolvable<number>(10e3);
 
     const subcriber = this.events.on(devtoolsSession, 'Runtime.executionContextCreated', event => {
       const { context } = event;

agent/main/lib/Page.ts

@@ -275,10 +275,7 @@ export default class Page extends TypedEventEmitter<IPageLevelEvents> implements
     expression: string,
     options?: { timeoutMs?: number; isolatedFromWebPageEnvironment?: boolean },
   ): Promise<T> {
-    return this.mainFrame.evaluate<T>(expression, {
-      ...options,
-      usePageDefaultContextId: !options?.isolatedFromWebPageEnvironment,
-    });
+    return this.mainFrame.evaluate<T>(expression, options);
   }
 
   async navigate(url: string, options: { referrer?: string } = {}): Promise<{ loaderId: string }> {

agent/main/test/Frames.test.ts

@@ -5,6 +5,7 @@ import { Browser, BrowserContext, Page } from '../index';
 import Agent from '../lib/Agent';
 import { attachFrame, setContent, waitForExists } from './_pageTestUtils';
 import { TestServer } from './server';
+import Frame from '../lib/Frame';
 
 describe('Frames', () => {
   let server: TestServer;
@@ -50,6 +51,16 @@ describe('Frames', () => {
       expect(await page.frames[1].evaluate('window.FOO')).toBe('bar');
     });
 
+    it('should not fetch context id for evaluate in mainframe', async () => {
+      await page.goto(server.emptyPage);
+      await page.waitForLoad('AllContentLoaded');
+      const mainFrame = page.mainFrame;
+
+      const spy = jest.spyOn<any, any>(mainFrame, 'waitForContextId');
+      await mainFrame.evaluate('window.location.href');
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
     it('should have correct execution contexts', async () => {
       await page.goto(`${server.baseUrl}/frames/one-frame.html`);
       await page.waitForLoad('AllContentLoaded');
@@ -94,7 +105,7 @@ describe('Frames', () => {
         await page.waitOn('frame-created', ev => ev.frame.id === 'frame1', 2000);
       }
       await expect(
-        page.frames[1].waitForLoad({ loadStatus: 'JavascriptReady', timeoutMs:1000 }),
+        page.frames[1].waitForLoad({ loadStatus: 'JavascriptReady', timeoutMs: 1000 }),
       ).resolves.toBeTruthy();
     });