braidfs 0.0.112 → 0.0.114

package/index.js

@@ -71,10 +71,12 @@ if (argv.length === 1 && argv[0].match(/^(run|serve)$/)) {
         for (let i = 0; i < argv.length; i += 2) {
             var sync = argv[i] === 'sync',
                 url = argv[i + 1]
-            if (!url.match(/^https?:\/\//)) {
-                if (url.startsWith('/')) url = require('path').relative(sync_base, url)
-                url = `https://${url}`
+
+            if (!is_well_formed_absolute_url(url)) {
+                console.log(`malformed url: ${url}`)
+                return
             }
+
             console.log(`${sync ? '' : 'un'}subscribing ${sync ? 'to' : 'from'} ${url}`)
             try {
                 var res = await braid_fetch(`http://localhost:${config.port}/.braidfs/config`, {
@@ -769,15 +771,17 @@ async function sync_url(url) {
 
             await prev_disconnect?.()
             if (freed || closed) return
+            
+            await reconnect_rate_limiter.get_turn(url)
+            if (freed || closed) return
 
-            async function retry(e) {
+            function retry(e) {
                 if (freed || closed) return
                 var p = self.disconnect()
 
                 console.log(`reconnecting in ${waitTime}s: ${url} after error: ${e}`)
                 last_connect_timer = setTimeout(async () => {
                     await p
-                    await reconnect_rate_limiter.get_turn(url)
                     last_connect_timer = null
                     connect()
                 }, waitTime * 1000)
@@ -803,11 +807,7 @@ async function sync_url(url) {
                                 ...(x => x && {Cookie: x})(config.cookies?.[new URL(url).hostname])
                             },
                         })
-                    } catch (e) {
-                        if (freed || closed) return
-                        aborts.delete(a)
-                        throw e
-                    }
+                    } catch (e) { retry(e) }
                 }
                 
                 async function send_out(stuff) {
@@ -815,8 +815,7 @@ async function sync_url(url) {
 
                     console.log(`send_out ${url} ${JSON.stringify(stuff, null, 4).slice(0, 1000)}`)
 
-                    var r = await my_fetch({ method: "PUT", ...stuff,
-                        retry: { retryRes: r => r.status !== 401 && r.status !== 403 }})
+                    var r = await my_fetch({ method: "PUT", ...stuff })
                     if (freed || closed) return
 
                     // the server has acknowledged this version,
@@ -824,7 +823,7 @@ async function sync_url(url) {
                     if (r.ok) self.update_fork_point(stuff.version, stuff.parents)
 
                     // if we're not authorized,
-                    if (r.status == 401 || r.status == 403) {
+                    else if (r.status == 401 || r.status == 403) {
                         // and it's one of our versions (a local edit),
                         if (self.peer === braid_text.decode_version(stuff.version[0])[0]) {
                             // then revert it
@@ -833,6 +832,9 @@ async function sync_url(url) {
                             sync_url(url)
                         }
                     }
+
+                    // on other errors, restart the connection
+                    else retry(new Error(`unexpected PUT status: ${r.status}`))
                 }
 
                 async function find_fork_point() {
@@ -843,11 +845,12 @@ async function sync_url(url) {
                     if (self.fork_point) {
                         var r = await my_fetch({
                             method: "HEAD",
-                            version: self.fork_point,
-                            retry: { retryRes: r =>
-                                r.status !== 309 && r.status !== 500 }
+                            version: self.fork_point
                         })
                         if (freed || closed) return
+
+                        if (!r.ok && r.status !== 309 && r.status !== 500) return retry(new Error(`unexpected HEAD status: ${r.status}`))
+
                         if (r.ok) return console.log(`[find_fork_point] "${url.split('/').pop()}" has our latest fork point, hooray!`)
                     }
 
@@ -866,15 +869,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,
-                            retry: { retryRes: r =>
-                                r.status !== 309 && r.status !== 500 }
-                        })
+                        var r = await my_fetch({ method: "HEAD", version })
                         if (freed || closed) return
                         console.log(`fetched in ${Date.now() - st}`)
 
+                        if (!r.ok && r.status !== 309 && r.status !== 500) return retry(new Error(`unexpected HEAD status: ${r.status}`))
+
                         if (r.ok) {
                             min = i
                             self.fork_point = version
@@ -1387,3 +1387,14 @@ async function file_exists(fullpath) {
 function sha256(x) {
     return require('crypto').createHash('sha256').update(x).digest('base64')
 }
+
+function is_well_formed_absolute_url(urlString) {
+    if (!urlString || typeof urlString !== 'string') return
+    if (urlString.match(/\s/)) return
+    try {
+        var url = new URL(urlString)
+        if (url.hostname.includes('%')) return
+        if (!url.hostname) return
+        return urlString.match(/^https?:\/\//)
+    } catch (error) {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braidfs",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",