braid-text 0.2.14 → 0.2.16

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"]
@@ -83,7 +80,7 @@ braid_text.serve = async (req, res, options = {}) => {
             try {
                 x = await braid_text.get(resource, { version: req.version, parents: req.parents })
             } catch (e) {
-                return my_end(400, "The server failed to get something. The error generated was: " + e)
+                return my_end(500, "The server failed to get something. The error generated was: " + e)
             }
 
             res.setHeader("Version", x.version.map((x) => JSON.stringify(x)).join(", "))
@@ -119,7 +116,7 @@ braid_text.serve = async (req, res, options = {}) => {
             try {
                 return await braid_text.get(resource, options)
             } catch (e) {
-                return my_end(400, "The server failed to get something. The error generated was: " + e)
+                return my_end(500, "The server failed to get something. The error generated was: " + e)
             }
         }
     }
@@ -195,7 +192,7 @@ braid_text.serve = async (req, res, options = {}) => {
                 //     - cons: typically implies that the request was missing an http conditional field like If-Match. that is to say, it implies that the request is missing a precondition, not that the server is missing a precondition
                 return done_my_turn(425, e.message)
             } else {
-                return done_my_turn(400, "The server failed to apply this version. The error generated was: " + e)
+                return done_my_turn(500, "The server failed to apply this version. The error generated was: " + e)
             }
         }
 
@@ -222,17 +219,14 @@ braid_text.get = async (key, options) => {
     let resource = (typeof key == 'string') ? await get_resource(key) : key
 
     if (!options.subscribe) {
-        let doc = resource.doc
-        if (options.version || options.parents) doc = dt_get(doc, options.version || options.parents)
-
-        let ret = {
-            version: doc.getRemoteVersion().map((x) => x.join("-")).sort(),
-            body: doc.get()
-        }
-
-        if (options.version || options.parents) doc.free()
-
-        return ret
+        return options.version || options.parents ?
+            {
+                version: options.version || options.parents,
+                body: dt_get_string(resource.doc, options.version || options.parents)
+            } : {
+                version: resource.doc.getRemoteVersion().map((x) => x.join("-")).sort(),
+                body: resource.doc.get()
+            }
     } else {
         if (options.merge_type != "dt") {
             let version = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
@@ -594,6 +588,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 => {
@@ -786,14 +787,18 @@ async function file_sync(key, process_delta, get_init) {
 //////////////////////////////////////////////////////////////////
 
 function dt_len(doc, version) {
-    let bytes = doc.toBytes()
-    let oplog = OpLog.fromBytes(bytes)
-    let [_agents, versions, _parentss] = dt_parse([...bytes])
+    return count_code_points(dt_get_string(doc, version))
+}
 
-    let frontier = new Set(version)
+function dt_get_string(doc, version) {
+    var bytes = doc.toBytes()
+    var oplog = OpLog.fromBytes(bytes)
+    var [_agents, versions, _parentss] = dt_parse([...bytes])
 
-    let local_version = []
-    for (let i = 0; i < versions.length; i++) {
+    var frontier = new Set(version)
+
+    var local_version = []
+    for (var i = 0; i < versions.length; i++) {
         var v = versions[i].join("-")
         if (frontier.has(v)) {
             local_version.push(i)
@@ -803,13 +808,13 @@ function dt_len(doc, version) {
 
     if (frontier.size) throw new Error(`version not found: ${version}`)
 
-    let b = new Branch()
+    var b = new Branch()
     b.merge(oplog, new Uint32Array(local_version))
-    let len = count_code_points(b.get())
+    var s = b.get()
     b.free()
     
     oplog.free()
-    return len
+    return s
 }
 
 function dt_get(doc, version, agent = null) {

package/package.json

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

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(`serving: http://localhost:${port}/test.html`)
+})

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) =>
@@ -23,7 +23,7 @@ async function main() {
     for (let t = 0; t < 10000; t++) {
         let seed = base + t
     // for (let t = 0; t < 1; t++) {
-    //     let seed = 7572861
+    //     let seed = 7630348
 
         og_log(`t = ${t}, seed = ${seed}, best_n = ${best_n} @ ${best_seed}`)
         Math.randomSeed(seed)