canvu-react 0.3.9 → 0.3.11

package/dist/realtime.js

@@ -100,7 +100,7 @@ function PresenceRemoteLayer({
   const rootTransform = formatCameraTransform(camera);
   const overlayStrokePx = 1.25;
   const LUCIDE_POINTER_VIEWBOX = 24;
-  const remoteCursorScreenPx = 15;
+  const remoteCursorScreenPx = 22;
   const iconWorldScale = remoteCursorScreenPx / (LUCIDE_POINTER_VIEWBOX * z);
   return /* @__PURE__ */ jsx(
     "svg",
@@ -164,9 +164,9 @@ function PresenceRemoteLayer({
         let cursorNode = null;
         if (cur) {
           const displayName = peer.displayName;
-          const labelOffsetX = 10 / z;
-          const labelOffsetY = 10 / z;
-          const labelFont = 10 / z;
+          const labelOffsetX = 14 / z;
+          const labelOffsetY = 14 / z;
+          const labelFont = 12 / z;
           cursorNode = /* @__PURE__ */ jsxs("g", { children: [
             /* @__PURE__ */ jsx(
               "g",
@@ -1742,7 +1742,7 @@ function useRealtimePeerFollow(options) {
   const { viewportRef, sessionPeers, followedPeerId, onFollowEnd } = options;
   const endedPeerIdRef = useRef(null);
   const lastAppliedCameraKeyRef = useRef(null);
-  const [viewportSizeVersion, setViewportSizeVersion] = useState(0);
+  const [, setViewportSizeVersion] = useState(0);
   useEffect(() => {
     if (!followedPeerId) return;
     let animationFrameId = 0;
@@ -1794,16 +1794,27 @@ function useRealtimePeerFollow(options) {
       return;
     }
     lastAppliedCameraKeyRef.current = nextCameraKey;
-  }, [
-    followedPeerId,
-    onFollowEnd,
-    sessionPeers,
-    viewportRef,
-    viewportSizeVersion
-  ]);
+  }, [followedPeerId, onFollowEnd, sessionPeers, viewportRef]);
 }
 
 // src/react/plugins/realtime/use-realtime-session.ts
+var DRAFT_STORAGE_PREFIX = "canvu-realtime-draft:";
+var DOCUMENT_FLUSH_DEBOUNCE_MS = 120;
+var DRAFT_PERSIST_DEBOUNCE_MS = 420;
+function requestWindowIdleCallback(callback, timeout) {
+  if (typeof window.requestIdleCallback === "function") {
+    return window.requestIdleCallback(callback, { timeout });
+  }
+  return window.setTimeout(callback, timeout);
+}
+function cancelWindowIdleCallback(handle) {
+  if (handle == null) return;
+  if (typeof window.cancelIdleCallback === "function") {
+    window.cancelIdleCallback(handle);
+    return;
+  }
+  window.clearTimeout(handle);
+}
 function createClientId() {
   if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
     return crypto.randomUUID();
@@ -1811,6 +1822,7 @@ function createClientId() {
   return `client-${Math.random().toString(36).slice(2, 10)}`;
 }
 function normalizeSocketUrl(input) {
+  if (!input) return "";
   if (input.startsWith("ws://") || input.startsWith("wss://")) return input;
   if (input.startsWith("http://")) return `ws://${input.slice("http://".length)}`;
   if (input.startsWith("https://")) return `wss://${input.slice("https://".length)}`;
@@ -1829,9 +1841,29 @@ function isValidSocketUrl(input) {
     return false;
   }
 }
+function sanitizeRealtimeItem(item) {
+  if (item.toolKind !== "image") return item;
+  return {
+    ...item,
+    imageBlobId: void 0,
+    imageThumbnailBlobId: void 0,
+    imageRasterHref: void 0,
+    imageThumbnailHref: void 0,
+    childrenSvg: ""
+  };
+}
+function sanitizeRealtimeItems(items) {
+  return items.map(sanitizeRealtimeItem);
+}
+function sanitizeRealtimeSnapshot(snapshot) {
+  return {
+    ...snapshot,
+    items: sanitizeRealtimeItems(snapshot.items)
+  };
+}
 function serializeItems(items) {
   try {
-    return JSON.stringify(items);
+    return JSON.stringify(sanitizeRealtimeItems(items));
   } catch {
     return null;
   }
@@ -1846,6 +1878,58 @@ function sameSerializedItems(left, right) {
 function nowMs() {
   return Date.now();
 }
+function draftStorageKey(roomId) {
+  return `${DRAFT_STORAGE_PREFIX}${roomId}`;
+}
+function isRealtimeOfflineDraft(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const record = value;
+  return typeof record.roomId === "string" && typeof record.baseRevision === "number" && typeof record.updatedAt === "number" && Array.isArray(record.items);
+}
+function readRealtimeOfflineDraft(roomId) {
+  if (typeof window === "undefined" || !roomId) return null;
+  try {
+    const raw = window.localStorage.getItem(draftStorageKey(roomId));
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (!isRealtimeOfflineDraft(parsed)) return null;
+    return {
+      ...parsed,
+      items: sanitizeRealtimeItems(parsed.items)
+    };
+  } catch {
+    return null;
+  }
+}
+function writeRealtimeOfflineDraft(draft) {
+  if (typeof window === "undefined") return;
+  if (!draft) return;
+  try {
+    window.localStorage.setItem(
+      draftStorageKey(draft.roomId),
+      JSON.stringify({
+        ...draft,
+        items: sanitizeRealtimeItems(draft.items)
+      })
+    );
+  } catch {
+  }
+}
+function removeRealtimeOfflineDraft(roomId) {
+  if (typeof window === "undefined" || !roomId) return;
+  try {
+    window.localStorage.removeItem(draftStorageKey(roomId));
+  } catch {
+  }
+}
+function buildDraftSnapshot(draft, clientId) {
+  return {
+    revision: draft.baseRevision,
+    items: draft.items,
+    updatedAt: draft.updatedAt,
+    updatedByClientId: clientId
+  };
+}
 function getViewportCameraSnapshot(viewport) {
   if (!viewport) return null;
   const camera = viewport.getCamera();
@@ -1859,6 +1943,17 @@ function getViewportCameraSnapshot(viewport) {
     viewportHeight: viewportSize.height
   };
 }
+function prepareRealtimeItems(items) {
+  try {
+    const sanitizedItems = sanitizeRealtimeItems(items);
+    return {
+      items: sanitizedItems,
+      serialized: JSON.stringify(sanitizedItems)
+    };
+  } catch {
+    return null;
+  }
+}
 function useRealtimeSession(options) {
   const {
     url,
@@ -1877,6 +1972,10 @@ function useRealtimeSession(options) {
   const reconnectTimerRef = useRef(null);
   const heartbeatTimerRef = useRef(null);
   const connectTimeoutRef = useRef(null);
+  const documentFlushTimerRef = useRef(null);
+  const documentFlushIdleRef = useRef(null);
+  const draftPersistTimerRef = useRef(null);
+  const draftPersistIdleRef = useRef(null);
   const manualDisconnectRef = useRef(false);
   const retryCountRef = useRef(0);
   const currentRevisionRef = useRef(0);
@@ -1893,6 +1992,8 @@ function useRealtimeSession(options) {
   const connectionStateRef = useRef(
     enabled ? "connecting" : "offline"
   );
+  const localDraftRef = useRef(null);
+  const conflictRef = useRef(null);
   const onErrorRef = useRef(onError);
   onErrorRef.current = onError;
   const [connectSequence, setConnectSequence] = useState(0);
@@ -1909,7 +2010,18 @@ function useRealtimeSession(options) {
   });
   const [sessionPeers, setSessionPeers] = useState([]);
   const [document2, setDocument] = useState(null);
+  const [hasLocalOfflineDraft, setHasLocalOfflineDraft] = useState(false);
+  const [hasPendingDocumentSync, setHasPendingDocumentSync] = useState(false);
+  const [conflict, setConflict] = useState(null);
   connectionStateRef.current = connection.state;
+  const syncState = useMemo(() => {
+    if (conflict != null) return "conflicted";
+    if (connection.connected) return "connected";
+    if (connection.state === "reconnecting" || connection.state === "connecting") {
+      return "reconnecting";
+    }
+    return "offline";
+  }, [conflict, connection.connected, connection.state]);
   const clearReconnectTimer = useCallback(() => {
     if (reconnectTimerRef.current != null) {
       window.clearTimeout(reconnectTimerRef.current);
@@ -1928,6 +2040,22 @@ function useRealtimeSession(options) {
       connectTimeoutRef.current = null;
     }
   }, []);
+  const clearDocumentFlushSchedule = useCallback(() => {
+    if (documentFlushTimerRef.current != null) {
+      window.clearTimeout(documentFlushTimerRef.current);
+      documentFlushTimerRef.current = null;
+    }
+    cancelWindowIdleCallback(documentFlushIdleRef.current);
+    documentFlushIdleRef.current = null;
+  }, []);
+  const clearDraftPersistSchedule = useCallback(() => {
+    if (draftPersistTimerRef.current != null) {
+      window.clearTimeout(draftPersistTimerRef.current);
+      draftPersistTimerRef.current = null;
+    }
+    cancelWindowIdleCallback(draftPersistIdleRef.current);
+    draftPersistIdleRef.current = null;
+  }, []);
   const updateConnection = useCallback(
     (patch) => {
       setConnection((prev) => {
@@ -1953,6 +2081,84 @@ function useRealtimeSession(options) {
     },
     [notifySubscribers]
   );
+  const setConflictState = useCallback(
+    (nextConflict) => {
+      conflictRef.current = nextConflict;
+      setConflict(nextConflict);
+    },
+    []
+  );
+  const setLocalDraft = useCallback(
+    (nextDraft) => {
+      localDraftRef.current = nextDraft;
+      setHasLocalOfflineDraft(nextDraft != null);
+      if (nextDraft) return;
+      removeRealtimeOfflineDraft(roomId);
+    },
+    [roomId]
+  );
+  const persistLocalDraft = useCallback(() => {
+    clearDraftPersistSchedule();
+    if (!localDraftRef.current) {
+      removeRealtimeOfflineDraft(roomId);
+      return;
+    }
+    writeRealtimeOfflineDraft(localDraftRef.current);
+  }, [clearDraftPersistSchedule, roomId]);
+  const scheduleDraftPersistence = useCallback(() => {
+    clearDraftPersistSchedule();
+    draftPersistTimerRef.current = window.setTimeout(() => {
+      draftPersistTimerRef.current = null;
+      draftPersistIdleRef.current = requestWindowIdleCallback(() => {
+        draftPersistIdleRef.current = null;
+        persistLocalDraft();
+      }, DRAFT_PERSIST_DEBOUNCE_MS);
+    }, DRAFT_PERSIST_DEBOUNCE_MS);
+  }, [clearDraftPersistSchedule, persistLocalDraft]);
+  const clearLocalDraft = useCallback(() => {
+    setLocalDraft(null);
+    clearDraftPersistSchedule();
+  }, [clearDraftPersistSchedule, setLocalDraft]);
+  const createSelfPeer = useCallback(
+    (state) => ({
+      id: peer.id,
+      clientId: clientIdRef.current,
+      peerId: peer.id,
+      roomId,
+      joinedAt: connection.lastConnectedAt ?? nowMs(),
+      lastSeenAt: nowMs(),
+      cursor: lastCursorRef.current,
+      isSelf: true,
+      connectionState: state,
+      ...peer.displayName ? { displayName: peer.displayName } : {},
+      ...peer.color ? { color: peer.color } : {},
+      ...peer.image ? { image: peer.image } : {},
+      ...lastMarkupStrokeRef.current !== void 0 ? { markupStroke: lastMarkupStrokeRef.current ?? null } : {},
+      ...lastCameraRef.current !== void 0 ? { camera: lastCameraRef.current ?? null } : {},
+      ...lastActiveToolRef.current ? { activeTool: lastActiveToolRef.current } : {}
+    }),
+    [
+      connection.lastConnectedAt,
+      peer.color,
+      peer.displayName,
+      peer.id,
+      peer.image,
+      roomId
+    ]
+  );
+  const collapsePeersToSelf = useCallback(
+    (state) => {
+      setSessionPeers((prev) => {
+        const selfPeer = prev.find(
+          (peerState) => peerState.clientId === clientIdRef.current
+        );
+        return [
+          selfPeer ? { ...selfPeer, isSelf: true, connectionState: state } : createSelfPeer(state)
+        ];
+      });
+    },
+    [createSelfPeer]
+  );
   const applyPeers = useCallback((peers) => {
     const selfClientId = clientIdRef.current;
     setSessionPeers(
@@ -1979,30 +2185,108 @@ function useRealtimeSession(options) {
     [buildClientMessage]
   );
   const flushQueuedDocument = useCallback(() => {
+    clearDocumentFlushSchedule();
+    if (conflictRef.current) return;
     const next = queuedItemsRef.current;
     if (!next || outboundInFlightRef.current) return;
-    queuedItemsRef.current = null;
     const baseRevision = currentRevisionRef.current;
-    const serialized = serializeItems(next);
-    outboundInFlightRef.current = { baseRevision, items: next, serialized };
+    const preparedItems = prepareRealtimeItems(next);
+    if (!preparedItems) return;
+    queuedItemsRef.current = null;
+    outboundInFlightRef.current = {
+      baseRevision,
+      items: preparedItems.items,
+      serialized: preparedItems.serialized
+    };
     const didSend = sendRaw({
       type: "document:update",
       roomId,
       clientId: clientIdRef.current,
       baseRevision,
-      items: next
+      items: preparedItems.items
     });
     if (!didSend) {
       queuedItemsRef.current = next;
       outboundInFlightRef.current = null;
+      setHasPendingDocumentSync(true);
     }
-  }, [roomId, sendRaw]);
+  }, [clearDocumentFlushSchedule, roomId, sendRaw]);
+  const scheduleDocumentFlush = useCallback(() => {
+    clearDocumentFlushSchedule();
+    documentFlushTimerRef.current = window.setTimeout(() => {
+      documentFlushTimerRef.current = null;
+      documentFlushIdleRef.current = requestWindowIdleCallback(() => {
+        documentFlushIdleRef.current = null;
+        flushQueuedDocument();
+      }, DOCUMENT_FLUSH_DEBOUNCE_MS);
+    }, DOCUMENT_FLUSH_DEBOUNCE_MS);
+  }, [clearDocumentFlushSchedule, flushQueuedDocument]);
   const queueDocumentSend = useCallback(
     (items) => {
+      setLocalDraft({
+        roomId,
+        baseRevision: currentRevisionRef.current,
+        items,
+        updatedAt: nowMs()
+      });
+      scheduleDraftPersistence();
       queuedItemsRef.current = items;
-      flushQueuedDocument();
+      setHasPendingDocumentSync(true);
+      if (conflictRef.current) return;
+      scheduleDocumentFlush();
+    },
+    [roomId, scheduleDocumentFlush, scheduleDraftPersistence, setLocalDraft]
+  );
+  const applyDraftSnapshot = useCallback(
+    (draft, options2) => {
+      applyDocument(buildDraftSnapshot(draft, clientIdRef.current), options2);
     },
-    [flushQueuedDocument]
+    [applyDocument]
+  );
+  const resolveAuthoritativeDocument = useCallback(
+    (serverDocument, options2) => {
+      const localDraft = localDraftRef.current;
+      if (!localDraft) {
+        setConflictState(null);
+        setHasPendingDocumentSync(false);
+        applyDocument(serverDocument, options2);
+        return false;
+      }
+      if (sameSerializedItems(localDraft.items, serverDocument.items)) {
+        clearLocalDraft();
+        setHasPendingDocumentSync(false);
+        setConflictState(null);
+        applyDocument(serverDocument, options2);
+        return true;
+      }
+      if (serverDocument.revision === localDraft.baseRevision) {
+        setConflictState(null);
+        applyDraftSnapshot(localDraft, {
+          suppressSubscriberNotify: options2?.suppressSubscriberNotify ?? sameSerializedItems(latestDocumentRef.current?.items, localDraft.items)
+        });
+        outboundInFlightRef.current = null;
+        queuedItemsRef.current = localDraft.items;
+        setHasPendingDocumentSync(true);
+        scheduleDocumentFlush();
+        return true;
+      }
+      setConflictState({
+        serverRevision: serverDocument.revision,
+        serverItems: serverDocument.items,
+        localItems: localDraft.items
+      });
+      applyDraftSnapshot(localDraft, {
+        suppressSubscriberNotify: options2?.suppressSubscriberNotify ?? sameSerializedItems(latestDocumentRef.current?.items, localDraft.items)
+      });
+      return true;
+    },
+    [
+      applyDocument,
+      applyDraftSnapshot,
+      clearLocalDraft,
+      scheduleDocumentFlush,
+      setConflictState
+    ]
   );
   const sendPresenceUpdate = useCallback(() => {
     sendRaw({
@@ -2041,17 +2325,108 @@ function useRealtimeSession(options) {
     reconnect,
     updateConnection
   ]);
+  const resolveConflict = useCallback(
+    (action) => {
+      const activeConflict = conflictRef.current;
+      if (!activeConflict) return;
+      if (action === "use-server") {
+        clearLocalDraft();
+        queuedItemsRef.current = null;
+        outboundInFlightRef.current = null;
+        setConflictState(null);
+        applyDocument({
+          revision: activeConflict.serverRevision,
+          items: activeConflict.serverItems,
+          updatedAt: nowMs()
+        });
+        return;
+      }
+      const nextDraft = {
+        roomId,
+        baseRevision: activeConflict.serverRevision,
+        items: activeConflict.localItems,
+        updatedAt: nowMs()
+      };
+      setLocalDraft(nextDraft);
+      scheduleDraftPersistence();
+      setConflictState(null);
+      applyDraftSnapshot(nextDraft, {
+        suppressSubscriberNotify: sameSerializedItems(
+          latestDocumentRef.current?.items,
+          nextDraft.items
+        )
+      });
+      currentRevisionRef.current = activeConflict.serverRevision;
+      queuedItemsRef.current = nextDraft.items;
+      outboundInFlightRef.current = null;
+      setHasPendingDocumentSync(true);
+      scheduleDocumentFlush();
+    },
+    [
+      applyDocument,
+      applyDraftSnapshot,
+      clearLocalDraft,
+      roomId,
+      scheduleDocumentFlush,
+      scheduleDraftPersistence,
+      setConflictState,
+      setLocalDraft
+    ]
+  );
+  useEffect(() => {
+    if (!roomId) {
+      clearDocumentFlushSchedule();
+      clearDraftPersistSchedule();
+      localDraftRef.current = null;
+      setHasLocalOfflineDraft(false);
+      setHasPendingDocumentSync(false);
+      setConflictState(null);
+      queuedItemsRef.current = null;
+      outboundInFlightRef.current = null;
+      latestDocumentRef.current = null;
+      setDocument(null);
+      currentRevisionRef.current = 0;
+      return;
+    }
+    const localDraft = readRealtimeOfflineDraft(roomId);
+    setLocalDraft(localDraft);
+    setHasPendingDocumentSync(localDraft != null);
+    setConflictState(null);
+    queuedItemsRef.current = localDraft?.items ?? null;
+    outboundInFlightRef.current = null;
+    if (localDraft) {
+      applyDraftSnapshot(localDraft, {
+        suppressSubscriberNotify: sameSerializedItems(
+          latestDocumentRef.current?.items,
+          localDraft.items
+        )
+      });
+    } else {
+      latestDocumentRef.current = null;
+      setDocument(null);
+      currentRevisionRef.current = 0;
+    }
+  }, [
+    applyDraftSnapshot,
+    clearDocumentFlushSchedule,
+    clearDraftPersistSchedule,
+    roomId,
+    setConflictState,
+    setLocalDraft
+  ]);
   useEffect(() => {
     if (!enabled) {
       manualDisconnectRef.current = true;
       clearReconnectTimer();
       clearHeartbeatTimer();
       clearConnectTimeout();
+      clearDocumentFlushSchedule();
       wsRef.current?.close();
       wsRef.current = null;
-      setSessionPeers([]);
-      queuedItemsRef.current = null;
+      queuedItemsRef.current = localDraftRef.current?.items ?? null;
       outboundInFlightRef.current = null;
+      setHasPendingDocumentSync(localDraftRef.current != null);
+      collapsePeersToSelf("offline");
       updateConnection((prev) => ({
         ...prev,
         state: "offline",
@@ -2063,6 +2438,17 @@ function useRealtimeSession(options) {
     }
     manualDisconnectRef.current = false;
     const socketUrl = normalizeSocketUrl(url);
+    if (!socketUrl) {
+      collapsePeersToSelf("offline");
+      updateConnection((prev) => ({
+        ...prev,
+        state: "offline",
+        connected: false,
+        roomId,
+        lastError: null
+      }));
+      return;
+    }
     if (!isValidSocketUrl(socketUrl)) {
       updateConnection((prev) => ({
         ...prev,
@@ -2132,8 +2518,6 @@ function useRealtimeSession(options) {
       }));
       if (parsed.type === "session:welcome") {
         retryCountRef.current = 0;
-        const queuedBeforeWelcome = queuedItemsRef.current;
-        const shouldPromoteQueuedLocalDraft = queuedBeforeWelcome != null && parsed.document.revision === 0 && parsed.document.items.length === 0;
         updateConnection((prev) => ({
           ...prev,
           state: "connected",
@@ -2144,14 +2528,21 @@ function useRealtimeSession(options) {
           lastError: null
         }));
         applyPeers(parsed.peers);
-        applyDocument(parsed.document, {
-          suppressSubscriberNotify: shouldPromoteQueuedLocalDraft
-        });
-        if (!shouldPromoteQueuedLocalDraft) {
+        const handledByDraft = resolveAuthoritativeDocument(
+          sanitizeRealtimeSnapshot(parsed.document),
+          {
+            suppressSubscriberNotify: localDraftRef.current != null && sameSerializedItems(
+              latestDocumentRef.current?.items,
+              localDraftRef.current.items
+            )
+          }
+        );
+        if (!handledByDraft) {
           queuedItemsRef.current = null;
           outboundInFlightRef.current = null;
+          setHasPendingDocumentSync(false);
         }
-        flushQueuedDocument();
+        scheduleDocumentFlush();
         return;
       }
       if (parsed.type === "presence:sync") {
@@ -2198,30 +2589,39 @@ function useRealtimeSession(options) {
         const isSelfAck = parsed.document.updatedByClientId === selfClientId;
         if (!isSelfAck) {
           outboundInFlightRef.current = null;
-          queuedItemsRef.current = null;
-          applyDocument(parsed.document);
+          queuedItemsRef.current = localDraftRef.current?.items ?? null;
+          setHasPendingDocumentSync(queuedItemsRef.current != null);
+          resolveAuthoritativeDocument(sanitizeRealtimeSnapshot(parsed.document));
           return;
         }
         const shouldSuppress = inFlight != null && sameSerializedItems(inFlight.items, parsed.document.items);
         outboundInFlightRef.current = null;
-        applyDocument(parsed.document, { suppressSubscriberNotify: shouldSuppress });
+        applyDocument(sanitizeRealtimeSnapshot(parsed.document), {
+          suppressSubscriberNotify: shouldSuppress
+        });
         if (queuedItemsRef.current) {
           if (sameSerializedItems(queuedItemsRef.current, parsed.document.items)) {
             queuedItemsRef.current = null;
           } else {
-            flushQueuedDocument();
+            scheduleDocumentFlush();
           }
         }
+        if (!queuedItemsRef.current) {
+          clearLocalDraft();
+        }
+        setHasPendingDocumentSync(queuedItemsRef.current != null);
+        setConflictState(null);
         return;
       }
       if (parsed.type === "document:resync-required") {
         outboundInFlightRef.current = null;
-        queuedItemsRef.current = null;
+        queuedItemsRef.current = localDraftRef.current?.items ?? null;
+        setHasPendingDocumentSync(queuedItemsRef.current != null);
         updateConnection((prev) => ({
           ...prev,
           lastError: parsed.reason
         }));
-        applyDocument(parsed.document);
+        resolveAuthoritativeDocument(sanitizeRealtimeSnapshot(parsed.document));
       }
     });
     socket.addEventListener("error", () => {
@@ -2237,6 +2637,9 @@ function useRealtimeSession(options) {
       clearHeartbeatTimer();
       clearConnectTimeout();
       wsRef.current = null;
+      collapsePeersToSelf(
+        manualDisconnectRef.current || !enabled ? "offline" : "reconnecting"
+      );
       updateConnection((prev) => ({
         ...prev,
         connected: false,
@@ -2252,6 +2655,7 @@ function useRealtimeSession(options) {
       clearReconnectTimer();
       clearHeartbeatTimer();
       clearConnectTimeout();
+      clearDocumentFlushSchedule();
       socket.close();
     };
   }, [
@@ -2259,19 +2663,24 @@ function useRealtimeSession(options) {
     applyPeers,
     clearConnectTimeout,
     clearHeartbeatTimer,
+    clearLocalDraft,
     clearReconnectTimer,
+    collapsePeersToSelf,
+    clearDocumentFlushSchedule,
     connectSequence,
     connectTimeoutMs,
     enabled,
-    flushQueuedDocument,
     heartbeatMs,
     peer.color,
     peer.displayName,
-    peer.image,
     peer.id,
+    peer.image,
+    resolveAuthoritativeDocument,
     roomId,
+    scheduleDocumentFlush,
     scheduleReconnect,
     sendRaw,
+    setConflictState,
     updateConnection,
     url
   ]);
@@ -2286,6 +2695,18 @@ function useRealtimeSession(options) {
       )
     );
   }, [connection.state]);
+  useEffect(
+    () => () => {
+      clearDocumentFlushSchedule();
+      clearDraftPersistSchedule();
+    },
+    [clearDocumentFlushSchedule, clearDraftPersistSchedule]
+  );
+  const flushDocumentSync = useCallback(async () => {
+    persistLocalDraft();
+    if (!connection.connected) return;
+    flushQueuedDocument();
+  }, [connection.connected, flushQueuedDocument, persistLocalDraft]);
   const remoteAdapter = useMemo(
     () => ({
       subscribe(onItems) {
@@ -2299,9 +2720,12 @@ function useRealtimeSession(options) {
       },
       send(items) {
         queueDocumentSend(items);
+      },
+      flush() {
+        return flushDocumentSync();
       }
     }),
-    [queueDocumentSend]
+    [flushDocumentSync, queueDocumentSend]
   );
   const disconnect = useCallback(() => {
     manualDisconnectRef.current = true;
@@ -2315,6 +2739,7 @@ function useRealtimeSession(options) {
     });
     wsRef.current?.close();
     wsRef.current = null;
+    collapsePeersToSelf("offline");
     updateConnection((prev) => ({
       ...prev,
       state: "offline",
@@ -2324,6 +2749,7 @@ function useRealtimeSession(options) {
     clearConnectTimeout,
     clearHeartbeatTimer,
     clearReconnectTimer,
+    collapsePeersToSelf,
     roomId,
     sendRaw,
     updateConnection
@@ -2389,8 +2815,15 @@ function useRealtimeSession(options) {
     remotePresence,
     remoteAdapter,
     document: document2,
+    hasLocalOfflineDraft,
+    hasPendingDocumentSync,
+    syncState,
+    conflict,
     bindViewportPresence,
     syncViewportPresence,
+    resolveConflict,
+    clearLocalDraft,
+    flushDocumentSync,
     disconnect,
     reconnectNow
   };
@@ -2543,7 +2976,76 @@ function realtimeSessionPlugin(options) {
     render: () => /* @__PURE__ */ jsx(RealtimeSessionPanel, { ...options })
   };
 }
+function useRealtimeCanvasDocument(options) {
+  const {
+    session,
+    items,
+    onItemsChange,
+    normalizeItems,
+    hydrateItems,
+    enabled = true
+  } = options;
+  const [loading, setLoading] = useState(false);
+  const lastAppliedRevisionRef = useRef(null);
+  const realtimeEnabled = enabled && session != null;
+  const applyIncomingItems = useCallback(
+    async (nextItems) => {
+      const normalizedItems = normalizeItems ? normalizeItems(nextItems) : [...nextItems];
+      if (!hydrateItems) return normalizedItems;
+      return await hydrateItems(normalizedItems);
+    },
+    [hydrateItems, normalizeItems]
+  );
+  const handleItemsChange = useCallback(
+    (nextItems) => {
+      if (!enabled) {
+        onItemsChange?.(normalizeItems ? normalizeItems(nextItems) : nextItems);
+        return;
+      }
+      const normalizedItems = normalizeItems ? normalizeItems(nextItems) : nextItems;
+      onItemsChange?.(normalizedItems);
+      session?.remoteAdapter.send?.(normalizedItems);
+    },
+    [enabled, normalizeItems, onItemsChange, session]
+  );
+  useEffect(() => {
+    if (!realtimeEnabled || !onItemsChange || !session?.document) return;
+    if (session.document.updatedByClientId === session.connection.clientId) return;
+    if (lastAppliedRevisionRef.current === session.document.revision) return;
+    let cancelled = false;
+    setLoading(true);
+    void applyIncomingItems(session.document.items).then((resolvedItems) => {
+      if (cancelled) return;
+      lastAppliedRevisionRef.current = session.document?.revision ?? null;
+      onItemsChange(resolvedItems);
+    }).finally(() => {
+      if (cancelled) return;
+      setLoading(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [applyIncomingItems, realtimeEnabled, onItemsChange, session]);
+  return useMemo(
+    () => ({
+      items,
+      onItemsChange: onItemsChange ? handleItemsChange : void 0,
+      loading,
+      saving: session?.hasPendingDocumentSync ?? false,
+      hasLocalOfflineDraft: session?.hasLocalOfflineDraft ?? false,
+      syncState: session?.syncState ?? "offline",
+      conflict: session?.conflict ?? null,
+      resolveConflict: session?.resolveConflict ?? (() => {
+      }),
+      clearLocalDraft: session?.clearLocalDraft ?? (() => {
+      }),
+      flush: session?.flushDocumentSync ?? (async () => {
+      })
+    }),
+    [handleItemsChange, items, loading, onItemsChange, session]
+  );
+}
 
-export { PresenceRemoteLayer, REALTIME_COMMENT_TOOL, RealtimeCommentsOverlay, RealtimeSessionPanel, createRealtimeCommentAvatarDataUrl, createRealtimeCommentDraftItem, createRealtimeCommentItem, defaultPresenceColorForId, getRealtimeCommentData, isRealtimeCommentDraftItem, isRealtimeCommentItem, parseRealtimeClientMessage, parseRealtimeServerMessage, realtimeCollaborationPlugin, realtimeCommentsPlugin, realtimeSessionPlugin, remoteMarkupStrokeFromPlacementPreview, useRealtimeComments, useRealtimePeerFollow, useRealtimeSession, withRealtimeCommentTool };
+export { PresenceRemoteLayer, REALTIME_COMMENT_TOOL, RealtimeCommentsOverlay, RealtimeSessionPanel, createRealtimeCommentAvatarDataUrl, createRealtimeCommentDraftItem, createRealtimeCommentItem, defaultPresenceColorForId, getRealtimeCommentData, isRealtimeCommentDraftItem, isRealtimeCommentItem, parseRealtimeClientMessage, parseRealtimeServerMessage, realtimeCollaborationPlugin, realtimeCommentsPlugin, realtimeSessionPlugin, remoteMarkupStrokeFromPlacementPreview, useRealtimeCanvasDocument, useRealtimeComments, useRealtimePeerFollow, useRealtimeSession, withRealtimeCommentTool };
 //# sourceMappingURL=realtime.js.map
 //# sourceMappingURL=realtime.js.map