canvu-react 0.4.43 → 0.4.44

package/dist/realtimeNative.js

@@ -247,6 +247,12 @@ function parseRealtimeServerMessage(value) {
   }
   return void 0;
 }
+var CLIENT_ONLY_IMAGE_KEYS = /* @__PURE__ */ new Set([
+  "imageBlobId",
+  "imageThumbnailBlobId",
+  "imageRasterHref",
+  "imageThumbnailHref"
+]);
 function getSceneItemId(item) {
   const id = item.id;
   return typeof id === "string" ? id : null;
@@ -263,6 +269,43 @@ function hasMissingLocalItems(localItems, incomingItems) {
   }
   return false;
 }
+function getComparableRealtimeItem(item) {
+  const comparable = { ...item };
+  if (item.toolKind === "image") {
+    for (const key of CLIENT_ONLY_IMAGE_KEYS) {
+      delete comparable[key];
+    }
+    comparable.childrenSvg = "";
+  }
+  return comparable;
+}
+function serializeComparableRealtimeItem(item) {
+  return JSON.stringify(getComparableRealtimeItem(item));
+}
+function hasChangedLocalItems(localItems, incomingItems) {
+  const incomingItemsById = /* @__PURE__ */ new Map();
+  for (const incomingItem of incomingItems) {
+    const id = getSceneItemId(incomingItem);
+    if (id) incomingItemsById.set(id, incomingItem);
+  }
+  for (const localItem of localItems) {
+    const id = getSceneItemId(localItem);
+    const incomingItem = id ? incomingItemsById.get(id) : null;
+    if (!incomingItem) continue;
+    if (serializeComparableRealtimeItem(localItem) !== serializeComparableRealtimeItem(incomingItem)) {
+      return true;
+    }
+  }
+  return false;
+}
+function shouldPreserveLocalRealtimeItems({
+  localItems,
+  incomingItems,
+  hasPendingLocalChanges
+}) {
+  if (!hasPendingLocalChanges) return false;
+  return hasMissingLocalItems(localItems, incomingItems) || hasChangedLocalItems(localItems, incomingItems);
+}
 function useRealtimeCanvasDocument(options) {
   const {
     session,
@@ -275,6 +318,8 @@ function useRealtimeCanvasDocument(options) {
   const [loading, setLoading] = useState(false);
   const lastAppliedRevisionRef = useRef(null);
   const inFlightRevisionRef = useRef(null);
+  const latestItemsRef = useRef(items);
+  const hasLocalChangeInFlightRef = useRef(false);
   const hasEverPropagatedItemsRef = useRef(false);
   const realtimeEnabled = enabled && session != null;
   const documentRevision = session?.document?.revision ?? null;
@@ -297,6 +342,7 @@ function useRealtimeCanvasDocument(options) {
         onItemsChange?.(normalizeItems ? normalizeItems(nextItems) : nextItems);
         return;
       }
+      hasLocalChangeInFlightRef.current = true;
       const normalizedItems = normalizeItems ? normalizeItems(nextItems) : nextItems;
       onItemsChange?.(normalizedItems);
       session?.remoteAdapter.send?.(normalizedItems);
@@ -304,10 +350,16 @@ function useRealtimeCanvasDocument(options) {
     [enabled, normalizeItems, onItemsChange, session]
   );
   useEffect(() => {
+    latestItemsRef.current = items;
     if (items.length > 0) {
       hasEverPropagatedItemsRef.current = true;
     }
-  }, [items.length]);
+  }, [items]);
+  useEffect(() => {
+    if (!hasLocalOfflineDraft && !hasPendingDocumentSync) {
+      hasLocalChangeInFlightRef.current = false;
+    }
+  }, [hasLocalOfflineDraft, hasPendingDocumentSync]);
   useEffect(() => {
     if (!realtimeEnabled || !onItemsChange || !session?.document) return;
     if (documentUpdatedByClientId === connectionClientId) return;
@@ -321,17 +373,22 @@ function useRealtimeCanvasDocument(options) {
       if (cancelled) return;
       if (inFlightRevisionRef.current !== documentRevision) return;
       lastAppliedRevisionRef.current = documentRevision;
-      const hasLocalItems = items.length > 0;
-      const hasPendingLocalChanges = hasLocalOfflineDraft || hasPendingDocumentSync;
+      const localItems = latestItemsRef.current;
+      const hasLocalItems = localItems.length > 0;
+      const hasPendingLocalChanges = hasLocalOfflineDraft || hasPendingDocumentSync || hasLocalChangeInFlightRef.current;
       if (resolvedItems.length === 0 && (hasEverPropagatedItemsRef.current || hasLocalItems || hasPendingLocalChanges)) {
         if (hasLocalItems) {
-          const normalizedLocalItems = normalizeItems ? normalizeItems(items) : [...items];
+          const normalizedLocalItems = normalizeItems ? normalizeItems(localItems) : [...localItems];
           session.remoteAdapter.send?.(normalizedLocalItems);
         }
         return;
       }
-      if (hasLocalItems && hasMissingLocalItems(items, resolvedItems)) {
-        const normalizedLocalItems = normalizeItems ? normalizeItems(items) : [...items];
+      if (shouldPreserveLocalRealtimeItems({
+        localItems,
+        incomingItems: resolvedItems,
+        hasPendingLocalChanges
+      })) {
+        const normalizedLocalItems = normalizeItems ? normalizeItems(localItems) : [...localItems];
         session.remoteAdapter.send?.(normalizedLocalItems);
         return;
       }
@@ -357,7 +414,6 @@ function useRealtimeCanvasDocument(options) {
     documentUpdatedByClientId,
     hasLocalOfflineDraft,
     hasPendingDocumentSync,
-    items,
     normalizeItems,
     onItemsChange,
     realtimeEnabled,
@@ -520,7 +576,7 @@ function useRealtimePeerFollow(options) {
   }, [followedPeerId, onFollowEnd, sessionPeers, viewportRef]);
 }
 var ITEMS_KEY = "items";
-var CLIENT_ONLY_IMAGE_KEYS = /* @__PURE__ */ new Set([
+var CLIENT_ONLY_IMAGE_KEYS2 = /* @__PURE__ */ new Set([
   "imageBlobId",
   "imageThumbnailBlobId",
   "imageRasterHref",
@@ -613,7 +669,7 @@ function updateYMapInPlace(yMap, next) {
 function normalizeRealtimeItem(item) {
   if (item.toolKind !== "image") return item;
   const normalized = Object.fromEntries(
-    Object.entries(item).filter(([key]) => !CLIENT_ONLY_IMAGE_KEYS.has(key))
+    Object.entries(item).filter(([key]) => !CLIENT_ONLY_IMAGE_KEYS2.has(key))
   );
   normalized.childrenSvg = "";
   return normalized;
@@ -766,6 +822,7 @@ var ORIGIN_BOOTSTRAP = /* @__PURE__ */ Symbol("canvu/realtime/bootstrap");
 var DRAFT_STORAGE_PREFIX = "canvu-realtime-draft:";
 var DOCUMENT_FLUSH_DEBOUNCE_MS = 120;
 var DRAFT_PERSIST_DEBOUNCE_MS = 420;
+var CONNECTION_MESSAGE_STATE_UPDATE_INTERVAL_MS = 1e3;
 function requestRuntimeIdleCallback(callback, timeout) {
   const runtime = globalThis;
   if (typeof runtime.requestIdleCallback === "function") {
@@ -777,7 +834,7 @@ function cancelRuntimeIdleCallback(handle) {
   if (handle == null) return;
   const runtime = globalThis;
   if (typeof runtime.cancelIdleCallback === "function") {
-    runtime.cancelIdleCallback(Number(handle));
+    runtime.cancelIdleCallback(handle);
     return;
   }
   globalThis.clearTimeout(handle);
@@ -898,6 +955,9 @@ function sameSerializedItems(left, right) {
 function nowMs() {
   return Date.now();
 }
+function shouldUpdateRealtimeConnectionMessageState(input) {
+  return input.lastStateUpdateAt == null || input.receivedAt - input.lastStateUpdateAt >= CONNECTION_MESSAGE_STATE_UPDATE_INTERVAL_MS;
+}
 function hasDurableDocumentPersistence(snapshot) {
   return snapshot.persistedRevision == null || snapshot.persistedRevision >= snapshot.revision;
 }
@@ -1061,6 +1121,7 @@ function useRealtimeSession(options) {
   const connectionStateRef = useRef(
     enabled ? "connecting" : "offline"
   );
+  const lastConnectionMessageStateUpdateAtRef = useRef(null);
   const localDraftRef = useRef(null);
   const conflictRef = useRef(null);
   const onErrorRef = useRef(onError);
@@ -1626,6 +1687,7 @@ function useRealtimeSession(options) {
   useEffect(() => {
     if (!enabled) {
       manualDisconnectRef.current = true;
+      lastConnectionMessageStateUpdateAtRef.current = null;
       clearReconnectTimer();
       clearHeartbeatTimer();
       clearConnectTimeout();
@@ -1682,6 +1744,7 @@ function useRealtimeSession(options) {
       return;
     }
     let disposed = false;
+    lastConnectionMessageStateUpdateAtRef.current = null;
     updateConnectionRef.current((prev) => ({
       ...prev,
       state: retryCountRef.current > 0 ? "reconnecting" : "connecting",
@@ -1735,10 +1798,17 @@ function useRealtimeSession(options) {
         }
         const parsed = parseRealtimeServerMessage(payload);
         if (!parsed) return;
-        updateConnectionRef.current((prev) => ({
-          ...prev,
-          lastMessageAt: nowMs()
-        }));
+        const receivedAt = nowMs();
+        if (shouldUpdateRealtimeConnectionMessageState({
+          lastStateUpdateAt: lastConnectionMessageStateUpdateAtRef.current,
+          receivedAt
+        })) {
+          lastConnectionMessageStateUpdateAtRef.current = receivedAt;
+          updateConnectionRef.current((prev) => ({
+            ...prev,
+            lastMessageAt: receivedAt
+          }));
+        }
         if (parsed.type === "session:welcome") {
           retryCountRef.current = 0;
           updateConnectionRef.current((prev) => ({
@@ -1747,7 +1817,7 @@ function useRealtimeSession(options) {
             connected: true,
             clientId: parsed.clientId,
             retryCount: 0,
-            lastConnectedAt: nowMs(),
+            lastConnectedAt: receivedAt,
             lastError: null
           }));
           applyPeersRef.current(parsed.peers);