braidfs 0.0.53 → 0.0.55

package/README.md

@@ -14,10 +14,10 @@ npm install -g braidfs
 
 ## Usage
 
-To start the braidfs server:
+To start the braidfs daemon:
 
 ```
-braidfs serve
+braidfs run
 ```
 
 To sync a URL:
@@ -37,29 +37,18 @@ To unsync a URL:
 braidfs unsync <url>
 ```
 
-## Accessing the Server
-
-The braidfs server runs on `http://localhost:10000` by default and provides the following endpoints:
-
-- `/<url>`: Synchronizes the specified URL: creates a local file, and provides a Braid-HTTP interface
-- `/.braidfs/config`: Displays the current configuration
-- `/.braidfs/errors`: Shows the error log
-
-Accessing a URL through the proxy (e.g., `http://localhost:10000/https://example.com/file.txt`) will automatically add it to the set of synced URLs, similar to using `braidfs sync <url>`.
-
 ## Configuration
 
 braidfs looks for a configuration file at `~/http/.braidfs/config`. You can set the following options:
 
-- `port`: The port number for the proxy server (default: 10000)
 - `sync`: An object where the keys are URLs to sync, and the values are simply "true"
 - `domains`: An object for setting domain-specific configurations, including authentication headers
+- `port`: The port number for the internal daemon (default: 45678)
 
 Example `config.json`:
 
 ```json
 {
-  "port": 10000,
   "sync": {
     "https://example.com/document1.txt": true,
     "https://example.com/document2.txt": true
@@ -70,7 +59,8 @@ Example `config.json`:
         "Cookie": "secret_pass"
       }
     }
-  }
+  },
+  "port": 45678
 }
 ```
 

package/index.js

@@ -28,9 +28,9 @@ if (require('fs').existsSync(proxy_base)) {
     }
 } else {
     config = {
-        port: 10000,
         sync: {},
         domains: { 'example.com': { auth_headers: { Cookie: "secret_pass" } } },
+        port: 45678,
         scan_interval_ms: 1000 * 20,
     }
     require('fs').mkdirSync(braidfs_config_dir, { recursive: true })
@@ -43,10 +43,10 @@ require('fs').mkdirSync(temp_folder, { recursive: true })
 
 // process command line args
 let to_run_in_background = process.platform === 'darwin' ? `
-To run server in background:
-    launchctl submit -l org.braid.braidfs -- braidfs serve` : ''
+To run daemon in background:
+    launchctl submit -l org.braid.braidfs -- braidfs run` : ''
 let argv = process.argv.slice(2)
-if (argv.length === 1 && argv[0] === 'serve') {
+if (argv.length === 1 && argv[0].match(/^(run|serve)$/)) {
     return main()
 } else if (argv.length && argv.length % 2 == 0 && argv.every((x, i) => i % 2 != 0 || x.match(/^(sync|unsync)$/))) {
     let operations = []
@@ -71,13 +71,13 @@ if (argv.length === 1 && argv[0] === 'serve') {
         }).then(() => console.log(`${operation}ed: ${url}`))
     )).then(() => console.log('All operations completed successfully.'))
         .catch(() => {
-            return console.log(`The braidfs server does not appear to be running.
+            return console.log(`The braidfs daemon does not appear to be running.
 You can run it with:
-    braidfs serve${to_run_in_background}`)
+    braidfs run${to_run_in_background}`)
         })
 } else {
     return console.log(`Usage:
-    braidfs serve
+    braidfs run
     braidfs sync <URL>
     braidfs unsync <URL>${to_run_in_background}`)
 }
@@ -106,7 +106,7 @@ async function main() {
 
         braid_text.serve(req, res, { key: normalize_url(url) })
     }).listen(config.port, () => {
-        console.log(`server started on port ${config.port}`)
+        console.log(`daemon started on port ${config.port}`)
         if (!config.allow_remote_access) console.log('!! only accessible from localhost !!')
 
         proxy_url('.braidfs/config').then(() => {
@@ -159,7 +159,7 @@ async function main() {
         watch_files()
         setTimeout(scan_files, 1200)
     }).on('error', e => {
-        if (e.code === 'EADDRINUSE') return console.log(`server already running on port ${config.port}`)
+        if (e.code === 'EADDRINUSE') return console.log(`port ${config.port} is in use`)
         throw e
     })
 }
@@ -582,6 +582,44 @@ async function proxy_url(url) {
             }).catch(e => (e?.name !== "AbortError") && crash(e))
         }
 
+        // send them stuff we have but they don't
+        if (is_external_link) send_new_stuff()
+        async function send_new_stuff() {
+            if (!start_something()) return
+            try {
+                let a = new AbortController()
+                aborts.add(a)
+                var r = await braid_fetch(url, {
+                    signal: a.signal,
+                    method: "HEAD",
+                    headers: {
+                        Accept: 'text/plain',
+                        ...config.domains?.[(new URL(url)).hostname]?.auth_headers,
+                    },
+                    retry: true
+                })
+                aborts.delete(a)
+
+                if (r.headers.get('editable') === 'false') {
+                    console.log('do not send updates for read-only file: ' + url)
+                    return
+                }
+
+                var chain = Promise.resolve()
+                braid_text.get(url, braid_text_get_options = {
+                    parents: r.headers.get('version') && JSON.parse(`[${r.headers.get('version')}]`),
+                    merge_type: 'dt',
+                    peer,
+                    subscribe: async (u) => {
+                        if (u.version.length) chain = chain.then(() => send_out({...u, peer}))
+                    },
+                })
+            } catch (e) {
+                if (e?.name !== "AbortError") crash(e)
+            }
+            finish_something()            
+        }
+
         // for config and errors file, listen for web changes
         if (!is_external_link) braid_text.get(url, braid_text_get_options = {
             merge_type: 'dt',

package/package.json

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