react-realtime-hooks 2.0.1 → 2.0.3

package/dist/index.js

@@ -937,6 +937,7 @@ var useWebSocket = (options) => {
     [protocolsDependency]
   );
   const socketRef = useRef(null);
+  const detachSocketListenersRef = useRef(null);
   const socketKeyRef = useRef(null);
   const activeSocketEpochRef = useRef(null);
   const closingSocketEpochRef = useRef(null);
@@ -1049,6 +1050,10 @@ var useWebSocket = (options) => {
       socketKeyRef.current = null;
       activeSocketEpochRef.current = null;
       closingSocketEpochRef.current = config.trackClose ? socketEpoch : null;
+      if (!config.trackClose) {
+        detachSocketListenersRef.current?.();
+        detachSocketListenersRef.current = null;
+      }
       if (isSocketActive(socket2)) {
         socket2.close(config.code, config.reason);
       }
@@ -1160,6 +1165,8 @@ var useWebSocket = (options) => {
     if (!shouldHandleSocketClose(socketEpoch)) {
       return;
     }
+    detachSocketListenersRef.current?.();
+    detachSocketListenersRef.current = null;
     if (activeSocketEpochRef.current === socketEpoch) {
       socketRef.current = null;
       socketKeyRef.current = null;
@@ -1230,10 +1237,12 @@ var useWebSocket = (options) => {
     controller.noteUserCloseRequested();
     reconnect.cancel();
     heartbeat.stop();
+    const socket2 = socketRef.current;
+    const hasInFlightSocket = socket2 !== null && (socket2.readyState === WebSocket.CONNECTING || socket2.readyState === WebSocket.OPEN);
     commitState((current) => ({
       ...current,
       lastChangedAt: Date.now(),
-      status: "closing"
+      status: hasInFlightSocket ? "closing" : "closed"
     }));
     closeSocket({
       code,
@@ -1297,12 +1306,21 @@ var useWebSocket = (options) => {
       status: reconnect.status === "running" || reconnect.status === "scheduled" ? "reconnecting" : "connecting"
     }));
     let cancelled = false;
-    let detachListeners = null;
     queueMicrotask(() => {
       if (cancelled) {
         return;
       }
+      if (controller.hasManualCloseRequested()) {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          status: "closed"
+        }));
+        return;
+      }
       const socket2 = new WebSocket(resolvedUrl, protocols);
+      detachSocketListenersRef.current?.();
+      detachSocketListenersRef.current = null;
       const socketEpoch = nextSocketEpochRef.current + 1;
       socketRef.current = socket2;
       socketKeyRef.current = nextSocketKey;
@@ -1336,7 +1354,7 @@ var useWebSocket = (options) => {
       socket2.addEventListener("message", handleSocketMessage);
       socket2.addEventListener("error", handleSocketError);
       socket2.addEventListener("close", handleSocketClose);
-      detachListeners = () => {
+      detachSocketListenersRef.current = () => {
         socket2.removeEventListener("open", handleSocketOpen);
         socket2.removeEventListener("message", handleSocketMessage);
         socket2.removeEventListener("error", handleSocketError);
@@ -1345,7 +1363,6 @@ var useWebSocket = (options) => {
     });
     return () => {
       cancelled = true;
-      detachListeners?.();
     };
   }, [
     closeSocket,
@@ -1366,6 +1383,8 @@ var useWebSocket = (options) => {
     supported
   ]);
   useEffect(() => () => {
+    detachSocketListenersRef.current?.();
+    detachSocketListenersRef.current = null;
     controller.noteEffectInitiatedClose();
     socketKeyRef.current = null;
     activeSocketEpochRef.current = null;
@@ -1510,6 +1529,7 @@ var useEventSource = (options) => {
     [eventsDependency]
   );
   const eventSourceRef = useRef(null);
+  const detachEventSourceListenersRef = useRef(null);
   const eventSourceKeyRef = useRef(null);
   const activeEventSourceEpochRef = useRef(null);
   const nextEventSourceEpochRef = useRef(0);
@@ -1547,6 +1567,8 @@ var useEventSource = (options) => {
     eventSourceRef.current = null;
     eventSourceKeyRef.current = null;
     activeEventSourceEpochRef.current = null;
+    detachEventSourceListenersRef.current?.();
+    detachEventSourceListenersRef.current = null;
     source.close();
   });
   const isActiveEventSourceEvent = useStableCallback((sourceEpoch) => {
@@ -1717,11 +1739,18 @@ var useEventSource = (options) => {
       status: reconnect.status === "running" || reconnect.status === "scheduled" ? "reconnecting" : "connecting"
     }));
     let cancelled = false;
-    let detachListeners = null;
     queueMicrotask(() => {
       if (cancelled) {
         return;
       }
+      if (manualCloseRef.current) {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          status: "closed"
+        }));
+        return;
+      }
       const source = new EventSource(resolvedUrl, {
         withCredentials: options.withCredentials ?? false
       });
@@ -1759,7 +1788,7 @@ var useEventSource = (options) => {
         source.addEventListener(eventName, handler);
       }
       source.addEventListener("error", handleSourceError);
-      detachListeners = () => {
+      detachEventSourceListenersRef.current = () => {
         source.removeEventListener("open", handleSourceOpen);
         source.removeEventListener("message", handleSourceMessage);
         for (const [eventName, handler] of namedEventHandlers) {
@@ -1770,7 +1799,6 @@ var useEventSource = (options) => {
     });
     return () => {
       cancelled = true;
-      detachListeners?.();
     };
   }, [
     closeEventSource,
@@ -1789,6 +1817,8 @@ var useEventSource = (options) => {
     supported
   ]);
   useEffect(() => () => {
+    detachEventSourceListenersRef.current?.();
+    detachEventSourceListenersRef.current = null;
     suppressReconnectRef.current = true;
     eventSourceKeyRef.current = null;
     activeEventSourceEpochRef.current = null;