Optimize desktop view

Optimize logs, requests, connection pages

Optimize windows tray auto hide

Optimize some details

Update core

Author: chen08209

analysis_options.yaml

@@ -1 +1,8 @@
 include: package:flutter_lints/flutter.yaml
+analyzer:
+  exclude:
+    - lib/l10n/intl/**
+
+linter:
+  rules:
+    prefer_single_quotes: true

arb/intl_en.arb

@@ -406,5 +406,20 @@
   "import": "Import",
   "importFile": "Import from file",
   "importUrl": "Import from URL",
-  "autoSetSystemDns": "Auto set system DNS"
+  "autoSetSystemDns": "Auto set system DNS",
+  "details": "{label} details",
+  "creationTime": "Creation time",
+  "progress": "Progress",
+  "host": "Host",
+  "destination": "Destination",
+  "destinationGeoIP": "Destination GeoIP",
+  "destinationIPASN": "Destination IPASN",
+  "specialProxy": "Special proxy",
+  "specialRules": "special rules",
+  "remoteDestination": "Remote destination",
+  "networkType": "Network type",
+  "proxyChains": "Proxy chains",
+  "log": "Log",
+  "connection": "Connection",
+  "request": "Request"
 }

arb/intl_ja.arb

@@ -407,5 +407,20 @@
   "import": "インポート",
   "importFile": "ファイルからインポート",
   "importUrl": "URLからインポート",
-  "autoSetSystemDns": "オートセットシステムDNS"
+  "autoSetSystemDns": "オートセットシステムDNS",
+  "details": "{label}詳細",
+  "creationTime": "作成時間",
+  "progress": "進捗",
+  "host": "ホスト",
+  "destination": "宛先",
+  "destinationGeoIP": "宛先地理情報",
+  "destinationIPASN": "宛先IP ASN",
+  "specialProxy": "特殊プロキシ",
+  "specialRules": "特殊ルール",
+  "remoteDestination": "リモート宛先",
+  "networkType": "ネットワーク種別",
+  "proxyChains": "プロキシチェーン",
+  "log": "ログ",
+  "connection": "接続",
+  "request": "リクエスト"
 }

arb/intl_ru.arb

@@ -407,5 +407,20 @@
   "import": "Импорт",
   "importFile": "Импорт из файла",
   "importUrl": "Импорт по URL",
-  "autoSetSystemDns": "Автоматическая настройка системного DNS"
+  "autoSetSystemDns": "Автоматическая настройка системного DNS",
+  "details": "Детали {}",
+  "creationTime": "Время создания",
+  "progress": "Прогресс",
+  "host": "Хост",
+  "destination": "Назначение",
+  "destinationGeoIP": "Геолокация назначения",
+  "destinationIPASN": "ASN назначения",
+  "specialProxy": "Специальный прокси",
+  "specialRules": "Специальные правила",
+  "remoteDestination": "Удалённое назначение",
+  "networkType": "Тип сети",
+  "proxyChains": "Цепочки прокси",
+  "log": "Журнал",
+  "connection": "Соединение",
+  "request": "Запрос"
 }

arb/intl_zh_CN.arb

@@ -407,5 +407,20 @@
   "import": "导入",
   "importFile": "通过文件导入",
   "importUrl": "通过URL导入",
-  "autoSetSystemDns": "自动设置系统DNS"
+  "autoSetSystemDns": "自动设置系统DNS",
+  "details": "{label}详情",
+  "creationTime": "创建时间",
+  "progress": "进度",
+  "host": "主机",
+  "destination": "目标地址",
+  "destinationGeoIP": "目标地理定位",
+  "destinationIPASN": "目标IP ASN",
+  "specialProxy": "特殊代理",
+  "specialRules": "特殊规则",
+  "remoteDestination": "远程目标",
+  "networkType": "网络类型",
+  "proxyChains": "代理链",
+  "log": "日志",
+  "connection": "连接",
+  "request": "请求"
 }

core/Clash.Meta

@@ -52,25 +52,25 @@ require (
 	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
 	github.com/metacubex/bart v0.20.5 // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
-	github.com/metacubex/chacha v0.1.2 // indirect
+	github.com/metacubex/chacha v0.1.5 // indirect
 	github.com/metacubex/fswatch v0.1.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
 	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
 	github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing v0.5.3 // indirect
+	github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29 // indirect
 	github.com/metacubex/sing-mux v0.3.2 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.10 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.4 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d // indirect
 	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c // indirect
+	github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8 // indirect
 	github.com/metacubex/sing-vmess v0.2.2 // indirect
 	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
 	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
 	github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 // indirect
-	github.com/metacubex/utls v1.7.3 // indirect
+	github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect

core/go.mod

@@ -101,8 +101,8 @@ github.com/metacubex/bart v0.20.5 h1:XkgLZ17QxfxkqKdGsojoM2Zu01mmHyyQSFzt2/calTM
 github.com/metacubex/bart v0.20.5/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
-github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc=
-github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
+github.com/metacubex/chacha v0.1.5 h1:fKWMb/5c7ZrY8Uoqi79PPFxl+qwR7X/q0OrsAubyX2M=
+github.com/metacubex/chacha v0.1.5/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU=
 github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
@@ -116,20 +116,20 @@ github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639/go.mod h1:Kc6
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
 github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing v0.5.3 h1:QWdN16WFKMk06x4nzkc8SvZ7y2x+TLQrpkPoHs+WSVM=
-github.com/metacubex/sing v0.5.3/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29 h1:SD9q025FNTaepuFXFOKDhnGLVu6PQYChBvw2ZYPXeLo=
+github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
 github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
 github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
 github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f h1:mP3vIm+9hRFI0C0Vl3pE0NESF/L85FDbuB0tGgUii6I=
 github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f/go.mod h1:JPTpf7fpnojsSuwRJExhSZSy63pVbp3VM39+zj+sAJM=
-github.com/metacubex/sing-shadowsocks v0.2.10 h1:Pr7LDbjMANIQHl07zWgl1vDuhpsfDQUpZ8cX6DPabfg=
-github.com/metacubex/sing-shadowsocks v0.2.10/go.mod h1:MtRM0ZZjR0kaDOzy9zWSt6/4/UlrnsNBq+1FNAF4vBk=
-github.com/metacubex/sing-shadowsocks2 v0.2.4 h1:Ec0x3hHR7xkld5Z09IGh16wtUUpBb2HgqZ9DExd8Q7s=
-github.com/metacubex/sing-shadowsocks2 v0.2.4/go.mod h1:WP8+S0kqtnSbX1vlIpo5i8Irm/ijZITEPBcZ26B5unY=
+github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92 h1:Y9ebcKya6ow7VHoESCN5+l4zZvg5eaL2IhI5LLCQxQA=
+github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92/go.mod h1:/squZ38pXrYjqtg8qn+joVvwbpGNYQNp8yxKsMVbCto=
+github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d h1:Ey3A1tA8lVkRbK1FDmwuWj/57Nr8JMdpoVqe45mFzJg=
+github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d/go.mod h1:+ukTd0OPFglT3bnKAYTJWYPbuox6HYNXE235r5tHdUk=
 github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
 github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
-github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c h1:Y6jk7AH5BEg9Dsvczrf/KokYsvxeKSZZlCLHg+hC4ro=
-github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
+github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8 h1:4zWKqxTx75TbfW2EmlQ3hxM6RTRg2PYOAVMCnU4I61I=
+github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8/go.mod h1:2YywXPWW8Z97kTH7RffOeykKzU+l0aiKlglWV1PAS64=
 github.com/metacubex/sing-vmess v0.2.2 h1:nG6GIKF1UOGmlzs+BIetdGHkFZ20YqFVIYp5Htqzp+4=
 github.com/metacubex/sing-vmess v0.2.2/go.mod h1:CVDNcdSLVYFgTHQlubr88d8CdqupAUDqLjROos+H9xk=
 github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
@@ -138,8 +138,8 @@ github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113a
 github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
 github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 h1:j1VRTiC9JLR4nUbSikx9OGdu/3AgFDqgcLj4GoqyQkc=
 github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.7.3 h1:yDcMEWojFh+t8rU9X0HPcZDPAoFze/rIIyssqivzj8A=
-github.com/metacubex/utls v1.7.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73 h1:HWKsf92BqLYqugATFIJ3hYiEBZ7JF6AoqyvqF39afuI=
+github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=

core/go.sum

@@ -62,7 +62,7 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  _autoUpdateGroupTask() {
+  void _autoUpdateGroupTask() {
     _autoUpdateGroupTaskTimer = Timer(const Duration(milliseconds: 20000), () {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         globalState.appController.updateGroupsDebounce();
@@ -71,14 +71,14 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  _autoUpdateProfilesTask() {
+  void _autoUpdateProfilesTask() {
     _autoUpdateProfilesTaskTimer = Timer(const Duration(minutes: 20), () async {
       await globalState.appController.autoUpdateProfiles();
       _autoUpdateProfilesTask();
     });
   }
 
-  _buildPlatformState(Widget child) {
+  Widget _buildPlatformState(Widget child) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
@@ -97,13 +97,13 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  _buildState(Widget child) {
+  Widget _buildState(Widget child) {
     return AppStateManager(
       child: ClashManager(
         child: ConnectivityManager(
           onConnectivityChanged: (results) async {
             if (!results.contains(ConnectivityResult.vpn)) {
-              await clashCore.closeConnections();
+              clashCore.closeConnections();
             }
             globalState.appController.updateLocalIp();
             globalState.appController.addCheckIpNumDebounce();
@@ -114,7 +114,7 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  _buildPlatformApp(Widget child) {
+  Widget _buildPlatformApp(Widget child) {
     if (system.isDesktop) {
       return WindowHeaderContainer(
         child: child,
@@ -125,7 +125,7 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  _buildApp(Widget child) {
+  Widget _buildApp(Widget child) {
     return MessageManager(
       child: ThemeManager(
         child: child,
@@ -153,8 +153,12 @@ class ApplicationState extends ConsumerState<Application> {
               ],
               builder: (_, child) {
                 return AppEnvManager(
-                  child: _buildPlatformApp(
-                    _buildApp(child!),
+                  child: _buildApp(
+                    AppSidebarContainer(
+                      child: _buildPlatformApp(
+                        child!,
+                      ),
+                    ),
                   ),
                 );
               },
@@ -179,7 +183,7 @@ class ApplicationState extends ConsumerState<Application> {
                   primaryColor: themeProps.primaryColor,
                 ).toPureBlack(themeProps.pureBlack),
               ),
-              home: child,
+              home: child!,
             );
           },
           child: const HomePage(),

lib/application.dart

@@ -17,7 +17,7 @@ class ClashCore {
   late ClashHandlerInterface clashInterface;
 
   ClashCore._internal() {
-    if (Platform.isAndroid) {
+    if (system.isAndroid) {
       clashInterface = clashLib!;
     } else {
       clashInterface = clashService!;
@@ -84,7 +84,7 @@ class ClashCore {
     return await clashInterface.setState(state);
   }
 
-  shutdown() async {
+  Future<void> shutdown() async {
     await clashInterface.shutdown();
   }
 
@@ -107,14 +107,14 @@ class ClashCore {
     if (proxies.isEmpty) return [];
     final groupNames = [
       UsedProxy.GLOBAL.name,
-      ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
+      ...(proxies[UsedProxy.GLOBAL.name]['all'] as List).where((e) {
         final proxy = proxies[e] ?? {};
         return GroupTypeExtension.valueList.contains(proxy['type']);
       })
     ];
     final groupsRaw = groupNames.map((groupName) {
       final group = proxies[groupName];
-      group["all"] = ((group["all"] ?? []) as List)
+      group['all'] = ((group['all'] ?? []) as List)
           .map(
             (name) => proxies[name],
           )
@@ -133,22 +133,22 @@ class ClashCore {
     return await clashInterface.changeProxy(changeProxyParams);
   }
 
-  Future<List<Connection>> getConnections() async {
+  Future<List<TrackerInfo>> getConnections() async {
     final res = await clashInterface.getConnections();
     final connectionsData = json.decode(res) as Map;
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
-    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
+    return connectionsRaw.map((e) => TrackerInfo.fromJson(e)).toList();
   }
 
-  closeConnection(String id) {
+  void closeConnection(String id) {
     clashInterface.closeConnection(id);
   }
 
-  closeConnections() {
+  void closeConnections() {
     clashInterface.closeConnections();
   }
 
-  resetConnections() {
+  void resetConnections() {
     clashInterface.resetConnections();
   }
 
@@ -202,11 +202,11 @@ class ClashCore {
     return clashInterface.updateExternalProvider(providerName);
   }
 
-  startListener() async {
+  Future<void> startListener() async {
     await clashInterface.startListener();
   }
 
-  stopListener() async {
+  Future<void> stopListener() async {
     await clashInterface.stopListener();
   }
 
@@ -260,23 +260,23 @@ class ClashCore {
     return int.parse(value);
   }
 
-  resetTraffic() {
+  void resetTraffic() {
     clashInterface.resetTraffic();
   }
 
-  startLog() {
+  void startLog() {
     clashInterface.startLog();
   }
 
-  stopLog() {
+  void stopLog() {
     clashInterface.stopLog();
   }
 
-  requestGc() {
-    clashInterface.forceGc();
+  Future<void> requestGc() async {
+    await clashInterface.forceGc();
   }
 
-  destroy() async {
+  Future<void> destroy() async {
     await clashInterface.destroy();
   }
 }