braid-http 1.3.34 → 1.3.36

package/braid-http-client.js

@@ -308,12 +308,13 @@ async function braid_fetch (url, params = {}) {
 
                 // try multiplexing if either of these is true:
                 // - they explicitly want multiplexing
-                // - this is not the first subscription to the same origin
-                if (braid_fetch.use_multiplexing &&
+                // - we have already seen "after" subscriptions to the same origin
+                var mux_params = params.multiplexer ?? braid_fetch.multiplexer
+                if (mux_params &&
                     (params.headers.has('multiplexer') ||
                         (params.headers.has('subscribe') &&
-                            braid_fetch.subscription_counts?.[origin] > 1))) {
-                    res = await multiplex_fetch(url, params)
+                            braid_fetch.subscription_counts?.[origin] > (mux_params.after ?? 1)))) {
+                    res = await multiplex_fetch(url, params, mux_params)
                 } else {
                     res = await normal_fetch(url, params)
                 }
@@ -833,7 +834,7 @@ function parse_body (state) {
 // doesn't exist already, then performs a fetch providing the multiplexer header.
 // This tells the server to send the results to the given multiplexer.
 //
-async function multiplex_fetch(url, params) {
+async function multiplex_fetch(url, params, mux_params) {
     var origin = new URL(url, typeof document !== 'undefined' ? document.baseURI : undefined).origin
 
     // the mux_key is the same as the origin, unless it is being overriden
@@ -848,19 +849,17 @@ async function multiplex_fetch(url, params) {
 
         var streams = new Map()
         var mux_error = null
-        var using_multiplex_well_known_url = false
 
         var mux_promise = (async () => {
             // attempt to establish a multiplexed connection
             try {
-                if (params.use_multiplex_well_known_url) throw 'skip to trying header'
+                if (mux_params?.via && mux_params.via !== 'method') 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) {
                 // some servers don't like custom methods,
                 // so let's try with a custom header
                 try {
-                    using_multiplex_well_known_url = true
                     r = await braid_fetch(`${origin}/.well-known/multiplex/${multiplexer}`, {headers: {'Multiplex-Version': '0.0.1'}, retry: true})
 
                     if (!r.ok) throw new Error('status not ok: ' + r.status)
@@ -937,8 +936,8 @@ async function multiplex_fetch(url, params) {
                 stream_error = e
                 bytes_available()
                 try {
-                    var r = await braid_fetch(!using_multiplex_well_known_url ? `${origin}${params.headers.get('multiplexer')}` : `${origin}/.well-known/multiplex${params.headers.get('multiplexer')}`, {
-                        ...!using_multiplex_well_known_url && {method: 'MULTIPLEX'},
+                    var r = await braid_fetch(`${origin}/.well-known/multiplex${params.headers.get('multiplexer')}`, {
+                        method: 'DELETE',
                         headers: { 'Multiplex-Version': '0.0.1' }, retry: true
                     })
 

package/package.json

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