Merge pull request #302 from ikatson/main-web-ui

[Feature] Redirect to Web UI on root when looked from browser
ikatson · Jan 14, 2025 · 98e9a75 · 98e9a75
2 parents 6cb4289 + e79b51e
commit 98e9a75
Showing 1 changed file with 44 additions and 30 deletions.
diff --git a/crates/librqbit/src/http_api.rs b/crates/librqbit/src/http_api.rs
@@ -2,13 +2,14 @@ use anyhow::Context;
 use axum::body::Bytes;
 use axum::extract::{ConnectInfo, Path, Query, Request, State};
 use axum::middleware::Next;
-use axum::response::IntoResponse;
+use axum::response::{IntoResponse, Redirect};
 use axum::routing::{get, post};
 use base64::Engine;
 use bencode::AsDisplay;
 use buffers::ByteBuf;
 use futures::future::BoxFuture;
 use futures::{FutureExt, TryStreamExt};
+use http::request::Parts;
 use http::{HeaderMap, HeaderValue, StatusCode};
 use itertools::Itertools;
 
@@ -161,35 +162,48 @@ impl HttpApi {
     ) -> BoxFuture<'static, anyhow::Result<()>> {
         let state = self.inner;
 
-        async fn api_root() -> impl IntoResponse {
-            axum::Json(serde_json::json!({
-                "apis": {
-                    "GET /": "list all available APIs",
-                    "GET /dht/stats": "DHT stats",
-                    "GET /dht/table": "DHT routing table",
-                    "GET /torrents": "List torrents",
-                    "GET /torrents/playlist": "Generate M3U8 playlist for all files in all torrents",
-                    "GET /stats": "Global session stats",
-                    "POST /torrents/resolve_magnet": "Resolve a magnet to torrent file bytes",
-                    "GET /torrents/{id_or_infohash}": "Torrent details",
-                    "GET /torrents/{id_or_infohash}/haves": "The bitfield of have pieces",
-                    "GET /torrents/{id_or_infohash}/playlist": "Generate M3U8 playlist for this torrent",
-                    "GET /torrents/{id_or_infohash}/stats/v1": "Torrent stats",
-                    "GET /torrents/{id_or_infohash}/peer_stats": "Per peer stats",
-                    "GET /torrents/{id_or_infohash}/stream/{file_idx}": "Stream a file. Accepts Range header to seek.",
-                    "POST /torrents/{id_or_infohash}/pause": "Pause torrent",
-                    "POST /torrents/{id_or_infohash}/start": "Resume torrent",
-                    "POST /torrents/{id_or_infohash}/forget": "Forget about the torrent, keep the files",
-                    "POST /torrents/{id_or_infohash}/delete": "Forget about the torrent, remove the files",
-                    "POST /torrents/{id_or_infohash}/update_only_files": "Change the selection of files to download. You need to POST json of the following form {\"only_files\": [0, 1, 2]}",
-                    "POST /torrents": "Add a torrent here. magnet: or http:// or a local file.",
-                    "POST /rust_log": "Set RUST_LOG to this post launch (for debugging)",
-                    "GET /web/": "Web UI",
-                },
-                "server": "rqbit",
-                "version": env!("CARGO_PKG_VERSION"),
-            }))
-        }
+        let api_root = move |parts: Parts| async move {
+            // If browser, and webui enabled, redirect to web
+            #[cfg(feature = "webui")]
+            {
+                if parts.headers.get("Accept").map_or(false, |h| {
+                    std::str::from_utf8(h.as_bytes()).map_or(false, |s| s.contains("text/html"))
+                }) {
+                    return Redirect::temporary("./web/").into_response();
+                }
+            }
+
+            (
+                [("Content-Type", "application/json")],
+                axum::Json(serde_json::json!({
+                    "apis": {
+                        "GET /": "list all available APIs",
+                        "GET /dht/stats": "DHT stats",
+                        "GET /dht/table": "DHT routing table",
+                        "GET /torrents": "List torrents",
+                        "GET /torrents/playlist": "Generate M3U8 playlist for all files in all torrents",
+                        "GET /stats": "Global session stats",
+                        "POST /torrents/resolve_magnet": "Resolve a magnet to torrent file bytes",
+                        "GET /torrents/{id_or_infohash}": "Torrent details",
+                        "GET /torrents/{id_or_infohash}/haves": "The bitfield of have pieces",
+                        "GET /torrents/{id_or_infohash}/playlist": "Generate M3U8 playlist for this torrent",
+                        "GET /torrents/{id_or_infohash}/stats/v1": "Torrent stats",
+                        "GET /torrents/{id_or_infohash}/peer_stats": "Per peer stats",
+                        "GET /torrents/{id_or_infohash}/stream/{file_idx}": "Stream a file. Accepts Range header to seek.",
+                        "POST /torrents/{id_or_infohash}/pause": "Pause torrent",
+                        "POST /torrents/{id_or_infohash}/start": "Resume torrent",
+                        "POST /torrents/{id_or_infohash}/forget": "Forget about the torrent, keep the files",
+                        "POST /torrents/{id_or_infohash}/delete": "Forget about the torrent, remove the files",
+                        "POST /torrents/{id_or_infohash}/update_only_files": "Change the selection of files to download. You need to POST json of the following form {\"only_files\": [0, 1, 2]}",
+                        "POST /torrents": "Add a torrent here. magnet: or http:// or a local file.",
+                        "POST /rust_log": "Set RUST_LOG to this post launch (for debugging)",
+                        "GET /web/": "Web UI",
+                    },
+                    "server": "rqbit",
+                    "version": env!("CARGO_PKG_VERSION"),
+                })),
+            ).into_response()
+        };
 
         async fn dht_stats(State(state): State<ApiState>) -> Result<impl IntoResponse> {
             state.api_dht_stats().map(axum::Json)