braid-text 0.2.25 → 0.2.27

package/index.js

@@ -488,6 +488,8 @@ braid_text.put = async (key, options) => {
 
     resource.need_defrag = true
 
+    await resource.db_delta(resource.doc.getPatchSince(v_before))
+
     if (options.merge_type != "dt") {
         patches = get_xf_patches(resource.doc, v_before)
         if (braid_text.verbose) console.log(JSON.stringify({ patches }))
@@ -588,8 +590,6 @@ braid_text.put = async (key, options) => {
     for (let client of resource.clients) {
         if (!peer || client.peer !== peer) client.subscribe(x)
     }
-
-    await resource.db_delta(resource.doc.getPatchSince(v_before))
 }
 
 braid_text.list = async () => {
@@ -923,7 +923,10 @@ function dt_get_patches(doc, version = null) {
     let [_agents, versions, parentss] = dt_parse([...bytes])
 
     let op_runs = []
-    if (version) {
+    if (version && v_eq(version,
+        doc.getRemoteVersion().map((x) => x.join("-")).sort())) {
+        // they want everything past the end, which is nothing
+    } else if (version) {
         let frontier = {}
         version.forEach((x) => frontier[x] = true)
         let local_version = []

package/package.json

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

package/test/test.html

@@ -87,6 +87,91 @@ runTest(
     JSON.stringify([ "hi-0" ])
 )
 
+runTest(
+    "test subscribing starting at a version using dt",
+    async () => {
+        let key = 'test-' + Math.random().toString(36).slice(2)
+
+        let r = await braid_fetch(`/${key}`, {
+            method: 'PUT',
+            version: ['hi-1'],
+            parents: [],
+            body: 'xx'
+        })
+        if (!r.ok) throw 'got: ' + r.statusCode
+
+        let r2 = await braid_fetch(`/${key}`, {
+            version: ['hi-0'],
+            subscribe: true,
+            headers: {
+                'Merge-Type': 'dt'
+            }
+        })
+        return r2.headers.get('merge-type') + ':' + await new Promise(async (done, fail) => {
+            r2.subscribe(update => {
+                done(JSON.stringify(update.parents))
+            }, fail)
+        })
+    },
+    'dt:' + JSON.stringify([ "hi-0" ])
+)
+
+runTest(
+    "test subscribing starting at the latest version using dt",
+    async () => {
+        let key = 'test-' + Math.random().toString(36).slice(2)
+
+        let r = await braid_fetch(`/${key}`, {
+            method: 'PUT',
+            version: ['hi-1'],
+            parents: [],
+            body: 'xx'
+        })
+        if (!r.ok) throw 'got: ' + r.statusCode
+
+        let r2 = await braid_fetch(`/${key}`, {
+            version: ['hi-1'],
+            subscribe: true,
+            headers: {
+                'Merge-Type': 'dt'
+            }
+        })
+        return await new Promise(async (done, fail) => {
+            r2.subscribe(update => done('got something'), fail)
+            setTimeout(() => done('got nothing'), 1500)
+        })
+    },
+    'got nothing'
+)
+
+runTest(
+    "test subscribing starting at beginning using dt",
+    async () => {
+        let key = 'test-' + Math.random().toString(36).slice(2)
+
+        let r = await braid_fetch(`/${key}`, {
+            method: 'PUT',
+            version: ['hi-1'],
+            parents: [],
+            body: 'xx'
+        })
+        if (!r.ok) throw 'got: ' + r.statusCode
+
+        let r2 = await braid_fetch(`/${key}`, {
+            subscribe: true,
+            headers: {
+                'Merge-Type': 'dt'
+            }
+        })
+        return r2.headers.get('merge-type') + ':' + await new Promise(async (done, fail) => {
+            r2.subscribe(update => {
+                if (update.version[0] === 'hi-1') done('got it!')
+            }, fail)
+        })
+    },
+    'dt:got it!'
+)
+
 runTest(
     "test dt_create_bytes with big agent name",
     async () => {

package/test/server.js

@@ -1,50 +0,0 @@
-
-var port = process.argv[2] || 8889
-
-var braid_text = require("../index.js")
-braid_text.db_folder = null
-
-var server = require("http").createServer(async (req, res) => {
-    console.log(`${req.method} ${req.url}`)
-
-    // Free the CORS
-    braid_text.free_cors(res)
-    if (req.method === 'OPTIONS') return
-
-    if (req.url.startsWith('/test.html')) {
-        let parts = req.url.split(/[\?&=]/g)
-
-        if (parts[1] === 'check') {
-            res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-cache" })
-            return res.end(JSON.stringify({
-                checking: parts[2],
-                result: (await braid_text.get(parts[2])) != null
-            }))
-        } else if (parts[1] === 'dt_create_bytes_big_name') {
-            try {
-                braid_text.dt_create_bytes('x'.repeat(1000000) + '-0', [], 0, 0, 'hi')
-                return res.end(JSON.stringify({ ok: true }))
-            } catch (e) {
-                return res.end(JSON.stringify({ ok: false, error: '' + e }))
-            }
-        } else if (parts[1] === 'dt_create_bytes_many_names') {
-            try {
-                braid_text.dt_create_bytes('hi-0', new Array(1000000).fill(0).map((x, i) => `x${i}-0`), 0, 0, 'hi')
-                return res.end(JSON.stringify({ ok: true }))
-            } catch (e) {
-                return res.end(JSON.stringify({ ok: false, error: '' + e }))
-            }
-        }
-
-        res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
-        require("fs").createReadStream(`${__dirname}/test.html`).pipe(res)
-        return
-    }
-
-    // Now serve the collaborative text!
-    braid_text.serve(req, res)
-})
-
-server.listen(port, () => {
-    console.log(`serving: http://localhost:${port}/test.html`)
-})