braidfs 0.0.66 → 0.0.69

package/index.js

@@ -132,7 +132,7 @@ async function main() {
 
             if (req.url === '/favicon.ico') return
 
-            if (req.socket.remoteAddress !== '127.0.0.1' && req.socket.remoteAddress !== '::1') {
+            if (!['::ffff:127.0.0.1', '127.0.0.1', '::1'].includes(req.socket.remoteAddress)) {
                 res.writeHead(403, { 'Content-Type': 'text/plain' })
                 return res.end('Access denied: only accessible from localhost')
             }
@@ -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/package.json

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