@checkly/playwright-core 1.48.22 → 1.51.11-beta.1

package/lib/server/dispatchers/localUtilsDispatcher.js

@@ -4,24 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LocalUtilsDispatcher = void 0;
-exports.urlToWSEndpoint = urlToWSEndpoint;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _os = _interopRequireDefault(require("os"));
-var _manualPromise = require("../../utils/manualPromise");
-var _utils = require("../../utils");
 var _dispatcher = require("./dispatcher");
-var _zipBundle = require("../../zipBundle");
-var _zipFile = require("../../utils/zipFile");
-var _jsonPipeDispatcher = require("../dispatchers/jsonPipeDispatcher");
-var _transport = require("../transport");
-var _socksInterceptor = require("../socksInterceptor");
-var _userAgent = require("../../utils/userAgent");
-var _progress = require("../progress");
-var _network = require("../../utils/network");
 var _instrumentation = require("../../server/instrumentation");
+var localUtils = _interopRequireWildcard(require("../localUtils"));
+var _userAgent = require("../utils/userAgent");
 var _deviceDescriptors = require("../deviceDescriptors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _jsonPipeDispatcher = require("../dispatchers/jsonPipeDispatcher");
+var _progress = require("../progress");
+var _socksInterceptor = require("../socksInterceptor");
+var _transport = require("../transport");
+var _network = require("../utils/network");
+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 (c) Microsoft Corporation.
  *
@@ -40,12 +34,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 class LocalUtilsDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, playwright) {
-    const localUtils = new _instrumentation.SdkObject(playwright, 'localUtils', 'localUtils');
+    const _localUtils = new _instrumentation.SdkObject(playwright, 'localUtils', 'localUtils');
     const deviceDescriptors = Object.entries(_deviceDescriptors.deviceDescriptors).map(([name, descriptor]) => ({
       name,
       descriptor
     }));
-    super(scope, localUtils, 'LocalUtils', {
+    super(scope, _localUtils, 'LocalUtils', {
       deviceDescriptors
     });
     this._type_LocalUtils = void 0;
@@ -54,131 +48,28 @@ class LocalUtilsDispatcher extends _dispatcher.Dispatcher {
     this._type_LocalUtils = true;
   }
   async zip(params) {
-    const promise = new _manualPromise.ManualPromise();
-    const zipFile = new _zipBundle.yazl.ZipFile();
-    zipFile.on('error', error => promise.reject(error));
-    const addFile = (file, name) => {
-      try {
-        if (_fs.default.statSync(file).isFile()) zipFile.addFile(file, name);
-      } catch (e) {}
-    };
-    for (const entry of params.entries) addFile(entry.value, entry.name);
-
-    // Add stacks and the sources.
-    const stackSession = params.stacksId ? this._stackSessions.get(params.stacksId) : undefined;
-    if (stackSession !== null && stackSession !== void 0 && stackSession.callStacks.length) {
-      await stackSession.writer;
-      if (process.env.PW_LIVE_TRACE_STACKS) {
-        zipFile.addFile(stackSession.file, 'trace.stacks');
-      } else {
-        const buffer = Buffer.from(JSON.stringify((0, _utils.serializeClientSideCallMetadata)(stackSession.callStacks)));
-        zipFile.addBuffer(buffer, 'trace.stacks');
-      }
-    }
-
-    // Collect sources from stacks.
-    if (params.includeSources) {
-      const sourceFiles = new Set();
-      for (const {
-        stack
-      } of (stackSession === null || stackSession === void 0 ? void 0 : stackSession.callStacks) || []) {
-        if (!stack) continue;
-        for (const {
-          file
-        } of stack) sourceFiles.add(file);
-      }
-      for (const sourceFile of sourceFiles) addFile(sourceFile, 'resources/src@' + (0, _utils.calculateSha1)(sourceFile) + '.txt');
-    }
-    if (params.mode === 'write') {
-      // New file, just compress the entries.
-      await _fs.default.promises.mkdir(_path.default.dirname(params.zipFile), {
-        recursive: true
-      });
-      zipFile.end(undefined, () => {
-        zipFile.outputStream.pipe(_fs.default.createWriteStream(params.zipFile)).on('close', () => promise.resolve()).on('error', error => promise.reject(error));
-      });
-      await promise;
-      await this._deleteStackSession(params.stacksId);
-      return;
-    }
-
-    // File already exists. Repack and add new entries.
-    const tempFile = params.zipFile + '.tmp';
-    await _fs.default.promises.rename(params.zipFile, tempFile);
-    _zipBundle.yauzl.open(tempFile, (err, inZipFile) => {
-      if (err) {
-        promise.reject(err);
-        return;
-      }
-      (0, _utils.assert)(inZipFile);
-      let pendingEntries = inZipFile.entryCount;
-      inZipFile.on('entry', entry => {
-        inZipFile.openReadStream(entry, (err, readStream) => {
-          if (err) {
-            promise.reject(err);
-            return;
-          }
-          zipFile.addReadStream(readStream, entry.fileName);
-          if (--pendingEntries === 0) {
-            zipFile.end(undefined, () => {
-              zipFile.outputStream.pipe(_fs.default.createWriteStream(params.zipFile)).on('close', () => {
-                _fs.default.promises.unlink(tempFile).then(() => {
-                  promise.resolve();
-                }).catch(error => promise.reject(error));
-              });
-            });
-          }
-        });
-      });
-    });
-    await promise;
-    await this._deleteStackSession(params.stacksId);
+    return await localUtils.zip(this._stackSessions, params);
   }
   async harOpen(params, metadata) {
-    let harBackend;
-    if (params.file.endsWith('.zip')) {
-      const zipFile = new _zipFile.ZipFile(params.file);
-      const entryNames = await zipFile.entries();
-      const harEntryName = entryNames.find(e => e.endsWith('.har'));
-      if (!harEntryName) return {
-        error: 'Specified archive does not have a .har file'
-      };
-      const har = await zipFile.read(harEntryName);
-      const harFile = JSON.parse(har.toString());
-      harBackend = new HarBackend(harFile, null, zipFile);
-    } else {
-      const harFile = JSON.parse(await _fs.default.promises.readFile(params.file, 'utf-8'));
-      harBackend = new HarBackend(harFile, _path.default.dirname(params.file), null);
-    }
-    this._harBackends.set(harBackend.id, harBackend);
-    return {
-      harId: harBackend.id
-    };
+    return await localUtils.harOpen(this._harBackends, params);
   }
   async harLookup(params, metadata) {
-    const harBackend = this._harBackends.get(params.harId);
-    if (!harBackend) return {
-      action: 'error',
-      message: `Internal error: har was not opened`
-    };
-    return await harBackend.lookup(params.url, params.method, params.headers, params.postData, params.isNavigationRequest);
+    return await localUtils.harLookup(this._harBackends, params);
   }
   async harClose(params, metadata) {
-    const harBackend = this._harBackends.get(params.harId);
-    if (harBackend) {
-      this._harBackends.delete(harBackend.id);
-      harBackend.dispose();
-    }
+    return await localUtils.harClose(this._harBackends, params);
   }
   async harUnzip(params, metadata) {
-    const dir = _path.default.dirname(params.zipFile);
-    const zipFile = new _zipFile.ZipFile(params.zipFile);
-    for (const entry of await zipFile.entries()) {
-      const buffer = await zipFile.read(entry);
-      if (entry === 'har.har') await _fs.default.promises.writeFile(params.harFile, buffer);else await _fs.default.promises.writeFile(_path.default.join(dir, entry), buffer);
-    }
-    zipFile.close();
-    await _fs.default.promises.unlink(params.zipFile);
+    return await localUtils.harUnzip(params);
+  }
+  async tracingStarted(params, metadata) {
+    return await localUtils.tracingStarted(this._stackSessions, params);
+  }
+  async traceDiscarded(params, metadata) {
+    return await localUtils.traceDiscarded(this._stackSessions, params);
+  }
+  async addStackToTracingNoReply(params, metadata) {
+    return await localUtils.addStackToTracingNoReply(this._stackSessions, params);
   }
   async connect(params, metadata) {
     const controller = new _progress.ProgressController(metadata, this._object);
@@ -219,165 +110,8 @@ class LocalUtilsDispatcher extends _dispatcher.Dispatcher {
       };
     }, params.timeout || 0);
   }
-  async tracingStarted(params, metadata) {
-    let tmpDir = undefined;
-    if (!params.tracesDir) tmpDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), 'playwright-tracing-'));
-    const traceStacksFile = _path.default.join(params.tracesDir || tmpDir, params.traceName + '.stacks');
-    this._stackSessions.set(traceStacksFile, {
-      callStacks: [],
-      file: traceStacksFile,
-      writer: Promise.resolve(),
-      tmpDir
-    });
-    return {
-      stacksId: traceStacksFile
-    };
-  }
-  async traceDiscarded(params, metadata) {
-    await this._deleteStackSession(params.stacksId);
-  }
-  async addStackToTracingNoReply(params, metadata) {
-    for (const session of this._stackSessions.values()) {
-      session.callStacks.push(params.callData);
-      if (process.env.PW_LIVE_TRACE_STACKS) {
-        session.writer = session.writer.then(() => {
-          const buffer = Buffer.from(JSON.stringify((0, _utils.serializeClientSideCallMetadata)(session.callStacks)));
-          return _fs.default.promises.writeFile(session.file, buffer);
-        });
-      }
-    }
-  }
-  async _deleteStackSession(stacksId) {
-    const session = stacksId ? this._stackSessions.get(stacksId) : undefined;
-    if (!session) return;
-    await session.writer;
-    if (session.tmpDir) await (0, _utils.removeFolders)([session.tmpDir]);
-    this._stackSessions.delete(stacksId);
-  }
 }
 exports.LocalUtilsDispatcher = LocalUtilsDispatcher;
