Merge pull request 'perf: lazy-load file content + fix oversized tile labels' (#5) from perf/lazy-load-and-font-fix into master

Reviewed-on: #5

.gitea/workflows/deploy.yml

@@ -0,0 +1,19 @@
+name: Deploy to OCI
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install frontend dependencies
+        run: cd web && npm ci
+
+      - name: Deploy to OCI
+        run: make deploy-oci

server/src/main.rs

@@ -2,7 +2,7 @@ mod cache;
 mod scanner;
 
 use axum::{
-    extract::{DefaultBodyLimit, Multipart, Path, State},
+    extract::{DefaultBodyLimit, Multipart, Path, Query, State},
     http::StatusCode,
     response::Json,
     routing::{get, post},
@@ -10,7 +10,7 @@ use axum::{
 };
 use cache::{Cache, RepoEntry};
 use scanner::{scan_dir, FileNode};
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::process::Command;
 use std::sync::Arc;
@@ -27,6 +27,43 @@ struct GitRequest {
     url: String,
 }
 
+#[derive(Deserialize)]
+struct FileQuery {
+    path: String,
+}
+
+/// Response wrapper that includes the cache key alongside the (content-stripped) tree.
+#[derive(Serialize)]
+struct TreeResponse {
+    cache_key: String,
+    tree: FileNode,
+}
+
+/// Recursively strip file content so the initial response is metadata-only.
+fn strip_content(node: &mut FileNode) {
+    node.content = None;
+    if let Some(children) = &mut node.children {
+        for child in children {
+            strip_content(child);
+        }
+    }
+}
+
+/// Walk the cached tree to find a single file's content by its relative path.
+fn find_file_content(node: &FileNode, path: &str) -> Option<String> {
+    if node.content.is_some() && node.path == path {
+        return node.content.clone();
+    }
+    if let Some(children) = &node.children {
+        for child in children {
+            if let Some(content) = find_file_content(child, path) {
+                return Some(content);
+            }
+        }
+    }
+    None
+}
+
 fn count_leaves(node: &FileNode) -> usize {
     match &node.children {
         Some(children) => children.iter().map(count_leaves).sum(),
@@ -55,6 +92,7 @@ async fn main() {
         .route("/api/scan-zip", post(scan_zip))
         .route("/api/repos", get(list_repos))
         .route("/api/repos/{key}", get(get_repo))
+        .route("/api/repos/{key}/file", get(get_file))
         .layer(DefaultBodyLimit::max(100 * 1024 * 1024))
         .with_state(state)
         .fallback_service(ServeDir::new(frontend_dir).append_index_html_on_directories(true));
@@ -76,19 +114,38 @@ async fn list_repos(
 async fn get_repo(
     State(state): State<Arc<AppState>>,
     Path(key): Path<String>,
-) -> Result<Json<FileNode>, (StatusCode, String)> {
+) -> Result<Json<TreeResponse>, (StatusCode, String)> {
     state
         .cache
         .get(&key)
-        .and_then(|data| serde_json::from_str(&data).ok())
+        .and_then(|data| serde_json::from_str::<FileNode>(&data).ok())
-        .map(Json)
+        .map(|mut tree| {
+            strip_content(&mut tree);
+            Json(TreeResponse { cache_key: key, tree })
+        })
         .ok_or((StatusCode::NOT_FOUND, "Repo not found in cache".to_string()))
 }
 
+async fn get_file(
+    State(state): State<Arc<AppState>>,
+    Path(key): Path<String>,
+    Query(q): Query<FileQuery>,
+) -> Result<Json<serde_json::Value>, (StatusCode, String)> {
+    let data = state
+        .cache
+        .get(&key)
+        .ok_or((StatusCode::NOT_FOUND, "Repo not found in cache".to_string()))?;
+    let tree: FileNode = serde_json::from_str(&data)
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+    let content = find_file_content(&tree, &q.path)
+        .ok_or((StatusCode::NOT_FOUND, format!("File not found: {}", q.path)))?;
+    Ok(Json(serde_json::json!({ "content": content })))
+}
+
 async fn scan_git(
     State(state): State<Arc<AppState>>,
     Json(req): Json<GitRequest>,
-) -> Result<Json<FileNode>, (StatusCode, String)> {
+) -> Result<Json<TreeResponse>, (StatusCode, String)> {
     let url = req.url.trim().to_string();
 
     if !url.starts_with("http://")
@@ -102,9 +159,10 @@ async fn scan_git(
     let key = Cache::make_key(&format!("git:{url}"));
     if let Some(cached) = state.cache.get(&key) {
         info!("Cache hit for {url}");
-        let tree: FileNode =
+        let mut tree: FileNode =
             serde_json::from_str(&cached).map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-        return Ok(Json(tree));
+        strip_content(&mut tree);
+        return Ok(Json(TreeResponse { cache_key: key, tree }));
     }
 
     // Clone into temp dir
@@ -138,18 +196,20 @@ async fn scan_git(
 
     let file_count = count_leaves(&tree);
 
+    // Cache with full content, then strip for response
     if let Ok(json_str) = serde_json::to_string(&tree) {
         state.cache.set(&key, &json_str);
         state.cache.record_repo(&key, &repo_name, &url, file_count);
     }
 
-    Ok(Json(tree))
+    strip_content(&mut tree);
+    Ok(Json(TreeResponse { cache_key: key, tree }))
 }
 
 async fn scan_zip(
     State(state): State<Arc<AppState>>,
     mut multipart: Multipart,
-) -> Result<Json<FileNode>, (StatusCode, String)> {
+) -> Result<Json<TreeResponse>, (StatusCode, String)> {
     let field = multipart
         .next_field()
         .await
@@ -173,9 +233,10 @@ async fn scan_zip(
 
     if let Some(cached) = state.cache.get(&key) {
         info!("Cache hit for zip {file_name}");
-        let tree: FileNode =
+        let mut tree: FileNode =
             serde_json::from_str(&cached).map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-        return Ok(Json(tree));
+        strip_content(&mut tree);
+        return Ok(Json(TreeResponse { cache_key: key, tree }));
     }
 
     let tmp = TempDir::new().map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
@@ -235,10 +296,12 @@ async fn scan_zip(
 
     let file_count = count_leaves(&tree);
 
+    // Cache with full content, then strip for response
     if let Ok(json_str) = serde_json::to_string(&tree) {
         state.cache.set(&key, &json_str);
         state.cache.record_repo(&key, &zip_name, &format!("zip:{file_name}"), file_count);
     }
 
-    Ok(Json(tree))
+    strip_content(&mut tree);
+    Ok(Json(TreeResponse { cache_key: key, tree }))
 }

web/src/app.js

@@ -31,7 +31,7 @@ function showError(msg) {
   alert(msg);
 }
 
-async function visualize(tree, repoName) {
+async function visualize(tree, repoName, cacheKey) {
   showLoading("Building layout...");
 
   // Wait for fonts to load so canvas renders them correctly
@@ -50,7 +50,7 @@ async function visualize(tree, repoName) {
 
   showVisualization();
   document.getElementById("osd-info").classList.add("active");
-  const renderer = new RepoRenderer(viewport, repoName || tree.name);
+  const renderer = new RepoRenderer(viewport, repoName || tree.name, cacheKey);
   await renderer.load(leaves, totalWidth, totalHeight);
 }
 
@@ -85,8 +85,8 @@ async function loadCachedRepo(key, name) {
   try {
     const res = await fetch(`/api/repos/${key}`);
     if (!res.ok) throw new Error("Cache expired");
-    const tree = await res.json();
+    const { cache_key, tree } = await res.json();
-    await visualize(tree, name);
+    await visualize(tree, name, cache_key);
   } catch (err) {
     showError(err.message);
   }
@@ -121,8 +121,8 @@ btnClone.addEventListener("click", async () => {
       throw new Error(err.error || "Clone failed");
     }
 
-    const tree = await res.json();
+    const { cache_key, tree } = await res.json();
-    await visualize(tree);
+    await visualize(tree, undefined, cache_key);
   } catch (err) {
     showError(err.message);
   } finally {
@@ -174,8 +174,8 @@ async function uploadZip(file) {
       throw new Error(err.error || "Upload failed");
     }
 
-    const tree = await res.json();
+    const { cache_key, tree } = await res.json();
-    await visualize(tree);
+    await visualize(tree, undefined, cache_key);
   } catch (err) {
     showError(err.message);
   }

web/src/renderer.js

@@ -42,9 +42,10 @@ function buildWatermark(text, cols, rows) {
 
 // ---------- renderer ----------
 export class RepoRenderer {
-  constructor(container, repoName) {
+  constructor(container, repoName, cacheKey) {
     this.container = container;
     this.repoName = repoName || "repo";
+    this.cacheKey = cacheKey || null;
     this.tiles = [];
     this.bgMeshes = [];
     this.raycaster = new THREE.Raycaster();
@@ -226,7 +227,7 @@ export class RepoRenderer {
       // --- Label (always visible, cheap — one per file) ---
       const label = new Text();
       label.text = leaf.name;
-      label.fontSize = Math.min(leaf.w, leaf.h) * 0.15;
+      label.fontSize = Math.min(Math.min(leaf.w, leaf.h) * 0.15, 5);
       label.color = 0xffffff;
       label.anchorX = "center"; label.anchorY = "middle";
       label.rotation.x = -Math.PI / 2;
@@ -235,13 +236,12 @@ export class RepoRenderer {
       this.scene.add(label);
       label.sync();
 
-      // Pre-compute syntax highlight ranges (cheap, no GPU)
-      const colorRanges = computeColorRanges(leaf.content, leaf.name);
-
       this.tiles.push({
-        bgMesh, label, darkMat, colorRanges,
+        bgMesh, label, darkMat,
         codeMesh: null, watermark: null, darkMesh: null,
-        data: leaf, showingCode: false, color, dist: Infinity
+        // colorRanges computed lazily on first _showCode
+        colorRanges: undefined,
+        data: leaf, showingCode: false, loading: false, color, dist: Infinity
       });
       this.bgMeshes.push(bgMesh);
     }
@@ -254,10 +254,43 @@ export class RepoRenderer {
     this.tooltip = document.getElementById("tooltip");
   }
 
+  // -------- lazy content fetch --------
+  async _fetchContent(tile) {
+    try {
+      const res = await fetch(
+        `/api/repos/${encodeURIComponent(this.cacheKey)}/file?path=${encodeURIComponent(tile.data.path)}`
+      );
+      if (res.ok) {
+        const { content } = await res.json();
+        tile.data.content = content;
+        // Pre-compute colorRanges right after fetch (off the hot animation path)
+        tile.colorRanges = computeColorRanges(content, tile.data.name);
+      }
+    } catch {
+      // network error — leave content null, will retry next LOD cycle
+    } finally {
+      tile.loading = false;
+    }
+  }
+
   // -------- lazy code/watermark creation --------
   _showCode(tile) {
     const d = tile.data;
 
+    // If content hasn't been loaded yet, kick off a fetch and bail
+    if (!d.content) {
+      if (!tile.loading) {
+        tile.loading = true;
+        if (this.cacheKey) this._fetchContent(tile);
+      }
+      return;
+    }
+
+    // Compute colorRanges lazily (only once, synchronous after content is available)
+    if (tile.colorRanges === undefined) {
+      tile.colorRanges = computeColorRanges(d.content, d.name);
+    }
+
     // Dark bg
     if (!tile.darkMesh) {
       tile.darkMesh = new THREE.Mesh(new THREE.PlaneGeometry(d.w, d.h), tile.darkMat);