Fix proxy (#2108)

packages/cli/src/server/web/proxy.rs

@@ -65,16 +65,43 @@ pub fn add_proxy(mut router: Router, proxy: &WebProxyConfig) -> Result<Router> {
 
     let client = ProxyClient::new(url);
 
-    router = router.route(
+    let method_router = any(move |mut req: Request<MyBody>| async move {
-        // Always remove trailing /'s so that the exact route
+        // Prevent request loops
-        // matches.
+        if req.headers().get("x-proxied-by-dioxus").is_some() {
-        &format!("/*{}", trimmed_path.trim_end_matches('/')),
+            return Err((
-        any(move |req: Request<MyBody>| async move {
+                StatusCode::NOT_FOUND,
+                "API is sharing a loopback with the dev server. Try setting a different port on the API config."
+                    .to_string(),
+            ));
+        }
+
+        req.headers_mut().insert(
+            "x-proxied-by-dioxus",
+            "true".parse().expect("header value is valid"),
+        );
+
         client
             .send(req)
             .await
             .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))
-        }),
+    });
+
+    // api/*path
+    router = router.route(
+        &format!("/{}/*path", trimmed_path.trim_end_matches('/')),
+        method_router.clone(),
+    );
+
+    // /api/
+    router = router.route(
+        &format!("/{}/", trimmed_path.trim_end_matches('/')),
+        method_router.clone(),
+    );
+
+    // /api
+    router = router.route(
+        &format!("/{}", trimmed_path.trim_end_matches('/')),
+        method_router,
     );
 
     Ok(router)

packages/hot-reload/src/lib.rs

@@ -71,9 +71,6 @@ pub fn connect(mut callback: impl FnMut(HotReloadMsg) + Send + 'static) {
             }
 
             let Ok(template) = serde_json::from_str(Box::leak(buf.into_boxed_str())) else {
-                eprintln!(
-                    "Could not parse hot reloading message - make sure your client is up to date"
-                );
                 continue;
             };
 

packages/web/src/eval.rs

@@ -1,4 +1,3 @@
-use core::panic;
 use dioxus_html::prelude::{EvalError, EvalProvider, Evaluator};
 use futures_util::StreamExt;
 use generational_box::{AnyStorage, GenerationalBox, UnsyncStorage};