braid-text 0.2.15 → 0.2.17

package/index.js

@@ -80,7 +80,7 @@ braid_text.serve = async (req, res, options = {}) => {
             try {
                 x = await braid_text.get(resource, { version: req.version, parents: req.parents })
             } catch (e) {
-                return my_end(400, "The server failed to get something. The error generated was: " + e)
+                return my_end(500, "The server failed to get something. The error generated was: " + e)
             }
 
             res.setHeader("Version", x.version.map((x) => JSON.stringify(x)).join(", "))
@@ -116,7 +116,7 @@ braid_text.serve = async (req, res, options = {}) => {
             try {
                 return await braid_text.get(resource, options)
             } catch (e) {
-                return my_end(400, "The server failed to get something. The error generated was: " + e)
+                return my_end(500, "The server failed to get something. The error generated was: " + e)
             }
         }
     }
@@ -192,7 +192,7 @@ braid_text.serve = async (req, res, options = {}) => {
                 //     - cons: typically implies that the request was missing an http conditional field like If-Match. that is to say, it implies that the request is missing a precondition, not that the server is missing a precondition
                 return done_my_turn(425, e.message)
             } else {
-                return done_my_turn(400, "The server failed to apply this version. The error generated was: " + e)
+                return done_my_turn(500, "The server failed to apply this version. The error generated was: " + e)
             }
         }
 
@@ -219,17 +219,14 @@ braid_text.get = async (key, options) => {
     let resource = (typeof key == 'string') ? await get_resource(key) : key
 
     if (!options.subscribe) {
-        let doc = resource.doc
-        if (options.version || options.parents) doc = dt_get(doc, options.version || options.parents)
-
-        let ret = {
-            version: doc.getRemoteVersion().map((x) => x.join("-")).sort(),
-            body: doc.get()
-        }
-
-        if (options.version || options.parents) doc.free()
-
-        return ret
+        return options.version || options.parents ?
+            {
+                version: options.version || options.parents,
+                body: dt_get_string(resource.doc, options.version || options.parents)
+            } : {
+                version: resource.doc.getRemoteVersion().map((x) => x.join("-")).sort(),
+                body: resource.doc.get()
+            }
     } else {
         if (options.merge_type != "dt") {
             let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
@@ -580,6 +577,34 @@ braid_text.put = async (key, options) => {
     await resource.db_delta(resource.doc.getPatchSince(v_before))
 }
 
+braid_text.revert = async (key, actor, seq) => {
+    var resource = (typeof key == 'string') ? await get_resource(key) : key
+
+    // get version without actor-seq,
+    // and update actor_seqs
+    var v = []
+    for (var [a, s] of Object.entries(resource.actor_seqs)) {
+        if (a !== actor) v.push(`${a}-${s}`)
+        else {
+            if (s < seq) return // nothing to do
+            else if (seq > 0) {
+                v.push(`${a}-${seq - 1}`)
+                resource.actor_seqs[actor] = seq - 1
+            } else delete resource.actor_seqs[actor]
+        }
+    }
+
+    // revert dt
+    var old_doc = resource.doc
+    resource.doc = dt_get(resource.doc, v)
+    old_doc.free()
+
+    resource.val = resource.doc.get()
+
+    // save it
+    await resource.db_delta()
+}
+
 braid_text.list = async () => {
     try {
         if (braid_text.db_folder) {
@@ -745,7 +770,8 @@ async function file_sync(key, process_delta, get_init) {
     return {
         change: async (bytes) => {
             await (chain = chain.then(async () => {
-                currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
+                if (!bytes) currentSize = threshold
+                else currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
                 const filename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
                 if (currentSize < threshold) {
                     if (braid_text.verbose) console.log(`appending to db..`)
@@ -790,14 +816,18 @@ async function file_sync(key, process_delta, get_init) {
 //////////////////////////////////////////////////////////////////
 
 function dt_len(doc, version) {
-    let bytes = doc.toBytes()
-    let oplog = OpLog.fromBytes(bytes)
-    let [_agents, versions, _parentss] = dt_parse([...bytes])
+    return count_code_points(dt_get_string(doc, version))
+}
 
-    let frontier = new Set(version)
+function dt_get_string(doc, version) {
+    var bytes = doc.toBytes()
+    var oplog = OpLog.fromBytes(bytes)
+    var [_agents, versions, _parentss] = dt_parse([...bytes])
 
-    let local_version = []
-    for (let i = 0; i < versions.length; i++) {
+    var frontier = new Set(version)
+
+    var local_version = []
+    for (var i = 0; i < versions.length; i++) {
         var v = versions[i].join("-")
         if (frontier.has(v)) {
             local_version.push(i)
@@ -807,13 +837,13 @@ function dt_len(doc, version) {
 
     if (frontier.size) throw new Error(`version not found: ${version}`)
 
-    let b = new Branch()
+    var b = new Branch()
     b.merge(oplog, new Uint32Array(local_version))
-    let len = count_code_points(b.get())
+    var s = b.get()
     b.free()
     
     oplog.free()
-    return len
+    return s
 }
 
 function dt_get(doc, version, agent = null) {
@@ -1741,4 +1771,6 @@ braid_text.dt_get_patches = dt_get_patches
 braid_text.dt_parse = dt_parse
 braid_text.dt_create_bytes = dt_create_bytes
 
+braid_text.decode_version = decode_version
+
 module.exports = braid_text

package/package.json

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

package/test/server.js

@@ -46,5 +46,5 @@ var server = require("http").createServer(async (req, res) => {
 })
 
 server.listen(port, () => {
-    console.log(`server started on port ${port}`)
+    console.log(`serving: http://localhost:${port}/test.html`)
 })

package/test/test.js

@@ -12,18 +12,43 @@ process.on("uncaughtException", (x) =>
 
 braid_text.db_folder = null
 
+async function test_revert() {
+    braid_text.db_folder = './braid-text-db'
+    var key = Math.random().toString(36).slice(2)
+    await braid_text.put(key, {version: ['a-0'], body: 'A'})
+    await braid_text.put(key, {version: ['a-1'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'B'}]})
+    await braid_text.revert(key, 'a', 1)
+    delete braid_text.cache[key]
+    var {version, body} = await braid_text.get(key, {})
+    if (version[0] != 'a-0') throw new Error('revert error: wrong version')
+    if (body != 'A') throw new Error('revert error: wrong text')
+
+    await braid_text.put(key, {version: ['b-0'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'C'}]})
+    if ('AC' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
+    await braid_text.revert(key, 'b', 0)
+    if ('A' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
+    delete braid_text.cache[key]
+    var {version, body} = await braid_text.get(key, {})
+    if (version[0] != 'a-0') throw new Error('revert error: wrong version')
+    if (body != 'A') throw new Error('revert error: wrong text')
+
+    braid_text.db_folder = null
+}
+
 async function main() {
     let best_seed = NaN
     let best_n = Infinity
     let base = Math.floor(Math.random() * 10000000)
     let st = Date.now()
 
+    await test_revert()
+
     let og_log = console.log
     console.log = () => {}
     for (let t = 0; t < 10000; t++) {
         let seed = base + t
     // for (let t = 0; t < 1; t++) {
-    //     let seed = 7572861
+    //     let seed = 7375800
 
         og_log(`t = ${t}, seed = ${seed}, best_n = ${best_n} @ ${best_seed}`)
         Math.randomSeed(seed)
@@ -53,6 +78,11 @@ async function main() {
             let dt_to_braid = async (doc, key) => {
                 await braid_text.get(key, {})
                 for (let x of dt_get_patches(doc)) {
+                    var resource = await braid_text.get_resource(key)
+                    var [actor, seq] = braid_text.decode_version(x.version)
+                    var pre_seq = resource.actor_seqs[actor]
+                    var old_text = await braid_text.get(key)
+
                     console.log(`x = `, x)
                     let y = {
                         merge_type: 'dt',
@@ -67,6 +97,12 @@ async function main() {
                     await braid_text.put(key, y)
                     y.validate_already_seen_versions = true
                     await braid_text.put(key, y)
+
+                    // test revert
+                    await braid_text.revert(key, actor, (pre_seq ?? -1) + 1)
+                    var new_text = await braid_text.get(key)
+                    if (old_text !== new_text) throw new Error('revert failed!')
+                    await braid_text.put(key, y)
                 }
             }
             await dt_to_braid(doc, 'doc')
@@ -196,12 +232,6 @@ function getRandomCharacter() {
     return characters[randomIndex];
 }
 
-function decode_version(v) {
-    let m = v.match(/^(.*)-(\d+)$/s)
-    if (!m) throw new Error(`invalid actor-seq version: ${v}`)
-    return [m[1], parseInt(m[2])]
-}
-
 /////////
 
 // the next two functions added by me