From fd963a8e66096530e7328fe268870f070f31c1fd Mon Sep 17 00:00:00 2001
From: huzibaca <masterorigin91@gmail.com>
Date: Thu, 12 Sep 2024 19:01:08 +0800
Subject: [PATCH] chore: delete useless emebd server api

---
 src-tauri/src/core/tray.rs    |  2 +-
 src-tauri/src/utils/server.rs | 51 +++--------------------------------
 2 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs
index d59fad9f..7c2174cd 100644
--- a/src-tauri/src/core/tray.rs
+++ b/src-tauri/src/core/tray.rs
@@ -8,7 +8,7 @@ use crate::{
     },
 };
 use anyhow::Result;
-use tauri::tray::{MouseButton, MouseButtonState, TrayIconEvent};
+use tauri::tray::{MouseButton, TrayIconEvent};
 use tauri::{
     menu::{MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
     Wry,
diff --git a/src-tauri/src/utils/server.rs b/src-tauri/src/utils/server.rs
index 3090da36..edc4a543 100644
--- a/src-tauri/src/utils/server.rs
+++ b/src-tauri/src/utils/server.rs
@@ -4,49 +4,19 @@ use super::resolve;
 use crate::config::{Config, IVerge, DEFAULT_PAC};
 use anyhow::{bail, Result};
 use port_scanner::local_port_available;
-use std::convert::Infallible;
 use tauri::AppHandle;
-use warp::http::StatusCode;
 use warp::Filter;
 
-#[derive(serde::Deserialize, Debug)]
-struct QueryParam {
-    param: String,
-}
-
 /// check whether there is already exists
 pub async fn check_singleton() -> Result<()> {
     let port = IVerge::get_singleton_port();
-
     if !local_port_available(port) {
-        let resp = reqwest::get(format!("http://127.0.0.1:{port}/commands/ping"))
+        reqwest::get(format!("http://127.0.0.1:{port}/commands/visible"))
             .await?
             .text()
             .await?;
-
-        if &resp == "ok" {
-            let argvs: Vec<String> = std::env::args().collect();
-            if argvs.len() > 1 {
-                let param = argvs[1].as_str();
-                if param.starts_with("clash:") {
-                    reqwest::get(format!(
-                        "http://127.0.0.1:{port}/commands/scheme?param={param}"
-                    ))
-                    .await?
-                    .text()
-                    .await?;
-                }
-            } else {
-                reqwest::get(format!("http://127.0.0.1:{port}/commands/visible"))
-                    .await?
-                    .text()
-                    .await?;
-            }
-            bail!("app exists");
-        }
-
         log::error!("failed to setup singleton listen server");
-        Ok(())
+        bail!("app exists");
     } else {
         Ok(())
     }
@@ -59,8 +29,6 @@ pub fn embed_server(app_handle: &AppHandle) {
 
     let handle = app_handle.clone();
     tauri::async_runtime::spawn(async move {
-        let ping = warp::path!("commands" / "ping").map(move || "ok");
-
         let visible = warp::path!("commands" / "visible").map(move || {
             resolve::create_window(&handle);
             "ok"
@@ -82,21 +50,8 @@ pub fn embed_server(app_handle: &AppHandle) {
                 .body(content)
                 .unwrap_or_default()
         });
-        let scheme = warp::path!("commands" / "scheme")
-            .and(warp::query::<QueryParam>())
-            .and_then(scheme_handler);
 
-        async fn scheme_handler(query: QueryParam) -> Result<impl warp::Reply, Infallible> {
-            let result = resolve::resolve_scheme(query.param).await;
-            Ok(match result {
-                Ok(_) => warp::reply::with_status("Ok", StatusCode::OK),
-                Err(_) => {
-                    warp::reply::with_status("Internal Error", StatusCode::INTERNAL_SERVER_ERROR)
-                }
-            })
-        }
-
-        let commands = ping.or(visible).or(pac).or(scheme);
+        let commands = visible.or(pac);
         warp::serve(commands).run(([127, 0, 0, 1], port)).await;
     });
 }