@@ -14,14 +12,14 @@ For example, encrypt user id or make session, and encode in hexadecimal:
```
hex_encode(your_encrypt_or_session_function(user id))
-// 3ae6afc9fad94abd8985d8ecc77afb273ae6afc9fad94abd8985d8ecc77afb273ae6afc9fad94abd8985d8ecc77afb27 // 48 bytes token
+// 3ae6afc9fad94abd8985d8ecc77afb273ae6afc9fad94abd8985d8ecc77afb273ae6afc9fad94abd8985d8ecc77afb27
```
For example, UUID:
```javascript
crypto.randomUUID().replaceAll('-', '')
-// 3ae6afc9fad94abd8985d8ecc77afb27 // 16 bytes token
+// 3ae6afc9fad94abd8985d8ecc77afb27
```
## User API
@@ -79,3 +77,6 @@ You can count the traffic of each user from serverLog
brook link --server 1.2.3.4:9999 --password hello --token xxx
```
+## Basic reference implementation
+
+https://github.com/TxThinkingInc/brook-dashboard
diff --git a/brook/quicserver.go b/brook/quicserver.go
index 5c1538f37f..9be1f4c34f 100644
--- a/brook/quicserver.go
+++ b/brook/quicserver.go
@@ -148,8 +148,15 @@ func (s *QUICServer) ListenAndServe() error {
return
}
defer ss.Clean()
- if err := s.TCPHandle(ss); err != nil {
- Log(Error{"from": ss.Src(), "dst": ss.Dst(), "error": err.Error()})
+ if ss.Network() == "tcp" {
+ if err := s.TCPHandle(ss); err != nil {
+ Log(Error{"from": ss.Src(), "dst": ss.Dst(), "error": err.Error()})
+ }
+ }
+ if ss.Network() == "udp" {
+ if err := s.UDPOverTCPHandle(ss); err != nil {
+ Log(Error{"from": c.RemoteAddr().String(), "dst": ss.Dst(), "error": err.Error()})
+ }
}
}(&QUICConn{
Conn: c,
@@ -240,6 +247,18 @@ func (s *QUICServer) TCPHandle(ss Exchanger) error {
return nil
}
+func (s *QUICServer) UDPOverTCPHandle(ss Exchanger) error {
+ rc, err := NATDial("udp", ss.Src(), ss.Dst(), ss.Dst())
+ if err != nil {
+ return err
+ }
+ defer rc.Close()
+ if err := ss.Exchange(rc); err != nil {
+ return nil
+ }
+ return nil
+}
+
func (s *QUICServer) UDPHandle(ss Exchanger) error {
rc, err := NATDial("udp", ss.Src(), ss.Dst(), ss.Dst())
if err != nil {
diff --git a/brook/test_test.go b/brook/test_test.go
index 40b49f3e6d..ff13564467 100644
--- a/brook/test_test.go
+++ b/brook/test_test.go
@@ -16,10 +16,12 @@ package brook
import (
"log"
+ "net"
"testing"
+
+ "github.com/phuslu/iploc"
)
func TestTest(t *testing.T) {
- l, err := CAC("/tmp/a")
- log.Printf("%#v %v\n", l, err)
+ log.Printf("%#v\n", iploc.Country(net.ParseIP("8.8.8.8")))
}
diff --git a/clash-meta/README.md b/clash-meta/README.md
index 975f1268e0..d38fbedd8a 100644
--- a/clash-meta/README.md
+++ b/clash-meta/README.md
@@ -98,4 +98,3 @@ API.
This software is released under the GPL-3.0 license.
-[](https://app.fossa.io/projects/git%2Bgithub.com%2FMetaCubeX%2Fmihomo?ref=badge_large)
diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json
index 219c86ba7d..7b47426cd4 100644
--- a/clash-nyanpasu/frontend/nyanpasu/package.json
+++ b/clash-nyanpasu/frontend/nyanpasu/package.json
@@ -35,7 +35,7 @@
"react-dom": "18.3.1",
"react-error-boundary": "4.0.13",
"react-fast-marquee": "1.6.4",
- "react-hook-form": "7.51.3",
+ "react-hook-form": "7.51.4",
"react-i18next": "14.1.1",
"react-markdown": "9.0.1",
"react-router-dom": "6.23.0",
diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json
index 6f103ba6ba..1db40c4e80 100644
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -97,7 +97,7 @@
"stylelint-config-standard": "36.0.0",
"stylelint-declaration-block-no-ignored-properties": "2.8.0",
"stylelint-order": "6.0.4",
- "stylelint-scss": "6.2.1",
+ "stylelint-scss": "6.3.0",
"tailwindcss": "3.4.3",
"tsx": "4.9.0",
"typescript": "5.4.5"
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index deb0cf1e5a..5765120bb9 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -121,8 +121,8 @@ importers:
specifier: 6.0.4
version: 6.0.4(stylelint@16.5.0(typescript@5.4.5))
stylelint-scss:
- specifier: 6.2.1
- version: 6.2.1(stylelint@16.5.0(typescript@5.4.5))
+ specifier: 6.3.0
+ version: 6.3.0(stylelint@16.5.0(typescript@5.4.5))
tailwindcss:
specifier: 3.4.3
version: 3.4.3
@@ -226,8 +226,8 @@ importers:
specifier: 1.6.4
version: 1.6.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react-hook-form:
- specifier: 7.51.3
- version: 7.51.3(react@18.3.1)
+ specifier: 7.51.4
+ version: 7.51.4(react@18.3.1)
react-i18next:
specifier: 14.1.1
version: 14.1.1(i18next@23.11.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -2127,8 +2127,8 @@ packages:
eastasianwidth@0.2.0:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
- electron-to-chromium@1.4.754:
- resolution: {integrity: sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA==}
+ electron-to-chromium@1.4.756:
+ resolution: {integrity: sha512-RJKZ9+vEBMeiPAvKNWyZjuYyUqMndcP1f335oHqn3BEQbs2NFtVrnK5+6Xg5wSM9TknNNpWghGDUCKGYF+xWXw==}
emoji-regex@10.3.0:
resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==}
@@ -2952,9 +2952,6 @@ packages:
resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
engines: {node: '>=0.10.0'}
- known-css-properties@0.29.0:
- resolution: {integrity: sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==}
-
known-css-properties@0.30.0:
resolution: {integrity: sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==}
@@ -3622,8 +3619,8 @@ packages:
react: '>= 16.8.0 || 18.0.0'
react-dom: '>= 16.8.0 || 18.0.0'
- react-hook-form@7.51.3:
- resolution: {integrity: sha512-cvJ/wbHdhYx8aviSWh28w9ImjmVsb5Y05n1+FW786vEZQJV5STNM0pW6ujS+oiBecb0ARBxJFyAnXj9+GHXACQ==}
+ react-hook-form@7.51.4:
+ resolution: {integrity: sha512-V14i8SEkh+V1gs6YtD0hdHYnoL4tp/HX/A45wWQN15CYr9bFRmmRdYStSO5L65lCCZRF+kYiSKhm9alqbcdiVA==}
engines: {node: '>=12.22.0'}
peerDependencies:
react: ^16.8.0 || ^17 || ^18
@@ -3999,8 +3996,8 @@ packages:
peerDependencies:
stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
- stylelint-scss@6.2.1:
- resolution: {integrity: sha512-ZoGLbVb1keZYRVGQlhB8G6sZOoNqw61whzzzGFWp05N12ErqLFfBv3JPrXiMLZaW98sBS7K/vUQhRnvUj4vwdw==}
+ stylelint-scss@6.3.0:
+ resolution: {integrity: sha512-8OSpiuf1xC7f8kllJsBOFAOYp/mR/C1FXMVeOFjtJPw+AFvEmC93FaklHt7MlOqU4poxuQ1TkYMyfI0V+1SxjA==}
engines: {node: '>=18.12.0'}
peerDependencies:
stylelint: ^16.0.2
@@ -4218,8 +4215,8 @@ packages:
resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
engines: {node: '>= 10.0.0'}
- update-browserslist-db@1.0.14:
- resolution: {integrity: sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==}
+ update-browserslist-db@1.0.15:
+ resolution: {integrity: sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==}
hasBin: true
peerDependencies:
browserslist: '>= 4.21.0'
@@ -5829,9 +5826,9 @@ snapshots:
browserslist@4.23.0:
dependencies:
caniuse-lite: 1.0.30001615
- electron-to-chromium: 1.4.754
+ electron-to-chromium: 1.4.756
node-releases: 2.0.14
- update-browserslist-db: 1.0.14(browserslist@4.23.0)
+ update-browserslist-db: 1.0.15(browserslist@4.23.0)
buffer-alloc-unsafe@1.1.0: {}
@@ -6150,7 +6147,7 @@ snapshots:
eastasianwidth@0.2.0: {}
- electron-to-chromium@1.4.754: {}
+ electron-to-chromium@1.4.756: {}
emoji-regex@10.3.0: {}
@@ -7100,8 +7097,6 @@ snapshots:
kind-of@6.0.3: {}
- known-css-properties@0.29.0: {}
-
known-css-properties@0.30.0: {}
less@4.2.0:
@@ -7854,7 +7849,7 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
- react-hook-form@7.51.3(react@18.3.1):
+ react-hook-form@7.51.4(react@18.3.1):
dependencies:
react: 18.3.1
@@ -8269,9 +8264,9 @@ snapshots:
postcss-sorting: 8.0.2(postcss@8.4.38)
stylelint: 16.5.0(typescript@5.4.5)
- stylelint-scss@6.2.1(stylelint@16.5.0(typescript@5.4.5)):
+ stylelint-scss@6.3.0(stylelint@16.5.0(typescript@5.4.5)):
dependencies:
- known-css-properties: 0.29.0
+ known-css-properties: 0.30.0
postcss-media-query-parser: 0.2.3
postcss-resolve-nested-selector: 0.1.1
postcss-selector-parser: 6.0.16
@@ -8606,7 +8601,7 @@ snapshots:
universalify@2.0.1: {}
- update-browserslist-db@1.0.14(browserslist@4.23.0):
+ update-browserslist-db@1.0.15(browserslist@4.23.0):
dependencies:
browserslist: 4.23.0
escalade: 3.1.2
diff --git a/clash-verge-rev/src-tauri/src/enhance/builtin/meta_guard.js b/clash-verge-rev/src-tauri/src/enhance/builtin/meta_guard.js
index be4183bb2c..e8ac897087 100644
--- a/clash-verge-rev/src-tauri/src/enhance/builtin/meta_guard.js
+++ b/clash-verge-rev/src-tauri/src/enhance/builtin/meta_guard.js
@@ -1,6 +1,6 @@
-function main(params) {
- if (params.mode === "script") {
- params.mode = "rule";
+function main(config) {
+ if (config.mode === "script") {
+ config.mode = "rule";
}
- return params;
+ return config;
}
diff --git a/clash-verge-rev/src-tauri/src/enhance/builtin/meta_hy_alpn.js b/clash-verge-rev/src-tauri/src/enhance/builtin/meta_hy_alpn.js
index da1fac0eb6..92c196ed0e 100644
--- a/clash-verge-rev/src-tauri/src/enhance/builtin/meta_hy_alpn.js
+++ b/clash-verge-rev/src-tauri/src/enhance/builtin/meta_hy_alpn.js
@@ -1,10 +1,10 @@
-function main(params) {
- if (Array.isArray(params.proxies)) {
- params.proxies.forEach((p, i) => {
+function main(config) {
+ if (Array.isArray(config.proxies)) {
+ config.proxies.forEach((p, i) => {
if (p.type === "hysteria" && typeof p.alpn === "string") {
- params.proxies[i].alpn = [p.alpn];
+ config.proxies[i].alpn = [p.alpn];
}
});
}
- return params;
+ return config;
}
diff --git a/clash-verge-rev/src-tauri/src/utils/tmpl.rs b/clash-verge-rev/src-tauri/src/utils/tmpl.rs
index 4d760ef421..9b43e397ea 100644
--- a/clash-verge-rev/src-tauri/src/utils/tmpl.rs
+++ b/clash-verge-rev/src-tauri/src/utils/tmpl.rs
@@ -1,18 +1,17 @@
//! Some config file template
/// 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
-proxies:
+proxies: []
-proxy-groups:
+proxy-groups: []
-rules:
+rules: []
";
/// enhanced profile
-pub const ITEM_MERGE: &str = "# Merge Template for clash verge
-# The `Merge` format used to enhance profile
+pub const ITEM_MERGE: &str = "# Profile Enhancement Merge Template for Clash Verge
prepend-rules: []
@@ -36,9 +35,9 @@ append-proxy-groups: []
";
/// enhanced profile
-pub const ITEM_SCRIPT: &str = "// Define the `main` function
+pub const ITEM_SCRIPT: &str = "// Define main function (script entry)
-function main(params) {
- return params;
+function main(config) {
+ return config;
}
";
diff --git a/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx b/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx
index 01a1df9eb1..27400d281b 100644
--- a/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/tun-viewer.tsx
@@ -13,6 +13,7 @@ import {
import { useClash } from "@/hooks/use-clash";
import { BaseDialog, DialogRef, Notice, Switch } from "@/components/base";
import { StackModeSwitch } from "./stack-mode-switch";
+import { enhanceProfiles } from "@/services/cmds";
export const TunViewer = forwardRef