braid-text 0.2.31 → 0.2.33

package/index.js

@@ -180,7 +180,10 @@ braid_text.serve = async (req, res, options = {}) => {
                 // we want to send some kind of error that gives the client faith,
                 // that resending this request later may work,
                 // hopefully after we've received the necessary parents.
-                return done_my_turn(309, e.message, 'Missing Parents', { 'Retry-After': '1' })
+                return done_my_turn(309, e.message, 'Version Unknown', {
+                    Parents: req.headers.parents,
+                    'Retry-After': '1'
+                })
             } else {
                 return done_my_turn(500, "The server failed to apply this version. The error generated was: " + e)
             }
@@ -911,23 +914,18 @@ function dt_get_patches(doc, version = null) {
     if (version && v_eq(version,
         doc.getRemoteVersion().map((x) => x.join("-")).sort())) {
         // they want everything past the end, which is nothing
-    } else if (version) {
+    } else if (version?.length) {
         let frontier = {}
         version.forEach((x) => frontier[x] = true)
         let local_version = []
         for (let i = 0; i < versions.length; i++)
             if (frontier[versions[i].join("-")]) local_version.push(i)
-        let after_bytes = doc.getPatchSince(new Uint32Array(local_version))
-
-        ;[_agents, versions, parentss] = dt_parse([...after_bytes])
-
-        let before_doc = dt_get(doc, version)
-        let before_doc_frontier = before_doc.getLocalVersion()
 
-        before_doc.mergeBytes(after_bytes)
-        op_runs = before_doc.getOpsSince(before_doc_frontier)
+        local_version = new Uint32Array(local_version)
 
-        before_doc.free()
+        let after_bytes = doc.getPatchSince(local_version)
+        ;[_agents, versions, parentss] = dt_parse([...after_bytes])
+        op_runs = doc.getOpsSince(local_version)
     } else op_runs = doc.getOpsSince([])
 
     doc.free()
@@ -1868,6 +1866,10 @@ class RangeSet {
     }
 }
 
+function ascii_ify(s) {
+    return s.replace(/[^\x20-\x7E]/g, c => '\\u' + c.charCodeAt(0).toString(16).padStart(4, '0'))
+}
+
 braid_text.get_resource = get_resource
 
 braid_text.encode_filename = encode_filename

package/package.json

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

package/test/test.html

@@ -68,12 +68,12 @@ runTest(
         let r = await braid_fetch(`/${key}`, {
             method: 'PUT',
             version: ['hi-1'],
-            parents: ['missing-0'],
+            parents: ['missing-0', 'y😀-0'],
             body: 'xx'
         })
-        return r.status + ' ' + r.ok
+        return r.status + ' ' + r.ok + ' ' + r.statusText +  ' ' + r.headers.get('Parents')
     },
-    '309 false'
+    '309 false Version Unknown "missing-0", "y\\ud83d\\ude00-0"'
 )
 
 runTest(