braid-http 1.3.14 → 1.3.16

package/braid-http-client.js

@@ -64,16 +64,19 @@ function braidify_http (http) {
                     on_update = f
 
                     // And set up a subscription parser
-                    var parser = subscription_parser((update, error) => {
+                    var parser = subscription_parser(async (update, error) => {
                         if (!error)
-                            on_update && on_update(update)
+                            on_update && (await on_update(update))
                         else
                             on_error && on_error(error)
                     })
 
                     // That will run each time we get new data
+                    var chain = Promise.resolve()
                     res.orig_on('data', (chunk) => {
-                        parser.read(chunk)
+                        chain = chain.then(async () => {
+                            await parser.read(chunk)
+                        })
                     })
                 }
 
@@ -226,6 +229,7 @@ async function braid_fetch (url, params = {}) {
     var res = null
     var subscription_cb = null
     var subscription_error = null
+    var cb_running = false
 
     return await new Promise((done, fail) => {
         connect()
@@ -233,7 +237,11 @@ async function braid_fetch (url, params = {}) {
             let on_error = e => {
                 on_error = () => {}
 
-                if (!params.retry || e.name === "AbortError" || e.startsWith?.('Parse error in headers')) {
+                if (!params.retry || 
+                    e.name === "AbortError" || 
+                    e.startsWith?.('Parse error in headers') ||
+                    cb_running) {
+
                     subscription_error?.(e)
                     return fail(e)
                 }
@@ -307,13 +315,15 @@ async function braid_fetch (url, params = {}) {
 
                         // Each time something happens, we'll either get a new
                         // version back, or an error.
-                        (result, err) => {
+                        async (result, err) => {
                             if (!err) {
                                 // check whether we aborted
                                 if (original_signal?.aborted) throw new DOMException('already aborted', 'AbortError')
 
                                 // Yay!  We got a new version!  Tell the callback!
-                                cb(result)
+                                cb_running = true
+                                await cb(result)
+                                cb_running = false
                             } else
                                 // This error handling code runs if the connection
                                 // closes, or if there is unparseable stuff in the
@@ -419,21 +429,21 @@ async function handle_fetch_stream (stream, cb, on_bytes) {
             var {done, value} = await reader.read()
         }
         catch (e) {
-            cb(null, e)
+            await cb(null, e)
             return
         }
 
         // Check if this connection has been closed!
         if (done) {
             console.debug("Connection closed.")
-            cb(null, 'Connection closed')
+            await cb(null, 'Connection closed')
             return
         }
 
         on_bytes?.(value)
 
         // Tell the parser to process some more stream
-        parser.read(value)
+        await parser.read(value)
     }
 }
 
@@ -452,7 +462,7 @@ var subscription_parser = (cb) => ({
 
     // You give it new input information as soon as you get it, and it will
     // report back with new versions as soon as it finds them.
-    read (input) {
+    async read (input) {
 
         // Store the new input!
         for (let x of input) this.state.input.push(x)
@@ -464,7 +474,7 @@ var subscription_parser = (cb) => ({
             try {
                 this.state = parse_update (this.state)
             } catch (e) {
-                this.cb(null, e)
+                await this.cb(null, e)
                 return
             }
 
@@ -496,9 +506,9 @@ var subscription_parser = (cb) => ({
                 }
 
                 try {
-                    this.cb(update)
+                    await this.cb(update)
                 } catch (e) {
-                    this.cb(null, e)
+                    await this.cb(null, e)
                     return
                 }
 
@@ -508,7 +518,7 @@ var subscription_parser = (cb) => ({
 
             // Or maybe there's an error to report upstream
             else if (this.state.result === 'error') {
-                this.cb(null, this.state.message)
+                await this.cb(null, this.state.message)
                 return
             }
 

package/package.json

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