Merge remote-tracking branch 'upstream/dev-next' into dev-next

2026-02-28 16:05:42 +08:00
parent 4f4079257a 6da7e538e1
commit dfc5653d2f
42 changed files with 1341 additions and 627 deletions
--- a/constant/proxy.go
+++ b/constant/proxy.go
@@ -30,7 +30,8 @@ const (
 	TypeSSMAPI       = "ssm-api"
 	TypeCCM          = "ccm"
 	TypeOCM          = "ocm"
-	TypeMySQL        = "mysql"
+	TypeOOMKiller    = "oom-killer"
+	TypeMySQL		 = "mysql"
 )

 const (
@@ -86,6 +87,8 @@ func ProxyDisplayName(proxyType string) string {
 		return "Hysteria2"
 	case TypeAnyTLS:
 		return "AnyTLS"
+	case TypeTailscale:
+		return "Tailscale"
 	case TypeMySQL:
 		return "MySQL"
 	case TypeSelector: