braid-text 0.2.8 → 0.2.10

package/index.js

@@ -9,8 +9,7 @@ let braid_text = {
     verbose: false,
     db_folder: './braid-text-db',
     length_cache_size: 10,
-    cache: {},
-    delete_cache: {}
+    cache: {}
 }
 
 let waiting_puts = 0
@@ -207,8 +206,7 @@ braid_text.serve = async (req, res, options = {}) => {
 }
 
 braid_text.delete = async (key) => {
-    let resource = (typeof key == 'string') ? await get_resource(key) : key
-    await resource.delete_me()
+    await braid_text.put(key, {body: ''})
 }
 
 braid_text.get = async (key, options) => {
@@ -597,8 +595,6 @@ 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 = {key}
@@ -607,11 +603,11 @@ async function get_resource(key) {
 
         resource.doc = new Doc("server")
 
-        let { change, delete_me } = braid_text.db_folder
+        let { change } = braid_text.db_folder
             ? await file_sync(key,
                 (bytes) => resource.doc.mergeBytes(bytes),
                 () => resource.doc.toBytes())
-            : { change: () => { }, delete_me: () => { } }
+            : { change: () => { } }
 
         resource.db_delta = change
 
@@ -626,11 +622,6 @@ async function get_resource(key) {
             resource.actor_seqs[v[0]] = Math.max(v[1], resource.actor_seqs[v[0]] ?? -1)
         }
 
-        resource.delete_me = async () => {
-            delete cache[key]
-            await (braid_text.delete_cache[key] = delete_me())
-        }
-
         resource.val = resource.doc.get()
 
         resource.length_cache = createSimpleCache(braid_text.length_cache_size)
@@ -746,11 +737,9 @@ 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}`
@@ -788,29 +777,7 @@ async function file_sync(key, process_delta, get_init) {
                     }
                 }
             }))
-        },
-        delete_me: async () => {
-            deleted = true
-            await (chain = chain.then(async () => {
-                await Promise.all(
-                    (
-                        await get_files_for_key(key)
-                    ).map((file) => {
-                        return new Promise((resolve, reject) => {
-                            fs.unlink(file, (err) => {
-                                if (err) {
-                                    console.error(`Error deleting file: ${file}`)
-                                    reject(err)
-                                } else {
-                                    if (braid_text.verbose) console.log(`Deleted file: ${file}`)
-                                    resolve()
-                                }
-                            })
-                        })
-                    })
-                )
-            }))
-        },
+        }
     }
 }
 

package/package.json

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

package/test.html

@@ -110,31 +110,18 @@ runTest(
     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'
+            body: 'hi'
         })
 
-        let r2 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+        await fetch(`/${key}`, {method: 'DELETE'})
 
-        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
+        let r = await fetch(`/${key}`)
 
-        return JSON.stringify([r0, r1, r2, r3])
+        return await r.text()
     },
-    JSON.stringify([false, true, false, true])
+    ''
 )
 
 runTest(