Cargo.lock

@@ -1367,7 +1367,7 @@ dependencies = [
 
 [[package]]
 name = "karnaugh"
-version = "0.1.4"
+version = "0.1.0"
 dependencies = [
  "axum",
  "clap",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "karnaugh"
-version = "0.1.4"
+version = "0.1.0"
 edition = "2024"
 
 [dependencies]
@@ -10,7 +10,7 @@ itertools = "0.14.0"
 tar = "0.4.44"
 time = "0.3.47"
 tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread"] }
-tower-http = { version = "0.6.8", features = ["compression-br", "fs", "trace", "set-header"] }
+tower-http = { version = "0.6.8", features = ["compression-br", "fs", "trace"] }
 tracing = "0.1.43"
 tracing-subscriber = "0.3.22"
 typst-html = { git = "https://github.com/mkorje/typst.git", branch = "mathml" }

flake.nix

@@ -21,9 +21,9 @@
       rec {
         packages.karnaugh = pkgs.rustPlatform.buildRustPackage (final: {
           pname = "karnaugh";
-          version = "0.1.4";
+          version = "0.1.0";
           src = self;
-          cargoHash = "sha256-pwZOy+9cnpEskNf4HYC81UbXPJIOnUCtxEKzEVTrNyQ=";
+          cargoHash = "sha256-4jmvuQiQz5TCkY//L2qyx0AiDTxHu8EocFfysgaTaHU=";
         });
         packages.container = pkgs.dockerTools.buildImage {
           name = "karnaugh";
@@ -36,7 +36,7 @@
           };
 
           config = {
-            Entrypoint = [ "/bin/karnaugh" ];
+            Cmd = ["/bin/karnaugh"];
           };
         };
         packages.default = packages.karnaugh;

src/main.rs

@@ -8,7 +8,7 @@ use ::typst::syntax::VirtualPath;
 use axum::{
     Router,
     extract::{Path, State},
-    http::{HeaderValue, StatusCode, header::CACHE_CONTROL},
+    http::StatusCode,
     response::{Html, IntoResponse, Response},
     routing::get,
 };
@@ -17,7 +17,6 @@ use itertools::Itertools;
 use tower_http::{
     compression::CompressionLayer,
     services::{ServeDir, ServeFile},
-    set_header::SetResponseHeaderLayer,
     trace::TraceLayer,
 };
 use tracing::{Level, info};
@@ -98,29 +97,19 @@ async fn main() {
     let mut favicon = state.config.get_full_assets_path();
     favicon.push(PathBuf::from("favicon.svg"));
 
-    let assets_service = ServeDir::new(state.config.get_full_assets_path());
-
     let app = Router::new()
         .route("/", get(root_handler))
         .route("/{*path}", get(typst_handler))
         .route_service("/favicon.ico", ServeFile::new(favicon))
-        .nest_service("/assets", assets_service)
+        .nest_service("/assets", ServeDir::new(&state.config.assets_root))
         .with_state(state.clone())
         .layer(TraceLayer::new_for_http())
-        .layer(CompressionLayer::new())
+        .layer(CompressionLayer::new());
-        .layer(SetResponseHeaderLayer::overriding(
-            CACHE_CONTROL,
-            HeaderValue::from_static("public, max-age=86400, immutable"),
-        ));
 
     let socket = SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), state.config.port);
     info!("Serving Karnaugh on socket {}", socket);
-    let listener = tokio::net::TcpListener::bind(socket)
+    let listener = tokio::net::TcpListener::bind(socket).await.unwrap();
-        .await
+    axum::serve(listener, app).await.unwrap();
-        .expect(&format!("Failed to bind to socket {}", socket));
-    axum::serve(listener, app)
-        .await
-        .expect("Failed to serve site");
 }
 
 async fn root_handler(State(state): State<AppState>) -> impl IntoResponse {

src/typst/mod.rs

@@ -138,10 +138,7 @@ impl<'a> DocumentWorld<'a> {
     }
 
     fn get_package(&self, spec: &PackageSpec) -> PackageResult<PathBuf> {
-        let path = get_package_path(
+        let path = get_package_path(&VirtualPath::new("").unwrap(), spec);
-            &VirtualPath::new("").expect("Failed to create empty virtual path"),
-            spec,
-        );
         let path = path.realize(&self.context.config.packages_root);
 
         if path.exists() {
@@ -180,9 +177,6 @@ impl<'a> DocumentWorld<'a> {
 }
 
 fn get_package_path(file_path: &VirtualPath, spec: &PackageSpec) -> VirtualPath {
-    let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version))
+    let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version)).unwrap();
-        .expect("Failed to create virtual path representing package path.");
+    package_path.join(file_path.get_without_slash()).unwrap()
-    package_path
-        .join(file_path.get_without_slash())
-        .expect("Failed to join file path into package path.")
 }