braid-http 1.3.97 → 1.3.99

package/braid-http-client.js

@@ -1086,7 +1086,8 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
     var mux_created_promise = (async () => {
         // attempt to establish a multiplexed connection
         try {
-            if (mux_params?.via === 'POST'
+            // Disable MULTIPLEX method for now — go straight to POST
+            if (true || mux_params?.via === 'POST'
                 || multiplex_fetch.post_only?.has(origin)) throw 'skip multiplex method'
             var r = await braid_fetch(`${origin}/${multiplexer}`, {
                 signal: mux_aborter.signal,
@@ -1137,7 +1138,7 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
         // and send messages to the appropriate requests
         parse_multiplex_stream(r.body.getReader(), async (request, bytes) => {
             if (requests.has(request)) requests.get(request)(bytes)
-            else try_deleting_request(request)
+            else try_deleting_request(request).catch(e => {})
         }, e => cleanup_multiplexer(e))
     })()
 

package/braid-http-server.js

@@ -220,6 +220,43 @@ function parse_content_range (range_string) {
     return [unit, range]
 }
 
+
+// Guard against double-braidification.
+//
+// Libraries (like braid-text &braid-blob) call braidify on the same
+// request/response.  We can't let it run twice on the same request.  That can
+// cause e.g. duplicate multiplexer request-id errors (409).
+var braidify_version = require('./package.json').version
+var warned_about_braidify_dupe = false
+function warn_braidify_dupe (req) {
+    function version_bigger (a, b) {
+        var pa = a.split('.').map(Number)
+        var pb = b.split('.').map(Number)
+        for (var i = 0; i < Math.max(pa.length, pb.length); i++) {
+            if ((pa[i] || 0) > (pb[i] || 0)) return true
+            if ((pa[i] || 0) < (pb[i] || 0)) return false
+        }
+        return false
+    }
+
+    if (!warned_about_braidify_dupe) {
+        var installed = req._braidified
+        var major_mismatch = installed.split('.')[0] !== braidify_version.split('.')[0]
+        var dominated = version_bigger(braidify_version, installed)
+
+        if (major_mismatch || dominated)
+            console.warn('braid-http: braidify already applied (v' + installed
+                         + '), skipping v' + braidify_version
+                         + (major_mismatch
+                            ? ' — major version mismatch, things may break'
+                            : ' — installed version is older, may lack features'))
+
+        warned_about_braidify_dupe = true
+    }
+}
+
+
+// The main server function!
 function braidify (req, res, next) {
     if (typeof req === 'function') {
         var handler = req
@@ -227,6 +264,15 @@ function braidify (req, res, next) {
             braidify(req, res, () => handler(req, res, next))
     }
 
+
+    // Guard against double-braidification.
+    if (req._braidified) {
+        warn_braidify_dupe(req)
+        return next?.()
+    }
+
+    req._braidified = braidify_version
+
     // console.log('\n## Braidifying', req.method, req.url, req.headers.peer)
 
     // Prevent uncaught EPIPE crashes on client disconnect

package/package.json

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