braid-blob 0.0.76 → 0.0.78

package/client.js

@@ -22,7 +22,7 @@
 //
 function braid_blob_client(url, params = {}) {
     var peer = params.peer || Math.random().toString(36).slice(2)
-    var current_version = null
+    var current_version = params.parents || null
 
     braid_fetch(url, {
         headers: { "Merge-Type": "aww" },

package/img-live.js

@@ -9,29 +9,48 @@ function sync(img) {
     var url = img.src
     if (!url) return
 
+    // Find an unused query parameter name for cache-busting
+    var param = 'img-live'
+    var u = new URL(url)
+    while (u.searchParams.has(param)) param = '-' + param
+    function cache_bust() {
+        u.searchParams.set(param, Math.random().toString(36).slice(2))
+        return u.toString()
+    }
+
     // Unsync first to handle attribute changes (e.g. droppable added/removed)
     unsync(img)
 
     var ac = new AbortController()
-    var client = braid_blob_client(url, {
-        signal: ac.signal,
-        on_update: (body, content_type, version, from_local_update) => {
-            if (from_local_update) {
-                var blob = new Blob([body], { type: content_type || 'image/png' })
-                img.src = URL.createObjectURL(blob)
-            } else {
+    var client_p = (async () => {
+        var res = await braid_fetch(cache_bust(), {
+            method: 'HEAD',
+            headers: { "Merge-Type": "aww" },
+            subscribe: true,
+            retry: () => true,
+            signal: ac.signal
+        })
+        return braid_blob_client(cache_bust(), {
+            signal: ac.signal,
+            parents: res.version,
+            on_update: (body, content_type, version, from_local_update) => {
+                if (from_local_update) {
+                    var blob = new Blob([body], { type: content_type || 'image/png' })
+                    img.src = URL.createObjectURL(blob)
+                } else {
+                    img.src = ''
+                    img.src = cache_bust()
+                }
+            },
+            on_delete: () => {
                 img.src = ''
-                img.src = url
+                img.src = cache_bust()
+            },
+            on_error: (error) => {
+                console.error('Live image error for', url, error)
             }
-        },
-        on_delete: () => {
-            img.src = ''
-            img.src = url
-        },
-        on_error: (error) => {
-            console.error('Live image error for', url, error)
-        }
-    })
+        })
+    })()
     live_images.set(img, ac)
 
     if (img.hasAttribute('droppable')) {
@@ -60,8 +79,8 @@ function sync(img) {
 
             var reader = new FileReader()
             reader.onload = async function() {
-                await client.update(reader.result, file.type)
-                img.src = url
+                await (await client_p).update(reader.result, file.type)
+                img.src = cache_bust()
             }
             reader.readAsArrayBuffer(file)
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-blob",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "description": "Library for collaborative blobs over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-blob",