@automerge/automerge-repo-react-hooks 2.5.2-alpha.6 → 2.5.3

package/dist/index.js

@@ -6692,139 +6692,67 @@ const DEFAULT_HEARTBEAT_INTERVAL_MS = 15_000;
 const DEFAULT_PEER_TTL_MS = 3 * DEFAULT_HEARTBEAT_INTERVAL_MS;
 const PRESENCE_MESSAGE_MARKER = "__presence";
 
-function unique(items) {
-    return Array.from(new Set(items));
-}
-
+/**
+ * A grouped view of peer states.
+ */
 class PeerStateView {
     value;
     constructor(value) {
         this.value = value;
     }
     /**
-     * Get all users.
-     *
-     * @returns Array of user presence {@link State}s
-     */
-    get users() {
-        const userIds = unique(Object.values(this.value).map(peerState => peerState.userId));
-        return userIds.map(u => this.getUserState(u));
-    }
-    /**
-     * Get all devices.
-     *
-     * @returns Array of device presence {@link State}s
-     */
-    get devices() {
-        const deviceIds = unique(Object.values(this.value).map(peerState => peerState.deviceId));
-        return deviceIds.map(d => this.getDeviceState(d));
-    }
-    /**
-     * Get all peers.
-     *
-     * @returns Array of peer presence {@link State}s
-     */
-    get peers() {
-        return Object.values(this.value);
-    }
-    /**
-     * Get all peer ids for this user.
-     *
-     * @param userId
-     * @returns Array of peer ids for this user
-     */
-    getUserPeers(userId) {
-        return Object.values(this.value)
-            .filter(peerState => peerState.userId === userId)
-            .map(peerState => peerState.peerId);
-    }
-    /**
-     * Get all peers for this device.
-     *
-     * @param deviceId
-     * @returns Array of peer ids for this device
-     */
-    getDevicePeers(deviceId) {
-        return Object.values(this.value)
-            .filter(peerState => peerState.deviceId === deviceId)
-            .map(peerState => peerState.peerId);
-    }
-    /**
-     * Return the most-recently-seen peer from this group.
+     * Get the presence state of all peers. By default, each peer is its own
+     * group, but presence activity can be aggregated by arbitrary criteria.
      *
-     * @param peers
-     * @returns id of most recently seen peer
+     * @param opts
+     * @returns presence state for all groups
      */
-    getLastSeenPeer(peers) {
-        let freshestLastSeenAt;
-        return peers.reduce((freshest, curr) => {
-            const lastSeenAt = this.value[curr]?.lastSeenAt;
-            if (!lastSeenAt) {
-                return freshest;
-            }
-            if (!freshest || lastSeenAt > freshestLastSeenAt) {
-                freshestLastSeenAt = lastSeenAt;
-                return curr;
+    getStates(opts) {
+        const groupingFn = opts?.groupingFn ?? peerIdentity;
+        const summaryFn = opts?.summaryFn ??
+            getLastActivePeer;
+        const statesByKey = Object.values(this.value).reduce((byKey, curr) => {
+            const key = groupingFn(curr);
+            if (!(key in byKey)) {
+                byKey[key] = [];
             }
-            return freshest;
-        }, undefined);
+            byKey[key].push(curr);
+            return byKey;
+        }, {});
+        return Object.entries(statesByKey).reduce((result, [key, states]) => {
+            result[key] = summaryFn(states);
+            return result;
+        }, {});
     }
-    /**
-     * Return the peer from this group that sent a state update most recently
-     *
-     * @param peers
-     * @returns id of most recently seen peer
-     */
-    getLastActivePeer(peers) {
-        let freshestLastActiveAt;
-        return peers.reduce((freshest, curr) => {
-            const lastActiveAt = this.value[curr]?.lastActiveAt;
-            if (!lastActiveAt) {
-                return freshest;
-            }
-            if (!freshest || lastActiveAt > freshestLastActiveAt) {
-                freshestLastActiveAt = lastActiveAt;
-                return curr;
-            }
+}
+/**
+ * Get the peerId of this peer.
+ *
+ * @param peer
+ * @returns peer id
+ */
+function peerIdentity(peer) {
+    return peer.peerId;
+}
+/**
+ * Find the peer that most recently sent a state update.
+ *
+ * @param peers
+ * @returns id of most recently active peer
+ */
+function getLastActivePeer(peers) {
+    let freshestLastActiveAt;
+    return peers.reduce((freshest, curr) => {
+        const lastActiveAt = curr.lastActiveAt;
+        if (!lastActiveAt) {
             return freshest;
-        }, undefined);
-    }
-    /**
-     * Get current ephemeral state value for this user's most-recently-active
-     * peer.
-     *
-     * @param userId
-     * @returns user's {@link State}
-     */
-    getUserState(userId) {
-        const peers = this.getUserPeers(userId);
-        if (!peers) {
-            return undefined;
         }
-        const peer = this.getLastActivePeer(peers);
-        if (!peer) {
-            return undefined;
-        }
-        return this.value[peer];
-    }
-    /**
-     * Get current ephemeral state value for this device's most-recently-active
-     * peer.
-     *
-     * @param deviceId
-     * @returns device's {@link State}
-     */
-    getDeviceState(deviceId) {
-        const peers = this.getDevicePeers(deviceId);
-        if (!peers) {
-            return undefined;
+        if (!freshest || lastActiveAt > freshestLastActiveAt) {
+            freshestLastActiveAt = lastActiveAt;
+            return curr;
         }
-        const peer = this.getLastActivePeer(peers);
-        if (!peer) {
-            return undefined;
-        }
-        return this.value[peer];
-    }
+        return freshest;
+    }, undefined);
 }
 
 class PeerPresenceInfo {
@@ -6867,7 +6795,7 @@ class PeerPresenceInfo {
      * @param peerId
      * @param value
      */
-    update({ peerId, deviceId, userId, value, }) {
+    update({ peerId, value }) {
         const peerState = this.#peerStates.value[peerId];
         const existingState = peerState?.value ?? {};
         const now = Date.now();
@@ -6875,10 +6803,8 @@ class PeerPresenceInfo {
             ...this.#peerStates.value,
             [peerId]: {
                 peerId,
-                deviceId,
-                userId,
-                lastActiveAt: now,
                 lastSeenAt: now,
+                lastActiveAt: now,
                 value: {
                     ...existingState,
                     ...value,
@@ -6933,8 +6859,6 @@ class PeerPresenceInfo {
  */
 class Presence extends EventEmitter {
     #handle;
-    deviceId;
-    userId;
     #peers;
     #localState;
     #heartbeatMs;
@@ -6949,13 +6873,11 @@ class Presence extends EventEmitter {
      * @param config see {@link PresenceConfig}
      * @returns
      */
-    constructor({ handle, deviceId, userId, }) {
+    constructor({ handle }) {
         super();
         this.#handle = handle;
         this.#peers = new PeerPresenceInfo(DEFAULT_PEER_TTL_MS);
         this.#localState = {};
-        this.userId = userId;
-        this.deviceId = deviceId;
     }
     /**
      * Start listening to ephemeral messages on the handle, broadcast initial
@@ -6979,7 +6901,6 @@ class Presence extends EventEmitter {
                 return;
             }
             const message = envelope[PRESENCE_MESSAGE_MARKER];
-            const { deviceId, userId } = message;
             if (!this.#peers.has(peerId)) {
                 this.announce();
             }
@@ -6995,15 +6916,11 @@ class Presence extends EventEmitter {
                 case "update":
                     this.#peers.update({
                         peerId,
-                        deviceId,
-                        userId,
                         value: { [message.channel]: message.value },
                     });
                     this.emit("update", {
                         type: "update",
                         peerId,
-                        deviceId,
-                        userId,
                         channel: message.channel,
                         value: message.value,
                     });
@@ -7011,15 +6928,11 @@ class Presence extends EventEmitter {
                 case "snapshot":
                     this.#peers.update({
                         peerId,
-                        deviceId,
-                        userId,
                         value: message.state,
                     });
                     this.emit("snapshot", {
                         type: "snapshot",
                         peerId,
-                        deviceId,
-                        userId,
                         state: message.state,
                     });
                     break;
@@ -7114,8 +7027,6 @@ class Presence extends EventEmitter {
     }
     doBroadcast(type, extra) {
         this.send({
-            userId: this.userId,
-            deviceId: this.deviceId,
             type,
             ...extra,
         });
@@ -7168,8 +7079,6 @@ class Presence extends EventEmitter {
 
 function usePresence({
   handle,
-  userId,
-  deviceId,
   initialState,
   heartbeatMs,
   peerTtlMs
@@ -7181,9 +7090,7 @@ function usePresence({
     peerTtlMs
   });
   const firstInitialState = useRef(initialState);
-  const [presence] = useState(
-    () => new Presence({ handle, userId, deviceId })
-  );
+  const [presence] = useState(() => new Presence({ handle }));
   useEffect(() => {
     presence.start({
       initialState: firstInitialState.current,
@@ -7197,7 +7104,7 @@ function usePresence({
     return () => {
       presence.stop();
     };
-  }, [presence, userId, deviceId, firstInitialState, firstOpts]);
+  }, [presence, firstInitialState, firstOpts]);
   const start = useCallback(
     (config) => {
       const initialState2 = config?.initialState ?? presence.getLocalState();