braidfs 0.0.122 → 0.0.124

package/index.js

@@ -59,7 +59,8 @@ if (require('fs').existsSync(sync_base)) {
         cookies: { 'example.com': 'secret_pass' },
         port: 45678,
         scan_interval_ms: 1000 * 20,
-        reconnect_delay_ms: 1000 * 3
+        reconnect_delay_ms: 1000 * 3,
+        retry_delay_ms: 1000,
     }
     require('fs').mkdirSync(braidfs_config_dir, { recursive: true })
     require('fs').writeFileSync(braidfs_config_file, JSON.stringify(config, null, 4))
@@ -133,11 +134,6 @@ async function main() {
 
             if (req.url === '/favicon.ico') return
 
-            if (!['::ffff:127.0.0.1', '127.0.0.1', '::1'].includes(req.socket.remoteAddress)) {
-                res.writeHead(403, { 'Content-Type': 'text/plain' })
-                return res.end('Access denied: only accessible from localhost')
-            }
-
             // Free the CORS
             free_the_cors(req, res)
             if (req.method === 'OPTIONS') return
@@ -200,7 +196,7 @@ async function main() {
             res.writeHead(500, { 'Error-Message': '' + e })
             res.end('' + e)
         }
-    }).listen(config.port, () => {
+    }).listen(config.port, 'localhost', () => {
         console.log(`daemon started on port ${config.port}`)
         console.log('!! only accessible from localhost !!')
 
@@ -525,18 +521,31 @@ async function sync_url(url) {
                 if (freed || closed) return
                 var p = self.disconnect()
 
-                console.log(`reconnecting in ${waitTime}s: ${url} after error: ${e}`)
+                var delay = waitTime * (config.retry_delay_ms ?? 1000)
+                console.log(`reconnecting in ${(delay / 1000).toFixed(2)}s: ${url} after error: ${e}`)
                 last_connect_timer = setTimeout(async () => {
                     await p
                     last_connect_timer = null
                     connect()
-                }, waitTime * 1000)
+                }, delay)
                 waitTime = Math.min(waitTime + 1, 3)
             }
 
             try {
                 var a = new AbortController()
                 aborts.add(a)
+
+                var fork_point
+                if (self.version) {
+                    // Check if server has our version
+                    var r = await braid_fetch(url, {
+                        signal: a.signal,
+                        method: "HEAD",
+                        version: ['' + self.version]
+                    })
+                    if (r.ok) fork_point = ['' + self.version]
+                }
+
                 var res = await braid_fetch(url, {
                     signal: a.signal,
                     headers: {
@@ -545,7 +554,7 @@ async function sync_url(url) {
                     subscribe: true,
                     heartbeats: 120,
                     peer: self.peer,
-                    parents: self.version != null ? ['' + self.version] : []
+                    parents: fork_point || []
                 })
                 if (freed || closed) return
 
@@ -1031,12 +1040,13 @@ async function sync_url(url) {
                 if (freed || closed) return
                 var p = self.disconnect()
 
-                console.log(`reconnecting in ${waitTime}s: ${url} after error: ${e}`)
+                var delay = waitTime * (config.retry_delay_ms ?? 1000)
+                console.log(`reconnecting in ${(delay / 1000).toFixed(2)}s: ${url} after error: ${e}`)
                 last_connect_timer = setTimeout(async () => {
                     await p
                     last_connect_timer = null
                     connect()
-                }, waitTime * 1000)
+                }, delay)
                 waitTime = Math.min(waitTime + 1, 3)
             }
 

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "braidfs",
-  "version": "0.0.122",
+  "version": "0.0.124",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",
   "homepage": "https://braid.org",
   "dependencies": {
-    "braid-http": "~1.3.79",
-    "braid-text": "~0.2.64",
-    "braid-blob": "~0.0.8",
-    "chokidar": "^4.0.3"
+    "braid-http": "~1.3.83",
+    "braid-text": "~0.2.83",
+    "braid-blob": "~0.0.30",
+    "chokidar": "^5.0.0"
   },
   "bin": {
     "braidfs": "./index.sh"