braid-http 1.3.12 → 1.3.14

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

@@ -116,22 +116,11 @@ function braidify_http (http) {
 // ***************************
 
 var normal_fetch,
-    AbortController,
-    Headers,
     is_nodejs = typeof window === 'undefined'
 
 if (is_nodejs) {
     // Nodejs
-
-    // Note that reconnect logic doesn't work in node-fetch, because it
-    // doesn't call the .catch() handler when the stream fails.
-    //
-    // See https://github.com/node-fetch/node-fetch/issues/753
-
-    normal_fetch = require('node-fetch')
-    AbortController = require('abort-controller')
-    Headers = normal_fetch.Headers
-    var to_whatwg_stream = require('web-streams-node').toWebReadableStream
+    normal_fetch = fetch
 } else {
     // Web Browser
     normal_fetch = window.fetch
@@ -233,7 +222,7 @@ 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
@@ -251,9 +240,9 @@ async function braid_fetch (url, params = {}) {
 
                 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 {
@@ -410,7 +399,7 @@ async function braid_fetch (url, params = {}) {
                 done(res)
 
                 params?.retry?.onRes?.(res)
-                waitTime = 10
+                waitTime = 1
             } catch (e) { on_error(e) }
         }
     })
@@ -418,9 +407,6 @@ async function braid_fetch (url, params = {}) {
 
 // Parse a stream of versions from the incoming bytes
 async function handle_fetch_stream (stream, cb, on_bytes) {
-    if (is_nodejs)
-        stream = to_whatwg_stream(stream)
-
     // Set up a reader
     var reader = stream.getReader(),
         parser = subscription_parser(cb)

package/package.json

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