patchright-core 1.50.1 → 1.51.1

package/lib/{utils → server/utils}/httpServer.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.HttpServer = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _utilsBundle = require("../utilsBundle");
-var _debug = require("./debug");
-var _network = require("./network");
-var _manualPromise = require("./manualPromise");
+var _utilsBundle = require("../../utilsBundle");
 var _crypto = require("./crypto");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _assert = require("../../utils/isomorphic/assert");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _network = require("./network");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -69,7 +69,7 @@ class HttpServer {
     }
   }
   createWebSocket(transport, guid) {
-    (0, _debug.assert)(!this._wsGuid, 'can only create one main websocket transport per server');
+    (0, _assert.assert)(!this._wsGuid, 'can only create one main websocket transport per server');
     this._wsGuid = guid || (0, _crypto.createGuid)();
     const wss = new _utilsBundle.wsServer({
       server: this._server,
@@ -109,7 +109,7 @@ class HttpServer {
     return this._wsGuid;
   }
   async start(options = {}) {
-    (0, _debug.assert)(!this._started, 'server already started');
+    (0, _assert.assert)(!this._started, 'server already started');
     this._started = true;
     const host = options.host || 'localhost';
     if (options.preferredPort) {
@@ -123,7 +123,7 @@ class HttpServer {
       await this._tryStart(options.port, host);
     }
     const address = this._server.address();
-    (0, _debug.assert)(address, 'Could not bind server socket');
+    (0, _assert.assert)(address, 'Could not bind server socket');
     if (typeof address === 'string') {
       this._urlPrefixPrecise = address;
       this._urlPrefixHumanReadable = address;

package/lib/{utils → server/utils}/linuxUtils.js

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLinuxDistributionInfo = getLinuxDistributionInfo;
 exports.getLinuxDistributionInfoSync = getLinuxDistributionInfoSync;
 var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -26,14 +25,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 let didFailToReadOSRelease = false;
 let osRelease;
-async function getLinuxDistributionInfo() {
+function getLinuxDistributionInfoSync() {
   if (process.platform !== 'linux') return undefined;
   if (!osRelease && !didFailToReadOSRelease) {
     try {
       var _fields$get, _fields$get2;
       // List of /etc/os-release values for different distributions could be
       // found here: https://gist.github.com/aslushnikov/8ceddb8288e4cf9db3039c02e0f4fb75
-      const osReleaseText = await _fs.default.promises.readFile('/etc/os-release', 'utf8');
+      const osReleaseText = _fs.default.readFileSync('/etc/os-release', 'utf8');
       const fields = parseOSReleaseText(osReleaseText);
       osRelease = {
         id: (_fields$get = fields.get('id')) !== null && _fields$get !== void 0 ? _fields$get : '',
@@ -45,25 +44,6 @@ async function getLinuxDistributionInfo() {
   }
   return osRelease;
 }
-function getLinuxDistributionInfoSync() {
-  if (process.platform !== 'linux') return undefined;
-  if (!osRelease && !didFailToReadOSRelease) {
-    try {
-      var _fields$get3, _fields$get4;
-      // List of /etc/os-release values for different distributions could be
-      // found here: https://gist.github.com/aslushnikov/8ceddb8288e4cf9db3039c02e0f4fb75
-      const osReleaseText = _fs.default.readFileSync('/etc/os-release', 'utf8');
-      const fields = parseOSReleaseText(osReleaseText);
-      osRelease = {
-        id: (_fields$get3 = fields.get('id')) !== null && _fields$get3 !== void 0 ? _fields$get3 : '',
-        version: (_fields$get4 = fields.get('version_id')) !== null && _fields$get4 !== void 0 ? _fields$get4 : ''
-      };
-    } catch (e) {
-      didFailToReadOSRelease = true;
-    }
-  }
-  return osRelease;
-}
 function parseOSReleaseText(osReleaseText) {
   const fields = new Map();
   for (const line of osReleaseText.split('\n')) {

package/lib/{utils → server/utils}/network.js

@@ -11,12 +11,12 @@ exports.fetchData = fetchData;
 exports.httpRequest = httpRequest;
 exports.isURLAvailable = isURLAvailable;
 var _http = _interopRequireDefault(require("http"));
-var _https = _interopRequireDefault(require("https"));
 var _http2 = _interopRequireDefault(require("http2"));
-var _utilsBundle = require("../utilsBundle");
+var _https = _interopRequireDefault(require("https"));
 var _url = _interopRequireDefault(require("url"));
-var _happyEyeballs = require("./happy-eyeballs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _utilsBundle = require("../../utilsBundle");
+var _happyEyeballs = require("./happyEyeballs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/utils/nodePlatform.js

@@ -0,0 +1,140 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.nodePlatform = void 0;
+exports.setBoxedStackPrefixes = setBoxedStackPrefixes;
+var _crypto = _interopRequireDefault(require("crypto"));
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var util = _interopRequireWildcard(require("util"));
+var _stream = require("stream");
+var _events = require("events");
+var _utilsBundle = require("../../utilsBundle");
+var _debugLogger = require("./debugLogger");
+var _zones = require("./zones");
+var _debug = require("./debug");
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * 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 pipelineAsync = util.promisify(_stream.pipeline);
+class NodeZone {
+  constructor(zone) {
+    this._zone = void 0;
+    this._zone = zone;
+  }
+  push(data) {
+    return new NodeZone(this._zone.with('apiZone', data));
+  }
+  pop() {
+    return new NodeZone(this._zone.without('apiZone'));
+  }
+  run(func) {
+    return this._zone.run(func);
+  }
+  data() {
+    return this._zone.data('apiZone');
+  }
+}
+let boxedStackPrefixes = [];
+function setBoxedStackPrefixes(prefixes) {
+  boxedStackPrefixes = prefixes;
+}
+const coreDir = _path.default.dirname(require.resolve('../../../package.json'));
+const nodePlatform = exports.nodePlatform = {
+  name: 'node',
+  boxedStackPrefixes: () => {
+    if (process.env.PWDEBUGIMPL) return [];
+    return [coreDir, ...boxedStackPrefixes];
+  },
+  calculateSha1: text => {
+    const sha1 = _crypto.default.createHash('sha1');
+    sha1.update(text);
+    return Promise.resolve(sha1.digest('hex'));
+  },
+  colors: _utilsBundle.colors,
+  coreDir,
+  createGuid: () => _crypto.default.randomBytes(16).toString('hex'),
+  defaultMaxListeners: () => _events.EventEmitter.defaultMaxListeners,
+  fs: () => _fs.default,
+  env: process.env,
+  inspectCustom: util.inspect.custom,
+  isDebugMode: () => !!(0, _debug.debugMode)(),
+  isJSDebuggerAttached: () => !!require('inspector').url(),
+  isLogEnabled(name) {
+    return _debugLogger.debugLogger.isEnabled(name);
+  },
+  isUnderTest: () => (0, _debug.isUnderTest)(),
+  log(name, message) {
+    _debugLogger.debugLogger.log(name, message);
+  },
+  path: () => _path.default,
+  pathSeparator: _path.default.sep,
+  showInternalStackFrames: () => !!process.env.PWDEBUGIMPL,
+  async streamFile(path, stream) {
+    await pipelineAsync(_fs.default.createReadStream(path), stream);
+  },
+  streamReadable: channel => {
+    return new ReadableStreamImpl(channel);
+  },
+  streamWritable: channel => {
+    return new WritableStreamImpl(channel);
+  },
+  zones: {
+    current: () => new NodeZone((0, _zones.currentZone)()),
+    empty: new NodeZone(_zones.emptyZone)
+  }
+};
+class ReadableStreamImpl 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);
+  }
+}
+class WritableStreamImpl extends _stream.Writable {
+  constructor(channel) {
+    super();
+    this._channel = void 0;
+    this._channel = channel;
+  }
+  async _write(chunk, encoding, callback) {
+    const error = await this._channel.write({
+      binary: typeof chunk === 'string' ? Buffer.from(chunk) : chunk
+    }).catch(e => e);
+    callback(error || null);
+  }
+  async _final(callback) {
+    // Stream might be destroyed after the connection was closed.
+    const error = await this._channel.close().catch(e => e);
+    callback(error || null);
+  }
+}

package/lib/{protocol/transport.js → server/utils/pipeTransport.js}

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PipeTransport = void 0;
-var _utils = require("../utils");
+var _task = require("./task");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -25,7 +25,7 @@ class PipeTransport {
   constructor(pipeWrite, pipeRead, closeable, endian = 'le') {
     this._pipeWrite = void 0;
     this._data = Buffer.from([]);
-    this._waitForNextTask = (0, _utils.makeWaitForNextTask)();
+    this._waitForNextTask = (0, _task.makeWaitForNextTask)();
     this._closed = false;
     this._bytesLeft = 0;
     this.onmessage = void 0;

package/lib/{utils → server/utils}/processLauncher.js

@@ -8,14 +8,14 @@ exports.gracefullyCloseAll = gracefullyCloseAll;
 exports.gracefullyCloseSet = void 0;
 exports.gracefullyProcessExitDoNotHang = gracefullyProcessExitDoNotHang;
 exports.launchProcess = launchProcess;
-var _fs = _interopRequireDefault(require("fs"));
 var childProcess = _interopRequireWildcard(require("child_process"));
+var _fs = _interopRequireDefault(require("fs"));
 var readline = _interopRequireWildcard(require("readline"));
-var _ = require("./");
 var _fileUtils = require("./fileUtils");
+var _utils = require("../../utils");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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.
@@ -55,7 +55,7 @@ let sigintHandlerCalled = false;
 function sigintHandler() {
   const exitWithCode130 = () => {
     // Give tests a chance to see that launched process did exit and dispatch any async calls.
-    if ((0, _.isUnderTest)()) {
+    if ((0, _utils.isUnderTest)()) {
       // eslint-disable-next-line no-restricted-properties
       setTimeout(() => process.exit(130), 1000);
     } else {

package/lib/{utils → server/utils}/profiler.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startProfiling = startProfiling;
 exports.stopProfiling = stopProfiling;
-var fs = _interopRequireWildcard(require("fs"));
-var path = _interopRequireWildcard(require("path"));
-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; }
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
  *
@@ -43,10 +42,10 @@ async function stopProfiling(profileName) {
     profile
   }) => {
     if (!err) {
-      fs.mkdirSync(profileDir, {
+      _fs.default.mkdirSync(profileDir, {
         recursive: true
       });
-      fs.writeFileSync(path.join(profileDir, profileName + '.json'), JSON.stringify(profile));
+      _fs.default.writeFileSync(_path.default.join(profileDir, profileName + '.json'), JSON.stringify(profile));
     }
     f();
   }));

package/lib/{common → server/utils}/socksProxy.js

@@ -7,10 +7,11 @@ exports.SocksProxyHandler = exports.SocksProxy = void 0;
 exports.parsePattern = parsePattern;
 var _events = _interopRequireDefault(require("events"));
 var _net = _interopRequireDefault(require("net"));
-var _debugLogger = require("../utils/debugLogger");
-var _happyEyeballs = require("../utils/happy-eyeballs");
-var _utils = require("../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _assert = require("../../utils/isomorphic/assert");
+var _crypto = require("./crypto");
+var _debugLogger = require("./debugLogger");
+var _happyEyeballs = require("./happyEyeballs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -79,7 +80,7 @@ class SocksConnection {
     this._run().catch(() => this._socket.end());
   }
   async _run() {
-    (0, _utils.assert)(await this._authenticate());
+    (0, _assert.assert)(await this._authenticate());
     const {
       command,
       host,
@@ -119,9 +120,9 @@ class SocksConnection {
     // +----+--------+
 
     const version = await this._readByte();
-    (0, _utils.assert)(version === 0x05, 'The VER field must be set to x05 for this version of the protocol, was ' + version);
+    (0, _assert.assert)(version === 0x05, 'The VER field must be set to x05 for this version of the protocol, was ' + version);
     const nMethods = await this._readByte();
-    (0, _utils.assert)(nMethods, 'No authentication methods specified');
+    (0, _assert.assert)(nMethods, 'No authentication methods specified');
     const methods = await this._readBytes(nMethods);
     for (const method of methods) {
       if (method === 0) {
@@ -148,7 +149,7 @@ class SocksConnection {
     // +----+-----+-------+------+----------+----------+
 
     const version = await this._readByte();
-    (0, _utils.assert)(version === 0x05, 'The VER field must be set to x05 for this version of the protocol, was ' + version);
+    (0, _assert.assert)(version === 0x05, 'The VER field must be set to x05 for this version of the protocol, was ' + version);
     const command = await this._readByte();
     await this._readByte(); // skip reserved.
     const addressType = await this._readByte();
@@ -335,7 +336,7 @@ class SocksProxy extends _events.default {
     this._patternMatcher = () => false;
     this._directSockets = new Map();
     this._server = new _net.default.Server(socket => {
-      const uid = (0, _utils.createGuid)();
+      const uid = (0, _crypto.createGuid)();
       const connection = new SocksConnection(uid, socket, this);
       this._connections.set(uid, connection);
     });

package/lib/{utils → server/utils}/userAgent.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.getEmbedderName = getEmbedderName;
 exports.getPlaywrightVersion = getPlaywrightVersion;
 exports.getUserAgent = getUserAgent;
-exports.userAgentVersionMatchesErrorMessage = userAgentVersionMatchesErrorMessage;
 var _child_process = require("child_process");
 var _os = _interopRequireDefault(require("os"));
 var _linuxUtils = require("../utils/linuxUtils");
-var _ascii = require("./ascii");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -88,18 +86,6 @@ function getEmbedderName() {
   };
 }
 function getPlaywrightVersion(majorMinorOnly = false) {
-  const version = process.env.PW_VERSION_OVERRIDE || require('./../../package.json').version;
+  const version = process.env.PW_VERSION_OVERRIDE || require('./../../../package.json').version;
   return majorMinorOnly ? version.split('.').slice(0, 2).join('.') : version;
-}
-function userAgentVersionMatchesErrorMessage(userAgent) {
-  const match = userAgent.match(/^Playwright\/(\d+\.\d+\.\d+)/);
-  if (!match) {
-    // Cannot parse user agent - be lax.
-    return;
-  }
-  const received = match[1].split('.').slice(0, 2).join('.');
-  const expected = getPlaywrightVersion(true);
-  if (received !== expected) {
-    return (0, _ascii.wrapInASCIIBox)([`Playwright version mismatch:`, `  - server version: v${expected}`, `  - client version: v${received}`, ``, `If you are using VSCode extension, restart VSCode.`, ``, `If you are connecting to a remote service,`, `keep your local Playwright version in sync`, `with the remote service version.`, ``, `<3 Playwright Team`].join('\n'), 1);
-  }
 }

package/lib/{utils → server/utils}/wsServer.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.perMessageDeflate = exports.WSServer = void 0;
-var _utils = require("../utils");
-var _utilsBundle = require("../utilsBundle");
+var _network = require("./network");
+var _utilsBundle = require("../../utilsBundle");
 var _debugLogger = require("./debugLogger");
 /**
  * Copyright (c) Microsoft Corporation.
@@ -44,7 +44,7 @@ class WSServer {
   }
   async listen(port = 0, hostname, path) {
     _debugLogger.debugLogger.log('server', `Server started at ${new Date()}`);
-    const server = (0, _utils.createHttpServer)((request, response) => {
+    const server = (0, _network.createHttpServer)((request, response) => {
       if (request.method === 'GET' && request.url === '/json') {
         response.setHeader('Content-Type', 'application/json');
         response.end(JSON.stringify({

package/lib/{utils → server/utils}/zipFile.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ZipFile = void 0;
-var _zipBundle = require("../zipBundle");
+var _zipBundle = require("../../zipBundle");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/{utils → server/utils}/zones.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zones = exports.Zone = void 0;
+exports.Zone = void 0;
+exports.currentZone = currentZone;
+exports.emptyZone = void 0;
 var _async_hooks = require("async_hooks");
 /**
  * Copyright (c) Microsoft Corporation.
@@ -21,29 +23,8 @@ var _async_hooks = require("async_hooks");
  * limitations under the License.
  */
 
-class ZoneManager {
-  constructor() {
-    this._asyncLocalStorage = new _async_hooks.AsyncLocalStorage();
-    this._emptyZone = Zone.createEmpty(this._asyncLocalStorage);
-  }
-  run(type, data, func) {
-    return this.current().with(type, data).run(func);
-  }
-  zoneData(type) {
-    return this.current().data(type);
-  }
-  current() {
-    var _this$_asyncLocalStor;
-    return (_this$_asyncLocalStor = this._asyncLocalStorage.getStore()) !== null && _this$_asyncLocalStor !== void 0 ? _this$_asyncLocalStor : this._emptyZone;
-  }
-  empty() {
-    return this._emptyZone;
-  }
-}
+const asyncLocalStorage = new _async_hooks.AsyncLocalStorage();
 class Zone {
-  static createEmpty(asyncLocalStorage) {
-    return new Zone(asyncLocalStorage, new Map());
-  }
   constructor(asyncLocalStorage, store) {
     this._asyncLocalStorage = void 0;
     this._data = void 0;
@@ -66,4 +47,8 @@ class Zone {
   }
 }
 exports.Zone = Zone;
-const zones = exports.zones = new ZoneManager();
+const emptyZone = exports.emptyZone = new Zone(asyncLocalStorage, new Map());
+function currentZone() {
+  var _asyncLocalStorage$ge;
+  return (_asyncLocalStorage$ge = asyncLocalStorage.getStore()) !== null && _asyncLocalStorage$ge !== void 0 ? _asyncLocalStorage$ge : emptyZone;
+}

package/lib/server/webkit/webkit.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WebKit = void 0;
-var _wkBrowser = require("../webkit/wkBrowser");
 var _path = _interopRequireDefault(require("path"));
 var _wkConnection = require("./wkConnection");
+var _ascii = require("../utils/ascii");
 var _browserType = require("../browserType");
-var _utils = require("../../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _wkBrowser = require("../webkit/wkBrowser");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -42,7 +42,7 @@ class WebKit extends _browserType.BrowserType {
   }
   doRewriteStartupLog(error) {
     if (!error.logs) return error;
-    if (error.logs.includes('Failed to open display') || error.logs.includes('cannot open display')) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
+    if (error.logs.includes('Failed to open display') || error.logs.includes('cannot open display')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
     return error;
   }
   attemptToGracefullyCloseBrowser(transport) {

package/lib/server/webkit/wkBrowser.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WKBrowserContext = exports.WKBrowser = void 0;
+var _utils = require("../../utils");
 var _browser = require("../browser");
 var _browserContext = require("../browserContext");
-var _utils = require("../../utils");
 var network = _interopRequireWildcard(require("../network"));
 var _wkConnection = require("./wkConnection");
 var _wkPage = require("./wkPage");
 var _errors = require("../errors");
 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; }
+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.
@@ -30,8 +30,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * limitations under the License.
  */
 
-const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15';
-const BROWSER_VERSION = '18.2';
+const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.4 Safari/605.1.15';
+const BROWSER_VERSION = '18.4';
 class WKBrowser extends _browser.Browser {
   static async connect(parent, transport, options) {
     const browser = new WKBrowser(parent, transport, options);

package/lib/server/webkit/wkConnection.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.kPageProxyMessageReceived = exports.kBrowserCloseMessageId = exports.WKSession = exports.WKConnection = void 0;
 var _events = require("events");
 var _utils = require("../../utils");
-var _debugLogger = require("../../utils/debugLogger");
+var _debugLogger = require("../utils/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**