braidfs 0.0.75 → 0.0.77

package/index.js

@@ -17,20 +17,21 @@ var config = null,
 
 if (require('fs').existsSync(proxy_base)) {
     try {
-        config = JSON.parse(require('fs').readFileSync(braidfs_config_file, 'utf8'))
-
-        // for 0.0.55 users upgrading to 0.0.56,
-        // which changes the config "domains" key to "cookies",
-        // and condenses its structure a bit
-        if (config.domains) {
-            config.cookies = Object.fromEntries(Object.entries(config.domains).map(([k, v]) => {
-                if (v.auth_headers?.Cookie) return [k, v.auth_headers.Cookie]
-            }).filter(x => x))
-            delete config.domains
-            require('fs').writeFileSync(braidfs_config_file, JSON.stringify(config, null, 4))
-        }
-    } catch (e) {
-        return console.log(`Cannot parse the configuration file at: ${braidfs_config_file}`)
+        config = require('fs').readFileSync(braidfs_config_file, 'utf8')
+    } catch (e) { return console.log(`could not find config file: ${braidfs_config_file}`) }
+    try {
+        config = JSON.parse(config)
+    } catch (e) { return console.log(`could not parse config file: ${braidfs_config_file}`) }
+
+    // for 0.0.55 users upgrading to 0.0.56,
+    // which changes the config "domains" key to "cookies",
+    // and condenses its structure a bit
+    if (config.domains) {
+        config.cookies = Object.fromEntries(Object.entries(config.domains).map(([k, v]) => {
+            if (v.auth_headers?.Cookie) return [k, v.auth_headers.Cookie]
+        }).filter(x => x))
+        delete config.domains
+        require('fs').writeFileSync(braidfs_config_file, JSON.stringify(config, null, 4))
     }
 } else {
     config = {
@@ -262,6 +263,10 @@ async function trash_file(fullpath, path) {
     await require('fs').promises.rename(fullpath, dest)
 
     // and log an error
+    await log_error(`error: unsynced file ${fullpath}; moved to ${dest}`)
+}
+
+async function log_error(text) {
     var x = await braid_text.get('.braidfs/errors', {}),
         len = [...x.body].length
     await braid_text.put('.braidfs/errors', {
@@ -269,7 +274,7 @@ async function trash_file(fullpath, path) {
         patches: [{
             unit: 'text',
             range: `[${len}:${len}]`,
-            content: `error: unsynced file ${fullpath}; moved to ${dest}\n`
+            content: `${text}\n`
         }]
     })
 }
@@ -474,11 +479,11 @@ async function proxy_url(url) {
         }
 
         async function send_out(stuff) {
-            console.log(`send_out ${url} ${JSON.stringify(stuff, null, 4).slice(0, 1000)}`)
-
             if (!start_something()) return
             if (is_external_link) {
                 try {
+                    console.log(`send_out ${url} ${JSON.stringify(stuff, null, 4).slice(0, 1000)}`)
+
                     let a = new AbortController()
                     aborts.add(a)
                     await braid_fetch(url, {
@@ -494,7 +499,7 @@ async function proxy_url(url) {
                     })
                     aborts.delete(a)
                 } catch (e) {
-                    if (e?.name !== "AbortError") crash(e)
+                    if (e?.name !== "AbortError") console.log(e)
                 }
             }
             finish_something()
@@ -515,9 +520,25 @@ async function proxy_url(url) {
                         () => 1, () => 0)) {
                         // meta file exists
                         let meta = JSON.parse(await require('fs').promises.readFile(meta_path, { encoding: 'utf8' }))
-                        let _ = ({ version: file_last_version, digest: file_last_digest } = Array.isArray(meta) ? { version: meta } : meta)
+                        void ({ version: file_last_version, digest: file_last_digest } = Array.isArray(meta) ? { version: meta } : meta)
+
+                        try {
+                            self.file_last_text = (await braid_text.get(url, { version: file_last_version })).body
+                        } catch (e) {
+                            // the version from the meta file doesn't exist..
+                            if (fullpath === braidfs_config_file) {
+                                // in the case of the config file,
+                                // we want to load the current file contents,
+                                // which we can acheive by setting file_last_version
+                                // to the latest
+                                console.log(`WARNING: there was an issue with the config file, and it is reverting to the contents at: ${braidfs_config_file}`)
+                                var x = await braid_text.get(url, {})
+                                file_last_version = x.version
+                                self.file_last_text = x.body
+                                file_last_digest = sha256(self.file_last_text)
+                            } else throw new Error(`sync error: version not found: ${file_last_version}`)
+                        }
 
-                        self.file_last_text = (await braid_text.get(url, { version: file_last_version })).body
                         file_needs_writing = !v_eq(file_last_version, (await braid_text.get(url, {})).version)
 
                         // sanity check
@@ -659,9 +680,12 @@ async function proxy_url(url) {
                 subscribe: true,
                 retry: {
                     onRes: (res) => {
-                        if (res.status !== 209) return console.log(
-                            `FAILED TO CONNECT TO: ${url}\n` +
-                            `GOT STATUS CODE: ${res.status}, expected 209.`)
+                        if (res.status !== 209) {
+                            log_error(`Can't sync ${url} -- got bad response ${res.status} from server (expected 209)`)
+                            return console.log(
+                                `FAILED TO CONNECT TO: ${url}\n` +
+                                `GOT STATUS CODE: ${res.status}, expected 209.`)
+                        }
 
                         console.log(`connected to ${url}`)
                         console.log(`  editable = ${res.headers.get('editable')}`)
@@ -694,8 +718,8 @@ async function proxy_url(url) {
 
                     self.signal_file_needs_writing()
                     finish_something()
-                }, e => (e?.name !== "AbortError") && crash(e))
-            }).catch(e => (e?.name !== "AbortError") && crash(e))
+                }, e => (e?.name !== "AbortError") && console.log(e))
+            }).catch(e => (e?.name !== "AbortError") && console.log(e))
         }
 
         // send them stuff we have but they don't
