From 7169e65244519dccfbea27770489902fbd245c63 Mon Sep 17 00:00:00 2001
From: liquidev <liquidev@tutanota.com>
Date: Sat, 23 Nov 2024 18:29:03 +0100
Subject: [PATCH] implement a blake3 content version layer for cache busting

works pretty much the same as our previous `?cache` parameter, but is implemented in a less ad-hoc way
---
 Cargo.lock                                    | 15 +++++
 content/programming/opinions.tree             |  2 +-
 crates/treehouse/Cargo.toml                   |  1 +
 crates/treehouse/src/main.rs                  |  4 +-
 crates/treehouse/src/vfs.rs                   |  2 +
 .../src/vfs/content_version_cache.rs          | 62 +++++++++++++++++++
 static/css/main.css                           |  4 +-
 7 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 crates/treehouse/src/vfs/content_version_cache.rs

diff --git a/Cargo.lock b/Cargo.lock
index 06748ae..80f5091 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -438,6 +438,20 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1583,6 +1597,7 @@ dependencies = [
  "clap",
  "codespan-reporting",
  "copy_dir",
+ "dashmap",
  "env_logger",
  "git2",
  "handlebars",
diff --git a/content/programming/opinions.tree b/content/programming/opinions.tree
index b162359..a920ed5 100644
--- a/content/programming/opinions.tree
+++ b/content/programming/opinions.tree
@@ -6,7 +6,7 @@
 <style>
     @font-face {
         font-family: "Determination Sans";
-        src: url('/static/font/DTM-Sans.otf?cache=b3-4fe96c14');
+        src: url('/static/font/DTM-Sans.otf?v=b3-4fe96c14');
     }
 
     .undertale-save-box {
diff --git a/crates/treehouse/Cargo.toml b/crates/treehouse/Cargo.toml
index c8914dd..81afda8 100644
--- a/crates/treehouse/Cargo.toml
+++ b/crates/treehouse/Cargo.toml
@@ -15,6 +15,7 @@ chrono = "0.4.35"
 clap = { version = "4.3.22", features = ["derive"] }
 codespan-reporting = "0.11.1"
 copy_dir = "0.1.3"
+dashmap = "6.1.0"
 env_logger = "0.10.0"
 git2 = { version = "0.19.0", default-features = false, features = ["vendored-libgit2"] }
 handlebars = "4.3.7"
diff --git a/crates/treehouse/src/main.rs b/crates/treehouse/src/main.rs
index 0242371..3741868 100644
--- a/crates/treehouse/src/main.rs
+++ b/crates/treehouse/src/main.rs
@@ -9,7 +9,7 @@ use treehouse::cli::serve::serve;
 use treehouse::dirs::Dirs;
 use treehouse::generate::{self, Sources};
 use treehouse::vfs::asynch::AsyncDir;
-use treehouse::vfs::{AnchoredAtExt, DynDir, ToDynDir, VPathBuf};
+use treehouse::vfs::{AnchoredAtExt, Blake3ContentVersionCache, DynDir, ToDynDir, VPathBuf};
 use treehouse::vfs::{Cd, PhysicalDir};
 use treehouse::{
     cli::{
@@ -42,6 +42,8 @@ fn vfs_sources() -> anyhow::Result<DynDir> {
         PhysicalDir::new(PathBuf::from("content")).to_dyn(),
     );
 
+    let root = Blake3ContentVersionCache::new(root);
+
     Ok(root.to_dyn())
 }
 
diff --git a/crates/treehouse/src/vfs.rs b/crates/treehouse/src/vfs.rs
index 6232dd5..0ae486d 100644
--- a/crates/treehouse/src/vfs.rs
+++ b/crates/treehouse/src/vfs.rs
@@ -52,6 +52,7 @@ use std::{
 mod anchored;
 pub mod asynch;
 mod cd;
+mod content_version_cache;
 mod edit;
 mod empty;
 mod file;
@@ -62,6 +63,7 @@ mod physical;
 
 pub use anchored::*;
 pub use cd::*;
+pub use content_version_cache::*;
 pub use edit::*;
 pub use empty::*;
 pub use file::*;
diff --git a/crates/treehouse/src/vfs/content_version_cache.rs b/crates/treehouse/src/vfs/content_version_cache.rs
new file mode 100644
index 0000000..0149b24
--- /dev/null
+++ b/crates/treehouse/src/vfs/content_version_cache.rs
@@ -0,0 +1,62 @@
+use std::fmt::{self, Debug};
+
+use dashmap::DashMap;
+use log::debug;
+
+use super::{Dir, DirEntry, EditPath, VPath, VPathBuf};
+
+pub struct Blake3ContentVersionCache<T> {
+    inner: T,
+    cache: DashMap<VPathBuf, Option<String>>,
+}
+
+impl<T> Blake3ContentVersionCache<T> {
+    pub fn new(inner: T) -> Self {
+        Self {
+            inner,
+            cache: DashMap::new(),
+        }
+    }
+}
+
+impl<T> Dir for Blake3ContentVersionCache<T>
+where
+    T: Dir,
+{
+    fn dir(&self, path: &VPath) -> Vec<DirEntry> {
+        self.inner.dir(path)
+    }
+
+    fn content(&self, path: &VPath) -> Option<Vec<u8>> {
+        self.inner.content(path)
+    }
+
+    fn content_version(&self, path: &VPath) -> Option<String> {
+        self.cache
+            .entry(path.to_owned())
+            .or_insert_with(|| {
+                self.content(path).map(|content| {
+                    let hash = blake3::hash(&content).to_hex();
+                    format!("b3-{}", &hash[0..8])
+                })
+            })
+            .clone()
+    }
+
+    fn anchor(&self, path: &VPath) -> Option<VPathBuf> {
+        self.inner.anchor(path)
+    }
+
+    fn edit_path(&self, path: &VPath) -> Option<EditPath> {
+        self.inner.edit_path(path)
+    }
+}
+
+impl<T> fmt::Debug for Blake3ContentVersionCache<T>
+where
+    T: Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Blake3ContentVersionCache({:?})", self.inner)
+    }
+}
diff --git a/static/css/main.css b/static/css/main.css
index b640b02..9a3264a 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -117,12 +117,12 @@ body {
        Other assets are referenced rarely enough that caching probably isn't gonna make too much of
        an impact.
        It's unlikely I'll ever update the font anyways, so eh, whatever. */
-    src: url("../font/Recursive_VF_1.085.woff2?cache=b3-445487d5");
+    src: url("../font/Recursive_VF_1.085.woff2?v=b3-445487d5");
 }
 
 @font-face {
     font-family: "RecVarMono";
-    src: url("../font/Recursive_VF_1.085.woff2?cache=b3-445487d5");
+    src: url("../font/Recursive_VF_1.085.woff2?v=b3-445487d5");
     font-variation-settings: "MONO" 1;
 }