experimental-a2 0.21.1 → 0.22.0

package/src/store-presence-polling.ts

@@ -19,6 +19,11 @@ export function pollPresence({
   sleep?: (ms: number) => Sleeper
 }): {
   ready: Promise<void>
+  /**
+   * Runs a foreground snapshot read and counts it as a poll, so a stamp a
+   * viewer paints from it is one later deletes carry.
+   */
+  snapshot(read: () => Promise<PresenceRow[]>): Promise<PresenceRow[]>
   update(patch: PresencePatch): void
   wake(): void
   stop(): void
@@ -45,6 +50,46 @@ export function pollPresence({
     // Seeding is best effort; foreground snapshots still report read errors.
     .catch(() => undefined)
 
+  /** Delivers how `rows` differ from what was seen; true when they do. */
+  const reconcile = (rows: PresenceRow[]): boolean => {
+    const live = new Set<string>()
+    let changed = false
+    for (const row of rows) {
+      const id = key(row)
+      live.add(id)
+      const prior = seen.get(id)
+      seen.set(id, row)
+      if (
+        prior?.seen === row.seen &&
+        prior.at.getTime() === row.at.getTime() &&
+        JSON.stringify(prior.value) === JSON.stringify(row.value)
+      )
+        continue
+      changed = true
+      deliver({
+        participant: row.participant,
+        values: { [row.field]: row.value },
+        seen: row.seen,
+        at: row.at,
+      })
+    }
+    for (const [id, row] of seen) {
+      if (live.has(id)) continue
+      seen.delete(id)
+      changed = true
+      deliver({
+        participant: row.participant,
+        values: { [row.field]: null },
+        seen: row.seen,
+        // The last seen stamp, never this poller's clock: only
+        // senders' clocks order the plane, and an observer-stamped
+        // delete could outrank the sender's next set.
+        at: row.at,
+      })
+    }
+    return changed
+  }
+
   const run = async (): Promise<void> => {
     await ready
     for (;;) {
@@ -60,39 +105,7 @@ export function pollPresence({
         const rows = await read()
         if (stopped) return
         if (version !== reading) continue
-        const live = new Set<string>()
-        let changed = false
-        for (const row of rows) {
-          const id = key(row)
-          live.add(id)
-          const prior = seen.get(id)
-          seen.set(id, row)
-          if (
-            prior?.seen === row.seen &&
-            prior.at.getTime() === row.at.getTime() &&
-            JSON.stringify(prior.value) === JSON.stringify(row.value)
-          )
-            continue
-          changed = true
-          deliver({
-            participant: row.participant,
-            values: { [row.field]: row.value },
-            seen: row.seen,
-            at: row.at,
-          })
-        }
-        for (const [id, row] of seen) {
-          if (live.has(id)) continue
-          seen.delete(id)
-          changed = true
-          deliver({
-            participant: row.participant,
-            values: { [row.field]: null },
-            seen: row.seen,
-            at: new Date(),
-          })
-        }
-        if (changed) activate()
+        if (reconcile(rows)) activate()
         else if (version === before)
           interval = Math.min(interval * 2, POLL_TIMINGS.idleCeilingMs)
       } catch {
@@ -103,10 +116,22 @@ export function pollPresence({
   void run()
   return {
     ready,
+    async snapshot(readSnapshot) {
+      const reading = version
+      const rows = await readSnapshot()
+      if (!stopped && version === reading && reconcile(rows)) activate()
+      return rows
+    },
     wake: activate,
     update(patch) {
       for (const [field, value] of Object.entries(patch.values)) {
-        seen.set(key({ participant: patch.participant, field }), {
+        const id = key({ participant: patch.participant, field })
+        // A deleted field is one the next read should not find.
+        if (value === null) {
+          seen.delete(id)
+          continue
+        }
+        seen.set(id, {
           participant: patch.participant,
           field,
           value,