react-realtime-hooks 1.0.1 → 1.0.2

package/dist/index.js

@@ -616,6 +616,7 @@ var useWebSocket = (options) => {
   const manualOpenRef = useRef(false);
   const skipCloseReconnectRef = useRef(false);
   const suppressReconnectRef = useRef(false);
+  const terminalErrorRef = useRef(null);
   const [openNonce, setOpenNonce] = useState(0);
   const [state, setState] = useState(
     () => createInitialState3(connect ? "connecting" : "idle")
@@ -699,7 +700,9 @@ var useWebSocket = (options) => {
   });
   const handleOpen = useEffectEvent((event, socket2) => {
     manualCloseRef.current = false;
+    manualOpenRef.current = false;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.markConnected();
     heartbeat.start();
     commitState((current) => ({
@@ -723,11 +726,19 @@ var useWebSocket = (options) => {
       options.onMessage?.(message, event);
     } catch {
       const parseError = new Event("error");
+      terminalErrorRef.current = parseError;
+      manualOpenRef.current = false;
+      skipCloseReconnectRef.current = true;
+      suppressReconnectRef.current = true;
+      reconnect.cancel();
+      heartbeat.stop();
       commitState((current) => ({
         ...current,
+        lastChangedAt: Date.now(),
         lastError: parseError,
         status: "error"
       }));
+      closeSocket(1003, "parse-error");
     }
   });
   const handleError = useEffectEvent((event) => {
@@ -744,8 +755,21 @@ var useWebSocket = (options) => {
     socketKeyRef.current = null;
     heartbeat.stop();
     updateBufferedAmount();
+    const terminalError = terminalErrorRef.current;
     const skipCloseReconnect = skipCloseReconnectRef.current;
     skipCloseReconnectRef.current = false;
+    if (terminalError !== null) {
+      suppressReconnectRef.current = false;
+      commitState((current) => ({
+        ...current,
+        lastChangedAt: Date.now(),
+        lastCloseEvent: event,
+        lastError: terminalError,
+        status: "error"
+      }));
+      options.onClose?.(event);
+      return;
+    }
     const shouldReconnect = !suppressReconnectRef.current && !skipCloseReconnect && reconnectEnabled && (options.shouldReconnect?.(event) ?? true);
     commitState((current) => ({
       ...current,
@@ -764,6 +788,7 @@ var useWebSocket = (options) => {
     manualCloseRef.current = false;
     manualOpenRef.current = true;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     setOpenNonce((current) => current + 1);
   };
@@ -772,6 +797,7 @@ var useWebSocket = (options) => {
     manualOpenRef.current = true;
     skipCloseReconnectRef.current = true;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     heartbeat.stop();
     closeSocket();
     suppressReconnectRef.current = false;
@@ -781,6 +807,7 @@ var useWebSocket = (options) => {
     manualCloseRef.current = true;
     manualOpenRef.current = false;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     heartbeat.stop();
     commitState((current) => ({
@@ -818,7 +845,7 @@ var useWebSocket = (options) => {
       }));
       return;
     }
-    const shouldConnect = connect && !manualCloseRef.current || manualOpenRef.current || reconnect.status === "running";
+    const shouldConnect = terminalErrorRef.current === null && (connect && !manualCloseRef.current || manualOpenRef.current || reconnect.status === "running");
     const nextSocketKey = `${resolvedUrl}::${protocolsDependency}::${options.binaryType ?? "blob"}`;
     if (!shouldConnect) {
       if (socketRef.current !== null) {
@@ -828,7 +855,7 @@ var useWebSocket = (options) => {
       socketKeyRef.current = null;
       commitState((current) => ({
         ...current,
-        status: manualCloseRef.current ? "closed" : "idle"
+        status: terminalErrorRef.current !== null ? "error" : manualCloseRef.current ? "closed" : "idle"
       }));
       return;
     }
@@ -883,6 +910,7 @@ var useWebSocket = (options) => {
   useEffect(() => () => {
     suppressReconnectRef.current = true;
     socketKeyRef.current = null;
+    terminalErrorRef.current = null;
     const socket2 = socketRef.current;
     socketRef.current = null;
     if (socket2 === null) {
@@ -979,6 +1007,7 @@ var useEventSource = (options) => {
   const manualOpenRef = useRef(false);
   const skipErrorReconnectRef = useRef(false);
   const suppressReconnectRef = useRef(false);
+  const terminalErrorRef = useRef(null);
   const [openNonce, setOpenNonce] = useState(0);
   const [state, setState] = useState(
     () => createInitialState4(connect ? "connecting" : "idle")
@@ -1012,7 +1041,9 @@ var useEventSource = (options) => {
   });
   const handleOpen = useEffectEvent((event, source) => {
     manualCloseRef.current = false;
+    manualOpenRef.current = false;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.markConnected();
     commitState((current) => ({
       ...current,
@@ -1038,8 +1069,14 @@ var useEventSource = (options) => {
         options.onMessage?.(message, event);
       } catch {
         const parseError = new Event("error");
+        terminalErrorRef.current = parseError;
+        manualOpenRef.current = false;
+        suppressReconnectRef.current = true;
+        reconnect.cancel();
+        closeEventSource();
         commitState((current) => ({
           ...current,
+          lastChangedAt: Date.now(),
           lastError: parseError,
           status: "error"
         }));
@@ -1047,6 +1084,17 @@ var useEventSource = (options) => {
     }
   );
   const handleError = useEffectEvent((event, source) => {
+    const terminalError = terminalErrorRef.current;
+    if (terminalError !== null) {
+      suppressReconnectRef.current = false;
+      commitState((current) => ({
+        ...current,
+        lastChangedAt: Date.now(),
+        lastError: terminalError,
+        status: "error"
+      }));
+      return;
+    }
     const skipErrorReconnect = skipErrorReconnectRef.current;
     skipErrorReconnectRef.current = false;
     const shouldReconnect = !suppressReconnectRef.current && !skipErrorReconnect && reconnectEnabled && (options.shouldReconnect?.(event) ?? true);
@@ -1073,6 +1121,7 @@ var useEventSource = (options) => {
     manualCloseRef.current = false;
     manualOpenRef.current = true;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     setOpenNonce((current) => current + 1);
   };
@@ -1081,6 +1130,7 @@ var useEventSource = (options) => {
     manualOpenRef.current = true;
     skipErrorReconnectRef.current = true;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     closeEventSource();
     suppressReconnectRef.current = false;
     reconnect.schedule("manual");
@@ -1089,6 +1139,7 @@ var useEventSource = (options) => {
     manualCloseRef.current = true;
     manualOpenRef.current = false;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     closeEventSource();
     commitState((current) => ({
@@ -1115,7 +1166,7 @@ var useEventSource = (options) => {
       }));
       return;
     }
-    const shouldConnect = connect && !manualCloseRef.current || manualOpenRef.current || reconnect.status === "running";
+    const shouldConnect = terminalErrorRef.current === null && (connect && !manualCloseRef.current || manualOpenRef.current || reconnect.status === "running");
     const nextEventSourceKey = [
       resolvedUrl,
       options.withCredentials ? "credentials" : "anonymous",
@@ -1129,7 +1180,7 @@ var useEventSource = (options) => {
       eventSourceKeyRef.current = null;
       commitState((current) => ({
         ...current,
-        status: manualCloseRef.current ? "closed" : "idle"
+        status: terminalErrorRef.current !== null ? "error" : manualCloseRef.current ? "closed" : "idle"
       }));
       return;
     }
@@ -1191,6 +1242,7 @@ var useEventSource = (options) => {
   useEffect(() => () => {
     suppressReconnectRef.current = true;
     eventSourceKeyRef.current = null;
+    terminalErrorRef.current = null;
     const source = eventSourceRef.current;
     eventSourceRef.current = null;
     if (source !== null) {