braid-http 1.3.13 → 1.3.15

package/LICENSE.txt

@@ -0,0 +1,11 @@
+Invisible Property License
+
+   1. You have the right to use this IP for any purpose.
+   2. If you make profit, you agree to give back a fair share of the profit to
+      the creators of this IP.
+   3. The creators will tell you how much they think is a fair share, if your
+      usage matters to them, and promise not to take you to court to enforce
+      the agreement.
+
+(In other words, this license thus runs on the honor system.  You are invited
+to participate in our community with honor.)

package/braid-http-client.js

@@ -222,10 +222,11 @@ async function braid_fetch (url, params = {}) {
             () => underlying_aborter.abort()
         )
 
-    var waitTime = 10
+    var waitTime = 1
     var res = null
     var subscription_cb = null
     var subscription_error = null
+    var cb_running = false
 
     return await new Promise((done, fail) => {
         connect()
@@ -233,16 +234,20 @@ 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)
                 }
 
                 underlying_aborter.abort()
 
-                console.log(`retrying in ${waitTime}ms: ${url} after error: ${e}`)
-                setTimeout(connect, waitTime)
-                waitTime = Math.min(waitTime * 2, 3000)
+                console.log(`retrying in ${waitTime}s: ${url} after error: ${e}`)
+                setTimeout(connect, waitTime * 1000)
+                waitTime = Math.min(waitTime + 1, 3)
             }
 
             try {
@@ -313,7 +318,9 @@ async function braid_fetch (url, params = {}) {
                                 if (original_signal?.aborted) throw new DOMException('already aborted', 'AbortError')
 
                                 // Yay!  We got a new version!  Tell the callback!
+                                cb_running = true
                                 cb(result)
+                                cb_running = false
                             } else
                                 // This error handling code runs if the connection
                                 // closes, or if there is unparseable stuff in the
@@ -399,7 +406,7 @@ async function braid_fetch (url, params = {}) {
                 done(res)
 
                 params?.retry?.onRes?.(res)
-                waitTime = 10
+                waitTime = 1
             } catch (e) { on_error(e) }
         }
     })

package/package.json

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