msw 2.13.3 → 2.13.4

package/cli/init.js

@@ -222,5 +222,5 @@ function promptWorkerDirectoryUpdate(message, packageJsonPath, publicDir) {
  * @returns {string}
  */
 function normalizePath(input) {
-  return input.replace(/[\\|\/]+/g, path.sep)
+  return input.replace(/[\\|/]+/g, path.sep)
 }

package/lib/browser/index.js

@@ -561,7 +561,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/createRequestId-DQcIlohW.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/createRequestId-DQcIlohW.mjs
 var INTERNAL_REQUEST_ID_HEADER_NAME = "x-interceptors-internal-request-id";
 function getGlobalSymbol(symbol) {
   return globalThis[symbol] || void 0;
@@ -710,7 +710,7 @@ function createRequestId() {
   return Math.random().toString(16).slice(2);
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/resolveWebSocketUrl-C83-x9iE.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/resolveWebSocketUrl-C83-x9iE.mjs
 function resolveWebSocketUrl(url) {
   if (typeof url === "string") return resolveWebSocketUrl(new URL(url, typeof location !== "undefined" ? location.href : void 0));
   if (url.protocol === "http:") url.protocol = "ws:";
@@ -721,7 +721,7 @@ function resolveWebSocketUrl(url) {
   return url.href;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/hasConfigurableGlobal-npXitu1-.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/hasConfigurableGlobal-npXitu1-.mjs
 async function emitAsync(emitter, eventName, ...data) {
   const listeners = emitter.listeners(eventName);
   if (listeners.length === 0) return;
@@ -805,7 +805,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
 function bindEvent(target, event) {
   Object.defineProperties(event, {
     target: {
@@ -1335,7 +1335,73 @@ function supportsReadableStreamTransfer() {
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/getRawRequest-BTaNLFr0.mjs
+// node_modules/.pnpm/@open-draft+deferred-promise@3.0.0/node_modules/@open-draft/deferred-promise/build/index.mjs
+function createDeferredExecutor2() {
+  const executor = ((resolve, reject) => {
+    executor.state = "pending";
+    executor.resolve = (data) => {
+      if (executor.state !== "pending") return;
+      executor.result = data;
+      const onFulfilled = (value) => {
+        executor.state = "fulfilled";
+        return value;
+      };
+      return resolve(data instanceof Promise ? data : Promise.resolve(data).then(onFulfilled));
+    };
+    executor.reject = (reason) => {
+      if (executor.state !== "pending") return;
+      queueMicrotask(() => {
+        executor.state = "rejected";
+      });
+      return reject(executor.rejectionReason = reason);
+    };
+  });
+  return executor;
+}
+var DeferredPromise2 = class extends Promise {
+  #executor;
+  resolve;
+  reject;
+  constructor(executor = null) {
+    const deferredExecutor = createDeferredExecutor2();
+    super((originalResolve, originalReject) => {
+      deferredExecutor(originalResolve, originalReject);
+      executor?.(deferredExecutor.resolve, deferredExecutor.reject);
+    });
+    this.#executor = deferredExecutor;
+    this.resolve = this.#executor.resolve;
+    this.reject = this.#executor.reject;
+  }
+  get state() {
+    return this.#executor.state;
+  }
+  get rejectionReason() {
+    return this.#executor.rejectionReason;
+  }
+  then(onFulfilled, onRejected) {
+    return this.#decorate(super.then(onFulfilled, onRejected));
+  }
+  catch(onRejected) {
+    return this.#decorate(super.catch(onRejected));
+  }
+  finally(onfinally) {
+    return this.#decorate(super.finally(onfinally));
+  }
+  #decorate(promise) {
+    return Object.defineProperties(promise, {
+      resolve: {
+        configurable: true,
+        value: this.resolve
+      },
+      reject: {
+        configurable: true,
+        value: this.reject
+      }
+    });
+  }
+};
+
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/getRawRequest-BTaNLFr0.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 var InterceptorError = class InterceptorError2 extends Error {
   constructor(message) {
@@ -1496,7 +1562,7 @@ function setRawRequest(request, rawRequest) {
   Reflect.set(request, kRawRequest, rawRequest);
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/bufferUtils-BiiO6HZv.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/bufferUtils-BiiO6HZv.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -1951,21 +2017,31 @@ var WorkerEvent = class extends TypedEvent {
   }
 };
 var WorkerChannel = class extends Emitter2 {
+  #getWorker;
+  #controller;
   constructor(options) {
     super();
-    this.options = options;
-    if (!SUPPORTS_SERVICE_WORKER) {
-      return;
-    }
-    navigator.serviceWorker.addEventListener("message", async (event) => {
-      const worker = await this.options.worker;
-      if (event.source != null && event.source !== worker) {
-        return;
-      }
-      if (event.data && (0, import_isObject.isObject)(event.data) && "type" in event.data) {
-        this.emit(new WorkerEvent(event));
+    invariant(
+      SUPPORTS_SERVICE_WORKER,
+      "Failed to open a WorkerChannel: Service Worker is not supported in this environment."
+    );
+    this.#getWorker = options.getWorker;
+    this.#controller = new AbortController();
+    navigator.serviceWorker.addEventListener(
+      "message",
+      async (event) => {
+        const worker = await this.#getWorker();
+        if (event.source != null && event.source !== worker) {
+          return;
+        }
+        if (event.data && (0, import_isObject.isObject)(event.data) && "type" in event.data) {
+          this.emit(new WorkerEvent(event));
+        }
+      },
+      {
+        signal: this.#controller.signal
       }
-    });
+    );
   }
   /**
    * Send data to the Service Worker controlling this client.
@@ -1974,12 +2050,20 @@ var WorkerChannel = class extends Emitter2 {
   postMessage(type) {
     invariant(
       SUPPORTS_SERVICE_WORKER,
-      "Failed to post message on a WorkerChannel: the Service Worker API is unavailable in this context. This is likely an issue with MSW. Please report it on GitHub: https://github.com/mswjs/msw/issues"
+      "Failed to post message on a WorkerChannel: the Service Worker API is unavailable in this environment. This is likely an issue with MSW. Please report it on GitHub: https://github.com/mswjs/msw/issues"
     );
-    this.options.worker.then((worker) => {
+    this.#getWorker().then((worker) => {
       worker.postMessage(type);
     });
   }
+  /**
+   * Terminal teardown. Removes the `navigator.serviceWorker` message listener
+   * and all emitter subscriptions. The channel is not usable afterwards.
+   */
+  terminate() {
+    this.#controller.abort();
+    this.removeAllListeners();
+  }
 };
 
 // src/browser/utils/pruneGetRequestBody.ts
@@ -2011,40 +2095,63 @@ function validateWorkerScope(registration) {
   }
 }
 
+// src/browser/utils/should-invalidate-worker.ts
+function shouldInvalidateWorker(prevOptions, nextOptions) {
+  return prevOptions.findWorker !== nextOptions.findWorker || prevOptions.serviceWorker.url !== nextOptions.serviceWorker.url || JSON.stringify(prevOptions.serviceWorker.options) !== JSON.stringify(nextOptions.serviceWorker.options);
+}
+
 // src/browser/sources/service-worker-source.ts
-var ServiceWorkerSource = class extends import_network_source.NetworkSource {
+var ServiceWorkerSource = class _ServiceWorkerSource extends import_network_source.NetworkSource {
+  static #current;
+  /**
+   * Create a new Service Worker source or reuse an existing one.
+   * These sources act as a singleton and only get recreated if the options change.
+   */
+  static async from(options) {
+    if (_ServiceWorkerSource.#current == null) {
+      _ServiceWorkerSource.#current = new _ServiceWorkerSource(options);
+    } else if (shouldInvalidateWorker(_ServiceWorkerSource.#current.#options, options)) {
+      await _ServiceWorkerSource.#current.terminate();
+      _ServiceWorkerSource.#current = new _ServiceWorkerSource(options);
+    }
+    return _ServiceWorkerSource.#current;
+  }
+  #options;
+  #frames;
+  #channel;
+  #listenerController;
+  #clientPromise;
+  #keepAliveInterval;
+  #stoppedAt;
+  workerPromise;
   constructor(options) {
     super();
-    this.options = options;
     invariant(
       supportsServiceWorker(),
       "Failed to use Service Worker as the network source: the Service Worker API is not supported in this environment"
     );
+    this.#options = options;
     this.#frames = /* @__PURE__ */ new Map();
-    this.workerPromise = new DeferredPromise();
+    this.workerPromise = new DeferredPromise2();
     this.#channel = new WorkerChannel({
-      worker: this.workerPromise.then(([worker]) => worker)
+      getWorker: () => this.workerPromise.then(([worker]) => worker)
     });
   }
-  #frames;
-  #channel;
-  #clientPromise;
-  #keepAliveInterval;
-  #stoppedAt;
-  workerPromise;
   async enable() {
-    this.#stoppedAt = void 0;
-    if (this.workerPromise.state !== "pending") {
+    if (this.workerPromise.state === "fulfilled" && typeof this.#stoppedAt == "undefined") {
       import_devUtils3.devUtils.warn(
         'Found a redundant "worker.start()" call. Note that starting the worker while mocking is already enabled will have no effect. Consider removing this "worker.start()" call.'
       );
       return this.workerPromise.then(([, registration2]) => registration2);
     }
+    this.#stoppedAt = void 0;
     this.#channel.removeAllListeners();
+    this.#frames.clear();
+    this.#listenerController = new AbortController();
     const [worker, registration] = await this.#startWorker();
     if (worker.state !== "activated") {
       const controller = new AbortController();
-      const activationPromise = new DeferredPromise();
+      const activationPromise = new DeferredPromise2();
       activationPromise.then(() => controller.abort());
       worker.addEventListener(
         "statechange",
@@ -2053,18 +2160,20 @@ var ServiceWorkerSource = class extends import_network_source.NetworkSource {
             activationPromise.resolve();
           }
         },
-        { signal: controller.signal }
+        {
+          signal: controller.signal
+        }
       );
       await activationPromise;
     }
     this.#channel.postMessage("MOCK_ACTIVATE");
-    const clientConfirmationPromise = new DeferredPromise();
+    const clientConfirmationPromise = new DeferredPromise2();
     this.#clientPromise = clientConfirmationPromise;
     this.#channel.once("MOCKING_ENABLED", (event) => {
       clientConfirmationPromise.resolve(event.data.client);
     });
     await clientConfirmationPromise;
-    if (!this.options.quiet) {
+    if (!this.#options.quiet) {
       this.#printStartMessage();
     }
     return registration;
@@ -2077,24 +2186,47 @@ var ServiceWorkerSource = class extends import_network_source.NetworkSource {
       return;
     }
     this.#stoppedAt = Date.now();
-    this.#frames.clear();
-    this.workerPromise = new DeferredPromise();
-    if (!this.options.quiet) {
+    this.#listenerController?.abort();
+    this.#listenerController = void 0;
+    this.#channel.postMessage("CLIENT_CLOSED");
+    if (!this.#options.quiet) {
       this.#printStopMessage();
     }
   }
+  /**
+   * Terminal teardown. Unregisters the Service Worker, tears down the channel,
+   * and clears timers. Called when the singleton is being replaced with one
+   * that has different options. The instance is not usable afterwards.
+   */
+  async terminate() {
+    if (this.#keepAliveInterval != null) {
+      clearInterval(this.#keepAliveInterval);
+      this.#keepAliveInterval = void 0;
+    }
+    this.#frames.clear();
+    this.#channel.terminate();
+    this.#listenerController?.abort();
+    this.#listenerController = void 0;
+    if (this.workerPromise.state === "fulfilled") {
+      const [, registration] = await this.workerPromise;
+      await registration.unregister();
+    }
+    if (_ServiceWorkerSource.#current === this) {
+      _ServiceWorkerSource.#current = void 0;
+    }
+  }
   async #startWorker() {
     if (this.#keepAliveInterval) {
       clearInterval(this.#keepAliveInterval);
     }
-    const workerUrl = this.options.serviceWorker.url;
+    const workerUrl = this.#options.serviceWorker.url;
     const [worker, registration] = await getWorkerInstance(
       workerUrl,
-      this.options.serviceWorker.options,
-      this.options.findWorker || this.#defaultFindWorker
+      this.#options.serviceWorker.options,
+      this.#options.findWorker || this.#defaultFindWorker
     );
     if (worker == null) {
-      const missingWorkerMessage = this.options?.findWorker ? import_devUtils3.devUtils.formatMessage(
+      const missingWorkerMessage = this.#options?.findWorker ? import_devUtils3.devUtils.formatMessage(
         `Failed to locate the Service Worker registration using a custom "findWorker" predicate.
 
 Please ensure that the custom predicate properly locates the Service Worker registration at "%s".
@@ -2112,16 +2244,28 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       );
       throw new Error(missingWorkerMessage);
     }
-    this.workerPromise.resolve([worker, registration]);
+    if (this.workerPromise.state === "pending") {
+      this.workerPromise.resolve([worker, registration]);
+    } else {
+      this.workerPromise = new DeferredPromise2((resolve) => {
+        resolve([worker, registration]);
+      });
+    }
     this.#channel.on("REQUEST", this.#handleRequest.bind(this));
     this.#channel.on("RESPONSE", this.#handleResponse.bind(this));
-    window.addEventListener("beforeunload", () => {
-      if (worker.state !== "redundant") {
-        this.#channel.postMessage("CLIENT_CLOSED");
+    window.addEventListener(
+      "beforeunload",
+      () => {
+        if (worker.state !== "redundant") {
+          this.#channel.postMessage("CLIENT_CLOSED");
+        }
+        clearInterval(this.#keepAliveInterval);
+        window.postMessage({ type: "msw/worker:stop" });
+      },
+      {
+        signal: this.#listenerController?.signal
       }
-      clearInterval(this.#keepAliveInterval);
-      window.postMessage({ type: "msw/worker:stop" });
-    });
+    );
     await this.#checkWorkerIntegrity().catch((error2) => {
       import_devUtils3.devUtils.error(
         "Error while checking the worker script integrity. Please report this on GitHub (https://github.com/mswjs/msw/issues) and include the original error below."
@@ -2131,7 +2275,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     this.#keepAliveInterval = window.setInterval(() => {
       this.#channel.postMessage("KEEPALIVE_REQUEST");
     }, 5e3);
-    if (!this.options.quiet) {
+    if (!this.#options.quiet) {
       validateWorkerScope(registration);
     }
     return [worker, registration];
@@ -2195,7 +2339,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     return workerUrl === mockServiceWorkerUrl;
   };
   async #checkWorkerIntegrity() {
-    const integrityCheckPromise = new DeferredPromise();
+    const integrityCheckPromise = new DeferredPromise2();
     this.#channel.postMessage("INTEGRITY_CHECK_REQUEST");
     this.#channel.once("INTEGRITY_CHECK_RESPONSE", (event) => {
       const { checksum, packageVersion } = event.data;
@@ -2319,7 +2463,7 @@ var until2 = async (promise) => {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/handleRequest-D7kpTI5U.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/handleRequest-D7kpTI5U.mjs
 function isObject2(value, loose = false) {
   return loose ? Object.prototype.toString.call(value).startsWith("[object ") : Object.prototype.toString.call(value) === "[object Object]";
 }
@@ -2436,7 +2580,7 @@ async function handleRequest(options) {
   return options.controller.handled;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/fetch-DdKEdDOR.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/fetch-DdKEdDOR.mjs
 function createNetworkError(cause) {
   return Object.assign(/* @__PURE__ */ new TypeError("Failed to fetch"), { cause });
 }
@@ -2629,7 +2773,7 @@ var FetchInterceptor = class FetchInterceptor2 extends Interceptor {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.41.2/node_modules/@mswjs/interceptors/lib/browser/XMLHttpRequest-BvxZV0WU.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.41.3/node_modules/@mswjs/interceptors/lib/browser/XMLHttpRequest-BvxZV0WU.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -3320,7 +3464,7 @@ function setupWorker(...handlers) {
         );
         return;
       }
-      const httpSource = supportsServiceWorker() ? new ServiceWorkerSource({
+      const httpSource = supportsServiceWorker() ? await ServiceWorkerSource.from({
         serviceWorker: {
           url: options?.serviceWorker?.url?.toString() || DEFAULT_WORKER_URL,
           options: options?.serviceWorker?.options