braid-text 0.3.16 → 0.3.18

package/client/simpleton-sync.js

@@ -118,7 +118,7 @@ function simpleton_client(url, {
     var outstanding_changes = 0      // PUTs sent, not yet ACKed
     var max_outstanding_changes = 10 // throttle limit
     var throttled = false
-    var throttled_update = null
+    var throttled_updates = []
     var ac = new AbortController()
 
     // ── Subscription (GET) ──────────────────────────────────────────────
@@ -150,8 +150,11 @@ function simpleton_client(url, {
             // parents match our client_version exactly. This ensures
             // we stay on a single line of time.
             update.parents.sort()
-            if (versions_eq(client_version, update.parents))
-                if (throttled) throttled_update = update
+            var last_queued = throttled_updates.length
+                ? throttled_updates[throttled_updates.length - 1].version
+                : client_version
+            if (versions_eq(last_queued, update.parents))
+                if (throttled) throttled_updates.push(update)
                 else await apply_update(update)
         }, on_error)
     }).catch(on_error)
@@ -199,11 +202,31 @@ function simpleton_client(url, {
             client_state = apply_patches(client_state, patches)
         }
 
+        // ── Advance version ─────────────────────────────────────────
+        // IMPORTANT: This must happen synchronously (before any await)
+        // to prevent the changed() accumulation loop from interleaving
+        // and capturing a stale client_version during a yield point.
+        client_version = update.version
+
+        // ── Notify listener ─────────────────────────────────────────
+        // IMPORTANT: No changed() / flush is called here.
+        // The JS does NOT send edits after receiving a server
+        // update. The PUT response handler's async accumulation
+        // loop handles flushing accumulated edits.
+        if (on_state) on_state(client_state)
+
         // ── Digest verification ─────────────────────────────────────
         // If the server sent a repr-digest, verify our state
         // matches. On mismatch, THROW — this halts the
         // subscription handler. The document is corrupted and
         // continuing would compound the problem.
+        //
+        // This is placed after advancing client_version and calling
+        // on_state so that the await does not create a yield point
+        // between applying patches and advancing client_version.
+        // That yield point previously allowed the changed() PUT loop
+        // to interleave, capturing a stale client_version and causing
+        // edit loss.
         if (update.extra_headers &&
             update.extra_headers["repr-digest"] &&
             update.extra_headers["repr-digest"].startsWith('sha-256=') &&
@@ -213,16 +236,6 @@ function simpleton_client(url, {
             console.log('state: ' + client_state)
             throw new Error('repr-digest mismatch')
         }
-
-        // ── Advance version ─────────────────────────────────────────
-        client_version = update.version
-
-        // ── Notify listener ─────────────────────────────────────────
-        // IMPORTANT: No changed() / flush is called here.
-        // The JS does NOT send edits after receiving a server
-        // update. The PUT response handler's async accumulation
-        // loop handles flushing accumulated edits.
-        if (on_state) on_state(client_state)
     }
 
     // ── Public interface ────────────────────────────────────────────────
@@ -255,10 +268,10 @@ function simpleton_client(url, {
         if (!change) {
             if (throttled) {
                 throttled = false
-                if (throttled_update &&
-                    versions_eq(client_version, throttled_update.parents))
-                    apply_update(throttled_update).catch(on_error)
-                throttled_update = null
+                for (var update of throttled_updates)
+                    if (versions_eq(client_version, update.parents))
+                        apply_update(update).catch(on_error)
+                throttled_updates = []
             }
             return
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-text",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",

package/server.js

@@ -1023,16 +1023,10 @@ function create_braid_text() {
 
                     if (client.my_timeout) {
                         if (peer && client.peer === peer) {
-                            if (!v_eq(client.my_last_sent_version, parents)) {
-                                // note: we don't add to client.my_unused_version_count,
-                                // because we're already in a timeout;
-                                // we'll just extend it here..
-                                set_timeout()
-                            } else {
-                                // hm.. it appears we got a correctly parented version,
-                                // which suggests that maybe we can stop the timeout early
-                                set_timeout(0)
-                            }
+                            // note: we don't add to client.my_unused_version_count,
+                            // because we're already in a timeout;
+                            // we'll just extend it here..
+                            set_timeout()
                         }
                         continue
                     }
@@ -1049,6 +1043,19 @@ function create_braid_text() {
 
                         x.parents = [version]
                         if (!v_eq(x.version, x.parents)) {
+                            // Note: this rebase will never trigger in the
+                            // presence of the timeout logic above, because
+                            // any version that would cause x.version to
+                            // differ from x.parents would have already
+                            // updated my_last_sent_version when forwarding
+                            // other peers' changes to this client, causing
+                            // a mismatch and triggering a timeout instead.
+                            //
+                            // However, this is the standard rebase path and
+                            // is left here for implementations that omit the
+                            // timeout optimization — without it, this branch
+                            // is needed to rebase the client's version when
+                            // concurrent edits have been merged.
                             if (braid_text.verbose) console.log("rebasing..")
                             x.patches = get_xf_patches(resource.doc, OpLog_remote_to_local(resource.doc, x.parents))
                         } else {