diff --git a/Cargo.lock b/Cargo.lock index 09ee9c537..b5d39c75d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1360,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5165,7 +5165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -7998,8 +7998,8 @@ dependencies = [ [[package]] name = "tauri-plugin-mihomo" -version = "0.2.0" -source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?rev=66a2b5d50520cae46cddfe456a0d334c094fd05b#66a2b5d50520cae46cddfe456a0d334c094fd05b" +version = "0.3.0" +source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#e8f46f631f40259bcbe252f14dd49efd1afdc2f0" dependencies = [ "base64 0.22.1", "bytes", @@ -9730,7 +9730,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Changelog.md b/Changelog.md index 178cc0986..14655af37 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,8 @@
✨ 新增功能 +- 增加 TrustTunnel, OpenVPN, Tailscale, GostRelay 节点显示支持 +
diff --git a/package.json b/package.json index 6ac2a289b..c8d17811f 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "react-markdown": "10.1.0", "react-router": "^7.13.1", "rehype-raw": "^7.0.0", - "tauri-plugin-mihomo-api": "github:clash-verge-rev/tauri-plugin-mihomo#66a2b5d50520cae46cddfe456a0d334c094fd05b", + "tauri-plugin-mihomo-api": "github:clash-verge-rev/tauri-plugin-mihomo", "types-pac": "^1.0.3", "validator": "^13.15.26" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2fbb9f8b..39db31d71 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 tauri-plugin-mihomo-api: - specifier: github:clash-verge-rev/tauri-plugin-mihomo#66a2b5d50520cae46cddfe456a0d334c094fd05b - version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b + specifier: github:clash-verge-rev/tauri-plugin-mihomo + version: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/e8f46f631f40259bcbe252f14dd49efd1afdc2f0 types-pac: specifier: ^1.0.3 version: 1.0.3 @@ -3398,9 +3398,9 @@ packages: resolution: {integrity: sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==} engines: {node: '>=18'} - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b: - resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b} - version: 0.1.5 + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/e8f46f631f40259bcbe252f14dd49efd1afdc2f0: + resolution: {tarball: https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/e8f46f631f40259bcbe252f14dd49efd1afdc2f0} + version: 0.3.0 terser@5.46.2: resolution: {integrity: sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==} @@ -7139,7 +7139,7 @@ snapshots: minizlib: 3.1.0 yallist: 5.0.0 - tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/66a2b5d50520cae46cddfe456a0d334c094fd05b: + tauri-plugin-mihomo-api@https://codeload.github.com/clash-verge-rev/tauri-plugin-mihomo/tar.gz/e8f46f631f40259bcbe252f14dd49efd1afdc2f0: dependencies: '@tauri-apps/api': 2.11.0 diff --git a/renovate.json b/renovate.json index 0f5c2f1df..e59c8a9ea 100644 --- a/renovate.json +++ b/renovate.json @@ -1,33 +1,7 @@ { "extends": ["config:recommended", ":disableDependencyDashboard"], "baseBranchPatterns": ["dev"], - "enabledManagers": ["cargo", "npm", "github-actions", "custom.regex"], - "customManagers": [ - { - "customType": "regex", - "description": "Track tauri-plugin-mihomo Cargo git revision on main", - "fileMatch": ["(^|/)src-tauri/Cargo\\.toml$"], - "matchStrings": [ - "tauri-plugin-mihomo\\s*=\\s*\\{[^}]*git\\s*=\\s*\"https://github\\.com/clash-verge-rev/tauri-plugin-mihomo\"[^}]*rev\\s*=\\s*\"(?[a-f0-9]{40})\"[^}]*\\}" - ], - "depNameTemplate": "tauri-plugin-mihomo", - "packageNameTemplate": "https://github.com/clash-verge-rev/tauri-plugin-mihomo", - "currentValueTemplate": "main", - "datasourceTemplate": "git-refs" - }, - { - "customType": "regex", - "description": "Track tauri-plugin-mihomo npm API git revision on main", - "fileMatch": ["(^|/)package\\.json$"], - "matchStrings": [ - "\"tauri-plugin-mihomo-api\"\\s*:\\s*\"github:clash-verge-rev/tauri-plugin-mihomo#(?[a-f0-9]{40})\"" - ], - "depNameTemplate": "tauri-plugin-mihomo-api", - "packageNameTemplate": "https://github.com/clash-verge-rev/tauri-plugin-mihomo", - "currentValueTemplate": "main", - "datasourceTemplate": "git-refs" - } - ], + "enabledManagers": ["cargo", "npm", "github-actions"], "labels": ["dependencies"], "ignorePaths": [ "**/node_modules/**", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 02419b944..fe783ace4 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -95,7 +95,7 @@ backon = { version = "1.6.0", features = ["tokio-sleep"] } tauri-plugin-http = "2.5.9" console-subscriber = { version = "0.5.0", optional = true } tauri-plugin-devtools = { version = "2.1.0" } -tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", rev = "66a2b5d50520cae46cddfe456a0d334c094fd05b" } +tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo" } clash_verge_logger = { git = "https://github.com/clash-verge-rev/clash-verge-logger" } async-trait = "0.1.89" clash_verge_service_ipc = { version = "2.3.0", features = [