braid-text 0.2.68 → 0.2.69

package/package.json

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

package/test/test.html

@@ -113,7 +113,7 @@ runTest(
                 var x = await new Promise(done => {
                     braid_text.get(new URL('http://localhost:8889/${key}'), {
                         subscribe: update => {
-                            if (update.body_text) done(update.body_text)
+                            if (update.body_text === 'yo') done(update.body_text)
                         }
                     })
                 })
@@ -134,6 +134,33 @@ runTest(
     'yo'
 )
 
+runTest(
+    "test braid_text.sync, key to url, where url breaks",
+    async () => {
+        var key = 'test' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                var count = 0
+                var ops
+                braid_text.sync('/${key}', new URL('http://localhost:8889/have_error'), ops = {
+                    on_connect: () => {
+                        count++
+                        if (count === 2) {
+                            res.end('it reconnected!')
+                            ops.my_unsync()
+                        }
+                    }
+                })
+            })()`
+        })
+        return await r.text()
+
+    },
+    'it reconnected!'
+)
+
 runTest(
     "test braid_text.sync, url to key",
     async () => {
@@ -163,6 +190,36 @@ runTest(
     'got: hi'
 )
 
+runTest(
+    "test braid_text.sync, url to resource",
+    async () => {
+        var key_a = 'test-a-' + Math.random().toString(36).slice(2)
+        var key_b = 'test-b-' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/${key_a}`, {
+            method: 'PUT',
+            body: 'hi'
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                var resource = await braid_text.get_resource('/${key_b}')
+                braid_text.sync(new URL('http://localhost:8889/${key_a}'), resource)
+                res.end('')
+            })()`
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        await new Promise(done => setTimeout(done, 100))
+
+        var r = await braid_fetch(`/${key_b}`)
+        return 'got: ' + (await r.text())
+    },
+    'got: hi'
+)
+
 runTest(
     "test braid_text.sync, with two urls",
     async () => {
@@ -222,6 +279,117 @@ runTest(
     'got: hi'
 )
 
+runTest(
+    "test braid_text.sync, key to url, when HEAD fails",
+    async () => {
+        var key_a = 'test-a-' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/${key_a}`, {
+            method: 'PUT',
+            body: 'hi'
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                var count = 0
+                var ops
+                braid_text.sync('/${key_a}', new URL('http://localhost:8889/have_error'), ops = {
+                    on_connect: () => {
+                        count++
+                        if (count === 2) {
+                            res.end('it reconnected!')
+                            ops.my_unsync()
+                        }
+                    }
+                })
+            })()`
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        return await r.text()
+    },
+    'it reconnected!'
+)
+
+runTest(
+    "test when remote doesn't have a fork-point that we think they have",
+    async () => {
+        var key_a = 'test-a-' + Math.random().toString(36).slice(2)
+        var key_b = 'test-b-' + Math.random().toString(36).slice(2)
+        var key_c = 'test-c-' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/${key_a}`, {
+            method: 'PUT',
+            body: 'hi'
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                braid_text.sync('/${key_a}', new URL('http://localhost:8889/${key_b}'))
+                await new Promise(done => setTimeout(done, 100))
+                braid_text.sync('/${key_a}', new URL('http://localhost:8889/${key_c}'))
+                await new Promise(done => setTimeout(done, 100))
+                res.end('')
+            })()`
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        return await (await braid_fetch(`/${key_c}`)).text()
+    },
+    'hi'
+)
+
+runTest(
+    "test when we don't have a fork-point with remote, but they do have a shared version",
+    async () => {
+        var key_a = 'test-a-' + Math.random().toString(36).slice(2)
+        var key_b = 'test-b-' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/${key_a}`, {
+            method: 'PUT',
+            body: 'hi'
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                var ops = {}
+                braid_text.sync('/${key_a}', '/${key_b}', ops)
+                await new Promise(done => setTimeout(done, 100))
+                ops.my_unsync()
+                res.end('')
+            })()`
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/${key_a}`, {
+            method: 'PUT',
+            body: 'yo'
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        var r = await braid_fetch(`/eval`, {
+            method: 'PUT',
+            body: `void (async () => {
+                var ops = {}
+                braid_text.sync('/${key_a}', new URL('http://localhost:8889/${key_b}'), ops)
+                await new Promise(done => setTimeout(done, 100))
+                ops.my_unsync()
+                res.end('')
+            })()`
+        })
+        if (!r.ok) return 'got: ' + r.status
+
+        return await (await braid_fetch(`/${key_b}`)).text()
+    },
+    'yo'
+)
+
 runTest(
     "test braid_text.sync, with two keys",
     async () => {
@@ -488,44 +656,6 @@ runTest(
     'got: yo -- version: "xyz-1"'
 )
 
-runTest(
-    "test updating meta data",
-    async () => {
-        var key = 'test-' + Math.random().toString(36).slice(2)
-
-        var r1 = await braid_fetch(`/eval`, {
-            method: 'PUT',
-            body: `void (async () => {
-                var resource = await braid_text.get_resource('/${key}')
-                resource.update_meta({ test_meta_info: 42 })
-                res.end(JSON.stringify(resource.meta))
-            })()`
-        })
-
-        return (await r1.text())
-    },
-    '{"test_meta_info":42}'
-)
-
-runTest(
-    "test updating meta data when do db_folder set",
-    async () => {
-        var key = 'test-' + Math.random().toString(36).slice(2)
-
-        var r1 = await braid_fetch(`/eval`, {
-            method: 'PUT',
-            body: `void (async () => {
-                var resource = await braid_text2.get_resource('/${key}')
-                resource.update_meta({ test_meta_info: 42 })
-                res.end(JSON.stringify(resource.meta))
-            })()`
-        })
-
-        return (await r1.text())
-    },
-    '{"test_meta_info":42}'
-)
-
 runTest(
     "test loading a meta file from disk",
     async () => {
@@ -535,7 +665,8 @@ runTest(
             method: 'PUT',
             body: `void (async () => {
                 var resource = await braid_text.get_resource('/${key}')
-                resource.update_meta({ test_meta_info: 42 })
+                resource.meta = { test_meta_info: 42 }
+                resource.change_meta()
 
                 await new Promise(done => setTimeout(done, 200))
 
@@ -782,7 +913,9 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             version: ['hi-0'],
             subscribe: true
         })
@@ -790,7 +923,10 @@ runTest(
         var p = new Promise(async (done, fail) => {
             r2.subscribe(update => {
                 parts.push(update.extra_headers['repr-digest'])
-                if (parts.length > 1) done()
+                if (parts.length > 1) {
+                    done()
+                    a.abort()
+                }
             }, fail)
         })
 
@@ -822,7 +958,9 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             version: ['hi-0'],
             headers: { 'merge-type': 'dt' },
             subscribe: true
@@ -831,7 +969,10 @@ runTest(
         var p = new Promise(async (done, fail) => {
             r2.subscribe(update => {
                 parts.push(update.extra_headers['repr-digest'])
-                if (parts.length > 1) done()
+                if (parts.length > 1) {
+                    done()
+                    a.abort()
+                }
             }, fail)
         })
 
@@ -1075,12 +1216,16 @@ runTest(
         var p_done
         var p = new Promise(done => p_done = done)
 
+        var a = new AbortController()
         var r = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             subscribe: true
         })
         r.subscribe(update => {
-            if (update.version[0] === 'hi-0')
+            if (update.version[0] === 'hi-0') {
                 p_done(update.patches[0].content_text)
+                a.abort()
+            }
         })
 
         var r = await braid_fetch(`/${key}`, {
@@ -1117,10 +1262,10 @@ runTest(
             body: 'x'
         })
 
-        if (!r.ok) throw 'got: ' + r.statusCode
+        if (!r.ok) throw 'got: ' + r.status
 
         r = await f
-        if (!r.ok) throw 'got: ' + r.statusCode
+        if (!r.ok) throw 'got: ' + r.status
 
         var r2 = await braid_fetch(`/${key}`)
         return await r2.text()
@@ -1633,13 +1778,16 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             version: ['hi-0'],
             subscribe: true
         })
         return await new Promise(async (done, fail) => {
             r2.subscribe(update => {
                 done(JSON.stringify(update.parents))
+                a.abort()
             }, fail)
         })
     },
@@ -1659,7 +1807,9 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             version: ['hi-0'],
             subscribe: true,
             headers: {
@@ -1669,6 +1819,7 @@ runTest(
         return r2.headers.get('merge-type') + ':' + await new Promise(async (done, fail) => {
             r2.subscribe(update => {
                 done(JSON.stringify(update.parents))
+                a.abort()
             }, fail)
         })
     },
@@ -1688,7 +1839,9 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             version: ['hi-1'],
             subscribe: true,
             headers: {
@@ -1696,8 +1849,14 @@ runTest(
             }
         })
         return await new Promise(async (done, fail) => {
-            r2.subscribe(update => done('got something'), fail)
-            setTimeout(() => done('got nothing'), 1500)
+            r2.subscribe(update => {
+                done('got something')
+                a.abort()
+            }, fail)
+            setTimeout(() => {
+                done('got nothing')
+                a.abort()
+            }, 1500)
         })
     },
     'got nothing'
@@ -1716,7 +1875,9 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         let r2 = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             subscribe: true,
             headers: {
                 'Merge-Type': 'dt'
@@ -1724,7 +1885,10 @@ runTest(
         })
         return r2.headers.get('merge-type') + ':' + await new Promise(async (done, fail) => {
             r2.subscribe(update => {
-                if (update.version[0] === 'hi-1') done('got it!')
+                if (update.version[0] === 'hi-1') {
+                    done('got it!')
+                    a.abort()
+                }
             }, fail)
         })
     },
@@ -1779,11 +1943,16 @@ runTest(
                 body: JSON.stringify({a: 5, b: 6}, null, 4)
             })
 
+            var a = new AbortController()
             let r = await braid_fetch(`/${key}`, {
+                signal: a.signal,
                 subscribe: true
             })
 
-            r.subscribe(update => done(update.body_text), fail)
+            r.subscribe(update => {
+                done(update.body_text)
+                a.abort()
+            }, fail)
         })
     },
     JSON.stringify({a: 5, b: 6}, null, 4)
@@ -2010,10 +2179,14 @@ runTest(
         })
         if (!r.ok) throw 'got: ' + r.statusCode
 
+        var a = new AbortController()
         var r = await braid_fetch(`/${key}`, {
+            signal: a.signal,
             subscribe: true
         })
-        return r.headers.get('current-version')
+        var result = r.headers.get('current-version')
+        a.abort()
+        return result
     },
     '"hi-11"'
 )