braid-text 0.2.17 → 0.2.19

package/index.js

@@ -483,13 +483,16 @@ braid_text.put = async (key, options) => {
         let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
 
         for (let client of resource.simpleton_clients) {
-            if (client.peer == peer) {
+            if (peer && client.peer === peer) {
                 client.my_last_seen_version = [og_v]
             }
 
             function set_timeout(time_override) {
                 if (client.my_timeout) clearTimeout(client.my_timeout)
                 client.my_timeout = setTimeout(() => {
+                    // if the doc has been freed, exit early
+                    if (resource.doc.__wbg_ptr === 0) return
+
                     let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
                     let x = { version }
                     x.parents = client.my_last_seen_version
@@ -507,7 +510,7 @@ braid_text.put = async (key, options) => {
             }
 
             if (client.my_timeout) {
-                if (client.peer == peer) {
+                if (peer && client.peer === peer) {
                     if (!v_eq(client.my_last_sent_version, og_parents)) {
                         // note: we don't add to client.my_unused_version_count,
                         // because we're already in a timeout;
@@ -523,7 +526,7 @@ braid_text.put = async (key, options) => {
             }
 
             let x = { version }
-            if (client.peer == peer) {
+            if (peer && client.peer === peer) {
                 if (!v_eq(client.my_last_sent_version, og_parents)) {
                     client.my_unused_version_count = (client.my_unused_version_count ?? 0) + 1
                     set_timeout()
@@ -571,15 +574,18 @@ braid_text.put = async (key, options) => {
         patches: og_patches,
     }
     for (let client of resource.clients) {
-        if (client.peer != peer) client.subscribe(x)
+        if (!peer || client.peer !== peer) client.subscribe(x)
     }
 
     await resource.db_delta(resource.doc.getPatchSince(v_before))
 }
 
-braid_text.revert = async (key, actor, seq) => {
+// currently version must be an array with exactly one element, e.g. ["abc-1"]
+braid_text.revert = async (key, version) => {
     var resource = (typeof key == 'string') ? await get_resource(key) : key
 
+    var [actor, seq] = decode_version(version[0])
+
     // get version without actor-seq,
     // and update actor_seqs
     var v = []

package/package.json

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

package/test/test.js

@@ -17,7 +17,7 @@ async function test_revert() {
     var key = Math.random().toString(36).slice(2)
     await braid_text.put(key, {version: ['a-0'], body: 'A'})
     await braid_text.put(key, {version: ['a-1'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'B'}]})
-    await braid_text.revert(key, 'a', 1)
+    await braid_text.revert(key, ['a-1'])
     delete braid_text.cache[key]
     var {version, body} = await braid_text.get(key, {})
     if (version[0] != 'a-0') throw new Error('revert error: wrong version')
@@ -25,7 +25,7 @@ async function test_revert() {
 
     await braid_text.put(key, {version: ['b-0'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'C'}]})
     if ('AC' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
-    await braid_text.revert(key, 'b', 0)
+    await braid_text.revert(key, ['b-0'])
     if ('A' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
     delete braid_text.cache[key]
     var {version, body} = await braid_text.get(key, {})
@@ -99,7 +99,7 @@ async function main() {
                     await braid_text.put(key, y)
 
                     // test revert
-                    await braid_text.revert(key, actor, (pre_seq ?? -1) + 1)
+                    await braid_text.revert(key, [`${actor}-${(pre_seq ?? -1) + 1}`])
                     var new_text = await braid_text.get(key)
                     if (old_text !== new_text) throw new Error('revert failed!')
                     await braid_text.put(key, y)
@@ -127,6 +127,30 @@ async function main() {
             console.log(`doc = `, await braid_text.get('doc', {version: middle_v}))
             if (await braid_text.get('middle_doc') != (await braid_text.get('doc', {version: middle_v})).body) throw new Error('bad')
 
+            // test simplton
+            var first_time = true
+            await new Promise(async (done, fail) => {
+                await braid_text.get('middle_doc', {peer: 'sim', subscribe: async update => {
+                    if (first_time) {
+                        first_time = false
+                        if (update.body !== await braid_text.get('middle_doc')) fail(new Error('test 2'))
+
+                        var x = await braid_text.get('middle_doc', {})
+                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-0'], parents: x.version, patches: [{content: 'A', range: '[0:0]'}]})
+                        await braid_text.put('middle_doc', {peer: 'other', merge_type: 'dt', version: ['other-0'], parents: [], patches: [{content: 'B', range: '[0:0]'}]})
+                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-1'], parents: ['sim-0'], patches: [{content: 'b', range: '[0:0]'}]})
+                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-2'], parents: ['sim-1'], patches: [{content: 'c', range: '[0:0]'}]})
+                        await braid_text.revert('middle_doc', ['sim-0'])
+                        await braid_text.revert('middle_doc', ['other-0'])
+
+                        done()
+                    }
+                }})
+            })
+
+            // test handler on dt
+            braid_text.get('middle_doc', {merge_type: 'dt', subscribe: async update => {}})
+
             // try getting updates from middle_doc to doc
             let o = {merge_type: 'dt', parents: middle_v, subscribe: update => {
                 braid_text.put('middle_doc', update)
@@ -171,6 +195,9 @@ function make_random_edit(doc) {
     }
     base_seq++
 
+    // try skipping some seqs.. to see if it breaks..
+    base_seq += Math.floor(Math.random() * 5)
+
     console.log({agents, versions, include_versions})
 
     let parent_doc = dt_get(doc, include_versions)