patchright-core 1.52.5 → 1.55.1

package/lib/server/dispatchers/browserContextDispatcher.js

@@ -39,16 +39,18 @@ var import_cdpSessionDispatcher = require("./cdpSessionDispatcher");
 var import_dialogDispatcher = require("./dialogDispatcher");
 var import_dispatcher = require("./dispatcher");
 var import_elementHandlerDispatcher = require("./elementHandlerDispatcher");
+var import_frameDispatcher = require("./frameDispatcher");
+var import_jsHandleDispatcher = require("./jsHandleDispatcher");
 var import_networkDispatchers = require("./networkDispatchers");
 var import_pageDispatcher = require("./pageDispatcher");
 var import_crBrowser = require("../chromium/crBrowser");
 var import_errors = require("../errors");
-var import_recorder = require("../recorder");
 var import_tracingDispatcher = require("./tracingDispatcher");
 var import_webSocketRouteDispatcher = require("./webSocketRouteDispatcher");
 var import_writableStreamDispatcher = require("./writableStreamDispatcher");
 var import_crypto = require("../utils/crypto");
 var import_urlMatch = require("../../utils/isomorphic/urlMatch");
+var import_recorder = require("../recorder");
 var import_recorderApp = require("../recorder/recorderApp");
 class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
   constructor(parentScope, context) {
@@ -56,16 +58,30 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
     const tracing = import_tracingDispatcher.TracingDispatcher.from(parentScope, context.tracing);
     super(parentScope, context, "BrowserContext", {
       isChromium: context._browser.options.isChromium,
-      isLocalBrowserOnServer: context._browser._isCollocatedWithServer,
       requestContext,
-      tracing
+      tracing,
+      options: context._options
     });
     this._type_EventTarget = true;
     this._type_BrowserContext = true;
     this._subscriptions = /* @__PURE__ */ new Set();
     this._webSocketInterceptionPatterns = [];
+    this._bindings = [];
+    this._initScripts = [];
+    this._clockPaused = false;
+    this._interceptionUrlMatchers = [];
     this.adopt(requestContext);
     this.adopt(tracing);
+    this._requestInterceptor = (route, request) => {
+      const matchesSome = this._interceptionUrlMatchers.some((urlMatch) => (0, import_urlMatch.urlMatches)(this._context._options.baseURL, request.url(), urlMatch));
+      const routeDispatcher = this.connection.existingDispatcher(route);
+      if (!matchesSome || routeDispatcher) {
+        route.continue({ isFallback: true }).catch(() => {
+        });
+        return;
+      }
+      this._dispatchEvent("route", { route: new import_networkDispatchers.RouteDispatcher(import_networkDispatchers.RequestDispatcher.from(this, request), route) });
+    };
     this._context = context;
     const onVideo = (artifact) => {
       const artifactDispatcher = import_artifactDispatcher.ArtifactDispatcher.from(parentScope, artifact);
@@ -96,18 +112,23 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
           page: pageDispatcher,
           type: message.type(),
           text: message.text(),
-          args: message.args().map((a) => import_elementHandlerDispatcher.ElementHandleDispatcher.fromJSHandle(pageDispatcher, a)),
+          args: message.args().map((a) => {
+            const elementHandle = a.asElement();
+            if (elementHandle)
+              return import_elementHandlerDispatcher.ElementHandleDispatcher.from(import_frameDispatcher.FrameDispatcher.from(this, elementHandle._frame), elementHandle);
+            return import_jsHandleDispatcher.JSHandleDispatcher.fromJSHandle(pageDispatcher, a);
+          }),
           location: message.location()
         });
       }
     });
