patchright-core 1.50.1 → 1.51.1

package/lib/client/page.js

@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Page = exports.BindingCall = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _errors = require("./errors");
-var _timeoutSettings = require("../common/timeoutSettings");
-var _utils = require("../utils");
 var _accessibility = require("./accessibility");
 var _artifact = require("./artifact");
 var _channelOwner = require("./channelOwner");
@@ -16,17 +11,25 @@ var _clientHelper = require("./clientHelper");
 var _coverage = require("./coverage");
 var _download = require("./download");
 var _elementHandle = require("./elementHandle");
+var _errors = require("./errors");
 var _events = require("./events");
 var _fileChooser = require("./fileChooser");
 var _frame = require("./frame");
+var _harRouter = require("./harRouter");
 var _input = require("./input");
 var _jsHandle = require("./jsHandle");
 var _network = require("./network");
 var _video = require("./video");
 var _waiter = require("./waiter");
 var _worker = require("./worker");
-var _harRouter = require("./harRouter");
-let _Symbol$asyncDispose;
+var _timeoutSettings = require("./timeoutSettings");
+var _assert = require("../utils/isomorphic/assert");
+var _fileUtils = require("./fileUtils");
+var _headers = require("../utils/isomorphic/headers");
+var _stringUtils = require("../utils/isomorphic/stringUtils");
+var _urlMatch = require("../utils/isomorphic/urlMatch");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+var _rtti = require("../utils/isomorphic/rtti");
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -43,8 +46,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 }; }
-_Symbol$asyncDispose = Symbol.asyncDispose;
+
 class Page extends _channelOwner.ChannelOwner {
   static from(page) {
     return page._object;
@@ -60,7 +62,7 @@ class Page extends _channelOwner.ChannelOwner {
     this._frames = new Set();
     this._workers = new Set();
     this._closed = false;
-    this._closedOrCrashedScope = new _utils.LongStandingScope();
+    this._closedOrCrashedScope = new _manualPromise.LongStandingScope();
     this._viewportSize = void 0;
     this._routes = [];
     this._webSocketRoutes = [];
@@ -81,7 +83,7 @@ class Page extends _channelOwner.ChannelOwner {
     this._locatorHandlers = new Map();
     this.routeInjecting = false;
     this._browserContext = parent;
-    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(this._browserContext._timeoutSettings);
+    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(this._platform, this._browserContext._timeoutSettings);
     this.accessibility = new _accessibility.Accessibility(this._channel);
     this.keyboard = new _input.Keyboard(this);
     this.mouse = new _input.Mouse(this);
@@ -209,12 +211,12 @@ class Page extends _channelOwner.ChannelOwner {
     return this._mainFrame;
   }
   frame(frameSelector) {
-    const name = (0, _utils.isString)(frameSelector) ? frameSelector : frameSelector.name;
-    const url = (0, _utils.isObject)(frameSelector) ? frameSelector.url : undefined;
-    (0, _utils.assert)(name || url, 'Either name or url matcher should be specified');
+    const name = (0, _rtti.isString)(frameSelector) ? frameSelector : frameSelector.name;
+    const url = (0, _rtti.isObject)(frameSelector) ? frameSelector.url : undefined;
+    (0, _assert.assert)(name || url, 'Either name or url matcher should be specified');
     return this.frames().find(f => {
       if (name) return f.name() === name;
-      return (0, _utils.urlMatches)(this._browserContext._options.baseURL, f.url(), url);
+      return (0, _urlMatch.urlMatches)(this._browserContext._options.baseURL, f.url(), url);
     }) || null;
   }
   frames() {
@@ -223,18 +225,18 @@ class Page 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(() => {});
   }
   _forceVideo() {
     if (!this._video) this._video = new _video.Video(this, this._connection);
@@ -256,9 +258,9 @@ class Page extends _channelOwner.ChannelOwner {
   async dispatchEvent(selector, type, eventInit, options) {
     return await this._mainFrame.dispatchEvent(selector, type, eventInit, options);
   }
-  async evaluateHandle(pageFunction, arg) {
-    (0, _jsHandle.assertMaxArguments)(arguments.length, 2);
-    return await this._mainFrame.evaluateHandle(pageFunction, arg);
+  async evaluateHandle(pageFunction, arg, isolatedContext = true) {
+    (0, _jsHandle.assertMaxArguments)(arguments.length, 3);
+    return await this._mainFrame.evaluateHandle(pageFunction, arg, isolatedContext);
   }
   async $eval(selector, pageFunction, arg) {
     (0, _jsHandle.assertMaxArguments)(arguments.length, 3);
@@ -296,7 +298,7 @@ class Page extends _channelOwner.ChannelOwner {
   async setExtraHTTPHeaders(headers) {
     (0, _network.validateHeaders)(headers);
     await this._channel.setExtraHTTPHeaders({
-      headers: (0, _utils.headersObjectToArray)(headers)
+      headers: (0, _headers.headersObjectToArray)(headers)
     });
   }
   url() {
@@ -371,7 +373,7 @@ class Page extends _channelOwner.ChannelOwner {
   }
   async waitForRequest(urlOrPredicate, options = {}) {
     const predicate = async request => {
-      if ((0, _utils.isString)(urlOrPredicate) || (0, _utils.isRegExp)(urlOrPredicate)) return (0, _utils.urlMatches)(this._browserContext._options.baseURL, request.url(), urlOrPredicate);
+      if ((0, _rtti.isString)(urlOrPredicate) || (0, _rtti.isRegExp)(urlOrPredicate)) return (0, _urlMatch.urlMatches)(this._browserContext._options.baseURL, request.url(), urlOrPredicate);
       return await urlOrPredicate(request);
     };
     const trimmedUrl = trimUrl(urlOrPredicate);
@@ -383,7 +385,7 @@ class Page extends _channelOwner.ChannelOwner {
   }
   async waitForResponse(urlOrPredicate, options = {}) {
     const predicate = async response => {
-      if ((0, _utils.isString)(urlOrPredicate) || (0, _utils.isRegExp)(urlOrPredicate)) return (0, _utils.urlMatches)(this._browserContext._options.baseURL, response.url(), urlOrPredicate);
+      if ((0, _rtti.isString)(urlOrPredicate) || (0, _rtti.isRegExp)(urlOrPredicate)) return (0, _urlMatch.urlMatches)(this._browserContext._options.baseURL, response.url(), urlOrPredicate);
       return await urlOrPredicate(response);
     };
     const trimmedUrl = trimUrl(urlOrPredicate);
@@ -435,7 +437,8 @@ class Page extends _channelOwner.ChannelOwner {
       media: options.media === null ? 'no-override' : options.media,
       colorScheme: options.colorScheme === null ? 'no-override' : options.colorScheme,
       reducedMotion: options.reducedMotion === null ? 'no-override' : options.reducedMotion,
-      forcedColors: options.forcedColors === null ? 'no-override' : options.forcedColors
+      forcedColors: options.forcedColors === null ? 'no-override' : options.forcedColors,
+      contrast: options.contrast === null ? 'no-override' : options.contrast
     });
   }
   async setViewportSize(viewportSize) {
@@ -447,27 +450,29 @@ class Page extends _channelOwner.ChannelOwner {
   viewportSize() {
     return this._viewportSize;
   }
-  async evaluate(pageFunction, arg) {
-    (0, _jsHandle.assertMaxArguments)(arguments.length, 2);
-    return await this._mainFrame.evaluate(pageFunction, arg);
+  async evaluate(pageFunction, arg, isolatedContext = true) {
+    (0, _jsHandle.assertMaxArguments)(arguments.length, 3);
+    return await this._mainFrame.evaluate(pageFunction, arg, isolatedContext);
   }
   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
     });
   }
   async route(url, handler, options = {}) {
-    this._routes.unshift(new _network.RouteHandler(this._browserContext._options.baseURL, url, handler, options.times));
+    this._routes.unshift(new _network.RouteHandler(this._platform, this._browserContext._options.baseURL, url, handler, options.times));
     await this._updateInterceptionPatterns();
   }
   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._browserContext._recordIntoHAR(har, this, 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);
@@ -489,7 +494,7 @@ class Page 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');
   }
@@ -513,21 +518,22 @@ class Page extends _channelOwner.ChannelOwner {
     });
   }
   async screenshot(options = {}) {
+    const mask = options.mask;
     const copy = {
       ...options,
       mask: undefined
     };
     if (!copy.type) copy.type = (0, _elementHandle.determineScreenshotType)(options);
-    if (options.mask) {
-      copy.mask = options.mask.map(locator => ({
+    if (mask) {
+      copy.mask = mask.map(locator => ({
         frame: locator._frame._channel,
         selector: locator._selector
       }));
     }
     const result = await this._channel.screenshot(copy);
     if (options.path) {
-      await (0, _utils.mkdirIfNeeded)(options.path);
-      await _fs.default.promises.writeFile(options.path, result.binary);
+      await (0, _fileUtils.mkdirIfNeeded)(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, result.binary);
     }
     return result.binary;
   }
@@ -553,7 +559,7 @@ class Page extends _channelOwner.ChannelOwner {
   async bringToFront() {
     await this._channel.bringToFront();
   }
-  async [_Symbol$asyncDispose]() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
   async close(options = {}) {
@@ -682,7 +688,7 @@ class Page extends _channelOwner.ChannelOwner {
   }
   async pause(_options) {
     var _this$_instrumentatio;
-    if (require('inspector').url()) return;
+    if (this._platform.isJSDebuggerAttached()) return;
     const defaultNavigationTimeout = this._browserContext._timeoutSettings.defaultNavigationTimeout();
     const defaultTimeout = this._browserContext._timeoutSettings.defaultTimeout();
     this._browserContext.setDefaultNavigationTimeout(0);
@@ -709,32 +715,30 @@ class Page extends _channelOwner.ChannelOwner {
     }
     const result = await this._channel.pdf(transportOptions);
     if (options.path) {
-      await _fs.default.promises.mkdir(_path.default.dirname(options.path), {
+      const platform = this._platform;
+      await platform.fs().promises.mkdir(platform.path().dirname(options.path), {
         recursive: true
       });
-      await _fs.default.promises.writeFile(options.path, result.pdf);
+      await platform.fs().promises.writeFile(options.path, result.pdf);
     }
     return result.pdf;
   }
   async installInjectRoute() {
     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
-          });
-          await route.fulfill({
-            response: response
+      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/'
           });
-        } catch (e) {
+        } else {
           await route.continue();
         }
-      } else {
+      } catch (error) {
         await route.continue();
       }
     });
-    this.routeInjecting = true;
   }
 }
 exports.Page = Page;
@@ -767,6 +771,6 @@ class BindingCall extends _channelOwner.ChannelOwner {
 }
 exports.BindingCall = BindingCall;
 function trimUrl(param) {
-  if ((0, _utils.isRegExp)(param)) return `/${(0, _utils.trimStringWithEllipsis)(param.source, 50)}/${param.flags}`;
-  if ((0, _utils.isString)(param)) return `"${(0, _utils.trimStringWithEllipsis)(param, 50)}"`;
+  if ((0, _rtti.isRegExp)(param)) return `/${(0, _stringUtils.trimStringWithEllipsis)(param.source, 50)}/${param.flags}`;
+  if ((0, _rtti.isString)(param)) return `"${(0, _stringUtils.trimStringWithEllipsis)(param, 50)}"`;
 }

package/lib/client/platform.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.emptyPlatform = void 0;
+var _colors = require("../utils/isomorphic/colors");
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const noopZone = {
+  push: () => noopZone,
+  pop: () => noopZone,
+  run: func => func(),
+  data: () => undefined
+};
+const emptyPlatform = exports.emptyPlatform = {
+  name: 'empty',
+  boxedStackPrefixes: () => [],
+  calculateSha1: async () => {
+    throw new Error('Not implemented');
+  },
+  colors: _colors.webColors,
+  createGuid: () => {
+    throw new Error('Not implemented');
+  },
+  defaultMaxListeners: () => 10,
+  env: {},
+  fs: () => {
+    throw new Error('Not implemented');
+  },
+  inspectCustom: undefined,
+  isDebugMode: () => false,
+  isJSDebuggerAttached: () => false,
+  isLogEnabled(name) {
+    return false;
+  },
+  isUnderTest: () => false,
+  log(name, message) {},
+  path: () => {
+    throw new Error('Function not implemented.');
+  },
+  pathSeparator: '/',
+  showInternalStackFrames: () => false,
+  streamFile(path, writable) {
+    throw new Error('Streams are not available');
+  },
+  streamReadable: channel => {
+    throw new Error('Streams are not available');
+  },
+  streamWritable: channel => {
+    throw new Error('Streams are not available');
+  },
+  zones: {
+    empty: noopZone,
+    current: () => noopZone
+  }
+};

package/lib/client/playwright.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Playwright = void 0;
-var _errors = require("./errors");
 var _android = require("./android");
+var _browser = require("./browser");
 var _browserType = require("./browserType");
 var _channelOwner = require("./channelOwner");
 var _electron = require("./electron");
+var _errors = require("./errors");
 var _fetch = require("./fetch");
 var _selectors = require("./selectors");
 /**
@@ -42,6 +43,11 @@ class Playwright extends _channelOwner.ChannelOwner {
     this.selectors = void 0;
     this.request = void 0;
     this.errors = void 0;
+    // Instrumentation.
+    this._defaultLaunchOptions = void 0;
+    this._defaultContextOptions = void 0;
+    this._defaultContextTimeout = void 0;
+    this._defaultContextNavigationTimeout = void 0;
     this.request = new _fetch.APIRequest(this);
     this.chromium = _browserType.BrowserType.from(initializer.chromium);
     this.chromium._playwright = this;
@@ -76,5 +82,19 @@ class Playwright extends _channelOwner.ChannelOwner {
   static from(channel) {
     return channel._object;
   }
+  _browserTypes() {
+    return [this.chromium, this.firefox, this.webkit, this._bidiChromium, this._bidiFirefox];
+  }
+  _preLaunchedBrowser() {
+    const browser = _browser.Browser.from(this._initializer.preLaunchedBrowser);
+    browser._browserType = this[browser._name];
+    return browser;
+  }
+  _allContexts() {
+    return this._browserTypes().flatMap(type => [...type._contexts]);
+  }
+  _allPages() {
+    return this._allContexts().flatMap(context => context.pages());
+  }
 }
 exports.Playwright = Playwright;

package/lib/client/selectors.js

@@ -4,9 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SelectorsOwner = exports.Selectors = void 0;
-var _clientHelper = require("./clientHelper");
+exports.setPlatformForSelectors = setPlatformForSelectors;
 var _channelOwner = require("./channelOwner");
+var _clientHelper = require("./clientHelper");
 var _locator = require("./locator");
+var _platform = require("./platform");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -23,13 +25,17 @@ var _locator = require("./locator");
  * limitations under the License.
  */
 
+let platform = _platform.emptyPlatform;
+function setPlatformForSelectors(p) {
+  platform = p;
+}
 class Selectors {
   constructor() {
     this._channels = new Set();
     this._registrations = [];
   }
   async register(name, script, options = {}) {
-    const source = await (0, _clientHelper.evaluationScript)(script, undefined, false);
+    const source = await (0, _clientHelper.evaluationScript)(platform, script, undefined, false);
     const params = {
       ...options,
       name,

package/lib/client/stream.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Stream = void 0;
-var _stream = require("stream");
 var _channelOwner = require("./channelOwner");
 /**
  * Copyright (c) Microsoft Corporation.
@@ -30,25 +29,7 @@ class Stream extends _channelOwner.ChannelOwner {
     super(parent, type, guid, initializer);
   }
   stream() {
-    return new StreamImpl(this._channel);
+    return this._platform.streamReadable(this._channel);
   }
 }
-exports.Stream = Stream;
-class StreamImpl extends _stream.Readable {
-  constructor(channel) {
-    super();
-    this._channel = void 0;
-    this._channel = channel;
-  }
-  async _read() {
-    const result = await this._channel.read({
-      size: 1024 * 1024
-    });
-    if (result.binary.byteLength) this.push(result.binary);else this.push(null);
-  }
-  _destroy(error, callback) {
-    // Stream might be destroyed after the connection was closed.
-    this._channel.close().catch(e => null);
-    super._destroy(error, callback);
-  }
-}
+exports.Stream = Stream;

package/lib/client/timeoutSettings.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TimeoutSettings = exports.DEFAULT_TIMEOUT = exports.DEFAULT_LAUNCH_TIMEOUT = void 0;
+/**
+ * Copyright 2019 Google Inc. All rights reserved.
+ * Modifications copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Keep in sync with server.
+const DEFAULT_TIMEOUT = exports.DEFAULT_TIMEOUT = 30000;
+const DEFAULT_LAUNCH_TIMEOUT = exports.DEFAULT_LAUNCH_TIMEOUT = 3 * 60 * 1000; // 3 minutes
+
+class TimeoutSettings {
+  constructor(platform, parent) {
+    this._parent = void 0;
+    this._defaultTimeout = void 0;
+    this._defaultNavigationTimeout = void 0;
+    this._platform = void 0;
+    this._parent = parent;
+    this._platform = platform;
+  }
+  setDefaultTimeout(timeout) {
+    this._defaultTimeout = timeout;
+  }
+  setDefaultNavigationTimeout(timeout) {
+    this._defaultNavigationTimeout = timeout;
+  }
+  defaultNavigationTimeout() {
+    return this._defaultNavigationTimeout;
+  }
+  defaultTimeout() {
+    return this._defaultTimeout;
+  }
+  navigationTimeout(options) {
+    if (typeof options.timeout === 'number') return options.timeout;
+    if (this._defaultNavigationTimeout !== undefined) return this._defaultNavigationTimeout;
+    if (this._platform.isDebugMode()) return 0;
+    if (this._defaultTimeout !== undefined) return this._defaultTimeout;
+    if (this._parent) return this._parent.navigationTimeout(options);
+    return DEFAULT_TIMEOUT;
+  }
+  timeout(options) {
+    if (typeof options.timeout === 'number') return options.timeout;
+    if (this._platform.isDebugMode()) return 0;
+    if (this._defaultTimeout !== undefined) return this._defaultTimeout;
+    if (this._parent) return this._parent.timeout(options);
+    return DEFAULT_TIMEOUT;
+  }
+}
+exports.TimeoutSettings = TimeoutSettings;

package/lib/client/tracing.js

@@ -70,15 +70,16 @@ class Tracing extends _channelOwner.ChannelOwner {
     }, false);
   }
   async _startCollectingStacks(traceName) {
+    var _this$_connection$loc;
     if (!this._isTracing) {
       this._isTracing = true;
       this._connection.setIsTracing(true);
     }
-    const result = await this._connection.localUtils()._channel.tracingStarted({
+    const result = await ((_this$_connection$loc = this._connection.localUtils()) === null || _this$_connection$loc === void 0 ? void 0 : _this$_connection$loc.tracingStarted({
       tracesDir: this._tracesDir,
       traceName
-    });
-    this._stacksId = result.stacksId;
+    }));
+    this._stacksId = result === null || result === void 0 ? void 0 : result.stacksId;
   }
   async stopChunk(options = {}) {
     await this._doStopChunk(options.path);
@@ -94,17 +95,19 @@ class Tracing extends _channelOwner.ChannelOwner {
       await this._channel.tracingStopChunk({
         mode: 'discard'
       });
-      if (this._stacksId) await this._connection.localUtils()._channel.traceDiscarded({
+      if (this._stacksId) await this._connection.localUtils().traceDiscarded({
         stacksId: this._stacksId
       });
       return;
     }
+    const localUtils = this._connection.localUtils();
+    if (!localUtils) throw new Error('Cannot save trace in thin clients');
     const isLocal = !this._connection.isRemote();
     if (isLocal) {
       const result = await this._channel.tracingStopChunk({
         mode: 'entries'
       });
-      await this._connection.localUtils()._channel.zip({
+      await localUtils.zip({
         zipFile: filePath,
         entries: result.entries,
         mode: 'write',
@@ -119,7 +122,7 @@ class Tracing extends _channelOwner.ChannelOwner {
 
     // The artifact may be missing if the browser closed while stopping tracing.
     if (!result.artifact) {
-      if (this._stacksId) await this._connection.localUtils()._channel.traceDiscarded({
+      if (this._stacksId) await localUtils.traceDiscarded({
         stacksId: this._stacksId
       });
       return;
@@ -129,7 +132,7 @@ class Tracing extends _channelOwner.ChannelOwner {
     const artifact = _artifact.Artifact.from(result.artifact);
     await artifact.saveAs(filePath);
     await artifact.delete();
-    await this._connection.localUtils()._channel.zip({
+    await localUtils.zip({
       zipFile: filePath,
       entries: [],
       mode: 'append',

package/lib/client/video.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Video = void 0;
-var _utils = require("../utils");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -24,7 +24,7 @@ var _utils = require("../utils");
 class Video {
   constructor(page, connection) {
     this._artifact = null;
-    this._artifactReadyPromise = new _utils.ManualPromise();
+    this._artifactReadyPromise = new _manualPromise.ManualPromise();
     this._isRemote = false;
     this._isRemote = connection.isRemote();
     this._artifact = page._closedOrCrashedScope.safeRace(this._artifactReadyPromise);

package/lib/client/waiter.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Waiter = void 0;
-var _stackTrace = require("../utils/stackTrace");
 var _errors = require("./errors");
-var _utils = require("../utils");
+var _stackTrace = require("../utils/isomorphic/stackTrace");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -33,9 +32,9 @@ class Waiter {
     this._waitId = void 0;
     this._error = void 0;
     this._savedZone = void 0;
-    this._waitId = (0, _utils.createGuid)();
+    this._waitId = channelOwner._platform.createGuid();
     this._channelOwner = channelOwner;
-    this._savedZone = _utils.zones.current().without('apiZone');
+    this._savedZone = channelOwner._platform.zones.current().pop();
     this._channelOwner._channel.waitForEventInfo({
       info: {
         waitId: this._waitId,
@@ -111,8 +110,8 @@ class Waiter {
           phase: 'log',
           message: s
         }
-      }).catch(() => {});
-    }, true);
+      });
+    }, true).catch(() => {});
   }
   _rejectOn(promise, dispose) {
     this._failures.push(promise);