braid-http 0.3.3 → 0.3.5

package/braid-http-client.js

@@ -1,11 +1,10 @@
-var peer = Math.random().toString(36).substr(2)
+// var peer = Math.random().toString(36).substr(2)
 
 // ***************************
 // http
 // ***************************
 
 function braidify_http (http) {
-    // Todo:  Wrap .put to add `peer` header
     http.normal_get = http.get
     http.get = function braid_req (arg1, arg2, arg3) {
         var url, options, cb
@@ -45,8 +44,8 @@ function braidify_http (http) {
         if (options.subscribe)
             options.headers.subscribe = 'true'
 
-        // Always add the `peer` header
-        options.headers.peer = options.headers.peer || peer
+        // // Always add the `peer` header
+        // options.headers.peer = options.headers.peer || peer
 
         // Wrap the callback to provide our new .on('update', ...) feature
         // on nodejs servers
@@ -158,8 +157,8 @@ async function braid_fetch (url, params = {}) {
         console.assert(Array.isArray(params.parents),
                        'fetch(): `parents` must be an array')
 
-    // Always set the peer
-    params.headers.set('peer', peer)
+    // // Always set the peer
+    // params.headers.set('peer', peer)
 
     // We provide some shortcuts for Braid params
     if (params.version)
@@ -168,6 +167,8 @@ async function braid_fetch (url, params = {}) {
         params.headers.set('parents', params.parents.map(JSON.stringify).join(', '))
     if (params.subscribe)
         params.headers.set('subscribe', 'true')
+    if (params.peer)
+        params.header.set('peer', params.peer)
 
     // Prevent browsers from going to disk cache
     params.cache = 'no-cache'
@@ -323,25 +324,24 @@ async function handle_fetch_stream (stream, cb) {
     while (true) {
         var versions = []
 
+        // Read the next chunk of stream!
         try {
-            // Read the next chunk of stream!
             var {done, value} = await reader.read()
-
-            // Check if this connection has been closed!
-            if (done) {
-                console.debug("Connection closed.")
-                cb(null, 'Connection closed')
-                return
-            }
-
-            // Tell the parser to process some more stream
-            parser.read(decoder.decode(value))
         }
-
         catch (e) {
             cb(null, e)
             return
         }
+
+        // Check if this connection has been closed!
+        if (done) {
+            console.debug("Connection closed.")
+            cb(null, 'Connection closed')
+            return
+        }
+
+        // Tell the parser to process some more stream
+        parser.read(decoder.decode(value))
     }
 }
 
@@ -367,9 +367,16 @@ var subscription_parser = (cb) => ({
 
         // Now loop through the input and parse until we hit a dead end
         while (this.state.input.trim() !== '') {
-            this.state = parse_update (this.state)
 
-            // Maybe we parsed a version!  That's cool!
+            // Try to parse an update
+            try {
+                this.state = parse_update (this.state)
+            } catch (e) {
+                this.cb(null, e)
+                return
+            }
+
+            // Maybe we parsed an update!  That's cool!
             if (this.state.result === 'success') {
                 this.cb({
                     version: this.state.version,

package/package.json

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