From d0b47204f414f97a12a07690bcc2142371a108a5 Mon Sep 17 00:00:00 2001
From: GyDi <zzzgydi@gmail.com>
Date: Fri, 23 Dec 2022 22:44:27 +0800
Subject: [PATCH 01/17] v1.2.1

---
 package.json              | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a9e0384..7c1e5d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "GPL-3.0",
   "scripts": {
     "dev": "tauri dev",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 40cef94..7774656 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Clash Verge",
-    "version": "1.2.0"
+    "version": "1.2.1"
   },
   "build": {
     "distDir": "../dist",

From 259ca5c5b945533b09c011ce2ab1ad98e37b20ef Mon Sep 17 00:00:00 2001
From: Hiddify <114227601+hiddify@users.noreply.github.com>
Date: Thu, 5 Jan 2023 02:38:32 +0000
Subject: [PATCH 02/17] select remote profile after import

---
 src/pages/profiles.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/profiles.tsx b/src/pages/profiles.tsx
index 0ccbd89..ac22fad 100644
--- a/src/pages/profiles.tsx
+++ b/src/pages/profiles.tsx
@@ -78,7 +78,7 @@ const ProfilePage = () => {
       // init selected array
       const { selected = [] } = profile;
       const selectedMap = Object.fromEntries(
-        selected.map((each) => [each.name!, each.now!])
+h        selected.map((each) => [each.name!, each.now!])
       );
 
       let hasChange = false;
@@ -104,21 +104,22 @@ const ProfilePage = () => {
 
   const onImport = async () => {
     if (!url) return;
-    setUrl("");
+    
     setDisabled(true);
 
     try {
       await importProfile(url);
       Notice.success("Successfully import profile.");
-
+      setUrl("");
       getProfiles().then((newProfiles) => {
         mutate("getProfiles", newProfiles);
-
-        const remoteItem = newProfiles.items?.find((e) => e.type === "remote");
-        if (!newProfiles.current && remoteItem) {
-          const current = remoteItem.uid;
+        if (newProfiles.items && newProfiles.items.length>0){
+          const lastItem = newProfiles.items[newProfiles.items.length-1];
+          const current = lastItem.uid;
           patchProfiles({ current });
           mutateLogs();
+          closeAllConnections();
+          Notice.success("Refresh clash config", 1000);
         }
       });
     } catch (err: any) {

From b96ba2e0d646c10bad3d9cf3d642ccc2bff194ea Mon Sep 17 00:00:00 2001
From: Hiddify <114227601+hiddify@users.noreply.github.com>
Date: Thu, 5 Jan 2023 02:39:55 +0000
Subject: [PATCH 03/17] get profile name from url parameter

---
 src-tauri/src/config/prfitem.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src-tauri/src/config/prfitem.rs b/src-tauri/src/config/prfitem.rs
index 0bfeb37..99ca0f0 100644
--- a/src-tauri/src/config/prfitem.rs
+++ b/src-tauri/src/config/prfitem.rs
@@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
 use std::fs;
 use sysproxy::Sysproxy;
+use tauri::regex::Regex;
 
 use super::Config;
 
@@ -276,10 +277,21 @@ impl PrfItem {
             },
             None => None,
         };
+        let re=Regex::new(r"(\?|&)name=([^&]*)(&|$)").unwrap();
+        let mut defname="Remote Profile";
+        match re.captures(url) {
+            Some(caps) => {
+                defname = caps.get(2).unwrap().as_str();        
+            }
+            None => {
+                // The regex did not match. Deal with it here!
+            }
+        }
+        
 
         let uid = help::get_uid("r");
         let file = format!("{uid}.yaml");
-        let name = name.unwrap_or(filename.unwrap_or("Remote File".into()));
+        let name = name.unwrap_or(filename.unwrap_or(defname.into()));
         let data = resp.text_with_charset("utf-8").await?;
 
         // check the data whether the valid yaml format

From af34cd7eb284a79708a6684394710e1fee1f630d Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Fri, 20 Jan 2023 15:17:08 -0800
Subject: [PATCH 04/17] Fix syntax error

---
 src/pages/profiles.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/profiles.tsx b/src/pages/profiles.tsx
index ac22fad..78a97de 100644
--- a/src/pages/profiles.tsx
+++ b/src/pages/profiles.tsx
@@ -78,7 +78,7 @@ const ProfilePage = () => {
       // init selected array
       const { selected = [] } = profile;
       const selectedMap = Object.fromEntries(
-h        selected.map((each) => [each.name!, each.now!])
+        selected.map((each) => [each.name!, each.now!])
       );
 
       let hasChange = false;

From fb731a6ba46c05f333306cf2ac857b4207e9b8eb Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Fri, 20 Jan 2023 15:17:57 -0800
Subject: [PATCH 05/17] Add deep_link package to the source(this package
 modified for this program)

---
 src-tauri/src/deep_link/linux.rs   | 143 +++++++++++++++++++++++++++++
 src-tauri/src/deep_link/macos.rs   |  11 +++
 src-tauri/src/deep_link/mod.rs     |  26 ++++++
 src-tauri/src/deep_link/windows.rs | 104 +++++++++++++++++++++
 4 files changed, 284 insertions(+)
 create mode 100644 src-tauri/src/deep_link/linux.rs
 create mode 100644 src-tauri/src/deep_link/macos.rs
 create mode 100644 src-tauri/src/deep_link/mod.rs
 create mode 100644 src-tauri/src/deep_link/windows.rs

diff --git a/src-tauri/src/deep_link/linux.rs b/src-tauri/src/deep_link/linux.rs
new file mode 100644
index 0000000..f4bf1cc
--- /dev/null
+++ b/src-tauri/src/deep_link/linux.rs
@@ -0,0 +1,143 @@
+use std::{
+    fs::{create_dir_all, remove_file, File},
+    io::{Error, ErrorKind, Read, Result, Write},
+    os::unix::net::{UnixListener, UnixStream},
+    process::Command,
+};
+
+use dirs_next::data_dir;
+
+use super::ID;
+
+pub async fn register<F,Fut>(scheme: &str, handler: F) -> Result<()>
+where
+F: FnMut(String) -> Fut + Send + 'static,
+Fut: Future<Output = ()> + Send + 'static,
+{
+    listen(handler);
+
+    let mut target = data_dir()
+        .ok_or_else(|| Error::new(ErrorKind::NotFound, "data directory not found."))?
+        .join("applications");
+
+    create_dir_all(&target)?;
+
+    let exe = tauri_utils::platform::current_exe()?;
+
+    let file_name = format!(
+        "{}-handler.desktop",
+        exe.file_name()
+            .ok_or_else(|| Error::new(
+                ErrorKind::NotFound,
+                "Couldn't get file name of curent executable.",
+            ))?
+            .to_string_lossy()
+    );
+
+    target.push(&file_name);
+
+    let mime_types = format!("x-scheme-handler/{};", scheme);
+
+    let mut file = File::create(&target)?;
+    file.write_all(
+        format!(
+            include_str!("template.desktop"),
+            name = ID
+                .get()
+                .expect("Called register() before prepare()")
+                .split('.')
+                .last()
+                .unwrap(),
+            exec = exe.to_string_lossy(),
+            mime_types = mime_types
+        )
+        .as_bytes(),
+    )?;
+
+    target.pop();
+
+    Command::new("update-desktop-database")
+        .arg(target)
+        .status()?;
+
+    Command::new("xdg-mime")
+        .args(["default", &file_name, scheme])
+        .status()?;
+
+    Ok(())
+}
+
+pub fn unregister(_scheme: &str) -> Result<()> {
+    let mut target =
+        data_dir().ok_or_else(|| Error::new(ErrorKind::NotFound, "data directory not found."))?;
+
+    target.push("applications");
+    target.push(format!(
+        "{}-handler.desktop",
+        tauri_utils::platform::current_exe()?
+            .file_name()
+            .ok_or_else(|| Error::new(
+                ErrorKind::NotFound,
+                "Couldn't get file name of curent executable.",
+            ))?
+            .to_string_lossy()
+    ));
+
+    remove_file(&target)?;
+
+    Ok(())
+}
+
+pub fn listen<F: FnMut(String) + Send + 'static>(mut handler: F) {
+    std::thread::spawn(move || {
+        let addr = format!(
+            "/tmp/{}-deep-link.sock",
+            ID.get().expect("listen() called before prepare()")
+        );
+
+        let listener = UnixListener::bind(addr).expect("Can't create listener");
+
+        for stream in listener.incoming() {
+            match stream {
+                Ok(mut stream) => {
+                    let mut buffer = String::new();
+                    if let Err(io_err) = stream.read_to_string(&mut buffer) {
+                        log::error!("Error reading incoming connection: {}", io_err.to_string());
+                    };
+
+                    handler(dbg!(buffer));
+                }
+                Err(err) => {
+                    log::error!("Incoming connection failed: {}", err);
+                    continue;
+                }
+            }
+        }
+    });
+}
+
+pub fn prepare(identifier: &str) {
+    let addr = format!("/tmp/{}-deep-link.sock", identifier);
+
+    match UnixStream::connect(&addr) {
+        Ok(mut stream) => {
+            if let Err(io_err) =
+                stream.write_all(std::env::args().nth(1).unwrap_or_default().as_bytes())
+            {
+                log::error!(
+                    "Error sending message to primary instance: {}",
+                    io_err.to_string()
+                );
+            };
+            std::process::exit(0);
+        }
+        Err(err) => {
+            log::error!("Error creating socket listener: {}", err.to_string());
+            if err.kind() == ErrorKind::ConnectionRefused {
+                let _ = remove_file(&addr);
+            }
+        }
+    };
+    ID.set(identifier.to_string())
+        .expect("prepare() called more than once with different identifiers.");
+}
diff --git a/src-tauri/src/deep_link/macos.rs b/src-tauri/src/deep_link/macos.rs
new file mode 100644
index 0000000..ba12a94
--- /dev/null
+++ b/src-tauri/src/deep_link/macos.rs
@@ -0,0 +1,11 @@
+pub fn register<F: FnMut(String) + Send + 'static>(
+    identifier: &str,
+    scheme: &str,
+    handler: F,
+) -> Result<(), std::io::Error> {
+    unimplemented!()
+}
+
+pub fn unregister(scheme: &str) -> Result<(), std::io::Error> {
+    unimplemented!()
+}
diff --git a/src-tauri/src/deep_link/mod.rs b/src-tauri/src/deep_link/mod.rs
new file mode 100644
index 0000000..165dbfe
--- /dev/null
+++ b/src-tauri/src/deep_link/mod.rs
@@ -0,0 +1,26 @@
+use once_cell::sync::OnceCell;
+
+#[cfg(target_os = "linux")]
+mod linux;
+#[cfg(target_os = "linux")]
+pub use linux::*;
+
+#[cfg(target_os = "windows")]
+mod windows;
+#[cfg(target_os = "windows")]
+pub use windows::*;
+
+#[cfg(target_os = "macos")]
+mod macos;
+#[cfg(target_os = "macos")]
+pub use macos::*;
+
+static ID: OnceCell<String> = OnceCell::new();
+
+/// This function is meant for use-cases where the default [`prepare`] function can't be used.
+///
+/// # Errors
+/// If ID was already set this functions returns an error containing the ID as String.
+pub fn set_identifier(identifier: &str) -> Result<(), String> {
+    ID.set(identifier.to_string())
+}
diff --git a/src-tauri/src/deep_link/windows.rs b/src-tauri/src/deep_link/windows.rs
new file mode 100644
index 0000000..e93f7c1
--- /dev/null
+++ b/src-tauri/src/deep_link/windows.rs
@@ -0,0 +1,104 @@
+use std::{
+    io::{BufRead, BufReader, Write},
+    path::Path, process::Output, future::IntoFuture,
+};
+
+use interprocess::local_socket::{LocalSocketListener, LocalSocketStream};
+use warp::Future;
+use ::futures::executor::block_on;
+use winreg::{enums::HKEY_CURRENT_USER, RegKey};
+use super::ID;
+
+// Consider adding a function to register without starting the listener.
+// Plugin needs linux and macOS support before making decisions.
+
+pub async fn register<F,Fut>(
+    scheme: &str,
+    handler: F,
+) -> Result<(), std::io::Error>
+where
+F: FnMut(String) -> Fut + Send + 'static,
+Fut: Future<Output = ()> + Send + 'static,
+{
+    listen(handler);
+
+    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
+    let base = Path::new("Software").join("Classes").join(scheme);
+
+    let exe = tauri_utils::platform::current_exe()?
+        .to_string_lossy()
+        .replace("\\\\?\\", "");
+
+    let (key, _) = hkcu.create_subkey(&base)?;
+    key.set_value(
+        "",
+        &format!(
+            "URL:{}",
+            ID.get().expect("register() called before prepare()")
+        ),
+    )?;
+    key.set_value("URL Protocol", &"")?;
+
+    let (icon, _) = hkcu.create_subkey(base.join("DefaultIcon"))?;
+    icon.set_value("", &format!("{},0", &exe))?;
+
+    let (cmd, _) = hkcu.create_subkey(base.join("shell").join("open").join("command"))?;
+
+    cmd.set_value("", &format!("{} \"%1\"", &exe))?;
+
+    Ok(())
+}
+
+pub fn unregister(scheme: &str) -> Result<(), std::io::Error> {
+    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
+    let base = Path::new("Software").join("Classes").join(scheme);
+
+    hkcu.delete_subkey_all(base)?;
+
+    Ok(())
+}
+
+pub fn listen<F,Fut>(mut handler: F) -> ()
+where
+F: FnMut(String) -> Fut + Send + 'static ,
+Fut:  Future<Output = ()> + Send  + 'static,
+{
+        let task_to_do = async move {
+            let listener =
+            LocalSocketListener::bind(ID.get().expect("listen() called before prepare()").as_str())
+                .expect("Can't create listener");
+
+            for conn in listener.incoming().filter_map(|c| {
+            c.map_err(|error| log::error!("Incoming connection failed: {}", error))
+                .ok()
+            })
+            {
+                let mut conn = BufReader::new(conn);
+                let mut buffer = String::new();
+                if let Err(io_err) = conn.read_line(&mut buffer) {
+                    log::error!("Error reading incoming connection: {}", io_err.to_string());
+                };
+                buffer.pop();
+
+                handler(buffer).await;
+            }
+        };
+
+        std::thread::spawn(move || block_on(task_to_do));
+}
+
+pub fn prepare(identifier: &str) {
+    if let Ok(mut conn) = LocalSocketStream::connect(identifier) {
+        if let Err(io_err) = conn.write_all(std::env::args().nth(1).unwrap_or_default().as_bytes())
+        {
+            log::error!(
+                "Error sending message to primary instance: {}",
+                io_err.to_string()
+            );
+        };
+        let _ = conn.write_all(b"\n");
+        std::process::exit(0);
+    };
+    ID.set(identifier.to_string())
+        .expect("prepare() called more than once with different identifiers.");
+}

From 36a117d2d668476402e37a20e28b36c3daabcb4e Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Fri, 20 Jan 2023 15:19:50 -0800
Subject: [PATCH 06/17] Add Deep link registering

---
 .husky/pre-commit           |  4 --
 package.json                |  8 ++--
 src-tauri/Cargo.lock        | 82 ++++++++++++++++++++++++++++++++++++-
 src-tauri/Cargo.toml        |  4 ++
 src-tauri/src/main.rs       | 31 +++++++++++++-
 src-tauri/src/utils/help.rs | 51 +++++++++++++++++++++++
 tsconfig.json               |  5 ++-
 7 files changed, 172 insertions(+), 13 deletions(-)
 delete mode 100755 .husky/pre-commit

diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100755
index f3a6796..0000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn pretty-quick --staged
diff --git a/package.json b/package.json
index 7c1e5d9..f6b2825 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
   "version": "1.2.1",
   "license": "GPL-3.0",
   "scripts": {
-    "dev": "tauri dev",
-    "dev:diff": "tauri dev -f verge-dev",
-    "build": "tauri build",
-    "tauri": "tauri",
+    "dev": "cargo tauri dev",
+    "dev:diff": "cargo tauri dev -f verge-dev",
+    "build": "cargo tauri build",
+    "tauri": "cargo tauri",
     "web:dev": "vite",
     "web:build": "tsc && vite build",
     "web:serve": "vite preview",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 09dae55..8d37707 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -370,6 +370,12 @@ version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
+[[package]]
+name = "bytecount"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+
 [[package]]
 name = "bytemuck"
 version = "1.12.3"
@@ -501,12 +507,15 @@ dependencies = [
  "delay_timer",
  "dirs 4.0.0",
  "dunce",
+ "futures 0.3.25",
+ "interprocess",
  "log 0.4.17",
  "log4rs",
  "nanoid",
  "once_cell",
  "open",
  "parking_lot",
+ "patch",
  "port_scanner",
  "reqwest",
  "rquickjs",
@@ -519,6 +528,7 @@ dependencies = [
  "tauri",
  "tauri-build",
  "tauri-runtime-wry",
+ "tauri-utils",
  "tokio",
  "warp",
  "which 4.3.0",
@@ -902,7 +912,7 @@ dependencies = [
  "cron_clock",
  "dashmap",
  "event-listener",
- "futures",
+ "futures 0.3.25",
  "log 0.4.17",
  "lru",
  "once_cell",
@@ -1169,6 +1179,12 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
+[[package]]
+name = "futures"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
+
 [[package]]
 name = "futures"
 version = "0.3.25"
@@ -1261,6 +1277,7 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
+ "futures 0.1.31",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -1885,6 +1902,32 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "interprocess"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb"
+dependencies = [
+ "blocking",
+ "cfg-if 1.0.0",
+ "futures-core",
+ "futures-io",
+ "intmap",
+ "libc",
+ "once_cell",
+ "rustc_version 0.4.0",
+ "spinning",
+ "thiserror",
+ "to_method",
+ "winapi",
+]
+
+[[package]]
+name = "intmap"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9"
+
 [[package]]
 name = "ipnet"
 version = "2.6.0"
@@ -2401,6 +2444,17 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom_locate"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e299bf5ea7b212e811e71174c5d1a5d065c4c0ad0c8691ecb1f97e3e66025e"
+dependencies = [
+ "bytecount",
+ "memchr",
+ "nom 7.1.1",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.4.0"
@@ -2692,6 +2746,17 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
 
+[[package]]
+name = "patch"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15c07fdcdd8b05bdcf2a25bc195b6c34cbd52762ada9dba88bf81e7686d14e7a"
+dependencies = [
+ "chrono",
+ "nom 7.1.1",
+ "nom_locate",
+]
+
 [[package]]
 name = "pathdiff"
 version = "0.2.1"
@@ -3787,6 +3852,15 @@ dependencies = [
  "system-deps 5.0.0",
 ]
 
+[[package]]
+name = "spinning"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -4331,6 +4405,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
+[[package]]
+name = "to_method"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"
+
 [[package]]
 name = "tokio"
 version = "1.23.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 5b8150b..6c4792e 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -41,6 +41,10 @@ tauri = { version = "1.1.1", features = ["global-shortcut-all", "process-all", "
 tauri-runtime-wry = { version = "0.12" }
 window-vibrancy = { version = "0.3.0" }
 window-shadows = { version = "0.2.0" }
+patch = "0.7.0"
+interprocess = "1.2.1"
+tauri-utils = "1.2.1"
+futures = { version = "0.3", features = ["compat"] }
 
 [target.'cfg(windows)'.dependencies]
 runas = "0.2.1"
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index a3ff866..ca6147d 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -9,11 +9,38 @@ mod core;
 mod enhance;
 mod feat;
 mod utils;
+mod deep_link;
 
-use crate::utils::{init, resolve, server};
+use crate::utils::{init, resolve, server, help};
 use tauri::{api, SystemTray};
+use std::fs::File;
+use std::io::Write;
+
+#[tokio::main]
+async fn main() -> std::io::Result<()> {
+    // Deep linking
+    
+    deep_link::prepare("top.gydi.clashverg");
+
+    let register_res = deep_link::register("clashy",| deep_link | async move {
+        // Convert deep link to something that import_profile can use
+        let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
+        // If deep link is invalid we just ignore
+        if profile_url_and_name.is_err(){
+            return
+        }
+        
+        // Import profile
+        if let Ok(_) = cmds::import_profile(profile_url_and_name.unwrap(), None).await{
+          
+        }
+    }).await;
+
+    // If we couldn't register, we log it
+    if register_res.is_err(){
+        println!("We can't register deep link scheme for program | {}",register_res.err().unwrap())
+    }
 
-fn main() -> std::io::Result<()> {
     // 单例检测
     if server::check_singleton().is_err() {
         println!("app exists");
diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 2d4a32f..0d90e77 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -105,6 +105,50 @@ pub fn open_file(path: PathBuf) -> Result<()> {
     Ok(())
 }
 
+#[derive(Debug)]
+pub enum ExtractDeeplinkError{
+    InvalidInput
+}
+pub fn extract_url_and_profile_name_from_deep_link(deep_link:&String) -> Result<(String,String),ExtractDeeplinkError>{
+    // Sample: clash://install-config?url=https://mysite.com/all.yml&name=profilename
+    let (url,profile) = {
+        let pruned = deep_link.split("url=").collect::<Vec<_>>();
+        if pruned.len() < 2 {
+            return Err(ExtractDeeplinkError::InvalidInput)
+        }
+        let url_and_profile_name = pruned[1].split("&").collect::<Vec<_>>();
+        if url_and_profile_name.len() < 2{
+            return Err(ExtractDeeplinkError::InvalidInput)
+        }
+        let url = url_and_profile_name[0].to_string();
+        let profile_name = {
+            let splitted: Vec<_> = url_and_profile_name[1].split("=").collect();
+            if splitted.len() < 2 {
+                return Err(ExtractDeeplinkError::InvalidInput)
+            }
+            splitted[1].to_string()
+        };
+
+        (url,profile_name)
+    };
+
+    return Ok((url,profile));
+}
+
+pub fn convert_deeplink_to_url_for_import_profile(deep_link:&String) -> Result<String,ExtractDeeplinkError>{
+    // Sample: clash://install-config?url=https://mysite.com/all.yml&name=profilename
+    let import_profile_url_raw = {
+        let url_part:Vec<_> = deep_link.split("url=").collect();
+        if url_part.len() < 2{
+            return Err(ExtractDeeplinkError::InvalidInput)
+        }
+        url_part
+    };
+
+    // Convert url to something that import_profile functin can use
+    let import_profile_url = import_profile_url_raw[1].replacen('&', "?", 1);
+    Ok(import_profile_url)
+}
 #[macro_export]
 macro_rules! error {
     ($result: expr) => {
@@ -169,3 +213,10 @@ fn test_parse_value() {
     assert_eq!(parse_str::<usize>(test_1, "expire1="), None);
     assert_eq!(parse_str::<usize>(test_2, "attachment="), None);
 }
+#[test]
+fn test_extract_url_and_profile_name_from_deep_link(){
+    let s = "clash://install-config?url=https://mysite.com/all.yml&name=profilename";
+    let (url,prof_name) = extract_url_and_profile_name_from_deep_link(&s.to_string()).unwrap();
+    assert_eq!(url,"https://mysite.com/all.yml");
+    assert_eq!(prof_name,"profilename");
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index a285c97..0d2a7ab 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
     "useDefineForClassFields": true,
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": false,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
@@ -16,10 +16,11 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
+    "noImplicitAny": false,
     "paths": {
       "@/*": ["src/*"],
       "@root/*": ["./*"]
-    }
+    },
   },
   "include": ["./src"]
 }

From 3b3109cb5f18716517ab7b5e5aba827d1d72b7df Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Fri, 20 Jan 2023 15:23:35 -0800
Subject: [PATCH 07/17] Comment extract_url_and_profile_name_from_deep_link
 function

---
 src-tauri/src/utils/help.rs | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 0d90e77..291d6a0 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -109,31 +109,31 @@ pub fn open_file(path: PathBuf) -> Result<()> {
 pub enum ExtractDeeplinkError{
     InvalidInput
 }
-pub fn extract_url_and_profile_name_from_deep_link(deep_link:&String) -> Result<(String,String),ExtractDeeplinkError>{
-    // Sample: clash://install-config?url=https://mysite.com/all.yml&name=profilename
-    let (url,profile) = {
-        let pruned = deep_link.split("url=").collect::<Vec<_>>();
-        if pruned.len() < 2 {
-            return Err(ExtractDeeplinkError::InvalidInput)
-        }
-        let url_and_profile_name = pruned[1].split("&").collect::<Vec<_>>();
-        if url_and_profile_name.len() < 2{
-            return Err(ExtractDeeplinkError::InvalidInput)
-        }
-        let url = url_and_profile_name[0].to_string();
-        let profile_name = {
-            let splitted: Vec<_> = url_and_profile_name[1].split("=").collect();
-            if splitted.len() < 2 {
-                return Err(ExtractDeeplinkError::InvalidInput)
-            }
-            splitted[1].to_string()
-        };
+// pub fn extract_url_and_profile_name_from_deep_link(deep_link:&String) -> Result<(String,String),ExtractDeeplinkError>{
+//     // Sample: clash://install-config?url=https://mysite.com/all.yml&name=profilename
+//     let (url,profile) = {
+//         let pruned = deep_link.split("url=").collect::<Vec<_>>();
+//         if pruned.len() < 2 {
+//             return Err(ExtractDeeplinkError::InvalidInput)
+//         }
+//         let url_and_profile_name = pruned[1].split("&").collect::<Vec<_>>();
+//         if url_and_profile_name.len() < 2{
+//             return Err(ExtractDeeplinkError::InvalidInput)
+//         }
+//         let url = url_and_profile_name[0].to_string();
+//         let profile_name = {
+//             let splitted: Vec<_> = url_and_profile_name[1].split("=").collect();
+//             if splitted.len() < 2 {
+//                 return Err(ExtractDeeplinkError::InvalidInput)
+//             }
+//             splitted[1].to_string()
+//         };
 
-        (url,profile_name)
-    };
+//         (url,profile_name)
+//     };
 
-    return Ok((url,profile));
-}
+//     return Ok((url,profile));
+// }
 
 pub fn convert_deeplink_to_url_for_import_profile(deep_link:&String) -> Result<String,ExtractDeeplinkError>{
     // Sample: clash://install-config?url=https://mysite.com/all.yml&name=profilename

From 8e82cad725b44d3ba32d44547f4048b340c15b87 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Fri, 20 Jan 2023 15:24:43 -0800
Subject: [PATCH 08/17] Comment extract_url_and_profile_name_form_deep_link
 fucntion test also

---
 src-tauri/src/utils/help.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 291d6a0..7d7366c 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -213,10 +213,10 @@ fn test_parse_value() {
     assert_eq!(parse_str::<usize>(test_1, "expire1="), None);
     assert_eq!(parse_str::<usize>(test_2, "attachment="), None);
 }
-#[test]
-fn test_extract_url_and_profile_name_from_deep_link(){
-    let s = "clash://install-config?url=https://mysite.com/all.yml&name=profilename";
-    let (url,prof_name) = extract_url_and_profile_name_from_deep_link(&s.to_string()).unwrap();
-    assert_eq!(url,"https://mysite.com/all.yml");
-    assert_eq!(prof_name,"profilename");
-}
\ No newline at end of file
+//#[test]
+// fn test_extract_url_and_profile_name_from_deep_link(){
+//     let s = "clash://install-config?url=https://mysite.com/all.yml&name=profilename";
+//     let (url,prof_name) = extract_url_and_profile_name_from_deep_link(&s.to_string()).unwrap();
+//     assert_eq!(url,"https://mysite.com/all.yml");
+//     assert_eq!(prof_name,"profilename");
+// }
\ No newline at end of file

From 525821f09360cf156ae16712b80147fe358a333c Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Sun, 22 Jan 2023 13:56:45 -0800
Subject: [PATCH 09/17] Add convert_deep_link_to_url_for_import_profile
 function, test

---
 src-tauri/src/utils/help.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 7d7366c..798e072 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -219,4 +219,14 @@ fn test_parse_value() {
 //     let (url,prof_name) = extract_url_and_profile_name_from_deep_link(&s.to_string()).unwrap();
 //     assert_eq!(url,"https://mysite.com/all.yml");
 //     assert_eq!(prof_name,"profilename");
-// }
\ No newline at end of file
+// }
+#[test]
+fn test_convert_deeplink_to_url_for_import_profile(){
+    let s = "clashy://install-config?url=https://antyfilter.aeycia.cl/80467cf865c2ef1af111716ddf30dd29/80467cf865c2ef1af111716ddf30dd29/clash/all.yml&name=all_antyfilter.aeycia.cl";
+    let res = convert_deeplink_to_url_for_import_profile(&s.to_string());
+    if res.is_err(){
+        println!("Test failed: {:?}",res.err().unwrap())
+    }else{
+        panic!("Test successfully completed")
+    }
+}
\ No newline at end of file

From d70f92f4672fc3bce2972d1e84acbb50b838de3b Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Sun, 22 Jan 2023 13:57:32 -0800
Subject: [PATCH 10/17] Add allow(unused) attribute for app_res_dir

---
 src-tauri/src/utils/dirs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/src/utils/dirs.rs b/src-tauri/src/utils/dirs.rs
index 42aa053..2206191 100644
--- a/src-tauri/src/utils/dirs.rs
+++ b/src-tauri/src/utils/dirs.rs
@@ -106,7 +106,7 @@ pub fn verge_path() -> Result<PathBuf> {
 pub fn profiles_path() -> Result<PathBuf> {
     Ok(app_home_dir()?.join(PROFILE_YAML))
 }
-
+#[allow(unused)]
 pub fn app_res_dir() -> Result<PathBuf> {
     unsafe {
         Ok(RESOURCE_DIR

From f7a70796e2c00fda8043b083378673ac2ada30c9 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Sun, 22 Jan 2023 13:58:34 -0800
Subject: [PATCH 11/17] Add allow(unused) for set_identifier function

---
 src-tauri/src/deep_link/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-tauri/src/deep_link/mod.rs b/src-tauri/src/deep_link/mod.rs
index 165dbfe..262ef93 100644
--- a/src-tauri/src/deep_link/mod.rs
+++ b/src-tauri/src/deep_link/mod.rs
@@ -21,6 +21,7 @@ static ID: OnceCell<String> = OnceCell::new();
 ///
 /// # Errors
 /// If ID was already set this functions returns an error containing the ID as String.
+#[allow(unused)]
 pub fn set_identifier(identifier: &str) -> Result<(), String> {
     ID.set(identifier.to_string())
 }

From d8942cd64d242e2538178a42a2a68fd297d9232f Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Sun, 22 Jan 2023 13:59:55 -0800
Subject: [PATCH 12/17] Edit deep link listener to run register async closure
 in a new thread

---
 src-tauri/src/deep_link/windows.rs | 43 ++++++++++++++----------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src-tauri/src/deep_link/windows.rs b/src-tauri/src/deep_link/windows.rs
index e93f7c1..f5d42cf 100644
--- a/src-tauri/src/deep_link/windows.rs
+++ b/src-tauri/src/deep_link/windows.rs
@@ -1,11 +1,10 @@
 use std::{
     io::{BufRead, BufReader, Write},
-    path::Path, process::Output, future::IntoFuture,
+    path::Path,
 };
 
 use interprocess::local_socket::{LocalSocketListener, LocalSocketStream};
 use warp::Future;
-use ::futures::executor::block_on;
 use winreg::{enums::HKEY_CURRENT_USER, RegKey};
 use super::ID;
 
@@ -21,7 +20,6 @@ F: FnMut(String) -> Fut + Send + 'static,
 Fut: Future<Output = ()> + Send + 'static,
 {
     listen(handler);
-
     let hkcu = RegKey::predef(HKEY_CURRENT_USER);
     let base = Path::new("Software").join("Classes").join(scheme);
 
@@ -49,6 +47,7 @@ Fut: Future<Output = ()> + Send + 'static,
     Ok(())
 }
 
+#[allow(unused)]
 pub fn unregister(scheme: &str) -> Result<(), std::io::Error> {
     let hkcu = RegKey::predef(HKEY_CURRENT_USER);
     let base = Path::new("Software").join("Classes").join(scheme);
@@ -63,28 +62,26 @@ where
 F: FnMut(String) -> Fut + Send + 'static ,
 Fut:  Future<Output = ()> + Send  + 'static,
 {
-        let task_to_do = async move {
-            let listener =
-            LocalSocketListener::bind(ID.get().expect("listen() called before prepare()").as_str())
-                .expect("Can't create listener");
+    let task_to_do = async move {
+        let listener =
+        LocalSocketListener::bind(ID.get().expect("listen() called before prepare()").as_str())
+            .expect("Can't create listener");
 
-            for conn in listener.incoming().filter_map(|c| {
-            c.map_err(|error| log::error!("Incoming connection failed: {}", error))
-                .ok()
-            })
-            {
-                let mut conn = BufReader::new(conn);
-                let mut buffer = String::new();
-                if let Err(io_err) = conn.read_line(&mut buffer) {
-                    log::error!("Error reading incoming connection: {}", io_err.to_string());
-                };
-                buffer.pop();
+        for conn in listener.incoming().filter_map(|c| {c.map_err(|error| log::error!("Incoming connection failed: {}", error)).ok()})
+        {
+            let mut conn = BufReader::new(conn);
+            let mut buffer = String::new();
+            if let Err(io_err) = conn.read_line(&mut buffer) {
+                log::error!("Error reading incoming connection: {}", io_err.to_string());
+            };
+            buffer.pop();
+            handler(buffer).await;
+        }
+    };
+    tokio::spawn(async move{
+        task_to_do.await;
+    });
 
-                handler(buffer).await;
-            }
-        };
-
-        std::thread::spawn(move || block_on(task_to_do));
 }
 
 pub fn prepare(identifier: &str) {

From 21c24a98d259c8514e6e3194a3aee01252d69d83 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Sun, 22 Jan 2023 14:00:53 -0800
Subject: [PATCH 13/17] Add error handling for deep link registration

---
 src-tauri/Cargo.lock  | 86 +++++++++++++++++++++++++++++++++++++++++++
 src-tauri/Cargo.toml  |  1 +
 src-tauri/src/main.rs | 23 ++++++------
 3 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 8d37707..1e797fb 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -82,6 +82,16 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
 
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.8.0"
@@ -119,6 +129,22 @@ dependencies = [
  "futures-lite",
 ]
 
+[[package]]
+name = "async-global-executor"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+ "tokio",
+]
+
 [[package]]
 name = "async-io"
 version = "1.12.0"
@@ -179,6 +205,33 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-attributes",
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log 0.4.17",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "async-task"
 version = "4.3.0"
@@ -500,6 +553,7 @@ name = "clash-verge"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "async-std",
  "auto-launch",
  "chrono",
  "ctrlc",
@@ -1516,6 +1570,18 @@ dependencies = [
  "regex 1.7.0",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.15.10"
@@ -2021,6 +2087,15 @@ dependencies = [
  "selectors",
 ]
 
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log 0.4.17",
+]
+
 [[package]]
 name = "lazy_static"
 version = "0.2.11"
@@ -2124,6 +2199,7 @@ checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
+ "value-bag",
 ]
 
 [[package]]
@@ -4745,6 +4821,16 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+dependencies = [
+ "ctor",
+ "version_check",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 6c4792e..14a8ddd 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -35,6 +35,7 @@ port_scanner = "0.1.5"
 delay_timer = "0.11.1"
 parking_lot = "0.12.0"
 tokio = { version = "1", features = ["full"] }
+async-std = { version = "1", features = ["attributes", "tokio1"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json"] }
 tauri = { version = "1.1.1", features = ["global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index ca6147d..0806281 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -12,33 +12,34 @@ mod utils;
 mod deep_link;
 
 use crate::utils::{init, resolve, server, help};
+use crate::core::handle::Handle;
 use tauri::{api, SystemTray};
-use std::fs::File;
-use std::io::Write;
 
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    // Deep linking
     
+    // Deep linking
     deep_link::prepare("top.gydi.clashverg");
-
-    let register_res = deep_link::register("clashy",| deep_link | async move {
+    
+    let deep_link_register_result = deep_link::register("clashy",| deep_link | async move {
         // Convert deep link to something that import_profile can use
         let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
-        // If deep link is invalid we just ignore
+        // If deep link is invalid, we pop up a message to user
         if profile_url_and_name.is_err(){
-            return
+            Handle::notice_message("set_config::error", "Profile url is invalid");
         }
         
         // Import profile
-        if let Ok(_) = cmds::import_profile(profile_url_and_name.unwrap(), None).await{
-          
+        let import_result = cmds::import_profile(profile_url_and_name.unwrap(), None).await;
+        // If we couldn't import profile& we pop up a message to user
+        if import_result.is_err(){
+            Handle::notice_message("set_config::error",format!("Profile url is invalid | {}", import_result.err().unwrap()));
         }
     }).await;
 
     // If we couldn't register, we log it
-    if register_res.is_err(){
-        println!("We can't register deep link scheme for program | {}",register_res.err().unwrap())
+    if deep_link_register_result.is_err(){
+        println!("We can't register deep link scheme for program | {}",deep_link_register_result.err().unwrap())
     }
 
     // 单例检测

From 1dfd32ea313e653c619e692b0a54e465c741d1db Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Mon, 23 Jan 2023 15:28:14 -0800
Subject: [PATCH 14/17] Change program name to "HiddifyDesktop"

---
 package.json              |   2 +-
 src-tauri/Cargo.lock      | 135 +++-----------------------------------
 src-tauri/Cargo.toml      |   2 +-
 src-tauri/src/main.rs     |   5 +-
 src-tauri/tauri.conf.json |   6 +-
 5 files changed, 17 insertions(+), 133 deletions(-)

diff --git a/package.json b/package.json
index f6b2825..baf210b 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "clash-verge",
+  "name": "HiddifyDesktop",
   "version": "1.2.1",
   "license": "GPL-3.0",
   "scripts": {
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 1e797fb..91f4c69 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -279,22 +279,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
 
-[[package]]
-name = "attohttpc"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log 0.4.17",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
-
 [[package]]
 name = "auto-launch"
 version = "0.4.0"
@@ -1435,7 +1419,7 @@ dependencies = [
  "libc",
  "log 0.4.17",
  "rustversion",
- "windows 0.39.0",
+ "windows",
 ]
 
 [[package]]
@@ -2354,12 +2338,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.5.4"
@@ -2632,17 +2610,6 @@ dependencies = [
  "objc_exception",
 ]
 
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -3356,30 +3323,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "rfd"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
-dependencies = [
- "block",
- "dispatch",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "lazy_static 1.4.0",
- "log 0.4.17",
- "objc",
- "objc-foundation",
- "objc_id",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.37.0",
-]
-
 [[package]]
 name = "rquickjs"
 version = "0.1.7"
@@ -4090,7 +4033,7 @@ dependencies = [
  "serde",
  "unicode-segmentation",
  "uuid 1.2.2",
- "windows 0.39.0",
+ "windows",
  "windows-implement",
  "x11-dl",
 ]
@@ -4113,8 +4056,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8ea1d785ab2164373703817bff144c4610a69ad3f659becaca0e1ea004b98d8"
 dependencies = [
  "anyhow",
- "attohttpc",
- "base64",
  "cocoa",
  "dirs-next",
  "embed_plist",
@@ -4127,7 +4068,6 @@ dependencies = [
  "heck 0.4.0",
  "http",
  "ignore",
- "minisign-verify",
  "objc",
  "once_cell",
  "open",
@@ -4136,7 +4076,6 @@ dependencies = [
  "rand 0.8.5",
  "raw-window-handle",
  "regex 1.7.0",
- "rfd",
  "semver 1.0.14",
  "serde",
  "serde_json",
@@ -4151,14 +4090,12 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
- "time 0.3.17",
  "tokio",
  "url",
  "uuid 1.2.2",
  "webkit2gtk",
  "webview2-com",
- "windows 0.39.0",
- "zip",
+ "windows",
 ]
 
 [[package]]
@@ -4234,7 +4171,7 @@ dependencies = [
  "thiserror",
  "uuid 1.2.2",
  "webview2-com",
- "windows 0.39.0",
+ "windows",
 ]
 
 [[package]]
@@ -4253,7 +4190,7 @@ dependencies = [
  "uuid 1.2.2",
  "webkit2gtk",
  "webview2-com",
- "windows 0.39.0",
+ "windows",
  "wry",
 ]
 
@@ -4282,7 +4219,7 @@ dependencies = [
  "thiserror",
  "url",
  "walkdir",
- "windows 0.39.0",
+ "windows",
 ]
 
 [[package]]
@@ -5071,7 +5008,7 @@ checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.39.0",
+ "windows",
  "windows-implement",
 ]
 
@@ -5096,7 +5033,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "windows 0.39.0",
+ "windows",
  "windows-bindgen",
  "windows-metadata",
 ]
@@ -5186,19 +5123,6 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
-[[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
 [[package]]
 name = "windows"
 version = "0.39.0"
@@ -5285,12 +5209,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.39.0"
@@ -5309,12 +5227,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.39.0"
@@ -5333,12 +5245,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.39.0"
@@ -5357,12 +5263,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.39.0"
@@ -5387,12 +5287,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.39.0"
@@ -5457,7 +5351,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.39.0",
+ "windows",
  "windows-implement",
 ]
 
@@ -5505,14 +5399,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
-
-[[package]]
-name = "zip"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
-]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 14a8ddd..602b0b9 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -38,7 +38,7 @@ tokio = { version = "1", features = ["full"] }
 async-std = { version = "1", features = ["attributes", "tokio1"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json"] }
-tauri = { version = "1.1.1", features = ["global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
+tauri = { version = "1.1.1", features = ["global-shortcut-all", "process-all", "shell-all", "system-tray", "window-all"] }
 tauri-runtime-wry = { version = "0.12" }
 window-vibrancy = { version = "0.3.0" }
 window-shadows = { version = "0.2.0" }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0806281..c434073 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -19,9 +19,9 @@ use tauri::{api, SystemTray};
 async fn main() -> std::io::Result<()> {
     
     // Deep linking
-    deep_link::prepare("top.gydi.clashverg");
+    deep_link::prepare("app.clashverge");
     
-    let deep_link_register_result = deep_link::register("clashy",| deep_link | async move {
+    let deep_link_register_result = deep_link::register("clash",| deep_link | async move {
         // Convert deep link to something that import_profile can use
         let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
         // If deep link is invalid, we pop up a message to user
@@ -35,6 +35,7 @@ async fn main() -> std::io::Result<()> {
         if import_result.is_err(){
             Handle::notice_message("set_config::error",format!("Profile url is invalid | {}", import_result.err().unwrap()));
         }
+        Handle::notice_message("set_config::ok", "Profile added.");
     }).await;
 
     // If we couldn't register, we log it
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 7774656..d750b5e 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,6 +1,6 @@
 {
   "package": {
-    "productName": "Clash Verge",
+    "productName": "HiddifyDesktop",
     "version": "1.2.1"
   },
   "build": {
@@ -26,7 +26,7 @@
         "icons/icon.ico"
       ],
       "resources": ["resources"],
-      "externalBin": ["sidecar/clash", "sidecar/clash-meta"],
+      "externalBin": ["sidecar/clash-meta", "sidecar/clash"],
       "copyright": "© 2022 zzzgydi All Rights Reserved",
       "category": "DeveloperTool",
       "shortDescription": "A Clash GUI based on tauri.",
@@ -51,7 +51,7 @@
       }
     },
     "updater": {
-      "active": true,
+      "active": false,
       "endpoints": [
         "https://github.com/zzzgydi/clash-verge/releases/download/updater/update.json",
         "https://hub.fastgit.xyz/zzzgydi/clash-verge/releases/download/updater/update-proxy.json"

From 5f64bfb1ae49b16cde15543c061639dc039c38b1 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Mon, 23 Jan 2023 19:05:02 -0800
Subject: [PATCH 15/17] It seems that we can't have more than one scheme for
 registration

---
 src-tauri/src/main.rs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index c434073..6420400 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -20,8 +20,8 @@ async fn main() -> std::io::Result<()> {
     
     // Deep linking
     deep_link::prepare("app.clashverge");
-    
-    let deep_link_register_result = deep_link::register("clash",| deep_link | async move {
+    // Define handler
+    let handler = | deep_link | async move {
         // Convert deep link to something that import_profile can use
         let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
         // If deep link is invalid, we pop up a message to user
@@ -36,12 +36,19 @@ async fn main() -> std::io::Result<()> {
             Handle::notice_message("set_config::error",format!("Profile url is invalid | {}", import_result.err().unwrap()));
         }
         Handle::notice_message("set_config::ok", "Profile added.");
-    }).await;
-
+    };
+    // Register "clash" scheme
+    let  deep_link_register_result = deep_link::register("clash",handler.clone()).await;
     // If we couldn't register, we log it
     if deep_link_register_result.is_err(){
-        println!("We can't register deep link scheme for program | {}",deep_link_register_result.err().unwrap())
+        println!("We can't register \"clash\" scheme for program | {}",deep_link_register_result.err().unwrap())
     }
+    // Register "clashmeta" scheme
+    // deep_link_register_result = deep_link::register("clashmeta", handler).await;
+    // If we couldn't register, we log it
+    // if deep_link_register_result.is_err(){
+    //     println!("We can't register \"clashmeta\" scheme for program | {}",deep_link_register_result.err().unwrap())
+    // }
 
     // 单例检测
     if server::check_singleton().is_err() {

From 7f5f0b7c4954ca543b731f9449657e8477f98929 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Wed, 25 Jan 2023 08:39:42 -0800
Subject: [PATCH 16/17] Add ability to focus on the main window when a profile
 added via deep link (I used global variable(mutex) between threads, so it's
 not the best way to do it, should be done better)

---
 src-tauri/src/main.rs       | 19 +++++++++++++++++--
 src-tauri/src/utils/help.rs | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 6420400..ff943e8 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,18 +10,29 @@ mod enhance;
 mod feat;
 mod utils;
 mod deep_link;
+use std::sync::{Arc, Mutex};
 
 use crate::utils::{init, resolve, server, help};
 use crate::core::handle::Handle;
-use tauri::{api, SystemTray};
+use tauri::{api, SystemTray, Manager};
+use once_cell::sync::Lazy;
+use std::thread;
+use help::focus_to_main_window_if_needed;
+
+// This is not the best way to do it...
+static mut NEED_WINDOW_BE_FOCUS:Lazy<Arc<Mutex<bool>>> = Lazy::new(|| Arc::new(Mutex::new(false)));
 
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    
+
     // Deep linking
     deep_link::prepare("app.clashverge");
     // Define handler
     let handler = | deep_link | async move {
+        // Set need to be focus to true, it's handled in other thread
+        unsafe{
+            *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = true;
+        }
         // Convert deep link to something that import_profile can use
         let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
         // If deep link is invalid, we pop up a message to user
@@ -126,6 +137,10 @@ async fn main() -> std::io::Result<()> {
     let app = builder
         .build(tauri::generate_context!())
         .expect("error while running tauri application");
+    
+    // Focus thread
+    let app_handle = app.app_handle();
+    thread::spawn(move ||{focus_to_main_window_if_needed(&app_handle)});
 
     app.run(|app_handle, e| match e {
         tauri::RunEvent::ExitRequested { api, .. } => {
diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 798e072..35fdb45 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -3,6 +3,9 @@ use nanoid::nanoid;
 use serde::{de::DeserializeOwned, Serialize};
 use serde_yaml::{Mapping, Value};
 use std::{fs, path::PathBuf, process::Command, str::FromStr};
+use tauri::{AppHandle, Manager};
+use std::thread;
+use std::time::Duration;
 
 /// read data from yaml as struct T
 pub fn read_yaml<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
@@ -149,6 +152,23 @@ pub fn convert_deeplink_to_url_for_import_profile(deep_link:&String) -> Result<S
     let import_profile_url = import_profile_url_raw[1].replacen('&', "?", 1);
     Ok(import_profile_url)
 }
+
+// Focus to the main window, and back the NEED_WINDOW_BE_FOCUS to false, and wait for NEED_WINDOW_BE_FOCUS be true to do its job
+pub fn focus_to_main_window_if_needed(app_handle:&AppHandle){
+    loop{
+        unsafe{
+            if *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() == true{
+                if let Some(window) = app_handle.get_window("main"){
+                    let _ = window.show();
+                    let _ = window.set_focus();
+                    *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
+                }
+            }
+        }
+        thread::sleep(Duration::from_millis(700))
+    }
+}
+
 #[macro_export]
 macro_rules! error {
     ($result: expr) => {

From 39ec07394fda62c41c9b196ce9f59d83aa1ea89b Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Wed, 25 Jan 2023 18:47:34 -0800
Subject: [PATCH 17/17] Now program window will show even when it's in
 background

---
 src-tauri/src/utils/help.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 35fdb45..4fb7699 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -2,10 +2,10 @@ use anyhow::{anyhow, bail, Context, Result};
 use nanoid::nanoid;
 use serde::{de::DeserializeOwned, Serialize};
 use serde_yaml::{Mapping, Value};
-use std::{fs, path::PathBuf, process::Command, str::FromStr};
-use tauri::{AppHandle, Manager};
-use std::thread;
+use std::{fs, path::PathBuf, process::Command, str::FromStr, thread};
+use tauri::{AppHandle};
 use std::time::Duration;
+use crate::utils::resolve;
 
 /// read data from yaml as struct T
 pub fn read_yaml<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
@@ -158,14 +158,12 @@ pub fn focus_to_main_window_if_needed(app_handle:&AppHandle){
     loop{
         unsafe{
             if *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() == true{
-                if let Some(window) = app_handle.get_window("main"){
-                    let _ = window.show();
-                    let _ = window.set_focus();
-                    *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
-                }
+                // Show main window is exist, otherwise create main window and show it
+                resolve::create_window(app_handle);
+                *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
+                thread::sleep(Duration::from_millis(600))
             }
         }
-        thread::sleep(Duration::from_millis(700))
     }
 }