canvu-react 0.3.11 → 0.3.13

package/dist/realtime.js

@@ -2072,6 +2072,10 @@ function useRealtimeSession(options) {
   }, []);
   const applyDocument = useCallback(
     (snapshot, options2) => {
+      const currentSnapshot = latestDocumentRef.current;
+      if (currentSnapshot && currentSnapshot.revision === snapshot.revision && currentSnapshot.updatedByClientId === snapshot.updatedByClientId && sameSerializedItems(currentSnapshot.items, snapshot.items)) {
+        return;
+      }
       currentRevisionRef.current = snapshot.revision;
       latestDocumentRef.current = snapshot;
       setDocument(snapshot);
@@ -2198,7 +2202,7 @@ function useRealtimeSession(options) {
       items: preparedItems.items,
       serialized: preparedItems.serialized
     };
-    const didSend = sendRaw({
+    const didSend = sendRawRef.current({
       type: "document:update",
       roomId,
       clientId: clientIdRef.current,
@@ -2210,7 +2214,7 @@ function useRealtimeSession(options) {
       outboundInFlightRef.current = null;
       setHasPendingDocumentSync(true);
     }
-  }, [clearDocumentFlushSchedule, roomId, sendRaw]);
+  }, [clearDocumentFlushSchedule, roomId]);
   const scheduleDocumentFlush = useCallback(() => {
     clearDocumentFlushSchedule();
     documentFlushTimerRef.current = window.setTimeout(() => {
@@ -2233,9 +2237,9 @@ function useRealtimeSession(options) {
       queuedItemsRef.current = items;
       setHasPendingDocumentSync(true);
       if (conflictRef.current) return;
-      scheduleDocumentFlush();
+      scheduleDocumentFlushRef.current();
     },
-    [roomId, scheduleDocumentFlush, scheduleDraftPersistence, setLocalDraft]
+    [roomId, scheduleDraftPersistence, setLocalDraft]
   );
   const applyDraftSnapshot = useCallback(
     (draft, options2) => {
@@ -2253,7 +2257,7 @@ function useRealtimeSession(options) {
         return false;
       }
       if (sameSerializedItems(localDraft.items, serverDocument.items)) {
-        clearLocalDraft();
+        clearLocalDraftRef.current();
         setHasPendingDocumentSync(false);
         setConflictState(null);
         applyDocument(serverDocument, options2);
@@ -2280,13 +2284,7 @@ function useRealtimeSession(options) {
       });
       return true;
     },
-    [
-      applyDocument,
-      applyDraftSnapshot,
-      clearLocalDraft,
-      scheduleDocumentFlush,
-      setConflictState
-    ]
+    [applyDocument, applyDraftSnapshot, scheduleDocumentFlush, setConflictState]
   );
   const sendPresenceUpdate = useCallback(() => {
     sendRaw({
@@ -2373,6 +2371,26 @@ function useRealtimeSession(options) {
       setLocalDraft
     ]
   );
+  const setConflictStateRef = useRef(setConflictState);
+  setConflictStateRef.current = setConflictState;
+  const updateConnectionRef = useRef(updateConnection);
+  updateConnectionRef.current = updateConnection;
+  const applyDocumentRef = useRef(applyDocument);
+  applyDocumentRef.current = applyDocument;
+  const clearLocalDraftRef = useRef(clearLocalDraft);
+  clearLocalDraftRef.current = clearLocalDraft;
+  const collapsePeersToSelfRef = useRef(collapsePeersToSelf);
+  collapsePeersToSelfRef.current = collapsePeersToSelf;
+  const applyPeersRef = useRef(applyPeers);
+  applyPeersRef.current = applyPeers;
+  const resolveAuthoritativeDocumentRef = useRef(resolveAuthoritativeDocument);
+  resolveAuthoritativeDocumentRef.current = resolveAuthoritativeDocument;
+  const scheduleDocumentFlushRef = useRef(scheduleDocumentFlush);
+  scheduleDocumentFlushRef.current = scheduleDocumentFlush;
+  const scheduleReconnectRef = useRef(scheduleReconnect);
+  scheduleReconnectRef.current = scheduleReconnect;
+  const sendRawRef = useRef(sendRaw);
+  sendRawRef.current = sendRaw;
   useEffect(() => {
     if (!roomId) {
       clearDocumentFlushSchedule();
@@ -2426,8 +2444,8 @@ function useRealtimeSession(options) {
       queuedItemsRef.current = localDraftRef.current?.items ?? null;
       outboundInFlightRef.current = null;
       setHasPendingDocumentSync(localDraftRef.current != null);
-      collapsePeersToSelf("offline");
-      updateConnection((prev) => ({
+      collapsePeersToSelfRef.current("offline");
+      updateConnectionRef.current((prev) => ({
         ...prev,
         state: "offline",
         connected: false,
@@ -2439,8 +2457,8 @@ function useRealtimeSession(options) {
     manualDisconnectRef.current = false;
     const socketUrl = normalizeSocketUrl(url);
     if (!socketUrl) {
-      collapsePeersToSelf("offline");
-      updateConnection((prev) => ({
+      collapsePeersToSelfRef.current("offline");
+      updateConnectionRef.current((prev) => ({
         ...prev,
         state: "offline",
         connected: false,
@@ -2450,7 +2468,7 @@ function useRealtimeSession(options) {
       return;
     }
     if (!isValidSocketUrl(socketUrl)) {
-      updateConnection((prev) => ({
+      updateConnectionRef.current((prev) => ({
         ...prev,
         state: "error",
         connected: false,
@@ -2461,7 +2479,7 @@ function useRealtimeSession(options) {
       return;
     }
     let disposed = false;
-    updateConnection((prev) => ({
+    updateConnectionRef.current((prev) => ({
       ...prev,
       state: retryCountRef.current > 0 ? "reconnecting" : "connecting",
       connected: false,
@@ -2479,7 +2497,7 @@ function useRealtimeSession(options) {
     socket.addEventListener("open", () => {
       if (disposed) return;
       clearConnectTimeout();
-      sendRaw({
+      sendRawRef.current({
         type: "session:join",
         roomId,
         peer: {
@@ -2492,7 +2510,7 @@ function useRealtimeSession(options) {
       });
       clearHeartbeatTimer();
       heartbeatTimerRef.current = window.setInterval(() => {
-        sendRaw({
+        sendRawRef.current({
           type: "session:ping",
           roomId,
           clientId: clientIdRef.current,
@@ -2512,13 +2530,13 @@ function useRealtimeSession(options) {
       }
       const parsed = parseRealtimeServerMessage(payload);
       if (!parsed) return;
-      updateConnection((prev) => ({
+      updateConnectionRef.current((prev) => ({
         ...prev,
         lastMessageAt: nowMs()
       }));
       if (parsed.type === "session:welcome") {
         retryCountRef.current = 0;
-        updateConnection((prev) => ({
+        updateConnectionRef.current((prev) => ({
           ...prev,
           state: "connected",
           connected: true,
@@ -2527,8 +2545,8 @@ function useRealtimeSession(options) {
           lastConnectedAt: nowMs(),
           lastError: null
         }));
-        applyPeers(parsed.peers);
-        const handledByDraft = resolveAuthoritativeDocument(
+        applyPeersRef.current(parsed.peers);
+        const handledByDraft = resolveAuthoritativeDocumentRef.current(
           sanitizeRealtimeSnapshot(parsed.document),
           {
             suppressSubscriberNotify: localDraftRef.current != null && sameSerializedItems(
@@ -2542,11 +2560,11 @@ function useRealtimeSession(options) {
           outboundInFlightRef.current = null;
           setHasPendingDocumentSync(false);
         }
-        scheduleDocumentFlush();
+        scheduleDocumentFlushRef.current();
         return;
       }
       if (parsed.type === "presence:sync") {
-        applyPeers(parsed.peers);
+        applyPeersRef.current(parsed.peers);
         return;
       }
       if (parsed.type === "session:peer-joined") {
@@ -2568,14 +2586,14 @@ function useRealtimeSession(options) {
         return;
       }
       if (parsed.type === "session:pong") {
-        updateConnection((prev) => ({
+        updateConnectionRef.current((prev) => ({
           ...prev,
           lastPongAt: parsed.serverTime
         }));
         return;
       }
       if (parsed.type === "session:error") {
-        updateConnection((prev) => ({
+        updateConnectionRef.current((prev) => ({
           ...prev,
           state: prev.connected ? prev.state : "error",
           lastError: parsed.message
@@ -2591,42 +2609,46 @@ function useRealtimeSession(options) {
           outboundInFlightRef.current = null;
           queuedItemsRef.current = localDraftRef.current?.items ?? null;
           setHasPendingDocumentSync(queuedItemsRef.current != null);
-          resolveAuthoritativeDocument(sanitizeRealtimeSnapshot(parsed.document));
+          resolveAuthoritativeDocumentRef.current(
+            sanitizeRealtimeSnapshot(parsed.document)
+          );
           return;
         }
         const shouldSuppress = inFlight != null && sameSerializedItems(inFlight.items, parsed.document.items);
         outboundInFlightRef.current = null;
-        applyDocument(sanitizeRealtimeSnapshot(parsed.document), {
+        applyDocumentRef.current(sanitizeRealtimeSnapshot(parsed.document), {
           suppressSubscriberNotify: shouldSuppress
         });
         if (queuedItemsRef.current) {
           if (sameSerializedItems(queuedItemsRef.current, parsed.document.items)) {
             queuedItemsRef.current = null;
           } else {
-            scheduleDocumentFlush();
+            scheduleDocumentFlushRef.current();
           }
         }
         if (!queuedItemsRef.current) {
-          clearLocalDraft();
+          clearLocalDraftRef.current();
         }
         setHasPendingDocumentSync(queuedItemsRef.current != null);
-        setConflictState(null);
+        setConflictStateRef.current(null);
         return;
       }
       if (parsed.type === "document:resync-required") {
         outboundInFlightRef.current = null;
         queuedItemsRef.current = localDraftRef.current?.items ?? null;
         setHasPendingDocumentSync(queuedItemsRef.current != null);
-        updateConnection((prev) => ({
+        updateConnectionRef.current((prev) => ({
           ...prev,
           lastError: parsed.reason
         }));
-        resolveAuthoritativeDocument(sanitizeRealtimeSnapshot(parsed.document));
+        resolveAuthoritativeDocumentRef.current(
+          sanitizeRealtimeSnapshot(parsed.document)
+        );
       }
     });
     socket.addEventListener("error", () => {
       if (disposed) return;
-      updateConnection((prev) => ({
+      updateConnectionRef.current((prev) => ({
         ...prev,
         state: prev.connected ? prev.state : "error",
         lastError: "Falha de conex\xE3o websocket."
@@ -2637,17 +2659,17 @@ function useRealtimeSession(options) {
       clearHeartbeatTimer();
       clearConnectTimeout();
       wsRef.current = null;
-      collapsePeersToSelf(
+      collapsePeersToSelfRef.current(
         manualDisconnectRef.current || !enabled ? "offline" : "reconnecting"
       );
-      updateConnection((prev) => ({
+      updateConnectionRef.current((prev) => ({
         ...prev,
         connected: false,
         clientId: prev.clientId,
         state: manualDisconnectRef.current || !enabled ? "offline" : prev.state
       }));
       if (!manualDisconnectRef.current && enabled) {
-        scheduleReconnect();
+        scheduleReconnectRef.current();
       }
     });
     return () => {
@@ -2659,14 +2681,10 @@ function useRealtimeSession(options) {
       socket.close();
     };
   }, [
-    applyDocument,
-    applyPeers,
     clearConnectTimeout,
+    clearDocumentFlushSchedule,
     clearHeartbeatTimer,
-    clearLocalDraft,
     clearReconnectTimer,
-    collapsePeersToSelf,
-    clearDocumentFlushSchedule,
     connectSequence,
     connectTimeoutMs,
     enabled,
@@ -2675,13 +2693,7 @@ function useRealtimeSession(options) {
     peer.displayName,
     peer.id,
     peer.image,
-    resolveAuthoritativeDocument,
     roomId,
-    scheduleDocumentFlush,
-    scheduleReconnect,
-    sendRaw,
-    setConflictState,
-    updateConnection,
     url
   ]);
   useEffect(() => {
@@ -2987,7 +2999,12 @@ function useRealtimeCanvasDocument(options) {
   } = options;
   const [loading, setLoading] = useState(false);
   const lastAppliedRevisionRef = useRef(null);
+  const inFlightRevisionRef = useRef(null);
   const realtimeEnabled = enabled && session != null;
+  const documentRevision = session?.document?.revision ?? null;
+  const documentItems = session?.document?.items;
+  const documentUpdatedByClientId = session?.document?.updatedByClientId ?? null;
+  const connectionClientId = session?.connection.clientId ?? null;
   const applyIncomingItems = useCallback(
     async (nextItems) => {
       const normalizedItems = normalizeItems ? normalizeItems(nextItems) : [...nextItems];
@@ -3010,22 +3027,38 @@ function useRealtimeCanvasDocument(options) {
   );
   useEffect(() => {
     if (!realtimeEnabled || !onItemsChange || !session?.document) return;
-    if (session.document.updatedByClientId === session.connection.clientId) return;
-    if (lastAppliedRevisionRef.current === session.document.revision) return;
+    if (documentUpdatedByClientId === connectionClientId) return;
+    if (documentRevision == null) return;
+    if (lastAppliedRevisionRef.current === documentRevision) return;
+    if (inFlightRevisionRef.current === documentRevision) return;
+    inFlightRevisionRef.current = documentRevision;
     let cancelled = false;
     setLoading(true);
-    void applyIncomingItems(session.document.items).then((resolvedItems) => {
+    void applyIncomingItems(documentItems ?? []).then((resolvedItems) => {
       if (cancelled) return;
-      lastAppliedRevisionRef.current = session.document?.revision ?? null;
+      if (inFlightRevisionRef.current !== documentRevision) return;
+      lastAppliedRevisionRef.current = documentRevision;
       onItemsChange(resolvedItems);
     }).finally(() => {
+      if (inFlightRevisionRef.current === documentRevision) {
+        inFlightRevisionRef.current = null;
+      }
       if (cancelled) return;
       setLoading(false);
     });
     return () => {
       cancelled = true;
     };
-  }, [applyIncomingItems, realtimeEnabled, onItemsChange, session]);
+  }, [
+    applyIncomingItems,
+    connectionClientId,
+    documentItems,
+    documentRevision,
+    documentUpdatedByClientId,
+    onItemsChange,
+    realtimeEnabled,
+    session?.document
+  ]);
   return useMemo(
     () => ({
       items,