-    this.addObjectListener(import_browserContext.BrowserContext.Events.Dialog, (dialog) => {
-      if (this._shouldDispatchEvent(dialog.page(), "dialog"))
-        this._dispatchEvent("dialog", { dialog: new import_dialogDispatcher.DialogDispatcher(this, dialog) });
-      else
-        dialog.close().catch(() => {
-        });
-    });
+    this._dialogHandler = (dialog) => {
+      if (!this._shouldDispatchEvent(dialog.page(), "dialog"))
+        return false;
+      this._dispatchEvent("dialog", { dialog: new import_dialogDispatcher.DialogDispatcher(this, dialog) });
+      return true;
+    };
+    context.dialogManager.addDialogHandler(this._dialogHandler);
     if (context._browser.options.name === "chromium") {
       for (const page of context.backgroundPages())
         this._dispatchEvent("backgroundPage", { page: import_pageDispatcher.PageDispatcher.from(this, page) });
@@ -117,7 +138,7 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
       this.addObjectListener(import_crBrowser.CRBrowserContext.CREvents.ServiceWorker, (serviceWorker) => this._dispatchEvent("serviceWorker", { worker: new import_pageDispatcher.WorkerDispatcher(this, serviceWorker) }));
     }
     this.addObjectListener(import_browserContext.BrowserContext.Events.Request, (request) => {
-      const redirectFromDispatcher = request.redirectedFrom() && (0, import_dispatcher.existingDispatcher)(request.redirectedFrom());
+      const redirectFromDispatcher = request.redirectedFrom() && this.connection.existingDispatcher(request.redirectedFrom());
       if (!redirectFromDispatcher && !this._shouldDispatchNetworkEvent(request, "request") && !request.isNavigationRequest())
         return;
       const requestDispatcher = import_networkDispatchers.RequestDispatcher.from(this, request);
@@ -127,7 +148,7 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
       });
     });
     this.addObjectListener(import_browserContext.BrowserContext.Events.Response, (response) => {
-      const requestDispatcher = (0, import_dispatcher.existingDispatcher)(response.request());
+      const requestDispatcher = this.connection.existingDispatcher(response.request());
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(response.request(), "response"))
         return;
       this._dispatchEvent("response", {
@@ -136,7 +157,7 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
       });
     });
     this.addObjectListener(import_browserContext.BrowserContext.Events.RequestFailed, (request) => {
-      const requestDispatcher = (0, import_dispatcher.existingDispatcher)(request);
+      const requestDispatcher = this.connection.existingDispatcher(request);
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, "requestFailed"))
         return;
       this._dispatchEvent("requestFailed", {
@@ -147,7 +168,7 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
       });
     });
     this.addObjectListener(import_browserContext.BrowserContext.Events.RequestFinished, ({ request, response }) => {
-      const requestDispatcher = (0, import_dispatcher.existingDispatcher)(request);
+      const requestDispatcher = this.connection.existingDispatcher(request);
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, "requestFinished"))
         return;
       this._dispatchEvent("requestFinished", {
@@ -157,6 +178,13 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
         page: import_pageDispatcher.PageDispatcher.fromNullable(this, request.frame()?._page.initializedOrUndefined())
       });
     });
