braid-text 0.2.24 → 0.2.26

package/index.js

@@ -76,6 +76,16 @@ braid_text.serve = async (req, res, options = {}) => {
         if (!req.subscribe) {
             res.setHeader("Accept-Subscribe", "true")
 
+            // special case for HEAD asking for version/parents,
+            // to be faster by not reconstructing body
+            if (req.method === "HEAD" && (req.version || req.parents)) {
+                if ((req.version || req.parents).every(event => {
+                    var [actor, seq] = decode_version(event)
+                    return resource.actor_seqs[actor]?.has(seq)
+                })) return my_end(200)
+                else return my_end(500, "Unknown Version")
+            }
+
             let x = null
             try {
                 x = await braid_text.get(resource, { version: req.version, parents: req.parents })
@@ -478,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 }))
@@ -578,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 () => {

package/package.json

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

package/test/test.html

@@ -266,4 +266,34 @@ runTest(
     'retried!'
 )
 
+runTest(
+    "test asking for a version that should and shouldn't be there",
+    async () => {
+        var key = 'test-' + Math.random().toString(36).slice(2)
+
+        var r = await braid_fetch(`/${key}`, {
+            method: 'PUT',
+            version: ['hi-10'],
+            parents: [],
+            body: 'x'
+        })
+        if (!r.ok) throw 'got: ' + r.statusCode
+
+        var r = await braid_fetch(`/${key}`, {
+            method: 'HEAD',
+            version: ['hi-5']
+        })
+        if (r.ok) throw 'found version we should not have found'
+
+        var r = await braid_fetch(`/${key}`, {
+            method: 'HEAD',
+            version: ['hi-10']
+        })
+        if (!r.ok) throw 'could not find version we should have found'
+
+        return 'worked out!'
+    },
+    'worked out!'
+)
+
 </script>

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`)
-})