braidfs 0.0.65 → 0.0.67

package/index.js

@@ -161,8 +161,7 @@ async function main() {
                 var proxy = await proxy_url.cache[normalize_url(path)]
 
                 var parents = JSON.parse(decodeURIComponent(m[2]))
-                var parent_text = (await braid_text.get(proxy.url,
-                    { parents })).body
+                var parent_text = proxy?.version_to_text_cache.get(JSON.stringify(parents)) ?? (await braid_text.get(proxy.url, { parents })).body
 
                 var text = await new Promise(done => {
                     const chunks = []
@@ -462,16 +461,26 @@ async function proxy_url(url) {
         // 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()
+        self.version_to_text_cache = new Map()
         function add_to_version_cache(text, version) {
+            if (self.hash_to_version_cache.size)
+                [...self.hash_to_version_cache.values()].pop().time = Date.now()
+
             var hash = sha256(text)
-            self.hash_to_version_cache.delete(hash)
-            self.hash_to_version_cache.set(hash, { version, time: Date.now() })
+            var value = self.hash_to_version_cache.get(hash)
+            if (value) {
+                self.hash_to_version_cache.delete(hash)
+                self.version_to_text_cache.delete(JSON.stringify(value.version))
+            }
+            self.hash_to_version_cache.set(hash, { version })
+            self.version_to_text_cache.set(JSON.stringify(version), text)
 
             var too_old = Date.now() - 30000
             for (var [key, value] of self.hash_to_version_cache) {
                 if (value.time > too_old ||
                     self.hash_to_version_cache.size <= 1) break
                 self.hash_to_version_cache.delete(key)
+                self.version_to_text_cache.delete(JSON.stringify(value.version))
             }
         }
 

package/index.sh

@@ -1,21 +1,11 @@
 #!/bin/bash
 
-# Resolve the actual path of the script, even if it's a symlink
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # Resolve $SOURCE until it's no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    # If $SOURCE was a relative symlink, resolve it relative to the symlink's directory
-    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
-done
-SCRIPT_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
 # Function to calculate Base64-encoded SHA256 hash
 calculate_sha256() {
     if command -v shasum > /dev/null; then
-        echo -n "$1" | shasum -a 256 | cut -d ' ' -f 1 | xxd -r -p | base64
+        cat | shasum -a 256 | cut -d ' ' -f 1 | xxd -r -p | base64
     elif command -v sha256sum > /dev/null; then
-        echo -n "$1" | sha256sum | cut -d ' ' -f 1 | xxd -r -p | base64
+        cat | sha256sum | cut -d ' ' -f 1 | xxd -r -p | base64
     else
         echo "Error: Neither shasum nor sha256sum is available." >&2
         exit 1
@@ -64,11 +54,8 @@ if [ "$1" = "editing" ]; then
         FILENAME="$(pwd)/$FILENAME"
     fi
     
-    # Read input from stdin
-    INPUT=$(cat)
-    
-    # Calculate SHA256 hash
-    HASH=$(calculate_sha256 "$INPUT")
+    # Calculate SHA256 hash directly from stdin
+    HASH=$(calculate_sha256)
     
     # Make HTTP request
     RESPONSE=$(curl -s "http://localhost:${PORT}/.braidfs/get_version/$(urlencode "$FILENAME")/$(urlencode "$HASH")")
@@ -85,15 +72,20 @@ elif [ "$1" = "edited" ]; then
     
     PARENT_VERSION="$3"
     
-    # Read input from stdin
-    INPUT=$(cat)
-    
-    # Make HTTP request
-    RESPONSE=$(curl -s -X PUT -d "$INPUT" "http://localhost:${PORT}/.braidfs/set_version/$(urlencode "$FILENAME")/$(urlencode "$PARENT_VERSION")")
-    echo "$RESPONSE"
-    exit 0
+    # Make HTTP request (getting body from stdin)
+    curl -s -X PUT --data-binary @- "http://localhost:${PORT}/.braidfs/set_version/$(urlencode "$FILENAME")/$(urlencode "$PARENT_VERSION")"
 
 # For all other commands, pass through to the Node.js script
 else
+    # Resolve the actual path of the script, even if it's a symlink
+    SOURCE="${BASH_SOURCE[0]}"
+    while [ -h "$SOURCE" ]; do # Resolve $SOURCE until it's no longer a symlink
+        DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+        SOURCE="$(readlink "$SOURCE")"
+        # If $SOURCE was a relative symlink, resolve it relative to the symlink's directory
+        [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+    done
+    SCRIPT_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
     node "$SCRIPT_DIR/index.js" "$@"
 fi

package/package.json

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