braid-http 1.3.22 → 1.3.24

package/braid-http-client.js

@@ -845,44 +845,62 @@ async function multiplex_fetch(url, params) {
         // make up a new multiplexer id (unless it is being overriden)
         var multiplexer = params.headers.get('multiplexer')?.split('/')[1] ?? Math.random().toString(36).slice(2)
 
-        // attempt to establish a multiplexed connection
-        try {
-            if (params.use_multiplex_header) throw 'skip to trying header'
-            var r = await braid_fetch(`${origin}/${multiplexer}`, {method: 'MULTIPLEX', retry: true})
-        } catch (e) {
-            // some servers don't like custom methods,
-            // so let's try with a custom header
+        var streams = new Map()
+        var mux_error = null
+        var using_multiplex_header = false
+
+        var mux_promise = (async () => {
+            // attempt to establish a multiplexed connection
             try {
-                var using_multiplex_header = true
-                r = await braid_fetch(`${origin}/${multiplexer}`, {headers: {MULTIPLEX: true}, retry: true})
+                if (params.use_multiplex_header) throw 'skip to trying header'
+                var r = await braid_fetch(`${origin}/${multiplexer}`, {method: 'MULTIPLEX', headers: {'Multiplex-Version': '0.0.1'}, retry: true})
+                if (!r.ok || r.headers.get('Multiplex-Version') !== '0.0.1') throw 'bad'
             } catch (e) {
-                // fallback to normal fetch if multiplexed connection fails
-                console.error(`Could not establish multiplexed connection.\nGot error: ${e}.\nFalling back to normal connection.`)
-                return (url, params) => normal_fetch(url, params)
+                // some servers don't like custom methods,
+                // so let's try with a custom header
+                try {
+                    using_multiplex_header = true
+                    r = await braid_fetch(`${origin}/${multiplexer}`, {headers: {Multiplex: true, 'Multiplex-Version': '0.0.1'}, retry: true})
+
+                    if (!r.ok) throw new Error('status not ok: ' + r.status)
+                    if (r.headers.get('Multiplex-Version') !== '0.0.1') throw new Error('wrong multiplex version: ' + r.headers.get('Multiplex-Version') + ', expected 0.0.1')
+                } catch (e) {
+                    // fallback to normal fetch if multiplexed connection fails
+                    console.error(`Could not establish multiplexed connection.\nGot error: ${e}.\nFalling back to normal connection.`)
+                    return false
+                }
             }
-        }
 
-        // parse the multiplexed stream,
-        // and send messages to the appropriate streams
-        var streams = new Map()
-        var mux_error = null
-        parse_multiplex_stream(r.body.getReader(), (stream, bytes) => {
-            streams.get(stream)?.(bytes)
-        }, e => {
-            // the multiplexer stream has died.. let everyone know..
-            mux_error = e
-            for (var f of streams.values()) f()
-            delete multiplex_fetch.multiplexers[mux_key]
-        })
+            // parse the multiplexed stream,
+            // and send messages to the appropriate streams
+            parse_multiplex_stream(r.body.getReader(), (stream, bytes) => {
+                streams.get(stream)?.(bytes)
+            }, e => {
+                // the multiplexer stream has died.. let everyone know..
+                mux_error = e
+                for (var f of streams.values()) f()
+                delete multiplex_fetch.multiplexers[mux_key]
+            })
+        })()
 
         // return a "fetch" for this multiplexer
         return async (url, params) => {
+            // maybe wait for multiplexer to be connected..
+            if (!params.experimental_do_not_wait_for_multiplexer) {
+                if ((await mux_promise) === false) {
+                    // it failed to connect the multiplexer,
+                    // so fallback to normal fetch
+                    return await normal_fetch(url, params)
+                }
+            }
+
             // make up a new stream id (unless it is being overriden)
             var stream = params.headers.get('multiplexer')?.split('/')[2] ?? Math.random().toString(36).slice(2)
 
             // add the multiplexer header without affecting the underlying params
             var mux_headers = new Headers(params.headers)
-            mux_headers.set('multiplexer', `/${multiplexer}/${stream}`)
+            mux_headers.set('Multiplexer', `/${multiplexer}/${stream}`)
+            mux_headers.set('Multiplex-Version', '0.0.1')
             params = {...params, headers: mux_headers}
 
             // setup a way to receive incoming data from the multiplexer
@@ -920,9 +938,18 @@ async function multiplex_fetch(url, params) {
                 stream_error = e
                 bytes_available()
                 try {
-                    await braid_fetch(`${origin}${params.headers.get('multiplexer')}`, {...using_multiplex_header ? {headers: {MULTIPLEX: true}} : {method: 'MULTIPLEX'}, retry: true})
+                    var r = await braid_fetch(`${origin}${params.headers.get('multiplexer')}`, {
+                        ...!using_multiplex_header && {method: 'MULTIPLEX'},
+                        headers: {
+                            ...using_multiplex_header && {Multiplex: true},
+                            'Multiplex-Version': '0.0.1'
+                        }, retry: true})
+
+                    if (!r.ok) throw new Error('status not ok: ' + r.status)
+                    if (r.headers.get('Multiplex-Version') !== '0.0.1') throw new Error('wrong multiplex version: ' + r.headers.get('Multiplex-Version') + ', expected 0.0.1')
                 } catch (e) {
-                    console.error(`Could not cancel multiplexed connection:`, e)
+                    e = new Error(`Could not cancel multiplexed connection: ${e}`)
+                    console.error('' + e)
                     throw e
                 }
             }
@@ -930,7 +957,17 @@ async function multiplex_fetch(url, params) {
             // do the underlying fetch
             try {
                 var res = await normal_fetch(url, params)
-                if (res.status !== 293) throw new Error('Could not establish multiplexed stream ' + params.headers.get('multiplexer') + ' got status: ' + res.status)
+
+                if (params.experimental_do_not_wait_for_multiplexer &&
+                    res.status === 422 &&
+                    !(await promise_done(mux_promise))) {
+                    // this error will trigger a retry if the user is using that
+                    throw new Error('multiplexer not yet connected')
+                }
+
+                if (res.status !== 293) throw new Error('Could not establish multiplexed stream ' + params.headers.get('multiplexer') + ', got status: ' + res.status)
+
+                if (res.headers.get('Multiplex-Version') !== '0.0.1') throw new Error('Could not establish multiplexed stream ' + params.headers.get('multiplexer') + ', got unknown version: ' + res.headers.get('Multiplex-Version'))
 
                 // we want to present the illusion that the connection is still open,
                 // and therefor closable with "abort",
@@ -1134,6 +1171,12 @@ function create_abort_error(msg) {
     return e
 }
 
+async function promise_done(promise) {
+    var pending = {}
+    var ret = await Promise.race([promise, Promise.resolve(pending)])
+    return ret !== pending
+}
+
 // ****************************
 // Exports
 // ****************************

package/braid-http-server.js

@@ -243,7 +243,10 @@ function braidify (req, res, next) {
     req.subscribe = subscribe
 
     // Multiplexer stuff
-    if (braidify.use_multiplexing && (req.method === 'MULTIPLEX' || req.headers.multiplex)) {
+    if (braidify.use_multiplexing &&
+        (req.method === 'MULTIPLEX' || req.headers.multiplex) &&
+        req.headers['multiplex-version'] === '0.0.1') {
+
         // parse the multiplexer id and stream id from the url
         var [multiplexer, stream] = req.url.slice(1).split('/')
 
@@ -263,6 +266,7 @@ function braidify (req, res, next) {
             // keep the connection open,
             // so people can send multiplexed data to it
             res.writeHead(200, {
+                'Multiplex-Version': '0.0.1',
                 'Cache-Control': 'no-cache',
                 'X-Accel-Buffering': 'no',
                 ...req.httpVersion !== '2.0' && {'Connection': 'keep-alive'}
@@ -290,8 +294,11 @@ function braidify (req, res, next) {
                 m.streams.delete(stream)
             } else m.streams.set(stream, 'abort')
 
+            console.log('got here....!!!!')
+
+
             // let the requester know we succeeded
-            res.writeHead(200, {})
+            res.writeHead(200, { 'Multiplex-Version': '0.0.1' })
             return res.end(``)
         }
     }
@@ -299,12 +306,15 @@ function braidify (req, res, next) {
     // a multiplexer header means the user wants to send the
     // results of this request to the provided multiplexer,
     // tagged with the given stream id
-    if (braidify.use_multiplexing && req.headers.multiplexer) {
+    if (braidify.use_multiplexing &&
+        req.headers.multiplexer &&
+        req.headers['multiplex-version'] === '0.0.1') {
+
         // parse the multiplexer id and stream id from the url
         var [multiplexer, stream] = req.headers.multiplexer.slice(1).split('/')
 
         var end_things = (msg) => {
-            res.statusCode = 400
+            res.statusCode = 422 // Unprocessable Entity (but good syntax!)
             res.end(msg)
         }
 
@@ -319,7 +329,10 @@ function braidify (req, res, next) {
         }
 
         // let the requester know we've multiplexed their response
-        res.writeHead(293, {multiplexer: req.headers.multiplexer})
+        res.writeHead(293, {
+            multiplexer: req.headers.multiplexer,
+            'Multiplex-Version': '0.0.1'
+        })
         res.end('Ok.')
 
         // and now set things up so that future use of the

package/package.json

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