Merge branch 'main' into fix/spa-fallback-status-code

packages/backend/src/main.rs

@@ -1,13 +1,9 @@
-use std::{collections::HashMap, sync::Arc};
-
 use axum::{
     Router, ServiceExt,
     extract::{DefaultBodyLimit, Request},
     routing::{delete, get, post},
 };
 use dotenv::dotenv;
-use lock::SharedState;
-use tokio::sync::Mutex;
 use tower::Layer;
 use tower_http::{
     compression::CompressionLayer,
@@ -19,9 +15,7 @@ use tower_http::{
 extern crate lazy_static;
 
 mod config;
-mod csp;
 mod health;
-mod lock;
 mod note;
 mod status;
 mod store;
@@ -30,26 +24,23 @@ mod store;
 async fn main() {
     dotenv().ok();
 
-    let shared_state = SharedState {
-        locks: Arc::new(Mutex::new(HashMap::new())),
-    };
-
-    if !store::can_reach_redis() {
-        println!("cannot reach redis");
-        panic!("cannot reach redis");
+    if !store::can_reach_cache() {
+        println!("cannot reach cache");
+        panic!("cannot reach cache");
     }
 
     let notes_routes = Router::new()
         .route("/", post(note::create))
-        .route("/{id}", delete(note::delete))
+        .route("/{id}", delete(note::view))
         .route("/{id}", get(note::preview));
-    let health_routes = Router::new().route("/live", get(health::report_health));
+    let health_routes = Router::new().route("/healthz", get(health::report_health));
     let status_routes = Router::new().route("/status", get(status::get_status));
-    let api_routes = Router::new()
+    let v3_routes = Router::new()
         .nest("/notes", notes_routes)
-        .merge(health_routes)
         .merge(status_routes);
 
+    let api_routes = Router::new().nest("/v3", v3_routes);
+
     let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
     // SPA fallback: serve `index.html` for client side routes.
     // `fallback` instead of `not_found_service`, as the latter forces a `404` status code,
@@ -58,9 +49,8 @@ async fn main() {
         ServeDir::new(config::FRONTEND_PATH.to_string()).fallback(ServeFile::new(index));
     let app = Router::new()
         .nest("/api", api_routes)
+        .merge(health_routes)
         .fallback_service(serve_dir)
-        // Disabled for now, as svelte inlines scripts
-        // .layer(middleware::from_fn(csp::add_csp_header))
         .layer(DefaultBodyLimit::max(*config::LIMIT))
         .layer(
             CompressionLayer::new()
@@ -68,8 +58,7 @@ async fn main() {
                 .deflate(true)
                 .gzip(true)
                 .zstd(true),
-        )
-        .with_state(shared_state);
+        );
 
     let app = NormalizePathLayer::trim_trailing_slash().layer(app);
 
@@ -80,4 +69,4 @@ async fn main() {
     axum::serve(listener, ServiceExt::<Request>::into_make_service(app))
         .await
         .unwrap();
-}
+}