+    this.addObjectListener(import_browserContext.BrowserContext.Events.RecorderEvent, ({ event, data, page, code }) => {
+      this._dispatchEvent("recorderEvent", { event, data, code, page: import_pageDispatcher.PageDispatcher.from(this, page) });
+    });
+  }
+  static from(parentScope, context) {
+    const result = parentScope.connection.existingDispatcher(context);
+    return result || new BrowserContextDispatcher(parentScope, context);
   }
   _shouldDispatchNetworkEvent(request, event) {
     return this._shouldDispatchEvent(request.frame()?._page?.initializedOrUndefined(), event);
@@ -164,52 +192,47 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
   _shouldDispatchEvent(page, event) {
     if (this._subscriptions.has(event))
       return true;
-    const pageDispatcher = page ? (0, import_dispatcher.existingDispatcher)(page) : void 0;
+    const pageDispatcher = page ? this.connection.existingDispatcher(page) : void 0;
     if (pageDispatcher?._subscriptions.has(event))
       return true;
     return false;
   }
-  async createTempFiles(params) {
+  async createTempFiles(params, progress) {
     const dir = this._context._browser.options.artifactsDir;
     const tmpDir = import_path.default.join(dir, "upload-" + (0, import_crypto.createGuid)());
     const tempDirWithRootName = params.rootDirName ? import_path.default.join(tmpDir, import_path.default.basename(params.rootDirName)) : tmpDir;
-    await import_fs.default.promises.mkdir(tempDirWithRootName, { recursive: true });
+    await progress.race(import_fs.default.promises.mkdir(tempDirWithRootName, { recursive: true }));
     this._context._tempDirs.push(tmpDir);
     return {
       rootDir: params.rootDirName ? new import_writableStreamDispatcher.WritableStreamDispatcher(this, tempDirWithRootName) : void 0,
       writableStreams: await Promise.all(params.items.map(async (item) => {
-        await import_fs.default.promises.mkdir(import_path.default.dirname(import_path.default.join(tempDirWithRootName, item.name)), { recursive: true });
+        await progress.race(import_fs.default.promises.mkdir(import_path.default.dirname(import_path.default.join(tempDirWithRootName, item.name)), { recursive: true }));
         const file = import_fs.default.createWriteStream(import_path.default.join(tempDirWithRootName, item.name));
         return new import_writableStreamDispatcher.WritableStreamDispatcher(this, file, item.lastModifiedMs);
       }))
     };
   }
-  async setDefaultNavigationTimeoutNoReply(params) {
-    this._context.setDefaultNavigationTimeout(params.timeout);
-  }
-  async setDefaultTimeoutNoReply(params) {
-    this._context.setDefaultTimeout(params.timeout);
-  }
-  async exposeBinding(params) {
-    await this._context.exposeBinding(params.name, !!params.needsHandle, (source, ...args) => {
+  async exposeBinding(params, progress) {
+    const binding = await this._context.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {
       if (this._disposed)
         return;
       const pageDispatcher = import_pageDispatcher.PageDispatcher.from(this, source.page);
-      const binding = new import_pageDispatcher.BindingCallDispatcher(pageDispatcher, params.name, !!params.needsHandle, source, args);
-      this._dispatchEvent("bindingCall", { binding });
-      return binding.promise();
+      const binding2 = new import_pageDispatcher.BindingCallDispatcher(pageDispatcher, params.name, !!params.needsHandle, source, args);
+      this._dispatchEvent("bindingCall", { binding: binding2 });
+      return binding2.promise();
     });
+    this._bindings.push(binding);
   }
-  async newPage(params, metadata) {
-    return { page: import_pageDispatcher.PageDispatcher.from(this, await this._context.newPage(metadata)) };
+  async newPage(params, progress) {
+    return { page: import_pageDispatcher.PageDispatcher.from(this, await this._context.newPage(progress)) };
   }
-  async cookies(params) {
-    return { cookies: await this._context.cookies(params.urls) };
+  async cookies(params, progress) {
+    return { cookies: await progress.race(this._context.cookies(params.urls)) };
   }
-  async addCookies(params) {
+  async addCookies(params, progress) {
     await this._context.addCookies(params.cookies);
   }
-  async clearCookies(params) {
+  async clearCookies(params, progress) {
     const nameRe = params.nameRegexSource !== void 0 && params.nameRegexFlags !== void 0 ? new RegExp(params.nameRegexSource, params.nameRegexFlags) : void 0;
     const domainRe = params.domainRegexSource !== void 0 && params.domainRegexFlags !== void 0 ? new RegExp(params.domainRegexSource, params.domainRegexFlags) : void 0;
     const pathRe = params.pathRegexSource !== void 0 && params.pathRegexFlags !== void 0 ? new RegExp(params.pathRegexSource, params.pathRegexFlags) : void 0;
@@ -219,107 +242,134 @@ class BrowserContextDispatcher extends import_dispatcher.Dispatcher {
       path: pathRe || params.path
     });
   }
-  async grantPermissions(params) {
+  async grantPermissions(params, progress) {
     await this._context.grantPermissions(params.permissions, params.origin);
   }
-  async clearPermissions() {
+  async clearPermissions(params, progress) {
     await this._context.clearPermissions();
   }
-  async setGeolocation(params) {
+  async setGeolocation(params, progress) {
     await this._context.setGeolocation(params.geolocation);
   }
-  async setExtraHTTPHeaders(params) {
-    await this._context.setExtraHTTPHeaders(params.headers);
+  async setExtraHTTPHeaders(params, progress) {
+    await this._context.setExtraHTTPHeaders(progress, params.headers);
   }
-  async setOffline(params) {
-    await this._context.setOffline(params.offline);
+  async setOffline(params, progress) {
+    await this._context.setOffline(progress, params.offline);
   }
-  async setHTTPCredentials(params) {
-    await this._context.setHTTPCredentials(params.httpCredentials);
+  async setHTTPCredentials(params, progress) {
+    await progress.race(this._context.setHTTPCredentials(params.httpCredentials));
   }
-  async addInitScript(params) {
-    await this._context.addInitScript(params.source);
+  async addInitScript(params, progress) {
+    this._initScripts.push(await this._context.addInitScript(progress, params.source));
   }
-  async setNetworkInterceptionPatterns(params) {
+  async setNetworkInterceptionPatterns(params, progress) {
+    const hadMatchers = this._interceptionUrlMatchers.length > 0;
     if (!params.patterns.length) {
-      await this._context.setRequestInterceptor(void 0);
-      return;
+      if (hadMatchers)
+        await this._context.removeRequestInterceptor(this._requestInterceptor);
+      this._interceptionUrlMatchers = [];
+    } else {
+      this._interceptionUrlMatchers = params.patterns.map((pattern) => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags) : pattern.glob);
+      if (!hadMatchers)
+        await this._context.addRequestInterceptor(progress, this._requestInterceptor);
     }
-    const urlMatchers = params.patterns.map((pattern) => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags) : pattern.glob);
-    await this._context.setRequestInterceptor((route, request) => {
-      const matchesSome = urlMatchers.some((urlMatch) => (0, import_urlMatch.urlMatches)(this._context._options.baseURL, request.url(), urlMatch));
-      if (!matchesSome)
-        return false;
-      this._dispatchEvent("route", { route: import_networkDispatchers.RouteDispatcher.from(import_networkDispatchers.RequestDispatcher.from(this, request), route) });
-      return true;
-    });
   }
-  async setWebSocketInterceptionPatterns(params, metadata) {
+  async setWebSocketInterceptionPatterns(params, progress) {
     this._webSocketInterceptionPatterns = params.patterns;
-    if (params.patterns.length)
-      await import_webSocketRouteDispatcher.WebSocketRouteDispatcher.installIfNeeded(this._context);
+    if (params.patterns.length && !this._routeWebSocketInitScript)
+      this._routeWebSocketInitScript = await import_webSocketRouteDispatcher.WebSocketRouteDispatcher.install(progress, this.connection, this._context);
   }
-  async storageState(params, metadata) {
-    return await this._context.storageState(params.indexedDB);
+  async storageState(params, progress) {
+    return await progress.race(this._context.storageState(progress, params.indexedDB));
   }
-  async close(params, metadata) {
-    metadata.potentiallyClosesScope = true;
+  async close(params, progress) {
+    progress.metadata.potentiallyClosesScope = true;
     await this._context.close(params);
   }
-  async enableRecorder(params) {
-    await import_recorder.Recorder.show(this._context, import_recorderApp.RecorderApp.factory(this._context), params);
+  async enableRecorder(params, progress) {
+    await import_recorderApp.RecorderApp.show(this._context, params);
+  }
+  async disableRecorder(params, progress) {
+    const recorder = import_recorder.Recorder.existingForContext(this._context);
+    if (recorder)
+      recorder.setMode("none");
   }
-  async pause(params, metadata) {
+  async pause(params, progress) {
   }
-  async newCDPSession(params) {
+  async newCDPSession(params, progress) {
     if (!this._object._browser.options.isChromium)
       throw new Error(`CDP session is only available in Chromium`);
     if (!params.page && !params.frame || params.page && params.frame)
       throw new Error(`CDP session must be initiated with either Page or Frame, not none or both`);
     const crBrowserContext = this._object;
-    return { session: new import_cdpSessionDispatcher.CDPSessionDispatcher(this, await crBrowserContext.newCDPSession((params.page ? params.page : params.frame)._object)) };
+    return { session: new import_cdpSessionDispatcher.CDPSessionDispatcher(this, await progress.race(crBrowserContext.newCDPSession((params.page ? params.page : params.frame)._object))) };
   }
-  async harStart(params) {
-    const harId = await this._context._harStart(params.page ? params.page._object : null, params.options);
+  async harStart(params, progress) {
+    const harId = this._context.harStart(params.page ? params.page._object : null, params.options);
     return { harId };
   }
-  async harExport(params) {
-    const artifact = await this._context._harExport(params.harId);
+  async harExport(params, progress) {
+    const artifact = await progress.race(this._context.harExport(params.harId));
     if (!artifact)
       throw new Error("No HAR artifact. Ensure record.harPath is set.");
     return { artifact: import_artifactDispatcher.ArtifactDispatcher.from(this, artifact) };
   }
-  async clockFastForward(params, metadata) {
-    await this._context.clock.fastForward(params.ticksString ?? params.ticksNumber ?? 0);
+  async clockFastForward(params, progress) {
+    await this._context.clock.fastForward(progress, params.ticksString ?? params.ticksNumber ?? 0);
   }
-  async clockInstall(params, metadata) {
-    await this._context.clock.install(params.timeString ?? params.timeNumber ?? void 0);
+  async clockInstall(params, progress) {
+    await this._context.clock.install(progress, params.timeString ?? params.timeNumber ?? void 0);
   }
-  async clockPauseAt(params, metadata) {
-    await this._context.clock.pauseAt(params.timeString ?? params.timeNumber ?? 0);
+  async clockPauseAt(params, progress) {
+    await this._context.clock.pauseAt(progress, params.timeString ?? params.timeNumber ?? 0);
+    this._clockPaused = true;
   }
-  async clockResume(params, metadata) {
-    await this._context.clock.resume();
+  async clockResume(params, progress) {
+    await this._context.clock.resume(progress);
+    this._clockPaused = false;
   }
-  async clockRunFor(params, metadata) {
-    await this._context.clock.runFor(params.ticksString ?? params.ticksNumber ?? 0);
+  async clockRunFor(params, progress) {
+    await this._context.clock.runFor(progress, params.ticksString ?? params.ticksNumber ?? 0);
   }
-  async clockSetFixedTime(params, metadata) {
-    await this._context.clock.setFixedTime(params.timeString ?? params.timeNumber ?? 0);
+  async clockSetFixedTime(params, progress) {
+    await this._context.clock.setFixedTime(progress, params.timeString ?? params.timeNumber ?? 0);
   }
-  async clockSetSystemTime(params, metadata) {
-    await this._context.clock.setSystemTime(params.timeString ?? params.timeNumber ?? 0);
+  async clockSetSystemTime(params, progress) {
+    await this._context.clock.setSystemTime(progress, params.timeString ?? params.timeNumber ?? 0);
   }
-  async updateSubscription(params) {
+  async updateSubscription(params, progress) {
     if (params.enabled)
       this._subscriptions.add(params.event);
     else
       this._subscriptions.delete(params.event);
   }
+  async registerSelectorEngine(params, progress) {
+    this._object.selectors().register(params.selectorEngine);
+  }
+  async setTestIdAttributeName(params, progress) {
+    this._object.selectors().setTestIdAttributeName(params.testIdAttributeName);
+  }
   _onDispose() {
-    if (!this._context.isClosingOrClosed())
-      this._context.setRequestInterceptor(void 0).catch(() => {
+    if (this._context.isClosingOrClosed())
+      return;
+    this._context.dialogManager.removeDialogHandler(this._dialogHandler);
+    this._interceptionUrlMatchers = [];
+    this._context.removeRequestInterceptor(this._requestInterceptor).catch(() => {
+    });
+    this._context.removeExposedBindings(this._bindings).catch(() => {
+    });
+    this._bindings = [];
+    this._context.removeInitScripts(this._initScripts).catch(() => {
+    });
+    this._initScripts = [];
+    if (this._routeWebSocketInitScript)
+      import_webSocketRouteDispatcher.WebSocketRouteDispatcher.uninstall(this.connection, this._context, this._routeWebSocketInitScript).catch(() => {
       });
+    this._routeWebSocketInitScript = void 0;
+    if (this._clockPaused)
+      this._context.clock.resumeNoReply();
+    this._clockPaused = false;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/dispatchers/browserDispatcher.js

@@ -18,134 +18,101 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var browserDispatcher_exports = {};
 __export(browserDispatcher_exports, {
-  BrowserDispatcher: () => BrowserDispatcher,
-  ConnectedBrowserDispatcher: () => ConnectedBrowserDispatcher
+  BrowserDispatcher: () => BrowserDispatcher
 });
 module.exports = __toCommonJS(browserDispatcher_exports);
 var import_browser = require("../browser");
 var import_browserContextDispatcher = require("./browserContextDispatcher");
 var import_cdpSessionDispatcher = require("./cdpSessionDispatcher");
 var import_dispatcher = require("./dispatcher");
-var import_dispatcher2 = require("./dispatcher");
 var import_browserContext = require("../browserContext");
-var import_selectors = require("../selectors");
 var import_artifactDispatcher = require("./artifactDispatcher");
-class BrowserDispatcher extends import_dispatcher2.Dispatcher {
-  constructor(scope, browser) {
+class BrowserDispatcher extends import_dispatcher.Dispatcher {
+  constructor(scope, browser, options = {}) {
     super(scope, browser, "Browser", { version: browser.version(), name: browser.options.name });
     this._type_Browser = true;
-    this.addObjectListener(import_browser.Browser.Events.Disconnected, () => this._didClose());
+    this._isolatedContexts = /* @__PURE__ */ new Set();
+    this._options = options;
+    if (!options.isolateContexts) {
+      this.addObjectListener(import_browser.Browser.Events.Context, (context) => this._dispatchEvent("context", { context: import_browserContextDispatcher.BrowserContextDispatcher.from(this, context) }));
+      this.addObjectListener(import_browser.Browser.Events.Disconnected, () => this._didClose());
+      if (browser._defaultContext)
+        this._dispatchEvent("context", { context: import_browserContextDispatcher.BrowserContextDispatcher.from(this, browser._defaultContext) });
+      for (const context of browser.contexts())
+        this._dispatchEvent("context", { context: import_browserContextDispatcher.BrowserContextDispatcher.from(this, context) });
+    }
   }
   _didClose() {
     this._dispatchEvent("close");
     this._dispose();
   }
-  async newContext(params, metadata) {
-    const context = await this._object.newContext(metadata, params);
-    return { context: new import_browserContextDispatcher.BrowserContextDispatcher(this, context) };
-  }
-  async newContextForReuse(params, metadata) {
-    return await newContextForReuse(this._object, this, params, null, metadata);
-  }
-  async stopPendingOperations(params, metadata) {
-    await this._object.stopPendingOperations(params.reason);
-  }
-  async close(params, metadata) {
-    metadata.potentiallyClosesScope = true;
+  async newContext(params, progress) {
+    if (params.recordVideo && this._object.attribution.playwright.options.isServer)
+      params.recordVideo.dir = this._object.options.artifactsDir;
+    if (!this._options.isolateContexts) {
+      const context2 = await this._object.newContext(progress, params);
+      const contextDispatcher2 = import_browserContextDispatcher.BrowserContextDispatcher.from(this, context2);
+      return { context: contextDispatcher2 };
+    }
+    const context = await this._object.newContext(progress, params);
+    this._isolatedContexts.add(context);
+    context.on(import_browserContext.BrowserContext.Events.Close, () => this._isolatedContexts.delete(context));
+    const contextDispatcher = import_browserContextDispatcher.BrowserContextDispatcher.from(this, context);
+    this._dispatchEvent("context", { context: contextDispatcher });
+    return { context: contextDispatcher };
+  }
+  async newContextForReuse(params, progress) {
+    const context = await this._object.newContextForReuse(progress, params);
+    const contextDispatcher = import_browserContextDispatcher.BrowserContextDispatcher.from(this, context);
+    this._dispatchEvent("context", { context: contextDispatcher });
+    return { context: contextDispatcher };
+  }
+  async disconnectFromReusedContext(params, progress) {
+    const context = this._object.contextForReuse();
+    const contextDispatcher = context ? this.connection.existingDispatcher(context) : void 0;
+    if (contextDispatcher) {
+      await contextDispatcher.stopPendingOperations(new Error(params.reason));
+      contextDispatcher._dispose();
+    }
+  }
+  async close(params, progress) {
+    if (this._options.ignoreStopAndKill)
+      return;
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.close(params);
   }
-  async killForTests(_, metadata) {
-    metadata.potentiallyClosesScope = true;
+  async killForTests(params, progress) {
+    if (this._options.ignoreStopAndKill)
+      return;
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.killForTests();
   }
   async defaultUserAgentForTest() {
     return { userAgent: this._object.userAgent() };
   }
-  async newBrowserCDPSession() {
+  async newBrowserCDPSession(params, progress) {
     if (!this._object.options.isChromium)
       throw new Error(`CDP session is only available in Chromium`);
     const crBrowser = this._object;
     return { session: new import_cdpSessionDispatcher.CDPSessionDispatcher(this, await crBrowser.newBrowserCDPSession()) };
   }
-  async startTracing(params) {
+  async startTracing(params, progress) {
     if (!this._object.options.isChromium)
       throw new Error(`Tracing is only available in Chromium`);
     const crBrowser = this._object;
     await crBrowser.startTracing(params.page ? params.page._object : void 0, params);
   }
-  async stopTracing() {
-    if (!this._object.options.isChromium)
-      throw new Error(`Tracing is only available in Chromium`);
-    const crBrowser = this._object;
-    return { artifact: import_artifactDispatcher.ArtifactDispatcher.from(this, await crBrowser.stopTracing()) };
-  }
-}
-class ConnectedBrowserDispatcher extends import_dispatcher2.Dispatcher {
-  constructor(scope, browser) {
-    super(scope, browser, "Browser", { version: browser.version(), name: browser.options.name });
-    this._type_Browser = true;
-    this._contexts = /* @__PURE__ */ new Set();
-    this.selectors = new import_selectors.Selectors();
-  }
-  async newContext(params, metadata) {
-    if (params.recordVideo)
-      params.recordVideo.dir = this._object.options.artifactsDir;
-    const context = await this._object.newContext(metadata, params);
-    this._contexts.add(context);
-    context.setSelectors(this.selectors);
-    context.on(import_browserContext.BrowserContext.Events.Close, () => this._contexts.delete(context));
-    return { context: new import_browserContextDispatcher.BrowserContextDispatcher(this, context) };
-  }
-  async newContextForReuse(params, metadata) {
-    return await newContextForReuse(this._object, this, params, this.selectors, metadata);
-  }
-  async stopPendingOperations(params, metadata) {
-    await this._object.stopPendingOperations(params.reason);
-  }
-  async close() {
-  }
-  async killForTests() {
-  }
-  async defaultUserAgentForTest() {
-    throw new Error("Client should not send us Browser.defaultUserAgentForTest");
-  }
-  async newBrowserCDPSession() {
-    if (!this._object.options.isChromium)
-      throw new Error(`CDP session is only available in Chromium`);
-    const crBrowser = this._object;
-    return { session: new import_cdpSessionDispatcher.CDPSessionDispatcher(this, await crBrowser.newBrowserCDPSession()) };
-  }
-  async startTracing(params) {
-    if (!this._object.options.isChromium)
-      throw new Error(`Tracing is only available in Chromium`);
-    const crBrowser = this._object;
-    await crBrowser.startTracing(params.page ? params.page._object : void 0, params);
-  }
-  async stopTracing() {
+  async stopTracing(params, progress) {
     if (!this._object.options.isChromium)
       throw new Error(`Tracing is only available in Chromium`);
     const crBrowser = this._object;
     return { artifact: import_artifactDispatcher.ArtifactDispatcher.from(this, await crBrowser.stopTracing()) };
   }
   async cleanupContexts() {
-    await Promise.all(Array.from(this._contexts).map((context) => context.close({ reason: "Global context cleanup (connection terminated)" })));
-  }
-}
-async function newContextForReuse(browser, scope, params, selectors, metadata) {
-  const { context, needsReset } = await browser.newContextForReuse(params, metadata);
-  if (needsReset) {
-    const oldContextDispatcher = (0, import_dispatcher.existingDispatcher)(context);
-    if (oldContextDispatcher)
-      oldContextDispatcher._dispose();
-    await context.resetForReuse(metadata, params);
+    await Promise.all(Array.from(this._isolatedContexts).map((context) => context.close({ reason: "Global context cleanup (connection terminated)" })));
   }
-  if (selectors)
-    context.setSelectors(selectors);
-  const contextDispatcher = new import_browserContextDispatcher.BrowserContextDispatcher(scope, context);
-  return { context: contextDispatcher };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BrowserDispatcher,
-  ConnectedBrowserDispatcher
+  BrowserDispatcher
 });

package/lib/server/dispatchers/browserTypeDispatcher.js

@@ -25,27 +25,36 @@ var import_browserContextDispatcher = require("./browserContextDispatcher");
 var import_browserDispatcher = require("./browserDispatcher");
 var import_dispatcher = require("./dispatcher");
 class BrowserTypeDispatcher extends import_dispatcher.Dispatcher {
-  constructor(scope, browserType) {
+  constructor(scope, browserType, denyLaunch) {
     super(scope, browserType, "BrowserType", {
       executablePath: browserType.executablePath(),
       name: browserType.name()
     });
     this._type_BrowserType = true;
+    this._denyLaunch = denyLaunch;
   }
-  async launch(params, metadata) {
-    const browser = await this._object.launch(metadata, params);
+  async launch(params, progress) {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+    const browser = await this._object.launch(progress, params);
     return { browser: new import_browserDispatcher.BrowserDispatcher(this, browser) };
   }
-  async launchPersistentContext(params, metadata) {
-    const browserContext = await this._object.launchPersistentContext(metadata, params.userDataDir, params);
-    return { context: new import_browserContextDispatcher.BrowserContextDispatcher(this, browserContext) };
+  async launchPersistentContext(params, progress) {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+    const browserContext = await this._object.launchPersistentContext(progress, params.userDataDir, params);
+    const browserDispatcher = new import_browserDispatcher.BrowserDispatcher(this, browserContext._browser);
+    const contextDispatcher = import_browserContextDispatcher.BrowserContextDispatcher.from(browserDispatcher, browserContext);
+    return { browser: browserDispatcher, context: contextDispatcher };
   }
-  async connectOverCDP(params, metadata) {
-    const browser = await this._object.connectOverCDP(metadata, params.endpointURL, params);
+  async connectOverCDP(params, progress) {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+    const browser = await this._object.connectOverCDP(progress, params.endpointURL, params);
     const browserDispatcher = new import_browserDispatcher.BrowserDispatcher(this, browser);
     return {
       browser: browserDispatcher,
-      defaultContext: browser._defaultContext ? new import_browserContextDispatcher.BrowserContextDispatcher(browserDispatcher, browser._defaultContext) : void 0
+      defaultContext: browser._defaultContext ? import_browserContextDispatcher.BrowserContextDispatcher.from(browserDispatcher, browser._defaultContext) : void 0
     };
   }
 }

package/lib/server/dispatchers/cdpSessionDispatcher.js

@@ -30,11 +30,11 @@ class CDPSessionDispatcher extends import_dispatcher.Dispatcher {
     this.addObjectListener(import_crConnection.CDPSession.Events.Event, ({ method, params }) => this._dispatchEvent("event", { method, params }));
     this.addObjectListener(import_crConnection.CDPSession.Events.Closed, () => this._dispose());
   }
-  async send(params) {
-    return { result: await this._object.send(params.method, params.params) };
+  async send(params, progress) {
+    return { result: await progress.race(this._object.send(params.method, params.params)) };
   }
-  async detach(_, metadata) {
-    metadata.potentiallyClosesScope = true;
+  async detach(_, progress) {
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.detach();
   }
 }