Merge branch 'master' into master

Cargo.toml

@@ -39,12 +39,12 @@ hyper = "0.14.17"
 axum = { version = "0.4.5", features = ["ws", "headers"] }
 tower-http = { version = "0.2.2", features = ["fs", "trace"] }
 headers = "0.3.7"
-
 # tools download
 dirs = "4.0.0"
 reqwest = { version = "0.11", features = ["rustls-tls", "stream", "trust-dns"] }
 flate2 = "1.0.22"
 tar = "0.4.38"
+tower = "0.4.12"
 
 [[bin]]
 path = "src/main.rs"

src/config.rs

@@ -44,6 +44,7 @@ impl Default for DioxusConfig {
                 watcher: WebWatcherConfing {
                     watch_path: Some(vec![PathBuf::from("src")]),
                     reload_html: Some(false),
+                    index_on_404: Some(false),
                 },
                 resource: WebResourceConfing {
                     dev: WebDevResourceConfing {
@@ -84,6 +85,7 @@ pub struct WebAppConfing {
 pub struct WebWatcherConfing {
     pub watch_path: Option<Vec<PathBuf>>,
     pub reload_html: Option<bool>,
+    pub index_on_404: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/server/mod.rs

@@ -1,6 +1,7 @@
 use axum::{
+    body::{Full, HttpBody},
     extract::{ws::Message, Extension, TypedHeader, WebSocketUpgrade},
-    http::StatusCode,
+    http::{Response, StatusCode},
     response::IntoResponse,
     routing::{get, get_service},
     Router,
@@ -8,7 +9,8 @@ use axum::{
 use notify::{RecommendedWatcher, Watcher};
 
 use std::{path::PathBuf, sync::Arc};
-use tower_http::services::ServeDir;
+use tower::ServiceBuilder;
+use tower_http::services::fs::{ServeDir, ServeFileSystemResponseBody};
 
 use crate::{builder, serve::Serve, CrateConfig, Result};
 use tokio::sync::broadcast;
@@ -74,23 +76,56 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
     let port = "8080";
     log::info!("📡 Dev-Server is started at: http://127.0.0.1:{}/", port);
 
-    axum::Server::bind(&format!("0.0.0.0:{}", port).parse().unwrap())
+    let file_service_config = config.clone();
-        .serve(
+    let file_service = ServiceBuilder::new()
-            Router::new()
+        .and_then(
-                .route("/_dioxus/ws", get(ws_handler))
+            |response: Response<ServeFileSystemResponseBody>| async move {
-                .fallback(
+                let response = if file_service_config
-                    get_service(ServeDir::new(config.crate_dir.join(&dist_path))).handle_error(
+                    .dioxus_config
-                        |error: std::io::Error| async move {
+                    .web
-                            (
+                    .watcher
-                                StatusCode::INTERNAL_SERVER_ERROR,
+                    .index_on_404
-                                format!("Unhandled internal error: {}", error),
+                    .unwrap_or(false)
-                            )
+                    && response.status() == StatusCode::NOT_FOUND
-                        },
+                {
-                    ),
+                    let body = Full::from(
-                )
+                        // TODO: Cache/memoize this.
-                .layer(Extension(ws_reload_state))
+                        std::fs::read_to_string(
-                .into_make_service(),
+                            file_service_config
+                                .crate_dir
+                                .join(file_service_config.out_dir)
+                                .join("index.html"),
+                        )
+                        .ok()
+                        .unwrap(),
+                    )
+                    .map_err(|err| match err {})
+                    .boxed();
+                    Response::builder()
+                        .status(StatusCode::OK)
+                        .body(body)
+                        .unwrap()
+                } else {
+                    response.map(|body| body.boxed())
+                };
+                Ok(response)
+            },
         )
+        .service(ServeDir::new((&config.crate_dir).join(&dist_path)));
+
+    let router = Router::new()
+        .route("/_dioxus/ws", get(ws_handler))
+        .fallback(
+            get_service(file_service).handle_error(|error: std::io::Error| async move {
+                (
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Unhandled internal error: {}", error),
+                )
+            }),
+        );
+
+    axum::Server::bind(&format!("0.0.0.0:{}", port).parse().unwrap())
+        .serve(router.layer(Extension(ws_reload_state)).into_make_service())
         .await?;
 
     Ok(())