braid-http 1.3.9 → 1.3.11

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)` : ''}`)
@@ -578,12 +578,12 @@ function parse_update (state) {
 function parse_headers (input) {
 
     // Find the start of the headers
-    let start = 0;
+    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 end = start;
+    var end = start
     while (++end) {
         if (end > input.length) return {result: 'waiting'}
         if (    input[end - 1] === 10
@@ -592,7 +592,7 @@ function parse_headers (input) {
     }
 
     // Extract the header string
-    var headers_source = new TextDecoder('utf-8').decode(new Uint8Array(input.slice(start, end)))
+    var headers_source = input.slice(start, end).map(x => String.fromCharCode(x)).join('')
 
     // 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')
@@ -816,6 +816,10 @@ function 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

@@ -150,7 +150,7 @@ function parse_update (req, cb) {
                 }
 
                 // Extract the header string
-                let headers_source = new TextDecoder('utf-8').decode(new Uint8Array(buffer.slice(s, e)))
+                let headers_source = buffer.slice(s, e).map(x => String.fromCharCode(x)).join('')
 
                 // Now let's parse those headers.
                 var headers = require('parse-headers')(headers_source)
@@ -400,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
@@ -447,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.9",
+  "version": "1.3.11",
   "description": "An implementation of Braid-HTTP for Node.js and Browsers",
   "scripts": {
     "test": "node test/server.js"