braid-text 0.0.20 → 0.0.22

package/index.js

@@ -4,7 +4,8 @@ let braidify = require("braid-http").http_server
 let fs = require("fs")
 
 let braid_text = {
-    db_folder: './braid-text-db'
+    db_folder: './braid-text-db',
+    cache: {}
 }
 
 let waiting_puts = 0
@@ -156,7 +157,7 @@ braid_text.serve = async (req, res, options = {}) => {
 
             await braid_text.put(resource, { peer, version: req.version, parents: req.parents, patches, body, merge_type })
 
-            options.put_cb(options.key, resource.doc.get())
+            options.put_cb(options.key, resource.val)
         } catch (e) {
             console.log(`EEE= ${e}:${e.stack}`)
             // we couldn't apply the version, possibly because we're missing its parents,
@@ -195,8 +196,8 @@ braid_text.serve = async (req, res, options = {}) => {
 braid_text.get = async (key, options) => {
     if (!options) {
         // if it doesn't exist already, don't create it in this case
-        if (!get_resource.cache?.[key]) return
-        return (await get_resource(key)).doc.get()
+        if (!braid_text.cache[key]) return
+        return (await get_resource(key)).val
     }
 
     if (options.version) validate_version_array(options.version)
@@ -339,22 +340,27 @@ braid_text.put = async (key, options) => {
     // validate version: make sure we haven't seen it already
     if (v[1] <= (resource.actor_seqs[v[0]] ?? -1)) {
 
+        if (!options.validate_already_seen_versions) return
+
         // if we have seen it already, make sure it's the same as before
         let local_version = OpLog_remote_to_local(resource.doc, og_parents)
         let updates = OpLog_get_patches(resource.doc.getPatchSince(local_version), resource.doc.getOpsSince(local_version))
 
         let seen = {}
         for (let u of updates) {
-            if (u.start != u.end) {
+            u.version = decode_version(u.version)
+            u.version[1] += u.end - u.start - 1
+
+            if (!u.content) {
                 // delete
-                let v = decode_version(u.version)
+                let v = u.version
                 for (let i = 0; i < u.end - u.start; i++) {
                     let ps = (i < u.end - u.start - 1) ? [`${v[0]}-${v[1] - i - 1}`] : u.parents
                     seen[JSON.stringify([v[0], v[1] - i, ps, u.start + i])] = true
                 }
             } else {
                 // insert
-                let v = decode_version(u.version)
+                let v = u.version
                 let content = [...u.content]
                 for (let i = 0; i < content.length; i++) {
                     let ps = (i > 0) ? [`${v[0]}-${v[1] - content.length + i}`] : u.parents
@@ -380,13 +386,14 @@ braid_text.put = async (key, options) => {
             }
             // insert
             for (let i = 0; i < p.content?.length ?? 0; i++) {
+                let vv = decode_version(v)
                 let c = p.content[i]
 
                 if (!seen[JSON.stringify([vv[0], vv[1], ps, p.range[1] + offset, c])]) throw new Error('invalid update: different from previous update with same version')
 
                 offset++
                 ps = [v]
-                v = decode_version(v)
+                v = vv
                 v = `${v[0]}-${v[1] + 1}`
             }
         }
@@ -528,6 +535,8 @@ braid_text.put = async (key, options) => {
     }
 
     await resource.db_delta(resource.doc.getPatchSince(v_before))
+
+    resource.val = resource.doc.get()
 }
 
 braid_text.list = async () => {
@@ -537,12 +546,12 @@ braid_text.list = async () => {
             var pages = new Set()
             for (let x of await require('fs').promises.readdir(braid_text.db_folder)) pages.add(decode_filename(x.replace(/\.\w+$/, '')))
             return [...pages.keys()]
-        } else return Object.keys(get_resource.cache)
+        } else return Object.keys(braid_text.cache)
     } catch (e) { return [] }
 }
 
 async function get_resource(key) {
-    let cache = get_resource.cache || (get_resource.cache = {})
+    let cache = braid_text.cache
     if (!cache[key]) cache[key] = new Promise(async done => {
         let resource = {}
         resource.clients = new Set()
@@ -573,6 +582,8 @@ async function get_resource(key) {
             delete cache[key]
         }
 
+        resource.val = resource.doc.get()
+
         done(resource)
     })
     return await cache[key]

package/package.json

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