@@ -703,7 +727,7 @@ async function proxy_url(url) {
         async function send_new_stuff() {
             if (!start_something()) return
             try {
-                let a = new AbortController()
+                var a = new AbortController()
                 aborts.add(a)
                 var r = await braid_fetch(url, {
                     signal: a.signal,
@@ -721,9 +745,65 @@ async function proxy_url(url) {
                     return
                 }
 
+                if (r.headers.get('version') == null) {
+                    log_error(`Can't sync ${url} -- got no version from server`)
+                    return console.log(`GOT NO VERSION FROM: ${url}`)
+                }
+                var parents = JSON.parse(`[${r.headers.get('version')}]`)                
+
+                var bytes = (await braid_text.get_resource(url)).doc.toBytes()
+                var [_, versions, __] = braid_text.dt_parse([...bytes])
+                var agents = {}
+                for (var v of versions) agents[v[0]] = v[1]
+
+                function we_have_it(version) {
+                    var m = version.match(/^(.*)-(\d+)$/s)
+                    var agent = m[1]
+                    var seq = 1 * m[2]
+                    return (agents[agent] ?? -1) >= seq
+                }
+
+                if (parents.length && !parents.some(we_have_it)) {
+                    var min = 0
+                    var max = versions.length
+                    var last_good_parents = []
+                    while (min < max) {
+                        var i = Math.ceil((min + max)/2)
+                        parents = i ? [versions[i - 1].join('-')] : []
+
+                        console.log(`min=${min}, max=${max}, i=${i}, parents=${parents}`)
+
+                        var a = new AbortController()
+                        aborts.add(a)
+                        var st = Date.now()
+                        var r = await braid_fetch(url, {
+                            signal: a.signal,
+                            method: "HEAD",
+                            parents,
+                            headers: {
+                                Accept: 'text/plain',
+                                ...(x => x && {Cookie: x})(config.cookies?.[new URL(url).hostname]),
+                            },
+                            retry: true
+                        })
+                        console.log(`fetched in ${Date.now() - st}`)
+                        aborts.delete(a)
+
+                        if (r.ok) {
+                            min = i
+                            last_good_parents = parents
+                        } else {
+                            max = i - 1
+                        }
+                    }
+                    parents = last_good_parents
+
+                    console.log(`found good parents: ${parents}: ${url}`)
+                }
+
                 var in_parallel = create_parallel_promises(10)
                 braid_text.get(url, braid_text_get_options = {
-                    parents: r.headers.get('version') && JSON.parse(`[${r.headers.get('version')}]`),
+                    parents,
                     merge_type: 'dt',
                     peer,
                     subscribe: async (u) => {
@@ -734,7 +814,7 @@ async function proxy_url(url) {
                     },
                 })
             } catch (e) {
-                if (e?.name !== "AbortError") crash(e)
+                if (e?.name !== "AbortError") console.log(e)
             }
             finish_something()
         }
@@ -892,11 +972,6 @@ async function set_read_only(fullpath, read_only) {
     }
 }
 
-function crash(e) {
-    console.error('CRASHING: ' + e + ' ' + e.stack)
-    process.exit(1)
-}
-
 async function get_file_lock(fullpath) {
     if (!get_file_lock.locks) get_file_lock.locks = {}
     if (!get_file_lock.locks[fullpath]) get_file_lock.locks[fullpath] = Promise.resolve()

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "braidfs",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "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.11",
+    "braid-text": "^0.2.14",
     "chokidar": "^3.6.0"
   },
   "bin": {