braid-text 0.2.1 → 0.2.3

package/index.js

@@ -9,7 +9,8 @@ let braid_text = {
     verbose: false,
     db_folder: './braid-text-db',
     length_cache_size: 10,
-    cache: {}
+    cache: {},
+    delete_cache: {}
 }
 
 let waiting_puts = 0
@@ -71,7 +72,7 @@ braid_text.serve = async (req, res, options = {}) => {
     if (req.method == "OPTIONS") return my_end(200)
 
     if (req.method == "DELETE") {
-        await resource.delete_me()
+        await braid_text.delete(resource)
         return my_end(200)
     }
 
@@ -205,6 +206,11 @@ braid_text.serve = async (req, res, options = {}) => {
     throw new Error("unknown")
 }
 
+braid_text.delete = async (key) => {
+    let resource = (typeof key == 'string') ? await get_resource(key) : key
+    await resource.delete_me()
+}
+
 braid_text.get = async (key, options) => {
     if (!options) {
         // if it doesn't exist already, don't create it in this case
@@ -481,6 +487,7 @@ braid_text.put = async (key, options) => {
     }
 
     for (let b of bytes) resource.doc.mergeBytes(b)
+    resource.val = resource.doc.get()
 
     resource.need_defrag = true
 
@@ -583,8 +590,6 @@ braid_text.put = async (key, options) => {
     }
 
     await resource.db_delta(resource.doc.getPatchSince(v_before))
-
-    resource.val = resource.doc.get()
 }
 
 braid_text.list = async () => {
@@ -599,9 +604,11 @@ braid_text.list = async () => {
 }
 
 async function get_resource(key) {
+    if (braid_text.delete_cache[key]) await braid_text.delete_cache[key]
+
     let cache = braid_text.cache
     if (!cache[key]) cache[key] = new Promise(async done => {
-        let resource = {}
+        let resource = {key}
         resource.clients = new Set()
         resource.simpleton_clients = new Set()
 
@@ -625,9 +632,9 @@ async function get_resource(key) {
             resource.actor_seqs[v[0]] = Math.max(v[1], resource.actor_seqs[v[0]] ?? -1)
         }
 
-        resource.delete_me = () => {
-            delete_me()
+        resource.delete_me = async () => {
             delete cache[key]
+            await (braid_text.delete_cache[key] = delete_me())
         }
 
         resource.val = resource.doc.get()
@@ -745,9 +752,11 @@ async function file_sync(key, process_delta, get_init) {
         }
     }
 
+    let deleted = false
     let chain = Promise.resolve()
     return {
         change: async (bytes) => {
+            if (deleted) return
             await (chain = chain.then(async () => {
                 currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
                 const filename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
@@ -787,6 +796,7 @@ async function file_sync(key, process_delta, get_init) {
             }))
         },
         delete_me: async () => {
+            deleted = true
             await (chain = chain.then(async () => {
                 await Promise.all(
                     (

package/package.json

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

package/server-demo.js

@@ -34,7 +34,17 @@ var server = require("http").createServer(async (req, res) => {
         return
     }
 
-    if (req.url == '/test.html') {
+    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
+            }))
+        }
+
         res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
         require("fs").createReadStream("./test.html").pipe(res)
         return

package/test.html

@@ -61,6 +61,38 @@ async function runTest(testName, testFunction, expectedResult) {
     }
 }
 
+runTest(
+    "test deleting a resource",
+    async () => {
+        let key = 'test-' + Math.random().toString(36).slice(2)
+
+        let r0 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+
+        await fetch(`/${key}`, {
+            method: 'PUT',
+            body: JSON.stringify({a: 5, b: 6}, null, 4)
+        })
+
+        let r1 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+
+        await fetch(`/${key}`, {
+            method: 'DELETE'
+        })
+
+        let r2 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+
+        await fetch(`/${key}`, {
+            method: 'PUT',
+            body: JSON.stringify({a: 5, b: 7}, null, 4)
+        })
+
+        let r3 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+
+        return JSON.stringify([r0, r1, r2, r3])
+    },
+    JSON.stringify([false, true, false, true])
+)
+
 runTest(
     "test getting a binary update from a subscription",
     async () => {