-const redirectStatus = [301, 302, 303, 307, 308];
-class HarBackend {
-  constructor(harFile, baseDir, zipFile) {
-    this.id = (0, _utils.createGuid)();
-    this._harFile = void 0;
-    this._zipFile = void 0;
-    this._baseDir = void 0;
-    this._harFile = harFile;
-    this._baseDir = baseDir;
-    this._zipFile = zipFile;
-  }
-  async lookup(url, method, headers, postData, isNavigationRequest) {
-    let entry;
-    try {
-      entry = await this._harFindResponse(url, method, headers, postData);
-    } catch (e) {
-      return {
-        action: 'error',
-        message: 'HAR error: ' + e.message
-      };
-    }
-    if (!entry) return {
-      action: 'noentry'
-    };
-
-    // If navigation is being redirected, restart it with the final url to ensure the document's url changes.
-    if (entry.request.url !== url && isNavigationRequest) return {
-      action: 'redirect',
-      redirectURL: entry.request.url
-    };
-    const response = entry.response;
-    try {
-      const buffer = await this._loadContent(response.content);
-      return {
-        action: 'fulfill',
-        status: response.status,
-        headers: response.headers,
-        body: buffer
-      };
-    } catch (e) {
-      return {
-        action: 'error',
-        message: e.message
-      };
-    }
-  }
-  async _loadContent(content) {
-    const file = content._file;
-    let buffer;
-    if (file) {
-      if (this._zipFile) buffer = await this._zipFile.read(file);else buffer = await _fs.default.promises.readFile(_path.default.resolve(this._baseDir, file));
-    } else {
-      buffer = Buffer.from(content.text || '', content.encoding === 'base64' ? 'base64' : 'utf-8');
-    }
-    return buffer;
-  }
-  async _harFindResponse(url, method, headers, postData) {
-    const harLog = this._harFile.log;
-    const visited = new Set();
-    while (true) {
-      const entries = [];
-      for (const candidate of harLog.entries) {
-        if (candidate.request.url !== url || candidate.request.method !== method) continue;
-        if (method === 'POST' && postData && candidate.request.postData) {
-          const buffer = await this._loadContent(candidate.request.postData);
-          if (!buffer.equals(postData)) {
-            const boundary = multipartBoundary(headers);
-            if (!boundary) continue;
-            const candidataBoundary = multipartBoundary(candidate.request.headers);
-            if (!candidataBoundary) continue;
-            // Try to match multipart/form-data ignroing boundary as it changes between requests.
-            if (postData.toString().replaceAll(boundary, '') !== buffer.toString().replaceAll(candidataBoundary, '')) continue;
-          }
-        }
-        entries.push(candidate);
-      }
-      if (!entries.length) return;
-      let entry = entries[0];
-
-      // Disambiguate using headers - then one with most matching headers wins.
-      if (entries.length > 1) {
-        const list = [];
-        for (const candidate of entries) {
-          const matchingHeaders = countMatchingHeaders(candidate.request.headers, headers);
-          list.push({
-            candidate,
-            matchingHeaders
-          });
-        }
-        list.sort((a, b) => b.matchingHeaders - a.matchingHeaders);
-        entry = list[0].candidate;
-      }
-      if (visited.has(entry)) throw new Error(`Found redirect cycle for ${url}`);
-      visited.add(entry);
-
-      // Follow redirects.
-      const locationHeader = entry.response.headers.find(h => h.name.toLowerCase() === 'location');
-      if (redirectStatus.includes(entry.response.status) && locationHeader) {
-        const locationURL = new URL(locationHeader.value, url);
-        url = locationURL.toString();
-        if ((entry.response.status === 301 || entry.response.status === 302) && method === 'POST' || entry.response.status === 303 && !['GET', 'HEAD'].includes(method)) {
-          // HTTP-redirect fetch step 13 (https://fetch.spec.whatwg.org/#http-redirect-fetch)
-          method = 'GET';
-        }
-        continue;
-      }
-      return entry;
-    }
-  }
-  dispose() {
-    var _this$_zipFile;
-    (_this$_zipFile = this._zipFile) === null || _this$_zipFile === void 0 || _this$_zipFile.close();
-  }
-}
-function countMatchingHeaders(harHeaders, headers) {
-  const set = new Set(headers.map(h => h.name.toLowerCase() + ':' + h.value));
-  let matches = 0;
-  for (const h of harHeaders) {
-    if (set.has(h.name.toLowerCase() + ':' + h.value)) ++matches;
-  }
-  return matches;
-}
 async function urlToWSEndpoint(progress, endpointURL) {
   var _progress$timeUntilDe;
   if (endpointURL.startsWith('ws')) return endpointURL;

package/lib/server/dispatchers/networkDispatchers.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.WebSocketDispatcher = exports.RouteDispatcher = exports.ResponseDispatcher = exports.RequestDispatcher = exports.APIRequestContextDispatcher = void 0;
 var _network = require("../network");
 var _dispatcher = require("./dispatcher");
-var _tracingDispatcher = require("./tracingDispatcher");
 var _frameDispatcher = require("./frameDispatcher");
 var _pageDispatcher = require("./pageDispatcher");
+var _tracingDispatcher = require("./tracingDispatcher");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -183,8 +183,8 @@ class APIRequestContextDispatcher extends _dispatcher.Dispatcher {
     this._type_APIRequestContext = true;
     this.adopt(tracing);
   }
-  async storageState() {
-    return this._object.storageState();
+  async storageState(params) {
+    return this._object.storageState(params.indexedDB);
   }
   async dispose(params, metadata) {
     metadata.potentiallyClosesScope = true;

package/lib/server/dispatchers/pageDispatcher.js

@@ -7,13 +7,14 @@ exports.WorkerDispatcher = exports.PageDispatcher = exports.BindingCallDispatche
 var _page = require("../page");
 var _dispatcher = require("./dispatcher");
 var _errors = require("../errors");
+var _artifactDispatcher = require("./artifactDispatcher");
+var _elementHandlerDispatcher = require("./elementHandlerDispatcher");
 var _frameDispatcher = require("./frameDispatcher");
-var _networkDispatchers = require("./networkDispatchers");
 var _jsHandleDispatcher = require("./jsHandleDispatcher");
-var _elementHandlerDispatcher = require("./elementHandlerDispatcher");
-var _artifactDispatcher = require("./artifactDispatcher");
-var _utils = require("../../utils");
+var _networkDispatchers = require("./networkDispatchers");
 var _webSocketRouteDispatcher = require("./webSocketRouteDispatcher");
+var _crypto = require("../utils/crypto");
+var _urlMatch = require("../../utils/isomorphic/urlMatch");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -155,7 +156,8 @@ class PageDispatcher extends _dispatcher.Dispatcher {
       media: params.media,
       colorScheme: params.colorScheme,
       reducedMotion: params.reducedMotion,
-      forcedColors: params.forcedColors
+      forcedColors: params.forcedColors,
+      contrast: params.contrast
     });
   }
   async setViewportSize(params, metadata) {
@@ -171,7 +173,7 @@ class PageDispatcher extends _dispatcher.Dispatcher {
     }
     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, _utils.urlMatches)(this._page._browserContext._options.baseURL, request.url(), urlMatch));
