braidfs 0.0.89 → 0.0.91

package/index.js

@@ -375,6 +375,12 @@ async function sync_url(url) {
         fullpath = `${sync_base}/${path}`,
         meta_path = `${sync_base_meta}/${braid_text.encode_filename(url)}`
 
+    async function get_fullpath() {
+        var p = fullpath
+        while (await is_dir(p)) p = require("path").join(p, 'index')
+        return p
+    }
+
     if (!sync_url.cache) sync_url.cache = {}
     if (!sync_url.chain) sync_url.chain = Promise.resolve()
     if (!sync_url.cache[path]) {
@@ -425,12 +431,6 @@ async function sync_url(url) {
 
         finish_something()
 
-        async function get_fullpath() {
-            var p = fullpath
-            while (await is_dir(p)) p = require("path").join(p, 'index')
-            return p
-        }
-
         self.peer = Math.random().toString(36).slice(2)
         self.local_edit_counter = 0
         self.fork_point = null
@@ -498,7 +498,7 @@ async function sync_url(url) {
                         "Content-Type": 'text/plain',
                         ...(x => x && {Cookie: x})(config.cookies?.[new URL(url).hostname])
                     },
-                    retry: true,
+                    retry: { retryRes: r => r.status !== 401 && r.status !== 403 },
                     ...params
                 })
             } catch (e) {
@@ -745,11 +745,11 @@ async function sync_url(url) {
         async function find_fork_point() {
             console.log(`[find_fork_point] url: ${url}`)
 
-            // see if they have the fork point
+            // see if remote has the fork point
             if (self.fork_point) {
                 var r = await my_fetch({ method: "HEAD", version: self.fork_point })
                 if (r.ok) {
-                    console.log(`[find_fork_point] they have our latest fork point, horray!`)
+                    console.log(`[find_fork_point] it has our latest fork point, hooray!`)
                     return self.fork_point
                 }
             }
@@ -812,6 +812,7 @@ async function sync_url(url) {
                 },
                 subscribe: true,
                 retry: {
+                    retryRes: () => true,
                     onRes: (res) => {
                         if (res.status !== 209)
                             return log_error(`Can't sync ${url} -- got bad response ${res.status} from server (expected 209)`)
@@ -848,7 +849,7 @@ async function sync_url(url) {
                     await braid_text.put(url, { ...update, peer: self.peer, merge_type: 'dt' })
 
                     // the server is giving us this version,
-                    // so they must have it,
+                    // so it must have it,
                     // so let's add it to our fork point
                     await self.update_fork_point(update.version[0], update.parents)
 
@@ -858,7 +859,7 @@ async function sync_url(url) {
             }).catch(e => (e?.name !== "AbortError") && console.log(e))
         }
 
-        // send them stuff we have but they don't
+        // send it stuff we have but it doesn't't
         async function send_new_stuff(fork_point) {
             var in_parallel = create_parallel_promises(10)
             await braid_text.get(url, braid_text_get_options = {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "braidfs",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",
   "homepage": "https://braid.org",
   "dependencies": {
-    "braid-http": "^1.3.73",
-    "braid-text": "^0.2.28",
+    "braid-http": "^1.3.75",
+    "braid-text": "^0.2.30",
     "chokidar": "^3.6.0"
   },
   "bin": {