fix(api): fix provider proxy endpoint and proxies endpoint returning provider proxies (#837)

* some fixes

* up

Author: ibigbug

clash_lib/src/app/api/handlers/provider.rs

@@ -38,7 +38,7 @@ pub fn routes(outbound_manager: ThreadSafeOutboundManager) -> Router<Arc<AppStat
                         .route("/healthcheck", get(get_proxy_delay))
                         .layer(middleware::from_fn_with_state(
                             state.clone(),
-                            find_provider_proxy_by_name,
+                            find_proxy_provider_proxy_by_name,
                         ))
                         .with_state(state.clone()),
                 )
@@ -72,21 +72,25 @@ async fn get_providers(State(state): State<ProviderState>) -> impl IntoResponse
     axum::response::Json(res)
 }
 
+#[derive(Deserialize)]
+struct ProviderNamePath {
+    provider_name: String,
+}
 async fn find_proxy_provider_by_name(
     State(state): State<ProviderState>,
-    Path(name): Path<String>,
+    Path(ProviderNamePath { provider_name }): Path<ProviderNamePath>,
     mut req: Request<axum::body::Body>,
     next: Next,
 ) -> Response {
     let outbound_manager = state.outbound_manager.clone();
-    match outbound_manager.get_proxy_provider(&name) {
+    match outbound_manager.get_proxy_provider(&provider_name) {
         Some(provider) => {
             req.extensions_mut().insert(provider);
             next.run(req).await
         }
         _ => (
             StatusCode::NOT_FOUND,
-            format!("proxy provider {} not found", name),
+            format!("proxy provider {} not found", provider_name),
         )
             .into_response(),
     }
@@ -126,16 +130,19 @@ async fn provider_healthcheck(
     (StatusCode::ACCEPTED, "provider healthcheck")
 }
 
-async fn find_provider_proxy_by_name(
+#[derive(Deserialize)]
+struct ProviderProxyPath {
+    proxy_name: String,
+}
+async fn find_proxy_provider_proxy_by_name(
     Extension(provider): Extension<ThreadSafeProxyProvider>,
-    Path(params): Path<HashMap<String, String>>,
+    Path(ProviderProxyPath { proxy_name }): Path<ProviderProxyPath>,
     mut req: Request<axum::body::Body>,
     next: Next,
 ) -> Response {
-    let proxy = provider.read().await.proxies().await;
-    let proxy = proxy
-        .iter()
-        .find(|x| Some(&x.name().to_string()) == params.get("proxy_name"));
+    let provider = provider.read().await;
+    let proxies = provider.proxies().await;
+    let proxy = proxies.iter().find(|x| x.name() == proxy_name);
 
     if let Some(proxy) = proxy {
         req.extensions_mut().insert(proxy.clone());
@@ -145,8 +152,8 @@ async fn find_provider_proxy_by_name(
             StatusCode::NOT_FOUND,
             format!(
                 "proxy {} not found in provider {}",
-                params.get("proxy_name").unwrap(),
-                provider.read().await.name()
+                proxy_name,
+                provider.name()
             ),
         )
             .into_response()

clash_lib/src/app/outbound/manager.rs

@@ -115,21 +115,13 @@ impl OutboundManager {
         self.selector_control.get(name).cloned()
     }
 
-    /// Get all proxies in the manager, including those from providers.
+    /// Get all proxies in the manager, excluding those in providers.
     pub async fn get_proxies(&self) -> HashMap<String, Box<dyn Serialize + Send>> {
         let mut r = HashMap::new();
 
         let proxy_manager = &self.proxy_manager;
 
-        let mut provider_handlers = HashMap::new();
-        for provider in self.proxy_providers.values() {
-            let proxies = provider.read().await.proxies().await;
-            for proxy in proxies {
-                provider_handlers.insert(proxy.name().to_owned(), proxy.clone());
-            }
-        }
-
-        for (k, v) in self.handlers.iter().chain(provider_handlers.iter()) {
+        for (k, v) in self.handlers.iter() {
             let mut m = if let Some(g) = v.try_as_group_handler() {
                 g.as_map().await
             } else {