Better frontend assets handling and move the react app to /account/ (#1324)

This makes the Vite assets handling better, namely:

 - make it possible to include any vite assets in the templates
 - include the right `<link rel="preload">` tags for assets
 - include Subresource Integrity hashes
 - pre-compress assets and remove on-the-fly compression by the Rust server
 - build the CSS used by templates through Vite

It also moves the React app from /app/ to /account/, and remove some of the old SSR account screens.

crates/cli/Cargo.toml

@@ -25,7 +25,7 @@ serde_yaml = "0.9.22"
 sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] }
 tokio = { version = "1.29.1", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
-tower-http = { version = "0.4.1", features = ["fs", "compression-full"] }
+tower-http = { version = "0.4.1", features = ["fs"] }
 url = "2.4.0"
 watchman_client = "0.8.0"
 zeroize = "1.6.0"

crates/cli/src/commands/server.rs

@@ -83,8 +83,11 @@ impl Options {
         let policy_factory = policy_factory_from_config(&config.policy).await?;
         let policy_factory = Arc::new(policy_factory);
 
-        let url_builder =
-            UrlBuilder::new(config.http.public_base.clone(), config.http.issuer.clone());
+        let url_builder = UrlBuilder::new(
+            config.http.public_base.clone(),
+            config.http.issuer.clone(),
+            None,
+        );
 
         // Load and compile the templates
         let templates = templates_from_config(&config.templates, &url_builder).await?;

crates/cli/src/commands/templates.rs

@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use camino::Utf8PathBuf;
 use clap::Parser;
+use mas_config::TemplatesConfig;
 use mas_storage::{Clock, SystemClock};
-use mas_templates::Templates;
 use rand::SeedableRng;
 use tracing::info_span;
 
+use crate::util::templates_from_config;
+
 #[derive(Parser, Debug)]
 pub(super) struct Options {
     #[clap(subcommand)]
@@ -27,26 +28,24 @@ pub(super) struct Options {
 
 #[derive(Parser, Debug)]
 enum Subcommand {
-    /// Check for template validity at given path.
-    Check {
-        /// Path where the templates are
-        path: Utf8PathBuf,
-    },
+    /// Check that the templates specified in the config are valid
+    Check,
 }
 
 impl Options {
-    pub async fn run(self, _root: &super::Options) -> anyhow::Result<()> {
+    pub async fn run(self, root: &super::Options) -> anyhow::Result<()> {
         use Subcommand as SC;
         match self.subcommand {
-            SC::Check { path } => {
+            SC::Check => {
                 let _span = info_span!("cli.templates.check").entered();
 
+                let config: TemplatesConfig = root.load_config()?;
                 let clock = SystemClock::default();
                 // XXX: we should disallow SeedableRng::from_entropy
                 let mut rng = rand_chacha::ChaChaRng::from_entropy();
                 let url_builder =
-                    mas_router::UrlBuilder::new("https://example.com/".parse()?, None);
-                let templates = Templates::load(path, url_builder).await?;
+                    mas_router::UrlBuilder::new("https://example.com/".parse()?, None, None);
+                let templates = templates_from_config(&config, &url_builder).await?;
                 templates.check_render(clock.now(), &mut rng).await?;
 
                 Ok(())

crates/cli/src/commands/worker.rs

@@ -37,8 +37,11 @@ impl Options {
         info!("Connecting to the database");
         let pool = database_from_config(&config.database).await?;
 
-        let url_builder =
-            UrlBuilder::new(config.http.public_base.clone(), config.http.issuer.clone());
+        let url_builder = UrlBuilder::new(
+            config.http.public_base.clone(),
+            config.http.issuer.clone(),
+            None,
+        );
 
         // Load and compile the templates
         let templates = templates_from_config(&config.templates, &url_builder).await?;

crates/cli/src/server.rs

@@ -26,13 +26,15 @@ use axum::{
     extract::{FromRef, MatchedPath},
     Extension, Router,
 };
-use hyper::{Method, Request, Response, StatusCode, Version};
+use hyper::{
+    header::{HeaderValue, CACHE_CONTROL},
+    Method, Request, Response, StatusCode, Version,
+};
 use listenfd::ListenFd;
 use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp};
 use mas_handlers::AppState;
 use mas_listener::{unix_or_tcp::UnixOrTcpListener, ConnectionInfo};
 use mas_router::Route;
-use mas_spa::ViteManifestService;
 use mas_templates::Templates;
 use mas_tower::{
     make_span_fn, metrics_attributes_fn, DurationRecorderLayer, InFlightCounterLayer, TraceLayer,
@@ -46,8 +48,8 @@ use opentelemetry_semantic_conventions::trace::{
 use rustls::ServerConfig;
 use sentry_tower::{NewSentryLayer, SentryHttpLayer};
 use tower::Layer;
-use tower_http::{compression::CompressionLayer, services::ServeDir};
-use tracing::Span;
+use tower_http::{services::ServeDir, set_header::SetResponseHeaderLayer};
+use tracing::{warn, Span};
 use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 const NET_PROTOCOL_NAME: Key = Key::from_static_str("net.protocol.name");
@@ -192,13 +194,23 @@ where
                 router.merge(mas_handlers::graphql_router::<AppState, B>(*playground))
             }
             mas_config::HttpResource::Assets { path } => {
-                let static_service = ServeDir::new(path).append_index_html_on_directories(false);
+                let static_service = ServeDir::new(path)
+                    .append_index_html_on_directories(false)
+                    .precompressed_br()
+                    .precompressed_gzip()
+                    .precompressed_deflate();
+
                 let error_layer =
                     HandleErrorLayer::new(|_e| ready(StatusCode::INTERNAL_SERVER_ERROR));
 
+                let cache_layer = SetResponseHeaderLayer::overriding(
+                    CACHE_CONTROL,
+                    HeaderValue::from_static("public, max-age=31536000, immutable"),
+                );
+
                 router.nest_service(
                     mas_router::StaticAsset::route(),
-                    error_layer.layer(static_service),
+                    (error_layer, cache_layer).layer(static_service),
                 )
             }
             mas_config::HttpResource::OAuth => {
@@ -215,25 +227,10 @@ where
                 }),
             ),
 
-            mas_config::HttpResource::Spa { manifest } => {
-                let error_layer =
-                    HandleErrorLayer::new(|_e| ready(StatusCode::INTERNAL_SERVER_ERROR));
-
-                // TODO: make those paths configurable
-                let app_base = "/app/";
-
-                // TODO: make that config typed and configurable
-                let config = serde_json::json!({
-                    "root": app_base,
-                });
-
-                let index_service = ViteManifestService::new(
-                    manifest.clone(),
-                    mas_router::StaticAsset::route().into(),
-                    config,
-                );
-
-                router.nest_service(app_base, error_layer.layer(index_service))
+            #[allow(deprecated)]
+            mas_config::HttpResource::Spa { .. } => {
+                warn!("The SPA HTTP resource is deprecated");
+                router
             }
         }
     }
@@ -266,7 +263,6 @@ where
         )
         .layer(SentryHttpLayer::new())
         .layer(NewSentryLayer::new_from_top())
-        .layer(CompressionLayer::new())
         .with_state(state)
 }
 

crates/cli/src/util.rs

@@ -111,7 +111,12 @@ pub async fn templates_from_config(
     config: &TemplatesConfig,
     url_builder: &UrlBuilder,
 ) -> Result<Templates, TemplateLoadingError> {
-    Templates::load(config.path.clone(), url_builder.clone()).await
+    Templates::load(
+        config.path.clone(),
+        url_builder.clone(),
+        config.assets_manifest.clone(),
+    )
+    .await
 }
 
 #[tracing::instrument(name = "db.connect", skip_all, err(Debug))]