msw 2.3.0-ws.rc-5 → 2.3.0-ws.rc-6

package/lib/iife/index.js

@@ -5661,25 +5661,81 @@ Consider naming this operation or using "graphql.operation()" request handler to
   };
 
   // src/core/ws/WebSocketClientManager.ts
-  var kAddByClientId = Symbol("kAddByClientId");
+  var MSW_WEBSOCKET_CLIENTS_KEY = "msw:ws:clients";
   var WebSocketClientManager = class {
-    constructor(channel) {
+    constructor(channel, url) {
       this.channel = channel;
-      this.clients = /* @__PURE__ */ new Set();
-      this.channel.addEventListener("message", (message3) => {
-        const { type, payload } = message3.data;
-        switch (type) {
-          case "connection:open": {
-            this.onRemoteConnection(payload.clientId, new URL(payload.url));
-            break;
+      this.url = url;
+      this.inMemoryClients = /* @__PURE__ */ new Set();
+      if (typeof localStorage !== "undefined") {
+        localStorage.removeItem = new Proxy(localStorage.removeItem, {
+          apply: (target, thisArg, args) => {
+            const [key] = args;
+            if (key === MSW_WEBSOCKET_CLIENTS_KEY) {
+              this.inMemoryClients.clear();
+            }
+            return Reflect.apply(target, thisArg, args);
           }
-        }
-      });
+        });
+      }
     }
+    inMemoryClients;
     /**
      * All active WebSocket client connections.
      */
-    clients;
+    get clients() {
+      if (typeof localStorage !== "undefined") {
+        const inMemoryClients = Array.from(this.inMemoryClients);
+        console.log("get clients()", inMemoryClients, this.getSerializedClients());
+        return new Set(
+          inMemoryClients.concat(
+            this.getSerializedClients().filter((serializedClient) => {
+              if (inMemoryClients.every(
+                (client) => client.id !== serializedClient.clientId
+              )) {
+                return serializedClient;
+              }
+            }).map((serializedClient) => {
+              return new WebSocketRemoteClientConnection(
+                serializedClient.clientId,
+                new URL(serializedClient.url),
+                this.channel
+              );
+            })
+          )
+        );
+      }
+      return this.inMemoryClients;
+    }
+    getSerializedClients() {
+      invariant(
+        typeof localStorage !== "undefined",
+        "Failed to call WebSocketClientManager#getSerializedClients() in a non-browser environment. This is likely a bug in MSW. Please, report it on GitHub: https://github.com/mswjs/msw"
+      );
+      const clientsJson = localStorage.getItem(MSW_WEBSOCKET_CLIENTS_KEY);
+      if (!clientsJson) {
+        return [];
+      }
+      const allClients = JSON.parse(clientsJson);
+      const matchingClients = allClients.filter((client) => {
+        return matchRequestUrl(new URL(client.url), this.url).matches;
+      });
+      return matchingClients;
+    }
+    addClient(client) {
+      this.inMemoryClients.add(client);
+      if (typeof localStorage !== "undefined") {
+        const serializedClients = this.getSerializedClients();
+        const nextSerializedClients = serializedClients.concat({
+          clientId: client.id,
+          url: client.url.href
+        });
+        localStorage.setItem(
+          MSW_WEBSOCKET_CLIENTS_KEY,
+          JSON.stringify(nextSerializedClients)
+        );
+      }
+    }
     /**
      * Adds the given `WebSocket` client connection to the set
      * of all connections. The given connection is always the complete
@@ -5687,14 +5743,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
      * for the opened connections in the same runtime.
      */
     addConnection(client) {
-      this.clients.add(client);
-      this.channel.postMessage({
-        type: "connection:open",
-        payload: {
-          clientId: client.id,
-          url: client.url.toString()
-        }
-      });
+      this.addClient(client);
       const handleExtraneousMessage = (message3) => {
         const { type, payload } = message3.data;
         if (typeof payload === "object" && "clientId" in payload && payload.clientId !== client.id) {
@@ -5719,18 +5768,6 @@ Consider naming this operation or using "graphql.operation()" request handler to
         once: true
       });
     }
-    /**
-     * Adds a client connection wrapper to operate with
-     * WebSocket client connections in other runtimes.
-     */
-    onRemoteConnection(id, url) {
-      this.clients.add(
-        // Create a connection-compatible instance that can
-        // operate with this client from a different runtime
-        // using the BroadcastChannel messages.
-        new WebSocketRemoteClientConnection(id, url, this.channel)
-      );
-    }
   };
   var WebSocketRemoteClientConnection = class {
     constructor(id, url, channel) {
@@ -5768,9 +5805,11 @@ Consider naming this operation or using "graphql.operation()" request handler to
       "Expected a WebSocket server URL to be a valid path but got %s",
       typeof url
     );
-    const clientManager = new WebSocketClientManager(wsBroadcastChannel);
+    const clientManager = new WebSocketClientManager(wsBroadcastChannel, url);
     return {
-      clients: clientManager.clients,
+      get clients() {
+        return clientManager.clients;
+      },
       on(event, listener) {
         const handler = new WebSocketHandler(url);
         handler[kEmitter].on("connection", ({ client }) => {
@@ -6565,6 +6604,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       context.workerChannel.send("MOCK_DEACTIVATE");
       context.isMockingEnabled = false;
       window.clearInterval(context.keepAliveInterval);
+      localStorage.removeItem(MSW_WEBSOCKET_CLIENTS_KEY);
       printStopMessage({ quiet: context.startOptions?.quiet });
     };
   };