patchright-core 1.50.1 → 1.51.1

package/lib/client/browserContext.js

@@ -6,31 +6,33 @@ Object.defineProperty(exports, "__esModule", {
 exports.BrowserContext = void 0;
 exports.prepareBrowserContextParams = prepareBrowserContextParams;
 exports.toClientCertificatesProtocol = toClientCertificatesProtocol;
-var _page = require("./page");
-var _frame = require("./frame");
-var network = _interopRequireWildcard(require("./network"));
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
+var _artifact = require("./artifact");
+var _browser = require("./browser");
+var _cdpSession = require("./cdpSession");
 var _channelOwner = require("./channelOwner");
 var _clientHelper = require("./clientHelper");
-var _browser = require("./browser");
-var _worker = require("./worker");
+var _clock = require("./clock");
+var _consoleMessage = require("./consoleMessage");
+var _dialog = require("./dialog");
+var _errors = require("./errors");
 var _events = require("./events");
-var _timeoutSettings = require("../common/timeoutSettings");
-var _waiter = require("./waiter");
-var _utils = require("../utils");
-var _cdpSession = require("./cdpSession");
-var _tracing = require("./tracing");
-var _artifact = require("./artifact");
 var _fetch = require("./fetch");
-var _stackTrace = require("../utils/stackTrace");
+var _frame = require("./frame");
 var _harRouter = require("./harRouter");
-var _consoleMessage = require("./consoleMessage");
-var _dialog = require("./dialog");
+var network = _interopRequireWildcard(require("./network"));
+var _page = require("./page");
+var _tracing = require("./tracing");
+var _waiter = require("./waiter");
 var _webError = require("./webError");
-var _errors = require("./errors");
-var _clock = require("./clock");
-let _Symbol$asyncDispose;
+var _worker = require("./worker");
+var _timeoutSettings = require("./timeoutSettings");
+var _fileUtils = require("./fileUtils");
+var _headers = require("../utils/isomorphic/headers");
+var _urlMatch = require("../utils/isomorphic/urlMatch");
+var _rtti = require("../utils/isomorphic/rtti");
+var _stackTrace = require("../utils/isomorphic/stackTrace");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -47,10 +49,7 @@ let _Symbol$asyncDispose;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-_Symbol$asyncDispose = Symbol.asyncDispose;
+
 class BrowserContext extends _channelOwner.ChannelOwner {
   static from(context) {
     return context._object;
@@ -67,7 +66,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     this._browser = null;
     this._browserType = void 0;
     this._bindings = new Map();
-    this._timeoutSettings = new _timeoutSettings.TimeoutSettings();
+    this._timeoutSettings = void 0;
     this._ownerPage = void 0;
     this._closedPromise = void 0;
     this._options = {};
@@ -82,6 +81,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     this._closeReason = void 0;
     this._harRouters = [];
     this.routeInjecting = false;
+    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(this._platform);
     if (parent instanceof _browser.Browser) this._browser = parent;
     (_this$_browser = this._browser) === null || _this$_browser === void 0 || _this$_browser._contexts.add(this);
     this._isChromium = ((_this$_browser2 = this._browser) === null || _this$_browser2 === void 0 ? void 0 : _this$_browser2._name) === 'chromium';
@@ -117,7 +117,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
       this.emit(_events.Events.BrowserContext.ServiceWorker, serviceWorker);
     });
     this._channel.on('console', event => {
-      const consoleMessage = new _consoleMessage.ConsoleMessage(event);
+      const consoleMessage = new _consoleMessage.ConsoleMessage(this._platform, event);
       this.emit(_events.Events.BrowserContext.Console, consoleMessage);
       const page = consoleMessage.page();
       if (page) page.emit(_events.Events.Page.Console, consoleMessage);
@@ -234,18 +234,18 @@ class BrowserContext extends _channelOwner.ChannelOwner {
   setDefaultNavigationTimeout(timeout) {
     this._timeoutSettings.setDefaultNavigationTimeout(timeout);
     this._wrapApiCall(async () => {
-      this._channel.setDefaultNavigationTimeoutNoReply({
+      await this._channel.setDefaultNavigationTimeoutNoReply({
         timeout
-      }).catch(() => {});
-    }, true);
+      });
+    }, true).catch(() => {});
   }
   setDefaultTimeout(timeout) {
     this._timeoutSettings.setDefaultTimeout(timeout);
     this._wrapApiCall(async () => {
-      this._channel.setDefaultTimeoutNoReply({
+      await this._channel.setDefaultTimeoutNoReply({
         timeout
-      }).catch(() => {});
-    }, true);
+      });
+    }, true).catch(() => {});
   }
   browser() {
     return this._browser;
@@ -271,15 +271,15 @@ class BrowserContext extends _channelOwner.ChannelOwner {
   }
   async clearCookies(options = {}) {
     await this._channel.clearCookies({
-      name: (0, _utils.isString)(options.name) ? options.name : undefined,
-      nameRegexSource: (0, _utils.isRegExp)(options.name) ? options.name.source : undefined,
-      nameRegexFlags: (0, _utils.isRegExp)(options.name) ? options.name.flags : undefined,
-      domain: (0, _utils.isString)(options.domain) ? options.domain : undefined,
-      domainRegexSource: (0, _utils.isRegExp)(options.domain) ? options.domain.source : undefined,
-      domainRegexFlags: (0, _utils.isRegExp)(options.domain) ? options.domain.flags : undefined,
-      path: (0, _utils.isString)(options.path) ? options.path : undefined,
-      pathRegexSource: (0, _utils.isRegExp)(options.path) ? options.path.source : undefined,
-      pathRegexFlags: (0, _utils.isRegExp)(options.path) ? options.path.flags : undefined
+      name: (0, _rtti.isString)(options.name) ? options.name : undefined,
+      nameRegexSource: (0, _rtti.isRegExp)(options.name) ? options.name.source : undefined,
+      nameRegexFlags: (0, _rtti.isRegExp)(options.name) ? options.name.flags : undefined,
+      domain: (0, _rtti.isString)(options.domain) ? options.domain : undefined,
+      domainRegexSource: (0, _rtti.isRegExp)(options.domain) ? options.domain.source : undefined,
+      domainRegexFlags: (0, _rtti.isRegExp)(options.domain) ? options.domain.flags : undefined,
+      path: (0, _rtti.isString)(options.path) ? options.path : undefined,
+      pathRegexSource: (0, _rtti.isRegExp)(options.path) ? options.path.source : undefined,
+      pathRegexFlags: (0, _rtti.isRegExp)(options.path) ? options.path.flags : undefined
     });
   }
   async grantPermissions(permissions, options) {
@@ -299,7 +299,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
   async setExtraHTTPHeaders(headers) {
     network.validateHeaders(headers);
     await this._channel.setExtraHTTPHeaders({
-      headers: (0, _utils.headersObjectToArray)(headers)
+      headers: (0, _headers.headersObjectToArray)(headers)
     });
   }
   async setOffline(offline) {
@@ -314,7 +314,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
   }
   async addInitScript(script, arg) {
     await this.installInjectRoute();
-    const source = await (0, _clientHelper.evaluationScript)(script, arg);
+    const source = await (0, _clientHelper.evaluationScript)(this._platform, script, arg);
     await this._channel.addInitScript({
       source
     });
@@ -336,7 +336,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     this._bindings.set(name, binding);
   }
   async route(url, handler, options = {}) {
-    this._routes.unshift(new network.RouteHandler(this._options.baseURL, url, handler, options.times));
+    this._routes.unshift(new network.RouteHandler(this._platform, this._options.baseURL, url, handler, options.times));
     await this._updateInterceptionPatterns();
   }
   async routeWebSocket(url, handler) {
@@ -362,11 +362,13 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     });
   }
   async routeFromHAR(har, options = {}) {
+    const localUtils = this._connection.localUtils();
+    if (!localUtils) throw new Error('Route from har is not supported in thin clients');
     if (options.update) {
       await this._recordIntoHAR(har, null, options);
       return;
     }
-    const harRouter = await _harRouter.HarRouter.create(this._connection.localUtils(), har, options.notFound || 'abort', {
+    const harRouter = await _harRouter.HarRouter.create(localUtils, har, options.notFound || 'abort', {
       urlMatch: options.url
     });
     this._harRouters.push(harRouter);
@@ -384,7 +386,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     const removed = [];
     const remaining = [];
     for (const route of this._routes) {
-      if ((0, _utils.urlMatchesEqual)(route.url, url) && (!handler || route.handler === handler)) removed.push(route);else remaining.push(route);
+      if ((0, _urlMatch.urlMatchesEqual)(route.url, url) && (!handler || route.handler === handler)) removed.push(route);else remaining.push(route);
     }
     await this._unrouteInternal(removed, remaining, 'default');
   }
@@ -424,10 +426,12 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     });
   }
   async storageState(options = {}) {
-    const state = await this._channel.storageState();
+    const state = await this._channel.storageState({
+      indexedDB: options.indexedDB
+    });
     if (options.path) {
-      await (0, _utils.mkdirIfNeeded)(options.path);
-      await _fs.default.promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
+      await (0, _fileUtils.mkdirIfNeeded)(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
     }
     return state;
   }
@@ -455,7 +459,7 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     this.tracing._resetStackCounter();
     this.emit(_events.Events.BrowserContext.Close, this);
   }
