feat: light mode wip (#96)

* 关闭窗口释放UI资源

* windows 还有左键点击事件

* 兼容enhance profile

* bug 修复

src-tauri/src/core/mod.rs

@@ -48,9 +48,10 @@ pub struct Core {
 impl Core {
   pub fn new() -> Core {
     let clash = Clash::new();
-    let verge = Verge::new();
+    let mut verge = Verge::new();
     let profiles = Profiles::new();
     let service = Service::new();
+    verge.launch_flag = Some(true);
 
     Core {
       clash: Arc::new(Mutex::new(clash)),
@@ -382,7 +383,14 @@ impl Core {
       result.error.map(|err| log::error!("{err}"));
     });
 
+    let mut verge = self.verge.lock();
+    let silent_start = verge.enable_silent_start.clone();
+    if silent_start.unwrap_or(false) && verge.launch_flag.unwrap_or(false) {
+      window.emit("script-handler-close", payload).unwrap();
+      verge.launch_flag = Some(false);
+    } else {
       window.emit("script-handler", payload).unwrap();
+    }
 
     Ok(())
   }

src-tauri/src/core/verge.rs

@@ -37,6 +37,10 @@ pub struct Verge {
   /// enable proxy guard
   pub enable_proxy_guard: Option<bool>,
 
+  /// launch flag
+  #[serde(skip_serializing)]
+  pub launch_flag: Option<bool>,
+
   /// set system proxy bypass
   pub system_proxy_bypass: Option<String>,
 

src-tauri/src/main.rs

@@ -44,10 +44,23 @@ fn main() -> std::io::Result<()> {
     .on_system_tray_event(move |app_handle, event| match event {
       SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
         "open_window" => {
-          let window = app_handle.get_window("main").unwrap();
+          tauri::window::WindowBuilder::new(
-          window.unminimize().unwrap();
+            app_handle,
-          window.show().unwrap();
+            "main".to_string(),
-          window.set_focus().unwrap();
+            tauri::WindowUrl::App("index.html".into()),
+          )
+          .title("Clash Verge")
+          .center()
+          .decorations(false)
+          .fullscreen(false)
+          .inner_size(800.0, 636.0)
+          .min_inner_size(600.0, 520.0)
+          .build()
+          .err()
+          .and_then(|e| {
+            log::error!("{e}");
+            Some(0)
+          });
         }
         "system_proxy" => {
           let core = app_handle.state::<core::Core>();
@@ -91,10 +104,23 @@ fn main() -> std::io::Result<()> {
       },
       #[cfg(target_os = "windows")]
       SystemTrayEvent::LeftClick { .. } => {
-        let window = app_handle.get_window("main").unwrap();
+        tauri::window::WindowBuilder::new(
-        window.unminimize().unwrap();
+          app_handle,
-        window.show().unwrap();
+          "main".to_string(),
-        window.set_focus().unwrap();
+          tauri::WindowUrl::App("index.html".into()),
+        )
+        .title("Clash Verge")
+        .center()
+        .decorations(false)
+        .fullscreen(false)
+        .inner_size(800.0, 636.0)
+        .min_inner_size(600.0, 520.0)
+        .build()
+        .err()
+        .and_then(|e| {
+          log::error!("{e}");
+          Some(0)
+        });
       }
       _ => {}
     })
@@ -156,17 +182,8 @@ fn main() -> std::io::Result<()> {
     .build(tauri::generate_context!())
     .expect("error while running tauri application")
     .run(|app_handle, e| match e {
-      tauri::RunEvent::WindowEvent { label, event, .. } => match event {
+      tauri::RunEvent::ExitRequested { api, .. } => {
-        tauri::WindowEvent::CloseRequested { api, .. } => {
+        api.prevent_exit();
-          let app_handle = app_handle.clone();
-          api.prevent_close();
-          app_handle.get_window(&label).unwrap().hide().unwrap();
-        }
-        _ => {}
-      },
-      tauri::RunEvent::ExitRequested { .. } => {
-        resolve::resolve_reset(app_handle);
-        api::process::kill_children();
       }
       tauri::RunEvent::Exit => {
         resolve::resolve_reset(app_handle);

src/components/layout/layout-control.tsx

@@ -30,7 +30,7 @@ const LayoutControl = () => {
       <Button
         size="small"
         sx={{ minWidth, svg: { transform: "scale(1.05)" } }}
-        onClick={() => appWindow.hide()}
+        onClick={() => appWindow.close()}
       >
         <CloseRounded fontSize="small" />
       </Button>

src/pages/_layout.tsx

@@ -35,7 +35,7 @@ const Layout = () => {
 
   useEffect(() => {
     window.addEventListener("keydown", (e) => {
-      if (e.key === "Escape") appWindow.hide();
+      if (e.key === "Escape") appWindow.close();
     });
 
     listen("verge://refresh-clash-config", async () => {

src/services/enhance.ts

@@ -1,4 +1,5 @@
-import { emit, listen } from "@tauri-apps/api/event";
+import { emit, listen, Event } from "@tauri-apps/api/event";
+import { appWindow } from "@tauri-apps/api/window";
 import { CmdType } from "./types";
 import ignoreCase from "../utils/ignore-case";
 
@@ -124,12 +125,7 @@ class Enhance {
     return this.resultMap.get(uid);
   }
 
-  // setup the handler
+  async enhanceHandler(event: Event<unknown>) {
-  setup() {
-    if (this.isSetup) return;
-    this.isSetup = true;
-
-    listen("script-handler", async (event) => {
     const payload = event.payload as CmdType.EnhancedPayload;
 
     const result = await this.runner(payload).catch((err: any) => ({
@@ -139,6 +135,19 @@ class Enhance {
     }));
 
     emit(payload.callback, JSON.stringify(result)).catch(console.error);
+  }
+  // setup the handler
+  setup() {
+    if (this.isSetup) return;
+    this.isSetup = true;
+
+    listen("script-handler", async (event) => {
+      await this.enhanceHandler(event);
+    });
+
+    listen("script-handler-close", async (event) => {
+      await this.enhanceHandler(event);
+      appWindow.close();
     });
   }