braid-http 0.1.2 → 0.1.5

package/braid-http-client.js

@@ -499,7 +499,7 @@ function parse_headers (input) {
 }
 
 // Content-range is of the form '<unit> <range>' e.g. 'json .index'
-var content_range_regex = /(\S+) (.*)/
+var content_range_regex = /(\S+)( (.*))?/
 function parse_body (state) {
 
     // Parse Body Snapshot
@@ -529,7 +529,7 @@ function parse_body (state) {
                 }
             state.patches = [{
                 unit: match[1],
-                range: match[2],
+                range: match[3],
                 content: state.input.substring(0, content_length),
 
                 // Question: Perhaps we should include headers here, like we do for
@@ -618,7 +618,7 @@ function parse_body (state) {
                     }
 
                 last_patch.unit = match[1]
-                last_patch.range = match[2]
+                last_patch.range = match[3]
                 last_patch.content = state.input.substr(0, content_length)
 
                 // Consume the parsed input

package/braid-http-server.js

@@ -74,12 +74,8 @@ function parse_patches (req, cb) {
         assert(req.headers['content-range'], 'No patches to parse: need `Patches: N` or `Content-Range:` header in ' + JSON.stringify(req.headers))
 
         // Parse the Content-Range header
-        var match = req.headers['content-range'].match(/(\S+) (.*)/)
-        if (!match) {
-            console.error('Cannot parse Content-Range in', JSON.stringify(headers))
-            process.exit(1)
-        }
-        var [unit, range] = match.slice(1)
+        // Content-range is of the form '<unit> <range>' e.g. 'json .index'
+        var [unit, range] = parse_content_range(req.headers['content-range'])
 
         // The contents of the patch is in the request body
         var buffer = ''
@@ -148,12 +144,7 @@ function parse_patches (req, cb) {
                 // XX Todo: support custom patch types beyond content-range.
 
                 // Content-range is of the form '<unit> <range>' e.g. 'json .index'
-                var match = headers['content-range'].match(/(\S+) (.*)/)
-                if (!match) {
-                    console.error('Cannot parse Content-Range in', JSON.stringify(headers))
-                    process.exit(1)
-                }
-                var [unit, range] = match.slice(1)
+                var [unit, range] = parse_content_range(headers['content-range'])
                 var patch_content =
                     buffer.substring(headers_length + blank_line.length,
                                      headers_length + blank_line.length + body_length)
@@ -178,6 +169,15 @@ function parse_patches (req, cb) {
     }
 }
 
+function parse_content_range (range_string) {
+    console.log('range string is', range_string)
+    var match = range_string.match(/(\S+)( (.*))?/)
+    console.log('##### match is', match)
+    if (!match) throw 'Cannot parse Content-Range in ' + string
+    var [unit, range] = [match[1], match[3]]
+    return [unit, range]
+}
+
 function braidify (req, res, next) {
     // console.log('\n## Braidifying', req.method, req.url, req.headers.peer)
 
@@ -203,6 +203,7 @@ function braidify (req, res, next) {
 
     // Add the braidly request/response helper methods
     res.sendVersion = (stuff) => send_version(res, stuff, req.url, peer)
+    res.sendUpdate = res.sendVersion
     req.patches = () => new Promise(
         (done, err) => parse_patches(req, (patches) => done(patches))
     )
@@ -249,7 +250,9 @@ function braidify (req, res, next) {
         }
 
     // Check the Useragent to work around Firefox bugs
-    if (req.headers['user-agent'].toLowerCase().indexOf('firefox') > -1)
+    if (req.headers['user-agent']
+        && typeof req.headers['user-agent'] === 'string'
+        && req.headers['user-agent'].toLowerCase().indexOf('firefox') > -1)
         res.is_firefox = true
 
     next && next()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-http",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "An implementation of Braid-HTTP for Node.js and Browsers",
   "scripts": {
     "test": "node test/server.js"

package/readme.md

@@ -130,7 +130,7 @@ Braidify adds these fields and methods to requests and responses:
 - `req.subscribe`
 - `req.startSubscription({onClose: cb})`
 - `await req.patches()`
-- `res.sendVersion()`
+- `res.sendUpdate()`
 
 Use it like this:
 
@@ -152,7 +152,7 @@ require('http').createServer(
             res.statusCode = 200
 
         // Send the current version
-        res.sendVersion({
+        res.sendUpdate({
             version: 'greg',
             body: JSON.stringify({greg: 'greg'})
         })
@@ -183,14 +183,14 @@ app.get('/', (req, res) => {
         res.statusCode = 200
 
     // Send the current version
-    res.sendVersion({
+    res.sendUpdate({
         version: 'greg',
         parents: ['gr','eg'],
         body: JSON.stringify({greg: 'greg'})
     })
 
     // Or you can send patches like this:
-    // res.sendVersion({
+    // res.sendUpdate({
     //     version: 'greg',
     //     parents: ['gr','eg'],
     //     patches: [{range: '.greg', unit: 'json', content: '"greg"'}]