braid-http 1.3.77 → 1.3.79

package/braid-http-client.js

@@ -612,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')
@@ -636,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) {
@@ -714,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/braid-http-server.js

@@ -597,7 +597,7 @@ function braidify (req, res, next) {
 }
 
 async function send_update(res, data, url, peer) {
-    var {version, parents, patches, patch, body, status} = data
+    var {version, parents, patches, patch, body, status, encoding} = data
 
     if (status) {
         assert(typeof status === 'number', 'sendUpdate: status must be a number')
@@ -613,7 +613,7 @@ async function send_update(res, data, url, peer) {
             res.setHeader(key, val)
     }
     function write_body (body) {
-        if (res.isSubscription) res.write('\r\n')
+        if (res.isSubscription && !encoding) res.write('\r\n')
         write_binary(res, body)
     }
 
@@ -662,7 +662,7 @@ async function send_update(res, data, url, peer) {
         status === 200 ? 'OK'
         : 404 ? 'Not Found'
         : 'Unknown'
-    if (res.isSubscription) res.write(`HTTP ${status} ${reason}\r\n`)
+    if (res.isSubscription && !encoding) res.write(`HTTP ${status} ${reason}\r\n`)
 
     // Write the headers or virtual headers
     for (var [header, value] of Object.entries(data)) {
@@ -698,7 +698,7 @@ async function send_update(res, data, url, peer) {
         let binary = typeof body === 'string' ? new TextEncoder().encode(body) : body,
             length = get_binary_length(binary)
         assert(length !== undefined && length !== 'undefined')
-        set_header('Content-Length', length)
+        set_header(encoding ? 'Length' : 'Content-Length', length)
         write_body(binary)
     } else
         write_patches(res, patches)

package/package.json

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