braidfs 0.0.101 → 0.0.103

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)
     }
@@ -829,7 +835,12 @@ async function sync_url(url) {
 
                     // see if remote has the fork point
                     if (self.fork_point) {
-                        var r = await my_fetch({ method: "HEAD", version: self.fork_point })
+                        var r = await my_fetch({
+                            method: "HEAD",
+                            version: self.fork_point,
+                            retry: { retryRes: r =>
+                                r.status !== 309 && r.status !== 500 }
+                        })
                         if (freed || closed) return
                         if (r.ok) return console.log(`[find_fork_point] "${url.split('/').pop()}" has our latest fork point, hooray!`)
                     }
@@ -849,7 +860,12 @@ async function sync_url(url) {
                         console.log(`min=${min}, max=${max}, i=${i}, version=${version}`)
 
                         var st = Date.now()
-                        var r = await my_fetch({ method: "HEAD", version })
+                        var r = await my_fetch({
+                            method: "HEAD",
+                            version,
+                            retry: { retryRes: r =>
+                                r.status !== 309 && r.status !== 500 }
+                        })
                         if (freed || closed) return
                         console.log(`fetched in ${Date.now() - st}`)
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "braidfs",
-  "version": "0.0.101",
+  "version": "0.0.103",
   "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.35",
+    "braid-text": "^0.2.40",
     "chokidar": "^3.6.0"
   },
   "bin": {