msw 2.2.4 → 2.2.6

package/lib/browser/index.mjs

@@ -95,6 +95,9 @@ function isNodeProcess() {
   return false;
 }
 
+// src/browser/setupWorker/start/createStartHandler.ts
+import { devUtils as devUtils7 } from '../core/utils/internal/devUtils.mjs';
+
 // node_modules/.pnpm/@open-draft+until@2.1.0/node_modules/@open-draft/until/lib/index.mjs
 var until = async (promise) => {
   try {
@@ -107,9 +110,6 @@ var until = async (promise) => {
   }
 };
 
-// src/browser/setupWorker/start/createStartHandler.ts
-import { devUtils as devUtils6 } from '../core/utils/internal/devUtils.mjs';
-
 // src/browser/setupWorker/start/utils/getWorkerInstance.ts
 import { devUtils } from '../core/utils/internal/devUtils.mjs';
 
@@ -288,7 +288,7 @@ var createRequestListener = (context, options) => {
         context.emitter,
         {
           onPassthroughResponse() {
-            messageChannel.postMessage("NOT_FOUND");
+            messageChannel.postMessage("PASSTHROUGH");
           },
           async onMockedResponse(response, { handler, parsedResult }) {
             const responseClone = response.clone();
@@ -352,18 +352,22 @@ This exception has been gracefully handled as a 500 response, however, it's stro
   };
 };
 
-// src/browser/utils/requestIntegrityCheck.ts
-async function requestIntegrityCheck(context, serviceWorker) {
+// src/browser/utils/checkWorkerIntegrity.ts
+import { devUtils as devUtils5 } from '../core/utils/internal/devUtils.mjs';
+async function checkWorkerIntegrity(context) {
   context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
-  const { payload: actualChecksum } = await context.events.once(
-    "INTEGRITY_CHECK_RESPONSE"
-  );
-  if (actualChecksum !== "223d191a56023cd36aa88c802961b911") {
-    throw new Error(
-      `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"223d191a56023cd36aa88c802961b911"}).`
+  const { payload } = await context.events.once("INTEGRITY_CHECK_RESPONSE");
+  if (payload.checksum !== "26357c79639bfa20d64c0efca2a87423") {
+    devUtils5.warn(
+      `The currently registered Service Worker has been generated by a different version of MSW (${payload.packageVersion}) and may not be fully compatible with the installed version.
+
+It's recommended you update your worker script by running this command:
+
+  \u2022 npx msw init <PUBLIC_DIR>
+
+You can also automate this process and make the worker script update automatically upon the library installations. Read more: https://mswjs.io/docs/cli/init.`
     );
   }
-  return serviceWorker;
 }
 
 // node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
@@ -1024,6 +1028,7 @@ function createResponseListener(context) {
     const { requestId } = responseJson;
     const request = context.requests.get(requestId);
     context.requests.delete(requestId);
+    console.log("RESPONSE LISTENER", responseJson, context.requests);
     if (responseJson.type?.includes("opaque")) {
       return;
     }
@@ -1056,10 +1061,10 @@ function createResponseListener(context) {
 }
 
 // src/browser/setupWorker/start/utils/validateWorkerScope.ts
-import { devUtils as devUtils5 } from '../core/utils/internal/devUtils.mjs';
+import { devUtils as devUtils6 } from '../core/utils/internal/devUtils.mjs';
 function validateWorkerScope(registration, options) {
   if (!options?.quiet && !location.href.startsWith(registration.scope)) {
-    devUtils5.warn(
+    devUtils6.warn(
       `Cannot intercept requests on this page because it's outside of the worker's scope ("${registration.scope}"). If you wish to mock API requests on this page, you must resolve this scope issue.
 
 - (Recommended) Register the worker at the root level ("/") of your application.
@@ -1085,14 +1090,14 @@ var createStartHandler = (context) => {
       );
       const [worker, registration] = instance;
       if (!worker) {
-        const missingWorkerMessage = customOptions?.findWorker ? devUtils6.formatMessage(
+        const missingWorkerMessage = customOptions?.findWorker ? devUtils7.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".
 More details: https://mswjs.io/docs/api/setup-worker/start#findworker
 `,
           options.serviceWorker.url
-        ) : devUtils6.formatMessage(
+        ) : devUtils7.formatMessage(
           `Failed to locate the Service Worker registration.
 
 This most likely means that the worker script URL "%s" cannot resolve against the actual public hostname (%s). This may happen if your application runs behind a proxy, or has a dynamic hostname.
@@ -1111,19 +1116,12 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         }
         window.clearInterval(context.keepAliveInterval);
       });
-      const integrityCheckResult = await until(
-        () => requestIntegrityCheck(context, worker)
-      );
-      if (integrityCheckResult.error) {
-        devUtils6.error(`Detected outdated Service Worker: ${integrityCheckResult.error.message}
-
-The mocking is still enabled, but it's highly recommended that you update your Service Worker by running:
-
-$ npx msw init <PUBLIC_DIR>
-
-This is necessary to ensure that the Service Worker is in sync with the library to guarantee its stability.
-If this message still persists after updating, please report an issue: https://github.com/open-draft/msw/issues      `);
-      }
+      await checkWorkerIntegrity(context).catch((error2) => {
+        devUtils7.error(
+          "Error while checking the worker script integrity. Please report this on GitHub (https://github.com/mswjs/msw/issues), including the original error below."
+        );
+        console.error(error2);
+      });
       context.keepAliveInterval = window.setInterval(
         () => context.workerChannel.send("KEEPALIVE_REQUEST"),
         5e3
@@ -1154,16 +1152,16 @@ If this message still persists after updating, please report an issue: https://g
 };
 
 // src/browser/setupWorker/stop/createStop.ts
-import { devUtils as devUtils8 } from '../core/utils/internal/devUtils.mjs';
+import { devUtils as devUtils9 } from '../core/utils/internal/devUtils.mjs';
 
 // src/browser/setupWorker/stop/utils/printStopMessage.ts
-import { devUtils as devUtils7 } from '../core/utils/internal/devUtils.mjs';
+import { devUtils as devUtils8 } from '../core/utils/internal/devUtils.mjs';
 function printStopMessage(args = {}) {
   if (args.quiet) {
     return;
   }
   console.log(
-    `%c${devUtils7.formatMessage("Mocking disabled.")}`,
+    `%c${devUtils8.formatMessage("Mocking disabled.")}`,
     "color:orangered;font-weight:bold;"
   );
 }
@@ -1172,7 +1170,7 @@ function printStopMessage(args = {}) {
 var createStop = (context) => {
   return function stop() {
     if (!context.isMockingEnabled) {
-      devUtils8.warn(
+      devUtils9.warn(
         'Found a redundant "worker.stop()" call. Note that stopping the worker while mocking already stopped has no effect. Consider removing this "worker.stop()" call.'
       );
       return;
@@ -2263,7 +2261,7 @@ function createFallbackStop(context) {
 }
 
 // src/browser/setupWorker/setupWorker.ts
-import { devUtils as devUtils9 } from '../core/utils/internal/devUtils.mjs';
+import { devUtils as devUtils10 } from '../core/utils/internal/devUtils.mjs';
 import { SetupApi } from '../core/SetupApi.mjs';
 import { mergeRight as mergeRight2 } from '../core/utils/internal/mergeRight.mjs';
 
@@ -2291,7 +2289,7 @@ var SetupWorkerApi = class extends SetupApi {
     super(...handlers);
     invariant(
       !isNodeProcess(),
-      devUtils9.formatMessage(
+      devUtils10.formatMessage(
         "Failed to execute `setupWorker` in a non-browser environment. Consider using `setupServer` for Node.js environment instead."
       )
     );
@@ -2389,7 +2387,7 @@ var SetupWorkerApi = class extends SetupApi {
   }
   async start(options = {}) {
     if (options.waitUntilReady === true) {
-      devUtils9.warn(
+      devUtils10.warn(
         'The "waitUntilReady" option has been deprecated. Please remove it from this "worker.start()" call. Follow the recommended Browser integration (https://mswjs.io/docs/integrations/browser) to eliminate any race conditions between the Service Worker registration and any requests made by your application on initial render.'
       );
     }