braid-text 0.2.26 → 0.2.28

package/index.js

@@ -808,6 +808,11 @@ function dt_len(doc, version) {
 }
 
 function dt_get_string(doc, version) {
+    // optimization: if version is the latest,
+    // then return the current text..
+    if (v_eq(version, doc.getRemoteVersion().map((x) => x.join("-")).sort()))
+        return doc.get()
+
     var bytes = doc.toBytes()
     var oplog = OpLog.fromBytes(bytes)
 
@@ -923,7 +928,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.26",
+  "version": "0.2.28",
   "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 () => {