braid-http 1.3.33 → 1.3.35

package/braid-http-client.js

@@ -848,7 +848,6 @@ 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
@@ -860,7 +859,6 @@ async function multiplex_fetch(url, params) {
                 // 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 +935,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/braid-http-server.js

@@ -313,20 +313,12 @@ function braidify (req, res, next) {
         // parse the multiplexer id and stream id from the url
         var [multiplexer, stream] = req.headers.multiplexer.slice(1).split('/')
 
-        var end_things = (msg) => {
-            // 422 = Unprocessable Entity (but good syntax!)
-            res.writeHead(422, {Multiplexer: req.headers.multiplexer})
-            res.end(msg)
-        }
-
         // find the multiplexer object (contains a response object)
         var m = braidify.multiplexers?.get(multiplexer)
-        if (!m) return end_things(`multiplexer ${multiplexer} does not exist`)
-
-        // special case: check that this stream isn't already aborted
-        if (m.streams.get(stream) === 'abort') {
-            m.streams.delete(stream)
-            return end_things(`multiplexer stream ${req.headers.multiplexer} already aborted`)
+        if (!m) {
+            // 422 = Unprocessable Entity (but good syntax!)
+            res.writeHead(422, {Multiplexer: `/${multiplexer}`})
+            res.end(`multiplexer ${multiplexer} does not exist`)
         }
 
         // let the requester know we've multiplexed their response

package/package.json

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