braidfs 0.0.130 → 0.0.132

package/index.js

@@ -186,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)
@@ -426,6 +429,8 @@ async function sync_url(url) {
     if (!sync_url.cache) sync_url.cache = {}
     if (!sync_url.chain) sync_url.chain = Promise.resolve()
     if (!sync_url.cache[path]) {
+        // console.log(`sync_url: ${url}`)
+
         var self = {url},
             freed = false,
             aborts = new Set()
@@ -458,16 +463,62 @@ async function sync_url(url) {
                 await require('fs').promises.unlink(fp)
             } catch (e) {}
         }
-        sync_url.cache[path] = sync_url.chain = sync_url.chain.then(init)
+
+        sync_url.cache[path] = (async () => {
+            self.merge_type = await detect_merge_type()
+            if (self.merge_type === 'dt') {
+                return await (sync_url.chain = sync_url.chain.then(init))
+            } else if (self.merge_type === 'aww') {
+                return await (sync_url.chain = sync_url.chain.then(init_binary_sync))
+            } else throw new Error(`unknown merge-type: ${self.merge_type}`)
+        })()
+    }
+    return
+
+    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() {
+        await ensure_path_stuff()
         if (freed) return
 
         console.log(`init_binary_sync: ${url}`)
 
         async function save_meta() {
             await require('fs').promises.writeFile(meta_path, JSON.stringify({
+                merge_type: self.merge_type,
                 peer: self.peer,
                 version: self.version,
                 file_mtimeNs_str: self.file_mtimeNs_str
@@ -697,12 +748,10 @@ async function sync_url(url) {
 
         return self
     }
-    
-    async function init() {
-        if (freed) return
-
-        // console.log(`sync_url: ${url}`)
 
+    async function ensure_path_stuff() {
+        if (freed) return
+        
         // if we're accessing /blah/index, it will be normalized to /blah,
         // but we still want to create a directory out of blah in this case
         if (wasnt_normal && !(await is_dir(fullpath))) {
@@ -713,15 +762,11 @@ async function sync_url(url) {
 
         await ensure_path(require("path").dirname(fullpath))
         if (freed) return
-
-        // Check if this is a binary file
-        // for now, this will be stuff in the "blobs" directory..
-        if (is_external_link && path.split('/')[1] === 'blobs') {
-            // Opts into the code for FS watcher (file_needs_reading, file_needs_writing) & unsyncing (disconnect)
-            // It notably does NOT handle `.braidfs/set_version/` and `.braidfs/get_version/` correctly!
-            // Search ` sync_url.cache[` to see how it's all handled.
-            return await init_binary_sync() 
-        }
+    }
+    
+    async function init() {
+        await ensure_path_stuff()
+        if (freed) return
 
         self.peer = Math.random().toString(36).slice(2)
         self.local_edit_counter = 0
@@ -738,6 +783,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()
@@ -799,8 +847,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)
 
@@ -858,6 +910,7 @@ async function sync_url(url) {
                     async function write_meta_file() {
                         if (freed) return
                         await wait_on(require('fs').promises.writeFile(meta_path, JSON.stringify({
+                            merge_type: self.merge_type,
                             version: file_last_version,
                             digest: sha256(self.file_last_text),
                             peer: self.peer,
@@ -912,6 +965,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 {
@@ -1037,6 +1093,7 @@ async function sync_url(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)
@@ -1055,6 +1112,7 @@ async function sync_url(url) {
                 on_disconnect: () => {
                     // 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)
                 }
@@ -1073,7 +1131,6 @@ async function sync_url(url) {
         start_sync()
         return self
     }
-    return await sync_url.cache[url]
 }
 
 async function ensure_path(path) {

package/package.json

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