braid-http 0.3.14 → 0.3.17

package/braid-http-client.js

@@ -377,7 +377,7 @@ var subscription_parser = (cb) => ({
 
             // Maybe we parsed an update!  That's cool!
             if (this.state.result === 'success') {
-                this.cb({
+                var update = {
                     version: this.state.version,
                     parents: this.state.parents,
                     body:    this.state.body,
@@ -385,7 +385,10 @@ var subscription_parser = (cb) => ({
 
                     // Output extra_headers if there are some
                     extra_headers: extra_headers(this.state.headers)
-                })
+                }
+                for (var k in update)
+                    if (update[k] === undefined) delete update[k]
+                this.cb(update)
 
                 // Reset the parser for the next version!
                 this.state = {input: this.state.input}
@@ -455,7 +458,7 @@ function parse_headers (input) {
     
     // Let's parse them!  First define some variables:
     var headers = {},
-        header_regex = /([\w-_]+):\s?(.*)\r?\n?/gy,  // Parses one line a time
+        header_regex = /(:?[\w-_]+):\s?(.*)\r?\n?/gy,  // Parses one line a time
         match,
         found_last_match = false
 

package/braid-http-server.js

@@ -63,17 +63,27 @@ ${patch.content}`
 }
 
 
-// This function reads num_patches in pseudoheader format from a
-// ReadableStream and then fires a callback when they're finished.
+// Deprecated method for legacy support
 function parse_patches (req, cb) {
+    parse_update(req, update => {
+        if (update.body)
+            // Return body as an "everything" patch
+            cb([{unit: 'everything', range: '', content: update.body}])
+        else
+            cb(update.patches)
+    })
+}
+
+// This function reads an update (either a set of patches, or a body) from a
+// ReadableStream and then fires a callback when finished.
+function parse_update (req, cb) {
     var num_patches = req.headers.patches
 
-    // Parse a request body as an "everything" patch
     if (!num_patches && !req.headers['content-range']) {
         var body = ''
         req.on('data', chunk => {body += chunk.toString()})
         req.on('end', () => {
-            cb([{unit: 'everything', range: '', content: body}])
+            cb({ body, patches: undefined })
         })
     }
 
@@ -95,7 +105,7 @@ function parse_patches (req, cb) {
         // Then return it
         req.on('end', () => {
             patches = [{unit, range, content: Buffer.concat(buffer).toString('utf8')}]
-            cb(patches)
+            cb({ patches, body: undefined })
         })
     }
 
@@ -108,7 +118,7 @@ function parse_patches (req, cb) {
         // We check to send send patches each time we parse one.  But if there
         // are zero to parse, we will never check to send them.
         if (num_patches === 0)
-            return cb([])
+            return cb({ patches: [], body: undefined })
 
         req.on('data', function parse (chunk) {
 
@@ -150,7 +160,7 @@ function parse_patches (req, cb) {
 
             // We got all the patches!  Pause the stream and tell the callback!
             req.pause()
-            cb(patches)
+            cb({ patches, body: undefined })
         })
         req.on('end', () => {
             // If the stream ends before we get everything, then return what we
@@ -195,6 +205,9 @@ function braidify (req, res, next) {
     // Add the braidly request/response helper methods
     res.sendUpdate = (stuff) => send_update(res, stuff, req.url, peer)
     res.sendVersion = res.sendUpdate
+    req.parseUpdate = () => new Promise(
+        (done, err) => parse_update(req, (update) => done(update))
+    )
     req.patches = () => new Promise(
         (done, err) => parse_patches(req, (patches) => done(patches))
     )

package/package.json

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

package/readme.md

@@ -129,7 +129,7 @@ async function connect () {
 Braidify adds these fields and methods to requests and responses:
 - `req.subscribe`
 - `req.startSubscription({onClose: cb})`
-- `await req.patches()`
+- `await req.parseUpdate()`
 - `res.sendUpdate()`
 
 Use it like this: