braid-http 1.3.8 → 1.3.10

package/braid-http-client.js

@@ -162,9 +162,9 @@ async function braid_fetch (url, params = {}) {
 
     // We provide some shortcuts for Braid params
     if (params.version)
-        params.headers.set('version', params.version.map(JSON.stringify).join(', '))
+        params.headers.set('version', params.version.map(JSON.stringify).map(ascii_ify).join(', '))
     if (Array.isArray(params.parents))
-        params.headers.set('parents', params.parents.map(JSON.stringify).join(', '))
+        params.headers.set('parents', params.parents.map(JSON.stringify).map(ascii_ify).join(', '))
     if (params.subscribe)
         params.headers.set('subscribe', 'true')
     if (params.peer)
@@ -395,7 +395,7 @@ async function braid_fetch (url, params = {}) {
 
                         case 502: // Bad Gateway
                         case 504: // Gateway Timeout
-                            give_up = false;
+                            give_up = false
                     }
                     if (give_up) {
                         let e = new Error(`giving up because of http status: ${res.status}${(res.status === 401 || res.status === 403) ? ` (access denied)` : ''}`)
@@ -489,6 +489,7 @@ var subscription_parser = (cb) => ({
                     parents: this.state.parents,
                     body:    this.state.body,
                     patches: this.state.patches,
+                    status:  this.state.status,
 
                     // Output extra_headers if there are some
                     extra_headers: extra_headers(this.state.headers)
@@ -563,6 +564,7 @@ function parse_update (state) {
         state.headers = parsed.headers
         state.version = state.headers.version
         state.parents = state.headers.parents
+        state.status  = state.headers[':status']
 
         // Take the parsed headers out of the buffer
         state.input = parsed.input
@@ -576,22 +578,24 @@ function parse_update (state) {
 function parse_headers (input) {
 
     // Find the start of the headers
-    let s = 0;
-    while (input[s] === 13 || input[s] === 10) s++
-    if (s === input.length) return {result: 'waiting'}
+    var start = 0
+    while (input[start] === 13 || input[start] === 10) start++
+    if (start === 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
+    var end = start
+    while (++end) {
+        if (end > input.length) return {result: 'waiting'}
+        if (    input[end - 1] === 10
+            && (input[end - 2] === 10 || (input[end - 2] === 13 && input[end - 3] === 10)))
+            break
     }
 
     // Extract the header string
-    var headers_source = new TextDecoder('utf-8').decode(new Uint8Array(input.slice(s, e)))
+    var headers_source = new TextDecoder('utf-8').decode(new Uint8Array(input.slice(start, end)))
 
-    // Skip "HTTP 200 OK"
-    headers_source = headers_source.replace(/^HTTP 200.*\r?\n/, '')
+    // Convert "HTTP 200 OK" to a :status: 200 header
+    headers_source = headers_source.replace(/^HTTP\/?\d*\.?\d* (\d\d\d).*\r?\n/, ':status: $1\r\n')
 
     var headers_length = headers_source.length
     
@@ -630,7 +634,7 @@ function parse_headers (input) {
         headers.patches = JSON.parse(headers.patches)
 
     // Update the input
-    input = input.slice(e)
+    input = input.slice(end)
 
     // And return the parsed result
     return { result: 'success', headers, input }
@@ -787,7 +791,7 @@ function extra_headers (headers) {
 
     // Remove the non-extra parts
     var known_headers = ['version', 'parents', 'patches',
-                         'content-length', 'content-range']
+                         'content-length', 'content-range', ':status']
     for (var i = 0; i < known_headers.length; i++)
         delete result[known_headers[i]]
 
@@ -807,10 +811,15 @@ function get_binary_length(x) {
 function deep_copy(x) {
     if (x === null || typeof x !== 'object') return x
     if (Array.isArray(x)) return x.map(x => deep_copy(x))
-    if (Object.prototype.toString.call(x) === '[object Object]') return Object.fromEntries(Object.entries(x).map(([k, x]) => [k, deep_copy(x)]))
+    if (Object.prototype.toString.call(x) === '[object Object]')
+        return Object.fromEntries(Object.entries(x).map(([k, x]) => [k, deep_copy(x)]))
     return x
 }
 
+function ascii_ify(s) {
+    return s.replace(/[^\x20-\x7E]/g, c => '\\u' + c.charCodeAt(0).toString(16).padStart(4, '0'))
+}
+
 // ****************************
 // Exports
 // ****************************

package/braid-http-server.js

@@ -325,7 +325,14 @@ function braidify (req, res, next) {
 }
 
 async function send_update(res, data, url, peer) {
-    var {version, parents, patches, patch, body} = data
+    var {version, parents, patches, patch, body, status} = data
+
+    if (status) {
+        assert(typeof status === 'number', 'sendUpdate: status must be a number')
+        assert(status > 100 && status < 600, 'sendUpdate: status must be a number between 100 and 600')
+    }
+    else
+        status = 200
 
     function set_header (key, val) {
         if (res.isSubscription)
@@ -379,7 +386,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')
 
-    if (res.isSubscription) res.write(`HTTP 200 OK\r\n`)
+    if (res.isSubscription) res.write(`HTTP ${status} OK\r\n`)
 
     // Write the headers or virtual headers
     for (var [header, value] of Object.entries(data)) {
@@ -393,10 +400,10 @@ async function send_update(res, data, url, peer) {
         // so we convert `value` from array to comma-separated strings.
         if (header === 'version') {
             header = 'Version'               // Capitalize for prettiness
-            value = value.map(JSON.stringify).join(", ")
+            value = value.map(JSON.stringify).map(ascii_ify).join(", ")
         } else if (header === 'parents') {
             header = 'Parents'               // Capitalize for prettiness
-            value = value.map(JSON.stringify).join(", ")
+            value = value.map(JSON.stringify).map(ascii_ify).join(", ")
         }
 
         // We don't output patches or body yet
@@ -440,4 +447,8 @@ function write_binary(res, body) {
     res.write(body)
 }
 
+function ascii_ify(s) {
+    return s.replace(/[^\x20-\x7E]/g, c => '\\u' + c.charCodeAt(0).toString(16).padStart(4, '0'))
+}
+
 module.exports = braidify

package/package.json

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