braid-text 0.0.31 → 0.1.1

package/editor.html

@@ -5,8 +5,8 @@
   ></textarea>
 </body>
 <script src="https://braid.org/code/myers-diff1.js"></script>
-<script src="https://unpkg.com/braid-http@~0.3/braid-http-client.js"></script>
-<script src="https://unpkg.com/braid-text/simpleton-client.js"></script>
+<script src="https://unpkg.com/braid-http@~1.0/braid-http-client.js"></script>
+<script src="/simpleton-client.js"></script>
 <script>
   let simpleton = simpleton_client(location.pathname, {
     apply_remote_update: ({ state, patches }) => {
@@ -19,6 +19,11 @@
       if (patches.length === 0) return null;
       return { patches, new_state: texty.value };
     },
+    on_error: (e) => {
+      texty.disabled = true
+      texty.style.background = '#fee'
+      texty.style.border = '4px solid red'
+    }
   });
 
   texty.value = "";

package/index.js

@@ -159,6 +159,8 @@ braid_text.serve = async (req, res, options = {}) => {
             }
 
             await braid_text.put(resource, { peer, version: req.version, parents: req.parents, patches, body, merge_type })
+            
+            res.setHeader("Version", resource.doc.getRemoteVersion().map((x) => x.join("-")).sort())
 
             options.put_cb(options.key, resource.val)
         } catch (e) {

package/markdown-editor.html

@@ -12,11 +12,11 @@ dom.BODY = -> DIV(WIKI())
     window.statebus_fetch = window.fetch
     window.fetch = window.og_fetch
 </script>
-<script src="https://unpkg.com/braid-http@~0.3/braid-http-client.js"></script>
+<script src="https://unpkg.com/braid-http@~1.0/braid-http-client.js"></script>
 <script>
     window.fetch = window.statebus_fetch
 </script>
-<script src="https://unpkg.com/braid-text/simpleton-client.js"></script>
+<script src="/simpleton-client.js"></script>
 
 <script>
 
@@ -47,6 +47,11 @@ var simpleton = simpleton_client(location.pathname, {
       patches: patches,
       new_state: t().value
     };
+  },
+  on_error: (e) => {
+    t().disabled = true
+    t().style.background = '#fee'
+    t().style.border = '4px solid red'
   }
 });
 

package/package.json

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

package/server-demo.js

@@ -28,6 +28,12 @@ var server = require("http").createServer(async (req, res) => {
         return
     }
 
+    if (req.url == '/simpleton-client.js') {
+        res.writeHead(200, { "Content-Type": "text/javascript", "Cache-Control": "no-cache" })
+        require("fs").createReadStream("./simpleton-client.js").pipe(res)
+        return
+    }
+
     // TODO: uncomment out the code below to add /pages endpoint,
     // which displays all the currently used keys
     // 

package/simpleton-client.js

@@ -1,4 +1,4 @@
-// requires braid-http@0.3.14
+// requires braid-http@~1.0/braid-http-client.js
 // 
 // url: resource endpoint
 //
@@ -17,7 +17,7 @@
 //     this is for outgoing changes;
 //     diff_function = () => ({patches, new_version}).
 //
-function simpleton_client(url, { apply_remote_update, generate_local_diff_update, content_type }) {
+function simpleton_client(url, { apply_remote_update, generate_local_diff_update, content_type, on_error }) {
     var peer = Math.random().toString(36).substr(2)
     var current_version = []
     var prev_state = ""
@@ -26,7 +26,7 @@ function simpleton_client(url, { apply_remote_update, generate_local_diff_update
     var max_outstanding_changes = 10
     var ac = new AbortController()
 
-    braid_fetch_wrapper(url, {
+    braid_fetch(url, {
         headers: { "Merge-Type": "simpleton",
             ...(content_type ? {Accept: content_type} : {}) },
         subscribe: true,
@@ -67,8 +67,8 @@ function simpleton_client(url, { apply_remote_update, generate_local_diff_update
 
                 prev_state = apply_remote_update(update)
             }
-        })
-    )
+        }, on_error)
+    ).catch(on_error)
     
     return {
       stop: async () => {
@@ -111,14 +111,19 @@ function simpleton_client(url, { apply_remote_update, generate_local_diff_update
             prev_state = new_state
 
             outstanding_changes++
-            await braid_fetch_wrapper(url, {
-                headers: { "Merge-Type": "simpleton",
-                    ...(content_type ? {"Content-Type": content_type} : {}) },
-                method: "PUT",
-                retry: true,
-                version, parents, patches,
-                peer
-            })
+            try {
+                await braid_fetch(url, {
+                    headers: { "Merge-Type": "simpleton",
+                        ...(content_type ? {"Content-Type": content_type} : {}) },
+                    method: "PUT",
+                    retry: true,
+                    version, parents, patches,
+                    peer
+                })
+            } catch (e) {
+                on_error(e)
+                throw e
+            }
             outstanding_changes--
         }
       }
@@ -138,42 +143,3 @@ function count_code_points(str) {
     }
     return code_points
 }
-
-async function braid_fetch_wrapper(url, params) {
-    if (!params.retry) throw "wtf"
-    var waitTime = 10
-    if (params.subscribe) {
-        var subscribe_handler = null
-        connect()
-        async function connect() {
-            if (params.signal?.aborted) return
-            try {
-                var c = await braid_fetch(url, { ...params, parents: params.parents?.() })
-                c.subscribe((...args) => subscribe_handler?.(...args), on_error)
-                waitTime = 10
-            } catch (e) {
-                on_error(e)
-            }
-        }
-        function on_error(e) {
-          console.log('eee = ' + e.stack)
-            setTimeout(connect, waitTime)
-            waitTime = Math.min(waitTime * 2, 3000)
-        }
-        return {subscribe: handler => { subscribe_handler = handler }}
-    } else {
-        return new Promise((done) => {
-            send()
-            async function send() {
-                try {
-                    var res = await braid_fetch(url, params)
-                    if (res.status !== 200) throw "status not 200: " + res.status
-                    done(res)
-                } catch (e) {
-                    setTimeout(send, waitTime)
-                    waitTime = Math.min(waitTime * 2, 3000)
-                }
-            }
-        })
-    }
-}