react-realtime-hooks 2.0.0 → 2.0.2

package/dist/index.js

@@ -1230,10 +1230,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,
@@ -1302,6 +1304,14 @@ var useWebSocket = (options) => {
       if (cancelled) {
         return;
       }
+      if (controller.hasManualCloseRequested()) {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          status: "closed"
+        }));
+        return;
+      }
       const socket2 = new WebSocket(resolvedUrl, protocols);
       const socketEpoch = nextSocketEpochRef.current + 1;
       socketRef.current = socket2;
@@ -1722,6 +1732,14 @@ var useEventSource = (options) => {
       if (cancelled) {
         return;
       }
+      if (manualCloseRef.current) {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          status: "closed"
+        }));
+        return;
+      }
       const source = new EventSource(resolvedUrl, {
         withCredentials: options.withCredentials ?? false
       });