braid-text 0.3.17 → 0.3.19

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)
@@ -265,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.17",
+  "version": "0.3.19",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",

package/server.js

@@ -718,7 +718,6 @@ function create_braid_text() {
                     }
                 }
 
-                options.my_last_sent_version = x.version
                 resource.simpleton_clients.add(options)
                 options.signal?.addEventListener('abort', () =>
                     resource.simpleton_clients.delete(options))
@@ -1015,7 +1014,6 @@ function create_braid_text() {
 
                             if (braid_text.verbose) console.log(`sending from rebase: ${JSON.stringify(x)}`)
                             client.my_subscribe(x)
-                            client.my_last_sent_version = x.version
 
                             delete client.my_timeout
                         }, time_override ?? Math.min(3000, 23 * Math.pow(1.5, client.my_unused_version_count - 1)))
@@ -1033,7 +1031,10 @@ function create_braid_text() {
 
                     let x = { version: resource.version }
                     if (peer && client.peer === peer) {
-                        if (!v_eq(client.my_last_sent_version, parents)) {
+                        if (!v_eq(resource.version, [version])) {
+                            // the resource has other changes beyond this
+                            // PUT, so the client is behind — start a
+                            // timeout to batch and rebase
                             client.my_unused_version_count = (client.my_unused_version_count ?? 0) + 1
                             set_timeout()
                             continue
@@ -1041,37 +1042,16 @@ function create_braid_text() {
                             delete client.my_unused_version_count
                         }
 
-                        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 {
-                            // this client already has this version,
-                            // so let's pretend to send it back, but not
-                            if (braid_text.verbose) console.log(`not reflecting back to simpleton`)
-                            client.my_last_sent_version = x.version
-                            continue
-                        }
+                        // this client already has this version,
+                        // so let's pretend to send it back, but not
+                        if (braid_text.verbose) console.log(`not reflecting back to simpleton`)
+                        continue
                     } else {
                         x.parents = version_before
                         x.patches = patches
                     }
                     if (braid_text.verbose) console.log(`sending: ${JSON.stringify(x)}`)
                     post_commit_updates.push([client, x])
-                    client.my_last_sent_version = x.version
                 }
             } else {
                 if (resource.simpleton_clients.size) {
@@ -1084,7 +1064,6 @@ function create_braid_text() {
                     for (let client of resource.simpleton_clients) {
                         if (client.my_timeout) continue
                         post_commit_updates.push([client, x])
-                        client.my_last_sent_version = x.version
                     }
                 }
             }