braidfs 0.0.102 → 0.0.104

package/index.js

@@ -396,12 +396,9 @@ async function sync_url(url) {
             return p
         }
         var get_fullpath = async () => {
-            if (freed) return
             var p = fullpath
-            while (await wait_on(is_dir(p))) {
-                if (freed) return
+            while (await is_dir(p))
                 p = require("path").join(p, 'index')
-            }
             return p
         }
         if (!unsync_url.cache) unsync_url.cache = {}
@@ -412,12 +409,21 @@ async function sync_url(url) {
 
             delete braid_text.cache[url]
             for (let f of await braid_text.get_files_for_key(url)) {
-                console.log(`trying to delete ${f}`)
-                try { await require('fs').promises.unlink(f) } catch (e) {}
+                try {
+                    console.log(`trying to delete: ${f}`)
+                    await require('fs').promises.unlink(f)
+                } catch (e) {}
             }
 
-            try { await require('fs').promises.unlink(meta_path) } catch (e) {}
-            try { await require('fs').promises.unlink(await get_fullpath()) } catch (e) {}
+            try {
+                console.log(`trying to delete: ${meta_path}`)
+                await require('fs').promises.unlink(meta_path)
+            } catch (e) {}
+            try {
+                var fp = await get_fullpath()
+                console.log(`trying to delete: ${fp}`)
+                await require('fs').promises.unlink(fp)
+            } catch (e) {}
         }
         sync_url.cache[path] = sync_url.chain = sync_url.chain.then(init)
     }
@@ -878,57 +884,13 @@ async function sync_url(url) {
                 await send_new_stuff()
                 if (freed || closed) return
 
-                // attempt to download the initial stuff in one go,
-                // using transfer-encoding dt
-                //
-                // first check for support..
-                //
-                var res = await my_fetch({
-                    method: 'HEAD',
-                    headers: { 'accept-transfer-encoding': 'dt' },
-                })
-                if (freed || closed) return
-
-                if (res.ok && res.headers.get('x-transfer-encoding') === 'dt') {
-                    var res = await my_fetch({
-                        headers: { 'accept-transfer-encoding': 'dt' },
-                        parents: self.fork_point,
-                    })
-                    if (freed || closed) return
-                    console.log(`got external updates about ${url}`)
-
-                    // manually apply the dt bytes..
-                    // ..code bits taken from braid-text put..
-                    var bytes = new Uint8Array(await res.arrayBuffer())
-                    if (freed || closed) return
-
-                    var start_i = 1 + resource.doc.getLocalVersion().reduce((a, b) => Math.max(a, b), -1)
-                    resource.doc.mergeBytes(bytes)
-
-                    // update resource.actor_seqs
-                    var end_i = resource.doc.getLocalVersion().reduce((a, b) => Math.max(a, b), -1)
-                    for (var i = start_i; i <= end_i; i++) {
-                        var v = resource.doc.localToRemoteVersion([i])[0]
-                        if (!resource.actor_seqs[v[0]]) resource.actor_seqs[v[0]] = new braid_text.RangeSet()
-                        resource.actor_seqs[v[0]].add_range(v[1], v[1])
-                    }
-
-                    resource.val = resource.doc.get()
-                    resource.need_defrag = true
-                    await resource.db_delta(bytes)
-                    if (freed || closed) return
-
-                    // ..do the things we do when getting subscribe updates..
-                    self.update_fork_point(JSON.parse(`[${res.headers.get('current-version')}]`), self.fork_point)
-                    self.signal_file_needs_writing()
-                }
-
                 var a = new AbortController()
                 aborts.add(a)
                 var res = await braid_fetch(url, {
                     signal: a.signal,
                     headers: {
                         "Merge-Type": "dt",
+                        'accept-encoding': 'updates(dt)',
                         Accept: 'text/plain',
                         ...(x => x && {Cookie: x})(config.cookies?.[new URL(url).hostname]),
                     },
@@ -955,6 +917,35 @@ async function sync_url(url) {
                 initial_connect_done()
                 res.subscribe(async update => {
                     if (freed || closed) return
+
+                    if (!update.status) {
+                        console.log(`got initial update about ${url}`)
+
+                        // manually apply the dt bytes..
+                        // ..code bits taken from braid-text put..
+                        var bytes = update.body
+
+                        var start_i = 1 + resource.doc.getLocalVersion().reduce((a, b) => Math.max(a, b), -1)
+                        resource.doc.mergeBytes(bytes)
+
+                        // update resource.actor_seqs
+                        var end_i = resource.doc.getLocalVersion().reduce((a, b) => Math.max(a, b), -1)
+                        for (var i = start_i; i <= end_i; i++) {
+                            var v = resource.doc.localToRemoteVersion([i])[0]
+                            if (!resource.actor_seqs[v[0]]) resource.actor_seqs[v[0]] = new braid_text.RangeSet()
+                            resource.actor_seqs[v[0]].add_range(v[1], v[1])
+                        }
+
+                        resource.val = resource.doc.get()
+                        resource.need_defrag = true
+                        await resource.db_delta(bytes)
+                        if (freed || closed) return
+
+                        self.update_fork_point(JSON.parse(`[${res.headers.get('current-version')}]`), self.fork_point)
+                        self.signal_file_needs_writing()
+                        return
+                    }
+
                     console.log(`got external update about ${url}`)
 
                     if (update.body) update.body = update.body_text

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "braidfs",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",
   "homepage": "https://braid.org",
   "dependencies": {
-    "braid-http": "^1.3.76",
-    "braid-text": "^0.2.40",
+    "braid-http": "~1.3.79",
+    "braid-text": "~0.2.44",
     "chokidar": "^3.6.0"
   },
   "bin": {