braid-http 1.3.27 → 1.3.29

package/braid-http-client.js

@@ -965,6 +965,11 @@ async function multiplex_fetch(url, params) {
                     throw new Error('multiplexer not yet connected')
                 }
 
+                // if the response says it's ok,
+                // but it's is not a multiplexed response,
+                // fall back to as if it was a normal fetch
+                if (res.ok && res.status !== 293) return res
+
                 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'))
@@ -1036,7 +1041,7 @@ async function multiplex_fetch(url, params) {
                 return res
             } catch (e) {
                 // if we had an error, be sure to unregister ourselves
-                await unset(e)
+                unset(e)
                 throw e
             }
         }

package/braid-http-server.js

@@ -277,22 +277,24 @@ function braidify (req, res, next) {
             return res.write(`\r\n`)
         } else {
             // in this case, we're closing the given stream
-            var m = braidify.multiplexers?.get(multiplexer)
 
             // if the multiplexer doesn't exist, send an error
+            var m = braidify.multiplexers?.get(multiplexer)
             if (!m) {
-                var msg = `multiplexer ${multiplexer} does not exist`
                 res.writeHead(400, {'Content-Type': 'text/plain'})
-                res.end(msg)
-                return
+                return res.end(`multiplexer /${multiplexer} does not exist`)
             }
 
-            // remove this stream, and notify it
+            // if the stream doesn't exist, send an error
             let s = m.streams.get(stream)
-            if (s) {
-                s()
-                m.streams.delete(stream)
-            } else m.streams.set(stream, 'abort')
+            if (!s) {
+                res.writeHead(400, {'Content-Type': 'text/plain'})
+                return res.end(`stream /${multiplexer}/${stream} does not exist`)
+            }
+
+            // remove this stream, and notify it
+            m.streams.delete(stream)
+            s()
 
             // let the requester know we succeeded
             res.writeHead(200, { 'Multiplex-Version': '0.0.1' })

package/package.json

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