braid-text 0.2.13 → 0.2.15

package/README.md

@@ -180,17 +180,17 @@ simpleton = simpleton_client(url, options)
 ## Testing
 
 ### to run unit tests:
-first run the demo server as usual:
+first run the test server:
 
     npm install
-    node server-demo.js
+    node test/server.js
 
-then open http://localhost:8888/test.html, and the boxes should turn green as the tests pass.
+then open http://localhost:8889/test.html, and the boxes should turn green as the tests pass.
 
 ### to run fuzz tests:
 
     npm install
-    node test.js
+    node test/test.js
 
 if the last output line looks like this, good:
 

package/index.js

@@ -24,11 +24,7 @@ braid_text.serve = async (req, res, options = {}) => {
         ...options                  // Override with all options passed in
     }
 
-    // free CORS
-    res.setHeader("Access-Control-Allow-Origin", "*")
-    res.setHeader("Access-Control-Allow-Methods", "*")
-    res.setHeader("Access-Control-Allow-Headers", "*")
-    res.setHeader("Access-Control-Expose-Headers", "*")
+    braid_text.free_cors(res)
 
     function my_end(statusCode, x) {
         res.statusCode = statusCode
@@ -40,8 +36,9 @@ braid_text.serve = async (req, res, options = {}) => {
         resource = await get_resource(options.key)
 
         braidify(req, res)
+        if (res.is_multiplexer) return
     } catch (e) {
-        return my_end(400, "The server failed to process this request. The error generated was: " + e)
+        return my_end(500, "The server failed to process this request. The error generated was: " + e)
     }
 
     let peer = req.headers["peer"]
@@ -594,6 +591,13 @@ braid_text.list = async () => {
     } catch (e) { return [] }
 }
 