+      const matchesSome = urlMatchers.some(urlMatch => (0, _urlMatch.urlMatches)(this._page._browserContext._options.baseURL, request.url(), urlMatch));
       if (!matchesSome) return false;
       this._dispatchEvent('route', {
         route: _networkDispatchers.RouteDispatcher.from(_networkDispatchers.RequestDispatcher.from(this.parentScope(), request), route)
@@ -181,7 +183,7 @@ class PageDispatcher extends _dispatcher.Dispatcher {
   }
   async setWebSocketInterceptionPatterns(params, metadata) {
     this._webSocketInterceptionPatterns = params.patterns;
-    if (params.patterns.length) await _webSocketRouteDispatcher.WebSocketRouteDispatcher.installIfNeeded(this.parentScope(), this._page);
+    if (params.patterns.length) await _webSocketRouteDispatcher.WebSocketRouteDispatcher.installIfNeeded(this._page);
   }
   async expectScreenshot(params, metadata) {
     const mask = (params.mask || []).map(({
@@ -336,7 +338,7 @@ exports.WorkerDispatcher = WorkerDispatcher;
 class BindingCallDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, name, needsHandle, source, args) {
     super(scope, {
-      guid: 'bindingCall@' + (0, _utils.createGuid)()
+      guid: 'bindingCall@' + (0, _crypto.createGuid)()
     }, 'BindingCall', {
       frame: _frameDispatcher.FrameDispatcher.from(scope.parentScope(), source.frame),
       name,

package/lib/server/dispatchers/playwrightDispatcher.js

@@ -4,18 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PlaywrightDispatcher = void 0;
+var _socksProxy = require("../utils/socksProxy");
 var _fetch = require("../fetch");
-var _socksProxy = require("../../common/socksProxy");
 var _androidDispatcher = require("./androidDispatcher");
+var _browserDispatcher = require("./browserDispatcher");
 var _browserTypeDispatcher = require("./browserTypeDispatcher");
 var _dispatcher = require("./dispatcher");
 var _electronDispatcher = require("./electronDispatcher");
 var _localUtilsDispatcher = require("./localUtilsDispatcher");
 var _networkDispatchers = require("./networkDispatchers");
 var _selectorsDispatcher = require("./selectorsDispatcher");
-var _browserDispatcher = require("./browserDispatcher");
-var _utils = require("../../utils");
-var _eventsHelper = require("../../utils/eventsHelper");
+var _crypto = require("../utils/crypto");
+var _eventsHelper = require("../utils/eventsHelper");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -72,7 +72,7 @@ exports.PlaywrightDispatcher = PlaywrightDispatcher;
 class SocksSupportDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, socksProxy) {
     super(scope, {
-      guid: 'socksSupport@' + (0, _utils.createGuid)()
+      guid: 'socksSupport@' + (0, _crypto.createGuid)()
     }, 'SocksSupport', {});
     this._type_SocksSupport = void 0;
     this._socksProxy = void 0;

package/lib/server/dispatchers/streamDispatcher.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.StreamDispatcher = void 0;
 var _dispatcher = require("./dispatcher");
-var _utils = require("../../utils");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _crypto = require("../utils/crypto");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -25,7 +26,7 @@ var _utils = require("../../utils");
 class StreamDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, stream) {
     super(scope, {
-      guid: 'stream@' + (0, _utils.createGuid)(),
+      guid: 'stream@' + (0, _crypto.createGuid)(),
       stream
     }, 'Stream', {});
     // In Node v12.9.0+ we can use readableEnded.
@@ -40,7 +41,7 @@ class StreamDispatcher extends _dispatcher.Dispatcher {
       binary: Buffer.from('')
     };
     if (!stream.readableLength) {
-      const readyPromise = new _utils.ManualPromise();
+      const readyPromise = new _manualPromise.ManualPromise();
       const done = () => readyPromise.resolve();
       stream.on('readable', done);
       stream.on('end', done);

package/lib/server/dispatchers/tracingDispatcher.js

@@ -37,6 +37,16 @@ class TracingDispatcher extends _dispatcher.Dispatcher {
   async tracingStartChunk(params) {
     return await this._object.startChunk(params);
   }
+  async tracingGroup(params, metadata) {
+    const {
+      name,
+      location
+    } = params;
+    await this._object.group(name, location, metadata);
+  }
+  async tracingGroupEnd(params) {
+    await this._object.groupEnd();
+  }
   async tracingStopChunk(params) {
     const {
       artifact,

package/lib/server/dispatchers/webSocketRouteDispatcher.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.WebSocketRouteDispatcher = void 0;
 var _page = require("../page");
 var _dispatcher = require("./dispatcher");
-var _utils = require("../../utils");
 var _pageDispatcher = require("./pageDispatcher");
 var webSocketMockSource = _interopRequireWildcard(require("../../generated/webSocketMockSource"));
-var _eventsHelper = require("../../utils/eventsHelper");
-var _class;
+var _crypto = require("../utils/crypto");
+var _urlMatch = require("../../utils/isomorphic/urlMatch");
+var _eventsHelper = require("../utils/eventsHelper");
+var _WebSocketRouteDispatcher;
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -27,13 +28,11 @@ var _class;
  * limitations under the License.
  */
 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; }
-const kBindingInstalledSymbol = Symbol('webSocketRouteBindingInstalled');
-const kInitScriptInstalledSymbol = Symbol('webSocketRouteInitScriptInstalled');
+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; }
 class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, id, url, frame) {
     super(scope, {
-      guid: 'webSocketRoute@' + (0, _utils.createGuid)()
+      guid: 'webSocketRoute@' + (0, _crypto.createGuid)()
     }, 'WebSocketRoute', {
       url
     });
@@ -55,15 +54,16 @@ class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
       webSocketRoute: this
     });
   }
-  static async installIfNeeded(contextDispatcher, target) {
+  static async installIfNeeded(target) {
+    const kBindingName = '__pwWebSocketBinding';
     const context = target instanceof _page.Page ? target.context() : target;
-    if (!context[kBindingInstalledSymbol]) {
-      context[kBindingInstalledSymbol] = true;
-      await context.exposeBinding('__pwWebSocketBinding', false, (source, payload) => {
+    if (!context.hasBinding(kBindingName)) {
+      await context.exposeBinding(kBindingName, false, (source, payload) => {
         if (payload.type === 'onCreate') {
-          const pageDispatcher = _pageDispatcher.PageDispatcher.fromNullable(contextDispatcher, source.page);
+          const contextDispatcher = (0, _dispatcher.existingDispatcher)(context);
+          const pageDispatcher = contextDispatcher ? _pageDispatcher.PageDispatcher.fromNullable(contextDispatcher, source.page) : undefined;
           let scope;
-          if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url)) scope = pageDispatcher;else if (matchesPattern(contextDispatcher, context._options.baseURL, payload.url)) scope = contextDispatcher;
+          if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url)) scope = pageDispatcher;else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url)) scope = contextDispatcher;
           if (scope) {
             new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
           } else {
@@ -96,15 +96,15 @@ class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
         });
       });
     }
-    if (!target[kInitScriptInstalledSymbol]) {
-      target[kInitScriptInstalledSymbol] = true;
+    const kInitScriptName = 'webSocketMockSource';
+    if (!target.initScripts.find(s => s.name === kInitScriptName)) {
       await target.addInitScript(`
         (() => {
           const module = {};
           ${webSocketMockSource.source}
           (module.exports.inject())(globalThis);
         })();
-      `);
+      `, kInitScriptName);
     }
   }
   async connect(params) {
@@ -178,12 +178,12 @@ class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
   }
 }
 exports.WebSocketRouteDispatcher = WebSocketRouteDispatcher;
-_class = WebSocketRouteDispatcher;
+_WebSocketRouteDispatcher = WebSocketRouteDispatcher;
 WebSocketRouteDispatcher._idToDispatcher = new Map();
 function matchesPattern(dispatcher, baseURL, url) {
   for (const pattern of dispatcher._webSocketInterceptionPatterns || []) {
     const urlMatch = pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags) : pattern.glob;
-    if ((0, _utils.urlMatches)(baseURL, url, urlMatch)) return true;
+    if ((0, _urlMatch.urlMatches)(baseURL, url, urlMatch)) return true;
   }
   return false;
 }

package/lib/server/dispatchers/writableStreamDispatcher.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WritableStreamDispatcher = void 0;
+var _fs = _interopRequireDefault(require("fs"));
 var _dispatcher = require("./dispatcher");
-var fs = _interopRequireWildcard(require("fs"));
-var _utils = require("../../utils");
-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 _crypto = require("../utils/crypto");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -28,7 +27,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 class WritableStreamDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, streamOrDirectory, lastModifiedMs) {
     super(scope, {
-      guid: 'writableStream@' + (0, _utils.createGuid)(),
+      guid: 'writableStream@' + (0, _crypto.createGuid)(),
       streamOrDirectory
     }, 'WritableStream', {});
     this._type_WritableStream = true;
@@ -48,7 +47,7 @@ class WritableStreamDispatcher extends _dispatcher.Dispatcher {
     if (typeof this._object.streamOrDirectory === 'string') throw new Error('Cannot close a directory');
     const stream = this._object.streamOrDirectory;
     await new Promise(fulfill => stream.end(fulfill));
-    if (this._lastModifiedMs) await fs.promises.utimes(this.path(), new Date(this._lastModifiedMs), new Date(this._lastModifiedMs));
+    if (this._lastModifiedMs) await _fs.default.promises.utimes(this.path(), new Date(this._lastModifiedMs), new Date(this._lastModifiedMs));
   }
   path() {
     if (typeof this._object.streamOrDirectory === 'string') return this._object.streamOrDirectory;