Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 2.4.1

- Replace rust-embed + startup brotli/gzip compression with memory-serve (build-time compression, zero startup cost)
- Remove rust-embed, brotli, flate2, mime_guess dependencies
- Closes #613

## 2.4.0

- Upgrade axum 0.7 to 0.8, ws-bridge 0.1 to 0.2, tokio-tungstenite 0.24 to 0.28
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["shared", "backend", "frontend", "proxy", "claude-session-lib", "laun
resolver = "2"

[workspace.package]
version = "2.4.0"
version = "2.4.1"
edition = "2021"
authors = ["Matthew Goodman <d3a6d0cec0c16f3e@inboxnegative.com>"]

Expand Down
8 changes: 4 additions & 4 deletions backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ clap = { version = "4.5", features = ["derive"] }
tower-cookies = { version = "0.11", features = ["signed"] }
bigdecimal = "0.4.10"
google-cognitive-apis = { version = "0.2.2", features = ["speech-to-text"] }
rust-embed = { version = "8.11.0", features = ["axum", "mime-guess"] }
mime_guess = "2.0.5"
brotli = "8.0"
flate2 = "1.0"
memory-serve = "2.1"
ws-bridge = { workspace = true, features = ["server"] }
tower_governor = "0.8.0"
governor = "0.8"

[build-dependencies]
memory-serve = "2.1"
3 changes: 3 additions & 0 deletions backend/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
memory_serve::load_directory("../frontend/dist");
}
137 changes: 0 additions & 137 deletions backend/src/embedded_assets.rs

This file was deleted.

21 changes: 10 additions & 11 deletions backend/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
mod auth;
mod db;
mod embedded_assets;
mod errors;
mod handlers;
mod jwt;
Expand All @@ -22,7 +21,6 @@ use tower_cookies::{CookieManagerLayer, Key};
use tower_governor::governor::GovernorConfigBuilder;
use tower_governor::key_extractor::SmartIpKeyExtractor;
use tower_governor::GovernorLayer;
use tower_http::compression::CompressionLayer;
use tower_http::cors::{Any, CorsLayer};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

Expand Down Expand Up @@ -537,17 +535,18 @@ async fn main() -> anyhow::Result<()> {
.merge(auth_device_routes)
.merge(download_routes)
// Serve embedded frontend assets with SPA fallback
.fallback(axum::routing::get(embedded_assets::serve_embedded_frontend));

// Pre-compress all embedded assets at startup (brotli + gzip)
embedded_assets::init_cache();
tracing::info!("Serving embedded frontend assets");
.merge(
memory_serve::load!()
.index_file(Some("/index.html"))
.fallback(Some("/index.html"))
.fallback_status(axum::http::StatusCode::OK)
.html_cache_control(memory_serve::CacheControl::NoCache)
.cache_control(memory_serve::CacheControl::Long)
.into_router(),
);

// Add CORS and cookie management
let app = app
.layer(CompressionLayer::new())
.layer(CookieManagerLayer::new())
.layer(cors);
let app = app.layer(CookieManagerLayer::new()).layer(cors);

// Spawn background task to broadcast user spend updates
{
Expand Down
Loading