braidfs 0.0.129 → 0.0.131

package/index.js

@@ -30,6 +30,9 @@ braid_text.db_folder = `${braidfs_config_dir}/braid-text-db`
 var trash = `${braidfs_config_dir}/trash`
 var temp_folder = `${braidfs_config_dir}/temp`
 
+// DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+var investigating_disconnects_log = `${braidfs_config_dir}/investigating_disconnects.log`
+
 var config = null,
     watcher_misses = 0,
     reconnect_rate_limiter = new ReconnectRateLimiter(() =>
@@ -70,6 +73,13 @@ require('fs').mkdirSync(sync_base_meta, { recursive: true })
 require('fs').mkdirSync(trash, { recursive: true })
 require('fs').mkdirSync(temp_folder, { recursive: true })
 
+// DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+require('fs').appendFileSync(investigating_disconnects_log, `${Date.now()} -- braidfs starting\n`)
+function do_investigating_disconnects_log(url, message) {
+    if (url.match(/^https:\/\/(dt\.)?braid\.org\/hello$/))
+        require('fs').appendFileSync(investigating_disconnects_log, `${Date.now()}:${url} -- ${message}\n`)
+}
+
 // Add instructions for how to run in the background on this OS
 var to_run_in_background = process.platform === 'darwin' ? `
 To run daemon in background:
@@ -176,6 +186,9 @@ async function main() {
                     var version = [sync.peer + "-" + (sync.local_edit_counter - 1)]
                     await braid_text.put(sync.url, { version, parents, patches, merge_type: 'dt' })
 
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    require('fs').appendFileSync(investigating_disconnects_log, `${Date.now()}:${sync.url} -- plugin edited (${sync.investigating_disconnects_thinks_connected})\n`)
+
                     // may be able to do this more efficiently.. we want to make sure we're capturing a file write that is after our version was written.. there may be a way we can avoid calling file_needs_writing here
                     await new Promise(done => {
                         sync.file_written_cbs.push(done)
@@ -389,6 +402,9 @@ function unsync_url(url) {
 
     console.log(`unsync_url: ${url}`)
 
+    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+    do_investigating_disconnects_log(url, `unsync_url: ${url}`)
+
     delete sync_url.cache[url]
     sync_url.chain = sync_url.chain.then(unsync_url.cache[url])
     delete unsync_url.cache[url]
@@ -407,6 +423,9 @@ async function sync_url(url) {
         fullpath = `${sync_base}/${path}`,
         meta_path = `${sync_base_meta}/${braid_text.encode_filename(url)}`
 
+    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+    do_investigating_disconnects_log(url, `sync_url`)
+
     if (!sync_url.cache) sync_url.cache = {}
     if (!sync_url.chain) sync_url.chain = Promise.resolve()
     if (!sync_url.cache[path]) {
@@ -444,6 +463,41 @@ async function sync_url(url) {
         }
         sync_url.cache[path] = sync_url.chain = sync_url.chain.then(init)
     }
+
+    async function detect_merge_type() {
+        // special case for .braidfs/config and .braidfs/error
+        if (url.startsWith('.braidfs/')) return 'dt'
+
+        try {
+            var meta = JSON.parse(await require('fs').promises.readFile(meta_path, 'utf8'))
+
+            // optimization for old braidfs versions
+            if (typeof meta.local_edit_counter === 'number') return 'dt'
+
+            if (meta.merge_type) return meta.merge_type
+        } catch (e) {}
+        if (freed) return
+
+        var res = await braid_fetch(url, {
+            method: 'HEAD',
+            retry: () => true,
+            // braid_fetch will await this function on each reconnect when retrying
+            parents: async () => reconnect_rate_limiter.get_turn(url),
+            // version needed to force Merge-Type return header
+            version: [],
+            headers: {
+                // needed for braid.org routing
+                Accept: 'text/plain',
+                // in case it supports dt, so it doesn't give us "simpleton"
+                'Merge-Type': 'dt',
+            }
+        })
+
+        var merge_type = res.headers.get('merge-type')
+        if (merge_type) return merge_type
+
+        throw `failed to get merge type for ${url}`
+    }
     
     async function init_binary_sync() {
         if (freed) return
@@ -722,6 +776,9 @@ async function sync_url(url) {
         // hack: remvoe in future
         var old_meta_fork_point = null
 
+        // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+        self.investigating_disconnects_thinks_connected = false
+
         // store a recent mapping of content-hashes to their versions,
         // to support the command line: braidfs editing filename < file
         self.hash_to_version_cache = new Map()
@@ -764,6 +821,9 @@ async function sync_url(url) {
             file_loop_pump()
         }
 
+        // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+        do_investigating_disconnects_log(url, 'before within_fiber')
+
         await within_fiber(fullpath, async () => {
             if (freed) return
             var fullpath = await get_fullpath()
@@ -780,8 +840,12 @@ async function sync_url(url) {
                 !({
                     version: file_last_version,
                     digest: file_last_digest,
-                    peer: self.peer,
-                    local_edit_counter: self.local_edit_counter,
+
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    // create new peer to eliminate this as a potential issue for now:
+                    // peer: self.peer,
+                    // local_edit_counter: self.local_edit_counter,
+
                     fork_point: old_meta_fork_point
                 } = Array.isArray(meta) ? { version: meta } : meta)
 
@@ -822,6 +886,9 @@ async function sync_url(url) {
         })
         if (freed) return
 
+        // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+        do_investigating_disconnects_log(url, 'after within_fiber')
+
         await file_loop_pump()
         async function file_loop_pump() {
             if (freed) return
@@ -890,6 +957,9 @@ async function sync_url(url) {
                             await wait_on(braid_text.put(url, { version, parents, patches, merge_type: 'dt' }))
                             if (freed) return
 
+                            // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                            require('fs').appendFileSync(investigating_disconnects_log, `${Date.now()}:${url} -- file edited (${self.investigating_disconnects_thinks_connected})\n`)
+
                             await write_meta_file()
                             if (freed) return
                         } else {
@@ -961,12 +1031,21 @@ async function sync_url(url) {
             file_loop_pump_lock--
         }
 
+        // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+        do_investigating_disconnects_log(url, 'after file_loop_pump')
+
         function start_sync() {
+            // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+            do_investigating_disconnects_log(url, 'start_sync')
+
             var closed = false
             var ac = new AbortController()
             aborts.add(ac)
 
             self.disconnect = async () => {
+                // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                do_investigating_disconnects_log(url, 'self.disconnect')
+
                 if (closed) return
                 closed = true
                 reconnect_rate_limiter.on_diss(url)
@@ -987,32 +1066,55 @@ async function sync_url(url) {
 
             // Use braid_text.sync for bidirectional sync with the remote URL
             if (is_external_link) braid_text.sync(url, new URL(url), {
+
+                // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                do_investigating_disconnects_log_L04LPFHQ1M: do_investigating_disconnects_log,
+
                 fork_point_hint: old_meta_fork_point,
                 signal: ac.signal,
                 headers: {
                     'Content-Type': 'text/plain',
                     ...(x => x && { Cookie: x })(config.cookies?.[new URL(url).hostname])
                 },
-                on_pre_connect: () => reconnect_rate_limiter.get_turn(url),
+                on_pre_connect: () => {
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    do_investigating_disconnects_log(url, `sync.on_pre_connect`)
+
+                    return reconnect_rate_limiter.get_turn(url)
+                },
                 on_res: res => {
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    do_investigating_disconnects_log(url, `sync.on_res status:${res?.status}`)
+                    self.investigating_disconnects_thinks_connected = res?.status
+
                     if (freed) return
                     reconnect_rate_limiter.on_conn(url)
                     self.file_read_only = res.headers.get('editable') === 'false'
                     console.log(`connected to ${url}${self.file_read_only ? ' (readonly)' : ''}`)
                 },
                 on_unauthorized: async () => {
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    do_investigating_disconnects_log(url, `sync.on_unauthorized`)
+
                     console.log(`access denied: reverting local edits`)
                     unsync_url(url)
                     //await sync_url.chain
                     sync_url(url)
                 },
                 on_disconnect: () => {
-                    reconnect_rate_limiter.on_diss(url)
+                    // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+                    do_investigating_disconnects_log(url, `sync.on_disconnect`)
+                    self.investigating_disconnects_thinks_connected = false
+
+                    return reconnect_rate_limiter.on_diss(url)
                 }
             })
         }
 
         self.reconnect = () => {
+            // DEBUGGING HACK ID: L04LPFHQ1M -- INVESTIGATING DISCONNECTS
+            do_investigating_disconnects_log(url, `reconnect`)
+
             for (var a of aborts) a.abort()
             aborts.clear()
             start_sync()

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "braidfs",
-  "version": "0.0.129",
+  "version": "0.0.131",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",
   "homepage": "https://braid.org",
   "dependencies": {
-    "braid-http": "~1.3.83",
-    "braid-text": "~0.2.94",
+    "braid-http": "~1.3.85",
+    "braid-text": "~0.2.97",
     "braid-blob": "~0.0.30",
     "chokidar": "^4.0.3"
   },