msw 0.38.2 → 0.39.2

package/lib/esm/index.js

@@ -745,13 +745,36 @@ function getRequestCookies(request) {
     }
 }
 
+/**
+ * Sets relevant cookies on the request.
+ * Request cookies are taken from the following sources:
+ * - Immediate (own) request cookies (those in the "Cookie" request header);
+ * - From the `document.cookie` based on the request's `credentials` value;
+ * - From the internal cookie store that persists/hydrates cookies in Node.js
+ */
 function setRequestCookies(request) {
     var _a;
+    // Set mocked request cookies from the `cookie` header of the original request.
+    // No need to take `credentials` into account, because in Node.js requests are intercepted
+    // _after_ they happen. Request issuer should have already taken care of sending relevant cookies.
+    // Unlike browser, where interception is on the worker level, _before_ the request happens.
+    const requestCookiesString = request.headers.get('cookie');
     store.hydrate();
-    request.cookies = Object.assign(Object.assign({}, getRequestCookies(request)), Array.from((_a = store.get(Object.assign(Object.assign({}, request), { url: request.url.toString() }))) === null || _a === void 0 ? void 0 : _a.entries()).reduce((cookies, [name, { value }]) => Object.assign(cookies, { [name]: value }), {}));
-    request.headers.set('cookie', Object.entries(request.cookies)
-        .map(([name, value]) => `${name}=${value}`)
-        .join('; '));
+    const cookiesFromStore = Array.from((_a = store.get(Object.assign(Object.assign({}, request), { url: request.url.toString() }))) === null || _a === void 0 ? void 0 : _a.entries()).reduce((cookies, [name, { value }]) => {
+        return Object.assign(cookies, { [name.trim()]: value });
+    }, {});
+    const cookiesFromDocument = getRequestCookies(request);
+    const forwardedCookies = Object.assign(Object.assign({}, cookiesFromDocument), cookiesFromStore);
+    // Ensure the persisted (document) cookies are propagated to the request.
+    // Propagated the cookies persisted in the Cookuie Store to the request headers.
+    // This forwards relevant request cookies based on the request's credentials.
+    for (const [name, value] of Object.entries(forwardedCookies)) {
+        request.headers.append('cookie', `${name}=${value}`);
+    }
+    const ownCookies = requestCookiesString
+        ? parse_1(requestCookiesString)
+        : {};
+    request.cookies = Object.assign(Object.assign(Object.assign({}, request.cookies), forwardedCookies), ownCookies);
 }
 
 /**
@@ -1333,16 +1356,32 @@ This is necessary to ensure that the Service Worker is in sync with the library
 If this message still persists after updating, please report an issue: https://github.com/open-draft/msw/issues\
       `);
             }
-            yield enableMocking(context, options).catch((err) => {
-                throw new Error(`Failed to enable mocking: ${err === null || err === void 0 ? void 0 : err.message}`);
-            });
             context.keepAliveInterval = window.setInterval(() => context.workerChannel.send('KEEPALIVE_REQUEST'), 5000);
             // Warn the user when loading the page that lies outside
             // of the worker's scope.
             validateWorkerScope(registration, context.startOptions);
             return registration;
         });
-        const workerRegistration = startWorkerInstance();
+        const workerRegistration = startWorkerInstance().then((registration) => __awaiter(this, void 0, void 0, function* () {
+            const pendingInstance = registration.installing || registration.waiting;
+            // Wait until the worker is activated.
+            // Assume the worker is already activated if there's no pending registration
+            // (i.e. when reloading the page after a successful activation).
+            if (pendingInstance) {
+                yield new Promise((resolve) => {
+                    pendingInstance.addEventListener('statechange', () => {
+                        if (pendingInstance.state === 'activated') {
+                            return resolve();
+                        }
+                    });
+                });
+            }
+            // Print the activation message only after the worker has been activated.
+            yield enableMocking(context, options).catch((error) => {
+                throw new Error(`Failed to enable mocking: ${error === null || error === void 0 ? void 0 : error.message}`);
+            });
+            return registration;
+        }));
         // Defer any network requests until the Service Worker instance is ready.
         // This prevents a race condition between the Service Worker registration
         // and application's runtime requests (i.e. requests on mount).
@@ -1421,6 +1460,7 @@ function parseIsomorphicRequest(request) {
         url: request.url,
         method: request.method,
         body: parseBody(request.body, request.headers),
+        credentials: request.credentials || 'same-origin',
         headers: request.headers,
         cookies: {},
         redirect: 'manual',
@@ -1432,21 +1472,9 @@ function parseIsomorphicRequest(request) {
         integrity: '',
         destination: 'document',
         bodyUsed: false,
-        credentials: 'same-origin',
     };
-    // Set mocked request cookies from the `cookie` header of the original request.
-    // No need to take `credentials` into account, because in Node.js requests are intercepted
-    // _after_ they happen. Request issuer should have already taken care of sending relevant cookies.
-    // Unlike browser, where interception is on the worker level, _before_ the request happens.
-    const requestCookiesString = request.headers.get('cookie');
     // Attach all the cookies from the virtual cookie store.
     setRequestCookies(mockedRequest);
-    const requestCookies = requestCookiesString
-        ? parse_1(requestCookiesString)
-        : {};
-    // Merge both direct request cookies and the cookies inherited
-    // from other same-origin requests in the cookie store.
-    mockedRequest.cookies = Object.assign(Object.assign({}, mockedRequest.cookies), requestCookies);
     return mockedRequest;
 }
 

package/lib/esm/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.38.2).
+ * Mock Service Worker (0.39.2).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.