braid-http 1.3.76 → 1.3.78

package/braid-http-client.js

@@ -439,7 +439,10 @@ async function braid_fetch (url, params = {}) {
 
                 if (params.retry && !res.ok) {
                     var give_up
-                    if (params.retry.retryRes) {
+                    if (typeof params.retry === 'function') {
+                        give_up = !params.retry(res)
+                    } else if (params.retry.retryRes) {
+                        // deprecated in favor of setting retry to a function
                         give_up = !params.retry.retryRes(res)
                     } else {
                         give_up = res.status >= 400 && res.status < 600
@@ -609,7 +612,7 @@ var subscription_parser = (cb) => ({
 function parse_update (state) {
     // If we don't have headers yet, let's try to parse some
     if (!state.headers) {
-        var parsed = parse_headers(state.input)
+        var parsed = parse_headers(state.input, true)
 
         // If header-parsing fails, send the error upstream
         if (parsed.result === 'error')
@@ -633,13 +636,53 @@ function parse_update (state) {
 }
 
 // Parsing helpers
-function parse_headers (input) {
+function parse_headers (input, check_for_encoding_blocks) {
 
     // Find the start of the headers
     var start = 0
     while (input[start] === 13 || input[start] === 10) start++
     if (start === input.length) return {result: 'waiting'}
 
+    // Check for an "Encoding" block like this:
+    //
+    //   Encoding: dt
+    //   Length: 411813
+    //   <binary dt file>
+    //
+    // Such a block will start with an "e", not an "h"
+    if (check_for_encoding_blocks &&
+        (input[start] === 101 || input[start] === 69)) {
+
+        // Look for two newlines
+        var end = start
+        var count = 0
+        while (++end) {
+            if (end > input.length) return {result: 'waiting'}
+            if (input[end - 1] === 10) count++
+            if (count === 2) break
+        }
+
+        // Extract the header string
+        var headers_source = input.slice(start, end).map(x => String.fromCharCode(x)).join('')
+
+        // Parse
+        var m = headers_source.match(/Encoding:\s*(\w+)\r?\nLength:\s*(\d+)\r?\n/i)
+        if (!m) return {
+            result: 'error',
+            message: `Parse error in encoding block: ${JSON.stringify(headers_source)}`
+        }
+        var headers = {
+            encoding: m[1],
+            length: m[2]
+        }
+
+        // Update the input
+        input = input.slice(end)
+
+        // And return the parsed result
+        return { result: 'success', headers, input }
+    }
+
     // Look for the double-newline at the end of the headers.
     var end = start
     while (++end) {
@@ -711,7 +754,8 @@ function parse_body (state) {
 
     // Parse Body Snapshot
 
-    var content_length = parseInt(state.headers['content-length'])
+    var content_length = parseInt(state.headers['content-length'] ??
+        (state.headers.patches === undefined && state.headers['length']))
     if (!isNaN(content_length)) {
 
         // We've read a Content-Length, so we have a block to parse

package/package.json

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