+braid_text.free_cors = res => {
+    res.setHeader("Access-Control-Allow-Origin", "*")
+    res.setHeader("Access-Control-Allow-Methods", "*")
+    res.setHeader("Access-Control-Allow-Headers", "*")
+    res.setHeader("Access-Control-Expose-Headers", "*")
+}
+
 async function get_resource(key) {
     let cache = braid_text.cache
     if (!cache[key]) cache[key] = new Promise(async done => {
@@ -790,12 +794,18 @@ function dt_len(doc, version) {
     let oplog = OpLog.fromBytes(bytes)
     let [_agents, versions, _parentss] = dt_parse([...bytes])
 
-    let frontier = {}
-    version.forEach((x) => frontier[x] = true)
+    let frontier = new Set(version)
 
     let local_version = []
-    for (let i = 0; i < versions.length; i++)
-        if (frontier[versions[i].join("-")]) local_version.push(i)
+    for (let i = 0; i < versions.length; i++) {
+        var v = versions[i].join("-")
+        if (frontier.has(v)) {
+            local_version.push(i)
+            frontier.delete(v)
+        }
+    }
+
+    if (frontier.size) throw new Error(`version not found: ${version}`)
 
     let b = new Branch()
     b.merge(oplog, new Uint32Array(local_version))
@@ -814,12 +824,19 @@ function dt_get(doc, version, agent = null) {
 
     let [_agents, versions, parentss] = dt_parse([...bytes])
 
-    let frontier = {}
-    version.forEach((x) => frontier[x] = true)
+    let frontier = new Set(version)
 
     let local_version = []
-    for (let i = 0; i < versions.length; i++)
-        if (frontier[versions[i].join("-")]) local_version.push(i)
+    for (let i = 0; i < versions.length; i++) {
+        var v = versions[i].join("-")
+        if (frontier.has(v)) {
+            local_version.push(i)
+            frontier.delete(v)
+        }
+    }
+
+    if (frontier.size) throw new Error(`version not found: ${version}`)
+
     dt_get.last_local_version = local_version = new Uint32Array(local_version)
 
     let after_versions = {}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "braid-text",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",
   "homepage": "https://braid.org",
   "dependencies": {
     "diamond-types-node": "^1.0.2",
-    "braid-http": "^1.3.4"
+    "braid-http": "^1.3.73"
   }
 }

package/server-demo.js

@@ -12,9 +12,8 @@ var server = require("http").createServer(async (req, res) => {
     console.log(`${req.method} ${req.url}`)
 
     // Free the CORS
-    free_the_cors(req, res)
-    if (req.method === 'OPTIONS') return
-
+    braid_text.free_cors(res)
+    if (req.method === 'OPTIONS') return res.end()
 
     if (req.url.endsWith("?editor")) {
         res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
@@ -34,36 +33,6 @@ var server = require("http").createServer(async (req, res) => {
         return
     }
 
-    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
-            }))
-        } else if (parts[1] === 'dt_create_bytes_big_name') {
-            try {
-                braid_text.dt_create_bytes('x'.repeat(1000000) + '-0', [], 0, 0, 'hi')
-                return res.end(JSON.stringify({ ok: true }))
-            } catch (e) {
-                return res.end(JSON.stringify({ ok: false, error: '' + e }))
-            }
-        } else if (parts[1] === 'dt_create_bytes_many_names') {
-            try {
-                braid_text.dt_create_bytes('hi-0', new Array(1000000).fill(0).map((x, i) => `x${i}-0`), 0, 0, 'hi')
-                return res.end(JSON.stringify({ ok: true }))
-            } catch (e) {
-                return res.end(JSON.stringify({ ok: false, error: '' + e }))
-            }
-        }
-
-        res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
-        require("fs").createReadStream("./test.html").pipe(res)
-        return
-    }
-
     // TODO: uncomment out the code below to add /pages endpoint,
     // which displays all the currently used keys
     // 
@@ -103,21 +72,3 @@ var server = require("http").createServer(async (req, res) => {
 server.listen(port, () => {
     console.log(`server started on port ${port}`)
 })
-
-
-// Free the CORS!
-function free_the_cors (req, res) {
-    res.setHeader('Range-Request-Allow-Methods', 'PATCH, PUT')
-    res.setHeader('Range-Request-Allow-Units', 'json')
-    res.setHeader("Patches", "OK")
-    var free_the_cors = {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
-        "Access-Control-Allow-Headers": "subscribe, client, version, parents, merge-type, content-type, content-range, patches, cache-control, peer"
-    }
-    Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))
-    if (req.method === 'OPTIONS') {
-        res.writeHead(200)
-        res.end()
-    }
-}

package/test/server.js

@@ -0,0 +1,50 @@
+
+var port = process.argv[2] || 8889
+
+var braid_text = require("../index.js")
+braid_text.db_folder = null
+
+var server = require("http").createServer(async (req, res) => {
+    console.log(`${req.method} ${req.url}`)
+
+    // Free the CORS
+    braid_text.free_cors(res)
+    if (req.method === 'OPTIONS') return
+
+    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
+            }))
+        } else if (parts[1] === 'dt_create_bytes_big_name') {
+            try {
+                braid_text.dt_create_bytes('x'.repeat(1000000) + '-0', [], 0, 0, 'hi')
+                return res.end(JSON.stringify({ ok: true }))
+            } catch (e) {
+                return res.end(JSON.stringify({ ok: false, error: '' + e }))
+            }
+        } else if (parts[1] === 'dt_create_bytes_many_names') {
+            try {
+                braid_text.dt_create_bytes('hi-0', new Array(1000000).fill(0).map((x, i) => `x${i}-0`), 0, 0, 'hi')
+                return res.end(JSON.stringify({ ok: true }))
+            } catch (e) {
+                return res.end(JSON.stringify({ ok: false, error: '' + e }))
+            }
+        }
+
+        res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
+        require("fs").createReadStream(`${__dirname}/test.html`).pipe(res)
+        return
+    }
+
+    // Now serve the collaborative text!
+    braid_text.serve(req, res)
+})
+
+server.listen(port, () => {
+    console.log(`server started on port ${port}`)
+})

package/{test.js → test/test.js}

@@ -1,6 +1,6 @@
 
 let { Doc } = require("diamond-types-node")
-let braid_text = require('./index.js')
+let braid_text = require('../index.js')
 let {dt_get, dt_get_patches, dt_parse, dt_create_bytes} = braid_text
 
 process.on("unhandledRejection", (x) =>