-  async [_Symbol$asyncDispose]() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
   async close(options = {}) {
@@ -477,8 +481,10 @@ class BrowserContext extends _channelOwner.ChannelOwner {
         const isCompressed = harParams.content === 'attach' || harParams.path.endsWith('.zip');
         const needCompressed = harParams.path.endsWith('.zip');
         if (isCompressed && !needCompressed) {
+          const localUtils = this._connection.localUtils();
+          if (!localUtils) throw new Error('Uncompressed har is not supported in thin clients');
           await artifact.saveAs(harParams.path + '.tmp');
-          await this._connection.localUtils()._channel.harUnzip({
+          await localUtils.harUnzip({
             zipFile: harParams.path + '.tmp',
             harFile: harParams.path
           });
@@ -495,31 +501,28 @@ class BrowserContext extends _channelOwner.ChannelOwner {
     await this._channel.enableRecorder(params);
   }
   async installInjectRoute() {
-    if (this.routeInjecting) return;
+    if (this.routeInjecting || this.context().routeInjecting) return;
     await this.route('**/*', async route => {
-      if (route.request().resourceType() === 'document' && route.request().url().startsWith('http')) {
-        try {
-          const response = await route.fetch({
-            maxRedirects: 0
+      try {
+        if (route.request().resourceType() === 'document' && route.request().url().startsWith('http')) {
+          const protocol = route.request().url().split(':')[0];
+          await route.continue({
+            url: protocol + '://patchright-init-script-inject.internal/'
           });
-          await route.fulfill({
-            response: response
-          });
-        } catch (e) {
+        } else {
           await route.continue();
         }
-      } else {
+      } catch (error) {
         await route.continue();
       }
     });
-    this.routeInjecting = true;
   }
 }
 exports.BrowserContext = BrowserContext;
-async function prepareStorageState(options) {
+async function prepareStorageState(platform, options) {
   if (typeof options.storageState !== 'string') return options.storageState;
   try {
-    return JSON.parse(await _fs.default.promises.readFile(options.storageState, 'utf8'));
+    return JSON.parse(await platform.fs().promises.readFile(options.storageState, 'utf8'));
   } catch (e) {
     (0, _stackTrace.rewriteErrorMessage)(e, `Error reading storage state from ${options.storageState}:\n` + e.message);
     throw e;
@@ -530,28 +533,29 @@ function prepareRecordHarOptions(options) {
   return {
     path: options.path,
     content: options.content || (options.omitContent ? 'omit' : undefined),
-    urlGlob: (0, _utils.isString)(options.urlFilter) ? options.urlFilter : undefined,
-    urlRegexSource: (0, _utils.isRegExp)(options.urlFilter) ? options.urlFilter.source : undefined,
-    urlRegexFlags: (0, _utils.isRegExp)(options.urlFilter) ? options.urlFilter.flags : undefined,
+    urlGlob: (0, _rtti.isString)(options.urlFilter) ? options.urlFilter : undefined,
+    urlRegexSource: (0, _rtti.isRegExp)(options.urlFilter) ? options.urlFilter.source : undefined,
+    urlRegexFlags: (0, _rtti.isRegExp)(options.urlFilter) ? options.urlFilter.flags : undefined,
     mode: options.mode
   };
 }
-async function prepareBrowserContextParams(options) {
+async function prepareBrowserContextParams(platform, options) {
   if (options.videoSize && !options.videosPath) throw new Error(`"videoSize" option requires "videosPath" to be specified`);
   if (options.extraHTTPHeaders) network.validateHeaders(options.extraHTTPHeaders);
   const contextParams = {
     ...options,
     viewport: options.viewport === null ? undefined : options.viewport,
     noDefaultViewport: options.viewport === null,
-    extraHTTPHeaders: options.extraHTTPHeaders ? (0, _utils.headersObjectToArray)(options.extraHTTPHeaders) : undefined,
-    storageState: await prepareStorageState(options),
+    extraHTTPHeaders: options.extraHTTPHeaders ? (0, _headers.headersObjectToArray)(options.extraHTTPHeaders) : undefined,
+    storageState: await prepareStorageState(platform, options),
     serviceWorkers: options.serviceWorkers,
     recordHar: prepareRecordHarOptions(options.recordHar),
     colorScheme: options.colorScheme === null ? 'no-override' : options.colorScheme,
     reducedMotion: options.reducedMotion === null ? 'no-override' : options.reducedMotion,
     forcedColors: options.forcedColors === null ? 'no-override' : options.forcedColors,
+    contrast: options.contrast === null ? 'no-override' : options.contrast,
     acceptDownloads: toAcceptDownloadsProtocol(options.acceptDownloads),
-    clientCertificates: await toClientCertificatesProtocol(options.clientCertificates)
+    clientCertificates: await toClientCertificatesProtocol(platform, options.clientCertificates)
   };
   if (!contextParams.recordVideo && options.videosPath) {
     contextParams.recordVideo = {
@@ -559,7 +563,7 @@ async function prepareBrowserContextParams(options) {
       size: options.videoSize
     };
   }
-  if (contextParams.recordVideo && contextParams.recordVideo.dir) contextParams.recordVideo.dir = _path.default.resolve(process.cwd(), contextParams.recordVideo.dir);
+  if (contextParams.recordVideo && contextParams.recordVideo.dir) contextParams.recordVideo.dir = platform.path().resolve(contextParams.recordVideo.dir);
   return contextParams;
 }
 function toAcceptDownloadsProtocol(acceptDownloads) {
@@ -567,11 +571,11 @@ function toAcceptDownloadsProtocol(acceptDownloads) {
   if (acceptDownloads) return 'accept';
   return 'deny';
 }
-async function toClientCertificatesProtocol(certs) {
+async function toClientCertificatesProtocol(platform, certs) {
   if (!certs) return undefined;
   const bufferizeContent = async (value, path) => {
     if (value) return value;
-    if (path) return await _fs.default.promises.readFile(path);
+    if (path) return await platform.fs().promises.readFile(path);
   };
   return await Promise.all(certs.map(async cert => ({
     origin: cert.origin,

package/lib/client/browserType.js

@@ -7,11 +7,13 @@ exports.BrowserType = void 0;
 var _browser3 = require("./browser");
 var _browserContext = require("./browserContext");
 var _channelOwner = require("./channelOwner");
-var _connection = require("./connection");
-var _events = require("./events");
 var _clientHelper = require("./clientHelper");
-var _utils = require("../utils");
-var _timeoutRunner = require("../utils/timeoutRunner");
+var _events = require("./events");
+var _assert = require("../utils/isomorphic/assert");
+var _headers = require("../utils/isomorphic/headers");
+var _time = require("../utils/isomorphic/time");
+var _timeoutRunner = require("../utils/isomorphic/timeoutRunner");
+var _webSocket = require("./webSocket");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -36,11 +38,6 @@ class BrowserType extends _channelOwner.ChannelOwner {
     this._serverLauncher = void 0;
     this._contexts = new Set();
     this._playwright = void 0;
-    // Instrumentation.
-    this._defaultContextOptions = void 0;
-    this._defaultContextTimeout = void 0;
-    this._defaultContextNavigationTimeout = void 0;
-    this._defaultLaunchOptions = void 0;
   }
   static from(browserType) {
     return browserType._object;
@@ -53,12 +50,12 @@ class BrowserType extends _channelOwner.ChannelOwner {
     return this._initializer.name;
   }
   async launch(options = {}) {
-    var _this$_defaultLaunchO;
-    (0, _utils.assert)(!options.userDataDir, 'userDataDir option is not supported in `browserType.launch`. Use `browserType.launchPersistentContext` instead');
-    (0, _utils.assert)(!options.port, 'Cannot specify a port without launching as a server.');
-    const logger = options.logger || ((_this$_defaultLaunchO = this._defaultLaunchOptions) === null || _this$_defaultLaunchO === void 0 ? void 0 : _this$_defaultLaunchO.logger);
+    var _this$_playwright$_de;
+    (0, _assert.assert)(!options.userDataDir, 'userDataDir option is not supported in `browserType.launch`. Use `browserType.launchPersistentContext` instead');
+    (0, _assert.assert)(!options.port, 'Cannot specify a port without launching as a server.');
+    const logger = options.logger || ((_this$_playwright$_de = this._playwright._defaultLaunchOptions) === null || _this$_playwright$_de === void 0 ? void 0 : _this$_playwright$_de.logger);
     options = {
-      ...this._defaultLaunchOptions,
+      ...this._playwright._defaultLaunchOptions,
       ...options
     };
     const launchOptions = {
@@ -76,28 +73,28 @@ class BrowserType extends _channelOwner.ChannelOwner {
   async launchServer(options = {}) {
     if (!this._serverLauncher) throw new Error('Launching server is not supported');
     options = {
-      ...this._defaultLaunchOptions,
+      ...this._playwright._defaultLaunchOptions,
       ...options
     };
     return await this._serverLauncher.launchServer(options);
   }
   async launchPersistentContext(userDataDir, options = {}) {
-    var _this$_defaultLaunchO2;
-    const logger = options.logger || ((_this$_defaultLaunchO2 = this._defaultLaunchOptions) === null || _this$_defaultLaunchO2 === void 0 ? void 0 : _this$_defaultLaunchO2.logger);
-    (0, _utils.assert)(!options.port, 'Cannot specify a port without launching as a server.');
+    var _this$_playwright$_de2;
+    const logger = options.logger || ((_this$_playwright$_de2 = this._playwright._defaultLaunchOptions) === null || _this$_playwright$_de2 === void 0 ? void 0 : _this$_playwright$_de2.logger);
+    (0, _assert.assert)(!options.port, 'Cannot specify a port without launching as a server.');
     options = {
-      ...this._defaultLaunchOptions,
-      ...this._defaultContextOptions,
+      ...this._playwright._defaultLaunchOptions,
+      ...this._playwright._defaultContextOptions,
       ...options
     };
-    const contextParams = await (0, _browserContext.prepareBrowserContextParams)(options);
+    const contextParams = await (0, _browserContext.prepareBrowserContextParams)(this._platform, options);
     const persistentParams = {
       ...contextParams,
       ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : undefined,
       ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs),
       env: options.env ? (0, _clientHelper.envObjectToArray)(options.env) : undefined,
       channel: options.channel,
-      userDataDir
+      userDataDir: this._platform.path().isAbsolute(userDataDir) || !userDataDir ? userDataDir : this._platform.path().resolve(userDataDir)
     };
     return await this._wrapApiCall(async () => {
       const result = await this._channel.launchPersistentContext(persistentParams);
@@ -111,19 +108,18 @@ class BrowserType extends _channelOwner.ChannelOwner {
       ...options,
       wsEndpoint: optionsOrWsEndpoint
     });
-    (0, _utils.assert)(optionsOrWsEndpoint.wsEndpoint, 'options.wsEndpoint is required');
+    (0, _assert.assert)(optionsOrWsEndpoint.wsEndpoint, 'options.wsEndpoint is required');
     return await this._connect(optionsOrWsEndpoint);
   }
   async _connect(params) {
     const logger = params.logger;
     return await this._wrapApiCall(async () => {
       var _params$exposeNetwork;
-      const deadline = params.timeout ? (0, _utils.monotonicTime)() + params.timeout : 0;
+      const deadline = params.timeout ? (0, _time.monotonicTime)() + params.timeout : 0;
       const headers = {
         'x-playwright-browser': this.name(),
         ...params.headers
       };
-      const localUtils = this._connection.localUtils();
       const connectParams = {
         wsEndpoint: params.wsEndpoint,
         headers,
@@ -132,69 +128,39 @@ class BrowserType extends _channelOwner.ChannelOwner {
         timeout: params.timeout
       };
       if (params.__testHookRedirectPortForwarding) connectParams.socksProxyRedirectPortForTest = params.__testHookRedirectPortForwarding;
-      const {
-        pipe,
-        headers: connectHeaders
-      } = await localUtils._channel.connect(connectParams);
-      const closePipe = () => pipe.close().catch(() => {});
-      const connection = new _connection.Connection(localUtils, this._instrumentation);
-      connection.markAsRemote();
-      connection.on('close', closePipe);
+      const connection = await (0, _webSocket.connectOverWebSocket)(this._connection, connectParams);
       let browser;
-      let closeError;
-      const onPipeClosed = reason => {
+      connection.on('close', () => {
         // Emulate all pages, contexts and the browser closing upon disconnect.
         for (const context of ((_browser = browser) === null || _browser === void 0 ? void 0 : _browser.contexts()) || []) {
           var _browser;
           for (const page of context.pages()) page._onClose();
           context._onClose();
         }
-        connection.close(reason || closeError);
-        // Give a chance to any API call promises to reject upon page/context closure.
-        // This happens naturally when we receive page.onClose and browser.onClose from the server
-        // in separate tasks. However, upon pipe closure we used to dispatch them all synchronously
-        // here and promises did not have a chance to reject.
-        // The order of rejects vs closure is a part of the API contract and our test runner
-        // relies on it to attribute rejections to the right test.
         setTimeout(() => {
           var _browser2;
           return (_browser2 = browser) === null || _browser2 === void 0 ? void 0 : _browser2._didClose();
         }, 0);
-      };
-      pipe.on('closed', params => onPipeClosed(params.reason));
-      connection.onmessage = message => this._wrapApiCall(() => pipe.send({
-        message
-      }).catch(() => onPipeClosed()), /* isInternal */true);
-      pipe.on('message', ({
-        message
-      }) => {
-        try {
-          connection.dispatch(message);
-        } catch (e) {
-          closeError = String(e);
-          closePipe();
-        }
       });
       const result = await (0, _timeoutRunner.raceAgainstDeadline)(async () => {
         // For tests.
         if (params.__testHookBeforeCreateBrowser) await params.__testHookBeforeCreateBrowser();
         const playwright = await connection.initializePlaywright();
         if (!playwright._initializer.preLaunchedBrowser) {
-          closePipe();
+          connection.close();
           throw new Error('Malformed endpoint. Did you use BrowserType.launchServer method?');
         }
         playwright._setSelectors(this._playwright.selectors);
         browser = _browser3.Browser.from(playwright._initializer.preLaunchedBrowser);
         this._didLaunchBrowser(browser, {}, logger);
         browser._shouldCloseConnectionOnClose = true;
-        browser._connectHeaders = connectHeaders;
-        browser.on(_events.Events.Browser.Disconnected, () => this._wrapApiCall(() => closePipe(), /* isInternal */true));
+        browser.on(_events.Events.Browser.Disconnected, () => connection.close());
         return browser;
       }, deadline);
       if (!result.timedOut) {
         return result.result;
       } else {
-        closePipe();
+        connection.close();
         throw new Error(`Timeout ${params.timeout}ms exceeded`);
       }
     });
@@ -202,12 +168,12 @@ class BrowserType extends _channelOwner.ChannelOwner {
   async connectOverCDP(endpointURLOrOptions, options) {
     if (typeof endpointURLOrOptions === 'string') return await this._connectOverCDP(endpointURLOrOptions, options);
     const endpointURL = 'endpointURL' in endpointURLOrOptions ? endpointURLOrOptions.endpointURL : endpointURLOrOptions.wsEndpoint;
-    (0, _utils.assert)(endpointURL, 'Cannot connect over CDP without wsEndpoint.');
+    (0, _assert.assert)(endpointURL, 'Cannot connect over CDP without wsEndpoint.');
     return await this.connectOverCDP(endpointURL, endpointURLOrOptions);
   }
   async _connectOverCDP(endpointURL, params = {}) {
     if (this.name() !== 'chromium') throw new Error('Connecting over CDP is only supported in Chromium.');
-    const headers = params.headers ? (0, _utils.headersObjectToArray)(params.headers) : undefined;
+    const headers = params.headers ? (0, _headers.headersObjectToArray)(params.headers) : undefined;
     const result = await this._channel.connectOverCDP({
       endpointURL,
       headers,
@@ -229,8 +195,8 @@ class BrowserType extends _channelOwner.ChannelOwner {
     context._browserType = this;
     this._contexts.add(context);
     context._setOptions(contextOptions, browserOptions);
-    if (this._defaultContextTimeout !== undefined) context.setDefaultTimeout(this._defaultContextTimeout);
-    if (this._defaultContextNavigationTimeout !== undefined) context.setDefaultNavigationTimeout(this._defaultContextNavigationTimeout);
+    if (this._playwright._defaultContextTimeout !== undefined) context.setDefaultTimeout(this._playwright._defaultContextTimeout);
+    if (this._playwright._defaultContextNavigationTimeout !== undefined) context.setDefaultNavigationTimeout(this._playwright._defaultContextNavigationTimeout);
     await this._instrumentation.runAfterCreateBrowserContext(context);
   }
   async _willCloseContext(context) {

package/lib/client/channelOwner.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChannelOwner = void 0;
 var _eventEmitter = require("./eventEmitter");
 var _validator = require("../protocol/validator");
-var _debugLogger = require("../utils/debugLogger");
-var _stackTrace = require("../utils/stackTrace");
-var _utils = require("../utils");
-var _zones = require("../utils/zones");
+var _clientStackTrace = require("./clientStackTrace");
+var _stackTrace = require("../utils/isomorphic/stackTrace");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -28,7 +26,8 @@ var _zones = require("../utils/zones");
 
 class ChannelOwner extends _eventEmitter.EventEmitter {
   constructor(parent, type, guid, initializer) {
-    super();
+    const connection = parent instanceof ChannelOwner ? parent._connection : parent;
+    super(connection._platform);
     this._connection = void 0;
     this._parent = void 0;
     this._objects = new Map();
@@ -42,7 +41,7 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
     this._isInternalType = false;
     this._wasCollected = false;
     this.setMaxListeners(0);
-    this._connection = parent instanceof ChannelOwner ? parent._connection : parent;
+    this._connection = connection;
     this._type = type;
     this._guid = guid;
     this._parent = parent instanceof ChannelOwner ? parent : undefined;
@@ -52,7 +51,7 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
       this._parent._objects.set(guid, this);
       this._logger = this._parent._logger;
     }
-    this._channel = this._createChannel(new _eventEmitter.EventEmitter());
+    this._channel = this._createChannel(new _eventEmitter.EventEmitter(connection._platform));
     this._initializer = initializer;
   }
   markAsInternalType() {
@@ -118,6 +117,13 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
       objects: Array.from(this._objects.values()).map(o => o._debugScopeState())
     };
   }
+  _validatorToWireContext() {
+    return {
+      tChannelImpl: tChannelImplToWire,
+      binary: this._connection.rawBuffers() ? 'buffer' : 'toBase64',
+      isUnderTest: () => this._platform.isUnderTest()
+    };
+  }
   _createChannel(base) {
     const channel = new Proxy(base, {
       get: (obj, prop) => {
@@ -126,16 +132,13 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
           if (validator) {
             return async params => {
               return await this._wrapApiCall(async apiZone => {
-                const validatedParams = validator(params, '', {
-                  tChannelImpl: tChannelImplToWire,
-                  binary: this._connection.rawBuffers() ? 'buffer' : 'toBase64'
-                });
+                const validatedParams = validator(params, '', this._validatorToWireContext());
                 if (!apiZone.isInternal && !apiZone.reported) {
                   // Reporting/tracing/logging this api call for the first time.
                   apiZone.params = params;
                   apiZone.reported = true;
                   this._instrumentation.onApiCallBegin(apiZone);
-                  logApiCall(this._logger, `=> ${apiZone.apiName} started`);
+                  logApiCall(this._platform, this._logger, `=> ${apiZone.apiName} started`);
                   return await this._connection.sendMessageToServer(this, prop, validatedParams, apiZone.apiName, apiZone.frames, apiZone.stepId);
                 }
                 // Since this api call is either internal, or has already been reported/traced once,
@@ -153,10 +156,10 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
   }
   async _wrapApiCall(func, isInternal) {
     const logger = this._logger;
-    const existingApiZone = _zones.zones.zoneData('apiZone');
+    const existingApiZone = this._platform.zones.current().data();
     if (existingApiZone) return await func(existingApiZone);
     if (isInternal === undefined) isInternal = this._isInternalType;
-    const stackTrace = (0, _stackTrace.captureLibraryStackTrace)();
+    const stackTrace = (0, _clientStackTrace.captureLibraryStackTrace)(this._platform);
     const apiZone = {
       apiName: stackTrace.apiName,
       frames: stackTrace.frames,
@@ -166,20 +169,20 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
       stepId: undefined
     };
     try {
-      const result = await _zones.zones.run('apiZone', apiZone, async () => await func(apiZone));
+      const result = await this._platform.zones.current().push(apiZone).run(async () => await func(apiZone));
       if (!isInternal) {
-        logApiCall(logger, `<= ${apiZone.apiName} succeeded`);
+        logApiCall(this._platform, logger, `<= ${apiZone.apiName} succeeded`);
         this._instrumentation.onApiCallEnd(apiZone);
       }
       return result;
     } catch (e) {
-      const innerError = (process.env.PWDEBUGIMPL || (0, _utils.isUnderTest)()) && e.stack ? '\n<inner error>\n' + e.stack : '';
+      const innerError = (this._platform.showInternalStackFrames() || this._platform.isUnderTest()) && e.stack ? '\n<inner error>\n' + e.stack : '';
       if (apiZone.apiName && !apiZone.apiName.includes('<anonymous>')) e.message = apiZone.apiName + ': ' + e.message;
       const stackFrames = '\n' + (0, _stackTrace.stringifyStackFrames)(stackTrace.frames).join('\n') + innerError;
       if (stackFrames.trim()) e.stack = e.message + stackFrames;else e.stack = '';
       if (!isInternal) {
         apiZone.error = e;
-        logApiCall(logger, `<= ${apiZone.apiName} failed`);
+        logApiCall(this._platform, logger, `<= ${apiZone.apiName} failed`);
         this._instrumentation.onApiCallEnd(apiZone);
       }
       throw e;
@@ -201,11 +204,11 @@ class ChannelOwner extends _eventEmitter.EventEmitter {
   }
 }
 exports.ChannelOwner = ChannelOwner;
-function logApiCall(logger, message) {
+function logApiCall(platform, logger, message) {
   if (logger && logger.isEnabled('api', 'info')) logger.log('api', 'info', message, [], {
     color: 'cyan'
   });
-  _debugLogger.debugLogger.log('api', message);
+  platform.log('api', message);
 }
 function tChannelImplToWire(names, arg, path, context) {
   if (arg._object instanceof ChannelOwner && (names === '*' || names.includes(arg._object._type))) return {