braid-http 1.3.71 → 1.3.73

package/braid-http-client.js

@@ -232,7 +232,6 @@ async function braid_fetch (url, params = {}) {
     var res = null
     var subscription_cb = null
     var subscription_error = null
-    var cb_running = false
 
     // Multiplexing book-keeping;
     // basically, if the user tries to make two or more subscriptions to the same origin,
@@ -267,9 +266,7 @@ async function braid_fetch (url, params = {}) {
                 // see if we should retry..
                 var retry = params.retry &&    // only try to reconnect if the user has chosen to
                     e.name !== "AbortError" && // don't retry if the user has chosen to abort
-                    !e.dont_retry &&           // some errors are unlikely to be fixed by retrying
-                    !cb_running                // if an error is thrown in the callback,
-                                               // then it may not be good to reconnect, and generate more errors
+                    !e.dont_retry              // some errors are unlikely to be fixed by retrying
 
                 if (retry && !original_signal?.aborted) {
                     // retry after some time..
@@ -347,8 +344,9 @@ async function braid_fetch (url, params = {}) {
                         }
                     }
 
-                    if (!res.ok)
-                        throw new Error('Request returned not ok status:', res.status)
+                    if (res.status !== 209) {
+                        throw new Error(`Got unexpected subscription status code: ${res.status}. Expected 209.`)
+                    }
 
                     if (res.bodyUsed)
                         // TODO: check if this needs a return
@@ -367,9 +365,15 @@ async function braid_fetch (url, params = {}) {
                                     throw create_error('already aborted', {name: 'AbortError'})
 
                                 // Yay!  We got a new version!  Tell the callback!
-                                cb_running = true
-                                await cb(result)
-                                cb_running = false
+                                try {
+                                    await cb(result)
+                                } catch (e) {
+                                    // This error is happening in the users code,
+                                    // so retrying the connection
+                                    // will probably still fail
+                                    e.dont_retry = true
+                                    throw e
+                                }
                             } else
                                 // This error handling code runs if the connection
                                 // closes, or if there is unparseable stuff in the

package/package.json

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