braid-http 1.3.60 → 1.3.62

package/README.md

@@ -37,7 +37,7 @@ npm install braid-http
 
 ```javascript
 // Import with require()
-require('braid-http').fetch       // A polyfill for require('node-fetch')
+require('braid-http').fetch       // A polyfill for fetch
 require('braid-http').http_client // A polyfill for require('http') clients
 require('braid-http').http_server // A polyfill for require('http') servers
 
@@ -285,10 +285,3 @@ fetch('https://localhost:3009/chat',
           x => console.log('Got ', x)
       )
 ```
-
-Note: the current version of `node-fetch` doesn't properly throw errors when a
-response connection dies, and thus you cannot attach a `.catch()` handler to
-automatically reconnect.  (See
-[issue #980](https://github.com/node-fetch/node-fetch/issues/980) and
-[#753](https://github.com/node-fetch/node-fetch/issues/753).)  We recommend
-using the `http` client on nodejs instead.

package/braid-http-client.js

@@ -122,7 +122,7 @@ var normal_fetch,
 
 if (is_nodejs) {
     // Nodejs
-    normal_fetch = fetch
+    normal_fetch = typeof fetch !== 'undefined' && fetch
 } else {
     // Web Browser
     normal_fetch = window.fetch
@@ -860,7 +860,7 @@ function get_binary_length(x) {
 function deep_copy(x) {
     if (x === null || typeof x !== 'object') return x
     if (Array.isArray(x)) return x.map(x => deep_copy(x))
-    if (Object.prototype.toString.call(x) === '[object Object]')
+    if (x.constructor === Object)
         return Object.fromEntries(Object.entries(x).map(([k, x]) => [k, deep_copy(x)]))
     return x
 }
@@ -882,7 +882,11 @@ async function promise_done(promise) {
 }
 
 function random_base64url(n) {
-    return [...crypto.getRandomValues(new Uint8Array(n))].map(x => 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'[x % 64]).join('')
+    var buf = new Uint8Array(n)
+    var crypt = (typeof crypto !== 'undefined') ? crypto : require('crypto')
+    var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'
+    return [...(crypt.webcrypto ?? crypt).getRandomValues(buf)].
+        map(x => chars[x % 64]).join('')
 }
 
 
@@ -949,7 +953,7 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
         if (!try_deleting.has(request)) {
             try_deleting.add(request)
             try {
-                var mux_was_done = await promise_done(mux_promise)
+                var mux_was_done = await promise_done(mux_created_promise)
 
                 var r = await braid_fetch(`${origin}/.well-known/multiplexer/${multiplexer}/${request}`, {
                     method: 'DELETE',
@@ -979,7 +983,10 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
         }
     }
 
-    var mux_promise = (async () => {
+    // This promise resolves when the create_multiplexer request responds.
+    //  - its value is undefined if successfully created
+    //  - its value is false if creation failed
+    var mux_created_promise = (async () => {
         // attempt to establish a multiplexed connection
         try {
             if (mux_params?.via === 'POST') throw 'skip multiplex method'
@@ -1039,7 +1046,7 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
 
         // if we already know the multiplexer is not working,
         // then fallback to normal fetch
-        if ((await promise_done(mux_promise)) && (await mux_promise) === false) {
+        if ((await promise_done(mux_created_promise)) && (await mux_created_promise) === false) {
             // if the user is specifically asking for multiplexing,
             // throw an error instead
             if (params.headers.get('multiplex-through')) throw new Error('multiplexer failed')
@@ -1105,7 +1112,7 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
 
         // do the underlying fetch
         try {
-            var mux_was_done = await promise_done(mux_promise)
+            var mux_was_done = await promise_done(mux_created_promise)
 
             // callback for testing
             mux_params?.onFetch?.(url, params)

package/braid-http-server.js

@@ -348,12 +348,14 @@ function braidify (req, res, next) {
         // find the multiplexer object (contains a response object)
         var m = braidify.multiplexers?.get(multiplexer)
         if (!m) {
+            req.is_multiplexer = res.is_multiplexer = true
             res.writeHead(424, 'Multiplexer no exist', {'Bad-Multiplexer': multiplexer})
             return res.end(`multiplexer ${multiplexer} does not exist`)
         }
 
         // if this request-id already exists, respond with an error
         if (m.requests.has(request)) {
+            req.is_multiplexer = res.is_multiplexer = true
             res.writeHead(409, 'Conflict', {'Content-Type': 'application/json'})
             return res.end(JSON.stringify({
                 error: 'Request already multiplexed',
@@ -621,7 +623,7 @@ async function send_update(res, data, url, peer) {
     // Validate body format
     if (body !== undefined) {
         assert(typeof body === 'string' || get_binary_length(body) != null)
-        if (body instanceof Blob) body = await body.arrayBuffer()
+        if (typeof Blob !== 'undefined' && body instanceof Blob) body = await body.arrayBuffer()
     }
 
     // Validate patches format
@@ -638,7 +640,8 @@ async function send_update(res, data, url, peer) {
             assert('content' in p)
             assert(typeof p.content === 'string'
                    || get_binary_length(p.content) != null)
-            if (p.content instanceof Blob) p.content = await p.content.arrayBuffer()
+            if (typeof Blob !== 'undefined' && p.content instanceof Blob)
+                p.content = await p.content.arrayBuffer()
         }
     }
 
@@ -708,7 +711,7 @@ async function send_update(res, data, url, peer) {
 function get_binary_length(x) {
     return  x instanceof ArrayBuffer ? x.byteLength :
             x instanceof Uint8Array ? x.length :
-            x instanceof Blob ? x.size :
+            typeof Blob !== 'undefined' && x instanceof Blob ? x.size :
             x instanceof Buffer ? x.length : undefined
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-http",
-  "version": "1.3.60",
+  "version": "1.3.62",
   "description": "An implementation of Braid-HTTP for Node.js and Browsers",
   "scripts": {
     "test": "node test/server.js"
@@ -19,15 +19,10 @@
     "require": "./index.js",
     "import": "./index.mjs"
   },
-  "browser": {
-    "node-web-streams": false,
-    "node-fetch": false,
-    "abort-controller": false
-  },
   "dependencies": {
-    "abort-controller": "^3.0.0",
-    "node-fetch": "^2.6.1",
-    "parse-headers": "^2.0.3",
-    "web-streams-node": "^0.4.0"
+    "parse-headers": "^2.0.3"
+  },
+  "devDependencies": {
+    "express": "^4.21.2"
   }
 }