braidfs 0.0.72 → 0.0.74

package/index.js

@@ -53,38 +53,6 @@ To run daemon in background:
     launchctl submit -l org.braid.braidfs -- braidfs run` : ''
 let argv = process.argv.slice(2)
 
-if (argv[0] === 'editing') {
-    return (async () => {
-        var filename = argv[1]
-        if (!require('path').isAbsolute(filename))
-            filename = require('path').resolve(process.cwd(), filename)
-        var input_string = await new Promise(done => {
-            const chunks = []
-            process.stdin.on('data', chunk => chunks.push(chunk))
-            process.stdin.on('end', () => done(Buffer.concat(chunks).toString()))
-        })
-
-        var r = await fetch(`http://localhost:${config.port}/.braidfs/get_version/${encodeURIComponent(filename)}/${encodeURIComponent(sha256(input_string))}`)
-        if (!r.ok) throw new Error(`bad status: ${r.status}`)
-        console.log(await r.text())
-    })()
-} else if (argv[0] === 'edited') {
-    return (async () => {
-        var filename = argv[1]
-        if (!require('path').isAbsolute(filename))
-            filename = require('path').resolve(process.cwd(), filename)
-        var parent_version = argv[2]
-        var input_string = await new Promise(done => {
-            const chunks = []
-            process.stdin.on('data', chunk => chunks.push(chunk))
-            process.stdin.on('end', () => done(Buffer.concat(chunks).toString()))
-        })
-        var r = await fetch(`http://localhost:${config.port}/.braidfs/set_version/${encodeURIComponent(filename)}/${encodeURIComponent(parent_version)}`, { method: 'PUT', body: input_string })
-        if (!r.ok) throw new Error(`bad status: ${r.status}`)
-        console.log(await r.text())
-    })()
-}
-
 console.log(`braidfs version: ${require(`${__dirname}/package.json`).version}`)
 
 if (argv.length === 1 && argv[0].match(/^(run|serve)$/)) {
@@ -159,7 +127,8 @@ async function main() {
                 var path = require('path').relative(proxy_base, fullpath)
                 var proxy = await proxy_url.cache[normalize_url(path)]
                 var version = proxy?.hash_to_version_cache.get(hash)?.version
-                return res.end(JSON.stringify(version ?? null))
+                if (!version) res.statusCode = 404
+                return res.end(JSON.stringify(version))
             }
 
             var m = url.match(/^\.braidfs\/set_version\/([^\/]*)\/([^\/]*)/)
@@ -690,6 +659,10 @@ 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.`)
+
                         console.log(`connected to ${url}`)
                         console.log(`  editable = ${res.headers.get('editable')}`)
 
@@ -704,7 +677,7 @@ async function proxy_url(url) {
                 },
                 peer
             }).then(x => {
-                x.subscribe(async update => {
+                if (x.status === 209) x.subscribe(async update => {
                     console.log(`got external update about ${url}`)
 
                     if (update.body) update.body = update.body_text

package/index.sh

@@ -58,9 +58,10 @@ if [ "$1" = "editing" ]; then
     HASH=$(calculate_sha256)
     
     # Make HTTP request
-    RESPONSE=$(curl -s "http://localhost:${PORT}/.braidfs/get_version/$(urlencode "$FILENAME")/$(urlencode "$HASH")")
+    RESPONSE=$(curl -s -f "http://localhost:${PORT}/.braidfs/get_version/$(urlencode "$FILENAME")/$(urlencode "$HASH")")
+    CURL_EXIT_CODE=$?
     echo "$RESPONSE"
-    exit 0
+    exit $CURL_EXIT_CODE
 
 # Check if the first argument is "edited"
 elif [ "$1" = "edited" ]; then

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "braidfs",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "description": "braid technology synchronizing files and webpages",
   "author": "Braid Working Group",
   "repository": "braid-org/braidfs",
   "homepage": "https://braid.org",
   "dependencies": {
-    "braid-http": "^1.3.70",
+    "braid-http": "^1.3.73",
     "braid-text": "^0.2.11",
     "chokidar": "^3.6.0"
   },