braid-text 0.0.24 → 0.0.26

package/index.js

@@ -210,12 +210,12 @@ braid_text.get = async (key, options) => {
         if (options.version || options.parents) doc = dt_get(doc, options.version || options.parents)
 
         return {
-            version: doc.getRemoteVersion().map((x) => x.join("-")),
+            version: doc.getRemoteVersion().map((x) => x.join("-")).sort(),
             body: doc.get()
         }
     } else {
         if (options.merge_type != "dt") {
-            let version = resource.doc.getRemoteVersion().map((x) => x.join("-"))
+            let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
             let x = { version }
 
             if (!options.parents && !options.version) {
@@ -300,7 +300,7 @@ braid_text.put = async (key, options) => {
 
     let resource = (typeof key == 'string') ? await get_resource(key) : key
 
-    let parents = resource.doc.getRemoteVersion().map((x) => x.join("-"))
+    let parents = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
     let og_parents = options_parents || parents
 
     let max_pos = count_code_points(v_eq(parents, og_parents) ?
@@ -440,7 +440,7 @@ braid_text.put = async (key, options) => {
         patches = get_xf_patches(resource.doc, v_before)
         console.log(JSON.stringify({ patches }))
 
-        let version = resource.doc.getRemoteVersion().map((x) => x.join("-"))
+        let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
 
         for (let client of resource.simpleton_clients) {
             if (client.peer == peer) {
@@ -450,7 +450,7 @@ braid_text.put = async (key, options) => {
             function set_timeout(time_override) {
                 if (client.my_timeout) clearTimeout(client.my_timeout)
                 client.my_timeout = setTimeout(() => {
-                    let version = resource.doc.getRemoteVersion().map((x) => x.join("-"))
+                    let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
                     let x = { version }
                     x.parents = client.my_last_seen_version
 
@@ -513,7 +513,7 @@ braid_text.put = async (key, options) => {
         }
     } else {
         if (resource.simpleton_clients.size) {
-            let version = resource.doc.getRemoteVersion().map((x) => x.join("-"))
+            let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
             patches = get_xf_patches(resource.doc, v_before)
             let x = { version, parents, patches }
             console.log(`sending: ${JSON.stringify(x)}`)
@@ -695,62 +695,67 @@ async function file_sync(key, process_delta, get_init) {
         }
     }
 
+    let chain = Promise.resolve()
     return {
         change: async (bytes) => {
-            currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
-            const filename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
-            if (currentSize < threshold) {
-                console.log(`appending to db..`)
-
-                let buffer = Buffer.allocUnsafe(4)
-                buffer.writeUInt32LE(bytes.length, 0)
-                await fs.promises.appendFile(filename, buffer)
-                await fs.promises.appendFile(filename, bytes)
-
-                console.log("wrote to : " + filename)
-            } else {
-                try {
-                    console.log(`starting new db..`)
-
-                    currentNumber++
-                    const init = get_init()
-                    const buffer = Buffer.allocUnsafe(4)
-                    buffer.writeUInt32LE(init.length, 0)
-
-                    const newFilename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
-                    await fs.promises.writeFile(newFilename, buffer)
-                    await fs.promises.appendFile(newFilename, init)
-
-                    console.log("wrote to : " + newFilename)
-
-                    currentSize = 4 + init.length
-                    threshold = currentSize * 10
+            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}`
+                if (currentSize < threshold) {
+                    console.log(`appending to db..`)
+
+                    let buffer = Buffer.allocUnsafe(4)
+                    buffer.writeUInt32LE(bytes.length, 0)
+                    await fs.promises.appendFile(filename, buffer)
+                    await fs.promises.appendFile(filename, bytes)
+
+                    console.log("wrote to : " + filename)
+                } else {
                     try {
-                        await fs.promises.unlink(filename)
-                    } catch (e) { }
-                } catch (e) {
-                    console.log(`e = ${e.stack}`)
+                        console.log(`starting new db..`)
+
+                        currentNumber++
+                        const init = get_init()
+                        const buffer = Buffer.allocUnsafe(4)
+                        buffer.writeUInt32LE(init.length, 0)
+
+                        const newFilename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
+                        await fs.promises.writeFile(newFilename, buffer)
+                        await fs.promises.appendFile(newFilename, init)
+
+                        console.log("wrote to : " + newFilename)
+
+                        currentSize = 4 + init.length
+                        threshold = currentSize * 10
+                        try {
+                            await fs.promises.unlink(filename)
+                        } catch (e) { }
+                    } catch (e) {
+                        console.log(`e = ${e.stack}`)
+                    }
                 }
-            }
+            }))
         },
         delete_me: 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 {
-                                console.log(`Deleted file: ${file}`)
-                                resolve()
-                            }
+            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 {
+                                    console.log(`Deleted file: ${file}`)
+                                    resolve()
+                                }
+                            })
                         })
                     })
-                })
-            )
+                )
+            }))
         },
     }
 }
@@ -836,7 +841,7 @@ function OpLog_get_patches(bytes, op_runs) {
     let patches = []
     op_runs.forEach((op_run) => {
         let version = versions[i].join("-")
-        let parents = parentss[i].map((x) => x.join("-"))
+        let parents = parentss[i].map((x) => x.join("-")).sort()
         let start = op_run.start
         let end = start + 1
         if (op_run.content) op_run.content = [...op_run.content]
@@ -863,7 +868,7 @@ function OpLog_get_patches(bytes, op_runs) {
                 })
                 if (j == len) break
                 version = versions[I].join("-")
-                parents = parentss[I].map((x) => x.join("-"))
+                parents = parentss[I].map((x) => x.join("-")).sort()
                 start = op_run.start + j
                 content = ""
             }
@@ -1450,6 +1455,7 @@ function decode_filename(encodedFilename) {
 
 function validate_version_array(x) {
     if (!Array.isArray(x)) throw new Error(`invalid version array: not an array`)
+    x.sort()
     for (xx of x) validate_actor_seq(xx)
 }
 
@@ -1468,7 +1474,7 @@ function is_valid_actor(x) {
     try {
         validate_actor(x)
         return true
-    } catch (e) {}
+    } catch (e) { }
 }
 
 function decode_version(v) {

package/package.json

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