react-realtime-hooks 1.3.2 → 1.3.4

package/dist/index.js

@@ -1220,47 +1220,62 @@ var useWebSocket = (options) => {
     if (socketRef.current !== null) {
       return;
     }
-    const socket2 = new WebSocket(resolvedUrl, protocols);
-    const socketEpoch = nextSocketEpochRef.current + 1;
-    socketRef.current = socket2;
-    socketKeyRef.current = nextSocketKey;
-    activeSocketEpochRef.current = socketEpoch;
-    closingSocketEpochRef.current = null;
-    nextSocketEpochRef.current = socketEpoch;
-    socket2.binaryType = options.binaryType ?? "blob";
     commitState((current) => ({
       ...current,
-      bufferedAmount: socket2.bufferedAmount,
+      bufferedAmount: 0,
       lastChangedAt: Date.now(),
       status: reconnect.status === "running" || reconnect.status === "scheduled" ? "reconnecting" : "connecting"
     }));
-    const handleSocketOpen = (event) => {
-      if (!isActiveSocketEvent(socketEpoch)) {
-        return;
-      }
-      handleOpen(event, socket2);
-    };
-    const handleSocketMessage = (event) => {
-      if (!isActiveSocketEvent(socketEpoch)) {
+    let cancelled = false;
+    let detachListeners = null;
+    queueMicrotask(() => {
+      if (cancelled) {
         return;
       }
-      handleMessage(event);
-    };
-    const handleSocketError = (event) => {
-      handleError(event, socketEpoch);
-    };
-    const handleSocketClose = (event) => {
-      handleClose(event, socketEpoch);
-    };
-    socket2.addEventListener("open", handleSocketOpen);
-    socket2.addEventListener("message", handleSocketMessage);
-    socket2.addEventListener("error", handleSocketError);
-    socket2.addEventListener("close", handleSocketClose);
+      const socket2 = new WebSocket(resolvedUrl, protocols);
+      const socketEpoch = nextSocketEpochRef.current + 1;
+      socketRef.current = socket2;
+      socketKeyRef.current = nextSocketKey;
+      activeSocketEpochRef.current = socketEpoch;
+      closingSocketEpochRef.current = null;
+      nextSocketEpochRef.current = socketEpoch;
+      socket2.binaryType = options.binaryType ?? "blob";
+      commitState((current) => ({
+        ...current,
+        bufferedAmount: socket2.bufferedAmount
+      }));
+      const handleSocketOpen = (event) => {
+        if (!isActiveSocketEvent(socketEpoch)) {
+          return;
+        }
+        handleOpen(event, socket2);
+      };
+      const handleSocketMessage = (event) => {
+        if (!isActiveSocketEvent(socketEpoch)) {
+          return;
+        }
+        handleMessage(event);
+      };
+      const handleSocketError = (event) => {
+        handleError(event, socketEpoch);
+      };
+      const handleSocketClose = (event) => {
+        handleClose(event, socketEpoch);
+      };
+      socket2.addEventListener("open", handleSocketOpen);
+      socket2.addEventListener("message", handleSocketMessage);
+      socket2.addEventListener("error", handleSocketError);
+      socket2.addEventListener("close", handleSocketClose);
+      detachListeners = () => {
+        socket2.removeEventListener("open", handleSocketOpen);
+        socket2.removeEventListener("message", handleSocketMessage);
+        socket2.removeEventListener("error", handleSocketError);
+        socket2.removeEventListener("close", handleSocketClose);
+      };
+    });
     return () => {
-      socket2.removeEventListener("open", handleSocketOpen);
-      socket2.removeEventListener("message", handleSocketMessage);
-      socket2.removeEventListener("error", handleSocketError);
-      socket2.removeEventListener("close", handleSocketClose);
+      cancelled = true;
+      detachListeners?.();
     };
   }, [
     closeSocket,
@@ -1571,55 +1586,66 @@ var useEventSource = (options) => {
     if (eventSourceRef.current !== null) {
       return;
     }
-    const source = new EventSource(resolvedUrl, {
-      withCredentials: options.withCredentials ?? false
-    });
-    const sourceEpoch = nextEventSourceEpochRef.current + 1;
-    eventSourceRef.current = source;
-    eventSourceKeyRef.current = nextEventSourceKey;
-    activeEventSourceEpochRef.current = sourceEpoch;
-    nextEventSourceEpochRef.current = sourceEpoch;
     commitState((current) => ({
       ...current,
       lastChangedAt: Date.now(),
       status: reconnect.status === "running" || reconnect.status === "scheduled" ? "reconnecting" : "connecting"
     }));
-    const handleSourceOpen = (event) => {
-      if (!isActiveEventSourceEvent(sourceEpoch)) {
-        return;
-      }
-      handleOpen(event, source);
-    };
-    const handleSourceMessage = (event) => {
-      if (!isActiveEventSourceEvent(sourceEpoch)) {
+    let cancelled = false;
+    let detachListeners = null;
+    queueMicrotask(() => {
+      if (cancelled) {
         return;
       }
-      commitParsedMessage("message", event, false);
-    };
-    const namedEventHandlers = /* @__PURE__ */ new Map();
-    const handleSourceError = (event) => {
-      handleError(event, source, sourceEpoch);
-    };
-    source.addEventListener("open", handleSourceOpen);
-    source.addEventListener("message", handleSourceMessage);
-    for (const eventName of namedEvents) {
-      const handler = (event) => {
+      const source = new EventSource(resolvedUrl, {
+        withCredentials: options.withCredentials ?? false
+      });
+      const sourceEpoch = nextEventSourceEpochRef.current + 1;
+      eventSourceRef.current = source;
+      eventSourceKeyRef.current = nextEventSourceKey;
+      activeEventSourceEpochRef.current = sourceEpoch;
+      nextEventSourceEpochRef.current = sourceEpoch;
+      const handleSourceOpen = (event) => {
         if (!isActiveEventSourceEvent(sourceEpoch)) {
           return;
         }
-        commitParsedMessage(eventName, event, true);
+        handleOpen(event, source);
       };
-      namedEventHandlers.set(eventName, handler);
-      source.addEventListener(eventName, handler);
-    }
-    source.addEventListener("error", handleSourceError);
-    return () => {
-      source.removeEventListener("open", handleSourceOpen);
-      source.removeEventListener("message", handleSourceMessage);
-      for (const [eventName, handler] of namedEventHandlers) {
-        source.removeEventListener(eventName, handler);
+      const handleSourceMessage = (event) => {
+        if (!isActiveEventSourceEvent(sourceEpoch)) {
+          return;
+        }
+        commitParsedMessage("message", event, false);
+      };
+      const namedEventHandlers = /* @__PURE__ */ new Map();
+      const handleSourceError = (event) => {
+        handleError(event, source, sourceEpoch);
+      };
+      source.addEventListener("open", handleSourceOpen);
+      source.addEventListener("message", handleSourceMessage);
+      for (const eventName of namedEvents) {
+        const handler = (event) => {
+          if (!isActiveEventSourceEvent(sourceEpoch)) {
+            return;
+          }
+          commitParsedMessage(eventName, event, true);
+        };
+        namedEventHandlers.set(eventName, handler);
+        source.addEventListener(eventName, handler);
       }
-      source.removeEventListener("error", handleSourceError);
+      source.addEventListener("error", handleSourceError);
+      detachListeners = () => {
+        source.removeEventListener("open", handleSourceOpen);
+        source.removeEventListener("message", handleSourceMessage);
+        for (const [eventName, handler] of namedEventHandlers) {
+          source.removeEventListener(eventName, handler);
+        }
+        source.removeEventListener("error", handleSourceError);
+      };
+    });
+    return () => {
+      cancelled = true;
+      detachListeners?.();
     };
   }, [
     closeEventSource,