braid-http 1.3.83 → 1.3.85

package/README.md

@@ -48,10 +48,11 @@ import {fetch, http_client, http_server} from 'braid-http'
 ## Using it in Browsers
 
 This library adds a `{subscribe: true}` option to `fetch()`, and lets you
-access the result of a subscription with two new fields on the fetch response:
+access the result of a subscription with these new fields on the fetch response:
 
 - `response.subscribe( update => ... )`
 - `response.subscription`: an iterator that can be used with `for await`
+- `response.version`: the parsed version from the response headers (if present)
 
 ### Example Subscription with Promises
 
@@ -363,23 +364,43 @@ nbraidify.enable_multiplex = true   // or false
 
 ## Test Procedure
 
-Using 3 terminals, in first terminal start the demo chat server:
+Run tests from the command line:
+
+```
+node test/test.js
+```
+
+Or run tests in a browser by starting the test server:
+
+```
+node test/test.js --browser
+```
+
+Then open https://localhost:9000 and make sure all the boxes turn green.
+
+You can also filter tests by name:
+
+```
+node test/test.js --filter="version"
+```
+
+For the complete browser test (including demos), use 3 terminals. In the first terminal start the demo chat server:
 
 ```
 cd demos/chat
 node server.js
 ```
 
-in second terminal start the demo blog server:
+In the second terminal start the demo blog server:
 ```
 cd demos/blog
 node server.js
 ```
 
-and in third and final terminal, start the test server:
+And in the third terminal, start the test server:
 ```
-node test/server.js
+node test/test.js --browser
 ```
 
-now open https://localhost:9000, and make sure all the boxes turn green, and try out the demo chat and blog, sending a message in each.
+Now open https://localhost:9000, make sure all the boxes turn green, and try out the demo chat and blog, sending a message in each.
 

package/braid-http-client.js

@@ -336,6 +336,7 @@ async function braid_fetch (url, params = {}) {
                         if (isFinite(heartbeats)) {
                             let timeout = null
                             on_heartbeat = () => {
+                                params.heartbeat_cb?.()
                                 clearTimeout(timeout)
                                 let wait_seconds = 1.2 * heartbeats + 3
                                 timeout = setTimeout(() => {
@@ -471,6 +472,11 @@ async function braid_fetch (url, params = {}) {
                 params?.retry?.onRes?.(res)
                 waitTime = 1
 
+                // parse version if it exists
+                var version_header = res.headers.get('version') || res.headers.get('current-version')
+                if (version_header)
+                    try { res.version = JSON.parse('[' + version_header + ']') } catch (e) { console.log('error parsing version: ' + version_header) }
+
                 done(res)
             } catch (e) { on_error(e) }
         }
@@ -643,7 +649,7 @@ function parse_update (state) {
 }
 
 // Parsing helpers
-function parse_headers (input, check_for_encoding_blocks) {
+function parse_headers (input, check_for_encoding_blocks, dont_parse_special_headers) {
 
     // Find the start of the headers
     var start = 0
@@ -738,12 +744,14 @@ function parse_headers (input, check_for_encoding_blocks) {
         }
 
     // Success!  Let's parse special headers
-    if ('version' in headers)
-        headers.version = JSON.parse('['+headers.version+']')
-    if ('parents' in headers)
-        headers.parents = JSON.parse('['+headers.parents+']')
-    if ('patches' in headers)
-        headers.patches = JSON.parse(headers.patches)
+    if (!dont_parse_special_headers) {
+        if ('version' in headers)
+            headers.version = JSON.parse('['+headers.version+']')
+        if ('parents' in headers)
+            headers.parents = JSON.parse('['+headers.parents+']')
+        if ('patches' in headers)
+            headers.patches = JSON.parse(headers.patches)
+    }
 
     // Update the input
     input = input.slice(end)
@@ -1126,6 +1134,9 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
         var request = (attempt === 1
             && params.headers.get('multiplex-through')?.split('/')[4])
             || random_base64url(Math.ceil((mux_params?.id_bits ?? 72) / 6))
+        
+        // make sure this request id is not already in use
+        if (requests.has(request)) throw "retry"
 
         // add the Multiplex-Through header without affecting the underlying params
         var mux_headers = new Headers(params.headers)
@@ -1178,6 +1189,8 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
 
         // do the underlying fetch
         try {
+            if (attempt > 1) await mux_created_promise
+
             var mux_was_done = await promise_done(mux_created_promise)
 
             // callback for testing
@@ -1252,7 +1265,7 @@ async function create_multiplexer(origin, mux_key, params, mux_params, attempt)
                 if (request_ended) buffers.push(null)
 
                 // try parsing what we got so far as headers..
-                var x = parse_headers(headers_buffer)
+                var x = parse_headers(headers_buffer, false, true)
 
                 // how did it go?
                 if (x.result === 'error') {
@@ -1394,6 +1407,7 @@ function concat_buffers(buffers) {
 if (typeof module !== 'undefined' && module.exports)
     module.exports = {
         fetch: braid_fetch,
+        multiplex_fetch,
         http: braidify_http,
         subscription_parser,
         parse_update,

package/braid-http-server.js

@@ -253,6 +253,7 @@ function braidify (req, res, next) {
     var multiplex_version = '1.0'
     if ((braidify.enable_multiplex ?? true) &&
         (req.method === 'MULTIPLEX' || req.url.startsWith('/.well-known/multiplexer/'))) {
+        req.is_multiplexer = res.is_multiplexer = true
 
         free_cors(res)
         if (req.method === 'OPTIONS') return res.end()
@@ -263,9 +264,6 @@ function braidify (req, res, next) {
             return res.end()
         }
 
-        // let the caller know we're handling things
-        req.is_multiplexer = res.is_multiplexer = true
-
         // parse the multiplexer id and request id from the url
         var [multiplexer, request] = req.url.split('/').slice(req.method === 'MULTIPLEX' ? 1 : 3)
 

package/package.json

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