@automerge/automerge-repo-react-hooks 2.5.2-alpha.3 → 2.5.2-alpha.5

package/dist/index.js

@@ -6758,7 +6758,7 @@ class PeerStateView {
     getLastSeenPeer(peers) {
         let freshestLastSeenAt;
         return peers.reduce((freshest, curr) => {
-            const lastSeenAt = this.value[curr]?.lastActiveAt;
+            const lastSeenAt = this.value[curr]?.lastSeenAt;
             if (!lastSeenAt) {
                 return freshest;
             }
@@ -6848,11 +6848,15 @@ class PeerPresenceInfo {
      * @param peerId
      */
     markSeen(peerId) {
+        if (!(peerId in this.#peerStates.value)) {
+            // Ignore heartbeats from peers we have not seen before: they will send a snapshot
+            return;
+        }
         this.#peerStates = new PeerStateView({
             ...this.#peerStates.value,
             [peerId]: {
                 ...this.#peerStates.value[peerId],
-                lastSeen: Date.now(),
+                lastSeenAt: Date.now(),
             },
         });
     }
@@ -6874,7 +6878,7 @@ class PeerPresenceInfo {
                 deviceId,
                 userId,
                 lastActiveAt: now,
-                lastUpdateAt: now,
+                lastSeenAt: now,
                 value: {
                     ...existingState,
                     ...value,
@@ -6898,9 +6902,15 @@ class PeerPresenceInfo {
      */
     prune() {
         const threshold = Date.now() - this.ttl;
-        this.#peerStates = new PeerStateView(Object.fromEntries(Object.entries(this.#peerStates).filter(([, state]) => {
-            return state.lastActiveAt >= threshold;
+        const pruned = [];
+        this.#peerStates = new PeerStateView(Object.fromEntries(Object.entries(this.#peerStates.value).filter(([id, state]) => {
+            const keep = state.lastSeenAt >= threshold;
+            if (!keep) {
+                pruned.push(id);
+            }
+            return keep;
         })));
+        return pruned;
     }
     /**
      * Get a snapshot of the current peer states
@@ -7141,7 +7151,10 @@ class Presence extends EventEmitter {
         // to minimize variance between peer expiration, since the heartbeat frequency
         // is expected to be several times higher.
         this.#pruningInterval = setInterval(() => {
-            this.#peers.prune();
+            const pruned = this.#peers.prune();
+            if (pruned.length > 0) {
+                this.emit("pruning", { pruned });
+            }
         }, this.#heartbeatMs);
     }
     stopPruningPeers() {
@@ -7180,16 +7193,23 @@ function usePresence({
     presence.on("snapshot", () => setPeerStates(presence.getPeerStates()));
     presence.on("update", () => setPeerStates(presence.getPeerStates()));
     presence.on("goodbye", () => setPeerStates(presence.getPeerStates()));
+    presence.on("pruning", () => setPeerStates(presence.getPeerStates()));
     return () => {
       presence.stop();
     };
   }, [presence, userId, deviceId, firstInitialState, firstOpts]);
-  const start = useCallback(() => {
-    presence.start({
-      initialState: presence.getLocalState(),
-      ...firstOpts.current
-    });
-  }, [presence, firstOpts]);
+  const start = useCallback(
+    (config) => {
+      const initialState2 = config?.initialState ?? presence.getLocalState();
+      const opts = {
+        ...firstOpts.current,
+        ...config,
+        initialState: initialState2
+      };
+      presence.start(opts);
+    },
+    [presence, firstOpts]
+  );
   const stop = useCallback(() => {
     presence.stop();
   }, [presence]);