braid-http 1.3.56 → 1.3.58

package/braid-http-client.js

@@ -985,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()
@@ -1002,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.
@@ -245,16 +251,23 @@ function braidify (req, res, next) {
     // Multiplexer stuff
     var multiplex_version = '1.0'
     if ((braidify.enable_multiplex ?? true) &&
-        (req.method === 'MULTIPLEX' || req.url.startsWith('/.well-known/multiplexer/')) &&
-        req.headers['multiplex-version'] === multiplex_version) {
-
-        // let the caller know we're handling things
-        req.is_multiplexer = res.is_multiplexer = true
+        (req.method === 'MULTIPLEX' || req.url.startsWith('/.well-known/multiplexer/'))) {
 
         // free the cors
         res.setHeader("Access-Control-Allow-Origin", "*")
         res.setHeader("Access-Control-Allow-Methods", "*")
         res.setHeader("Access-Control-Allow-Headers", "*")
+        res.setHeader("Access-Control-Expose-Headers", "*")
+        if (req.method === 'OPTIONS') return res.end()
+
+        // check the multiplexing protocol version
+        if (req.headers['multiplex-version'] !== multiplex_version) {
+            res.writeHead(400, 'Bad Multiplexer Version')
+            return res.end()
+        }
+
+        // let the caller know we're handling things
+        req.is_multiplexer = res.is_multiplexer = true
 
         // parse the multiplexer id and request id from the url
         var [multiplexer, request] = req.url.split('/').slice(req.method === 'MULTIPLEX' ? 1 : 3)
@@ -287,7 +300,7 @@ function braidify (req, res, next) {
             res.writeHead(200, 'OK', {
                 'Multiplex-Version': multiplex_version,
                 'Incremental': '?1',
-                'Cache-Control': 'no-cache',
+                'Cache-Control': 'no-store',
                 'X-Accel-Buffering': 'no',
                 ...req.httpVersion !== '2.0' && {'Connection': 'keep-alive'}
             })
@@ -367,7 +380,7 @@ function braidify (req, res, next) {
 
             // copy any CORS headers from the user
             var cors_headers = Object.entries(res2.getHeaders()).
-                filter(x => braidify.cors_headers.has(x.key))
+                filter(x => braidify.cors_headers.has(x[0]))
 
             if (og_stream) {
                 og_stream.respond({
@@ -434,6 +447,10 @@ function braidify (req, res, next) {
         // we want to send a special message to the multiplexer saying so
         res2.on('finish', () => m.res.write(`close response ${request}\r\n`))
 
+        // copy over any headers which have already been set on res to res2
+        for (let x of Object.entries(res.getHeaders()))
+            res2.setHeader(...x)
+
         // we want access to "res" to be forwarded to our fake "res2",
         // so that it goes into the multiplexer
         function* get_props(obj) {

package/package.json

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