braid-http 1.3.105 → 1.3.106

package/README.md

@@ -165,7 +165,7 @@ for await (var update of subscription_iterator) {
 
 You can braidify your nodejs server with:
 
-```
+```javascript
 var braidify = require('braid-http').http_server
 ```
 
@@ -344,19 +344,19 @@ fetch('https://localhost:3009/chat',
 
 Run all tests from the command line:
 
-```
+```bash
 npm test
 ```
 
 Run tests in a browser (auto-opens):
 
-```
+```bash
 npm run test:browser
 ```
 
 You can also filter tests by name:
 
-```
+```bash
 node test/test.js --filter="version"
 ```
 
@@ -369,7 +369,7 @@ the scenes to overcome web browsers' 6-connection limit (with HTTP/1) and
 the recommended ways, you don't need to know it's happening — the abstraction
 is completely transparent.
 
-```
+```javascript
 // Recommendation #1: Wrapping the entire request handler
 require('http').createServer(
   braidify((req, res) => {
@@ -378,18 +378,22 @@ require('http').createServer(
 )
 ```
 
-```
+```javascript
 // Recommendation #2: As middleware
 var app = require('express')()
 app.use(braidify)
 ```
 
-```
+```javascript
 // Recommendation #3: With braidify(req, res, next)
 // (Equivalent to the middleware form.)
-   ...
-   braidify(req, res, next)
-   ...
+app.use(
+  (req, res, next) => {
+    ...
+    braidify(req, res, next)
+    ...
+  }
+)
 ```
 
 
@@ -397,14 +401,16 @@ app.use(braidify)
 
 If you are using braidify from within a library, or in another context without
 access to the entire request handler, or a `next()` method, then you can use
-the inline form:
+the inline `braidify(req, res)` form:
 
-```
+```javascript
+require('http').createServer(
   (req, res) => {
-      ...
-      braidify(req, res); if (req.is_multiplexer) return
-      ...
-  })
+    ...
+    braidify(req, res); if (req.is_multiplexer) return
+    ...
+  }
+)
 ```
 
 Just know that there are three abstraction leaks when using this form:

package/braid-http-server.js

@@ -649,9 +649,19 @@ function braidify (req, res, next) {
             res.isSubscription = true
 
             // Let's disable the timeouts (if it exists)
-            if (req.socket.server)
+            if (req.socket.server) {
                 req.socket.server.timeout = 0.0
 
+                // Node 18+ added requestTimeout (default 300s) and
+                // headersTimeout (default 60s) which will kill idle
+                // long-lived connections — our bread and butter.  We disable
+                // the requestTimeout, but the headersTimeout is probably
+                // fine.
+                //
+                req.socket.server.requestTimeout = 0
+                // req.socket.server.headersTimeout = 0
+            }
+
             // We have a subscription!
             res.statusCode = 209
             res.statusMessage = 'Multiresponse'
@@ -753,12 +763,12 @@ async function send_update(res, data, url, peer) {
     // Validate the body and patches
     assert(!(patch && patches),
            'sendUpdate: cannot have both `update.patch` and `update.patches` set')
-    if (patch)
-        patches = [patch]
     assert(!(body && patches),
            'sendUpdate: cannot have both `update.body` and `update.patch(es)')
     assert(!patches || Array.isArray(patches),
            'sendUpdate: `patches` provided is not array')
+    if (patch)
+        patches = patch
 
     // Validate body format
     if (body !== undefined) {

package/package.json

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