braid-http 1.3.0 → 1.3.2

package/braid-http-client.js

@@ -575,24 +575,29 @@ function parse_update (state) {
 // Parsing helpers
 function parse_headers (input) {
 
-    var h = extractHeader(input)
-    if (!h) return {result: 'waiting'}
-
-    // Skip "HTTP 104 Multiresponse"
-    if (h.header_string.startsWith('HTTP 104')) {
-        h = extractHeader(h.remaining_bytes)
-        if (!h) return {result: 'waiting'}
+    // Find the start of the headers
+    let s = 0;
+    while (input[s] === 13 || input[s] === 10) s++
+    if (s === input.length) return {result: 'waiting'}
+
+    // Look for the double-newline at the end of the headers.
+    let e = s;
+    while (++e) {
+        if (e > input.length) return {result: 'waiting'}
+        if (input[e - 1] === 10 && (input[e - 2] === 10 || (input[e - 2] === 13 && input[e - 3] === 10))) break
     }
 
+    // Extract the header string
+    var headers_source = new TextDecoder('utf-8').decode(new Uint8Array(input.slice(s, e)))
+
     // Skip "HTTP 200 OK"
-    h.header_string = h.header_string.replace(/^HTTP 200.*\r?\n/, '')
+    headers_source = headers_source.replace(/^HTTP 200.*\r?\n/, '')
 
-    var headers_source = h.header_string
     var headers_length = headers_source.length
     
     // Let's parse them!  First define some variables:
     var headers = {},
-        header_regex = /(:?[\w-_]+):\s?(.*)\r?\n?/gy,  // Parses one line a time
+        header_regex = /(:?[\w-_]+):\s?(.*)[\r\n]*/gy,  // Parses one line a time
         match,
         found_last_match = false
 
@@ -625,7 +630,7 @@ function parse_headers (input) {
         headers.patches = JSON.parse(headers.patches)
 
     // Update the input
-    input = h.remaining_bytes
+    input = input.slice(e)
 
     // And return the parsed result
     return { result: 'success', headers, input }
@@ -793,60 +798,6 @@ function extra_headers (headers) {
     return result
 }
 
-// a parsing utility function that will inspect a byte array of incoming data
-// to see if there is header information at the beginning,
-// namely some non-newline characters followed by two newlines
-function extractHeader(input) {
-    // Find the start of the headers
-    let begin_headers_i = 0;
-    while (input[begin_headers_i] === 13 || input[begin_headers_i] === 10) {
-        begin_headers_i++;
-    }
-    if (begin_headers_i === input.length) {
-        return null; // Incomplete headers
-    }
-
-    // Look for the double-newline at the end of the headers
-    let end_headers_i = begin_headers_i;
-    let size_of_tail = 0;
-    while (end_headers_i < input.length) {
-        if (input[end_headers_i] === 10 && input[end_headers_i + 1] === 10) {
-            size_of_tail = 2;
-            break;
-        }
-        if (input[end_headers_i] === 10 && input[end_headers_i + 1] === 13 && input[end_headers_i + 2] === 10) {
-            size_of_tail = 3;
-            break;
-        }
-        if (input[end_headers_i] === 13 && input[end_headers_i + 1] === 10 && input[end_headers_i + 2] === 10) {
-            size_of_tail = 3;
-            break;
-        }
-        if (input[end_headers_i] === 13 && input[end_headers_i + 1] === 10 && input[end_headers_i + 2] === 13 && input[end_headers_i + 3] === 10) {
-            size_of_tail = 4;
-            break;
-        }
-
-        end_headers_i++;
-    }
-
-    // If no double-newline is found, wait for more input
-    if (end_headers_i === input.length) {
-        return null; // Incomplete headers
-    }
-
-    // Extract the header string
-    const headerBytes = input.slice(begin_headers_i, end_headers_i);
-    const headerString = new TextDecoder('utf-8').decode(new Uint8Array(headerBytes));
-
-    // Return the remaining bytes and the header string
-    const remainingBytes = input.slice(end_headers_i + size_of_tail);
-    return {
-        remaining_bytes: remainingBytes,
-        header_string: headerString
-    };
-}
-
 function get_binary_length(x) {
     return  x instanceof ArrayBuffer ? x.byteLength :
             x instanceof Uint8Array ? x.length :

package/braid-http-server.js

@@ -137,11 +137,23 @@ function parse_update (req, cb) {
             for (let x of chunk) buffer.push(x)
 
             while (patches.length < num_patches) {
-                let h = extractHeader(buffer)
-                if (!h) return
+                // Find the start of the headers
+                let s = 0;
+                while (buffer[s] === 13 || buffer[s] === 10) s++
+                if (s === buffer.length) return {result: 'waiting'}
+
+                // Look for the double-newline at the end of the headers.
+                let e = s;
+                while (++e) {
+                    if (e > buffer.length) return {result: 'waiting'}
+                    if (buffer[e - 1] === 10 && (buffer[e - 2] === 10 || (buffer[e - 2] === 13 && buffer[e - 3] === 10))) break
+                }
+
+                // Extract the header string
+                let headers_source = new TextDecoder('utf-8').decode(new Uint8Array(buffer.slice(s, e)))
 
                 // Now let's parse those headers.
-                var headers = require('parse-headers')(h.header_string)
+                var headers = require('parse-headers')(headers_source)
 
                 // We require `content-length` to declare the length of the patch.
                 if (!('content-length' in headers)) {
@@ -154,14 +166,14 @@ function parse_update (req, cb) {
                 var body_length = parseInt(headers['content-length'])
 
                 // Give up if we don't have the full patch yet.
-                if (h.remaining_bytes.length < body_length)
+                if (buffer.length - e < body_length)
                     return
 
                 // XX Todo: support custom patch types beyond content-range.
 
                 // Content-range is of the form '<unit> <range>' e.g. 'json .index'
                 var [unit, range] = parse_content_range(headers['content-range'])
-                var patch_content = new Uint8Array(h.remaining_bytes.slice(0, body_length))
+                var patch_content = new Uint8Array(buffer.slice(e, e + body_length))
 
                 // We've got our patch!
                 let patch = {unit, range, content: patch_content}
@@ -170,7 +182,7 @@ function parse_update (req, cb) {
                 })
                 patches.push(patch)
 
-                buffer = h.remaining_bytes.slice(body_length)
+                buffer = buffer.slice(e + body_length)
             }
 
             // We got all the patches!  Pause the stream and tell the callback!
@@ -367,13 +379,7 @@ async function send_update(res, data, url, peer) {
     assert(body_exists || patches, 'Missing body or patches')
     assert(!(body_exists && patches), 'Cannot send both body and patches')
 
-    // Write the beginning of a new multiresponse response
-    if (!res.wrote_104_multiresponse) {
-        res.write(`HTTP 104 Multiresponse\r\n\r\n`)
-        res.wrote_104_multiresponse = true
-    }
-
-    res.write(`HTTP 200 OK\r\n`)
+    if (res.isSubscription) res.write(`HTTP 200 OK\r\n`)
 
     // Write the headers or virtual headers
     for (var [header, value] of Object.entries(data)) {
@@ -422,60 +428,6 @@ async function send_update(res, data, url, peer) {
     }
 }
 
-// a parsing utility function that will inspect a byte array of incoming data
-// to see if there is header information at the beginning,
-// namely some non-newline characters followed by two newlines
-function extractHeader(input) {
-    // Find the start of the headers
-    let begin_headers_i = 0;
-    while (input[begin_headers_i] === 13 || input[begin_headers_i] === 10) {
-        begin_headers_i++;
-    }
-    if (begin_headers_i === input.length) {
-        return null; // Incomplete headers
-    }
-
-    // Look for the double-newline at the end of the headers
-    let end_headers_i = begin_headers_i;
-    let size_of_tail = 0;
-    while (end_headers_i < input.length) {
-        if (input[end_headers_i] === 10 && input[end_headers_i + 1] === 10) {
-            size_of_tail = 2;
-            break;
-        }
-        if (input[end_headers_i] === 10 && input[end_headers_i + 1] === 13 && input[end_headers_i + 2] === 10) {
-            size_of_tail = 3;
-            break;
-        }
-        if (input[end_headers_i] === 13 && input[end_headers_i + 1] === 10 && input[end_headers_i + 2] === 10) {
-            size_of_tail = 3;
-            break;
-        }
-        if (input[end_headers_i] === 13 && input[end_headers_i + 1] === 10 && input[end_headers_i + 2] === 13 && input[end_headers_i + 3] === 10) {
-            size_of_tail = 4;
-            break;
-        }
-
-        end_headers_i++;
-    }
-
-    // If no double-newline is found, wait for more input
-    if (end_headers_i === input.length) {
-        return null; // Incomplete headers
-    }
-
-    // Extract the header string
-    const headerBytes = input.slice(begin_headers_i, end_headers_i);
-    const headerString = new TextDecoder('utf-8').decode(new Uint8Array(headerBytes));
-
-    // Return the remaining bytes and the header string
-    const remainingBytes = input.slice(end_headers_i + size_of_tail);
-    return {
-        remaining_bytes: remainingBytes,
-        header_string: headerString
-    };
-}
-
 function get_binary_length(x) {
     return  x instanceof ArrayBuffer ? x.byteLength :
             x instanceof Uint8Array ? x.length :

package/package.json

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