react-realtime-hooks 1.0.1 → 1.0.3

package/dist/index.js

@@ -402,6 +402,7 @@ var useHeartbeat = (options) => {
   const startOnMount = options.startOnMount ?? true;
   const intervalRef = useRef(createManagedInterval());
   const timeoutRef = useRef(createManagedTimeout());
+  const generationRef = useRef(0);
   const [state, setState] = useState(
     () => createInitialState2(enabled && startOnMount)
   );
@@ -428,8 +429,7 @@ var useHeartbeat = (options) => {
       handleTimeout();
     }, options.timeoutMs);
   });
-  const runBeat = useEffectEvent(() => {
-    const performedAt = Date.now();
+  const handleBeatSuccess = useEffectEvent((performedAt) => {
     commitState((current) => ({
       ...current,
       hasTimedOut: false,
@@ -437,7 +437,35 @@ var useHeartbeat = (options) => {
     }));
     scheduleTimeout();
     options.onBeat?.();
-    void options.beat?.();
+  });
+  const handleBeatError = useEffectEvent((error) => {
+    timeoutRef.current.cancel();
+    options.onError?.(error);
+  });
+  const runBeat = useEffectEvent(() => {
+    const generation = generationRef.current;
+    const completeBeat = (result) => {
+      if (generation !== generationRef.current || result === false) {
+        return;
+      }
+      handleBeatSuccess(Date.now());
+    };
+    const failBeat = (error) => {
+      if (generation !== generationRef.current) {
+        return;
+      }
+      handleBeatError(error);
+    };
+    try {
+      const result = options.beat?.();
+      if (result !== null && typeof result === "object" && "then" in result) {
+        void Promise.resolve(result).then(completeBeat, failBeat);
+        return;
+      }
+      completeBeat(result);
+    } catch (error) {
+      failBeat(error);
+    }
   });
   const start = () => {
     if (!enabled) {
@@ -455,6 +483,7 @@ var useHeartbeat = (options) => {
     }));
   };
   const stop = () => {
+    generationRef.current += 1;
     intervalRef.current.cancel();
     timeoutRef.current.cancel();
     commitState((current) => ({
@@ -500,6 +529,7 @@ var useHeartbeat = (options) => {
     return void 0;
   }, [enabled, options.intervalMs, startOnMount]);
   useEffect(() => () => {
+    generationRef.current += 1;
     intervalRef.current.cancel();
     timeoutRef.current.cancel();
   }, []);
@@ -605,6 +635,7 @@ var toProtocolsDependency = (protocols) => {
   return Array.isArray(protocols) ? protocols.join("|") : protocols;
 };
 var toHeartbeatConfig = (heartbeat) => heartbeat === void 0 || heartbeat === false ? null : heartbeat;
+var isSocketActive = (socket) => socket.readyState === WebSocket.OPEN || socket.readyState === WebSocket.CONNECTING;
 var useWebSocket = (options) => {
   const connect = options.connect ?? true;
   const supported = isWebSocketSupported();
@@ -616,6 +647,8 @@ var useWebSocket = (options) => {
   const manualOpenRef = useRef(false);
   const skipCloseReconnectRef = useRef(false);
   const suppressReconnectRef = useRef(false);
+  const pendingCloseActionRef = useRef(null);
+  const terminalErrorRef = useRef(null);
   const [openNonce, setOpenNonce] = useState(0);
   const [state, setState] = useState(
     () => createInitialState3(connect ? "connecting" : "idle")
@@ -633,6 +666,7 @@ var useWebSocket = (options) => {
   const heartbeatConfig = toHeartbeatConfig(
     options.heartbeat
   );
+  const defaultHeartbeatAction = options.reconnect === false ? "close" : "reconnect";
   const heartbeatHookOptions = heartbeatConfig === null ? {
     enabled: false,
     intervalMs: 1e3,
@@ -668,6 +702,27 @@ var useWebSocket = (options) => {
   if (heartbeatConfig !== null && heartbeatConfig.onTimeout !== void 0) {
     heartbeatHookOptions.onTimeout = heartbeatConfig.onTimeout;
   }
+  if (heartbeatConfig !== null) {
+    const onTimeout = heartbeatHookOptions.onTimeout;
+    heartbeatHookOptions.onTimeout = () => {
+      applyHeartbeatAction(
+        heartbeatConfig.timeoutAction ?? defaultHeartbeatAction,
+        new Event("heartbeat-timeout"),
+        "heartbeat-timeout"
+      );
+      onTimeout?.();
+    };
+    const onError = heartbeatConfig.onError;
+    heartbeatHookOptions.onError = (error) => {
+      const event = error instanceof Event ? error : new Event("heartbeat-error");
+      applyHeartbeatAction(
+        heartbeatConfig.errorAction ?? heartbeatConfig.timeoutAction ?? defaultHeartbeatAction,
+        event,
+        "error"
+      );
+      onError?.(error);
+    };
+  }
   const heartbeat = useHeartbeat(
     heartbeatHookOptions
   );
@@ -683,10 +738,46 @@ var useWebSocket = (options) => {
     }
     socketRef.current = null;
     socketKeyRef.current = null;
-    if (socket2.readyState === WebSocket.OPEN || socket2.readyState === WebSocket.CONNECTING) {
+    if (isSocketActive(socket2)) {
       socket2.close(code, reason);
     }
   });
+  const applyHeartbeatAction = useEffectEvent(
+    (action, error, reconnectTrigger) => {
+      heartbeat.stop();
+      if (action === "none") {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          lastError: error
+        }));
+        return;
+      }
+      const shouldReconnect = action === "reconnect" && reconnectEnabled && (options.shouldReconnect?.(error) ?? true);
+      manualOpenRef.current = false;
+      terminalErrorRef.current = shouldReconnect ? null : error;
+      const socket2 = socketRef.current;
+      if (socket2 === null || !isSocketActive(socket2)) {
+        commitState((current) => ({
+          ...current,
+          lastChangedAt: Date.now(),
+          lastError: error,
+          status: shouldReconnect ? "reconnecting" : "error"
+        }));
+        if (shouldReconnect) {
+          reconnect.schedule(reconnectTrigger);
+        }
+        return;
+      }
+      pendingCloseActionRef.current = {
+        error,
+        reconnectTrigger: shouldReconnect ? reconnectTrigger : null
+      };
+      skipCloseReconnectRef.current = true;
+      suppressReconnectRef.current = true;
+      closeSocket();
+    }
+  );
   const parseMessage = useEffectEvent((event) => {
     const parser = options.parseMessage ?? defaultParseMessage;
     return parser(event);
@@ -699,7 +790,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 +816,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 +845,38 @@ var useWebSocket = (options) => {
     socketKeyRef.current = null;
     heartbeat.stop();
     updateBufferedAmount();
+    const pendingCloseAction = pendingCloseActionRef.current;
+    pendingCloseActionRef.current = null;
+    const terminalError = terminalErrorRef.current;
     const skipCloseReconnect = skipCloseReconnectRef.current;
     skipCloseReconnectRef.current = false;
+    if (pendingCloseAction !== null) {
+      suppressReconnectRef.current = false;
+      commitState((current) => ({
+        ...current,
+        lastChangedAt: Date.now(),
+        lastCloseEvent: event,
+        lastError: pendingCloseAction.error ?? current.lastError,
+        status: pendingCloseAction.reconnectTrigger === null ? "error" : "reconnecting"
+      }));
+      options.onClose?.(event);
+      if (pendingCloseAction.reconnectTrigger !== null) {
+        reconnect.schedule(pendingCloseAction.reconnectTrigger);
+      }
+      return;
+    }
+    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 +895,7 @@ var useWebSocket = (options) => {
     manualCloseRef.current = false;
     manualOpenRef.current = true;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     setOpenNonce((current) => current + 1);
   };
@@ -772,6 +904,7 @@ var useWebSocket = (options) => {
     manualOpenRef.current = true;
     skipCloseReconnectRef.current = true;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     heartbeat.stop();
     closeSocket();
     suppressReconnectRef.current = false;
@@ -781,6 +914,7 @@ var useWebSocket = (options) => {
     manualCloseRef.current = true;
     manualOpenRef.current = false;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     heartbeat.stop();
     commitState((current) => ({
@@ -818,7 +952,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 +962,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,12 +1017,13 @@ var useWebSocket = (options) => {
   useEffect(() => () => {
     suppressReconnectRef.current = true;
     socketKeyRef.current = null;
+    terminalErrorRef.current = null;
     const socket2 = socketRef.current;
     socketRef.current = null;
     if (socket2 === null) {
       return;
     }
-    if (socket2.readyState === WebSocket.OPEN || socket2.readyState === WebSocket.CONNECTING) {
+    if (isSocketActive(socket2)) {
       socket2.close();
     }
   }, []);
@@ -979,6 +1114,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 +1148,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 +1176,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 +1191,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 +1228,7 @@ var useEventSource = (options) => {
     manualCloseRef.current = false;
     manualOpenRef.current = true;
     suppressReconnectRef.current = false;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     setOpenNonce((current) => current + 1);
   };
@@ -1081,6 +1237,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 +1246,7 @@ var useEventSource = (options) => {
     manualCloseRef.current = true;
     manualOpenRef.current = false;
     suppressReconnectRef.current = true;
+    terminalErrorRef.current = null;
     reconnect.cancel();
     closeEventSource();
     commitState((current) => ({
@@ -1115,7 +1273,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 +1287,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 +1349,7 @@ var useEventSource = (options) => {
   useEffect(() => () => {
     suppressReconnectRef.current = true;
     eventSourceKeyRef.current = null;
+    terminalErrorRef.current = null;
     const source = eventSourceRef.current;
     eventSourceRef.current = null;
     if (source !== null) {