patchright-core 1.52.4 → 1.55.0

package/lib/server/dispatchers/pageDispatcher.js

@@ -34,14 +34,14 @@ var import_networkDispatchers = require("./networkDispatchers");
 var import_networkDispatchers2 = require("./networkDispatchers");
 var import_networkDispatchers3 = require("./networkDispatchers");
 var import_webSocketRouteDispatcher = require("./webSocketRouteDispatcher");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
 var import_urlMatch = require("../../utils/isomorphic/urlMatch");
 class PageDispatcher extends import_dispatcher.Dispatcher {
   constructor(parentScope, page) {
     const mainFrame = import_frameDispatcher.FrameDispatcher.from(parentScope, page.mainFrame());
     super(parentScope, page, "Page", {
       mainFrame,
-      viewportSize: page.viewportSize() || void 0,
+      viewportSize: page.emulatedSize()?.viewport,
       isClosed: page.isClosed(),
       opener: PageDispatcher.fromNullable(parentScope, page.opener())
     });
@@ -49,8 +49,23 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
     this._type_Page = true;
     this._subscriptions = /* @__PURE__ */ new Set();
     this._webSocketInterceptionPatterns = [];
+    this._bindings = [];
+    this._initScripts = [];
+    this._interceptionUrlMatchers = [];
+    this._locatorHandlers = /* @__PURE__ */ new Set();
+    this._jsCoverageActive = false;
+    this._cssCoverageActive = false;
     this.adopt(mainFrame);
     this._page = page;
+    this._requestInterceptor = (route, request) => {
+      const matchesSome = this._interceptionUrlMatchers.some((urlMatch) => (0, import_urlMatch.urlMatches)(this._page.browserContext._options.baseURL, request.url(), urlMatch));
+      if (!matchesSome) {
+        route.continue({ isFallback: true }).catch(() => {
+        });
+        return;
+      }
+      this._dispatchEvent("route", { route: new import_networkDispatchers3.RouteDispatcher(import_networkDispatchers.RequestDispatcher.from(this.parentScope(), request), route) });
+    };
     this.addObjectListener(import_page.Page.Events.Close, () => {
       this._dispatchEvent("close");
       this._dispose();
@@ -59,6 +74,7 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
     this.addObjectListener(import_page.Page.Events.Download, (download) => {
       this._dispatchEvent("download", { url: download.url, suggestedFilename: download.suggestedFilename(), artifact: import_artifactDispatcher.ArtifactDispatcher.from(parentScope, download.artifact) });
     });
+    this.addObjectListener(import_page.Page.Events.EmulatedSizeChanged, () => this._dispatchEvent("viewportSizeChanged", { viewportSize: page.emulatedSize()?.viewport }));
     this.addObjectListener(import_page.Page.Events.FileChooser, (fileChooser) => this._dispatchEvent("fileChooser", {
       element: import_elementHandlerDispatcher.ElementHandleDispatcher.from(mainFrame, fileChooser.element()),
       isMultiple: fileChooser.isMultiple()
@@ -69,9 +85,9 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
     this.addObjectListener(import_page.Page.Events.WebSocket, (webSocket) => this._dispatchEvent("webSocket", { webSocket: new import_networkDispatchers3.WebSocketDispatcher(this, webSocket) }));
     this.addObjectListener(import_page.Page.Events.Worker, (worker) => this._dispatchEvent("worker", { worker: new WorkerDispatcher(this, worker) }));
     this.addObjectListener(import_page.Page.Events.Video, (artifact) => this._dispatchEvent("video", { artifact: import_artifactDispatcher.ArtifactDispatcher.from(parentScope, artifact) }));
-    if (page._video)
-      this._dispatchEvent("video", { artifact: import_artifactDispatcher.ArtifactDispatcher.from(this.parentScope(), page._video) });
-    const frames = page._frameManager.frames();
+    if (page.video)
+      this._dispatchEvent("video", { artifact: import_artifactDispatcher.ArtifactDispatcher.from(this.parentScope(), page.video) });
+    const frames = page.frameManager.frames();
     for (let i = 1; i < frames.length; i++)
       this._onFrameAttached(frames[i]);
   }
@@ -81,54 +97,51 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
   static fromNullable(parentScope, page) {
     if (!page)
       return void 0;
-    const result = (0, import_dispatcher.existingDispatcher)(page);
+    const result = parentScope.connection.existingDispatcher(page);
     return result || new PageDispatcher(parentScope, page);
   }
   page() {
     return this._page;
   }
-  async setDefaultNavigationTimeoutNoReply(params, metadata) {
-    this._page.setDefaultNavigationTimeout(params.timeout);
-  }
-  async setDefaultTimeoutNoReply(params, metadata) {
-    this._page.setDefaultTimeout(params.timeout);
-  }
-  async exposeBinding(params, metadata) {
-    await this._page.exposeBinding(params.name, !!params.needsHandle, (source, ...args) => {
+  async exposeBinding(params, progress) {
+    const binding = await this._page.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {
       if (this._disposed)
         return;
-      const binding = new BindingCallDispatcher(this, params.name, !!params.needsHandle, source, args);
-      this._dispatchEvent("bindingCall", { binding });
-      return binding.promise();
+      const binding2 = new BindingCallDispatcher(this, params.name, !!params.needsHandle, source, args);
+      this._dispatchEvent("bindingCall", { binding: binding2 });
+      return binding2.promise();
     });
+    this._bindings.push(binding);
   }
-  async setExtraHTTPHeaders(params, metadata) {
-    await this._page.setExtraHTTPHeaders(params.headers);
+  async setExtraHTTPHeaders(params, progress) {
+    await this._page.setExtraHTTPHeaders(progress, params.headers);
   }
-  async reload(params, metadata) {
-    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.reload(metadata, params)) };
+  async reload(params, progress) {
+    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.reload(progress, params)) };
   }
-  async goBack(params, metadata) {
-    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goBack(metadata, params)) };
+  async goBack(params, progress) {
+    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goBack(progress, params)) };
   }
-  async goForward(params, metadata) {
-    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goForward(metadata, params)) };
+  async goForward(params, progress) {
+    return { response: import_networkDispatchers2.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goForward(progress, params)) };
   }
-  async requestGC(params, metadata) {
-    await this._page.requestGC();
+  async requestGC(params, progress) {
+    await progress.race(this._page.requestGC());
   }
-  async registerLocatorHandler(params, metadata) {
+  async registerLocatorHandler(params, progress) {
     const uid = this._page.registerLocatorHandler(params.selector, params.noWaitAfter);
+    this._locatorHandlers.add(uid);
     return { uid };
   }
-  async resolveLocatorHandlerNoReply(params, metadata) {
+  async resolveLocatorHandlerNoReply(params, progress) {
     this._page.resolveLocatorHandler(params.uid, params.remove);
   }
-  async unregisterLocatorHandler(params, metadata) {
+  async unregisterLocatorHandler(params, progress) {
     this._page.unregisterLocatorHandler(params.uid);
+    this._locatorHandlers.delete(params.uid);
   }
-  async emulateMedia(params, metadata) {
-    await this._page.emulateMedia({
+  async emulateMedia(params, progress) {
+    await this._page.emulateMedia(progress, {
       media: params.media,
       colorScheme: params.colorScheme,
       reducedMotion: params.reducedMotion,
@@ -136,32 +149,30 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
       contrast: params.contrast
     });
   }
-  async setViewportSize(params, metadata) {
-    await this._page.setViewportSize(params.viewportSize);
+  async setViewportSize(params, progress) {
+    await this._page.setViewportSize(progress, params.viewportSize);
   }
-  async addInitScript(params, metadata) {
-    await this._page.addInitScript(params.source);
+  async addInitScript(params, progress) {
+    this._initScripts.push(await this._page.addInitScript(progress, params.source));
   }
-  async setNetworkInterceptionPatterns(params, metadata) {
+  async setNetworkInterceptionPatterns(params, progress) {
+    const hadMatchers = this._interceptionUrlMatchers.length > 0;
     if (!params.patterns.length) {
-      await this._page.setClientRequestInterceptor(void 0);
-      return;
+      if (hadMatchers)
+        await this._page.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._page.addRequestInterceptor(progress, this._requestInterceptor);
     }
-    const urlMatchers = params.patterns.map((pattern) => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags) : pattern.glob);
-    await this._page.setClientRequestInterceptor((route, request) => {
-      const matchesSome = urlMatchers.some((urlMatch) => (0, import_urlMatch.urlMatches)(this._page._browserContext._options.baseURL, request.url(), urlMatch));
-      if (!matchesSome)
-        return false;
-      this._dispatchEvent("route", { route: import_networkDispatchers3.RouteDispatcher.from(import_networkDispatchers.RequestDispatcher.from(this.parentScope(), 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._page);
+    if (params.patterns.length && !this._routeWebSocketInitScript)
+      this._routeWebSocketInitScript = await import_webSocketRouteDispatcher.WebSocketRouteDispatcher.install(progress, this.connection, this._page);
   }
-  async expectScreenshot(params, metadata) {
+  async expectScreenshot(params, progress) {
     const mask = (params.mask || []).map(({ frame, selector }) => ({
       frame: frame._object,
       selector
@@ -170,94 +181,106 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
       frame: params.locator.frame._object,
       selector: params.locator.selector
     } : void 0;
-    return await this._page.expectScreenshot(metadata, {
+    return await this._page.expectScreenshot(progress, {
       ...params,
       locator,
       mask
     });
   }
-  async screenshot(params, metadata) {
+  async screenshot(params, progress) {
     const mask = (params.mask || []).map(({ frame, selector }) => ({
       frame: frame._object,
       selector
     }));
-    return { binary: await this._page.screenshot(metadata, { ...params, mask }) };
+    return { binary: await this._page.screenshot(progress, { ...params, mask }) };
   }
-  async close(params, metadata) {
+  async close(params, progress) {
     if (!params.runBeforeUnload)
-      metadata.potentiallyClosesScope = true;
-    await this._page.close(metadata, params);
+      progress.metadata.potentiallyClosesScope = true;
+    await this._page.close(params);
   }
-  async updateSubscription(params) {
+  async updateSubscription(params, progress) {
     if (params.event === "fileChooser")
-      await this._page.setFileChooserIntercepted(params.enabled);
+      await this._page.setFileChooserInterceptedBy(params.enabled, this);
     if (params.enabled)
       this._subscriptions.add(params.event);
     else
       this._subscriptions.delete(params.event);
   }
-  async keyboardDown(params, metadata) {
-    await this._page.keyboard.down(params.key);
+  async keyboardDown(params, progress) {
+    await this._page.keyboard.down(progress, params.key);
   }
-  async keyboardUp(params, metadata) {
-    await this._page.keyboard.up(params.key);
+  async keyboardUp(params, progress) {
+    await this._page.keyboard.up(progress, params.key);
   }
-  async keyboardInsertText(params, metadata) {
-    await this._page.keyboard.insertText(params.text);
+  async keyboardInsertText(params, progress) {
+    await this._page.keyboard.insertText(progress, params.text);
   }
-  async keyboardType(params, metadata) {
-    await this._page.keyboard.type(params.text, params);
+  async keyboardType(params, progress) {
+    await this._page.keyboard.type(progress, params.text, params);
   }
-  async keyboardPress(params, metadata) {
-    await this._page.keyboard.press(params.key, params);
+  async keyboardPress(params, progress) {
+    await this._page.keyboard.press(progress, params.key, params);
   }
-  async mouseMove(params, metadata) {
-    await this._page.mouse.move(params.x, params.y, params, metadata);
+  async mouseMove(params, progress) {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.move(progress, params.x, params.y, params);
   }
-  async mouseDown(params, metadata) {
-    await this._page.mouse.down(params, metadata);
+  async mouseDown(params, progress) {
+    progress.metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.down(progress, params);
   }
-  async mouseUp(params, metadata) {
-    await this._page.mouse.up(params, metadata);
+  async mouseUp(params, progress) {
+    progress.metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.up(progress, params);
   }
-  async mouseClick(params, metadata) {
-    await this._page.mouse.click(params.x, params.y, params, metadata);
+  async mouseClick(params, progress) {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.click(progress, params.x, params.y, params);
   }
-  async mouseWheel(params, metadata) {
-    await this._page.mouse.wheel(params.deltaX, params.deltaY);
+  async mouseWheel(params, progress) {
+    await this._page.mouse.wheel(progress, params.deltaX, params.deltaY);
   }
-  async touchscreenTap(params, metadata) {
-    await this._page.touchscreen.tap(params.x, params.y, metadata);
+  async touchscreenTap(params, progress) {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.touchscreen.tap(progress, params.x, params.y);
   }
-  async accessibilitySnapshot(params, metadata) {
-    const rootAXNode = await this._page.accessibility.snapshot({
+  async accessibilitySnapshot(params, progress) {
+    const rootAXNode = await progress.race(this._page.accessibility.snapshot({
       interestingOnly: params.interestingOnly,
       root: params.root ? params.root._elementHandle : void 0
-    });
+    }));
     return { rootAXNode: rootAXNode || void 0 };
   }
-  async pdf(params, metadata) {
+  async pdf(params, progress) {
     if (!this._page.pdf)
       throw new Error("PDF generation is only supported for Headless Chromium");
-    const buffer = await this._page.pdf(params);
+    const buffer = await progress.race(this._page.pdf(params));
     return { pdf: buffer };
   }
-  async bringToFront(params, metadata) {
-    await this._page.bringToFront();
+  async snapshotForAI(params, progress) {
+    return { snapshot: await this._page.snapshotForAI(progress) };
+  }
+  async bringToFront(params, progress) {
+    await progress.race(this._page.bringToFront());
   }
-  async startJSCoverage(params, metadata) {
+  async startJSCoverage(params, progress) {
     const coverage = this._page.coverage;
-    await coverage.startJSCoverage(params);
+    await coverage.startJSCoverage(progress, params);
+    this._jsCoverageActive = true;
   }
-  async stopJSCoverage(params, metadata) {
+  async stopJSCoverage(params, progress) {
+    this._jsCoverageActive = false;
     const coverage = this._page.coverage;
     return await coverage.stopJSCoverage();
   }
-  async startCSSCoverage(params, metadata) {
+  async startCSSCoverage(params, progress) {
     const coverage = this._page.coverage;
-    await coverage.startCSSCoverage(params);
+    await coverage.startCSSCoverage(progress, params);
+    this._cssCoverageActive = true;
   }
-  async stopCSSCoverage(params, metadata) {
+  async stopCSSCoverage(params, progress) {
+    this._cssCoverageActive = false;
     const coverage = this._page.coverage;
     return await coverage.stopCSSCoverage();
   }
@@ -268,15 +291,40 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
     this._dispatchEvent("frameDetached", { frame: import_frameDispatcher.FrameDispatcher.from(this.parentScope(), frame) });
   }
   _onDispose() {
-    if (!this._page.isClosedOrClosingOrCrashed())
-      this._page.setClientRequestInterceptor(void 0).catch(() => {
+    if (this._page.isClosedOrClosingOrCrashed())
+      return;
+    this._interceptionUrlMatchers = [];
+    this._page.removeRequestInterceptor(this._requestInterceptor).catch(() => {
+    });
+    this._page.removeExposedBindings(this._bindings).catch(() => {
+    });
+    this._bindings = [];
+    this._page.removeInitScripts(this._initScripts).catch(() => {
+    });
+    this._initScripts = [];
+    if (this._routeWebSocketInitScript)
+      import_webSocketRouteDispatcher.WebSocketRouteDispatcher.uninstall(this.connection, this._page, this._routeWebSocketInitScript).catch(() => {
+      });
+    this._routeWebSocketInitScript = void 0;
+    for (const uid of this._locatorHandlers)
+      this._page.unregisterLocatorHandler(uid);
+    this._locatorHandlers.clear();
+    this._page.setFileChooserInterceptedBy(false, this).catch(() => {
+    });
+    if (this._jsCoverageActive)
+      this._page.coverage.stopJSCoverage().catch(() => {
+      });
+    this._jsCoverageActive = false;
+    if (this._cssCoverageActive)
+      this._page.coverage.stopCSSCoverage().catch(() => {
       });
+    this._cssCoverageActive = false;
   }
 }
 class WorkerDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, worker) {
     super(scope, worker, "Worker", {
-      url: worker.url()
+      url: worker.url
     });
     this._type_Worker = true;
     this.addObjectListener(import_page.Worker.Events.Close, () => this._dispatchEvent("close"));
@@ -284,23 +332,24 @@ class WorkerDispatcher extends import_dispatcher.Dispatcher {
   static fromNullable(scope, worker) {
     if (!worker)
       return void 0;
-    const result = (0, import_dispatcher.existingDispatcher)(worker);
+    const result = scope.connection.existingDispatcher(worker);
     return result || new WorkerDispatcher(scope, worker);
   }
-  async evaluateExpression(params, metadata) {
-    return { value: (0, import_jsHandleDispatcher.serializeResult)(await this._object.evaluateExpression(params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg), params.isolatedContext)) };
+  async evaluateExpression(params, progress) {
+    return { value: (0, import_jsHandleDispatcher.serializeResult)(await progress.race(this._object.evaluateExpression(params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg)))) };
   }
-  async evaluateExpressionHandle(params, metadata) {
-    return { handle: import_elementHandlerDispatcher.ElementHandleDispatcher.fromJSHandle(this, await this._object.evaluateExpressionHandle(params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg), params.isolatedContext)) };
+  async evaluateExpressionHandle(params, progress) {
+    return { handle: import_jsHandleDispatcher.JSHandleDispatcher.fromJSHandle(this, await progress.race(this._object.evaluateExpressionHandle(params.expression, params.isFunction, (0, import_jsHandleDispatcher.parseArgument)(params.arg)))) };
   }
 }
 class BindingCallDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, name, needsHandle, source, args) {
-    super(scope, { guid: "bindingCall@" + (0, import_crypto.createGuid)() }, "BindingCall", {
-      frame: import_frameDispatcher.FrameDispatcher.from(scope.parentScope(), source.frame),
+    const frameDispatcher = import_frameDispatcher.FrameDispatcher.from(scope.parentScope(), source.frame);
+    super(scope, new import_instrumentation.SdkObject(scope._object, "bindingCall"), "BindingCall", {
+      frame: frameDispatcher,
       name,
       args: needsHandle ? void 0 : args.map(import_jsHandleDispatcher.serializeResult),
-      handle: needsHandle ? import_elementHandlerDispatcher.ElementHandleDispatcher.fromJSHandle(scope, args[0]) : void 0
+      handle: needsHandle ? import_elementHandlerDispatcher.ElementHandleDispatcher.fromJSOrElementHandle(frameDispatcher, args[0]) : void 0
     });
     this._type_BindingCall = true;
     this._promise = new Promise((resolve, reject) => {
@@ -311,11 +360,11 @@ class BindingCallDispatcher extends import_dispatcher.Dispatcher {
   promise() {
     return this._promise;
   }
-  async resolve(params, metadata) {
+  async resolve(params, progress) {
     this._resolve((0, import_jsHandleDispatcher.parseArgument)(params.result));
     this._dispose();
   }
-  async reject(params, metadata) {
+  async reject(params, progress) {
     this._reject((0, import_errors.parseError)(params.error));
     this._dispose();
   }

package/lib/server/dispatchers/playwrightDispatcher.js

@@ -31,32 +31,44 @@ var import_dispatcher = require("./dispatcher");
 var import_electronDispatcher = require("./electronDispatcher");
 var import_localUtilsDispatcher = require("./localUtilsDispatcher");
 var import_networkDispatchers = require("./networkDispatchers");
-var import_selectorsDispatcher = require("./selectorsDispatcher");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
 var import_eventsHelper = require("../utils/eventsHelper");
 class PlaywrightDispatcher extends import_dispatcher.Dispatcher {
-  constructor(scope, playwright, socksProxy, preLaunchedBrowser, prelaunchedAndroidDevice) {
-    const browserDispatcher = preLaunchedBrowser ? new import_browserDispatcher.ConnectedBrowserDispatcher(scope, preLaunchedBrowser) : void 0;
+  constructor(scope, playwright, options = {}) {
+    const denyLaunch = options.denyLaunch ?? false;
+    const chromium = new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.chromium, denyLaunch);
+    const firefox = new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.firefox, denyLaunch);
+    const webkit = new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.webkit, denyLaunch);
+    const _bidiChromium = new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright._bidiChromium, denyLaunch);
+    const _bidiFirefox = new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright._bidiFirefox, denyLaunch);
     const android = new import_androidDispatcher.AndroidDispatcher(scope, playwright.android);
-    const prelaunchedAndroidDeviceDispatcher = prelaunchedAndroidDevice ? new import_androidDispatcher2.AndroidDeviceDispatcher(android, prelaunchedAndroidDevice) : void 0;
-    super(scope, playwright, "Playwright", {
-      chromium: new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.chromium),
-      firefox: new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.firefox),
-      webkit: new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.webkit),
-      bidiChromium: new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.bidiChromium),
-      bidiFirefox: new import_browserTypeDispatcher.BrowserTypeDispatcher(scope, playwright.bidiFirefox),
+    const initializer = {
+      chromium,
+      firefox,
+      webkit,
+      _bidiChromium,
+      _bidiFirefox,
       android,
-      electron: new import_electronDispatcher.ElectronDispatcher(scope, playwright.electron),
+      electron: new import_electronDispatcher.ElectronDispatcher(scope, playwright.electron, denyLaunch),
       utils: playwright.options.isServer ? void 0 : new import_localUtilsDispatcher.LocalUtilsDispatcher(scope, playwright),
-      selectors: new import_selectorsDispatcher.SelectorsDispatcher(scope, browserDispatcher?.selectors || playwright.selectors),
-      preLaunchedBrowser: browserDispatcher,
-      preConnectedAndroidDevice: prelaunchedAndroidDeviceDispatcher,
-      socksSupport: socksProxy ? new SocksSupportDispatcher(scope, socksProxy) : void 0
-    });
+      socksSupport: options.socksProxy ? new SocksSupportDispatcher(scope, playwright, options.socksProxy) : void 0
+    };
+    let browserDispatcher;
+    if (options.preLaunchedBrowser) {
+      const browserTypeDispatcher = initializer[options.preLaunchedBrowser.options.name];
+      browserDispatcher = new import_browserDispatcher.BrowserDispatcher(browserTypeDispatcher, options.preLaunchedBrowser, {
+        ignoreStopAndKill: true,
+        isolateContexts: !options.sharedBrowser
+      });
+      initializer.preLaunchedBrowser = browserDispatcher;
+    }
+    if (options.preLaunchedAndroidDevice)
+      initializer.preConnectedAndroidDevice = new import_androidDispatcher2.AndroidDeviceDispatcher(android, options.preLaunchedAndroidDevice);
+    super(scope, playwright, "Playwright", initializer);
     this._type_Playwright = true;
     this._browserDispatcher = browserDispatcher;
   }
-  async newRequest(params) {
+  async newRequest(params, progress) {
     const request = new import_fetch.GlobalAPIRequestContext(this._object, params);
     return { request: import_networkDispatchers.APIRequestContextDispatcher.from(this.parentScope(), request) };
   }
@@ -65,8 +77,8 @@ class PlaywrightDispatcher extends import_dispatcher.Dispatcher {
   }
 }
 class SocksSupportDispatcher extends import_dispatcher.Dispatcher {
-  constructor(scope, socksProxy) {
-    super(scope, { guid: "socksSupport@" + (0, import_crypto.createGuid)() }, "SocksSupport", {});
+  constructor(scope, parent, socksProxy) {
+    super(scope, new import_instrumentation.SdkObject(parent, "socksSupport"), "SocksSupport", {});
     this._type_SocksSupport = true;
     this._socksProxy = socksProxy;
     this._socksListeners = [
@@ -75,19 +87,19 @@ class SocksSupportDispatcher extends import_dispatcher.Dispatcher {
       import_eventsHelper.eventsHelper.addEventListener(socksProxy, import_socksProxy.SocksProxy.Events.SocksClosed, (payload) => this._dispatchEvent("socksClosed", payload))
     ];
   }
-  async socksConnected(params) {
+  async socksConnected(params, progress) {
     this._socksProxy?.socketConnected(params);
   }
-  async socksFailed(params) {
+  async socksFailed(params, progress) {
     this._socksProxy?.socketFailed(params);
   }
-  async socksData(params) {
+  async socksData(params, progress) {
     this._socksProxy?.sendSocketData(params);
   }
-  async socksError(params) {
+  async socksError(params, progress) {
     this._socksProxy?.sendSocketError(params);
   }
-  async socksEnd(params) {
+  async socksEnd(params, progress) {
     this._socksProxy?.sendSocketEnd(params);
   }
   _onDispose() {

package/lib/server/dispatchers/streamDispatcher.js

@@ -23,16 +23,22 @@ __export(streamDispatcher_exports, {
 module.exports = __toCommonJS(streamDispatcher_exports);
 var import_dispatcher = require("./dispatcher");
 var import_manualPromise = require("../../utils/isomorphic/manualPromise");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
+class StreamSdkObject extends import_instrumentation.SdkObject {
+  constructor(parent, stream) {
+    super(parent, "stream");
+    this.stream = stream;
+  }
+}
 class StreamDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, stream) {
-    super(scope, { guid: "stream@" + (0, import_crypto.createGuid)(), stream }, "Stream", {});
+    super(scope, new StreamSdkObject(scope._object, stream), "Stream", {});
     this._type_Stream = true;
     this._ended = false;
     stream.once("end", () => this._ended = true);
     stream.once("error", () => this._ended = true);
   }
-  async read(params) {
+  async read(params, progress) {
     const stream = this._object.stream;
     if (this._ended)
       return { binary: Buffer.from("") };
@@ -42,15 +48,16 @@ class StreamDispatcher extends import_dispatcher.Dispatcher {
       stream.on("readable", done);
       stream.on("end", done);
       stream.on("error", done);
-      await readyPromise;
-      stream.off("readable", done);
-      stream.off("end", done);
-      stream.off("error", done);
+      await progress.race(readyPromise).finally(() => {
+        stream.off("readable", done);
+        stream.off("end", done);
+        stream.off("error", done);
+      });
     }
     const buffer = stream.read(Math.min(stream.readableLength, params.size || stream.readableLength));
     return { binary: buffer || Buffer.from("") };
   }
-  async close() {
+  async close(params, progress) {
     this._object.stream.destroy();
   }
 }

package/lib/server/dispatchers/tracingDispatcher.js

@@ -27,30 +27,39 @@ class TracingDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, tracing) {
     super(scope, tracing, "Tracing", {});
     this._type_Tracing = true;
+    this._started = false;
   }
   static from(scope, tracing) {
-    const result = (0, import_dispatcher.existingDispatcher)(tracing);
+    const result = scope.connection.existingDispatcher(tracing);
     return result || new TracingDispatcher(scope, tracing);
   }
-  async tracingStart(params) {
-    await this._object.start(params);
+  async tracingStart(params, progress) {
+    this._object.start(params);
+    this._started = true;
   }
-  async tracingStartChunk(params) {
-    return await this._object.startChunk(params);
+  async tracingStartChunk(params, progress) {
+    return await this._object.startChunk(progress, params);
   }
-  async tracingGroup(params, metadata) {
+  async tracingGroup(params, progress) {
     const { name, location } = params;
-    await this._object.group(name, location, metadata);
+    this._object.group(name, location, progress.metadata);
   }
-  async tracingGroupEnd(params) {
-    await this._object.groupEnd();
+  async tracingGroupEnd(params, progress) {
+    this._object.groupEnd();
   }
-  async tracingStopChunk(params) {
-    const { artifact, entries } = await this._object.stopChunk(params);
+  async tracingStopChunk(params, progress) {
+    const { artifact, entries } = await this._object.stopChunk(progress, params);
     return { artifact: artifact ? import_artifactDispatcher.ArtifactDispatcher.from(this, artifact) : void 0, entries };
   }
-  async tracingStop(params) {
-    await this._object.stop();
+  async tracingStop(params, progress) {
+    this._started = false;
+    await this._object.stop(progress);
+  }
+  _onDispose() {
+    if (this._started)
+      this._object.stopChunk(void 0, { mode: "discard" }).then(() => this._object.stop(void 0)).catch(() => {
+      });
+    this._started = false;
   }
 }
 // Annotate the CommonJS export names for ESM import in node: