braid-http 1.3.55 → 1.3.57

package/braid-http-client.js

@@ -947,12 +947,23 @@ 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 r = await braid_fetch(`${origin}/.well-known/multiplexer/${multiplexer}/${request}`, {
                     method: 'DELETE',
                     headers: { 'Multiplex-Version': multiplex_version },
                     retry: true
                 })
 
+                // if we know the multiplexer was created,
+                // but it isn't there now,
+                // and our client doesn't realize it,
+                // then shut it down ourselves
+                if (r.status === 404 && r.headers.get('Bad-Multiplexer')
+                    && mux_was_done && !mux_error) {
+                    cleanup_multiplexer(new Error('multiplexer detected to be closed'))
+                }
+
                 if (!r.ok) throw new Error('status not ok: ' + r.status)
                 if (r.headers.get('Multiplex-Version') !== multiplex_version)
                     throw new Error('wrong multiplex version: '
@@ -974,7 +985,8 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
                 signal: mux_aborter.signal,
                 method: 'MULTIPLEX',
                 headers: {'Multiplex-Version': multiplex_version},
-                retry: true
+                retry: true,
+                multiplex: false
             })
             if (r.status === 409) {
                 var e = await r.json()
@@ -991,7 +1003,8 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
                                         {method: 'POST',
                                         signal: mux_aborter.signal,
                                         headers: {'Multiplex-Version': multiplex_version},
-                                        retry: true})
+                                        retry: true,
+                                        multiplex: false})
                 if (r.status === 409) {
                     var e = await r.json()
                     if (e.error === 'Multiplexer already exists')

package/braid-http-server.js

@@ -221,6 +221,12 @@ function parse_content_range (range_string) {
 }
 
 function braidify (req, res, next) {
+    if (typeof req === 'function') {
+        var handler = req
+        return (req, res, next) =>
+            braidify(req, res, () => handler(req, res, next))
+    }
+
     // console.log('\n## Braidifying', req.method, req.url, req.headers.peer)
 
     // First, declare that we support Patches and JSON ranges.

package/package.json

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