braid-text 0.3.23 → 0.3.24

package/client/cursor-highlights.js

@@ -297,7 +297,7 @@ function peer_bg_color(peer_id) {
 //   cursors.on_edit(patches)      // call after local edit; patches optional
 //   cursors.destroy()
 //
-function cursor_highlights(textarea, url) {
+function cursor_highlights(textarea, url, options) {
     var peer = Math.random().toString(36).slice(2)
     var hl = textarea_highlights(textarea)
     var applying_remote = false
@@ -307,6 +307,7 @@ function cursor_highlights(textarea, url) {
 
     cursor_client(url, {
         peer,
+        headers: options?.headers,
         get_text: () => textarea.value,
         on_change: (sels) => {
             for (var [id, ranges] of Object.entries(sels)) {

package/client/cursor-sync.js

@@ -15,12 +15,12 @@
 //   cursors.changed(patches)
 //   cursors.destroy()
 //
-async function cursor_client(url, { peer, get_text, on_change }) {
+async function cursor_client(url, { peer, get_text, on_change, headers: user_headers }) {
     // --- feature detection: HEAD probe ---
     try {
         var head_res = await braid_fetch(url, {
             method: 'HEAD',
-            headers: { 'Accept': 'application/text-cursors+json' }
+            headers: { ...user_headers, 'Accept': 'application/text-cursors+json' }
         })
         var ct = head_res.headers.get('content-type') || ''
         if (!ct.includes('application/text-cursors+json')) return null
@@ -124,6 +124,7 @@ async function cursor_client(url, { peer, get_text, on_change }) {
         braid_fetch(url, {
             method: 'PUT',
             headers: {
+                ...user_headers,
                 'Content-Type': 'application/text-cursors+json',
                 Peer: peer,
                 'Content-Range': 'json [' + JSON.stringify(peer) + ']',
@@ -155,6 +156,7 @@ async function cursor_client(url, { peer, get_text, on_change }) {
         }},
         peer,
         headers: {
+            ...user_headers,
             Accept: 'application/text-cursors+json',
             Heartbeats: '10',
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-text",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",

package/server.js

@@ -578,7 +578,9 @@ function create_braid_text() {
             
                 res.setHeader("Version", get_current_version())
 
-                options.put_cb(options.key, resource.val, {old_val, patches: put_patches, version: resource.version, parents: old_version})
+                options.put_cb(options.key, resource.val,
+                               {old_val, patches: put_patches,
+                                version: resource.version, parents: old_version})
             } catch (e) {
                 console.log(`${req.method} ERROR: ${e.stack}`)
                 return done_my_turn(500, "The server failed to apply this version. The error generated was: " + e)
@@ -3114,12 +3116,17 @@ async function handle_cursors(resource, req, res) {
             res.sendUpdate({ body: JSON.stringify(cursors.snapshot()) })
         }
     } else if (req.method === 'PUT' || req.method === 'POST' || req.method === 'PATCH') {
-        var raw_body = await new Promise((resolve, reject) => {
-            var chunks = []
-            req.on('data', chunk => chunks.push(chunk))
-            req.on('end', () => resolve(Buffer.concat(chunks).toString()))
-            req.on('error', reject)
-        })
+        var raw_body
+        if (req.already_buffered_body != null) {
+            raw_body = req.already_buffered_body.toString()
+        } else {
+            raw_body = await new Promise((resolve, reject) => {
+                var chunks = []
+                req.on('data', chunk => chunks.push(chunk))
+                req.on('end', () => resolve(Buffer.concat(chunks).toString()))
+                req.on('error', reject)
+            })
+        }
         var range = req.headers['content-range']
         if (!range || !range.startsWith('json ')) {
             res.writeHead(400)