mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-18 18:02:08 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99740c1324 | ||
|
|
c04b20d1fa | ||
|
|
e127067878 | ||
|
|
6f03b72368 | ||
|
|
7bd3ee9340 | ||
|
|
c94db606e5 | ||
|
|
4d2474226b | ||
|
|
1ffc4f538b | ||
|
|
6702ac957b | ||
|
|
ba42b2e77d | ||
|
|
fba18ca40a | ||
|
|
3a2a7a1476 | ||
|
|
3c6d6b90bc | ||
|
|
47dc9ee304 | ||
|
|
0045bf206c | ||
|
|
669a1a6953 | ||
|
|
e28452cc7b | ||
|
|
5ceac03db1 | ||
|
|
96215e5950 | ||
|
|
7a030b9224 | ||
|
|
e743478a4d | ||
|
|
bc29c80d44 | ||
|
|
82b8a474d7 | ||
|
|
99851b297d | ||
|
|
e3a500e12c | ||
|
|
378666e3cc | ||
|
|
b65ad1ebd7 | ||
|
|
933a821b5f |
@@ -92,7 +92,6 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
||||||
VITE_WIN_PORTABLE: 1
|
|
||||||
|
|
||||||
release-for-linux:
|
release-for-linux:
|
||||||
strategy:
|
strategy:
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ A Clash Meta GUI based on <a href="https://github.com/tauri-apps/tauri">Tauri</a
|
|||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Since the clash core has been removed. The project no longer maintains the clash core, but only the Clash Meta core.
|
- Since the clash core has been removed. The project no longer maintains the clash core, but only the Clash Meta core.
|
||||||
- Profiles management and enhancement (by yaml and Javascript). [Doc](https://github.com/clash-verge-rev/clash-verge-rev/wiki/%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
|
- Profiles management and enhancement (by yaml and Javascript). [Doc](https://clash-verge-rev.github.io)
|
||||||
- Simple UI and supports custom theme color.
|
- Simple UI and supports custom theme color.
|
||||||
- Built-in support [Clash.Meta(mihomo)](https://github.com/MetaCubeX/mihomo) core.
|
- Built-in support [Clash.Meta(mihomo)](https://github.com/MetaCubeX/mihomo) core.
|
||||||
- System proxy setting and guard.
|
- System proxy setting and guard.
|
||||||
@@ -41,18 +41,18 @@ A Clash Meta GUI based on <a href="https://github.com/tauri-apps/tauri">Tauri</a
|
|||||||
|
|
||||||
Download from [release](https://github.com/clash-verge-rev/clash-verge-rev/releases). Supports Windows (x64/x86), Linux (x64/arm64) and macOS 10.15+ (intel/apple).
|
Download from [release](https://github.com/clash-verge-rev/clash-verge-rev/releases). Supports Windows (x64/x86), Linux (x64/arm64) and macOS 10.15+ (intel/apple).
|
||||||
|
|
||||||
- [Windows x64](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/Clash.Verge_1.4.5_x64-setup.exe)
|
- [Windows x64](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/Clash.Verge_1.4.7_x64-setup.exe)
|
||||||
- [Windows x86](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/Clash.Verge_1.4.5_x86-setup.exe)
|
- [Windows x86](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/Clash.Verge_1.4.7_x86-setup.exe)
|
||||||
- [Windows arm64](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/Clash.Verge_1.4.5_arm64-setup.exe)
|
- [Windows arm64](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/Clash.Verge_1.4.7_arm64-setup.exe)
|
||||||
|
|
||||||
- [macOS intel](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/Clash.Verge_1.4.5_x64.dmg)
|
- [macOS intel](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/Clash.Verge_1.4.7_x64.dmg)
|
||||||
- [macOS apple](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/Clash.Verge_1.4.5_aarch64.dmg)
|
- [macOS apple](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/Clash.Verge_1.4.7_aarch64.dmg)
|
||||||
|
|
||||||
- [Linux x64 AppImage](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/clash-verge_1.4.5_amd64.AppImage)
|
- [Linux x64 AppImage](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/clash-verge_1.4.7_amd64.AppImage)
|
||||||
- [Linux x64 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/clash-verge_1.4.5_amd64.deb)
|
- [Linux x64 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/clash-verge_1.4.7_amd64.deb)
|
||||||
- [Linux x86 AppImage](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/clash-verge_1.4.5_i386.AppImage)
|
- [Linux x86 AppImage](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/clash-verge_1.4.7_i386.AppImage)
|
||||||
- [Linux x86 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/clash-verge_1.4.5_i386.deb)
|
- [Linux x86 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/clash-verge_1.4.7_i386.deb)
|
||||||
- [Linux arm64 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.5/clash-verge_1.4.5_arm64.deb)
|
- [Linux arm64 deb](https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v1.4.7/clash-verge_1.4.7_arm64.deb)
|
||||||
|
|
||||||
Or you can build it yourself. Supports Windows, Linux and macOS 10.15+
|
Or you can build it yourself. Supports Windows, Linux and macOS 10.15+
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ You should install Rust and Nodejs, see [here](https://tauri.app/v1/guides/getti
|
|||||||
pnpm i
|
pnpm i
|
||||||
```
|
```
|
||||||
|
|
||||||
Then download the clash binary... Or you can download it from [clash meta release](https://github.com/MetaCubeX/Clash.Meta/releases) and rename it according to [tauri config](https://tauri.studio/docs/api/config/#tauri.bundle.externalBin).
|
Then download the clash binary... Or you can download it from [clash meta release](https://github.com/MetaCubeX/Clash.Meta/releases) and rename it according to [tauri config](https://tauri.app/v1/api/config#bundleconfig.externalbin).
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
# force update to latest version
|
# force update to latest version
|
||||||
|
|||||||
@@ -1,3 +1,30 @@
|
|||||||
|
## v1.4.7
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Windows 便携版禁用应用内更新
|
||||||
|
- 支持代理组 Hidden 选项
|
||||||
|
- 支持 URL Scheme(MacOS & Linux)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## v1.4.6
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- 更新 Clash Meta(mihomo) 内核到 v1.18.0
|
||||||
|
- 支持 URL Scheme(暂时仅支持 Windows)
|
||||||
|
- 添加窗口置顶按钮
|
||||||
|
- UI 优化调整
|
||||||
|
|
||||||
|
### Bugs Fixes
|
||||||
|
|
||||||
|
- 修复一些编译错误
|
||||||
|
- 获取订阅名称错误
|
||||||
|
- 订阅信息解析错误
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## v1.4.5
|
## v1.4.5
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "clash-verge",
|
"name": "clash-verge",
|
||||||
"version": "1.4.5",
|
"version": "1.4.7",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "tauri dev",
|
"dev": "tauri dev",
|
||||||
|
|||||||
@@ -28,13 +28,13 @@ index 4c6dde5..5fd9ad8 100644
|
|||||||
@@ -25,7 +25,6 @@ log4rs = "1"
|
@@ -25,7 +25,6 @@ log4rs = "1"
|
||||||
nanoid = "0.4"
|
nanoid = "0.4"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
sysinfo = "0.29"
|
sysinfo = "0.30"
|
||||||
-rquickjs = "0.3" # 高版本不支持 Linux aarch64
|
-rquickjs = "0.3" # 高版本不支持 Linux aarch64
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
auto-launch = "0.5"
|
auto-launch = "0.5"
|
||||||
@@ -34,6 +33,7 @@ port_scanner = "0.1.5"
|
@@ -34,6 +33,7 @@ port_scanner = "0.1.5"
|
||||||
delay_timer = "0.11"
|
delay_timer = "0.11.5"
|
||||||
parking_lot = "0.12"
|
parking_lot = "0.12"
|
||||||
percent-encoding = "2.3.1"
|
percent-encoding = "2.3.1"
|
||||||
+quick-rs = { path = "quick-rs" }
|
+quick-rs = { path = "quick-rs" }
|
||||||
@@ -123,7 +123,7 @@ index 6c207d9..d47dc33 100644
|
|||||||
- if result == "\"\"" {
|
- if result == "\"\"" {
|
||||||
- anyhow::bail!("main function should return object");
|
- anyhow::bail!("main function should return object");
|
||||||
- }
|
- }
|
||||||
- return Ok(serde_json::from_str::<Mapping>(result.as_str())?);
|
- Ok(serde_json::from_str::<Mapping>(result.as_str())?)
|
||||||
- });
|
- });
|
||||||
-
|
-
|
||||||
- let mut out = outputs.lock().unwrap();
|
- let mut out = outputs.lock().unwrap();
|
||||||
|
|||||||
+56
-12
@@ -48,7 +48,7 @@ const SIDECAR_HOST = target
|
|||||||
.match(/(?<=host: ).+(?=\s*)/g)[0];
|
.match(/(?<=host: ).+(?=\s*)/g)[0];
|
||||||
|
|
||||||
/* ======= clash meta alpha======= */
|
/* ======= clash meta alpha======= */
|
||||||
const VERSION_URL =
|
const META_ALPHA_VERSION_URL =
|
||||||
"https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt";
|
"https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt";
|
||||||
const META_ALPHA_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha`;
|
const META_ALPHA_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha`;
|
||||||
let META_ALPHA_VERSION;
|
let META_ALPHA_VERSION;
|
||||||
@@ -65,22 +65,38 @@ const META_ALPHA_MAP = {
|
|||||||
"linux-arm": "mihomo-linux-armv7",
|
"linux-arm": "mihomo-linux-armv7",
|
||||||
};
|
};
|
||||||
|
|
||||||
// Fetch the latest release version from the version.txt file
|
// Fetch the latest alpha release version from the version.txt file
|
||||||
async function getLatestVersion() {
|
async function getLatestAlphaVersion() {
|
||||||
|
const options = {};
|
||||||
|
|
||||||
|
const httpProxy =
|
||||||
|
process.env.HTTP_PROXY ||
|
||||||
|
process.env.http_proxy ||
|
||||||
|
process.env.HTTPS_PROXY ||
|
||||||
|
process.env.https_proxy;
|
||||||
|
|
||||||
|
if (httpProxy) {
|
||||||
|
options.agent = proxyAgent(httpProxy);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const response = await fetch(VERSION_URL, { method: "GET" });
|
const response = await fetch(META_ALPHA_VERSION_URL, {
|
||||||
|
...options,
|
||||||
|
method: "GET",
|
||||||
|
});
|
||||||
let v = await response.text();
|
let v = await response.text();
|
||||||
META_ALPHA_VERSION = v.trim(); // Trim to remove extra whitespaces
|
META_ALPHA_VERSION = v.trim(); // Trim to remove extra whitespaces
|
||||||
console.log(`Latest release version: ${META_ALPHA_VERSION}`);
|
console.log(`Latest alpha version: ${META_ALPHA_VERSION}`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error fetching latest release version:", error.message);
|
console.error("Error fetching latest alpha version:", error.message);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ======= clash meta stable ======= */
|
/* ======= clash meta stable ======= */
|
||||||
|
const META_VERSION_URL =
|
||||||
|
"https://github.com/MetaCubeX/mihomo/releases/latest/download/version.txt";
|
||||||
const META_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download`;
|
const META_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download`;
|
||||||
let META_VERSION = "v1.17.0";
|
let META_VERSION;
|
||||||
|
|
||||||
const META_MAP = {
|
const META_MAP = {
|
||||||
"win32-x64": "mihomo-windows-amd64-compatible",
|
"win32-x64": "mihomo-windows-amd64-compatible",
|
||||||
@@ -94,6 +110,33 @@ const META_MAP = {
|
|||||||
"linux-arm": "mihomo-linux-armv7",
|
"linux-arm": "mihomo-linux-armv7",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Fetch the latest release version from the version.txt file
|
||||||
|
async function getLatestReleaseVersion() {
|
||||||
|
const options = {};
|
||||||
|
|
||||||
|
const httpProxy =
|
||||||
|
process.env.HTTP_PROXY ||
|
||||||
|
process.env.http_proxy ||
|
||||||
|
process.env.HTTPS_PROXY ||
|
||||||
|
process.env.https_proxy;
|
||||||
|
|
||||||
|
if (httpProxy) {
|
||||||
|
options.agent = proxyAgent(httpProxy);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const response = await fetch(META_VERSION_URL, {
|
||||||
|
...options,
|
||||||
|
method: "GET",
|
||||||
|
});
|
||||||
|
let v = await response.text();
|
||||||
|
META_VERSION = v.trim(); // Trim to remove extra whitespaces
|
||||||
|
console.log(`Latest release version: ${META_VERSION}`);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching latest release version:", error.message);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* check available
|
* check available
|
||||||
*/
|
*/
|
||||||
@@ -273,8 +316,8 @@ async function downloadFile(url, path) {
|
|||||||
/**
|
/**
|
||||||
* main
|
* main
|
||||||
*/
|
*/
|
||||||
const SERVICE_URL =
|
|
||||||
"https://github.com/zzzgydi/clash-verge-service/releases/download/latest";
|
const SERVICE_URL = `https://github.com/clash-verge-rev/clash-verge-service/releases/download/${SIDECAR_HOST}`;
|
||||||
|
|
||||||
const resolveService = () =>
|
const resolveService = () =>
|
||||||
resolveResource({
|
resolveResource({
|
||||||
@@ -316,15 +359,16 @@ const tasks = [
|
|||||||
// { name: "clash", func: resolveClash, retry: 5 },
|
// { name: "clash", func: resolveClash, retry: 5 },
|
||||||
{
|
{
|
||||||
name: "clash-meta-alpha",
|
name: "clash-meta-alpha",
|
||||||
func: () => getLatestVersion().then(() => resolveSidecar(clashMetaAlpha())),
|
func: () =>
|
||||||
|
getLatestAlphaVersion().then(() => resolveSidecar(clashMetaAlpha())),
|
||||||
retry: 5,
|
retry: 5,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "clash-meta",
|
name: "clash-meta",
|
||||||
func: () => resolveSidecar(clashMeta()),
|
func: () =>
|
||||||
|
getLatestReleaseVersion().then(() => resolveSidecar(clashMeta())),
|
||||||
retry: 5,
|
retry: 5,
|
||||||
},
|
},
|
||||||
// { name: "wintun", func: resolveWintun, retry: 5, winOnly: true },
|
|
||||||
{ name: "service", func: resolveService, retry: 5, winOnly: true },
|
{ name: "service", func: resolveService, retry: 5, winOnly: true },
|
||||||
{ name: "install", func: resolveInstall, retry: 5, winOnly: true },
|
{ name: "install", func: resolveInstall, retry: 5, winOnly: true },
|
||||||
{ name: "uninstall", func: resolveUninstall, retry: 5, winOnly: true },
|
{ name: "uninstall", func: resolveUninstall, retry: 5, winOnly: true },
|
||||||
|
|||||||
Generated
+259
-44
@@ -28,19 +28,6 @@ dependencies = [
|
|||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ahash"
|
|
||||||
version = "0.8.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"getrandom 0.2.11",
|
|
||||||
"once_cell",
|
|
||||||
"version_check",
|
|
||||||
"zerocopy",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aho-corasick"
|
name = "aho-corasick"
|
||||||
version = "0.6.10"
|
version = "0.6.10"
|
||||||
@@ -101,6 +88,16 @@ version = "1.6.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
|
checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "async-broadcast"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
|
||||||
|
dependencies = [
|
||||||
|
"event-listener 2.5.3",
|
||||||
|
"futures-core",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-channel"
|
name = "async-channel"
|
||||||
version = "1.9.0"
|
version = "1.9.0"
|
||||||
@@ -238,6 +235,17 @@ dependencies = [
|
|||||||
"windows-sys 0.48.0",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "async-recursion"
|
||||||
|
version = "1.0.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.39",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-signal"
|
name = "async-signal"
|
||||||
version = "0.2.5"
|
version = "0.2.5"
|
||||||
@@ -559,7 +567,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clash-verge"
|
name = "clash-verge"
|
||||||
version = "1.4.5"
|
version = "1.4.7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"auto-launch",
|
"auto-launch",
|
||||||
@@ -591,7 +599,6 @@ dependencies = [
|
|||||||
"warp",
|
"warp",
|
||||||
"which 5.0.0",
|
"which 5.0.0",
|
||||||
"window-shadows",
|
"window-shadows",
|
||||||
"windows-sys 0.52.0",
|
|
||||||
"winreg 0.52.0",
|
"winreg 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -931,9 +938,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "delay_timer"
|
name = "delay_timer"
|
||||||
version = "0.11.4"
|
version = "0.11.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "46e3040b73d9397711697558109c983a2dc6fc63e98785ffbefd3ece57b46b67"
|
checksum = "d70c0d5d2addc05d1e0cf7e60b3a5bf08415f03136a773d7c66b4e4a3b892cef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -1136,6 +1143,27 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enumflags2"
|
||||||
|
version = "0.7.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
|
||||||
|
dependencies = [
|
||||||
|
"enumflags2_derive",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enumflags2_derive"
|
||||||
|
version = "0.7.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.39",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "equivalent"
|
name = "equivalent"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@@ -1787,7 +1815,7 @@ version = "0.12.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.7.7",
|
"ahash",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2141,17 +2169,6 @@ version = "2.9.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
|
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "iptools"
|
|
||||||
version = "0.2.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c03bfb870879ce6a141b644653d63b203d290ec5f3b6919cf7b30cba06a164a5"
|
|
||||||
dependencies = [
|
|
||||||
"ahash 0.8.6",
|
|
||||||
"once_cell",
|
|
||||||
"regex 1.10.2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is-docker"
|
name = "is-docker"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@@ -2452,6 +2469,19 @@ version = "0.1.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mac-notification-sys"
|
||||||
|
version = "0.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"dirs-next",
|
||||||
|
"objc-foundation",
|
||||||
|
"objc_id",
|
||||||
|
"time",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "malloc_buf"
|
name = "malloc_buf"
|
||||||
version = "0.0.6"
|
version = "0.0.6"
|
||||||
@@ -2525,6 +2555,15 @@ dependencies = [
|
|||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "memoffset"
|
||||||
|
version = "0.7.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memoffset"
|
name = "memoffset"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@@ -2675,6 +2714,18 @@ dependencies = [
|
|||||||
"memoffset 0.6.5",
|
"memoffset 0.6.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nix"
|
||||||
|
version = "0.26.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 1.3.2",
|
||||||
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"memoffset 0.7.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nix"
|
name = "nix"
|
||||||
version = "0.27.1"
|
version = "0.27.1"
|
||||||
@@ -2712,6 +2763,19 @@ dependencies = [
|
|||||||
"minimal-lexical",
|
"minimal-lexical",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "notify-rust"
|
||||||
|
version = "4.10.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226"
|
||||||
|
dependencies = [
|
||||||
|
"log 0.4.20",
|
||||||
|
"mac-notification-sys",
|
||||||
|
"serde",
|
||||||
|
"tauri-winrt-notification",
|
||||||
|
"zbus",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ntapi"
|
name = "ntapi"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@@ -2943,6 +3007,16 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ordered-stream"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
|
||||||
|
dependencies = [
|
||||||
|
"futures-core",
|
||||||
|
"pin-project-lite",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "os_pipe"
|
name = "os_pipe"
|
||||||
version = "1.1.4"
|
version = "1.1.4"
|
||||||
@@ -3254,7 +3328,7 @@ dependencies = [
|
|||||||
"base64 0.21.5",
|
"base64 0.21.5",
|
||||||
"indexmap 2.1.0",
|
"indexmap 2.1.0",
|
||||||
"line-wrap",
|
"line-wrap",
|
||||||
"quick-xml",
|
"quick-xml 0.31.0",
|
||||||
"serde",
|
"serde",
|
||||||
"time",
|
"time",
|
||||||
]
|
]
|
||||||
@@ -3381,6 +3455,15 @@ version = "1.2.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quick-xml"
|
||||||
|
version = "0.30.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
|
||||||
|
dependencies = [
|
||||||
|
"memchr",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.31.0"
|
version = "0.31.0"
|
||||||
@@ -4307,6 +4390,12 @@ dependencies = [
|
|||||||
"loom",
|
"loom",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "static_assertions"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "string_cache"
|
name = "string_cache"
|
||||||
version = "0.8.7"
|
version = "0.8.7"
|
||||||
@@ -4363,9 +4452,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sysinfo"
|
name = "sysinfo"
|
||||||
version = "0.29.11"
|
version = "0.30.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
|
checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"core-foundation-sys",
|
"core-foundation-sys",
|
||||||
@@ -4373,18 +4462,18 @@ dependencies = [
|
|||||||
"ntapi",
|
"ntapi",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rayon",
|
"rayon",
|
||||||
"winapi",
|
"windows 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sysproxy"
|
name = "sysproxy"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#f8fab6a542c41cf3b973f4fe77d399756e3efff1"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9707a79d3b95683aa5a9521e698ffd878b8fb289727c25a69157fb85d529ffff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"interfaces",
|
"interfaces",
|
||||||
"iptools",
|
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"windows 0.52.0",
|
"winapi",
|
||||||
"winreg 0.10.1",
|
"winreg 0.10.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -4535,6 +4624,7 @@ dependencies = [
|
|||||||
"ignore",
|
"ignore",
|
||||||
"infer 0.9.0",
|
"infer 0.9.0",
|
||||||
"minisign-verify",
|
"minisign-verify",
|
||||||
|
"notify-rust",
|
||||||
"objc",
|
"objc",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"open 3.2.0",
|
"open 3.2.0",
|
||||||
@@ -4710,6 +4800,16 @@ dependencies = [
|
|||||||
"toml 0.7.8",
|
"toml 0.7.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tauri-winrt-notification"
|
||||||
|
version = "0.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2"
|
||||||
|
dependencies = [
|
||||||
|
"quick-xml 0.30.0",
|
||||||
|
"windows 0.51.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tempfile"
|
name = "tempfile"
|
||||||
version = "3.8.1"
|
version = "3.8.1"
|
||||||
@@ -5171,6 +5271,17 @@ version = "0.1.10"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003"
|
checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "uds_windows"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
|
||||||
|
dependencies = [
|
||||||
|
"memoffset 0.9.0",
|
||||||
|
"tempfile",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicase"
|
name = "unicase"
|
||||||
version = "2.7.0"
|
version = "2.7.0"
|
||||||
@@ -5678,6 +5789,16 @@ dependencies = [
|
|||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows"
|
||||||
|
version = "0.51.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
|
||||||
|
dependencies = [
|
||||||
|
"windows-core 0.51.1",
|
||||||
|
"windows-targets 0.48.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows"
|
name = "windows"
|
||||||
version = "0.52.0"
|
version = "0.52.0"
|
||||||
@@ -6112,6 +6233,16 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "xdg-home"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
|
||||||
|
dependencies = [
|
||||||
|
"nix 0.26.4",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yaml-rust"
|
name = "yaml-rust"
|
||||||
version = "0.4.5"
|
version = "0.4.5"
|
||||||
@@ -6122,23 +6253,69 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerocopy"
|
name = "zbus"
|
||||||
version = "0.7.28"
|
version = "3.14.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e"
|
checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zerocopy-derive",
|
"async-broadcast",
|
||||||
|
"async-executor",
|
||||||
|
"async-fs",
|
||||||
|
"async-io 1.13.0",
|
||||||
|
"async-lock 2.8.0",
|
||||||
|
"async-process",
|
||||||
|
"async-recursion",
|
||||||
|
"async-task",
|
||||||
|
"async-trait",
|
||||||
|
"blocking",
|
||||||
|
"byteorder",
|
||||||
|
"derivative",
|
||||||
|
"enumflags2",
|
||||||
|
"event-listener 2.5.3",
|
||||||
|
"futures-core",
|
||||||
|
"futures-sink",
|
||||||
|
"futures-util",
|
||||||
|
"hex",
|
||||||
|
"nix 0.26.4",
|
||||||
|
"once_cell",
|
||||||
|
"ordered-stream",
|
||||||
|
"rand 0.8.5",
|
||||||
|
"serde",
|
||||||
|
"serde_repr",
|
||||||
|
"sha1",
|
||||||
|
"static_assertions",
|
||||||
|
"tracing",
|
||||||
|
"uds_windows",
|
||||||
|
"winapi",
|
||||||
|
"xdg-home",
|
||||||
|
"zbus_macros",
|
||||||
|
"zbus_names",
|
||||||
|
"zvariant",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerocopy-derive"
|
name = "zbus_macros"
|
||||||
version = "0.7.28"
|
version = "3.14.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b"
|
checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"proc-macro-crate",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.39",
|
"regex 1.10.2",
|
||||||
|
"syn 1.0.109",
|
||||||
|
"zvariant_utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zbus_names"
|
||||||
|
version = "2.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
"static_assertions",
|
||||||
|
"zvariant",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6151,3 +6328,41 @@ dependencies = [
|
|||||||
"crc32fast",
|
"crc32fast",
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zvariant"
|
||||||
|
version = "3.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
|
||||||
|
dependencies = [
|
||||||
|
"byteorder",
|
||||||
|
"enumflags2",
|
||||||
|
"libc",
|
||||||
|
"serde",
|
||||||
|
"static_assertions",
|
||||||
|
"zvariant_derive",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zvariant_derive"
|
||||||
|
version = "3.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro-crate",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
"zvariant_utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zvariant_utils"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "clash-verge"
|
name = "clash-verge"
|
||||||
version = "1.4.5"
|
version = "1.4.7"
|
||||||
description = "clash verge"
|
description = "clash verge"
|
||||||
authors = ["zzzgydi", "wonfen", "MystiPanda"]
|
authors = ["zzzgydi", "wonfen", "MystiPanda"]
|
||||||
license = "GPL-3.0"
|
license = "GPL-3.0"
|
||||||
@@ -14,6 +14,7 @@ tauri-build = { version = "1", features = [] }
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
warp = "0.3"
|
warp = "0.3"
|
||||||
|
sysproxy = "0.3.0"
|
||||||
which = "5.0.0"
|
which = "5.0.0"
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
dirs = "5.0"
|
dirs = "5.0"
|
||||||
@@ -24,28 +25,26 @@ dunce = "1.0"
|
|||||||
log4rs = "1"
|
log4rs = "1"
|
||||||
nanoid = "0.4"
|
nanoid = "0.4"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
sysinfo = "0.29"
|
sysinfo = "0.30"
|
||||||
rquickjs = "0.3" # 高版本不支持 Linux aarch64
|
rquickjs = "0.3" # 高版本不支持 Linux aarch64
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
auto-launch = "0.5"
|
auto-launch = "0.5"
|
||||||
once_cell = "1.18"
|
once_cell = "1.18"
|
||||||
port_scanner = "0.1.5"
|
port_scanner = "0.1.5"
|
||||||
delay_timer = "0.11"
|
delay_timer = "0.11.5"
|
||||||
parking_lot = "0.12"
|
parking_lot = "0.12"
|
||||||
percent-encoding = "2.3.1"
|
percent-encoding = "2.3.1"
|
||||||
window-shadows = { version = "0.2" }
|
window-shadows = { version = "0.2" }
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
|
reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
|
||||||
sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
|
tauri = { version = "1.5", features = [ "notification-all", "icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
|
||||||
tauri = { version = "1.5", features = ["icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
|
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
runas = "=1.0.0" # 高版本会返回错误 Status
|
runas = "=1.0.0" # 高版本会返回错误 Status
|
||||||
deelevate = "0.2.0"
|
deelevate = "0.2.0"
|
||||||
winreg = { version = "0.52", features = ["transactions"] }
|
winreg = "0.52.0"
|
||||||
windows-sys = { version = "0.52", features = ["Win32_System_LibraryLoader", "Win32_System_SystemInformation"] }
|
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
#openssl
|
#openssl
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleURLTypes</key>
|
||||||
|
<array>
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleURLName</key>
|
||||||
|
<string>io.github.clash-verge-rev.clash-verge-rev</string>
|
||||||
|
<key>CFBundleURLSchemes</key>
|
||||||
|
<array>
|
||||||
|
<string>clash</string>
|
||||||
|
</array>
|
||||||
|
</dict>
|
||||||
|
</array>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Categories={{{categories}}}
|
||||||
|
Comment={{{comment}}}
|
||||||
|
Exec={{{exec}}} %u
|
||||||
|
Icon={{{icon}}}
|
||||||
|
Name={{{name}}}
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
MimeType=x-scheme-handler/clash;
|
||||||
@@ -219,7 +219,7 @@ pub fn open_app_dir() -> CmdResult<()> {
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn open_core_dir() -> CmdResult<()> {
|
pub fn open_core_dir() -> CmdResult<()> {
|
||||||
let core_dir = wrap_err!(tauri::utils::platform::current_exe())?;
|
let core_dir = wrap_err!(tauri::utils::platform::current_exe())?;
|
||||||
let core_dir = core_dir.parent().ok_or(format!("failed to get core dir"))?;
|
let core_dir = core_dir.parent().ok_or("failed to get core dir")?;
|
||||||
wrap_err!(open::that(core_dir))
|
wrap_err!(open::that(core_dir))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,10 +252,15 @@ pub async fn clash_api_get_proxy_delay(
|
|||||||
) -> CmdResult<clash_api::DelayRes> {
|
) -> CmdResult<clash_api::DelayRes> {
|
||||||
match clash_api::get_proxy_delay(name, url).await {
|
match clash_api::get_proxy_delay(name, url).await {
|
||||||
Ok(res) => Ok(res),
|
Ok(res) => Ok(res),
|
||||||
Err(err) => Err(format!("{}", err.to_string())),
|
Err(err) => Err(err.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_portable_flag() -> CmdResult<bool> {
|
||||||
|
Ok(*dirs::PORTABLE_FLAG.get().unwrap_or(&false))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub mod service {
|
pub mod service {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|||||||
@@ -65,8 +65,8 @@ impl IClashTemp {
|
|||||||
let config = &self.0;
|
let config = &self.0;
|
||||||
|
|
||||||
ClashInfo {
|
ClashInfo {
|
||||||
port: Self::guard_mixed_port(&config),
|
port: Self::guard_mixed_port(config),
|
||||||
server: Self::guard_client_ctrl(&config),
|
server: Self::guard_client_ctrl(config),
|
||||||
secret: config.get("secret").and_then(|value| match value {
|
secret: config.get("secret").and_then(|value| match value {
|
||||||
Value::String(val_str) => Some(val_str.clone()),
|
Value::String(val_str) => Some(val_str.clone()),
|
||||||
Value::Bool(val_bool) => Some(val_bool.to_string()),
|
Value::Bool(val_bool) => Some(val_bool.to_string()),
|
||||||
@@ -98,7 +98,7 @@ impl IClashTemp {
|
|||||||
Some(val_str) => {
|
Some(val_str) => {
|
||||||
let val_str = val_str.trim();
|
let val_str = val_str.trim();
|
||||||
|
|
||||||
let val = match val_str.starts_with(":") {
|
let val = match val_str.starts_with(':') {
|
||||||
true => format!("127.0.0.1{val_str}"),
|
true => format!("127.0.0.1{val_str}"),
|
||||||
false => val_str.to_owned(),
|
false => val_str.to_owned(),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::utils::{dirs, help, tmpl};
|
use crate::utils::{dirs, help, resolve::VERSION, tmpl};
|
||||||
use anyhow::{bail, Context, Result};
|
use anyhow::{bail, Context, Result};
|
||||||
use reqwest::StatusCode;
|
use reqwest::StatusCode;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@@ -8,7 +8,7 @@ use sysproxy::Sysproxy;
|
|||||||
|
|
||||||
use super::Config;
|
use super::Config;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
#[derive(Debug, Clone, Deserialize, Serialize, Default)]
|
||||||
pub struct PrfItem {
|
pub struct PrfItem {
|
||||||
pub uid: Option<String>,
|
pub uid: Option<String>,
|
||||||
|
|
||||||
@@ -96,25 +96,7 @@ impl PrfOption {
|
|||||||
a.update_interval = b.update_interval.or(a.update_interval);
|
a.update_interval = b.update_interval.or(a.update_interval);
|
||||||
Some(a)
|
Some(a)
|
||||||
}
|
}
|
||||||
t @ _ => t.0.or(t.1),
|
t => t.0.or(t.1),
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for PrfItem {
|
|
||||||
fn default() -> Self {
|
|
||||||
PrfItem {
|
|
||||||
uid: None,
|
|
||||||
itype: None,
|
|
||||||
name: None,
|
|
||||||
desc: None,
|
|
||||||
file: None,
|
|
||||||
url: None,
|
|
||||||
selected: None,
|
|
||||||
extra: None,
|
|
||||||
updated: None,
|
|
||||||
option: None,
|
|
||||||
file_data: None,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -152,7 +134,7 @@ impl PrfItem {
|
|||||||
let desc = item.desc.unwrap_or("".into());
|
let desc = item.desc.unwrap_or("".into());
|
||||||
PrfItem::from_script(name, desc)
|
PrfItem::from_script(name, desc)
|
||||||
}
|
}
|
||||||
typ @ _ => bail!("invalid profile item type \"{typ}\""),
|
typ => bail!("invalid profile item type \"{typ}\""),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +170,7 @@ impl PrfItem {
|
|||||||
let opt_ref = option.as_ref();
|
let opt_ref = option.as_ref();
|
||||||
let with_proxy = opt_ref.map_or(false, |o| o.with_proxy.unwrap_or(false));
|
let with_proxy = opt_ref.map_or(false, |o| o.with_proxy.unwrap_or(false));
|
||||||
let self_proxy = opt_ref.map_or(false, |o| o.self_proxy.unwrap_or(false));
|
let self_proxy = opt_ref.map_or(false, |o| o.self_proxy.unwrap_or(false));
|
||||||
let user_agent = opt_ref.map_or(None, |o| o.user_agent.clone());
|
let user_agent = opt_ref.and_then(|o| o.user_agent.clone());
|
||||||
|
|
||||||
let mut builder = reqwest::ClientBuilder::new().use_rustls_tls().no_proxy();
|
let mut builder = reqwest::ClientBuilder::new().use_rustls_tls().no_proxy();
|
||||||
|
|
||||||
@@ -213,25 +195,26 @@ impl PrfItem {
|
|||||||
}
|
}
|
||||||
// 使用系统代理
|
// 使用系统代理
|
||||||
else if with_proxy {
|
else if with_proxy {
|
||||||
match Sysproxy::get_system_proxy() {
|
if let Ok(p @ Sysproxy { enable: true, .. }) = Sysproxy::get_system_proxy() {
|
||||||
Ok(p @ Sysproxy { enable: true, .. }) => {
|
let proxy_scheme = format!("http://{}:{}", p.host, p.port);
|
||||||
let proxy_scheme = format!("http://{}:{}", p.host, p.port);
|
|
||||||
|
|
||||||
if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
|
if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
|
||||||
builder = builder.proxy(proxy);
|
builder = builder.proxy(proxy);
|
||||||
}
|
|
||||||
if let Ok(proxy) = reqwest::Proxy::https(&proxy_scheme) {
|
|
||||||
builder = builder.proxy(proxy);
|
|
||||||
}
|
|
||||||
if let Ok(proxy) = reqwest::Proxy::all(&proxy_scheme) {
|
|
||||||
builder = builder.proxy(proxy);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => {}
|
if let Ok(proxy) = reqwest::Proxy::https(&proxy_scheme) {
|
||||||
};
|
builder = builder.proxy(proxy);
|
||||||
|
}
|
||||||
|
if let Ok(proxy) = reqwest::Proxy::all(&proxy_scheme) {
|
||||||
|
builder = builder.proxy(proxy);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let version = format!("clash-verge-rev");
|
let version = match VERSION.get() {
|
||||||
|
Some(v) => format!("clash-verge/v{}", v),
|
||||||
|
None => "clash-verge/unknown".to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
builder = builder.user_agent(user_agent.unwrap_or(version));
|
builder = builder.user_agent(user_agent.unwrap_or(version));
|
||||||
|
|
||||||
let resp = builder.build()?.get(url).send().await?;
|
let resp = builder.build()?.get(url).send().await?;
|
||||||
@@ -247,12 +230,11 @@ impl PrfItem {
|
|||||||
let extra = match header.get("Subscription-Userinfo") {
|
let extra = match header.get("Subscription-Userinfo") {
|
||||||
Some(value) => {
|
Some(value) => {
|
||||||
let sub_info = value.to_str().unwrap_or("");
|
let sub_info = value.to_str().unwrap_or("");
|
||||||
|
|
||||||
Some(PrfExtra {
|
Some(PrfExtra {
|
||||||
upload: help::parse_str(sub_info, "upload=").unwrap_or(0),
|
upload: help::parse_str(sub_info, "upload").unwrap_or(0),
|
||||||
download: help::parse_str(sub_info, "download=").unwrap_or(0),
|
download: help::parse_str(sub_info, "download").unwrap_or(0),
|
||||||
total: help::parse_str(sub_info, "total=").unwrap_or(0),
|
total: help::parse_str(sub_info, "total").unwrap_or(0),
|
||||||
expire: help::parse_str(sub_info, "expire=").unwrap_or(0),
|
expire: help::parse_str(sub_info, "expire").unwrap_or(0),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
None => None,
|
None => None,
|
||||||
@@ -261,14 +243,18 @@ impl PrfItem {
|
|||||||
// parse the Content-Disposition
|
// parse the Content-Disposition
|
||||||
let filename = match header.get("Content-Disposition") {
|
let filename = match header.get("Content-Disposition") {
|
||||||
Some(value) => {
|
Some(value) => {
|
||||||
let filename = value.to_str().unwrap_or("");
|
let filename = format!("{value:?}");
|
||||||
match help::parse_str::<String>(filename, "filename=") {
|
let filename = filename.trim_matches('"');
|
||||||
Some(filename) => Some(filename),
|
match help::parse_str::<String>(filename, "filename*") {
|
||||||
None => match help::parse_str::<String>(filename, "filename*=") {
|
Some(filename) => {
|
||||||
|
let iter = percent_encoding::percent_decode(filename.as_bytes());
|
||||||
|
let filename = iter.decode_utf8().unwrap_or_default();
|
||||||
|
filename.split("''").last().map(|s| s.to_string())
|
||||||
|
}
|
||||||
|
None => match help::parse_str::<String>(filename, "filename") {
|
||||||
Some(filename) => {
|
Some(filename) => {
|
||||||
let iter = percent_encoding::percent_decode(filename.as_bytes());
|
let filename = filename.trim_matches('"');
|
||||||
let filename = iter.decode_utf8().unwrap_or_default();
|
Some(filename.to_string())
|
||||||
filename.split("''").last().map(|s| s.to_string())
|
|
||||||
}
|
}
|
||||||
None => None,
|
None => None,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -37,13 +37,13 @@ impl IProfiles {
|
|||||||
profiles.items = Some(vec![]);
|
profiles.items = Some(vec![]);
|
||||||
}
|
}
|
||||||
// compatible with the old old old version
|
// compatible with the old old old version
|
||||||
profiles.items.as_mut().map(|items| {
|
if let Some(items) = profiles.items.as_mut() {
|
||||||
for item in items.iter_mut() {
|
for item in items.iter_mut() {
|
||||||
if item.uid.is_none() {
|
if item.uid.is_none() {
|
||||||
item.uid = Some(help::get_uid("d"));
|
item.uid = Some(help::get_uid("d"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
profiles
|
profiles
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
@@ -152,17 +152,19 @@ impl IProfiles {
|
|||||||
self.items = Some(vec![]);
|
self.items = Some(vec![]);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.items.as_mut().map(|items| items.push(item));
|
if let Some(items) = self.items.as_mut() {
|
||||||
|
items.push(item)
|
||||||
|
}
|
||||||
self.save_file()
|
self.save_file()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// reorder items
|
/// reorder items
|
||||||
pub fn reorder(&mut self, active_id: String, over_id: String) -> Result<()> {
|
pub fn reorder(&mut self, active_id: String, over_id: String) -> Result<()> {
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
let mut items = self.items.take().unwrap_or_default();
|
||||||
let mut old_index = None;
|
let mut old_index = None;
|
||||||
let mut new_index = None;
|
let mut new_index = None;
|
||||||
|
|
||||||
for i in 0..items.len() {
|
for (i, _) in items.iter().enumerate() {
|
||||||
if items[i].uid == Some(active_id.clone()) {
|
if items[i].uid == Some(active_id.clone()) {
|
||||||
old_index = Some(i);
|
old_index = Some(i);
|
||||||
}
|
}
|
||||||
@@ -182,7 +184,7 @@ impl IProfiles {
|
|||||||
|
|
||||||
/// update the item value
|
/// update the item value
|
||||||
pub fn patch_item(&mut self, uid: String, item: PrfItem) -> Result<()> {
|
pub fn patch_item(&mut self, uid: String, item: PrfItem) -> Result<()> {
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
let mut items = self.items.take().unwrap_or_default();
|
||||||
|
|
||||||
for each in items.iter_mut() {
|
for each in items.iter_mut() {
|
||||||
if each.uid == Some(uid.clone()) {
|
if each.uid == Some(uid.clone()) {
|
||||||
@@ -255,11 +257,11 @@ impl IProfiles {
|
|||||||
let current = self.current.as_ref().unwrap_or(&uid);
|
let current = self.current.as_ref().unwrap_or(&uid);
|
||||||
let current = current.clone();
|
let current = current.clone();
|
||||||
|
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
let mut items = self.items.take().unwrap_or_default();
|
||||||
let mut index = None;
|
let mut index = None;
|
||||||
|
|
||||||
// get the index
|
// get the index
|
||||||
for i in 0..items.len() {
|
for (i, _) in items.iter().enumerate() {
|
||||||
if items[i].uid == Some(uid.clone()) {
|
if items[i].uid == Some(uid.clone()) {
|
||||||
index = Some(i);
|
index = Some(i);
|
||||||
break;
|
break;
|
||||||
@@ -267,19 +269,19 @@ impl IProfiles {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(index) = index {
|
if let Some(index) = index {
|
||||||
items.remove(index).file.map(|file| {
|
if let Some(file) = items.remove(index).file {
|
||||||
let _ = dirs::app_profiles_dir().map(|path| {
|
let _ = dirs::app_profiles_dir().map(|path| {
|
||||||
let path = path.join(file);
|
let path = path.join(file);
|
||||||
if path.exists() {
|
if path.exists() {
|
||||||
let _ = fs::remove_file(path);
|
let _ = fs::remove_file(path);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// delete the original uid
|
// delete the original uid
|
||||||
if current == uid {
|
if current == uid {
|
||||||
self.current = match items.len() > 0 {
|
self.current = match !items.is_empty() {
|
||||||
true => items[0].uid.clone(),
|
true => items[0].uid.clone(),
|
||||||
false => None,
|
false => None,
|
||||||
};
|
};
|
||||||
@@ -299,7 +301,7 @@ impl IProfiles {
|
|||||||
Some(file) => dirs::app_profiles_dir()?.join(file),
|
Some(file) => dirs::app_profiles_dir()?.join(file),
|
||||||
None => bail!("failed to get the file field"),
|
None => bail!("failed to get the file field"),
|
||||||
};
|
};
|
||||||
return Ok(help::read_merge_mapping(&file_path)?);
|
return help::read_merge_mapping(&file_path);
|
||||||
}
|
}
|
||||||
bail!("failed to find the current profile \"uid:{current}\"");
|
bail!("failed to find the current profile \"uid:{current}\"");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ pub async fn put_configs(path: &str) -> Result<()> {
|
|||||||
|
|
||||||
match response.status().as_u16() {
|
match response.status().as_u16() {
|
||||||
204 => Ok(()),
|
204 => Ok(()),
|
||||||
status @ _ => {
|
status => {
|
||||||
bail!("failed to put configs with status \"{status}\"")
|
bail!("failed to put configs with status \"{status}\"")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,12 +83,12 @@ fn clash_client_info() -> Result<(String, HeaderMap)> {
|
|||||||
/// 缩短clash的日志
|
/// 缩短clash的日志
|
||||||
pub fn parse_log(log: String) -> String {
|
pub fn parse_log(log: String) -> String {
|
||||||
if log.starts_with("time=") && log.len() > 33 {
|
if log.starts_with("time=") && log.len() > 33 {
|
||||||
return (&log[33..]).to_owned();
|
return (log[33..]).to_owned();
|
||||||
}
|
}
|
||||||
if log.len() > 9 {
|
if log.len() > 9 {
|
||||||
return (&log[9..]).to_owned();
|
return (log[9..]).to_owned();
|
||||||
}
|
}
|
||||||
return log;
|
log
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 缩短clash -t的错误输出
|
/// 缩短clash -t的错误输出
|
||||||
@@ -105,7 +105,7 @@ pub fn parse_check_output(log: String) -> String {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if mr > m {
|
if mr > m {
|
||||||
return (&log[e..mr]).to_owned();
|
return (log[e..mr]).to_owned();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ pub fn parse_check_output(log: String) -> String {
|
|||||||
let r = log.find("path=").or(Some(log.len()));
|
let r = log.find("path=").or(Some(log.len()));
|
||||||
|
|
||||||
if let (Some(l), Some(r)) = (l, r) {
|
if let (Some(l), Some(r)) = (l, r) {
|
||||||
return (&log[(l + 6)..(r - 1)]).to_owned();
|
return (log[(l + 6)..(r - 1)]).to_owned();
|
||||||
}
|
}
|
||||||
|
|
||||||
log
|
log
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use anyhow::{bail, Context, Result};
|
|||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use std::{fs, io::Write, sync::Arc, time::Duration};
|
use std::{fs, io::Write, sync::Arc, time::Duration};
|
||||||
use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};
|
use sysinfo::{Pid, System};
|
||||||
use tauri::api::process::{Command, CommandChild, CommandEvent};
|
use tauri::api::process::{Command, CommandChild, CommandEvent};
|
||||||
use tokio::time::sleep;
|
use tokio::time::sleep;
|
||||||
|
|
||||||
@@ -35,12 +35,12 @@ impl CoreManager {
|
|||||||
.map(|pid| {
|
.map(|pid| {
|
||||||
let mut system = System::new();
|
let mut system = System::new();
|
||||||
system.refresh_all();
|
system.refresh_all();
|
||||||
system.process(Pid::from_u32(pid)).map(|proc| {
|
if let Some(proc) = system.process(Pid::from_u32(pid)) {
|
||||||
if proc.name().contains("clash") {
|
if proc.name().contains("clash") {
|
||||||
log::debug!(target: "app", "kill old clash process");
|
log::debug!(target: "app", "kill old clash process");
|
||||||
proc.kill();
|
proc.kill();
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tauri::async_runtime::spawn(async {
|
tauri::async_runtime::spawn(async {
|
||||||
@@ -68,7 +68,7 @@ impl CoreManager {
|
|||||||
|
|
||||||
if !output.status.success() {
|
if !output.status.success() {
|
||||||
let error = clash_api::parse_check_output(output.stdout.clone());
|
let error = clash_api::parse_check_output(output.stdout.clone());
|
||||||
let error = match error.len() > 0 {
|
let error = match !error.is_empty() {
|
||||||
true => error,
|
true => error,
|
||||||
false => output.stdout.clone(),
|
false => output.stdout.clone(),
|
||||||
};
|
};
|
||||||
@@ -110,7 +110,7 @@ impl CoreManager {
|
|||||||
use super::win_service;
|
use super::win_service;
|
||||||
|
|
||||||
// 服务模式
|
// 服务模式
|
||||||
let enable = { Config::verge().latest().enable_service_mode.clone() };
|
let enable = { Config::verge().latest().enable_service_mode };
|
||||||
let enable = enable.unwrap_or(false);
|
let enable = enable.unwrap_or(false);
|
||||||
|
|
||||||
*self.use_service_mode.lock() = enable;
|
*self.use_service_mode.lock() = enable;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ impl Handle {
|
|||||||
self.app_handle
|
self.app_handle
|
||||||
.lock()
|
.lock()
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map_or(None, |a| a.get_window("main"))
|
.and_then(|a| a.get_window("main"))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn refresh_clash() {
|
pub fn refresh_clash() {
|
||||||
|
|||||||
@@ -65,17 +65,17 @@ impl Hotkey {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let f = match func.trim() {
|
let f = match func.trim() {
|
||||||
"open_dashboard" => || feat::open_dashboard(),
|
"open_dashboard" => feat::open_dashboard,
|
||||||
"clash_mode_rule" => || feat::change_clash_mode("rule".into()),
|
"clash_mode_rule" => || feat::change_clash_mode("rule".into()),
|
||||||
"clash_mode_global" => || feat::change_clash_mode("global".into()),
|
"clash_mode_global" => || feat::change_clash_mode("global".into()),
|
||||||
"clash_mode_direct" => || feat::change_clash_mode("direct".into()),
|
"clash_mode_direct" => || feat::change_clash_mode("direct".into()),
|
||||||
"clash_mode_script" => || feat::change_clash_mode("script".into()),
|
"clash_mode_script" => || feat::change_clash_mode("script".into()),
|
||||||
"toggle_system_proxy" => || feat::toggle_system_proxy(),
|
"toggle_system_proxy" => feat::toggle_system_proxy,
|
||||||
"enable_system_proxy" => || feat::enable_system_proxy(),
|
"enable_system_proxy" => feat::enable_system_proxy,
|
||||||
"disable_system_proxy" => || feat::disable_system_proxy(),
|
"disable_system_proxy" => feat::disable_system_proxy,
|
||||||
"toggle_tun_mode" => || feat::toggle_tun_mode(),
|
"toggle_tun_mode" => feat::toggle_tun_mode,
|
||||||
"enable_tun_mode" => || feat::enable_tun_mode(),
|
"enable_tun_mode" => feat::enable_tun_mode,
|
||||||
"disable_tun_mode" => || feat::disable_tun_mode(),
|
"disable_tun_mode" => feat::disable_tun_mode,
|
||||||
|
|
||||||
_ => bail!("invalid function \"{func}\""),
|
_ => bail!("invalid function \"{func}\""),
|
||||||
};
|
};
|
||||||
@@ -86,7 +86,7 @@ impl Hotkey {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn unregister(&self, hotkey: &str) -> Result<()> {
|
fn unregister(&self, hotkey: &str) -> Result<()> {
|
||||||
self.get_manager()?.unregister(&hotkey)?;
|
self.get_manager()?.unregister(hotkey)?;
|
||||||
log::info!(target: "app", "unregister hotkey {hotkey}");
|
log::info!(target: "app", "unregister hotkey {hotkey}");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -110,7 +110,7 @@ impl Hotkey {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_map_from_vec<'a>(hotkeys: &'a Vec<String>) -> HashMap<&'a str, &'a str> {
|
fn get_map_from_vec(hotkeys: &Vec<String>) -> HashMap<&str, &str> {
|
||||||
let mut map = HashMap::new();
|
let mut map = HashMap::new();
|
||||||
|
|
||||||
hotkeys.iter().for_each(|hotkey| {
|
hotkeys.iter().for_each(|hotkey| {
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ impl Sysopt {
|
|||||||
let verge = Config::verge();
|
let verge = Config::verge();
|
||||||
let verge = verge.latest();
|
let verge = verge.latest();
|
||||||
(
|
(
|
||||||
verge.enable_system_proxy.clone().unwrap_or(false),
|
verge.enable_system_proxy.unwrap_or(false),
|
||||||
verge.system_proxy_bypass.clone(),
|
verge.system_proxy_bypass.clone(),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
@@ -66,7 +66,7 @@ impl Sysopt {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if enable {
|
if enable {
|
||||||
let old = Sysproxy::get_system_proxy().map_or(None, |p| Some(p));
|
let old = Sysproxy::get_system_proxy().ok();
|
||||||
current.set_system_proxy()?;
|
current.set_system_proxy()?;
|
||||||
|
|
||||||
*self.old_sysproxy.lock() = old;
|
*self.old_sysproxy.lock() = old;
|
||||||
@@ -93,7 +93,7 @@ impl Sysopt {
|
|||||||
let verge = Config::verge();
|
let verge = Config::verge();
|
||||||
let verge = verge.latest();
|
let verge = verge.latest();
|
||||||
(
|
(
|
||||||
verge.enable_system_proxy.clone().unwrap_or(false),
|
verge.enable_system_proxy.unwrap_or(false),
|
||||||
verge.system_proxy_bypass.clone(),
|
verge.system_proxy_bypass.clone(),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
@@ -142,7 +142,7 @@ impl Sysopt {
|
|||||||
|
|
||||||
/// init the auto launch
|
/// init the auto launch
|
||||||
pub fn init_launch(&self) -> Result<()> {
|
pub fn init_launch(&self) -> Result<()> {
|
||||||
let enable = { Config::verge().latest().enable_auto_launch.clone() };
|
let enable = { Config::verge().latest().enable_auto_launch };
|
||||||
let enable = enable.unwrap_or(false);
|
let enable = enable.unwrap_or(false);
|
||||||
|
|
||||||
let app_exe = current_exe()?;
|
let app_exe = current_exe()?;
|
||||||
@@ -233,7 +233,7 @@ impl Sysopt {
|
|||||||
drop(auto_launch);
|
drop(auto_launch);
|
||||||
return self.init_launch();
|
return self.init_launch();
|
||||||
}
|
}
|
||||||
let enable = { Config::verge().latest().enable_auto_launch.clone() };
|
let enable = { Config::verge().latest().enable_auto_launch };
|
||||||
let enable = enable.unwrap_or(false);
|
let enable = enable.unwrap_or(false);
|
||||||
let auto_launch = auto_launch.as_ref().unwrap();
|
let auto_launch = auto_launch.as_ref().unwrap();
|
||||||
|
|
||||||
@@ -271,9 +271,9 @@ impl Sysopt {
|
|||||||
let verge = Config::verge();
|
let verge = Config::verge();
|
||||||
let verge = verge.latest();
|
let verge = verge.latest();
|
||||||
(
|
(
|
||||||
verge.enable_system_proxy.clone().unwrap_or(false),
|
verge.enable_system_proxy.unwrap_or(false),
|
||||||
verge.enable_proxy_guard.clone().unwrap_or(false),
|
verge.enable_proxy_guard.unwrap_or(false),
|
||||||
verge.proxy_guard_duration.clone().unwrap_or(10),
|
verge.proxy_guard_duration.unwrap_or(10),
|
||||||
verge.system_proxy_bypass.clone(),
|
verge.system_proxy_bypass.clone(),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ impl Timer {
|
|||||||
let timer_map = self.timer_map.lock();
|
let timer_map = self.timer_map.lock();
|
||||||
let delay_timer = self.delay_timer.lock();
|
let delay_timer = self.delay_timer.lock();
|
||||||
|
|
||||||
Config::profiles().latest().get_items().map(|items| {
|
if let Some(items) = Config::profiles().latest().get_items() {
|
||||||
items
|
items
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|item| {
|
.filter_map(|item| {
|
||||||
@@ -61,7 +61,7 @@ impl Timer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
});
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,9 +114,9 @@ pub fn use_sort(config: Mapping, enable_filter: bool) -> Mapping {
|
|||||||
.chain(DEFAULT_FIELDS)
|
.chain(DEFAULT_FIELDS)
|
||||||
.for_each(|key| {
|
.for_each(|key| {
|
||||||
let key = Value::from(key);
|
let key = Value::from(key);
|
||||||
config.get(&key).map(|value| {
|
if let Some(value) = config.get(&key) {
|
||||||
ret.insert(key, value.clone());
|
ret.insert(key, value.clone());
|
||||||
});
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if !enable_filter {
|
if !enable_filter {
|
||||||
@@ -134,9 +134,9 @@ pub fn use_sort(config: Mapping, enable_filter: bool) -> Mapping {
|
|||||||
|
|
||||||
config_keys.difference(&supported_keys).for_each(|&key| {
|
config_keys.difference(&supported_keys).for_each(|&key| {
|
||||||
let key = Value::from(key);
|
let key = Value::from(key);
|
||||||
config.get(&key).map(|value| {
|
if let Some(value) = config.get(&key) {
|
||||||
ret.insert(key, value.clone());
|
ret.insert(key, value.clone());
|
||||||
});
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,7 +150,7 @@ pub fn use_keys(config: &Mapping) -> Vec<String> {
|
|||||||
.map(|s| {
|
.map(|s| {
|
||||||
let mut s = s.to_string();
|
let mut s = s.to_string();
|
||||||
s.make_ascii_lowercase();
|
s.make_ascii_lowercase();
|
||||||
return s;
|
s
|
||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,8 @@ mod merge;
|
|||||||
mod script;
|
mod script;
|
||||||
mod tun;
|
mod tun;
|
||||||
|
|
||||||
pub(self) use self::field::*;
|
|
||||||
|
|
||||||
use self::chain::*;
|
use self::chain::*;
|
||||||
|
use self::field::*;
|
||||||
use self::merge::*;
|
use self::merge::*;
|
||||||
use self::script::*;
|
use self::script::*;
|
||||||
use self::tun::*;
|
use self::tun::*;
|
||||||
@@ -28,9 +27,9 @@ pub fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
|
|||||||
let verge = verge.latest();
|
let verge = verge.latest();
|
||||||
(
|
(
|
||||||
verge.clash_core.clone(),
|
verge.clash_core.clone(),
|
||||||
verge.enable_tun_mode.clone().unwrap_or(false),
|
verge.enable_tun_mode.unwrap_or(false),
|
||||||
verge.enable_builtin_enhanced.clone().unwrap_or(true),
|
verge.enable_builtin_enhanced.unwrap_or(true),
|
||||||
verge.enable_clash_fields.clone().unwrap_or(true),
|
verge.enable_clash_fields.unwrap_or(true),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -39,18 +38,18 @@ pub fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
|
|||||||
let profiles = Config::profiles();
|
let profiles = Config::profiles();
|
||||||
let profiles = profiles.latest();
|
let profiles = profiles.latest();
|
||||||
|
|
||||||
let current = profiles.current_mapping().unwrap_or(Mapping::new());
|
let current = profiles.current_mapping().unwrap_or_default();
|
||||||
|
|
||||||
let chain = match profiles.chain.as_ref() {
|
let chain = match profiles.chain.as_ref() {
|
||||||
Some(chain) => chain
|
Some(chain) => chain
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|uid| profiles.get_item(uid).ok())
|
.filter_map(|uid| profiles.get_item(uid).ok())
|
||||||
.filter_map(|item| <Option<ChainItem>>::from(item))
|
.filter_map(<Option<ChainItem>>::from)
|
||||||
.collect::<Vec<ChainItem>>(),
|
.collect::<Vec<ChainItem>>(),
|
||||||
None => vec![],
|
None => vec![],
|
||||||
};
|
};
|
||||||
|
|
||||||
let valid = profiles.valid.clone().unwrap_or(vec![]);
|
let valid = profiles.valid.clone().unwrap_or_default();
|
||||||
|
|
||||||
(current, chain, valid)
|
(current, chain, valid)
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ pub fn use_script(script: String, config: Mapping) -> Result<(Mapping, Vec<(Stri
|
|||||||
if result == "\"\"" {
|
if result == "\"\"" {
|
||||||
anyhow::bail!("main function should return object");
|
anyhow::bail!("main function should return object");
|
||||||
}
|
}
|
||||||
return Ok(serde_json::from_str::<Mapping>(result.as_str())?);
|
Ok(serde_json::from_str::<Mapping>(result.as_str())?)
|
||||||
});
|
});
|
||||||
|
|
||||||
let mut out = outputs.lock().unwrap();
|
let mut out = outputs.lock().unwrap();
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ pub fn change_clash_mode(mode: String) {
|
|||||||
|
|
||||||
// 切换系统代理
|
// 切换系统代理
|
||||||
pub fn toggle_system_proxy() {
|
pub fn toggle_system_proxy() {
|
||||||
let enable = Config::verge().draft().enable_system_proxy.clone();
|
let enable = Config::verge().draft().enable_system_proxy;
|
||||||
let enable = enable.unwrap_or(false);
|
let enable = enable.unwrap_or(false);
|
||||||
|
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
@@ -110,7 +110,7 @@ pub fn disable_system_proxy() {
|
|||||||
|
|
||||||
// 切换tun模式
|
// 切换tun模式
|
||||||
pub fn toggle_tun_mode() {
|
pub fn toggle_tun_mode() {
|
||||||
let enable = Config::verge().data().enable_tun_mode.clone();
|
let enable = Config::verge().data().enable_tun_mode;
|
||||||
let enable = enable.unwrap_or(false);
|
let enable = enable.unwrap_or(false);
|
||||||
|
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
@@ -164,14 +164,14 @@ pub async fn patch_clash(patch: Mapping) -> Result<()> {
|
|||||||
let mixed_port = patch.get("mixed-port");
|
let mixed_port = patch.get("mixed-port");
|
||||||
let enable_random_port = Config::verge().latest().enable_random_port.unwrap_or(false);
|
let enable_random_port = Config::verge().latest().enable_random_port.unwrap_or(false);
|
||||||
if mixed_port.is_some() && !enable_random_port {
|
if mixed_port.is_some() && !enable_random_port {
|
||||||
let changed = mixed_port.clone().unwrap()
|
let changed = mixed_port.unwrap()
|
||||||
!= Config::verge()
|
!= Config::verge()
|
||||||
.latest()
|
.latest()
|
||||||
.verge_mixed_port
|
.verge_mixed_port
|
||||||
.unwrap_or(Config::clash().data().get_mixed_port());
|
.unwrap_or(Config::clash().data().get_mixed_port());
|
||||||
// 检查端口占用
|
// 检查端口占用
|
||||||
if changed {
|
if changed {
|
||||||
if let Some(port) = mixed_port.clone().unwrap().as_u64() {
|
if let Some(port) = mixed_port.unwrap().as_u64() {
|
||||||
if !port_scanner::local_port_available(port as u16) {
|
if !port_scanner::local_port_available(port as u16) {
|
||||||
Config::clash().discard();
|
Config::clash().discard();
|
||||||
bail!("port already in use");
|
bail!("port already in use");
|
||||||
|
|||||||
@@ -25,7 +25,10 @@ fn main() -> std::io::Result<()> {
|
|||||||
#[allow(unused_mut)]
|
#[allow(unused_mut)]
|
||||||
let mut builder = tauri::Builder::default()
|
let mut builder = tauri::Builder::default()
|
||||||
.system_tray(SystemTray::new())
|
.system_tray(SystemTray::new())
|
||||||
.setup(|app| Ok(resolve::resolve_setup(app)))
|
.setup(|app| {
|
||||||
|
resolve::resolve_setup(app);
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
.on_system_tray_event(core::tray::Tray::on_system_tray_event)
|
.on_system_tray_event(core::tray::Tray::on_system_tray_event)
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
// common
|
// common
|
||||||
@@ -34,6 +37,7 @@ fn main() -> std::io::Result<()> {
|
|||||||
cmds::open_logs_dir,
|
cmds::open_logs_dir,
|
||||||
cmds::open_web_url,
|
cmds::open_web_url,
|
||||||
cmds::open_core_dir,
|
cmds::open_core_dir,
|
||||||
|
cmds::get_portable_flag,
|
||||||
// cmds::kill_sidecar,
|
// cmds::kill_sidecar,
|
||||||
cmds::restart_sidecar,
|
cmds::restart_sidecar,
|
||||||
cmds::grant_permission,
|
cmds::grant_permission,
|
||||||
@@ -132,13 +136,13 @@ fn main() -> std::io::Result<()> {
|
|||||||
if label == "main" {
|
if label == "main" {
|
||||||
match event {
|
match event {
|
||||||
tauri::WindowEvent::Destroyed => {
|
tauri::WindowEvent::Destroyed => {
|
||||||
let _ = resolve::save_window_size_position(&app_handle, true);
|
let _ = resolve::save_window_size_position(app_handle, true);
|
||||||
}
|
}
|
||||||
tauri::WindowEvent::CloseRequested { .. } => {
|
tauri::WindowEvent::CloseRequested { .. } => {
|
||||||
let _ = resolve::save_window_size_position(&app_handle, true);
|
let _ = resolve::save_window_size_position(app_handle, true);
|
||||||
}
|
}
|
||||||
tauri::WindowEvent::Moved(_) | tauri::WindowEvent::Resized(_) => {
|
tauri::WindowEvent::Moved(_) | tauri::WindowEvent::Resized(_) => {
|
||||||
let _ = resolve::save_window_size_position(&app_handle, false);
|
let _ = resolve::save_window_size_position(app_handle, false);
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
use crate::core::handle;
|
use crate::core::handle;
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
use once_cell::sync::OnceCell;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use tauri::{
|
use tauri::{
|
||||||
api::path::{data_dir, resource_dir},
|
api::path::{data_dir, resource_dir},
|
||||||
@@ -7,16 +8,18 @@ use tauri::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(not(feature = "verge-dev"))]
|
#[cfg(not(feature = "verge-dev"))]
|
||||||
static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev";
|
pub static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev";
|
||||||
#[cfg(feature = "verge-dev")]
|
#[cfg(feature = "verge-dev")]
|
||||||
static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev.dev";
|
pub static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev.dev";
|
||||||
|
|
||||||
|
pub static PORTABLE_FLAG: OnceCell<bool> = OnceCell::new();
|
||||||
|
|
||||||
static CLASH_CONFIG: &str = "config.yaml";
|
static CLASH_CONFIG: &str = "config.yaml";
|
||||||
static VERGE_CONFIG: &str = "verge.yaml";
|
static VERGE_CONFIG: &str = "verge.yaml";
|
||||||
static PROFILE_YAML: &str = "profiles.yaml";
|
static PROFILE_YAML: &str = "profiles.yaml";
|
||||||
|
|
||||||
/// get the verge app home dir
|
/// init portable flag
|
||||||
pub fn app_home_dir() -> Result<PathBuf> {
|
pub fn init_portable_flag() -> Result<()> {
|
||||||
use tauri::utils::platform::current_exe;
|
use tauri::utils::platform::current_exe;
|
||||||
|
|
||||||
let app_exe = current_exe()?;
|
let app_exe = current_exe()?;
|
||||||
@@ -24,13 +27,27 @@ pub fn app_home_dir() -> Result<PathBuf> {
|
|||||||
let dir = PathBuf::from(dir).join(".config/PORTABLE");
|
let dir = PathBuf::from(dir).join(".config/PORTABLE");
|
||||||
|
|
||||||
if dir.exists() {
|
if dir.exists() {
|
||||||
let app_exe = dunce::canonicalize(app_exe)?;
|
PORTABLE_FLAG.get_or_init(|| true);
|
||||||
let app_dir = app_exe
|
|
||||||
.parent()
|
|
||||||
.ok_or(anyhow::anyhow!("failed to get the portable app dir"))?;
|
|
||||||
return Ok(PathBuf::from(app_dir).join(".config").join(APP_ID));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
PORTABLE_FLAG.get_or_init(|| false);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// get the verge app home dir
|
||||||
|
pub fn app_home_dir() -> Result<PathBuf> {
|
||||||
|
use tauri::utils::platform::current_exe;
|
||||||
|
|
||||||
|
let flag = PORTABLE_FLAG.get().unwrap_or(&false);
|
||||||
|
if *flag {
|
||||||
|
let app_exe = current_exe()?;
|
||||||
|
let app_exe = dunce::canonicalize(app_exe)?;
|
||||||
|
let app_dir = app_exe
|
||||||
|
.parent()
|
||||||
|
.ok_or(anyhow::anyhow!("failed to get the portable app dir"))?;
|
||||||
|
return Ok(PathBuf::from(app_dir).join(".config").join(APP_ID));
|
||||||
|
}
|
||||||
|
|
||||||
Ok(data_dir()
|
Ok(data_dir()
|
||||||
.ok_or(anyhow::anyhow!("failed to get app home dir"))?
|
.ok_or(anyhow::anyhow!("failed to get app home dir"))?
|
||||||
.join(APP_ID))
|
.join(APP_ID))
|
||||||
|
|||||||
+17
-20
@@ -14,7 +14,7 @@ pub fn read_yaml<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
|
|||||||
bail!("file not found \"{}\"", path.display());
|
bail!("file not found \"{}\"", path.display());
|
||||||
}
|
}
|
||||||
|
|
||||||
let yaml_str = fs::read_to_string(&path)
|
let yaml_str = fs::read_to_string(path)
|
||||||
.with_context(|| format!("failed to read the file \"{}\"", path.display()))?;
|
.with_context(|| format!("failed to read the file \"{}\"", path.display()))?;
|
||||||
|
|
||||||
serde_yaml::from_str::<T>(&yaml_str).with_context(|| {
|
serde_yaml::from_str::<T>(&yaml_str).with_context(|| {
|
||||||
@@ -71,15 +71,12 @@ pub fn get_uid(prefix: &str) -> String {
|
|||||||
/// parse the string
|
/// parse the string
|
||||||
/// xxx=123123; => 123123
|
/// xxx=123123; => 123123
|
||||||
pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
|
pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
|
||||||
target.find(key).and_then(|idx| {
|
target.split(';').map(str::trim).find_map(|s| {
|
||||||
let idx = idx + key.len();
|
let mut parts = s.splitn(2, '=');
|
||||||
let value = &target[idx..];
|
match (parts.next(), parts.next()) {
|
||||||
|
(Some(k), Some(v)) if k == key => v.parse::<T>().ok(),
|
||||||
match value.split(';').nth(0) {
|
_ => None,
|
||||||
Some(value) => value.trim().parse(),
|
|
||||||
None => value.trim().parse(),
|
|
||||||
}
|
}
|
||||||
.ok()
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,11 +89,11 @@ pub fn open_file(app: tauri::AppHandle, path: PathBuf) -> Result<()> {
|
|||||||
let code = "code";
|
let code = "code";
|
||||||
|
|
||||||
let _ = match Program::from_str(code) {
|
let _ = match Program::from_str(code) {
|
||||||
Ok(code) => open(&app.shell_scope(), &path.to_string_lossy(), Some(code)),
|
Ok(code) => open(&app.shell_scope(), path.to_string_lossy(), Some(code)),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
log::error!(target: "app", "Can't find VScode `{err}`");
|
log::error!(target: "app", "Can't find VScode `{err}`");
|
||||||
// default open
|
// default open
|
||||||
open(&app.shell_scope(), &path.to_string_lossy(), None)
|
open(&app.shell_scope(), path.to_string_lossy(), None)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -162,17 +159,17 @@ fn test_parse_value() {
|
|||||||
let test_1 = "upload=111; download=2222; total=3333; expire=444";
|
let test_1 = "upload=111; download=2222; total=3333; expire=444";
|
||||||
let test_2 = "attachment; filename=Clash.yaml";
|
let test_2 = "attachment; filename=Clash.yaml";
|
||||||
|
|
||||||
assert_eq!(parse_str::<usize>(test_1, "upload=").unwrap(), 111);
|
assert_eq!(parse_str::<usize>(test_1, "upload").unwrap(), 111);
|
||||||
assert_eq!(parse_str::<usize>(test_1, "download=").unwrap(), 2222);
|
assert_eq!(parse_str::<usize>(test_1, "download").unwrap(), 2222);
|
||||||
assert_eq!(parse_str::<usize>(test_1, "total=").unwrap(), 3333);
|
assert_eq!(parse_str::<usize>(test_1, "total").unwrap(), 3333);
|
||||||
assert_eq!(parse_str::<usize>(test_1, "expire=").unwrap(), 444);
|
assert_eq!(parse_str::<usize>(test_1, "expire").unwrap(), 444);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
parse_str::<String>(test_2, "filename=").unwrap(),
|
parse_str::<String>(test_2, "filename").unwrap(),
|
||||||
format!("Clash.yaml")
|
format!("Clash.yaml")
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(parse_str::<usize>(test_1, "aaa="), None);
|
assert_eq!(parse_str::<usize>(test_1, "aaa"), None);
|
||||||
assert_eq!(parse_str::<usize>(test_1, "upload1="), None);
|
assert_eq!(parse_str::<usize>(test_1, "upload1"), None);
|
||||||
assert_eq!(parse_str::<usize>(test_1, "expire1="), None);
|
assert_eq!(parse_str::<usize>(test_1, "expire1"), None);
|
||||||
assert_eq!(parse_str::<usize>(test_2, "attachment="), None);
|
assert_eq!(parse_str::<usize>(test_2, "attachment"), None);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ pub fn delete_log() -> Result<()> {
|
|||||||
let auto_log_clean = {
|
let auto_log_clean = {
|
||||||
let verge = Config::verge();
|
let verge = Config::verge();
|
||||||
let verge = verge.data();
|
let verge = verge.data();
|
||||||
verge.auto_log_clean.clone().unwrap_or(0)
|
verge.auto_log_clean.unwrap_or(0)
|
||||||
};
|
};
|
||||||
|
|
||||||
let day = match auto_log_clean {
|
let day = match auto_log_clean {
|
||||||
@@ -130,10 +130,8 @@ pub fn delete_log() -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
};
|
};
|
||||||
|
|
||||||
for file in fs::read_dir(&log_dir)? {
|
for file in fs::read_dir(&log_dir)?.flatten() {
|
||||||
if let Ok(file) = file {
|
let _ = process_file(file);
|
||||||
let _ = process_file(file);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -141,6 +139,7 @@ pub fn delete_log() -> Result<()> {
|
|||||||
/// Initialize all the config files
|
/// Initialize all the config files
|
||||||
/// before tauri setup
|
/// before tauri setup
|
||||||
pub fn init_config() -> Result<()> {
|
pub fn init_config() -> Result<()> {
|
||||||
|
let _ = dirs::init_portable_flag();
|
||||||
let _ = init_log();
|
let _ = init_log();
|
||||||
let _ = delete_log();
|
let _ = delete_log();
|
||||||
|
|
||||||
@@ -299,3 +298,45 @@ pub fn init_service() -> Result<()> {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// initialize url scheme
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
pub fn init_scheme() -> Result<()> {
|
||||||
|
use tauri::utils::platform::current_exe;
|
||||||
|
use winreg::enums::*;
|
||||||
|
use winreg::RegKey;
|
||||||
|
|
||||||
|
let app_exe = current_exe()?;
|
||||||
|
let app_exe = dunce::canonicalize(app_exe)?;
|
||||||
|
let app_exe = app_exe.to_string_lossy().into_owned();
|
||||||
|
|
||||||
|
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
||||||
|
let (clash, _) = hkcu.create_subkey("Software\\Classes\\Clash")?;
|
||||||
|
clash.set_value("", &"Clash Verge")?;
|
||||||
|
clash.set_value("URL Protocol", &"Clash Verge URL Scheme Protocol")?;
|
||||||
|
let (default_icon, _) = hkcu.create_subkey("Software\\Classes\\Clash\\DefaultIcon")?;
|
||||||
|
default_icon.set_value("", &app_exe)?;
|
||||||
|
let (command, _) = hkcu.create_subkey("Software\\Classes\\Clash\\Shell\\Open\\Command")?;
|
||||||
|
command.set_value("", &format!("{app_exe} \"%1\""))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub fn init_scheme() -> Result<()> {
|
||||||
|
let output = std::process::Command::new("xdg-mime")
|
||||||
|
.arg("default")
|
||||||
|
.arg("clash-verge.desktop")
|
||||||
|
.arg("x-scheme-handler/clash")
|
||||||
|
.output()?;
|
||||||
|
if !output.status.success() {
|
||||||
|
return Err(anyhow::anyhow!(
|
||||||
|
"failed to set clash scheme, {}",
|
||||||
|
String::from_utf8_lossy(&output.stderr)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
pub fn init_scheme() -> Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,20 @@
|
|||||||
use crate::config::IVerge;
|
use crate::config::{IVerge, PrfOption};
|
||||||
use crate::{config::Config, core::*, utils::init, utils::server};
|
use crate::{
|
||||||
|
config::{Config, PrfItem},
|
||||||
|
core::*,
|
||||||
|
utils::init,
|
||||||
|
utils::server,
|
||||||
|
};
|
||||||
use crate::{log_err, trace_err};
|
use crate::{log_err, trace_err};
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
use once_cell::sync::OnceCell;
|
||||||
use serde_yaml::Mapping;
|
use serde_yaml::Mapping;
|
||||||
use std::net::TcpListener;
|
use std::net::TcpListener;
|
||||||
|
use tauri::api::notification;
|
||||||
use tauri::{App, AppHandle, Manager};
|
use tauri::{App, AppHandle, Manager};
|
||||||
|
|
||||||
|
pub static VERSION: OnceCell<String> = OnceCell::new();
|
||||||
|
|
||||||
pub fn find_unused_port() -> Result<u16> {
|
pub fn find_unused_port() -> Result<u16> {
|
||||||
match TcpListener::bind("127.0.0.1:0") {
|
match TcpListener::bind("127.0.0.1:0") {
|
||||||
Ok(listener) => {
|
Ok(listener) => {
|
||||||
@@ -27,12 +36,15 @@ pub fn find_unused_port() -> Result<u16> {
|
|||||||
pub fn resolve_setup(app: &mut App) {
|
pub fn resolve_setup(app: &mut App) {
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
app.set_activation_policy(tauri::ActivationPolicy::Accessory);
|
app.set_activation_policy(tauri::ActivationPolicy::Accessory);
|
||||||
|
let version = app.package_info().version.to_string();
|
||||||
handle::Handle::global().init(app.app_handle());
|
handle::Handle::global().init(app.app_handle());
|
||||||
|
VERSION.get_or_init(|| version.clone());
|
||||||
|
|
||||||
log_err!(init::init_resources());
|
log_err!(init::init_resources());
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
log_err!(init::init_service());
|
log_err!(init::init_service());
|
||||||
|
log_err!(init::init_scheme());
|
||||||
|
|
||||||
// 处理随机端口
|
// 处理随机端口
|
||||||
let enable_random_port = Config::verge().latest().enable_random_port.unwrap_or(false);
|
let enable_random_port = Config::verge().latest().enable_random_port.unwrap_or(false);
|
||||||
|
|
||||||
@@ -74,7 +86,7 @@ pub fn resolve_setup(app: &mut App) {
|
|||||||
log::trace!("init system tray");
|
log::trace!("init system tray");
|
||||||
log_err!(tray::Tray::update_systray(&app.app_handle()));
|
log_err!(tray::Tray::update_systray(&app.app_handle()));
|
||||||
|
|
||||||
let silent_start = { Config::verge().data().enable_silent_start.clone() };
|
let silent_start = { Config::verge().data().enable_silent_start };
|
||||||
if !silent_start.unwrap_or(false) {
|
if !silent_start.unwrap_or(false) {
|
||||||
create_window(&app.app_handle());
|
create_window(&app.app_handle());
|
||||||
}
|
}
|
||||||
@@ -85,6 +97,13 @@ pub fn resolve_setup(app: &mut App) {
|
|||||||
log_err!(handle::Handle::update_systray_part());
|
log_err!(handle::Handle::update_systray_part());
|
||||||
log_err!(hotkey::Hotkey::global().init(app.app_handle()));
|
log_err!(hotkey::Hotkey::global().init(app.app_handle()));
|
||||||
log_err!(timer::Timer::global().init());
|
log_err!(timer::Timer::global().init());
|
||||||
|
|
||||||
|
let argvs: Vec<String> = std::env::args().collect();
|
||||||
|
if argvs.len() > 1 {
|
||||||
|
tauri::async_runtime::block_on(async {
|
||||||
|
resolve_scheme(argvs[1].to_owned()).await;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// reset system proxy
|
/// reset system proxy
|
||||||
@@ -219,3 +238,31 @@ pub fn save_window_size_position(app_handle: &AppHandle, save_to_file: bool) ->
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn resolve_scheme(param: String) {
|
||||||
|
let url = param
|
||||||
|
.trim_start_matches("clash://install-config/?url=")
|
||||||
|
.trim_start_matches("clash://install-config?url=");
|
||||||
|
let option = PrfOption {
|
||||||
|
user_agent: None,
|
||||||
|
with_proxy: Some(true),
|
||||||
|
self_proxy: None,
|
||||||
|
update_interval: None,
|
||||||
|
};
|
||||||
|
if let Ok(item) = PrfItem::from_url(url, None, None, Some(option)).await {
|
||||||
|
if Config::profiles().data().append_item(item).is_ok() {
|
||||||
|
notification::Notification::new(crate::utils::dirs::APP_ID)
|
||||||
|
.title("Clash Verge")
|
||||||
|
.body("Import profile success")
|
||||||
|
.show()
|
||||||
|
.unwrap();
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
notification::Notification::new(crate::utils::dirs::APP_ID)
|
||||||
|
.title("Clash Verge")
|
||||||
|
.body("Import profile failed")
|
||||||
|
.show()
|
||||||
|
.unwrap();
|
||||||
|
log::error!("failed to parse url: {}", url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,19 +4,42 @@ use super::resolve;
|
|||||||
use crate::config::IVerge;
|
use crate::config::IVerge;
|
||||||
use anyhow::{bail, Result};
|
use anyhow::{bail, Result};
|
||||||
use port_scanner::local_port_available;
|
use port_scanner::local_port_available;
|
||||||
|
use std::convert::Infallible;
|
||||||
use tauri::AppHandle;
|
use tauri::AppHandle;
|
||||||
use warp::Filter;
|
use warp::Filter;
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize, Debug)]
|
||||||
|
struct QueryParam {
|
||||||
|
param: String,
|
||||||
|
}
|
||||||
|
|
||||||
/// check whether there is already exists
|
/// check whether there is already exists
|
||||||
pub fn check_singleton() -> Result<()> {
|
pub fn check_singleton() -> Result<()> {
|
||||||
let port = IVerge::get_singleton_port();
|
let port = IVerge::get_singleton_port();
|
||||||
|
|
||||||
if !local_port_available(port) {
|
if !local_port_available(port) {
|
||||||
tauri::async_runtime::block_on(async {
|
tauri::async_runtime::block_on(async {
|
||||||
let url = format!("http://127.0.0.1:{port}/commands/visible");
|
let resp = reqwest::get(format!("http://127.0.0.1:{port}/commands/ping"))
|
||||||
let resp = reqwest::get(url).await?.text().await?;
|
.await?
|
||||||
|
.text()
|
||||||
|
.await?;
|
||||||
|
|
||||||
if &resp == "ok" {
|
if &resp == "ok" {
|
||||||
|
let argvs: Vec<String> = std::env::args().collect();
|
||||||
|
if argvs.len() > 1 {
|
||||||
|
let param = argvs[1].as_str();
|
||||||
|
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");
|
bail!("app exists");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,11 +57,22 @@ pub fn embed_server(app_handle: AppHandle) {
|
|||||||
let port = IVerge::get_singleton_port();
|
let port = IVerge::get_singleton_port();
|
||||||
|
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
let commands = warp::path!("commands" / "visible").map(move || {
|
let ping = warp::path!("commands" / "ping").map(move || "ok");
|
||||||
|
|
||||||
|
let visible = warp::path!("commands" / "visible").map(move || {
|
||||||
resolve::create_window(&app_handle);
|
resolve::create_window(&app_handle);
|
||||||
format!("ok")
|
"ok"
|
||||||
});
|
});
|
||||||
|
|
||||||
warp::serve(commands).bind(([127, 0, 0, 1], port)).await;
|
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> {
|
||||||
|
resolve::resolve_scheme(query.param).await;
|
||||||
|
Ok("ok")
|
||||||
|
}
|
||||||
|
let commands = ping.or(visible).or(scheme);
|
||||||
|
warp::serve(commands).run(([127, 0, 0, 1], port)).await;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
///! Some config file template
|
//! Some config file template
|
||||||
|
|
||||||
/// template for new a profile item
|
/// template for new a profile item
|
||||||
pub const ITEM_LOCAL: &str = "# Profile Template for clash verge
|
pub const ITEM_LOCAL: &str = "# Profile Template for clash verge
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "Clash Verge",
|
"productName": "Clash Verge",
|
||||||
"version": "1.4.5"
|
"version": "1.4.7"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"distDir": "../dist",
|
"distDir": "../dist",
|
||||||
@@ -51,6 +51,9 @@
|
|||||||
},
|
},
|
||||||
"clipboard": {
|
"clipboard": {
|
||||||
"all": true
|
"all": true
|
||||||
|
},
|
||||||
|
"notification": {
|
||||||
|
"all": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"windows": [],
|
"windows": [],
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
"bundle": {
|
"bundle": {
|
||||||
"targets": ["deb", "appimage", "updater"],
|
"targets": ["deb", "appimage", "updater"],
|
||||||
"deb": {
|
"deb": {
|
||||||
"depends": ["openssl"]
|
"depends": ["openssl"],
|
||||||
|
"desktopTemplate": "./clash-verge.desktop"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,8 +77,8 @@
|
|||||||
|
|
||||||
.the-bar {
|
.the-bar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 2px;
|
top: 0px;
|
||||||
right: 8px;
|
right: 0px;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -27,15 +27,25 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
padding: 5px 5px;
|
padding: 10px 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
scrollbar-gutter: stable;
|
scrollbar-gutter: stable;
|
||||||
|
|
||||||
.base-content {
|
.base-content {
|
||||||
width: 100%;
|
width: calc(100% - 10px * 2);
|
||||||
// max-width: 850px;
|
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.no-padding {
|
||||||
|
> section {
|
||||||
|
padding: 0;
|
||||||
|
overflow: visible;
|
||||||
|
|
||||||
|
.base-content {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,10 +8,11 @@ interface Props {
|
|||||||
header?: React.ReactNode; // something behind title
|
header?: React.ReactNode; // something behind title
|
||||||
contentStyle?: React.CSSProperties;
|
contentStyle?: React.CSSProperties;
|
||||||
children?: ReactNode;
|
children?: ReactNode;
|
||||||
|
full?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const BasePage: React.FC<Props> = (props) => {
|
export const BasePage: React.FC<Props> = (props) => {
|
||||||
const { title, header, contentStyle, children } = props;
|
const { title, header, contentStyle, full, children } = props;
|
||||||
const { theme } = useCustomTheme();
|
const { theme } = useCustomTheme();
|
||||||
|
|
||||||
const isDark = theme.palette.mode === "dark";
|
const isDark = theme.palette.mode === "dark";
|
||||||
@@ -28,7 +29,7 @@ export const BasePage: React.FC<Props> = (props) => {
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className="base-container"
|
className={full ? "base-container no-padding" : "base-container"}
|
||||||
style={{ backgroundColor: isDark ? "#090909" : "#ffffff" }}
|
style={{ backgroundColor: isDark ? "#090909" : "#ffffff" }}
|
||||||
>
|
>
|
||||||
<section
|
<section
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { Button } from "@mui/material";
|
import { Button, ButtonGroup } from "@mui/material";
|
||||||
import { appWindow } from "@tauri-apps/api/window";
|
import { appWindow } from "@tauri-apps/api/window";
|
||||||
import {
|
import {
|
||||||
CloseRounded,
|
CloseRounded,
|
||||||
CropSquareRounded,
|
CropSquareRounded,
|
||||||
FilterNoneRounded,
|
FilterNoneRounded,
|
||||||
HorizontalRuleRounded,
|
HorizontalRuleRounded,
|
||||||
|
PushPinOutlined,
|
||||||
|
PushPinRounded,
|
||||||
} from "@mui/icons-material";
|
} from "@mui/icons-material";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
@@ -12,12 +14,37 @@ export const LayoutControl = () => {
|
|||||||
const minWidth = 40;
|
const minWidth = 40;
|
||||||
|
|
||||||
const [isMaximized, setIsMaximized] = useState(false);
|
const [isMaximized, setIsMaximized] = useState(false);
|
||||||
|
const [isPined, setIsPined] = useState(false);
|
||||||
appWindow.isMaximized().then((isMaximized) => {
|
appWindow.isMaximized().then((isMaximized) => {
|
||||||
setIsMaximized(() => isMaximized);
|
setIsMaximized(() => isMaximized);
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ButtonGroup
|
||||||
|
variant="text"
|
||||||
|
sx={{
|
||||||
|
height: "100%",
|
||||||
|
".MuiButtonGroup-grouped": {
|
||||||
|
borderRadius: "0px",
|
||||||
|
borderRight: "0px",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
sx={{ minWidth, svg: { transform: "scale(0.9)" } }}
|
||||||
|
onClick={() => {
|
||||||
|
appWindow.setAlwaysOnTop(!isPined);
|
||||||
|
setIsPined((isPined) => !isPined);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{isPined ? (
|
||||||
|
<PushPinRounded fontSize="small" />
|
||||||
|
) : (
|
||||||
|
<PushPinOutlined fontSize="small" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
size="small"
|
size="small"
|
||||||
sx={{ minWidth, svg: { transform: "scale(0.9)" } }}
|
sx={{ minWidth, svg: { transform: "scale(0.9)" } }}
|
||||||
@@ -48,11 +75,15 @@ export const LayoutControl = () => {
|
|||||||
|
|
||||||
<Button
|
<Button
|
||||||
size="small"
|
size="small"
|
||||||
sx={{ minWidth, svg: { transform: "scale(1.05)" } }}
|
sx={{
|
||||||
|
minWidth,
|
||||||
|
svg: { transform: "scale(1.05)" },
|
||||||
|
":hover": { bgcolor: "#ff000090" },
|
||||||
|
}}
|
||||||
onClick={() => appWindow.close()}
|
onClick={() => appWindow.close()}
|
||||||
>
|
>
|
||||||
<CloseRounded fontSize="small" />
|
<CloseRounded fontSize="small" />
|
||||||
</Button>
|
</Button>
|
||||||
</>
|
</ButtonGroup>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
|
|||||||
<TextField
|
<TextField
|
||||||
{...text}
|
{...text}
|
||||||
{...field}
|
{...field}
|
||||||
placeholder={`clash-verge-rev`}
|
placeholder={`clash-verge/v${version}`}
|
||||||
label="User Agent"
|
label="User Agent"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -98,6 +98,8 @@ export const ProxyItemMini = (props: Props) => {
|
|||||||
)}
|
)}
|
||||||
<TypeBox component="span">{proxy.type}</TypeBox>
|
<TypeBox component="span">{proxy.type}</TypeBox>
|
||||||
{proxy.udp && <TypeBox component="span">UDP</TypeBox>}
|
{proxy.udp && <TypeBox component="span">UDP</TypeBox>}
|
||||||
|
{proxy.xudp && <TypeBox component="span">XUDP</TypeBox>}
|
||||||
|
{proxy.tfo && <TypeBox component="span">TFO</TypeBox>}
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -104,6 +104,10 @@ export const ProxyItem = (props: Props) => {
|
|||||||
)}
|
)}
|
||||||
{showType && <TypeBox component="span">{proxy.type}</TypeBox>}
|
{showType && <TypeBox component="span">{proxy.type}</TypeBox>}
|
||||||
{showType && proxy.udp && <TypeBox component="span">UDP</TypeBox>}
|
{showType && proxy.udp && <TypeBox component="span">UDP</TypeBox>}
|
||||||
|
{showType && proxy.xudp && (
|
||||||
|
<TypeBox component="span">XUDP</TypeBox>
|
||||||
|
)}
|
||||||
|
{showType && proxy.tfo && <TypeBox component="span">TFO</TypeBox>}
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export const ProxyRender = (props: RenderProps) => {
|
|||||||
props;
|
props;
|
||||||
const { type, group, headState, proxy, proxyCol } = item;
|
const { type, group, headState, proxy, proxyCol } = item;
|
||||||
|
|
||||||
if (type === 0) {
|
if (type === 0 && !group.hidden) {
|
||||||
return (
|
return (
|
||||||
<ListItemButton
|
<ListItemButton
|
||||||
dense
|
dense
|
||||||
@@ -61,7 +61,7 @@ export const ProxyRender = (props: RenderProps) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 1) {
|
if (type === 1 && !group.hidden) {
|
||||||
return (
|
return (
|
||||||
<ProxyHead
|
<ProxyHead
|
||||||
sx={{ pl: indent ? 4.5 : 2.5, pr: 3, mt: indent ? 1 : 0.5, mb: 1 }}
|
sx={{ pl: indent ? 4.5 : 2.5, pr: 3, mt: indent ? 1 : 0.5, mb: 1 }}
|
||||||
@@ -74,7 +74,7 @@ export const ProxyRender = (props: RenderProps) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 2) {
|
if (type === 2 && !group.hidden) {
|
||||||
return (
|
return (
|
||||||
<ProxyItem
|
<ProxyItem
|
||||||
groupName={group.name}
|
groupName={group.name}
|
||||||
@@ -87,7 +87,7 @@ export const ProxyRender = (props: RenderProps) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 3) {
|
if (type === 3 && !group.hidden) {
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
@@ -105,7 +105,7 @@ export const ProxyRender = (props: RenderProps) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 4) {
|
if (type === 4 && !group.hidden) {
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
|
|||||||
@@ -168,6 +168,6 @@ const FlexBox = styled("div")`
|
|||||||
|
|
||||||
.label {
|
.label {
|
||||||
flex: none;
|
flex: none;
|
||||||
width: 80px;
|
width: 85px;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
|
|||||||
import { BaseDialog, DialogRef, Notice } from "@/components/base";
|
import { BaseDialog, DialogRef, Notice } from "@/components/base";
|
||||||
import { atomUpdateState } from "@/services/states";
|
import { atomUpdateState } from "@/services/states";
|
||||||
import { listen, Event, UnlistenFn } from "@tauri-apps/api/event";
|
import { listen, Event, UnlistenFn } from "@tauri-apps/api/event";
|
||||||
|
import { portableFlag } from "@/pages/_layout";
|
||||||
|
|
||||||
const UpdateLog = styled(Box)(() => ({
|
const UpdateLog = styled(Box)(() => ({
|
||||||
"h1,h2,h3,ul,ol,p": { margin: "0.5em 0", color: "inherit" },
|
"h1,h2,h3,ul,ol,p": { margin: "0.5em 0", color: "inherit" },
|
||||||
@@ -46,6 +47,10 @@ export const UpdateViewer = forwardRef<DialogRef>((props, ref) => {
|
|||||||
}, [updateInfo]);
|
}, [updateInfo]);
|
||||||
|
|
||||||
const onUpdate = useLockFn(async () => {
|
const onUpdate = useLockFn(async () => {
|
||||||
|
if (portableFlag) {
|
||||||
|
Notice.error(t("Portable Updater Error"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (updateState) return;
|
if (updateState) return;
|
||||||
setUpdateState(true);
|
setUpdateState(true);
|
||||||
if (eventListener !== null) {
|
if (eventListener !== null) {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { GuardState } from "./mods/guard-state";
|
|||||||
import { LayoutViewer } from "./mods/layout-viewer";
|
import { LayoutViewer } from "./mods/layout-viewer";
|
||||||
import { UpdateViewer } from "./mods/update-viewer";
|
import { UpdateViewer } from "./mods/update-viewer";
|
||||||
import getSystem from "@/utils/get-system";
|
import getSystem from "@/utils/get-system";
|
||||||
|
import { portableFlag } from "@/pages/_layout";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onError?: (err: Error) => void;
|
onError?: (err: Error) => void;
|
||||||
@@ -213,7 +214,7 @@ const SettingVerge = ({ onError }: Props) => {
|
|||||||
</IconButton>
|
</IconButton>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
{!(OS === "windows" && WIN_PORTABLE) && (
|
{!portableFlag && (
|
||||||
<SettingItem label={t("Check for Updates")}>
|
<SettingItem label={t("Check for Updates")}>
|
||||||
<IconButton
|
<IconButton
|
||||||
color="inherit"
|
color="inherit"
|
||||||
|
|||||||
+3
-1
@@ -145,5 +145,7 @@
|
|||||||
"Never Clean": "Never Clean",
|
"Never Clean": "Never Clean",
|
||||||
"Retain 7 Days": "Retain 7 Days",
|
"Retain 7 Days": "Retain 7 Days",
|
||||||
"Retain 30 Days": "Retain 30 Days",
|
"Retain 30 Days": "Retain 30 Days",
|
||||||
"Retain 90 Days": "Retain 90 Days"
|
"Retain 90 Days": "Retain 90 Days",
|
||||||
|
|
||||||
|
"Portable Updater Error": "The portable version does not support in-app updates. Please manually download and replace it"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -115,5 +115,7 @@
|
|||||||
"disable_system_proxy": "Отключить системный прокси",
|
"disable_system_proxy": "Отключить системный прокси",
|
||||||
"toggle_tun_mode": "Переключить режим туннеля",
|
"toggle_tun_mode": "Переключить режим туннеля",
|
||||||
"enable_tun_mode": "Включить режим туннеля",
|
"enable_tun_mode": "Включить режим туннеля",
|
||||||
"disable_tun_mode": "Отключить режим туннеля"
|
"disable_tun_mode": "Отключить режим туннеля",
|
||||||
|
|
||||||
|
"Portable Updater Error": "Портативная версия не поддерживает обновление внутри приложения, пожалуйста, скачайте и замените вручную"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -145,5 +145,7 @@
|
|||||||
"Never Clean": "不清理",
|
"Never Clean": "不清理",
|
||||||
"Retain 7 Days": "保留7天",
|
"Retain 7 Days": "保留7天",
|
||||||
"Retain 30 Days": "保留30天",
|
"Retain 30 Days": "保留30天",
|
||||||
"Retain 90 Days": "保留90天"
|
"Retain 90 Days": "保留90天",
|
||||||
|
|
||||||
|
"Portable Updater Error": "便携版不支持应用内更新,请手动下载替换"
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-7
@@ -22,6 +22,9 @@ import { useCustomTheme } from "@/components/layout/use-custom-theme";
|
|||||||
import getSystem from "@/utils/get-system";
|
import getSystem from "@/utils/get-system";
|
||||||
import "dayjs/locale/ru";
|
import "dayjs/locale/ru";
|
||||||
import "dayjs/locale/zh-cn";
|
import "dayjs/locale/zh-cn";
|
||||||
|
import { getPortableFlag } from "@/services/cmds";
|
||||||
|
|
||||||
|
export let portableFlag = false;
|
||||||
|
|
||||||
dayjs.extend(relativeTime);
|
dayjs.extend(relativeTime);
|
||||||
|
|
||||||
@@ -71,10 +74,12 @@ const Layout = () => {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setTimeout(() => {
|
|
||||||
void appWindow.unminimize();
|
setTimeout(async () => {
|
||||||
void appWindow.show();
|
portableFlag = await getPortableFlag();
|
||||||
void appWindow.setFocus();
|
await appWindow.unminimize();
|
||||||
|
await appWindow.show();
|
||||||
|
await appWindow.setFocus();
|
||||||
}, 50);
|
}, 50);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -119,9 +124,7 @@ const Layout = () => {
|
|||||||
<div className="the-logo" data-windrag>
|
<div className="the-logo" data-windrag>
|
||||||
<LogoSvg />
|
<LogoSvg />
|
||||||
|
|
||||||
{!(OS === "windows" && WIN_PORTABLE) && (
|
{!portableFlag && <UpdateButton className="the-newbtn" />}
|
||||||
<UpdateButton className="the-newbtn" />
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<List className="the-menu">
|
<List className="the-menu">
|
||||||
|
|||||||
+63
-65
@@ -114,6 +114,7 @@ const ConnectionsPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
|
full
|
||||||
title={t("Connections")}
|
title={t("Connections")}
|
||||||
contentStyle={{ height: "100%" }}
|
contentStyle={{ height: "100%" }}
|
||||||
header={
|
header={
|
||||||
@@ -142,75 +143,72 @@ const ConnectionsPage = () => {
|
|||||||
</Box>
|
</Box>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Box sx={{ boxShadow: 0, height: "100%" }}>
|
<Box
|
||||||
<Box
|
sx={{
|
||||||
sx={{
|
pt: 1,
|
||||||
pt: 1,
|
mb: 0.5,
|
||||||
mb: 0.5,
|
mx: "10px",
|
||||||
mx: "12px",
|
height: "36px",
|
||||||
height: "36px",
|
display: "flex",
|
||||||
display: "flex",
|
alignItems: "center",
|
||||||
alignItems: "center",
|
userSelect: "text",
|
||||||
userSelect: "text",
|
}}
|
||||||
}}
|
>
|
||||||
>
|
{!isTableLayout && (
|
||||||
{!isTableLayout && (
|
<Select
|
||||||
<Select
|
|
||||||
size="small"
|
|
||||||
autoComplete="off"
|
|
||||||
value={curOrderOpt}
|
|
||||||
onChange={(e) => setOrderOpt(e.target.value)}
|
|
||||||
sx={{
|
|
||||||
mr: 1,
|
|
||||||
width: i18n.language === "en" ? 190 : 120,
|
|
||||||
'[role="button"]': { py: 0.65 },
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{Object.keys(orderOpts).map((opt) => (
|
|
||||||
<MenuItem key={opt} value={opt}>
|
|
||||||
<span style={{ fontSize: 14 }}>{t(opt)}</span>
|
|
||||||
</MenuItem>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<TextField
|
|
||||||
hiddenLabel
|
|
||||||
fullWidth
|
|
||||||
size="small"
|
size="small"
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
spellCheck="false"
|
value={curOrderOpt}
|
||||||
variant="outlined"
|
onChange={(e) => setOrderOpt(e.target.value)}
|
||||||
placeholder={t("Filter conditions")}
|
sx={{
|
||||||
value={filterText}
|
mr: 1,
|
||||||
onChange={(e) => setFilterText(e.target.value)}
|
width: i18n.language === "en" ? 190 : 120,
|
||||||
sx={{ input: { py: 0.65, px: 1.25 } }}
|
'[role="button"]': { py: 0.65 },
|
||||||
/>
|
}}
|
||||||
</Box>
|
>
|
||||||
|
{Object.keys(orderOpts).map((opt) => (
|
||||||
|
<MenuItem key={opt} value={opt}>
|
||||||
|
<span style={{ fontSize: 14 }}>{t(opt)}</span>
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
)}
|
||||||
|
|
||||||
<Box height="calc(100% - 50px)" sx={{ userSelect: "text" }}>
|
<TextField
|
||||||
{filterConn.length === 0 ? (
|
hiddenLabel
|
||||||
<BaseEmpty text="No Connections" />
|
fullWidth
|
||||||
) : isTableLayout ? (
|
size="small"
|
||||||
<ConnectionTable
|
autoComplete="off"
|
||||||
connections={filterConn}
|
spellCheck="false"
|
||||||
onShowDetail={(detail) => detailRef.current?.open(detail)}
|
variant="outlined"
|
||||||
/>
|
placeholder={t("Filter conditions")}
|
||||||
) : (
|
value={filterText}
|
||||||
<Virtuoso
|
onChange={(e) => setFilterText(e.target.value)}
|
||||||
data={filterConn}
|
sx={{ input: { py: 0.65, px: 1.25 } }}
|
||||||
itemContent={(index, item) => (
|
/>
|
||||||
<ConnectionItem
|
|
||||||
value={item}
|
|
||||||
onShowDetail={() => detailRef.current?.open(item)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</Box>
|
|
||||||
|
|
||||||
<ConnectionDetail ref={detailRef} />
|
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
|
<Box height="calc(100% - 50px)" sx={{ userSelect: "text" }}>
|
||||||
|
{filterConn.length === 0 ? (
|
||||||
|
<BaseEmpty text="No Connections" />
|
||||||
|
) : isTableLayout ? (
|
||||||
|
<ConnectionTable
|
||||||
|
connections={filterConn}
|
||||||
|
onShowDetail={(detail) => detailRef.current?.open(detail)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Virtuoso
|
||||||
|
data={filterConn}
|
||||||
|
itemContent={(index, item) => (
|
||||||
|
<ConnectionItem
|
||||||
|
value={item}
|
||||||
|
onShowDetail={() => detailRef.current?.open(item)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
<ConnectionDetail ref={detailRef} />
|
||||||
</BasePage>
|
</BasePage>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
+42
-50
@@ -38,6 +38,7 @@ const LogPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
|
full
|
||||||
title={t("Logs")}
|
title={t("Logs")}
|
||||||
contentStyle={{ height: "100%" }}
|
contentStyle={{ height: "100%" }}
|
||||||
header={
|
header={
|
||||||
@@ -66,61 +67,52 @@ const LogPage = () => {
|
|||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
boxSizing: "border-box",
|
pt: 1,
|
||||||
boxShadow: 0,
|
mb: 0.5,
|
||||||
height: "100%",
|
mx: "10px",
|
||||||
userSelect: "text",
|
height: "36px",
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Box
|
<Select
|
||||||
sx={{
|
size="small"
|
||||||
pt: 1,
|
autoComplete="off"
|
||||||
mb: 0.5,
|
value={logState}
|
||||||
mx: "12px",
|
onChange={(e) => setLogState(e.target.value)}
|
||||||
height: "36px",
|
sx={{ width: 120, mr: 1, '[role="button"]': { py: 0.65 } }}
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<Select
|
<MenuItem value="all">ALL</MenuItem>
|
||||||
size="small"
|
<MenuItem value="inf">INFO</MenuItem>
|
||||||
autoComplete="off"
|
<MenuItem value="warn">WARN</MenuItem>
|
||||||
value={logState}
|
<MenuItem value="err">ERROR</MenuItem>
|
||||||
onChange={(e) => setLogState(e.target.value)}
|
</Select>
|
||||||
sx={{ width: 120, mr: 1, '[role="button"]': { py: 0.65 } }}
|
|
||||||
>
|
|
||||||
<MenuItem value="all">ALL</MenuItem>
|
|
||||||
<MenuItem value="inf">INFO</MenuItem>
|
|
||||||
<MenuItem value="warn">WARN</MenuItem>
|
|
||||||
<MenuItem value="err">ERROR</MenuItem>
|
|
||||||
</Select>
|
|
||||||
|
|
||||||
<TextField
|
<TextField
|
||||||
hiddenLabel
|
hiddenLabel
|
||||||
fullWidth
|
fullWidth
|
||||||
size="small"
|
size="small"
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
spellCheck="false"
|
spellCheck="false"
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
placeholder={t("Filter conditions")}
|
placeholder={t("Filter conditions")}
|
||||||
value={filterText}
|
value={filterText}
|
||||||
onChange={(e) => setFilterText(e.target.value)}
|
onChange={(e) => setFilterText(e.target.value)}
|
||||||
sx={{ input: { py: 0.65, px: 1.25 } }}
|
sx={{ input: { py: 0.65, px: 1.25 } }}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box height="calc(100% - 50px)">
|
||||||
|
{filterLogs.length > 0 ? (
|
||||||
|
<Virtuoso
|
||||||
|
initialTopMostItemIndex={999}
|
||||||
|
data={filterLogs}
|
||||||
|
itemContent={(index, item) => <LogItem value={item} />}
|
||||||
|
followOutput={"smooth"}
|
||||||
/>
|
/>
|
||||||
</Box>
|
) : (
|
||||||
|
<BaseEmpty text="No Logs" />
|
||||||
<Box height="calc(100% - 50px)">
|
)}
|
||||||
{filterLogs.length > 0 ? (
|
|
||||||
<Virtuoso
|
|
||||||
initialTopMostItemIndex={999}
|
|
||||||
data={filterLogs}
|
|
||||||
itemContent={(index, item) => <LogItem value={item} />}
|
|
||||||
followOutput={"smooth"}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<BaseEmpty text="No Logs" />
|
|
||||||
)}
|
|
||||||
</Box>
|
|
||||||
</Box>
|
</Box>
|
||||||
</BasePage>
|
</BasePage>
|
||||||
);
|
);
|
||||||
|
|||||||
+2
-10
@@ -51,6 +51,7 @@ const ProxyPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
|
full
|
||||||
contentStyle={{ height: "100%" }}
|
contentStyle={{ height: "100%" }}
|
||||||
title={t("Proxy Groups")}
|
title={t("Proxy Groups")}
|
||||||
header={
|
header={
|
||||||
@@ -72,16 +73,7 @@ const ProxyPage = () => {
|
|||||||
</Box>
|
</Box>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Box
|
<ProxyGroups mode={curMode!} />
|
||||||
sx={{
|
|
||||||
borderRadius: 1,
|
|
||||||
boxShadow: 0,
|
|
||||||
height: "100%",
|
|
||||||
boxSizing: "border-box",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ProxyGroups mode={curMode!} />
|
|
||||||
</Box>
|
|
||||||
</BasePage>
|
</BasePage>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
+36
-38
@@ -18,45 +18,43 @@ const RulesPage = () => {
|
|||||||
}, [data, filterText]);
|
}, [data, filterText]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage title={t("Rules")} contentStyle={{ height: "100%" }}>
|
<BasePage full title={t("Rules")} contentStyle={{ height: "100%" }}>
|
||||||
<Box sx={{ boxSizing: "border-box", boxShadow: 0, height: "100%" }}>
|
<Box
|
||||||
<Box
|
sx={{
|
||||||
sx={{
|
pt: 1,
|
||||||
pt: 1,
|
mb: 0.5,
|
||||||
mb: 0.5,
|
mx: "10px",
|
||||||
mx: "12px",
|
height: "36px",
|
||||||
height: "36px",
|
display: "flex",
|
||||||
display: "flex",
|
alignItems: "center",
|
||||||
alignItems: "center",
|
}}
|
||||||
}}
|
>
|
||||||
>
|
<TextField
|
||||||
<TextField
|
hiddenLabel
|
||||||
hiddenLabel
|
fullWidth
|
||||||
fullWidth
|
size="small"
|
||||||
size="small"
|
autoComplete="off"
|
||||||
autoComplete="off"
|
variant="outlined"
|
||||||
variant="outlined"
|
spellCheck="false"
|
||||||
spellCheck="false"
|
placeholder={t("Filter conditions")}
|
||||||
placeholder={t("Filter conditions")}
|
value={filterText}
|
||||||
value={filterText}
|
onChange={(e) => setFilterText(e.target.value)}
|
||||||
onChange={(e) => setFilterText(e.target.value)}
|
sx={{ input: { py: 0.65, px: 1.25 } }}
|
||||||
sx={{ input: { py: 0.65, px: 1.25 } }}
|
/>
|
||||||
/>
|
</Box>
|
||||||
</Box>
|
|
||||||
|
|
||||||
<Box height="calc(100% - 50px)">
|
<Box height="calc(100% - 50px)">
|
||||||
{rules.length > 0 ? (
|
{rules.length > 0 ? (
|
||||||
<Virtuoso
|
<Virtuoso
|
||||||
data={rules}
|
data={rules}
|
||||||
itemContent={(index, item) => (
|
itemContent={(index, item) => (
|
||||||
<RuleItem index={index + 1} value={item} />
|
<RuleItem index={index + 1} value={item} />
|
||||||
)}
|
)}
|
||||||
followOutput={"smooth"}
|
followOutput={"smooth"}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<BaseEmpty text="No Rules" />
|
<BaseEmpty text="No Rules" />
|
||||||
)}
|
)}
|
||||||
</Box>
|
|
||||||
</Box>
|
</Box>
|
||||||
</BasePage>
|
</BasePage>
|
||||||
);
|
);
|
||||||
|
|||||||
+8
-1
@@ -119,7 +119,14 @@ export const getProxies = async () => {
|
|||||||
const generateItem = (name: string) => {
|
const generateItem = (name: string) => {
|
||||||
if (proxyRecord[name]) return proxyRecord[name];
|
if (proxyRecord[name]) return proxyRecord[name];
|
||||||
if (providerMap[name]) return providerMap[name];
|
if (providerMap[name]) return providerMap[name];
|
||||||
return { name, type: "unknown", udp: false, history: [] };
|
return {
|
||||||
|
name,
|
||||||
|
type: "unknown",
|
||||||
|
udp: false,
|
||||||
|
xudp: false,
|
||||||
|
tfo: false,
|
||||||
|
history: [],
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const { GLOBAL: global, DIRECT: direct, REJECT: reject } = proxyRecord;
|
const { GLOBAL: global, DIRECT: direct, REJECT: reject } = proxyRecord;
|
||||||
|
|||||||
@@ -191,3 +191,7 @@ export async function invoke_uwp_tool() {
|
|||||||
Notice.error(err?.message || err.toString(), 1500)
|
Notice.error(err?.message || err.toString(), 1500)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getPortableFlag() {
|
||||||
|
return invoke<boolean>("get_portable_flag");
|
||||||
|
}
|
||||||
|
|||||||
Vendored
+3
-1
@@ -14,7 +14,6 @@ type Platform =
|
|||||||
/**
|
/**
|
||||||
* defines in `vite.config.ts`
|
* defines in `vite.config.ts`
|
||||||
*/
|
*/
|
||||||
declare const WIN_PORTABLE: boolean;
|
|
||||||
declare const OS_PLATFORM: Platform;
|
declare const OS_PLATFORM: Platform;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -45,12 +44,15 @@ interface IProxyItem {
|
|||||||
name: string;
|
name: string;
|
||||||
type: string;
|
type: string;
|
||||||
udp: boolean;
|
udp: boolean;
|
||||||
|
xudp: boolean;
|
||||||
|
tfo: boolean;
|
||||||
history: {
|
history: {
|
||||||
time: string;
|
time: string;
|
||||||
delay: number;
|
delay: number;
|
||||||
}[];
|
}[];
|
||||||
all?: string[];
|
all?: string[];
|
||||||
now?: string;
|
now?: string;
|
||||||
|
hidden?: boolean;
|
||||||
provider?: string; // 记录是否来自provider
|
provider?: string; // 记录是否来自provider
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,5 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
define: {
|
define: {
|
||||||
OS_PLATFORM: `"${process.platform}"`,
|
OS_PLATFORM: `"${process.platform}"`,
|
||||||
WIN_PORTABLE: !!process.env.VITE_WIN_PORTABLE,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user