Fix windows tun issues

Fix windows backup recovery issues

Optimize overwrite handle

Optimize access control page

Optimize some details

.github/workflows/build.yaml

@@ -16,7 +16,7 @@ jobs:
           - platform: android
             os: ubuntu-latest
           - platform: windows
-            os: windows-latest
+            os: Windows-2022
             arch: amd64
           - platform: linux
             os: ubuntu-22.04
@@ -27,9 +27,9 @@ jobs:
           - platform: macos
             os: macos-latest
             arch: arm64
-          - platform: windows
-            os: windows-11-arm
-            arch: arm64
+          #          - platform: windows
+          #            os: windows-11-arm
+          #            arch: arm64
           - platform: linux
             os: ubuntu-24.04-arm
             arch: arm64
@@ -52,6 +52,7 @@ jobs:
         if: startsWith(matrix.platform,'android')
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
+          echo "${{ secrets.SERVICE_JSON }}" | base64 --decode > android/app/google-services.json
           echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
@@ -63,22 +64,25 @@ jobs:
           cache-dependency-path: |
             core/go.sum
 
-      - name: Setup Flutter Master
-        if: startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'master'
-          cache: true
       - name: Setup Flutter
         if: ${{ !(startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) }}
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: stable
+          flutter-version: 3.35.7
+          cache: true
+      - name: Setup Flutter With Other
+        if: startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')
+        uses: subosito/flutter-action@v2
+        with:
+          channel: master
+          flutter-version: 3.35.7
           cache: true
-      #          flutter-version: 3.29.3
 
       - name: Get Flutter Dependency
-        run: flutter pub get
+        run: |
+          flutter --version
+          flutter pub get
 
       - name: Setup
         run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }} ${{ env.IS_STABLE == 'true' && '--env stable' || '' }}
@@ -103,34 +107,26 @@ jobs:
       - name: Generate
         if: ${{ env.IS_STABLE == 'true' }}
         run: |
-          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
-          preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
-          currentTag=""
-          for ((i = 0; i <= ${#tags[@]}; i++)); do
-            if (( i < ${#tags[@]} )); then
-              tag=${tags[$i]}
-            else
-              tag=""
-            fi
-            if [ -n "$currentTag" ]; then
-              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
-                break
-              fi
-            fi
-            if [ -n "$currentTag" ]; then
-              echo "## $currentTag" >> NEW_CHANGELOG.md
-              echo "" >> NEW_CHANGELOG.md
-              if [ -n "$tag" ]; then
-                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
-              else
-                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
-              fi
-              echo "" >> NEW_CHANGELOG.md
-            fi
-            currentTag=$tag
+          last_ver=$(grep -m1 '^## ' CHANGELOG.md 2>/dev/null | sed 's/^## //')
+          
+          tags=($(git tag --merged HEAD --sort=-creatordate))
+          
+          temp="NEW_CHANGELOG.md" > "$temp"
+          
+          for i in "${!tags[@]}"; do
+              curr="${tags[i]}"
+              [[ "$curr" == "$last_ver" ]] && break
+          
+              prev="${tags[i+1]}"
+              range="${prev:+$prev..}$curr"
+          
+              echo -e "## $curr\n" >> "$temp"
+              git log --no-merges --pretty=format:"%B" "$range" | \
+              awk '!/Update changelog/ && NF {print "- " $0 "\n"}' >> "$temp"
           done
-          cat CHANGELOG.md >> NEW_CHANGELOG.md
-          cat NEW_CHANGELOG.md > CHANGELOG.md
+          [ -f CHANGELOG.md ] && cat CHANGELOG.md >> "$temp"
+          
+          mv "$temp" CHANGELOG.md
 
       - name: Commit
         if: ${{ env.IS_STABLE == 'true' }}
@@ -180,31 +176,22 @@ jobs:
 
       - name: Generate release.md
         run: |
-          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
-          preTag=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
-          currentTag=""
-          for ((i = 0; i <= ${#tags[@]}; i++)); do
-            if (( i < ${#tags[@]} )); then
-              tag=${tags[$i]}
-            else
-              tag=""
-            fi
-            if [ -n "$currentTag" ]; then
-              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
-                break
-              fi
-            fi
-            if [ -n "$currentTag" ]; then
-              if [ -n "$tag" ]; then
-                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
-              else
-                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
-              fi
-              echo "" >> release.md
-            fi
-            currentTag=$tag
+          tags=($(git tag --merged HEAD --sort=-creatordate))
+          preTag=$(curl -s "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          out="release.md" > "$out"
+          for i in "${!tags[@]}"; do
+            curr="${tags[i]}"
+            [[ "$curr" == "$preTag" ]] && break
+
+            prev="${tags[i+1]}"
+            range="${prev:+$prev..}$curr"
+
+            echo -e "## $curr\n" >> "$out"
+            git log --no-merges --pretty=format:"%B" "$range" | \
+            awk '!/Update changelog/ && NF {print "- " $0 "\n"}' >> "$out"
           done
 
+
       - name: Push to telegram
         env:
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}

.gitignore

@@ -45,11 +45,19 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/**/.cxx
+/android/**/build
+/android/common/**/.**/
+/android/common/local.*
+/android/core/**/includes/
+/android/core/**/cmake-build-*/
+/android/core/**/jniLibs/
 
 
-
-#libclash
+#FlClash
 /libclash/
-
-#jniLibs
 /android/app/src/main/jniLibs/
+/services/helper/target
+/macos/**/Package.resolved
+devtools_options.yaml
+

CHANGELOG.md

@@ -1,918 +0,0 @@
-## v0.8.87
-
-- Optimize desktop view
-
-- Optimize logs, requests, connection pages
-
-- Optimize windows tray auto hide
-
-- Optimize some details
-
-- Update core
-
-- Update changelog
-
-## v0.8.86
-
-- Fix windows tun issues
-
-- Optimize android get system dns
-
-- Optimize more details
-
-- Update changelog
-
-## v0.8.85
-
-- Support override script
-
-- Support proxies search
-
-- Support svg display
-
-- Optimize config persistence
-
-- Add some scenes auto close connections
-
-- Update core
-
-- Optimize more details
-
-## v0.8.84
-
-- Fix windows service verify issues
-
-- Update changelog
-
-## v0.8.83
-
-- Add windows server mode start process verify
-
-- Add linux deb dependencies
-
-- Add backup recovery strategy select
-
-- Support custom text scaling
-
-- Optimize the display of different text scale
-
-- Optimize windows setup experience
-
-- Optimize startTun performance
-
-- Optimize android tv experience
-
-- Optimize default option
-
-- Optimize computed text size
-
-- Optimize hyperOS freeform window
-
-- Add developer mode
-
-- Update core
-
-- Optimize more details
-
-- Add issues template
-
-- Update changelog
-
-## v0.8.82
-
-- Optimize android vpn performance
-
-- Add custom primary color and color scheme
-
-- Add linux nad windows arm release
-
-- Optimize requests and logs page
-
-- Fix map input page delete issues
-
-- Update changelog
-
-## v0.8.81
-
-- Add rule override
-
-- Update core
-
-- Optimize more details
-
-- Update changelog
-
-## v0.8.80
-
-- Optimize dashboard performance
-
-- Fix some issues
-
-- Fix unselected proxy group delay issues
-
-- Fix asn url issues
-
-- Update changelog
-
-## v0.8.79
-
-- Fix tab delay view issues
-
-- Fix tray action issues
-
-- Fix get profile redirect client ua issues
-
-- Fix proxy card delay view issues
-
-- Add Russian, Japanese adaptation
-
-- Fix some issues
-
-- Update changelog
-
-## v0.8.78
-
-- Fix list form input view issues
-
-- Fix traffic view issues
-
-- Update changelog
-
-## v0.8.77
-
-- Optimize performance
-
-- Update core
-
-- Optimize core stability
-
-- Fix linux tun authority check error
-
-- Fix some issues
-
-- Fix scroll physics error
-
-- Update changelog
-
-## v0.8.75
-
-- Add windows storage corruption detection
-
-- Fix core crash caused by windows resource manager restart
-
-- Optimize logs, requests, access to pages
-
-- Fix macos bypass domain issues
-
-- Update changelog
-
-## v0.8.74
-
-- Fix some issues
-
-- Update changelog
-
-## v0.8.73
-
-- Update popup menu
-
-- Add file editor
-
-- Fix android service issues
-
-- Optimize desktop background performance
-
-- Optimize android main process performance
-
-- Optimize delay test
-
-- Optimize vpn protect
-
-- Update changelog
-
-## v0.8.72
-
-- Update core
-
-- Fix some issues
-
-- Update changelog
-
-## v0.8.71
-
-- Remake dashboard
-
-- Optimize theme
-
-- Optimize more details
-
-- Update flutter version
-
-- Update changelog
-
-## v0.8.70
-
-- Support better window position memory
-
-- Add windows arm64 and linux arm64 build script
-
-- Optimize some details
-
-## v0.8.69
-
-- Remake desktop
-
-- Optimize change proxy
-
-- Optimize network check
-
-- Fix fallback issues
-
-- Optimize lots of details
-
-- Update change.yaml
-
-- Fix android tile issues
-
-- Fix windows tray issues
-
-- Support setting bypassDomain
-
-- Update flutter version
-
-- Fix android service issues
-
-- Fix macos dock exit button issues
-
-- Add route address setting
-
-- Optimize provider view
-
-- Update changelog
-
-- Update CHANGELOG.md
-
-## v0.8.67
-
-- Add android shortcuts
-
-- Fix init params issues
-
-- Fix dynamic color issues
-
-- Optimize navigator animate
-
-- Optimize window init
-
-- Optimize fab
-
-- Optimize save
-
-## v0.8.66
-
-- Fix the collapse issues
-
-- Add fontFamily options
-
-## v0.8.65
-
-- Update core version
-
-- Update flutter version
-
-- Optimize ip check
-
-- Optimize url-test
-
-## v0.8.64
-
-- Update release message
-
-- Init auto gen changelog
-
-- Fix windows tray issues
-
-- Fix urltest issues
-
-- Add auto changelog
-
-- Fix windows admin auto launch issues
-
-- Add android vpn options
-
-- Support proxies icon configuration
-
-- Optimize android immersion display
-
-- Fix some issues
-
-- Optimize ip detection
-
-- Support android vpn ipv6 inbound switch
-
-- Support log export
-
-- Optimize more details
-
-- Fix android system dns issues
-
-- Optimize dns default option
-
-- Fix some issues
-
-- Update readme
-
-## v0.8.60
-
-- Fix build error2
-
-- Fix build error
-
-- Support desktop hotkey
-
-- Support android ipv6 inbound
-
-- Support android system dns
-
-- fix some bugs
-
-## v0.8.59
-
-- Fix delete profile error
-
-## v0.8.58
-
-- Fix submit error 2
-
-- Fix submit error
-
-- Optimize DNS strategy
-
-- Fix the problem that the tray is not displayed in some cases
-
-- Optimize tray
-
-- Update core
-
-- Fix some error
-
-## v0.8.57
-
-- Fix tun update issues
-
-- Add DNS override
-- Fixed some bugs
-- Optimize more detail
-
-- Add Hosts override
-
-## v0.8.56
-
-- fix android tip error
-- fix windows auto launch error
-
-## v0.8.55
-
-- Fix windows tray issues
-
-- Optimize windows logic
-
-- Optimize app logic
-
-- Support windows administrator auto launch
-
-- Support android close vpn
-
-## v0.8.53
-
-- Change flutter version
-
-- Support profiles sort
-
-- Support windows country flags display
-
-- Optimize proxies page and profiles page columns
-
-## v0.8.52
-
-- Update flutter version
-
-- Update version
-
-- Update timeout time
-
-- Update access control page
-
-- Fix bug
-
-## v0.8.51
-
-- Optimize provider page
-
-- Optimize delay test
-
-- Support local backup and recovery
-
-- Fix android tile service issues
-
-## v0.8.49
-
-- Fix linux core build error
-
-- Add proxy-only traffic statistics
-
-- Update core
-
-- Optimize more details
-
-- Merge pull request #140 from txyyh/main
-
-- 添加自建 F-Droid 仓库相关 workflow
-- Rename readme fingerprint
-
-- Rename workflow deploy repo name
-
-- Add download guide to README
-
-- Add push release files to fdroid-repo
-
-## v0.8.48
-
-- Optimize proxies page
-
-- Fix ua issues
-
-- Optimize more details
-
-## v0.8.47
-
-- Fix windows build error
-
-## v0.8.46
-
-- Update app icon
-
-- Fix desktop backup error
-
-- Optimize request ua
-
-- Change android icon
-
-- Optimize dashboard
-
-## v0.8.44
-
-- Remove request validate certificate
-
-- Sync core
-
-## v0.8.43
-
-- Fix windows error
-
-## v0.8.42
-
-- Fix setup.dart error
-
-- Fix android system proxy not effective
-
-- Add macos arm64
-
-## v0.8.41
-
-- Optimize proxies page
-
-- Support mouse drag scroll
-
-- Adjust desktop ui
-
-- Revert "Fix android vpn issues"
-
-- This reverts commit 891977408e6938e2acd74e9b9adb959c48c79988.
-
-## v0.8.40
-
-- Fix android vpn issues
-
-- Fix android vpn issues
-
-- Rollback partial modification
-
-## v0.8.39
-
-- Fix the problem that ui can't be synchronized when android vpn is occupied by an external
-
-- Override default socksPort,port
-
-## v0.8.38
-
-- Fix fab issues
-
-## v0.8.37
-
-- Update version
-
-- Fix the problem that vpn cannot be started in some cases
-
-- Fix the problem that geodata url does not take effect
-
-## v0.8.36
-
-- Update ua
-
-- Fix change outbound mode without check ip issues
-
-- Separate android ui and vpn
-
-- Fix url validate issues 2
-
-- Add android hidden from the recent task
-
-- Add geoip file
-
-- Support modify geoData URL
-
-## v0.8.35
-
-- Fix url validate issues
-
-- Fix check ip performance problem
-
-- Optimize resources page
-
-## v0.8.34
-
-- Add ua selector
-
-- Support modify test url
-
-- Optimize android proxy
-
-- Fix the error that async proxy provider could not selected the proxy
-
-## v0.8.33
-
-- Fix android proxy error
-
-- Fix submit error
-
-- Add windows tun
-
-- Optimize android proxy
-
-- Optimize change profile
-
-- Update application ua
-
-- Optimize delay test
-
-## v0.8.32
-
-- Fix android repeated request notification issues
-
-## v0.8.31
-
-- Fix memory overflow issues
-
-## v0.8.30
-
-- Optimize proxies expansion panel 2
-
-- Fix android scan qrcode error
-
-## v0.8.29
-
-- Optimize proxies expansion panel
-
-- Fix text error
-
-## v0.8.28
-
-- Optimize proxy
-
-- Optimize delayed sorting performance
-
-- Add expansion panel proxies page
-
-- Support to adjust the proxy card size
-
-- Support to adjust proxies columns number
-
-- Fix autoRun show issues
-
-- Fix Android 10 issues
-
-- Optimize ip show
-
-## v0.8.26
-
-- Add intranet IP display
-
-- Add connections page
-
-- Add search in connections, requests
-
-- Add keyword search in connections, requests, logs
-
-- Add basic viewing editing capabilities
-
-- Optimize update profile
-
-## v0.8.25
-
-- Update version
-
-- Fix the problem of excessive memory usage in traffic usage.
-
-- Add lightBlue theme color
-
-- Fix start unable to update profile issues
-
-- Fix flashback caused by process
-
-## v0.8.23
-
-- Add build version
-
-- Optimize quick start
-
-- Update system default option
-
-## v0.8.22
-
-- Update build.yml
-
-- Fix android vpn close issues
-
-- Add requests page
-
-- Fix checkUpdate dark mode style error
-
-- Fix quickStart error open app
-
-- Add memory proxies tab index
-
-- Support hidden group
-
-- Optimize logs
-
-- Fix externalController hot load error
-
-## v0.8.21
-
-- Add tcp concurrent switch
-
-- Add system proxy switch
-
-- Add geodata loader switch
-
-- Add external controller switch
-
-- Add auto gc on trim memory
-
-- Fix android notification error
-
-## v0.8.20
-
-- Fix ipv6 error
-
-- Fix android udp direct error
-
-- Add ipv6 switch
-
-- Add access all selected button
-
-- Remove android low version splash
-
-## v0.8.19
-
-- Update version
-
-- Add allowBypass
-
-- Fix Android only pick .text file issues
-
-## v0.8.18
-
-- Fix search issues
-
-## v0.8.17
-
-- Fix LoadBalance, Relay load error
-
-- Fix build.yml4
-
-- Fix build.yml3
-
-- Fix build.yml2
-
-- Fix build.yml
-
-- Add search function at access control
-
-- Fix the issues with the profile add button to cover the edit button
-
-- Adapt LoadBalance and Relay
-
-- Add arm
-
-- Fix android notification icon error
-
-## v0.8.16
-
-- Add one-click update all profiles
-- Add expire show
-
-## v0.8.15
-
-- Temp remove tun mode
-
-- Remove macos in workflow
-
-- Change go version
-
-## v0.8.14
-
-- Update Version
-
-- Fix tun unable to open
-
-## v0.8.13
-
-- Optimize delay test2
-
-- Optimize delay test
-
-- Add check ip
-
-- add check ip request
-
-## v0.8.12
-
-- Fix the problem that the download of remote resources failed after GeodataMode was turned on, which caused the
-  application to flash back.
-
-- Fix edit profile error
-
-- Fix quickStart change proxy error
-
-- Fix core version
-
-## v0.8.10
-
-- Fix core version
-
-## v0.8.9
-
-- Update file_picker
-
-- Add resources page
-
-- Optimize more detail
-
-- Add access selected sorted
-
-- Fix notification duplicate creation issue
-
-- Fix AccessControl click issue
-
-## v0.8.7
-
-- Fix Workflow
-
-- Fix Linux unable to open
-
-- Update README.md 3
-
-- Create LICENSE
-- Update README.md 2
-
-- Update README.md
-
-- Optimize workFlow
-
-## v0.8.6
-
-- optimize checkUpdate
-
-## v0.8.5
-
-- Fix submit error
-
-## v0.8.4
-
-- add WebDAV
-
-- add Auto check updates
-
-- Optimize more details
-
-- optimize delayTest
-
-## v0.8.2
-
-- upgrade flutter version
-
-## v0.8.1
-
-- Update kernel
-- Add import profile via QR code image
-
-## v0.8.0
-
-- Add compatibility mode and adapt clash scheme.
-
-## v0.7.14
-
-- update Version
-
-- Reconstruction application proxy logic
-
-## v0.7.13
-
-- Fix Tab destroy error
-
-## v0.7.12
-
-- Optimize repeat healthcheck
-
-## v0.7.11
-
-- Optimize Direct mode ui
-
-## v0.7.10
-
-- Optimize Healthcheck
-
-- Remove proxies position animation, improve performance
-- Add Telegram Link
-
-- Update healthcheck policy
-
-- New Check URLTest
-
-- Fix the problem of invalid auto-selection
-
-## v0.7.8
-
-- New Async UpdateConfig
-
-- add changeProfileDebounce
-
-- Update Workflow
-
-- Fix ChangeProfile block
-
-- Fix Release Message Error
-
-## v0.7.7
-
-- Update Selector 2
-
-## v0.7.6
-
-- Update Version
-
-- Fix Proxies Select Error
-
-## v0.7.5
-
-- Fix the problem that the proxy group is empty in global mode.
-
-- Fix the problem that the proxy group is empty in global mode.
-
-## v0.7.4
-
-- Add ProxyProvider2
-
-## v0.7.3
-
-- Add ProxyProvider
-
-- Update Version
-
-- Update ProxyGroup Sort
-
-- Fix Android quickStart VpnService some problems
-
-## v0.7.1
-
-- Update version
-
-- Set Android notification low importance
-
-- Fix the issue that VpnService can't be closed correctly in special cases
-
-- Fix the problem that TileService is not destroyed correctly in some cases
-
-- Adjust tab animation defaults
-
-- Add Telegram in README_zh_CN.md
-
-- Add Telegram
-
-## v0.7.0
-
-- update mobile_scanner
-
-- Initial commit

README.md

@@ -54,7 +54,7 @@ Support the following actions
     
     com.follow.clash.action.STOP
     
-    com.follow.clash.action.CHANGE
+    com.follow.clash.action.TOGGLE
    ```
 
 ## Download

README_zh_CN.md

@@ -54,7 +54,7 @@ on Mobile:
     
     com.follow.clash.action.STOP
     
-    com.follow.clash.action.CHANGE
+    com.follow.clash.action.TOGGLE
    ```
 
 ## Download

analysis_options.yaml

@@ -1,9 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 analyzer:
-  plugins:
-    - custom_lint
   exclude:
     - lib/l10n/intl/**
+  errors:
+    invalid_annotation_target: ignore
 
 linter:
   rules:

android/app/build.gradle.kts

@@ -5,6 +5,8 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("dev.flutter.flutter-gradle-plugin")
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
 }
 
 val localPropertiesFile = rootProject.file("local.properties")
@@ -18,10 +20,9 @@ val mStoreFile: File = file("keystore.jks")
 val mStorePassword: String? = localProperties.getProperty("storePassword")
 val mKeyAlias: String? = localProperties.getProperty("keyAlias")
 val mKeyPassword: String? = localProperties.getProperty("keyPassword")
-val isRelease = mStoreFile.exists()
-        && mStorePassword != null
-        && mKeyAlias != null
-        && mKeyPassword != null
+val isRelease =
+    mStoreFile.exists() && mStorePassword != null && mKeyAlias != null && mKeyPassword != null
+
 
 android {
     namespace = "com.follow.clash"
@@ -29,6 +30,7 @@ android {
     ndkVersion = libs.versions.ndkVersion.get()
 
 
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -53,6 +55,12 @@ android {
         }
     }
 
+    packaging {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     buildTypes {
         debug {
             isMinifyEnabled = false
@@ -69,8 +77,7 @@ android {
             }
 
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
         }
     }
@@ -86,6 +93,7 @@ flutter {
     source = "../.."
 }
 
+
 dependencies {
     implementation(project(":service"))
     implementation(project(":common"))
@@ -94,4 +102,7 @@ dependencies {
     implementation(libs.smali.dexlib2) {
         exclude(group = "com.google.guava", module = "guava")
     }
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics.ndk)
+    implementation(libs.firebase.analytics)
 }

android/app/google-services.json

@@ -0,0 +1,46 @@
+{
+  "project_info": {
+    "project_number": "000000000000",
+    "project_id": "dev"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:000000000000:android:0000000000000000",
+        "android_client_info": {
+          "package_name": "com.follow.clash"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:000000000000:android:0000000000000000",
+        "android_client_info": {
+          "package_name": "com.follow.clash.debug"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ]
+}

android/app/src/debug/AndroidManifest.xml

@@ -11,7 +11,6 @@
         <service
             android:name=".TileService"
             android:label="FlClash Debug"
-            tools:replace="android:label"
-            tools:targetApi="24" />
+            tools:replace="android:label" />
     </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -2,10 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <permission
-        android:name="${applicationId}.permission.RECEIVE_BROADCASTS"
-        android:protectionLevel="signature" />
-
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
@@ -24,28 +20,23 @@
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".Application"
         android:banner="@mipmap/ic_banner"
-        android:extractNativeLibs="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="FlClash">
         <activity
-            android:name="com.follow.clash.MainActivity"
+            android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
@@ -112,35 +103,11 @@
             android:exported="true"
             android:permission="${applicationId}.permission.RECEIVE_BROADCASTS">
             <intent-filter>
-                <action android:name="${applicationId}.intent.action.START" />
-                <action android:name="${applicationId}.intent.action.STOP" />
-                <action android:name="${applicationId}.intent.action.TOGGLE" />
+                <action android:name="${applicationId}.intent.action.SERVICE_CREATED" />
+                <action android:name="${applicationId}.intent.action.SERVICE_DESTROYED" />
             </intent-filter>
         </receiver>
 
-
-        <provider
-            android:name=".FilesProvider"
-            android:authorities="${applicationId}.files"
-            android:exported="true"
-            android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS"
-            android:process=":background">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
-            </intent-filter>
-        </provider>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

android/app/src/main/kotlin/com/follow/clash/BroadcastReceiver.kt

@@ -4,29 +4,24 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.follow.clash.common.BroadcastAction
+import com.follow.clash.common.GlobalState
 import com.follow.clash.common.action
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
-class BroadcastReceiver : BroadcastReceiver(),
-    CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
+class BroadcastReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         when (intent?.action) {
-            BroadcastAction.START.action -> {
-                launch {
+            BroadcastAction.SERVICE_CREATED.action -> {
+                GlobalState.log("Receiver service created")
+                GlobalState.launch {
                     State.handleStartServiceAction()
                 }
             }
 
-            BroadcastAction.STOP.action -> {
-                State.handleStopServiceAction()
-            }
-
-            BroadcastAction.TOGGLE.action -> {
-                launch {
-                    State.handleToggleAction()
+            BroadcastAction.SERVICE_DESTROYED.action -> {
+                GlobalState.log("Receiver service destroyed")
+                GlobalState.launch {
+                    State.handleStopServiceAction()
                 }
             }
         }

android/app/src/main/kotlin/com/follow/clash/Ext.kt

@@ -1,28 +1,77 @@
 package com.follow.clash
 
+import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.util.Base64
 import androidx.core.graphics.drawable.toBitmap
+import com.follow.clash.common.GlobalState
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
-import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 
-suspend fun Drawable.getBase64(): String {
-    val drawable = this
-    return withContext(Dispatchers.IO) {
-        val bitmap = drawable.toBitmap()
-        val byteArrayOutputStream = ByteArrayOutputStream()
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
-        Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
+private const val ICON_TTL_DAYS = 1L
+
+suspend fun PackageManager.getPackageIconPath(packageName: String): String =
+    withContext(Dispatchers.IO) {
+        val cacheDir = GlobalState.application.cacheDir
+        val iconDir = File(cacheDir, "icons").apply { mkdirs() }
+        return@withContext try {
+            val pkgInfo = getPackageInfo(packageName, 0)
+            val lastUpdateTime = pkgInfo.lastUpdateTime
+            val iconFile = File(iconDir, "${packageName}_${lastUpdateTime}.webp")
+            if (iconFile.exists() && !isExpired(iconFile)) {
+                return@withContext iconFile.absolutePath
+            }
+            iconDir.listFiles { f -> f.name.startsWith("${packageName}_") }?.forEach(File::delete)
+
+            val icon = getApplicationIcon(packageName)
+            saveDrawableToFile(icon, iconFile)
+            iconFile.absolutePath
+        } catch (_: Exception) {
+            val defaultIconFile = File(iconDir, "default_icon.webp")
+            if (!defaultIconFile.exists()) {
+                saveDrawableToFile(defaultActivityIcon, defaultIconFile)
+            }
+            defaultIconFile.absolutePath
+        }
     }
+
+private suspend fun saveDrawableToFile(drawable: Drawable, file: File) {
+    val bitmap = withContext(Dispatchers.Default) {
+        drawable.toBitmap(width = 128, height = 128)
+    }
+    try {
+        val format = when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
+                Bitmap.CompressFormat.WEBP_LOSSY
+            }
+
+            else -> {
+                Bitmap.CompressFormat.WEBP
+            }
+        }
+        FileOutputStream(file).use { fos ->
+            bitmap.compress(format, 90, fos)
+        }
+    } finally {
+        if (!bitmap.isRecycled) bitmap.recycle()
+    }
+}
+
+private fun isExpired(file: File): Boolean {
+    val now = System.currentTimeMillis()
+    val age = now - file.lastModified()
+    return age > TimeUnit.DAYS.toMillis(ICON_TTL_DAYS)
 }
 
 suspend fun <T> MethodChannel.awaitResult(
@@ -49,17 +98,13 @@ inline fun <reified T : FlutterPlugin> FlutterEngine.plugin(): T? {
     return plugins.get(T::class.java) as T?
 }
 
-
 fun <T> MethodChannel.invokeMethodOnMainThread(
-    method: String,
-    arguments: Any? = null,
-    callback: ((Result<T>) -> Unit)? = null
+    method: String, arguments: Any? = null, callback: ((Result<T>) -> Unit)? = null
 ) {
     Handler(Looper.getMainLooper()).post {
         invokeMethod(method, arguments, object : MethodChannel.Result {
             override fun success(result: Any?) {
-                @Suppress("UNCHECKED_CAST")
-                callback?.invoke(Result.success(result as T))
+                @Suppress("UNCHECKED_CAST") callback?.invoke(Result.success(result as T))
             }
 
             override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {

android/app/src/main/kotlin/com/follow/clash/MainActivity.kt

@@ -1,5 +1,8 @@
 package com.follow.clash
 
+import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
+import com.follow.clash.common.GlobalState
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
@@ -13,10 +16,14 @@ import kotlinx.coroutines.launch
 class MainActivity : FlutterActivity(),
     CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
 
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        launch {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleScope.launch {
             State.destroyServiceEngine()
         }
+    }
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
         flutterEngine.plugins.add(ServicePlugin())
@@ -25,6 +32,9 @@ class MainActivity : FlutterActivity(),
     }
 
     override fun onDestroy() {
+        GlobalState.launch {
+            Service.setEventListener(null)
+        }
         State.flutterEngine = null
         super.onDestroy()
     }

android/app/src/main/kotlin/com/follow/clash/Service.kt

@@ -1,77 +1,147 @@
 package com.follow.clash
 
 import com.follow.clash.common.ServiceDelegate
+import com.follow.clash.common.formatString
 import com.follow.clash.common.intent
+import com.follow.clash.service.IAckInterface
 import com.follow.clash.service.ICallbackInterface
+import com.follow.clash.service.IEventInterface
 import com.follow.clash.service.IRemoteInterface
+import com.follow.clash.service.IResultInterface
 import com.follow.clash.service.RemoteService
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
-import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 
 object Service {
     private val delegate by lazy {
         ServiceDelegate<IRemoteInterface>(
-            RemoteService::class.intent, ::handleOnServiceCrash
+            RemoteService::class.intent, ::handleServiceDisconnected
         ) {
             IRemoteInterface.Stub.asInterface(it)
         }
     }
 
-    var onServiceCrash: (() -> Unit)? = null
+    var onServiceDisconnected: ((String) -> Unit)? = null
 
-    private fun handleOnServiceCrash() {
-        bindingState.set(false)
-        onServiceCrash?.let {
-            it()
+    private fun handleServiceDisconnected(message: String) {
+        onServiceDisconnected?.let {
+            it(message)
         }
     }
 
-    private val bindingState = AtomicBoolean(false)
-
     fun bind() {
-        if (bindingState.compareAndSet(false, true)) {
-            delegate.bind()
+        delegate.bind()
+    }
+
+    fun unbind() {
+        delegate.unbind()
+    }
+
+    suspend fun invokeAction(data: String, cb: (result: String) -> Unit): Result<Unit> {
+        val res = mutableListOf<ByteArray>()
+        return delegate.useService {
+            it.invokeAction(
+                data, object : ICallbackInterface.Stub() {
+                    override fun onResult(
+                        result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
+                    ) {
+                        res.add(result ?: byteArrayOf())
+                        ack?.onAck()
+                        if (isSuccess) {
+                            cb(res.formatString())
+                        }
+                    }
+                })
         }
     }
 
-    suspend fun invokeAction(
-        data: String, cb: (result: String?) -> Unit
-    ) {
-        delegate.useService {
-            it.invokeAction(data, object : ICallbackInterface.Stub() {
-                override fun onResult(result: String?) {
-                    cb(result)
+    suspend fun setEventListener(
+        cb: ((result: String?) -> Unit)?
+    ): Result<Unit> {
+        val results = HashMap<String, MutableList<ByteArray>>()
+        return delegate.useService {
+            it.setEventListener(
+                when (cb != null) {
+                true -> object : IEventInterface.Stub() {
+                    override fun onEvent(
+                        id: String, data: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
+                    ) {
+                        if (results[id] == null) {
+                            results[id] = mutableListOf()
+                        }
+                        results[id]?.add(data ?: byteArrayOf())
+                        ack?.onAck()
+                        if (isSuccess) {
+                            cb(results[id]?.formatString())
+                            results.remove(id)
+                        }
+                    }
                 }
+
+                false -> null
             })
         }
     }
 
     suspend fun updateNotificationParams(
         params: NotificationParams
-    ) {
-        delegate.useService {
+    ): Result<Unit> {
+        return delegate.useService {
             it.updateNotificationParams(params)
         }
     }
 
-    suspend fun setMessageCallback(
-        cb: (result: String?) -> Unit
-    ) {
-        delegate.useService {
-            it.setMessageCallback(object : ICallbackInterface.Stub() {
-                override fun onResult(result: String?) {
-                    cb(result)
-                }
-            })
+    suspend fun setCrashlytics(
+        enable: Boolean
+    ): Result<Unit> {
+        return delegate.useService {
+            it.setCrashlytics(enable)
         }
     }
 
-    suspend fun startService(options: VpnOptions, inApp: Boolean) {
-        delegate.useService { it.startService(options, inApp) }
+    private suspend fun awaitIResultInterface(
+        block: (IResultInterface) -> Unit
+    ): Long = suspendCancellableCoroutine { continuation ->
+        val callback = object : IResultInterface.Stub() {
+            override fun onResult(time: Long) {
+                if (continuation.isActive) {
+                    continuation.resume(time)
+                }
+            }
+        }
+
+        try {
+            block(callback)
+        } catch (e: Exception) {
+            if (continuation.isActive) {
+                continuation.resumeWithException(e)
+            }
+        }
     }
 
-    suspend fun stopService() {
-        delegate.useService { it.stopService() }
+
+    suspend fun startService(options: VpnOptions, runTime: Long): Long {
+        return delegate.useService {
+            awaitIResultInterface { callback ->
+                it.startService(options, runTime, callback)
+            }
+        }.getOrNull() ?: 0L
+    }
+
+    suspend fun stopService(): Long {
+        return delegate.useService {
+            awaitIResultInterface { callback ->
+                it.stopService(callback)
+            }
+        }.getOrNull() ?: 0L
+    }
+
+    suspend fun getRunTime(): Long {
+        return delegate.useService {
+            it.runTime
+        }.getOrNull() ?: 0L
     }
 }

android/app/src/main/kotlin/com/follow/clash/State.kt

@@ -26,6 +26,7 @@ object State {
     var runTime: Long = 0
 
     val runStateFlow: MutableStateFlow<RunState> = MutableStateFlow(RunState.STOP)
+
     var flutterEngine: FlutterEngine? = null
     var serviceFlutterEngine: FlutterEngine? = null
 
@@ -51,25 +52,49 @@ object State {
         action?.invoke()
     }
 
-    suspend fun handleStartServiceAction() {
-        tilePlugin?.handleStart()
-        if (flutterEngine != null) {
-            return
+    suspend fun handleSyncState() {
+        runLock.withLock {
+            Service.bind()
+            runTime = Service.getRunTime()
+            val runState = when (runTime == 0L) {
+                true -> RunState.STOP
+                false -> RunState.START
+            }
+            runStateFlow.tryEmit(runState)
         }
-        startServiceWithEngine()
     }
 
-    fun handleStopServiceAction() {
-        tilePlugin?.handleStop()
-        if (flutterEngine != null || serviceFlutterEngine != null) {
-            return
+    suspend fun handleStartServiceAction() {
+        runLock.withLock {
+            if (runStateFlow.value != RunState.STOP) {
+                return
+            }
+            tilePlugin?.handleStart()
+            if (flutterEngine != null) {
+                return
+            }
+            startServiceWithEngine()
+        }
+
+    }
+
+    suspend fun handleStopServiceAction() {
+        runLock.withLock {
+            if (runStateFlow.value != RunState.START) {
+                return
+            }
+            tilePlugin?.handleStop()
+            if (flutterEngine != null || serviceFlutterEngine != null) {
+                return
+            }
+            handleStopService()
         }
-        handleStopService()
     }
 
     fun handleStartService() {
+        val appPlugin = flutterEngine?.plugin<AppPlugin>()
         if (appPlugin != null) {
-            appPlugin?.requestNotificationsPermission {
+            appPlugin.requestNotificationsPermission {
                 startService()
             }
             return
@@ -77,8 +102,23 @@ object State {
         startService()
     }
 
+    fun handleStopService() {
+        GlobalState.launch {
+            runLock.withLock {
+                if (runStateFlow.value != RunState.START) {
+                    return@launch
+                }
+                runStateFlow.tryEmit(RunState.PENDING)
+                runTime = Service.stopService()
+                runStateFlow.tryEmit(RunState.STOP)
+            }
+            destroyServiceEngine()
+        }
+    }
+
     suspend fun destroyServiceEngine() {
         runLock.withLock {
+            GlobalState.log("Destroy service engine")
             withContext(Dispatchers.Main) {
                 runCatching {
                     serviceFlutterEngine?.destroy()
@@ -88,26 +128,32 @@ object State {
         }
     }
 
-    suspend fun startServiceWithEngine() {
-        runLock.withLock {
-            withContext(Dispatchers.Main) {
-                serviceFlutterEngine = FlutterEngine(GlobalState.application)
-                serviceFlutterEngine?.plugins?.add(ServicePlugin())
-                serviceFlutterEngine?.plugins?.add(AppPlugin())
-                serviceFlutterEngine?.plugins?.add(TilePlugin())
-                val dartEntrypoint = DartExecutor.DartEntrypoint(
-                    FlutterInjector.instance().flutterLoader().findAppBundlePath(), "_service"
-                )
-                serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
+    private fun startServiceWithEngine() {
+        GlobalState.launch {
+            runLock.withLock {
+                if (runStateFlow.value != RunState.STOP) {
+                    return@launch
+                }
+                GlobalState.log("Create service engine")
+                withContext(Dispatchers.Main) {
+                    serviceFlutterEngine?.destroy()
+                    serviceFlutterEngine = FlutterEngine(GlobalState.application)
+                    serviceFlutterEngine?.plugins?.add(ServicePlugin())
+                    serviceFlutterEngine?.plugins?.add(AppPlugin())
+                    serviceFlutterEngine?.plugins?.add(TilePlugin())
+                    val dartEntrypoint = DartExecutor.DartEntrypoint(
+                        FlutterInjector.instance().flutterLoader().findAppBundlePath(), "_service"
+                    )
+                    serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
+                }
             }
-
         }
     }
 
     private fun startService() {
         GlobalState.launch {
             runLock.withLock {
-                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
+                if (runStateFlow.value != RunState.STOP) {
                     return@launch
                 }
                 runStateFlow.tryEmit(RunState.PENDING)
@@ -119,30 +165,14 @@ object State {
                     return@launch
                 }
                 appPlugin?.prepare(options.enable) {
-                    Service.startService(options, true)
+                    runTime = Service.startService(options, runTime)
                     runStateFlow.tryEmit(RunState.START)
-                    runTime = System.currentTimeMillis()
                 }
             }
         }
 
     }
-
-    fun handleStopService() {
-        GlobalState.launch {
-            runLock.withLock {
-                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.STOP) {
-                    return@launch
-                }
-                runStateFlow.tryEmit(RunState.PENDING)
-                Service.stopService()
-                runStateFlow.tryEmit(RunState.STOP)
-                runTime = 0
-            }
-            destroyServiceEngine()
-        }
-
-    }
 }
 
 
+

android/app/src/main/kotlin/com/follow/clash/TempActivity.kt

@@ -21,7 +21,9 @@ class TempActivity : Activity(),
             }
 
             QuickAction.STOP.action -> {
-                State.handleStopServiceAction()
+                launch {
+                    State.handleStopServiceAction()
+                }
             }
 
             QuickAction.TOGGLE.action -> {

android/app/src/main/kotlin/com/follow/clash/TileService.kt

@@ -31,6 +31,7 @@ class TileService : TileService() {
         scope?.cancel()
         scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
         scope?.launch {
+            State.handleSyncState()
             State.runStateFlow.collect {
                 updateTile(it)
             }
@@ -44,8 +45,7 @@ class TileService : TileService() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
         } else {
-            @Suppress("DEPRECATION")
-            startActivityAndCollapse(intent)
+            @Suppress("DEPRECATION") startActivityAndCollapse(intent)
         }
     }
 

android/app/src/main/kotlin/com/follow/clash/models/State.kt

@@ -2,7 +2,8 @@ package com.follow.clash.models
 
 
 data class AppState(
-    val currentProfileName: String,
-    val stopText: String,
-    val onlyStatisticsProxy: Boolean,
+    val crashlytics: Boolean = true,
+    val currentProfileName: String = "FlClash",
+    val stopText: String = "Stop",
+    val onlyStatisticsProxy: Boolean = false,
 )

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -22,7 +22,7 @@ import com.follow.clash.common.Components
 import com.follow.clash.common.GlobalState
 import com.follow.clash.common.QuickAction
 import com.follow.clash.common.quickIntent
-import com.follow.clash.getBase64
+import com.follow.clash.getPackageIconPath
 import com.follow.clash.models.Package
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -58,8 +58,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private var requestNotificationCallback: (() -> Unit)? = null
 
-    private val iconMap = mutableMapOf<String, String?>()
-
     private val packages = mutableListOf<Package>()
 
     private val skipPrefixList = listOf(
@@ -150,26 +148,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             }
 
             "getPackageIcon" -> {
-                scope.launch {
-                    val packageName = call.argument<String>("packageName")
-                    if (packageName == null) {
-                        result.success(null)
-                        return@launch
-                    }
-                    val packageIcon = getPackageIcon(packageName)
-                    packageIcon.let {
-                        if (it != null) {
-                            result.success(it)
-                            return@launch
-                        }
-                        if (iconMap["default"] == null) {
-                            iconMap["default"] =
-                                GlobalState.application.packageManager?.defaultActivityIcon?.getBase64()
-                        }
-                        result.success(iconMap["default"])
-                        return@launch
-                    }
-                }
+                handleGetPackageIcon(call, result)
             }
 
             "tip" -> {
@@ -184,6 +163,18 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
+    private fun handleGetPackageIcon(call: MethodCall, result: Result) {
+        scope.launch {
+            val packageName = call.argument<String>("packageName")
+            if (packageName == null) {
+                result.success("")
+                return@launch
+            }
+            val path = GlobalState.application.packageManager.getPackageIconPath(packageName)
+            result.success(path)
+        }
+    }
+
     private fun initShortcuts(label: String) {
         val shortcut = with(ShortcutInfoCompat.Builder(GlobalState.application, "toggle")) {
             setShortLabel(label)
@@ -223,31 +214,18 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
-    private suspend fun getPackageIcon(packageName: String): String? {
-        val packageManager = GlobalState.application.packageManager
-        if (iconMap[packageName] == null) {
-            iconMap[packageName] = try {
-                packageManager?.getApplicationIcon(packageName)?.getBase64()
-            } catch (_: Exception) {
-                null
-            }
-
-        }
-        return iconMap[packageName]
-    }
 
     private fun getPackages(): List<Package> {
         val packageManager = GlobalState.application.packageManager
         if (packages.isNotEmpty()) return packages
         packageManager?.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS)
             ?.filter {
-                it.packageName != GlobalState.application.packageName || it.packageName == "android"
-
+                it.packageName != GlobalState.application.packageName && it.packageName != "android"
             }?.map {
                 Package(
                     packageName = it.packageName,
                     label = it.applicationInfo?.loadLabel(packageManager).toString(),
-                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
+                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) != 0,
                     lastUpdateTime = it.lastUpdateTime,
                     internet = it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
                 )
@@ -285,9 +263,12 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                     arrayOf(Manifest.permission.POST_NOTIFICATIONS),
                     NOTIFICATION_PERMISSION_REQUEST_CODE
                 )
-                return
             }
+            return
+        } else {
+            invokeRequestNotificationCallback()
         }
+
     }
 
     fun invokeRequestNotificationCallback() {

android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt

@@ -5,6 +5,7 @@ import com.follow.clash.Service
 import com.follow.clash.State
 import com.follow.clash.awaitResult
 import com.follow.clash.common.Components
+import com.follow.clash.common.GlobalState
 import com.follow.clash.invokeMethodOnMainThread
 import com.follow.clash.models.AppState
 import com.follow.clash.service.models.NotificationParams
@@ -37,7 +38,11 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
         "init" -> {
-            handleInit(result)
+            handleInit(call, result)
+        }
+
+        "shutdown" -> {
+            handleShutdown(result)
         }
 
         "invokeAction" -> {
@@ -74,6 +79,11 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         }
     }
 
+    private fun handleShutdown(result: MethodChannel.Result) {
+        Service.unbind()
+        result.success(true)
+    }
+
     private fun handleStart(result: MethodChannel.Result) {
         State.handleStartService()
         result.success(true)
@@ -99,15 +109,16 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         }
     }
 
-    private fun onServiceCrash() {
+    private fun onServiceDisconnected(message: String) {
         State.runStateFlow.tryEmit(RunState.STOP)
-        flutterMethodChannel.invokeMethodOnMainThread<Any>("crash", null)
+        flutterMethodChannel.invokeMethodOnMainThread<Any>("crash", message)
     }
 
     private fun handleSyncState(call: MethodCall, result: MethodChannel.Result) {
+        val data = call.arguments<String>()!!
+        val params = Gson().fromJson(data, AppState::class.java)
+        GlobalState.setCrashlytics(params.crashlytics)
         launch {
-            val data = call.arguments<String>()!!
-            val params = Gson().fromJson(data, AppState::class.java)
             Service.updateNotificationParams(
                 NotificationParams(
                     title = params.currentProfileName,
@@ -115,23 +126,35 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
                     onlyStatisticsProxy = params.onlyStatisticsProxy
                 )
             )
-            result.success(true)
+            Service.setCrashlytics(params.crashlytics)
+            result.success("")
         }
-
     }
 
-    fun handleInit(result: MethodChannel.Result) {
+    fun handleInit(call: MethodCall, result: MethodChannel.Result) {
         Service.bind()
         launch {
-            Service.setMessageCallback {
-                handleSendEvent(it)
+            val needSetEventListener = call.arguments<Boolean>() ?: false
+            when (needSetEventListener) {
+                true -> Service.setEventListener {
+                    handleSendEvent(it)
+                }
+
+                false -> Service.setEventListener(null)
+            }.onSuccess {
+                result.success("")
+            }.onFailure {
+                result.success(it.message)
             }
-            result.success(true)
+
         }
-        Service.onServiceCrash = ::onServiceCrash
+        Service.onServiceDisconnected = ::onServiceDisconnected
     }
 
     private fun handleGetRunTime(result: MethodChannel.Result) {
-        return result.success(State.runTime)
+        launch {
+            State.handleSyncState()
+            result.success(State.runTime)
+        }
     }
 }

android/common/build.gradle.kts

@@ -39,4 +39,7 @@ kotlin {
 dependencies {
     implementation(libs.androidx.core)
     implementation(libs.gson)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics.ndk)
+    implementation(libs.firebase.analytics)
 }

android/common/src/main/AndroidManifest.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <permission
+        android:name="${applicationId}.permission.RECEIVE_BROADCASTS"
+        android:protectionLevel="signature" />
+
     <uses-permission android:name="${applicationId}.permission.RECEIVE_BROADCASTS" />
 </manifest>

android/common/src/main/java/com/follow/clash/common/Enums.kt

@@ -10,9 +10,8 @@ enum class QuickAction {
 }
 
 enum class BroadcastAction {
-    START,
-    STOP,
-    TOGGLE,
+    SERVICE_CREATED,
+    SERVICE_DESTROYED,
 }
 
 enum class AccessControlMode {

android/common/src/main/java/com/follow/clash/common/Ext.kt

@@ -1,6 +1,7 @@
 package com.follow.clash.common
 
 import android.annotation.SuppressLint
+import android.app.ActivityManager
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -13,14 +14,22 @@ import android.content.Context.RECEIVER_NOT_EXPORTED
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.os.Build
+import android.os.Handler
 import android.os.IBinder
+import android.os.Looper
 import android.os.RemoteException
 import android.util.Log
+import androidx.core.content.getSystemService
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.retryWhen
+import kotlinx.coroutines.withContext
+import java.nio.charset.Charset
 import kotlin.reflect.KClass
 
 //fun Context.startForegroundServiceCompat(intent: Intent?) {
@@ -36,19 +45,23 @@ val KClass<*>.intent: Intent
 
 fun Service.startForegroundCompat(id: Int, notification: Notification) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        startForeground(id, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        startForeground(id, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
     } else {
         startForeground(id, notification)
     }
 }
 
+val ComponentName.intent: Intent
+    get() = Intent().apply {
+        setComponent(this@intent)
+        setPackage(GlobalState.packageName)
+    }
+
 val QuickAction.action: String
     get() = "${GlobalState.application.packageName}.action.${this.name}"
 
 val QuickAction.quickIntent: Intent
-    get() = Intent().apply {
-        setComponent(Components.TEMP_ACTIVITY)
-        setPackage(GlobalState.packageName)
+    get() = Components.TEMP_ACTIVITY.intent.apply {
         action = this@quickIntent.action
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
     }
@@ -56,10 +69,18 @@ val QuickAction.quickIntent: Intent
 val BroadcastAction.action: String
     get() = "${GlobalState.application.packageName}.intent.action.${this.name}"
 
+val Context.processName: String?
+    get() {
+        val pid = android.os.Process.myPid()
+        val activityManager = getSystemService<ActivityManager>()
+        activityManager?.runningAppProcesses?.find { it.pid == pid }?.let {
+            return it.processName
+        }
+        return null
+    }
+
 val BroadcastAction.quickIntent: Intent
-    get() = Intent().apply {
-        setComponent(Components.BROADCAST_RECEIVER)
-        setPackage(GlobalState.packageName)
+    get() = Components.BROADCAST_RECEIVER.intent.apply {
         action = this@quickIntent.action
     }
 
@@ -125,62 +146,55 @@ fun Context.receiveBroadcastFlow(
 }
 
 
-sealed class BindServiceEvent<out T : IBinder> {
-    data class Connected<T : IBinder>(val binder: T) : BindServiceEvent<T>()
-    object Disconnected : BindServiceEvent<Nothing>()
-    object Crashed : BindServiceEvent<Nothing>()
-}
-
 inline fun <reified T : IBinder> Context.bindServiceFlow(
     intent: Intent,
     flags: Int = Context.BIND_AUTO_CREATE,
-): Flow<BindServiceEvent<T>> = callbackFlow {
-    var currentBinder: IBinder? = null
-    val deathRecipient = IBinder.DeathRecipient {
-        trySend(BindServiceEvent.Crashed)
-    }
-
+    maxRetries: Int = 10,
+    retryDelayMillis: Long = 200L
+): Flow<Pair<IBinder?, String>> = callbackFlow {
     val connection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
             if (binder != null) {
                 try {
-                    binder.linkToDeath(deathRecipient, 0)
-                    currentBinder = binder
                     @Suppress("UNCHECKED_CAST") val casted = binder as? T
                     if (casted != null) {
-                        trySend(BindServiceEvent.Connected(casted))
+                        trySend(Pair(casted, ""))
                     } else {
-                        GlobalState.log("Binder is not of type ${T::class.java}")
-                        trySend(BindServiceEvent.Disconnected)
+                        trySend(Pair(null, "Binder is not of type ${T::class.java}"))
                     }
                 } catch (e: RemoteException) {
-                    GlobalState.log("Failed to link to death: ${e.message}")
-                    binder.unlinkToDeath(deathRecipient, 0)
-                    trySend(BindServiceEvent.Disconnected)
+                    trySend(Pair(null, "Failed to link to death: ${e.message}"))
                 }
             } else {
-                trySend(BindServiceEvent.Disconnected)
+                trySend(Pair(null, "Binder empty"))
             }
         }
 
         override fun onServiceDisconnected(name: ComponentName?) {
-            GlobalState.log("Service disconnected")
-            currentBinder?.unlinkToDeath(deathRecipient, 0)
-            currentBinder = null
-            trySend(BindServiceEvent.Disconnected)
+            trySend(Pair(null, "Service disconnected"))
         }
     }
 
-    if (!bindService(intent, connection, flags)) {
-        GlobalState.log("Failed to bind service")
-        trySend(BindServiceEvent.Disconnected)
-        close()
-        return@callbackFlow
+    val success = withContext(Dispatchers.Main) {
+        bindService(intent, connection, flags)
+    }
+
+    if (!success) {
+        throw IllegalStateException("bindService() failed, will retry")
     }
 
     awaitClose {
-        currentBinder?.unlinkToDeath(deathRecipient, 0)
-        unbindService(connection)
+        Handler(Looper.getMainLooper()).post {
+            unbindService(connection)
+            trySend(Pair(null, ""))
+        }
+    }
+}.retryWhen { cause, attempt ->
+    if (attempt < maxRetries && cause is Exception) {
+        delay(retryDelayMillis)
+        true
+    } else {
+        false
     }
 }
 
@@ -201,4 +215,36 @@ val Long.formatBytes: String
         } else {
             "%.1f${units[unitIndex]}".format(size)
         }
-    }
+    }
+
+fun String.chunkedForAidl(charset: Charset = Charsets.UTF_8): List<ByteArray> {
+    val allBytes = toByteArray(charset)
+    val total = allBytes.size
+    val maxBytes = when {
+        total <= 100 * 1024 -> total
+        total <= 1024 * 1024 -> 64 * 1024
+        total <= 10 * 1024 * 1024 -> 128 * 1024
+        else -> 256 * 1024
+    }
+
+    val result = mutableListOf<ByteArray>()
+    var index = 0
+    while (index < total) {
+        val end = minOf(index + maxBytes, total)
+        result.add(allBytes.copyOfRange(index, end))
+        index = end
+    }
+    return result
+}
+
+
+fun <T : List<ByteArray>> T.formatString(charset: Charset = Charsets.UTF_8): String {
+    val totalSize = this.sumOf { it.size }
+    val combined = ByteArray(totalSize)
+    var offset = 0
+    forEach { byteArray ->
+        byteArray.copyInto(combined, offset)
+        offset += byteArray.size
+    }
+    return String(combined, charset)
+}

android/common/src/main/java/com/follow/clash/common/GlobalState.kt

@@ -1,7 +1,10 @@
 package com.follow.clash.common
 
+
 import android.app.Application
 import android.util.Log
+import com.google.firebase.FirebaseApp
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 
@@ -12,16 +15,16 @@ object GlobalState : CoroutineScope by CoroutineScope(Dispatchers.Default) {
     const val NOTIFICATION_ID = 1
 
     val packageName: String
-        get() = _application.packageName
+        get() = application.packageName
 
     val RECEIVE_BROADCASTS_PERMISSIONS: String
         get() = "${packageName}.permission.RECEIVE_BROADCASTS"
 
 
-    private lateinit var _application: Application
+    private var _application: Application? = null
 
     val application: Application
-        get() = _application
+        get() = _application!!
 
 
     fun log(text: String) {
@@ -31,4 +34,14 @@ object GlobalState : CoroutineScope by CoroutineScope(Dispatchers.Default) {
     fun init(application: Application) {
         _application = application
     }
+
+    fun setCrashlytics(enable: Boolean) {
+        _application?.let {
+            FirebaseApp.initializeApp(it)
+            FirebaseCrashlytics.getInstance().isCrashlyticsCollectionEnabled = enable
+            if (enable) {
+                log("init crashlytics ${it.processName}")
+            }
+        }
+    }
 }

android/common/src/main/java/com/follow/clash/common/Service.kt

@@ -8,64 +8,71 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import java.util.concurrent.atomic.AtomicBoolean
 
 class ServiceDelegate<T>(
     private val intent: Intent,
-    private val onServiceDisconnected: (() -> Unit)? = null,
-    private val onServiceCrash: (() -> Unit)? = null,
+    private val onServiceDisconnected: ((String) -> Unit)? = null,
     private val interfaceCreator: (IBinder) -> T,
 ) : CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
 
-    private val _service = MutableStateFlow<T?>(null)
+    private val _bindingState = AtomicBoolean(false)
 
-    val service: StateFlow<T?> = _service
+    private var _serviceState = MutableStateFlow<Pair<T?, String>?>(null)
 
-    private var bindJob: Job? = null
-    private fun handleBindEvent(event: BindServiceEvent<IBinder>) {
-        when (event) {
-            is BindServiceEvent.Connected -> {
-                _service.value = event.binder.let(interfaceCreator)
-            }
+    val serviceState: StateFlow<Pair<T?, String>?> = _serviceState
+    private var job: Job? = null
 
-            is BindServiceEvent.Disconnected -> {
-                _service.value = null
-                onServiceDisconnected?.invoke()
-            }
-
-            is BindServiceEvent.Crashed -> {
-                _service.value = null
-                onServiceCrash?.invoke()
-            }
+    private fun handleBind(data: Pair<IBinder?, String>) {
+        data.first?.let {
+            _serviceState.value = Pair(interfaceCreator(it), data.second)
+        } ?: run {
+            _serviceState.value = Pair(null, data.second)
+            unbind()
+            onServiceDisconnected?.invoke(data.second)
+            _bindingState.set(false)
         }
     }
 
     fun bind() {
-        unbind()
-        bindJob = launch {
-            GlobalState.application.bindServiceFlow<IBinder>(intent).collect { it ->
-                handleBindEvent(it)
+        if (_bindingState.compareAndSet(false, true)) {
+            job?.cancel()
+            job = null
+            _serviceState.value = null
+            job = launch {
+                runCatching {
+                    GlobalState.application.bindServiceFlow<IBinder>(intent)
+                        .collect { handleBind(it) }
+                }
             }
         }
     }
 
-    suspend inline fun <R> useService(crossinline block: (T) -> R): Result<R> {
-        return withTimeoutOrNull(10_000) {
-            service.first { it != null }
-        }?.let { service ->
-            try {
-                Result.success(block(service))
-            } catch (e: Exception) {
-                Result.failure(e)
+    suspend inline fun <R> useService(
+        timeoutMillis: Long = 5000, crossinline block: suspend (T) -> R
+    ): Result<R> {
+        return runCatching {
+            withTimeout(timeoutMillis) {
+                val state = serviceState.filterNotNull().first()
+                state.first?.let {
+                    withContext(Dispatchers.Default) {
+                        block(it)
+                    }
+                } ?: throw Exception(state.second)
             }
-        } ?: Result.failure(Exception("Service connection timeout"))
+        }
     }
 
     fun unbind() {
-        _service.value = null
-        bindJob?.cancel()
-        bindJob = null
+        if (_bindingState.compareAndSet(true, false)) {
+            job?.cancel()
+            job = null
+            _serviceState.value = null
+        }
     }
 }

android/core/src/main/cpp/CMakeLists.txt

@@ -8,25 +8,9 @@ message("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")
 
 
 if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    #    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
-    add_compile_options(-O3)
-
-    add_compile_options(-flto)
-
-    add_compile_options(-g0)
-
-    add_compile_options(-ffunction-sections -fdata-sections)
-
-    add_compile_options(-fno-exceptions -fno-rtti)
-
-    add_link_options(
-            -flto
-            -Wl,--gc-sections
-            -Wl,--strip-all
-            -Wl,--exclude-libs=ALL
-    )
-
-    add_compile_options(-fvisibility=hidden -fvisibility-inlines-hidden)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
+    add_compile_options(-O3 -flto -g0 -fno-exceptions -fno-rtti)
+    add_link_options(-flto -Wl,--gc-sections,--strip-all)
 endif ()
 
 set(LIB_CLASH_PATH "${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libclash.so")

android/core/src/main/cpp/core.cpp

@@ -9,16 +9,14 @@
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject thiz, jint fd, jobject cb,
-                                         jstring address, jstring dns) {
+                                         jstring stack, jstring address, jstring dns) {
     const auto interface = new_global(cb);
-    scoped_string addressChar = get_string(address);
-    scoped_string dnsChar = get_string(dns);
-    startTUN(interface, fd, addressChar, dnsChar);
+    startTUN(interface, fd, get_string(stack), get_string(address), get_string(dns));
 }
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_stopTun(JNIEnv *) {
+Java_com_follow_clash_core_Core_stopTun(JNIEnv *env, jobject thiz) {
     stopTun();
 }
 
@@ -31,39 +29,39 @@ Java_com_follow_clash_core_Core_forceGC(JNIEnv *env, jobject thiz) {
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_updateDNS(JNIEnv *env, jobject thiz, jstring dns) {
-    scoped_string dnsChar = get_string(dns);
-    updateDns(dnsChar);
+    updateDns(get_string(dns));
 }
 
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_invokeAction(JNIEnv *env, jobject thiz, jstring data, jobject cb) {
     const auto interface = new_global(cb);
-    scoped_string dataChar = get_string(data);
-    invokeAction(interface, dataChar);
+    invokeAction(interface, get_string(data));
 }
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_setMessageCallback(JNIEnv *env, jobject thiz, jobject cb) {
-    const auto interface = new_global(cb);
-    setMessageCallback(interface);
+Java_com_follow_clash_core_Core_setEventListener(JNIEnv *env, jobject thiz, jobject cb) {
+    if (cb != nullptr) {
+        const auto interface = new_global(cb);
+        setEventListener(interface);
+    } else {
+        setEventListener(nullptr);
+    }
 }
 
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_follow_clash_core_Core_getTraffic(JNIEnv *env, jobject thiz,
                                            const jboolean only_statistics_proxy) {
-    scoped_string res = getTraffic(only_statistics_proxy);
-    return new_string(res);
+    return new_string(getTraffic(only_statistics_proxy));
 }
 
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_follow_clash_core_Core_getTotalTraffic(JNIEnv *env, jobject thiz,
                                                 const jboolean only_statistics_proxy) {
-    scoped_string res = getTotalTraffic(only_statistics_proxy);
-    return new_string(res);
+    return new_string(getTotalTraffic(only_statistics_proxy));
 }
 
 extern "C"
@@ -83,6 +81,10 @@ static void release_jni_object_impl(void *obj) {
     del_global(static_cast<jobject>(obj));
 }
 
+static void free_string_impl(char *str) {
+    free(str);
+}
+
 static void call_tun_interface_protect_impl(void *tun_interface, const int fd) {
     ATTACH_JNI();
     env->CallVoidMethod(static_cast<jobject>(tun_interface),
@@ -103,8 +105,7 @@ call_tun_interface_resolve_process_impl(void *tun_interface, const int protocol,
         new_string(source),
         new_string(target),
         uid));
-    scoped_string packageNameChar = get_string(packageName);
-    return packageNameChar;
+    return get_string(packageName);
 }
 
 static void call_invoke_interface_result_impl(void *invoke_interface, const char *data) {
@@ -139,6 +140,7 @@ JNI_OnLoad(JavaVM *vm, void *) {
     resolve_process_func = &call_tun_interface_resolve_process_impl;
     result_func = &call_invoke_interface_result_impl;
     release_object_func = &release_jni_object_impl;
+    free_string_func = &free_string_impl;
 
     return JNI_VERSION_1_6;
 }
@@ -146,7 +148,7 @@ JNI_OnLoad(JavaVM *vm, void *) {
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject thiz, jint fd, jobject cb,
-                                         jstring address, jstring dns) {
+                                         jstring stack, jstring address, jstring dns) {
 }
 
 extern "C"
@@ -171,7 +173,7 @@ Java_com_follow_clash_core_Core_updateDNS(JNIEnv *env, jobject thiz, jstring dns
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_setMessageCallback(JNIEnv *env, jobject thiz, jobject cb) {
+Java_com_follow_clash_core_Core_setEventListener(JNIEnv *env, jobject thiz, jobject cb) {
 }
 
 extern "C"

android/core/src/main/java/com/follow/clash/core/Core.kt

@@ -8,6 +8,7 @@ data object Core {
     private external fun startTun(
         fd: Int,
         cb: TunInterface,
+        stack: String,
         address: String,
         dns: String,
     )
@@ -29,6 +30,7 @@ data object Core {
         fd: Int,
         protect: (Int) -> Boolean,
         resolverProcess: (protocol: Int, source: InetSocketAddress, target: InetSocketAddress, uid: Int) -> String,
+        stack: String,
         address: String,
         dns: String,
     ) {
@@ -53,6 +55,7 @@ data object Core {
                     )
                 }
             },
+            stack,
             address,
             dns
         )
@@ -81,18 +84,22 @@ data object Core {
         )
     }
 
-    private external fun setMessageCallback(cb: InvokeInterface)
+    private external fun setEventListener(cb: InvokeInterface?)
 
-    fun setMessageCallback(
-        cb: (result: String?) -> Unit
+    fun callSetEventListener(
+        cb: ((result: String?) -> Unit)?
     ) {
-        setMessageCallback(
-            object : InvokeInterface {
-                override fun onResult(result: String?) {
-                    cb(result)
-                }
-            },
-        )
+        when (cb != null) {
+            true -> setEventListener(
+                object : InvokeInterface {
+                    override fun onResult(result: String?) {
+                        cb(result)
+                    }
+                },
+            )
+
+            false -> setEventListener(null)
+        }
     }
 
     external fun stopTun()

android/gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
 #agp = "8.10.1"
+firebaseBom = "34.2.0"
 minSdk = "23"
 targetSdk = "36"
 compileSdk = "36"
@@ -10,11 +11,18 @@ coreSplashscreen = "1.0.1"
 gson = "2.13.1"
 kotlin = "2.2.10"
 smaliDexlib2 = "3.0.9"
+firebaseCrashlyticsKtx = "20.0.1"
+firebaseCommonKtx = "22.0.0"
 
 [libraries]
 build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 annotation-jvm = { module = "androidx.annotation:annotation-jvm", version.ref = "annotationJvm" }
 core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
+firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
-smali-dexlib2 = { module = "com.android.tools.smali:smali-dexlib2", version.ref = "smaliDexlib2" }
+smali-dexlib2 = { module = "com.android.tools.smali:smali-dexlib2", version.ref = "smaliDexlib2" }
+firebase-crashlytics-ktx = { group = "com.google.firebase", name = "firebase-crashlytics-ktx", version.ref = "firebaseCrashlyticsKtx" }
+firebase-common-ktx = { group = "com.google.firebase", name = "firebase-common-ktx", version.ref = "firebaseCommonKtx" }

android/service/src/main/AndroidManifest.xml

@@ -5,11 +5,11 @@
 
     <application>
         <service
-            android:name="com.follow.clash.service.VpnService"
+            android:name=".VpnService"
             android:exported="false"
-            android:foregroundServiceType="dataSync"
+            android:foregroundServiceType="specialUse"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:process=":background">
+            android:process=":remote">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
@@ -19,18 +19,31 @@
         </service>
 
         <service
-            android:name="com.follow.clash.service.CommonService"
+            android:name=".CommonService"
             android:exported="false"
-            android:foregroundServiceType="dataSync"
-            android:process=":background">
+            android:foregroundServiceType="specialUse"
+            android:process=":remote">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="service" />
+                android:value="proxy" />
         </service>
 
         <service
-            android:name="com.follow.clash.service.RemoteService"
+            android:name=".RemoteService"
+            android:enabled="true"
             android:exported="false"
-            android:process=":background" />
+            android:process=":remote" />
+
+        <provider
+            android:name=".FilesProvider"
+            android:authorities="${applicationId}.files"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS"
+            android:process=":remote">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>
     </application>
 </manifest>

android/service/src/main/aidl/com/follow/clash/service/IAckInterface.aidl

@@ -0,0 +1,8 @@
+// IAckInterface.aidl
+package com.follow.clash.service;
+
+import com.follow.clash.service.IAckInterface;
+
+interface IAckInterface {
+   oneway void onAck();
+}

android/service/src/main/aidl/com/follow/clash/service/ICallbackInterface.aidl

@@ -1,6 +1,8 @@
 // ICallbackInterface.aidl
 package com.follow.clash.service;
 
+import com.follow.clash.service.IAckInterface;
+
 interface ICallbackInterface {
-    void onResult(String result);
+    oneway void onResult(in byte[] data,in boolean isSuccess, in IAckInterface ack);
 }

android/service/src/main/aidl/com/follow/clash/service/IEventInterface.aidl

@@ -0,0 +1,8 @@
+// IEventInterface.aidl
+package com.follow.clash.service;
+
+import com.follow.clash.service.IAckInterface;
+
+interface IEventInterface {
+    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess, in IAckInterface ack);
+}

android/service/src/main/aidl/com/follow/clash/service/IRemoteInterface.aidl

@@ -2,13 +2,17 @@
 package com.follow.clash.service;
 
 import com.follow.clash.service.ICallbackInterface;
+import com.follow.clash.service.IEventInterface;
+import com.follow.clash.service.IResultInterface;
 import com.follow.clash.service.models.VpnOptions;
 import com.follow.clash.service.models.NotificationParams;
 
 interface IRemoteInterface {
     void invokeAction(in String data, in ICallbackInterface callback);
     void updateNotificationParams(in NotificationParams params);
-    void startService(in VpnOptions options,in boolean inApp);
-    void stopService();
-    void setMessageCallback(in ICallbackInterface messageCallback);
+    void startService(in VpnOptions options, in long runTime, in IResultInterface result);
+    void stopService(in IResultInterface result);
+    void setEventListener(in IEventInterface event);
+    void setCrashlytics(in boolean enable);
+    long getRunTime();
 }

android/service/src/main/aidl/com/follow/clash/service/IResultInterface.aidl

@@ -0,0 +1,6 @@
+// IResultInterface.aidl
+package com.follow.clash.service;
+
+interface IResultInterface {
+    oneway void onResult(in long runTime);
+}

android/service/src/main/java/com/follow/clash/service/CommonService.kt

@@ -29,6 +29,11 @@ class CommonService : Service(), IBaseService,
         handleCreate()
     }
 
+    override fun onDestroy() {
+        handleDestroy()
+        super.onDestroy()
+    }
+
     override fun onLowMemory() {
         Core.forceGC()
         super.onLowMemory()

android/service/src/main/java/com/follow/clash/service/FilesProvider.kt

@@ -1,35 +1,33 @@
-package com.follow.clash
+package com.follow.clash.service
 
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.os.CancellationSignal
 import android.os.ParcelFileDescriptor
-import android.provider.DocumentsContract.Document
-import android.provider.DocumentsContract.Root
+import android.provider.DocumentsContract
 import android.provider.DocumentsProvider
 import java.io.File
 import java.io.FileNotFoundException
 
-
 class FilesProvider : DocumentsProvider() {
 
     companion object {
         private const val DEFAULT_ROOT_ID = "0"
 
         private val DEFAULT_DOCUMENT_COLUMNS = arrayOf(
-            Document.COLUMN_DOCUMENT_ID,
-            Document.COLUMN_DISPLAY_NAME,
-            Document.COLUMN_MIME_TYPE,
-            Document.COLUMN_FLAGS,
-            Document.COLUMN_SIZE,
+            DocumentsContract.Document.COLUMN_DOCUMENT_ID,
+            DocumentsContract.Document.COLUMN_DISPLAY_NAME,
+            DocumentsContract.Document.COLUMN_MIME_TYPE,
+            DocumentsContract.Document.COLUMN_FLAGS,
+            DocumentsContract.Document.COLUMN_SIZE,
         )
         private val DEFAULT_ROOT_COLUMNS = arrayOf(
-            Root.COLUMN_ROOT_ID,
-            Root.COLUMN_FLAGS,
-            Root.COLUMN_ICON,
-            Root.COLUMN_TITLE,
-            Root.COLUMN_SUMMARY,
-            Root.COLUMN_DOCUMENT_ID
+            DocumentsContract.Root.COLUMN_ROOT_ID,
+            DocumentsContract.Root.COLUMN_FLAGS,
+            DocumentsContract.Root.COLUMN_ICON,
+            DocumentsContract.Root.COLUMN_TITLE,
+            DocumentsContract.Root.COLUMN_SUMMARY,
+            DocumentsContract.Root.COLUMN_DOCUMENT_ID
         )
     }
 
@@ -40,12 +38,12 @@ class FilesProvider : DocumentsProvider() {
     override fun queryRoots(projection: Array<String>?): Cursor {
         return MatrixCursor(projection ?: DEFAULT_ROOT_COLUMNS).apply {
             newRow().apply {
-                add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
-                add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY)
-                add(Root.COLUMN_ICON, R.mipmap.ic_launcher)
-                add(Root.COLUMN_TITLE, "FlClash")
-                add(Root.COLUMN_SUMMARY, "Data")
-                add(Root.COLUMN_DOCUMENT_ID, "/")
+                add(DocumentsContract.Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
+                add(DocumentsContract.Root.COLUMN_FLAGS, DocumentsContract.Root.FLAG_LOCAL_ONLY)
+                add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_service)
+                add(DocumentsContract.Root.COLUMN_TITLE, "FlClash")
+                add(DocumentsContract.Root.COLUMN_SUMMARY, "Data")
+                add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, "/")
             }
         }
     }
@@ -87,20 +85,20 @@ class FilesProvider : DocumentsProvider() {
 
     private fun includeFile(result: MatrixCursor, file: File) {
         result.newRow().apply {
-            add(Document.COLUMN_DOCUMENT_ID, file.absolutePath)
-            add(Document.COLUMN_DISPLAY_NAME, file.name)
-            add(Document.COLUMN_SIZE, file.length())
+            add(DocumentsContract.Document.COLUMN_DOCUMENT_ID, file.absolutePath)
+            add(DocumentsContract.Document.COLUMN_DISPLAY_NAME, file.name)
+            add(DocumentsContract.Document.COLUMN_SIZE, file.length())
             add(
-                Document.COLUMN_FLAGS,
-                Document.FLAG_SUPPORTS_WRITE or Document.FLAG_SUPPORTS_DELETE
+                DocumentsContract.Document.COLUMN_FLAGS,
+                DocumentsContract.Document.FLAG_SUPPORTS_WRITE or DocumentsContract.Document.FLAG_SUPPORTS_DELETE
             )
-            add(Document.COLUMN_MIME_TYPE, getDocumentType(file))
+            add(DocumentsContract.Document.COLUMN_MIME_TYPE, getDocumentType(file))
         }
     }
 
     private fun getDocumentType(file: File): String {
         return if (file.isDirectory) {
-            Document.MIME_TYPE_DIR
+            DocumentsContract.Document.MIME_TYPE_DIR
         } else {
             "application/octet-stream"
         }

android/service/src/main/java/com/follow/clash/service/IBaseService.kt

@@ -1,15 +1,18 @@
 package com.follow.clash.service
 
 import com.follow.clash.common.BroadcastAction
+import com.follow.clash.common.GlobalState
 import com.follow.clash.common.sendBroadcast
 
 interface IBaseService {
     fun handleCreate() {
-        if (!State.inApp) {
-            BroadcastAction.START.sendBroadcast()
-        } else {
-            State.inApp = false
-        }
+        GlobalState.log("Service create")
+        BroadcastAction.SERVICE_CREATED.sendBroadcast()
+    }
+
+    fun handleDestroy() {
+        GlobalState.log("Service destroy")
+        BroadcastAction.SERVICE_DESTROYED.sendBroadcast()
     }
 
     fun start()

android/service/src/main/java/com/follow/clash/service/RemoteService.kt

@@ -3,89 +3,164 @@ package com.follow.clash.service
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
+import com.follow.clash.common.GlobalState
 import com.follow.clash.common.ServiceDelegate
+import com.follow.clash.common.chunkedForAidl
 import com.follow.clash.common.intent
 import com.follow.clash.core.Core
+import com.follow.clash.service.State.delegate
+import com.follow.clash.service.State.intent
+import com.follow.clash.service.State.runLock
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.withLock
+import java.util.UUID
+import kotlin.coroutines.resume
 
 class RemoteService : Service(),
     CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
-    private var delegate: ServiceDelegate<IBaseService>? = null
-    private var intent: Intent? = null
-
-    private fun handleStopService() {
+    private fun handleStopService(result: IResultInterface) {
         launch {
-            delegate?.useService { service ->
-                service.stop()
+            runLock.withLock {
+                delegate?.useService { service ->
+                    service.stop()
+                    delegate?.unbind()
+                }
+                State.runTime = 0
+                result.onResult(0)
             }
-            delegate?.unbind()
         }
     }
 
-    fun onServiceDisconnected() {
-        handleStopService()
+    private fun handleServiceDisconnected(message: String) {
+        GlobalState.log("Background service disconnected: $message")
+        intent = null
+        delegate = null
     }
 
-    private fun handleStartService() {
+    private fun handleStartService(runTime: Long, result: IResultInterface) {
         launch {
-            val nextIntent = when (State.options?.enable == true) {
-                true -> VpnService::class.intent
-                false -> CommonService::class.intent
+            runLock.withLock {
+                val nextIntent = when (State.options?.enable == true) {
+                    true -> VpnService::class.intent
+                    false -> CommonService::class.intent
+                }
+                if (intent != nextIntent) {
+                    delegate?.unbind()
+                    delegate = ServiceDelegate(nextIntent, ::handleServiceDisconnected) { binder ->
+                        when (binder) {
+                            is VpnService.LocalBinder -> binder.getService()
+                            is CommonService.LocalBinder -> binder.getService()
+                            else -> throw IllegalArgumentException("Invalid binder type")
+                        }
+                    }
+                    intent = nextIntent
+                    delegate?.bind()
+                }
+                delegate?.useService { service ->
+                    service.start()
+                }
+                State.runTime = when (runTime != 0L) {
+                    true -> runTime
+                    false -> System.currentTimeMillis()
+                }
+                result.onResult(State.runTime)
             }
-            if (intent != nextIntent) {
-                delegate?.unbind()
-                delegate = ServiceDelegate(nextIntent, ::onServiceDisconnected) { binder ->
-                    when (binder) {
-                        is VpnService.LocalBinder -> binder.getService()
-                        is CommonService.LocalBinder -> binder.getService()
-                        else -> throw IllegalArgumentException("Invalid binder type")
+        }
+    }
+
+    private val binder = object : IRemoteInterface.Stub() {
+        override fun invokeAction(data: String, callback: ICallbackInterface) {
+            Core.invokeAction(data) {
+                launch {
+                    runCatching {
+                        val chunks = it?.chunkedForAidl() ?: listOf()
+                        for ((index, chunk) in chunks.withIndex()) {
+                            suspendCancellableCoroutine { cont ->
+                                callback.onResult(
+                                    chunk,
+                                    index == chunks.lastIndex,
+                                    object : IAckInterface.Stub() {
+                                        override fun onAck() {
+                                            cont.resume(Unit)
+                                        }
+                                    },
+                                )
+                            }
+                        }
                     }
                 }
-                intent = nextIntent
-                delegate?.bind()
             }
-            delegate?.useService { service ->
-                service.start()
-            }
-        }
-    }
-
-    private val binder: IRemoteInterface.Stub = object : IRemoteInterface.Stub() {
-        override fun invokeAction(data: String, callback: ICallbackInterface) {
-            Core.invokeAction(data, callback::onResult)
         }
 
         override fun updateNotificationParams(params: NotificationParams?) {
             State.notificationParamsFlow.tryEmit(params)
         }
 
+
         override fun startService(
-            options: VpnOptions, inApp: Boolean
+            options: VpnOptions,
+            runtime: Long,
+            result: IResultInterface,
         ) {
             State.options = options
-            State.inApp = inApp
-            handleStartService()
+            handleStartService(runtime, result)
         }
 
-        override fun stopService() {
-            handleStopService()
+        override fun stopService(result: IResultInterface) {
+            handleStopService(result)
         }
 
-        override fun setMessageCallback(messageCallback: ICallbackInterface) {
-            setMessageCallback(messageCallback::onResult)
-        }
-    }
+        override fun setEventListener(eventListener: IEventInterface?) {
+            GlobalState.log("RemoveEventListener ${eventListener == null}")
+            when (eventListener != null) {
+                true -> Core.callSetEventListener {
+                    launch {
+                        runCatching {
+                            val id = UUID.randomUUID().toString()
+                            val chunks = it?.chunkedForAidl() ?: listOf()
+                            for ((index, chunk) in chunks.withIndex()) {
+                                suspendCancellableCoroutine { cont ->
+                                    eventListener.onEvent(
+                                        id,
+                                        chunk,
+                                        index == chunks.lastIndex,
+                                        object : IAckInterface.Stub() {
+                                            override fun onAck() {
+                                                cont.resume(Unit)
+                                            }
+                                        },
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
 
-    private fun setMessageCallback(cb: (result: String?) -> Unit) {
-        Core.setMessageCallback(cb)
+                false -> Core.callSetEventListener(null)
+            }
+        }
+
+        override fun setCrashlytics(enable: Boolean) {
+            GlobalState.setCrashlytics(enable)
+        }
+
+        override fun getRunTime(): Long {
+            return State.runTime
+        }
     }
 
     override fun onBind(intent: Intent?): IBinder {
         return binder
     }
+
+    override fun onDestroy() {
+        GlobalState.log("Remote service destroy")
+        super.onDestroy()
+    }
 }

android/service/src/main/java/com/follow/clash/service/State.kt

@@ -1,13 +1,22 @@
 package com.follow.clash.service
 
+import android.content.Intent
+import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.sync.Mutex
 
 object State {
     var options: VpnOptions? = null
-    var inApp: Boolean = false
     var notificationParamsFlow: MutableStateFlow<NotificationParams?> = MutableStateFlow(
         NotificationParams()
     )
+
+    val runLock = Mutex()
+    var runTime: Long = 0L
+
+    var delegate: ServiceDelegate<IBaseService>? = null
+
+    var intent: Intent? = null
 }

android/service/src/main/java/com/follow/clash/service/VpnService.kt

@@ -11,9 +11,7 @@ import android.os.RemoteException
 import android.util.Log
 import androidx.core.content.getSystemService
 import com.follow.clash.common.AccessControlMode
-import com.follow.clash.common.BroadcastAction
 import com.follow.clash.common.GlobalState
-import com.follow.clash.common.sendBroadcast
 import com.follow.clash.core.Core
 import com.follow.clash.service.models.VpnOptions
 import com.follow.clash.service.models.getIpv4RouteAddress
@@ -45,6 +43,11 @@ class VpnService : SystemVpnService(), IBaseService,
         handleCreate()
     }
 
+    override fun onDestroy() {
+        handleDestroy()
+        super.onDestroy()
+    }
+
     private val connectivity by lazy {
         getSystemService<ConnectivityManager>()
     }
@@ -108,12 +111,13 @@ class VpnService : SystemVpnService(), IBaseService,
             try {
                 val isSuccess = super.onTransact(code, data, reply, flags)
                 if (!isSuccess) {
-                    GlobalState.log("onTransact error ===>")
-                    BroadcastAction.STOP.sendBroadcast()
+                    GlobalState.log("VpnService disconnected")
+                    handleDestroy()
                 }
                 return isSuccess
             } catch (e: RemoteException) {
-                throw e
+                GlobalState.log("VpnService onTransact $e")
+                return false
             }
         }
     }
@@ -209,6 +213,7 @@ class VpnService : SystemVpnService(), IBaseService,
                 allowBypass()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
+                GlobalState.log("Open http proxy")
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1", options.port, options.bypassDomain
@@ -222,6 +227,7 @@ class VpnService : SystemVpnService(), IBaseService,
             fd,
             protect = this::protect,
             resolverProcess = this::resolverProcess,
+            options.stack,
             options.address,
             options.dns
         )

android/service/src/main/java/com/follow/clash/service/models/Traffic.kt

@@ -1,5 +1,6 @@
 package com.follow.clash.service.models
 
+import com.follow.clash.common.GlobalState
 import com.follow.clash.common.formatBytes
 import com.follow.clash.core.Core
 import com.google.gson.Gson
@@ -13,7 +14,12 @@ val Traffic.speedText: String
     get() = "${up.formatBytes}/s↑  ${down.formatBytes}/s↓"
 
 fun Core.getSpeedTrafficText(onlyStatisticsProxy: Boolean): String {
-    val res = getTraffic(onlyStatisticsProxy)
-    val traffic = Gson().fromJson(res, Traffic::class.java)
-    return traffic.speedText
+    try {
+        val res = getTraffic(onlyStatisticsProxy)
+        val traffic = Gson().fromJson(res, Traffic::class.java)
+        return traffic.speedText
+    } catch (e: Exception) {
+        GlobalState.log(e.message + "")
+        return ""
+    }
 }

android/service/src/main/java/com/follow/clash/service/models/VpnOptions.kt

@@ -23,6 +23,7 @@ data class VpnOptions(
     val allowBypass: Boolean,
     val systemProxy: Boolean,
     val bypassDomain: List<String>,
+    val stack: String,
     val routeAddress: List<String>,
 ) : Parcelable
 

android/service/src/main/java/com/follow/clash/service/modules/NetworkObserveModule.kt

@@ -28,6 +28,7 @@ class NetworkObserveModule(private val service: Service) : Module() {
     private val connectivity by lazy {
         service.getSystemService<ConnectivityManager>()
     }
+    private var preDnsList = listOf<String>()
 
     private val request = NetworkRequest.Builder().apply {
         addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
@@ -61,6 +62,7 @@ class NetworkObserveModule(private val service: Service) : Module() {
 
         override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) {
             networkInfos[network]?.dnsList = linkProperties.dnsServers
+            onUpdateNetwork()
             setUnderlyingNetworks(network)
             super.onLinkPropertiesChanged(network, linkProperties)
         }
@@ -96,7 +98,11 @@ class NetworkObserveModule(private val service: Service) : Module() {
     fun onUpdateNetwork() {
         val dnsList = (networkInfos.asSequence().minByOrNull { networkToInt(it) }?.value?.dnsList
             ?: emptyList()).map { x -> x.asSocketAddressText(53) }
-        Core.updateDNS(dnsList.joinToString { "," })
+        if (dnsList == preDnsList) {
+            return
+        }
+        preDnsList = dnsList
+        Core.updateDNS(dnsList.toSet().joinToString(","))
     }
 
     fun setUnderlyingNetworks(network: Network) {

android/service/src/main/java/com/follow/clash/service/modules/NotificationModule.kt

@@ -25,19 +25,28 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.zip
 import kotlinx.coroutines.launch
 
+data class ExtendedNotificationParams(
+    val title: String,
+    val stopText: String,
+    val onlyStatisticsProxy: Boolean,
+    val contentText: String,
+)
+
+val NotificationParams.extended: ExtendedNotificationParams
+    get() = ExtendedNotificationParams(
+        title, stopText, onlyStatisticsProxy, Core.getSpeedTrafficText(onlyStatisticsProxy)
+    )
+
 class NotificationModule(private val service: Service) : Module() {
     private val scope = CoroutineScope(Dispatchers.Default)
 
     override fun onInstall() {
-        State.notificationParamsFlow.value?.let {
-            update(it)
-        }
         scope.launch {
             val screenFlow = service.receiveBroadcastFlow {
                 addAction(Intent.ACTION_SCREEN_ON)
@@ -48,14 +57,21 @@ class NotificationModule(private val service: Service) : Module() {
                 emit(isScreenOn())
             }
 
-            tickerFlow(1000, 0)
-                .combine(State.notificationParamsFlow.zip(screenFlow) { params, screenOn ->
-                    params to screenOn
-                }) { _, (params, screenOn) -> params to screenOn }
-                .filter { (params, screenOn) -> params != null && screenOn }
+            combine(
+                tickerFlow(1000, 0), State.notificationParamsFlow, screenFlow
+            ) { _, params, screenOn ->
+                params?.extended to screenOn
+            }.filter { (params, screenOn) -> params != null && screenOn }
+                .distinctUntilChanged { old, new -> old.first == new.first && old.second == new.second }
                 .collect { (params, _) ->
                     update(params!!)
                 }
+
+            State.notificationParamsFlow.value?.let {
+                update(it.extended)
+            } ?: run {
+                update(NotificationParams().extended)
+            }
         }
     }
 
@@ -77,28 +93,25 @@ class NotificationModule(private val service: Service) : Module() {
             setSmallIcon(R.drawable.ic)
             setContentTitle("FlClash")
             setContentIntent(intent.toPendingIntent)
+            setPriority(NotificationCompat.PRIORITY_HIGH)
             setCategory(NotificationCompat.CATEGORY_SERVICE)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             }
             setOngoing(true)
-            setShowWhen(false)
+            setShowWhen(true)
             setOnlyAlertOnce(true)
         }
     }
 
-    private fun update(params: NotificationParams) {
-        val contentText = Core.getSpeedTrafficText(params.onlyStatisticsProxy)
+    private fun update(params: ExtendedNotificationParams) {
         service.startForeground(
             with(notificationBuilder) {
                 setContentTitle(params.title)
-                setContentText(contentText)
-                setPriority(NotificationCompat.PRIORITY_HIGH)
+                setContentText(params.contentText)
                 clearActions()
                 addAction(
-                    0,
-                    params.stopText,
-                    QuickAction.STOP.quickIntent.toPendingIntent
+                    0, params.stopText, QuickAction.STOP.quickIntent.toPendingIntent
                 ).build()
             })
     }

android/service/src/main/res/drawable/ic_service.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="240dp"
+    android:height="240dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240"
+    tools:ignore="VectorRaster">
+  <path
+      android:pathData="M48.1,80.89L168.44,11.41c11.08,-6.4 25.24,-2.6 31.64,8.48 0,0 0,0 0,0h0c6.4,11.08 2.6,25.24 -8.48,31.64 0,0 0,0 0,0l-120.34,69.48c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64 0,0 0,0 0,0Z"
+      android:fillColor="#6666FB"/>
+  <path
+      android:pathData="M78.98,134.37l60.18,-34.74c11.07,-6.39 25.23,-2.59 31.63,8.48h0c6.4,11.07 2.61,25.24 -8.47,31.64l-60.18,34.74c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64h0Z"
+      android:fillColor="#336AB6"/>
+  <path
+      android:pathData="M109.86,187.86h0c11.08,-6.4 25.24,-2.6 31.64,8.48 0,0 0,0 0,0h0c6.4,11.08 2.6,25.24 -8.48,31.64 0,0 0,0 0,0h0c-11.08,6.4 -25.24,2.6 -31.64,-8.48 0,0 0,0 0,0h0c-6.4,-11.08 -2.6,-25.24 8.48,-31.64 0,0 0,0 0,0Z"
+      android:fillColor="#5CA8E9"/>
+</vector>

android/settings.gradle.kts

@@ -18,8 +18,10 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.12.1" apply false
+    id("com.android.application") version "8.12.2" apply false
     id("org.jetbrains.kotlin.android") version "2.2.10" apply false
+    id("com.google.gms.google-services") version ("4.3.15") apply false
+    id("com.google.firebase.crashlytics") version ("2.8.1") apply false
 }
 
 

arb/intl_en.arb

@@ -340,6 +340,8 @@
   "none": "none",
   "basicConfig": "Basic configuration",
   "basicConfigDesc": "Modify the basic configuration globally",
+  "advancedConfig": "Advanced configuration",
+  "advancedConfigDesc": "Provide diverse configuration options",
   "selectedCountTitle": "{count} items have been selected",
   "addRule": "Add rule",
   "ruleName": "Rule name",
@@ -390,7 +392,7 @@
   "existsTip": "Current {label} already exists",
   "deleteTip": "Are you sure you want to delete the current {label}?",
   "deleteMultipTip": "Are you sure you want to delete the selected {label}?",
-  "nullTip": "No {label} at the moment",
+  "nullTip": "No {label} yet",
   "script": "Script",
   "color": "Color",
   "rename": "Rename",
@@ -409,7 +411,7 @@
   "autoSetSystemDns": "Auto set system DNS",
   "details": "{label} details",
   "creationTime": "Creation time",
-  "progress": "Progress",
+  "process": "Process",
   "host": "Host",
   "destination": "Destination",
   "destinationGeoIP": "Destination GeoIP",
@@ -428,5 +430,38 @@
   "restartCoreTip": "Are you sure you want to restart the core?",
   "forceRestartCoreTip": "Are you sure you want to force restart the core?",
   "dnsHijacking": "DNS hijacking",
-  "coreStatus": "Core status"
+  "coreStatus": "Core status",
+  "dataCollectionTip": "Data Collection Notice",
+  "dataCollectionContent": "This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.",
+  "crashlytics": "Crash Analysis",
+  "crashlyticsTip": "When enabled, automatically uploads crash logs without sensitive information when the app crashes",
+  "appendSystemDns": "Append System DNS",
+  "appendSystemDnsTip": "Forcefully append system DNS to the configuration",
+  "editRule": "Edit rule",
+  "overrideMode": "Override mode",
+  "standardModeDesc": "Standard mode, override basic configuration, provide simple rule addition capability",
+  "scriptModeDesc": "Script mode, use external extension scripts, provide one-click override configuration capability",
+  "addedRules": "Added rules",
+  "controlGlobalAddedRules": "Control global added rules",
+  "overrideScript": "Override script",
+  "goToConfigureScript": "Go to configure script",
+  "editGlobalRules": "Edit global rules",
+  "externalFetch": "External fetch",
+  "confirmForceCrashCore": "Are you sure you want to force crash the core?",
+  "confirmClearAllData": "Are you sure you want to clear all data?",
+  "loadTest": "Load test",
+  "yearsAgo": "{count, plural, =1{1 year ago} other{{count} years ago}}",
+  "monthsAgo": "{count, plural, =1{1 month ago} other{{count} months ago}}",
+  "daysAgo": "{count, plural, =1{1 day ago} other{{count} days ago}}",
+  "hoursAgo": "{count, plural, =1{1 hour ago} other{{count} hours ago}}",
+  "minutesAgo": "{count, plural, =1{1 minute ago} other{{count} minutes ago}}",
+  "justNow": "Just now",
+  "noLongerRemind": "Don't remind again",
+  "accessControlSettings": "Access Control Settings",
+  "turnOn": "Turn On",
+  "turnOff": "Turn Off",
+  "coreConfigChangeDetected": "Core configuration change detected",
+  "reload": "Reload",
+  "vpnConfigChangeDetected": "VPN configuration change detected",
+  "restart": "Restart"
 }

arb/intl_ja.arb

@@ -340,6 +340,8 @@
   "none": "なし",
   "basicConfig": "基本設定",
   "basicConfigDesc": "基本設定をグローバルに変更",
+  "advancedConfig": "高度な設定",
+  "advancedConfigDesc": "多様な設定を提供",
   "selectedCountTitle": "{count} 項目が選択されています",
   "addRule": "ルールを追加",
   "ruleName": "ルール名",
@@ -391,7 +393,7 @@
   "existsTip": "現在の{label}は既に存在しています",
   "deleteTip": "現在の{label}を削除してもよろしいですか？",
   "deleteMultipTip": "選択された{label}を削除してもよろしいですか？",
-  "nullTip": "現在{label}はありません",
+  "nullTip": "まだ{label}はありません",
   "script": "スクリプト",
   "color": "カラー",
   "rename": "リネーム",
@@ -410,7 +412,7 @@
   "autoSetSystemDns": "オートセットシステムDNS",
   "details": "{label}詳細",
   "creationTime": "作成時間",
-  "progress": "進捗",
+  "process": "プロセス",
   "host": "ホスト",
   "destination": "宛先",
   "destinationGeoIP": "宛先地理情報",
@@ -429,5 +431,38 @@
   "restartCoreTip": "コアを再起動してもよろしいですか？",
   "forceRestartCoreTip": "コアを強制再起動してもよろしいですか？",
   "dnsHijacking": "DNSハイジャッキング",
-  "coreStatus": "コアステータス"
+  "coreStatus": "コアステータス",
+  "dataCollectionTip": "データ収集説明",
+  "dataCollectionContent": "本アプリはFirebase Crashlyticsを使用してクラッシュ情報を収集し、アプリの安定性を向上させます。\n収集されるデータにはデバイス情報とクラッシュ詳細が含まれますが、個人の機密データは含まれません。\n設定でこの機能を無効にすることができます。",
+  "crashlytics": "クラッシュ分析",
+  "crashlyticsTip": "有効にすると、アプリがクラッシュした際に機密情報を含まないクラッシュログを自動的にアップロードします",
+  "appendSystemDns": "システムDNSを追加",
+  "appendSystemDnsTip": "設定にシステムDNSを強制的に追加します",
+  "editRule": "ルールを編集",
+  "overrideMode": "上書きモード",
+  "standardModeDesc": "標準モード、基本設定を上書きし、シンプルなルール追加機能を提供",
+  "scriptModeDesc": "スクリプトモード、外部拡張スクリプトを使用し、ワンクリックで設定を上書きする機能を提供",
+  "addedRules": "追加ルール",
+  "controlGlobalAddedRules": "グローバル追加ルールを制御",
+  "overrideScript": "上書きスクリプト",
+  "goToConfigureScript": "スクリプト設定に移動",
+  "editGlobalRules": "グローバルルールを編集",
+  "externalFetch": "外部取得",
+  "confirmForceCrashCore": "コアを強制的にクラッシュさせてもよろしいですか？",
+  "confirmClearAllData": "すべてのデータをクリアしてもよろしいですか？",
+  "loadTest": "読み込みテスト",
+  "yearsAgo": "{count}年前",
+  "monthsAgo": "{count}ヶ月前",
+  "daysAgo": "{count}日前",
+  "hoursAgo": "{count}時間前",
+  "minutesAgo": "{count}分前",
+  "justNow": "たった今",
+  "noLongerRemind": "今後表示しない",
+  "accessControlSettings": "アクセス制御設定",
+  "turnOn": "オン",
+  "turnOff": "オフ",
+  "coreConfigChangeDetected": "コア設定の変更が検出されました",
+  "reload": "リロード",
+  "vpnConfigChangeDetected": "VPN設定の変更が検出されました",
+  "restart": "再起動"
 }

arb/intl_ru.arb

@@ -340,6 +340,8 @@
   "none": "Нет",
   "basicConfig": "Базовая конфигурация",
   "basicConfigDesc": "Глобальное изменение базовых настроек",
+  "advancedConfig": "Расширенная конфигурация",
+  "advancedConfigDesc": "Предоставляет разнообразные варианты конфигурации",
   "selectedCountTitle": "Выбрано {count} элементов",
   "addRule": "Добавить правило",
   "ruleName": "Название правила",
@@ -391,7 +393,7 @@
   "existsTip": "Текущий {label} уже существует",
   "deleteTip": "Вы уверены, что хотите удалить текущий {label}?",
   "deleteMultipTip": "Вы уверены, что хотите удалить выбранные {label}?",
-  "nullTip": "Сейчас {label} нет",
+  "nullTip": "{label} пока отсутствуют",
   "script": "Скрипт",
   "color": "Цвет",
   "rename": "Переименовать",
@@ -410,7 +412,7 @@
   "autoSetSystemDns": "Автоматическая настройка системного DNS",
   "details": "Детали {}",
   "creationTime": "Время создания",
-  "progress": "Прогресс",
+  "process": "процесс",
   "host": "Хост",
   "destination": "Назначение",
   "destinationGeoIP": "Геолокация назначения",
@@ -429,5 +431,38 @@
   "restartCoreTip": "Вы уверены, что хотите перезапустить ядро?",
   "forceRestartCoreTip": "Вы уверены, что хотите принудительно перезапустить ядро?",
   "dnsHijacking": "DNS-перехват",
-  "coreStatus": "Основной статус"
+  "coreStatus": "Основной статус",
+  "dataCollectionTip": "Уведомление о сборе данных",
+  "dataCollectionContent": "Это приложение использует Firebase Crashlytics для сбора информации о сбоях nhằm улучшения стабильности приложения.\nСобираемые данные включают информацию об устройстве и подробности о сбоях, но не содержат персональных конфиденциальных данных.\nВы можете отключить эту функцию в настройках.",
+  "crashlytics": "Анализ сбоев",
+  "crashlyticsTip": "При включении автоматически загружает журналы сбоев без конфиденциальной информации, когда приложение выходит из строя",
+  "appendSystemDns": "Добавить системный DNS",
+  "appendSystemDnsTip": "Принудительно добавить системный DNS к конфигурации",
+  "editRule": "Редактировать правило",
+  "overrideMode": "Режим переопределения",
+  "standardModeDesc": "Стандартный режим, переопределение базовой конфигурации, предоставление возможности простого добавления правил",
+  "scriptModeDesc": "Режим скрипта, использование внешних расширяющих скриптов, предоставление возможности переопределения конфигурации одним кликом",
+  "addedRules": "Добавленные правила",
+  "controlGlobalAddedRules": "Управление глобальными добавленными правилами",
+  "overrideScript": "Скрипт переопределения",
+  "goToConfigureScript": "Перейти к настройке скрипта",
+  "editGlobalRules": "Редактировать глобальные правила",
+  "externalFetch": "Внешнее получение",
+  "confirmForceCrashCore": "Вы уверены, что хотите принудительно аварийно завершить работу ядра?",
+  "confirmClearAllData": "Вы уверены, что хотите очистить все данные?",
+  "loadTest": "Тест загрузки",
+  "yearsAgo": "{count, plural, one{{count} год назад} few{{count} года назад} many{{count} лет назад} other{{count} года назад}}",
+  "monthsAgo": "{count, plural, one{{count} месяц назад} few{{count} месяца назад} many{{count} месяцев назад} other{{count} месяца назад}}",
+  "daysAgo": "{count, plural, one{{count} день назад} few{{count} дня назад} many{{count} дней назад} other{{count} дня назад}}",
+  "hoursAgo": "{count, plural, one{{count} час назад} few{{count} часа назад} many{{count} часов назад} other{{count} часа назад}}",
+  "minutesAgo": "{count, plural, one{{count} минута назад} few{{count} минуты назад} many{{count} минут назад} other{{count} минуты назад}}",
+  "justNow": "Только что",
+  "noLongerRemind": "Больше не напоминать",
+  "accessControlSettings": "Настройки контроля доступа",
+  "turnOn": "Включить",
+  "turnOff": "Выключить",
+  "coreConfigChangeDetected": "Обнаружено изменение конфигурации ядра",
+  "reload": "Перезагрузить",
+  "vpnConfigChangeDetected": "Обнаружено изменение конфигурации VPN",
+  "restart": "Перезапустить"
 }

arb/intl_zh_CN.arb

@@ -340,6 +340,8 @@
   "none": "无",
   "basicConfig": "基本配置",
   "basicConfigDesc": "全局修改基本配置",
+  "advancedConfig": "进阶配置",
+  "advancedConfigDesc": "提供多样化配置",
   "selectedCountTitle": "已选择 {count} 项",
   "addRule": "添加规则",
   "ruleName": "规则名称",
@@ -410,7 +412,7 @@
   "autoSetSystemDns": "自动设置系统DNS",
   "details": "{label}详情",
   "creationTime": "创建时间",
-  "progress": "进度",
+  "process": "进程",
   "host": "主机",
   "destination": "目标地址",
   "destinationGeoIP": "目标地理定位",
@@ -429,5 +431,38 @@
   "restartCoreTip": "您确定要重启核心吗？",
   "forceRestartCoreTip": "您确定要强制重启核心吗？",
   "dnsHijacking": "DNS劫持",
-  "coreStatus": "核心状态"
+  "coreStatus": "核心状态",
+  "dataCollectionTip": "数据收集说明",
+  "dataCollectionContent": "本应用使用 Firebase Crashlytics 收集崩溃信息以改进应用稳定性。\n收集的数据包括设备信息和崩溃详情，不包含个人敏感数据。\n您可以在设置中关闭此功能。",
+  "crashlytics": "崩溃分析",
+  "crashlyticsTip": "开启后，应用崩溃时自动上传不包含敏感信息的崩溃日志",
+  "appendSystemDns": "追加系统DNS",
+  "appendSystemDnsTip": "强制为配置附加系统DNS",
+  "editRule": "编辑规则",
+  "overrideMode": "覆写模式",
+  "standardModeDesc": "标准模式，覆写基本配置，提供简单追加规则能力",
+  "scriptModeDesc": "脚本模式，使用外部扩展脚本，提供一键覆写配置的能力",
+  "addedRules": "附加规则",
+  "controlGlobalAddedRules": "控制全局附加规则",
+  "overrideScript": "覆写脚本",
+  "goToConfigureScript": "前往配置脚本",
+  "editGlobalRules": "编辑全局规则",
+  "externalFetch": "外部获取",
+  "confirmForceCrashCore": "确定要强制崩溃核心？",
+  "confirmClearAllData": "确定要清除所有数据？",
+  "loadTest": "加载测试",
+  "yearsAgo": "{count} 年前",
+  "monthsAgo": "{count} 个月前",
+  "daysAgo": "{count} 天前",
+  "hoursAgo": "{count} 小时前",
+  "minutesAgo": "{count} 分钟前",
+  "justNow": "刚刚",
+  "noLongerRemind": "不再提示",
+  "accessControlSettings": "访问控制设置",
+  "turnOn": "开启",
+  "turnOff": "关闭",
+  "coreConfigChangeDetected": "检测到核心配置更改",
+  "reload": "重载",
+  "vpnConfigChangeDetected": "检测到VPN相关配置改动",
+  "restart": "重启"
 }

assets/images/empty/connection.svg

@@ -0,0 +1,23 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+
+    <rect x="95" y="90" width="36" height="12" rx="4" fill="#E8DEF8"/>
+    <rect x="140" y="90" width="65" height="12" rx="6" fill="#E8DEF8"/>
+
+    <path d="M95 118H205" stroke="#E8DEF8" stroke-width="2" stroke-dasharray="4 4"/>
+
+    <rect x="95" y="138" width="40" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
+    <rect x="145" y="138" width="50" height="12" rx="6" fill="#E8DEF8" opacity="0.5"/>
+
+    <rect x="95" y="162" width="55" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
+    <rect x="160" y="162" width="30" height="12" rx="6" fill="#E8DEF8" opacity="0.5"/>
+
+    <g transform="translate(210, 210)">
+        <circle cx="0" cy="0" r="38" fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
+
+        <path d="M-10 16V-16M-10 -16L-18 -8M-10 -16L-2 -8" stroke="#FDF7FF" stroke-width="5" stroke-linecap="round"
+              stroke-linejoin="round"/>
+        <path d="M10 -16V16M10 16L2 8M10 16L18 8" stroke="#FDF7FF" stroke-width="5" stroke-linecap="round"
+              stroke-linejoin="round"/>
+    </g>
+</svg>

assets/images/empty/data.svg

@@ -0,0 +1,9 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+    <rect x="100" y="90" width="100" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="100" y="115" width="70" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="100" y="140" width="80" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="155" y="170" width="80" height="60" rx="12" fill="#6750A4"/>
+    <rect x="150" y="165" width="90" height="18" rx="6" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
+    <rect x="185" y="200" width="20" height="6" rx="3" fill="#FDF7FF" opacity="0.8"/>
+</svg>

assets/images/empty/log.svg

@@ -0,0 +1,25 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M90 200C90 180 100 165 150 165C200 165 210 180 210 200V220C210 231.046 201.046 240 190 240H110C98.9543 240 90 231.046 90 220V200Z"
+          fill="#E8DEF8"/>
+
+    <rect x="75" y="85" width="150" height="100" rx="30" fill="#6750A4"/>
+
+    <rect x="85" y="95" width="130" height="80" rx="22" fill="#6750A4" stroke="#7D66B5" stroke-width="2"/>
+
+    <path d="M110 135 C110 142 118 148 128 148 C138 148 146 142 146 135" stroke="#FDF7FF" stroke-width="4"
+          stroke-linecap="round"/>
+    <path d="M154 135 C154 142 162 148 172 148 C182 148 190 142 190 135" stroke="#FDF7FF" stroke-width="4"
+          stroke-linecap="round"/>
+    <circle cx="150" cy="160" r="4" fill="#E8DEF8" opacity="0.5"/>
+
+    <path d="M150 85 V 65" stroke="#6750A4" stroke-width="4" stroke-linecap="round"/>
+    <circle cx="150" cy="60" r="8" fill="#6750A4"/>
+    <circle cx="150" cy="60" r="3" fill="#FDF7FF"/>
+
+    <path d="M220 70 L235 70 L220 85 H235" stroke="#6750A4" stroke-width="3" stroke-linecap="round"
+          stroke-linejoin="round"/>
+    <path d="M245 40 L255 40 L245 50 H255" stroke="#E8DEF8" stroke-width="2" stroke-linecap="round"
+          stroke-linejoin="round"/>
+
+    <path d="M90 185 H210" stroke="#000" stroke-width="4" stroke-opacity="0.1" stroke-linecap="round"/>
+</svg>

assets/images/empty/profile.svg

@@ -0,0 +1,37 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+    <path d="M60 94V84C60 72.9543 68.9543 64 80 64H130C141.046 64 150 72.9543 150 84V94H220C231.046 94 240 102.954 240 114V210C240 221.046 231.046 230 220 230H80C68.9543 230 60 221.046 60 210V94Z"
+          fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+
+
+    <rect x="90" y="124" width="60" height="12" rx="6" fill="#E8DEF8"/>
+
+
+    <rect x="90" y="154" width="50" height="12" rx="6" fill="#E8DEF8"/>
+
+    <rect x="90" y="184" width="40" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="180" y="184" width="30" height="12" rx="6" fill="#E8DEF8" opacity="0.6"/>
+    <circle cx="186" cy="190" r="6" fill="#E8DEF8"/>
+
+    <g transform="translate(210, 210)">
+        <path fill-rule="evenodd" clip-rule="evenodd"
+              d="M0 -32 C-17.67 -32 -32 -17.67 -32 0 C-32 17.67 -17.67 32 0 32 C17.67 32 32 17.67 32 0 C32 -17.67 17.67 -32 0 -32ZM0 -8 C-4.42 -8 -8 -4.42 -8 0 C-8 4.42 -4.42 8 0 8 C4.42 8 8 4.42 8 0 C8 -4.42 4.42 -8 0 -8Z"
+              fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
+
+        <rect x="-5" y="-38" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
+        <rect x="-5" y="26" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
+        <rect x="-38" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
+        <rect x="26" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
+        <rect x="-5" y="-38" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
+              transform="rotate(45)"/>
+        <rect x="-5" y="26" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
+              transform="rotate(45)"/>
+        <rect x="-38" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
+              transform="rotate(45)"/>
+        <rect x="26" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
+              transform="rotate(45)"/>
+
+        <circle cx="0" cy="0" r="22" fill="#6750A4"/>
+        <circle cx="0" cy="0" r="8" fill="#FDF7FF" opacity="0.8"/>
+    </g>
+</svg>

assets/images/empty/proxy.svg

@@ -0,0 +1,18 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+    <rect x="95" y="90" width="110" height="16" rx="4" fill="#E8DEF8"/>
+    <circle cx="105" cy="98" r="3" fill="#FDF7FF"/>
+    <circle cx="115" cy="98" r="3" fill="#FDF7FF"/>
+    <rect x="95" y="120" width="110" height="16" rx="4" fill="#E8DEF8"/>
+    <circle cx="105" cy="128" r="3" fill="#FDF7FF"/>
+    <circle cx="115" cy="128" r="3" fill="#FDF7FF"/>
+    <rect x="95" y="150" width="80" height="16" rx="4" fill="#E8DEF8"/>
+    <circle cx="105" cy="158" r="3" fill="#FDF7FF"/>
+    <circle cx="115" cy="158" r="3" fill="#FDF7FF"/>
+    <circle cx="195" cy="195" r="30" fill="#6750A4"/>
+    <rect x="180" y="193" width="30" height="4" rx="2" fill="#FDF7FF" transform="rotate(45 195 195)"/>
+    <circle cx="183" cy="183" r="4" fill="#FDF7FF"/>
+    <circle cx="207" cy="207" r="4" fill="#FDF7FF"/>
+    <path d="M175 158 H190 V165" stroke="#E8DEF8" stroke-width="2" stroke-linecap="round"/>
+    
+</svg>

assets/images/empty/rule.svg

@@ -0,0 +1,31 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+
+    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+
+
+    <rect x="95" y="90" width="80" height="12" rx="6" fill="#E8DEF8"/>
+
+    <rect x="185" y="90" width="25" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
+
+
+    <rect x="95" y="125" width="60" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="165" y="125" width="45" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
+
+
+    <rect x="95" y="160" width="70" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="175" y="160" width="35" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
+
+
+    <g transform="translate(210, 210)">
+        <circle cx="0" cy="0" r="36" fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
+
+        <circle cx="0" cy="0" r="24" stroke="#FDF7FF" stroke-width="3"/>
+
+        <path d="M-24 0C-24 0 -12 8 0 8C12 8 24 0 24 0" stroke="#FDF7FF" stroke-width="3" stroke-linecap="round"
+              stroke-linejoin="round"/>
+
+        <ellipse cx="0" cy="0" rx="10" ry="24" stroke="#FDF7FF" stroke-width="3"/>
+        
+        <circle cx="14" cy="-12" r="3" fill="#FDF7FF"/>
+    </g>
+</svg>

assets/images/empty/script.svg

@@ -0,0 +1,19 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
+
+    <rect x="100" y="90" width="30" height="12" rx="6" fill="#E8DEF8"/>
+    <rect x="136" y="90" width="50" height="12" rx="6" fill="#E8DEF8"/>
+
+    <rect x="120" y="120" width="80" height="12" rx="6" fill="#E8DEF8"/>
+
+    <rect x="120" y="150" width="50" height="12" rx="6" fill="#E8DEF8"/>
+
+    <rect x="100" y="180" width="20" height="12" rx="6" fill="#E8DEF8"/>
+
+    <g transform="translate(165, 160)">
+        <rect x="0" y="0" width="80" height="80" rx="20" fill="#6750A4" stroke="#FDF7FF" stroke-width="4"/>
+        <path d="M28 30L18 40L28 50" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+        <path d="M52 30L62 40L52 50" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+        <path d="M46 26L34 54" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" opacity="0.8"/>
+    </g>
+</svg>

core/action.go

@@ -53,8 +53,8 @@ func handleAction(action *Action, result ActionResult) {
 		result.success(handleShutdown())
 		return
 	case validateConfigMethod:
-		data := []byte(action.Data.(string))
-		result.success(handleValidateConfig(data))
+		path := action.Data.(string)
+		result.success(handleValidateConfig(path))
 		return
 	case updateConfigMethod:
 		data := []byte(action.Data.(string))
@@ -181,6 +181,10 @@ func handleAction(action *Action, result ActionResult) {
 	case crashMethod:
 		result.success(true)
 		handleCrash()
+	case deleteFile:
+		path := action.Data.(string)
+		handleDelFile(path, result)
+		return
 	default:
 		nextHandle(action, result)
 	}

core/bride.c

@@ -2,6 +2,8 @@
 
 void (*release_object_func)(void *obj);
 
+void (*free_string_func)(char *data);
+
 void (*protect_func)(void *tun_interface, int fd);
 
 char* (*resolve_process_func)(void *tun_interface,int protocol, const char *source, const char *target, int uid);
@@ -20,6 +22,10 @@ void release_object(void *obj) {
     release_object_func(obj);
 }
 
+void free_string(char *data) {
+    free_string_func(data);
+}
+
 void result(void *invoke_Interface, const char *data) {
     return result_func(invoke_Interface, data);
 }

core/bride.go

@@ -16,7 +16,7 @@ func resolveProcess(callback unsafe.Pointer, protocol int, source, target string
 	t := C.CString(target)
 	defer C.free(unsafe.Pointer(t))
 	res := C.resolve_process(callback, C.int(protocol), s, t, C.int(uid))
-	return parseCString(res)
+	return takeCString(res)
 }
 
 func invokeResult(callback unsafe.Pointer, data string) {
@@ -29,7 +29,7 @@ func releaseObject(callback unsafe.Pointer) {
 	C.release_object(callback)
 }
 
-func parseCString(s *C.char) string {
-	//defer C.free(unsafe.Pointer(s))
+func takeCString(s *C.char) string {
+	defer C.free_string(s)
 	return C.GoString(s)
 }

core/bride.h

@@ -4,6 +4,8 @@
 
 extern void (*release_object_func)(void *obj);
 
+extern void (*free_string_func)(char *data);
+
 extern void (*protect_func)(void *tun_interface, int fd);
 
 extern char* (*resolve_process_func)(void *tun_interface, int protocol, const char *source, const char *target, int uid);
@@ -16,4 +18,6 @@ extern char* resolve_process(void *tun_interface, int protocol, const char *sour
 
 extern void release_object(void *obj);
 
+extern void free_string(char *data);
+
 extern void result(void *invoke_Interface,  const char *data);

core/common.go

@@ -17,12 +17,15 @@ import (
 	"github.com/metacubex/mihomo/constant/features"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
+	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"os"
+	"path/filepath"
+	"runtime"
 	"sync"
 )
 
@@ -114,11 +117,15 @@ func updateListeners() {
 	listeners := currentConfig.Listeners
 	general := currentConfig.General
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
-	listener.SetAllowLan(general.AllowLan)
+
+	allowLan := general.AllowLan
+	listener.SetAllowLan(allowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
-	listener.SetBindAddress(general.BindAddress)
+
+	bindAddress := general.BindAddress
+	listener.SetBindAddress(bindAddress)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
@@ -159,7 +166,6 @@ func patchSelectGroup(mapping map[string]string) {
 
 func defaultSetupParams() *SetupParams {
 	return &SetupParams{
-		Config:      config.DefaultRawConfig(),
 		TestURL:     "https://www.gstatic.com/generate_204",
 		SelectedMap: map[string]string{},
 	}
@@ -235,18 +241,37 @@ func updateConfig(params *UpdateParams) {
 	updateListeners()
 }
 
+func parseWithPath(path string) (*config.Config, error) {
+	buf, err := readFile(path)
+	if err != nil {
+		return nil, err
+	}
+	rawConfig := config.DefaultRawConfig()
+	err = UnmarshalJson(buf, rawConfig)
+	if err != nil {
+		return nil, err
+	}
+	parseRawConfig, err := config.ParseRawConfig(rawConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return parseRawConfig, nil
+}
+
 func setupConfig(params *SetupParams) error {
 	runLock.Lock()
 	defer runLock.Unlock()
 	var err error
 	constant.DefaultTestURL = params.TestURL
-	currentConfig, err = config.ParseRawConfig(params.Config)
+	currentConfig, err = executor.ParseWithPath(filepath.Join(constant.Path.HomeDir(), "config.yaml"))
 	if err != nil {
 		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
 	hub.ApplyConfig(currentConfig)
 	patchSelectGroup(params.SelectedMap)
 	updateListeners()
+	runtime.GC()
 	return err
 }
 

core/constant.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"github.com/metacubex/mihomo/adapter/provider"
 	P "github.com/metacubex/mihomo/component/process"
-	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
@@ -18,7 +17,6 @@ type InitParams struct {
 }
 
 type SetupParams struct {
-	Config      *config.RawConfig `json:"config"`
 	SelectedMap map[string]string `json:"selected-map"`
 	TestURL     string            `json:"test-url"`
 }
@@ -101,6 +99,7 @@ const (
 	crashMethod                    Method = "crash"
 	setupConfigMethod              Method = "setupConfig"
 	getConfigMethod                Method = "getConfig"
+	deleteFile                     Method = "deleteFile"
 )
 
 type Method string

core/go.mod

@@ -10,7 +10,6 @@ require (
 )
 
 require (
-	github.com/3andne/restls-client-go v0.1.6 // indirect
 	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/ajg/form v1.5.1 // indirect
@@ -19,58 +18,62 @@ require (
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/ebitengine/purego v0.8.3 // indirect
-	github.com/enfein/mieru/v3 v3.16.1 // indirect
+	github.com/ebitengine/purego v0.9.1 // indirect
+	github.com/enfein/mieru/v3 v3.22.1 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.2.2 // indirect
+	github.com/go-chi/chi/v5 v5.2.3 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.3.2 // indirect
+	github.com/gofrs/uuid/v5 v5.4.0 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
-	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/reedsolomon v1.12.3 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
-	github.com/metacubex/bart v0.20.5 // indirect
+	github.com/metacubex/amneziawg-go v0.0.0-20251104174305-5a0e9f7e361d // indirect
+	github.com/metacubex/ascon v0.1.0 // indirect
+	github.com/metacubex/bart v0.26.0 // indirect
 	github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b // indirect
+	github.com/metacubex/blake3 v0.1.0 // 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/gvisor v0.0.0-20250919004547-6122b699a301 // indirect
+	github.com/metacubex/kcp-go v0.0.0-20251105084629-8c93f4bf37be // indirect
 	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
-	github.com/metacubex/quic-go v0.53.1-0.20250628094454-fda5262d1d9c // indirect
+	github.com/metacubex/quic-go v0.55.1-0.20251024060151-bd465f127128 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing v0.5.4 // indirect
-	github.com/metacubex/sing-mux v0.3.2 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250718154553-1b193bec4cbb // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.11 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.5 // indirect
+	github.com/metacubex/restls-client-go v0.1.7 // indirect
+	github.com/metacubex/sing v0.5.6 // indirect
+	github.com/metacubex/sing-mux v0.3.4 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20251004051927-c45ee18473bb // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.12 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.7 // indirect
 	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.7-0.20250721020617-8e7c37ed3d97 // indirect
-	github.com/metacubex/sing-vmess v0.2.3 // indirect
+	github.com/metacubex/sing-tun v0.4.9 // indirect
+	github.com/metacubex/sing-vmess v0.2.4 // 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.8.0 // indirect
-	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
+	github.com/metacubex/smux v0.0.0-20250922175018-15c9a6a78719 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20251024101424-368b42b59148 // indirect
+	github.com/metacubex/utls v1.8.3 // indirect
+	github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f // indirect
+	github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
@@ -78,27 +81,21 @@ require (
 	github.com/openacid/low v0.1.21 // indirect
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/sagernet/cors v1.2.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
-	github.com/samber/lo v1.51.0 // indirect
-	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
+	github.com/samber/lo v1.52.0 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
 	github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
-	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
@@ -110,5 +107,4 @@ require (
 	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -1,5 +1,3 @@
-github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
-github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
 github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg=
 github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM=
 github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss=
@@ -24,10 +22,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc=
-github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/enfein/mieru/v3 v3.16.1 h1:CfIt1pQCCQbohkw+HBD2o8V9tnhZvB5yuXGGQIXTLOs=
-github.com/enfein/mieru/v3 v3.16.1/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
+github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
+github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/enfein/mieru/v3 v3.22.1 h1:/XGYYXpEhEJlxosmtbpEJkhtRLHB8IToG7LB8kU2ZDY=
+github.com/enfein/mieru/v3 v3.22.1/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
 github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
 github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -41,12 +39,11 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
-github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
+github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -57,20 +54,19 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
-github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0=
+github.com/gofrs/uuid/v5 v5.4.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
-github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
-github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
@@ -80,65 +76,73 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
-github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/reedsolomon v1.12.3 h1:tzUznbfc3OFwJaTebv/QdhnFf2Xvb7gZ24XaHLBPmdc=
+github.com/klauspost/reedsolomon v1.12.3/go.mod h1:3K5rXwABAvzGeR01r6pWZieUALXO/Tq7bFKGIb4m4WI=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
-github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4=
-github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI=
-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/amneziawg-go v0.0.0-20251104174305-5a0e9f7e361d h1:vAJ0ZT4aO803F1uw2roIA9yH7Sxzox34tVVyye1bz6c=
+github.com/metacubex/amneziawg-go v0.0.0-20251104174305-5a0e9f7e361d/go.mod h1:MsM/5czONyXMJ3PRr5DbQ4O/BxzAnJWOIcJdLzW6qHY=
+github.com/metacubex/ascon v0.1.0 h1:6ZWxmXYszT1XXtwkf6nxfFhc/OTtQ9R3Vyj1jN32lGM=
+github.com/metacubex/ascon v0.1.0/go.mod h1:eV5oim4cVPPdEL8/EYaTZ0iIKARH9pnhAK/fcT5Kacc=
+github.com/metacubex/bart v0.26.0 h1:d/bBTvVatfVWGfQbiDpYKI1bXUJgjaabB2KpK1Tnk6w=
+github.com/metacubex/bart v0.26.0/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b h1:j7dadXD8I2KTmMt8jg1JcaP1ANL3JEObJPdANKcSYPY=
 github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b/go.mod h1:+WmP0VJZDkDszvpa83HzfUp6QzARl/IKkMorH4+nODw=
+github.com/metacubex/blake3 v0.1.0 h1:KGnjh/56REO7U+cgZA8dnBhxdP7jByrG7hTP+bu6cqY=
+github.com/metacubex/blake3 v0.1.0/go.mod h1:CCkLdzFrqf7xmxCdhQFvJsRRV2mwOLDoSPg6vUTB9Uk=
 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=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
-github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI=
-github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
+github.com/metacubex/gvisor v0.0.0-20250919004547-6122b699a301 h1:N5GExQJqYAH3gOCshpp2u/J3CtNYzMctmlb0xK9wtbQ=
+github.com/metacubex/gvisor v0.0.0-20250919004547-6122b699a301/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
+github.com/metacubex/kcp-go v0.0.0-20251105084629-8c93f4bf37be h1:Y7SigZIqfv/+RIA/D7R6EbB9p+brPRoGOM6zobSmRIM=
+github.com/metacubex/kcp-go v0.0.0-20251105084629-8c93f4bf37be/go.mod h1:HIJZW4QMhbBqXuqC1ly6Hn0TEYT2SzRw58ns1yGhXTs=
 github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo=
 github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA=
-github.com/metacubex/quic-go v0.53.1-0.20250628094454-fda5262d1d9c h1:ABQzmOaZddM3q0OYeoZEc0XF+KW+dUdPNvY/c5rsunI=
-github.com/metacubex/quic-go v0.53.1-0.20250628094454-fda5262d1d9c/go.mod h1:eWlAK3zsKI0P8UhYpXlIsl3mtW4D6MpMNuYLIu8CKWI=
+github.com/metacubex/quic-go v0.55.1-0.20251024060151-bd465f127128 h1:I1uvJl206/HbkzEAZpLgGkZgUveOZb+P+6oTUj7dN+o=
+github.com/metacubex/quic-go v0.55.1-0.20251024060151-bd465f127128/go.mod h1:1lktQFtCD17FZliVypbrDHwbsFSsmz2xz2TRXydvB5c=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
+github.com/metacubex/restls-client-go v0.1.7 h1:eCwiXCTQb5WJu9IlgYvDBA1OgrINv58dEe7hcN5H15k=
+github.com/metacubex/restls-client-go v0.1.7/go.mod h1:BN/U52vPw7j8VTSh2vleD/MnmVKCov84mS5VcjVHH4g=
 github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing v0.5.4 h1:a4kAOZmF+OXosbzPEcrSc5QD35/ex+MNuZsrcuWskHk=
-github.com/metacubex/sing v0.5.4/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-20250718154553-1b193bec4cbb h1:U/m3h8lp/j7i8zFgfvScLdZa1/Y8dd74oO7iZaQq80s=
-github.com/metacubex/sing-quic v0.0.0-20250718154553-1b193bec4cbb/go.mod h1:B60FxaPHjR1SeQB0IiLrgwgvKsaoASfOWdiqhLjmMGA=
-github.com/metacubex/sing-shadowsocks v0.2.11 h1:p2NGNOdF95e6XvdDKipLj1FRRqR8dnbfC/7pw2CCTlw=
-github.com/metacubex/sing-shadowsocks v0.2.11/go.mod h1:bT1PCTV316zFnlToRMk5zt9HmIQYRBveiT71mplYPfc=
-github.com/metacubex/sing-shadowsocks2 v0.2.5 h1:MnPn0hbcDkSJt6TlpI15XImHKK6IqaOwBUGPKyMnJnE=
-github.com/metacubex/sing-shadowsocks2 v0.2.5/go.mod h1:Zyh+rAQRyevYfG/COCvDs1c/YMhGqCuknn7QrGmoQIw=
+github.com/metacubex/sing v0.5.6 h1:mEPDCadsCj3DB8gn+t/EtposlYuALEkExa/LUguw6/c=
+github.com/metacubex/sing v0.5.6/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing-mux v0.3.4 h1:tf4r27CIkzaxq9kBlAXQkgMXq2HPp5Mta60Kb4RCZF0=
+github.com/metacubex/sing-mux v0.3.4/go.mod h1:SEJfAuykNj/ozbPqngEYqyggwSr81+L7Nu09NRD5mh4=
+github.com/metacubex/sing-quic v0.0.0-20251004051927-c45ee18473bb h1:gxrJmnxuEAel+kh3V7ntqkHjURif0xKDu76nzr/BF5Y=
+github.com/metacubex/sing-quic v0.0.0-20251004051927-c45ee18473bb/go.mod h1:JK4+PYUKps6pnlicKjsSUAjAcvIUjhorIjdNZGg930M=
+github.com/metacubex/sing-shadowsocks v0.2.12 h1:Wqzo8bYXrK5aWqxu/TjlTnYZzAKtKsaFQBdr6IHFaBE=
+github.com/metacubex/sing-shadowsocks v0.2.12/go.mod h1:2e5EIaw0rxKrm1YTRmiMnDulwbGxH9hAFlrwQLQMQkU=
+github.com/metacubex/sing-shadowsocks2 v0.2.7 h1:hSuuc0YpsfiqYqt1o+fP4m34BQz4e6wVj3PPBVhor3A=
+github.com/metacubex/sing-shadowsocks2 v0.2.7/go.mod h1:vOEbfKC60txi0ca+yUlqEwOGc3Obl6cnSgx9Gf45KjE=
 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.7-0.20250721020617-8e7c37ed3d97 h1:YYpc60UZE2G0pUeHbRw9erDrUDZrPQy8QzWFqA3kHsk=
-github.com/metacubex/sing-tun v0.4.7-0.20250721020617-8e7c37ed3d97/go.mod h1:2YywXPWW8Z97kTH7RffOeykKzU+l0aiKlglWV1PAS64=
-github.com/metacubex/sing-vmess v0.2.3 h1:QKLdIk5A2FcR3Y7m2/JO1XhfzgDA8tF4W9/ffsH9opo=
-github.com/metacubex/sing-vmess v0.2.3/go.mod h1:21R5R1u90uUvBQF0owoooEu96/SAYYD56nDrwm6nFaM=
+github.com/metacubex/sing-tun v0.4.9 h1:jY0Yyt8nnN3yQRN/jTxgqNCmGi1dsFdxdIi7pQUlVVU=
+github.com/metacubex/sing-tun v0.4.9/go.mod h1:L/TjQY5JEGy8nvsuYmy/XgMFMCPiF0+AWSFCYfS6r9w=
+github.com/metacubex/sing-vmess v0.2.4 h1:Tx6AGgCiEf400E/xyDuYyafsel6sGbR8oF7RkAaus6I=
+github.com/metacubex/sing-vmess v0.2.4/go.mod h1:21R5R1u90uUvBQF0owoooEu96/SAYYD56nDrwm6nFaM=
 github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
 github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80=
-github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo=
-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.8.0 h1:mSYi6FMnmc5riARl5UZDmWVy710z+P5b7xuGW0lV9ac=
-github.com/metacubex/utls v1.8.0/go.mod h1:FdjYzVfCtgtna19hX0ER1Xsa5uJInwdQ4IcaaI98lEQ=
-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/metacubex/smux v0.0.0-20250922175018-15c9a6a78719 h1:T6qCCfolRDAVJKeaPW/mXwNLjnlo65AYN7WS2jrBNaM=
+github.com/metacubex/smux v0.0.0-20250922175018-15c9a6a78719/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
+github.com/metacubex/tfo-go v0.0.0-20251024101424-368b42b59148 h1:Zd0QqciLIhv9MKbGKTPEgN8WUFsgQGA1WJBy6spEnVU=
+github.com/metacubex/tfo-go v0.0.0-20251024101424-368b42b59148/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.8.3 h1:0m/yCxm3SK6kWve2lKiFb1pue1wHitJ8sQQD4Ikqde4=
+github.com/metacubex/utls v1.8.3/go.mod h1:kncGGVhFaoGn5M3pFe3SXhZCzsbCJayNOH4UEqTKTko=
+github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f h1:FGBPRb1zUabhPhDrlKEjQ9lgIwQ6cHL4x8M9lrERhbk=
+github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f/go.mod h1:oPGcV994OGJedmmxrcK9+ni7jUEMGhR+uVQAdaduIP4=
+github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 h1:lhlqpYHopuTLx9xQt22kSA9HtnyTDmk5XjjQVCGHe2E=
+github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49/go.mod h1:MBeEa9IVBphH7vc3LNtW6ZujVXFizotPo3OEiHQ+TNU=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
 github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
@@ -160,18 +164,14 @@ github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
 github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
-github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI=
-github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
-github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
-github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
+github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
+github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
 github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
@@ -191,11 +191,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
@@ -209,14 +205,12 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
-github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -240,16 +234,13 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -263,7 +254,6 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
@@ -271,5 +261,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

core/hub.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	"github.com/metacubex/mihomo/common/observable"
@@ -13,6 +12,7 @@ import (
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/features"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/listener"
@@ -20,7 +20,9 @@ import (
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 	"net"
+	"os"
 	"runtime"
+	"runtime/debug"
 	"sort"
 	"strconv"
 	"time"
@@ -33,6 +35,8 @@ var (
 )
 
 func handleInitClash(paramsString string) bool {
+	runLock.Lock()
+	defer runLock.Unlock()
 	var params = InitParams{}
 	err := json.Unmarshal([]byte(paramsString), &params)
 	if err != nil {
@@ -60,6 +64,7 @@ func handleStopListener() bool {
 	defer runLock.Unlock()
 	isRunning = false
 	listener.StopListener()
+	resolver.ResetConnection()
 	return true
 }
 
@@ -68,22 +73,24 @@ func handleGetIsInit() bool {
 }
 
 func handleForceGC() {
-	go func() {
-		log.Infoln("[APP] request force GC")
-		runtime.GC()
-	}()
+	log.Infoln("[APP] request force GC")
+	runtime.GC()
+	if features.Android {
+		debug.FreeOSMemory()
+	}
 }
 
 func handleShutdown() bool {
 	stopListeners()
 	executor.Shutdown()
-	runtime.GC()
+	handleForceGC()
 	isInit = false
 	return true
 }
 
-func handleValidateConfig(bytes []byte) string {
-	_, err := config.UnmarshalRawConfig(bytes)
+func handleValidateConfig(path string) string {
+	buf, err := readFile(path)
+	_, err = config.UnmarshalRawConfig(buf)
 	if err != nil {
 		return err.Error()
 	}
@@ -143,7 +150,7 @@ func handleGetTraffic(onlyStatisticsProxy bool) string {
 	}
 	data, err := json.Marshal(traffic)
 	if err != nil {
-		fmt.Println("Error:", err)
+		log.Errorln("Error: %s", err)
 		return ""
 	}
 	return string(data)
@@ -157,7 +164,7 @@ func handleGetTotalTraffic(onlyStatisticsProxy bool) string {
 	}
 	data, err := json.Marshal(traffic)
 	if err != nil {
-		fmt.Println("Error:", err)
+		log.Errorln("Error: %s", err)
 		return ""
 	}
 	return string(data)
@@ -227,7 +234,7 @@ func handleGetConnections() string {
 	snapshot := statistic.DefaultManager.Snapshot()
 	data, err := json.Marshal(snapshot)
 	if err != nil {
-		fmt.Println("Error:", err)
+		log.Errorln("Error: %s", err)
 		return ""
 	}
 	return string(data)
@@ -322,13 +329,13 @@ func handleUpdateGeoData(geoType string, geoName string, fn func(value string))
 				fn(err.Error())
 				return
 			}
-		case "GeoIp":
+		case "GEOIP":
 			err := updater.UpdateGeoIpWithPath(path)
 			if err != nil {
 				fn(err.Error())
 				return
 			}
-		case "GeoSite":
+		case "GEOSITE":
 			err := updater.UpdateGeoSiteWithPath(path)
 			if err != nil {
 				fn(err.Error())
@@ -454,6 +461,33 @@ func handleUpdateConfig(bytes []byte) string {
 	return ""
 }
 
+func handleDelFile(path string, result ActionResult) {
+	go func() {
+		fileInfo, err := os.Stat(path)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				result.success(err.Error())
+			}
+			result.success("")
+			return
+		}
+		if fileInfo.IsDir() {
+			err = os.RemoveAll(path)
+			if err != nil {
+				result.success(err.Error())
+				return
+			}
+		} else {
+			err = os.Remove(path)
+			if err != nil {
+				result.success(err.Error())
+				return
+			}
+		}
+		result.success("")
+	}()
+}
+
 func handleSetupConfig(bytes []byte) string {
 	var params = defaultSetupParams()
 	err := UnmarshalJson(bytes, params)

core/lib.go

@@ -27,7 +27,7 @@ import (
 	"unsafe"
 )
 
-var messageCallback unsafe.Pointer
+var eventListener unsafe.Pointer
 
 type TunHandler struct {
 	listener *sing_tun.Listener
@@ -36,11 +36,13 @@ type TunHandler struct {
 	limit *semaphore.Weighted
 }
 
-func (th *TunHandler) start(fd int, address, dns string) {
+func (th *TunHandler) start(fd int, stack, address, dns string) {
+	runLock.Lock()
+	defer runLock.Unlock()
 	_ = th.limit.Acquire(context.TODO(), 4)
 	defer th.limit.Release(4)
 	th.initHook()
-	tunListener := t.Start(fd, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack, address, dns)
+	tunListener := t.Start(fd, stack, address, dns)
 	if tunListener != nil {
 		log.Infoln("TUN address: %v", tunListener.Address())
 		th.listener = tunListener
@@ -136,7 +138,7 @@ func handleStopTun() {
 	}
 }
 
-func handleStartTun(callback unsafe.Pointer, fd int, address, dns string) {
+func handleStartTun(callback unsafe.Pointer, fd int, stack, address, dns string) {
 	handleStopTun()
 	tunLock.Lock()
 	defer tunLock.Unlock()
@@ -145,7 +147,7 @@ func handleStartTun(callback unsafe.Pointer, fd int, address, dns string) {
 			callback: callback,
 			limit:    semaphore.NewWeighted(4),
 		}
-		tunHandler.start(fd, address, dns)
+		tunHandler.start(fd, stack, address, dns)
 	}
 }
 
@@ -181,7 +183,7 @@ func nextHandle(action *Action, result ActionResult) bool {
 
 //export invokeAction
 func invokeAction(callback unsafe.Pointer, paramsChar *C.char) {
-	params := parseCString(paramsChar)
+	params := takeCString(paramsChar)
 	var action = &Action{}
 	err := json.Unmarshal([]byte(params), action)
 	if err != nil {
@@ -197,36 +199,40 @@ func invokeAction(callback unsafe.Pointer, paramsChar *C.char) {
 }
 
 //export startTUN
-func startTUN(callback unsafe.Pointer, fd C.int, addressChar, dnsChar *C.char) bool {
-	handleStartTun(callback, int(fd), parseCString(addressChar), parseCString(dnsChar))
+func startTUN(callback unsafe.Pointer, fd C.int, stackChar, addressChar, dnsChar *C.char) bool {
+	handleStartTun(callback, int(fd), takeCString(stackChar), takeCString(addressChar), takeCString(dnsChar))
 	return true
 }
 
-//export setMessageCallback
-func setMessageCallback(callback unsafe.Pointer) {
-	if messageCallback != nil {
-		releaseObject(messageCallback)
+//export setEventListener
+func setEventListener(listener unsafe.Pointer) {
+	if eventListener != nil || listener == nil {
+		releaseObject(eventListener)
 	}
-	messageCallback = callback
+	eventListener = listener
 }
 
 //export getTotalTraffic
 func getTotalTraffic(onlyStatisticsProxy bool) *C.char {
-	return C.CString(handleGetTotalTraffic(onlyStatisticsProxy))
+	data := C.CString(handleGetTotalTraffic(onlyStatisticsProxy))
+	defer C.free(unsafe.Pointer(data))
+	return data
 }
 
 //export getTraffic
 func getTraffic(onlyStatisticsProxy bool) *C.char {
-	return C.CString(handleGetTraffic(onlyStatisticsProxy))
+	data := C.CString(handleGetTraffic(onlyStatisticsProxy))
+	defer C.free(unsafe.Pointer(data))
+	return data
 }
 
 func sendMessage(message Message) {
-	if messageCallback == nil {
+	if eventListener == nil {
 		return
 	}
 	result := ActionResult{
 		Method:   messageMethod,
-		callback: messageCallback,
+		callback: eventListener,
 		Data:     message,
 	}
 	result.send()
@@ -249,5 +255,5 @@ func forceGC() {
 
 //export updateDns
 func updateDns(s *C.char) {
-	handleUpdateDns(parseCString(s))
+	handleUpdateDns(takeCString(s))
 }

core/tun/tun.go

@@ -14,9 +14,13 @@ import (
 	"strings"
 )
 
-func Start(fd int, device string, stack constant.TUNStack, address, dns string) *sing_tun.Listener {
+func Start(fd int, stack string, address, dns string) *sing_tun.Listener {
 	var prefix4 []netip.Prefix
 	var prefix6 []netip.Prefix
+	tunStack, ok := constant.StackTypeMapping[strings.ToLower(stack)]
+	if !ok {
+		tunStack = constant.TunSystem
+	}
 	for _, a := range strings.Split(address, ",") {
 		a = strings.TrimSpace(a)
 		if len(a) == 0 {
@@ -45,8 +49,8 @@ func Start(fd int, device string, stack constant.TUNStack, address, dns string)
 
 	options := LC.Tun{
 		Enable:              true,
-		Device:              device,
-		Stack:               stack,
+		Device:              "FlClash",
+		Stack:               tunStack,
 		DNSHijack:           dnsHijack,
 		AutoRoute:           false,
 		AutoDetectInterface: false,

lib/application.dart

@@ -24,15 +24,14 @@ class Application extends ConsumerStatefulWidget {
 }
 
 class ApplicationState extends ConsumerState<Application> {
-  Timer? _autoUpdateGroupTaskTimer;
   Timer? _autoUpdateProfilesTaskTimer;
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: CommonPageTransitionsBuilder(),
-      TargetPlatform.windows: CommonPageTransitionsBuilder(),
-      TargetPlatform.linux: CommonPageTransitionsBuilder(),
-      TargetPlatform.macOS: CommonPageTransitionsBuilder(),
+      TargetPlatform.android: commonSharedXPageTransitions,
+      TargetPlatform.windows: commonSharedXPageTransitions,
+      TargetPlatform.linux: commonSharedXPageTransitions,
+      TargetPlatform.macOS: commonSharedXPageTransitions,
     },
   );
 
@@ -66,7 +65,7 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  Widget _buildPlatformState(Widget child) {
+  Widget _buildPlatformState({required Widget child}) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
@@ -77,7 +76,7 @@ class ApplicationState extends ConsumerState<Application> {
     return AndroidManager(child: TileManager(child: child));
   }
 
-  Widget _buildState(Widget child) {
+  Widget _buildState({required Widget child}) {
     return AppStateManager(
       child: CoreManager(
         child: ConnectivityManager(
@@ -94,77 +93,74 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  Widget _buildPlatformApp(Widget child) {
+  Widget _buildPlatformApp({required Widget child}) {
     if (system.isDesktop) {
       return WindowHeaderContainer(child: child);
     }
     return VpnManager(child: child);
   }
 
-  Widget _buildApp(Widget child) {
-    return MessageManager(child: ThemeManager(child: child));
+  Widget _buildApp({required Widget child}) {
+    return StatusManager(child: ThemeManager(child: child));
   }
 
   @override
   Widget build(context) {
-    return _buildPlatformState(
-      _buildState(
-        Consumer(
-          builder: (_, ref, child) {
-            final locale = ref.watch(
-              appSettingProvider.select((state) => state.locale),
-            );
-            final themeProps = ref.watch(themeSettingProvider);
-            return MaterialApp(
-              debugShowCheckedModeBanner: false,
-              navigatorKey: globalState.navigatorKey,
-              localizationsDelegates: const [
-                AppLocalizations.delegate,
-                GlobalMaterialLocalizations.delegate,
-                GlobalCupertinoLocalizations.delegate,
-                GlobalWidgetsLocalizations.delegate,
-              ],
-              builder: (_, child) {
-                return AppEnvManager(
-                  child: _buildApp(
-                    AppSidebarContainer(child: _buildPlatformApp(child!)),
-                  ),
-                );
-              },
-              scrollBehavior: BaseScrollBehavior(),
-              title: appName,
-              locale: utils.getLocaleForString(locale),
-              supportedLocales: AppLocalizations.delegate.supportedLocales,
-              themeMode: themeProps.themeMode,
-              theme: ThemeData(
-                useMaterial3: true,
-                pageTransitionsTheme: _pageTransitionsTheme,
-                colorScheme: _getAppColorScheme(
-                  brightness: Brightness.light,
-                  primaryColor: themeProps.primaryColor,
+    return Consumer(
+      builder: (_, ref, child) {
+        final locale = ref.watch(
+          appSettingProvider.select((state) => state.locale),
+        );
+        final themeProps = ref.watch(themeSettingProvider);
+        return MaterialApp(
+          debugShowCheckedModeBanner: false,
+          navigatorKey: globalState.navigatorKey,
+          localizationsDelegates: const [
+            AppLocalizations.delegate,
+            GlobalMaterialLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+          ],
+          builder: (_, child) {
+            return AppEnvManager(
+              child: _buildApp(
+                child: _buildPlatformState(
+                  child: _buildState(child: _buildPlatformApp(child: child!)),
                 ),
               ),
-              darkTheme: ThemeData(
-                useMaterial3: true,
-                pageTransitionsTheme: _pageTransitionsTheme,
-                colorScheme: _getAppColorScheme(
-                  brightness: Brightness.dark,
-                  primaryColor: themeProps.primaryColor,
-                ).toPureBlack(themeProps.pureBlack),
-              ),
-              home: child!,
             );
           },
-          child: const HomePage(),
-        ),
-      ),
+          scrollBehavior: BaseScrollBehavior(),
+          title: appName,
+          locale: utils.getLocaleForString(locale),
+          supportedLocales: AppLocalizations.delegate.supportedLocales,
+          themeMode: themeProps.themeMode,
+          theme: ThemeData(
+            useMaterial3: true,
+            pageTransitionsTheme: _pageTransitionsTheme,
+            colorScheme: _getAppColorScheme(
+              brightness: Brightness.light,
+              primaryColor: themeProps.primaryColor,
+            ),
+          ),
+          darkTheme: ThemeData(
+            useMaterial3: true,
+            pageTransitionsTheme: _pageTransitionsTheme,
+            colorScheme: _getAppColorScheme(
+              brightness: Brightness.dark,
+              primaryColor: themeProps.primaryColor,
+            ).toPureBlack(themeProps.pureBlack),
+          ),
+          home: child!,
+        );
+      },
+      child: const HomePage(),
     );
   }
 
   @override
   Future<void> dispose() async {
     linkManager.destroy();
-    _autoUpdateGroupTaskTimer?.cancel();
     _autoUpdateProfilesTaskTimer?.cancel();
     await coreController.destroy();
     await globalState.appController.savePreferences();

lib/common/android.dart

@@ -1,13 +0,0 @@
-import 'package:fl_clash/plugins/service.dart';
-import 'package:fl_clash/state.dart';
-
-import 'system.dart';
-
-class Android {
-  Future<void> init() async {
-    await service?.init();
-    await service?.syncAndroidState(globalState.getAndroidState());
-  }
-}
-
-final android = system.isAndroid ? Android() : null;

lib/common/app_localizations.dart

@@ -1,3 +1,3 @@
 import 'package:fl_clash/l10n/l10n.dart';
 
-final appLocalizations = AppLocalizations.current;
+final appLocalizations = AppLocalizations.current;

lib/common/archive.dart

@@ -7,6 +7,9 @@ import 'package:path/path.dart';
 extension ArchiveExt on Archive {
   void addDirectoryToArchive(String dirPath, String parentPath) {
     final dir = Directory(dirPath);
+    if (!dir.existsSync()) {
+      return;
+    }
     final entities = dir.listSync(recursive: false);
     for (final entity in entities) {
       final relativePath = relative(entity.path, from: parentPath);
@@ -14,16 +17,15 @@ extension ArchiveExt on Archive {
         final data = entity.readAsBytesSync();
         final archiveFile = ArchiveFile(relativePath, data.length, data);
         addFile(archiveFile);
-      } else if (entity is Directory) {
-        addDirectoryToArchive(entity.path, parentPath);
       }
+      // else if (entity is Directory) {
+      //   addDirectoryToArchive(entity.path, parentPath);
+      // }
     }
   }
 
   void addTextFile<T>(String name, T raw) {
     final data = json.encode(raw);
-    addFile(
-      ArchiveFile.string(name, data),
-    );
+    addFile(ArchiveFile.string(name, data));
   }
 }

lib/common/cache.dart

@@ -0,0 +1,185 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+
+class LocalImageCacheManager extends CacheManager {
+  static const key = 'ImageCaches';
+
+  static final LocalImageCacheManager _instance = LocalImageCacheManager._();
+
+  factory LocalImageCacheManager() {
+    return _instance;
+  }
+
+  LocalImageCacheManager._()
+    : super(Config(key, fileService: _LocalImageCacheFileService()));
+}
+
+class _LocalImageCacheFileService extends FileService {
+  _LocalImageCacheFileService();
+
+  @override
+  Future<FileServiceResponse> get(
+    String url, {
+    Map<String, String>? headers,
+  }) async {
+    final response = await request.dio.get<ResponseBody>(
+      url,
+      options: Options(headers: headers, responseType: ResponseType.stream),
+    );
+    return _LocalImageResponse(response);
+  }
+}
+
+class _LocalImageResponse implements FileServiceResponse {
+  _LocalImageResponse(this._response);
+
+  final DateTime _receivedTime = DateTime.now();
+
+  final Response<ResponseBody> _response;
+
+  String? _header(String name) {
+    return _response.headers.value(name);
+  }
+
+  @override
+  int get statusCode => _response.statusCode ?? 0;
+
+  @override
+  Stream<List<int>> get content =>
+      _response.data!.stream.transform(uint8ListToListIntConverter);
+
+  @override
+  int? get contentLength => _response.data?.contentLength;
+
+  @override
+  DateTime get validTill {
+    var ageDuration = const Duration(days: 7);
+    final controlHeader = _header(HttpHeaders.cacheControlHeader);
+    if (controlHeader != null) {
+      final controlSettings = controlHeader.split(',');
+      for (final setting in controlSettings) {
+        final sanitizedSetting = setting.trim().toLowerCase();
+        if (sanitizedSetting == 'no-cache') {
+          ageDuration = Duration.zero;
+        }
+        if (sanitizedSetting.startsWith('max-age=')) {
+          final validSeconds =
+              int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
+          if (validSeconds > 0) {
+            ageDuration = Duration(seconds: validSeconds);
+          }
+        }
+      }
+    }
+
+    if (ageDuration > const Duration(days: 7)) {
+      return _receivedTime.add(ageDuration);
+    }
+    return _receivedTime.add(const Duration(days: 7));
+  }
+
+  @override
+  String? get eTag => _header(HttpHeaders.etagHeader);
+
+  @override
+  String get fileExtension {
+    var fileExtension = '';
+    final contentTypeHeader = _header(HttpHeaders.contentTypeHeader);
+    if (contentTypeHeader != null) {
+      final contentType = ContentType.parse(contentTypeHeader);
+      fileExtension = contentType.fileExtension;
+    }
+    return fileExtension;
+  }
+}
+
+extension ContentTypeConverter on ContentType {
+  String get fileExtension => mimeTypes[mimeType] ?? '.$subType';
+}
+
+const mimeTypes = {
+  'application/vnd.android.package-archive': '.apk',
+  'application/epub+zip': '.epub',
+  'application/gzip': '.gz',
+  'application/java-archive': '.jar',
+  'application/json': '.json',
+  'application/ld+json': '.jsonld',
+  'application/msword': '.doc',
+  'application/octet-stream': '.bin',
+  'application/ogg': '.ogx',
+  'application/pdf': '.pdf',
+  'application/php': '.php',
+  'application/rtf': '.rtf',
+  'application/vnd.amazon.ebook': '.azw',
+  'application/vnd.apple.installer+xml': '.mpkg',
+  'application/vnd.mozilla.xul+xml': '.xul',
+  'application/vnd.ms-excel': '.xls',
+  'application/vnd.ms-fontobject': '.eot',
+  'application/vnd.ms-powerpoint': '.ppt',
+  'application/vnd.oasis.opendocument.presentation': '.odp',
+  'application/vnd.oasis.opendocument.spreadsheet': '.ods',
+  'application/vnd.oasis.opendocument.text': '.odt',
+  'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+      '.pptx',
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+      '.docx',
+  'application/vnd.rar': '.rar',
+  'application/vnd.visio': '.vsd',
+  'application/x-7z-compressed': '.7z',
+  'application/x-abiword': '.abw',
+  'application/x-bzip': '.bz',
+  'application/x-bzip2': '.bz2',
+  'application/x-csh': '.csh',
+  'application/x-freearc': '.arc',
+  'application/x-sh': '.sh',
+  'application/x-shockwave-flash': '.swf',
+  'application/x-tar': '.tar',
+  'application/xhtml+xml': '.xhtml',
+  'application/xml': '.xml',
+  'application/zip': '.zip',
+  'audio/3gpp': '.3gp',
+  'audio/3gpp2': '.3g2',
+  'audio/aac': '.aac',
+  'audio/x-aac': '.aac',
+  'audio/midi': '.midi',
+  'audio/x-midi': '.midi',
+  'audio/x-m4a': '.m4a',
+  'audio/m4a': '.m4a',
+  'audio/mpeg': '.mp3',
+  'audio/ogg': '.oga',
+  'audio/opus': '.opus',
+  'audio/wav': '.wav',
+  'audio/x-wav': '.wav',
+  'audio/webm': '.weba',
+  'font/otf': '.otf',
+  'font/ttf': '.ttf',
+  'font/woff': '.woff',
+  'font/woff2': '.woff2',
+  'image/bmp': '.bmp',
+  'image/gif': '.gif',
+  'image/jpeg': '.jpg',
+  'image/png': '.png',
+  'image/svg+xml': '.svg',
+  'image/tiff': '.tiff',
+  'image/vnd.microsoft.icon': '.ico',
+  'image/webp': '.webp',
+  'text/calendar': '.ics',
+  'text/css': '.css',
+  'text/csv': '.csv',
+  'text/html': '.html',
+  'text/javascript': '.js',
+  'text/plain': '.txt',
+  'text/xml': '.xml',
+  'video/3gpp': '.3gp',
+  'video/3gpp2': '.3g2',
+  'video/mp2t': '.ts',
+  'video/mpeg': '.mpeg',
+  'video/ogg': '.ogv',
+  'video/webm': '.webm',
+  'video/x-msvideo': '.avi',
+  'video/quicktime': '.mov',
+};

lib/common/common.dart

@@ -1,6 +1,7 @@
-export 'android.dart';
 export 'app_localizations.dart';
+export 'cache.dart';
 export 'color.dart';
+export 'compute.dart';
 export 'constant.dart';
 export 'context.dart';
 export 'converter.dart';
@@ -37,3 +38,4 @@ export 'text.dart';
 export 'tray.dart';
 export 'utils.dart';
 export 'window.dart';
+export 'yaml.dart';

lib/common/compute.dart

@@ -0,0 +1,110 @@
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+
+import 'string.dart';
+
+List<Group> computeSort({
+  required List<Group> groups,
+  required ProxiesSortType sortType,
+  required DelayMap delayMap,
+  required SelectedMap selectedMap,
+  required String defaultTestUrl,
+}) {
+  return groups.map((group) {
+    final proxies = group.all;
+    final newProxies = switch (sortType) {
+      ProxiesSortType.none => proxies,
+      ProxiesSortType.delay => _sortOfDelay(
+        groups: groups,
+        proxies: proxies,
+        delayMap: delayMap,
+        selectedMap: selectedMap,
+        testUrl: group.testUrl.getSafeValue(defaultTestUrl),
+      ),
+      ProxiesSortType.name => _sortOfName(proxies),
+    };
+    return group.copyWith(all: newProxies);
+  }).toList();
+}
+
+DelayState computeProxyDelayState({
+  required String proxyName,
+  required String testUrl,
+  required List<Group> groups,
+  required SelectedMap selectedMap,
+  required DelayMap delayMap,
+}) {
+  final state = computeRealSelectedProxyState(
+    proxyName,
+    groups: groups,
+    selectedMap: selectedMap,
+  );
+  final currentDelayMap = delayMap[state.testUrl.getSafeValue(testUrl)] ?? {};
+  final delay = currentDelayMap[state.proxyName];
+  return DelayState(delay: delay ?? 0, group: state.group);
+}
+
+SelectedProxyState computeRealSelectedProxyState(
+  String proxyName, {
+  required List<Group> groups,
+  required SelectedMap selectedMap,
+}) {
+  return _getRealSelectedProxyState(
+    SelectedProxyState(proxyName: proxyName),
+    groups: groups,
+    selectedMap: selectedMap,
+  );
+}
+
+SelectedProxyState _getRealSelectedProxyState(
+  SelectedProxyState state, {
+  required List<Group> groups,
+  required SelectedMap selectedMap,
+}) {
+  if (state.proxyName.isEmpty) return state;
+  final index = groups.indexWhere((element) => element.name == state.proxyName);
+  final newState = state.copyWith(group: true);
+  if (index == -1) return newState;
+  final group = groups[index];
+  final currentSelectedName = group.getCurrentSelectedName(
+    selectedMap[newState.proxyName] ?? '',
+  );
+  if (currentSelectedName.isEmpty) {
+    return newState;
+  }
+  return _getRealSelectedProxyState(
+    newState.copyWith(proxyName: currentSelectedName, testUrl: group.testUrl),
+    groups: groups,
+    selectedMap: selectedMap,
+  );
+}
+
+List<Proxy> _sortOfDelay({
+  required List<Group> groups,
+  required List<Proxy> proxies,
+  required DelayMap delayMap,
+  required SelectedMap selectedMap,
+  required String testUrl,
+}) {
+  return List.from(proxies)..sort((a, b) {
+    final aDelayState = computeProxyDelayState(
+      proxyName: a.name,
+      testUrl: testUrl,
+      groups: groups,
+      selectedMap: selectedMap,
+      delayMap: delayMap,
+    );
+    final bDelayState = computeProxyDelayState(
+      proxyName: b.name,
+      testUrl: testUrl,
+      groups: groups,
+      selectedMap: selectedMap,
+      delayMap: delayMap,
+    );
+    return aDelayState.compareTo(bDelayState);
+  });
+}
+
+List<Proxy> _sortOfName(List<Proxy> proxies) {
+  return List.of(proxies)..sort((a, b) => a.name.compareTo(b.name));
+}

lib/common/constant.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: constant_identifier_names
+
 import 'dart:math';
 import 'dart:ui';
 
@@ -21,6 +23,12 @@ final baseInfoEdgeInsets = EdgeInsets.symmetric(
   vertical: 16.ap,
   horizontal: 16.ap,
 );
+final listHeaderPadding = EdgeInsets.only(
+  left: 16.ap,
+  right: 8.ap,
+  top: 24.ap,
+  bottom: 8.ap,
+);
 
 final defaultTextScaleFactor =
     WidgetsBinding.instance.platformDispatcher.textScaleFactor;
@@ -30,14 +38,14 @@ const animateDuration = Duration(milliseconds: 100);
 const midDuration = Duration(milliseconds: 200);
 const commonDuration = Duration(milliseconds: 300);
 const defaultUpdateDuration = Duration(days: 1);
-const mmdbFileName = 'geoip.metadb';
-const asnFileName = 'ASN.mmdb';
-const geoIpFileName = 'GeoIP.dat';
-const geoSiteFileName = 'GeoSite.dat';
+const MMDB = 'GEOIP.metadb';
+const ASN = 'ASN.mmdb';
+const GEOIP = 'GEOIP.dat';
+const GEOSITE = 'GEOSITE.dat';
 final double kHeaderHeight = system.isDesktop
     ? !system.isMacOS
-        ? 40
-        : 28
+          ? 40
+          : 28
     : 0;
 const profilesDirectoryName = 'profiles';
 const localhost = '127.0.0.1';
@@ -61,6 +69,7 @@ const stringListEquality = ListEquality<String>();
 const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
 const groupListEquality = ListEquality<Group>();
+const ruleEquality = ListEquality<Rule>();
 const externalProviderListEquality = ListEquality<ExternalProvider>();
 const packageListEquality = ListEquality<Package>();
 const hotKeyActionListEquality = ListEquality<HotKeyAction>();
@@ -84,7 +93,7 @@ const profilesStoreKey = PageStorageKey<String>('profiles');
 const defaultPrimaryColor = 0XFFD8C0C3;
 
 double getWidgetHeight(num lines) {
-  return max(lines * 84 + (lines - 1) * 16, 0).ap;
+  return max(lines * 80 + (lines - 1) * 16, 0).ap;
 }
 
 const maxLength = 1000;

lib/common/context.dart

@@ -1,4 +1,6 @@
-import 'package:fl_clash/manager/message_manager.dart';
+import 'package:fl_clash/l10n/l10n.dart';
+import 'package:fl_clash/manager/manager.dart';
+import 'package:fl_clash/models/widget.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -7,28 +9,20 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  Future<void>? showNotifier(String text) {
-    return findAncestorStateOfType<MessageManagerState>()?.message(text);
+  void showNotifier(String text, {MessageActionState? actionState}) {
+    return findAncestorStateOfType<StatusManagerState>()?.message(
+      text,
+      actionState: actionState,
+    );
   }
 
-  void showSnackBar(
-    String message, {
-    SnackBarAction? action,
-  }) {
+  void showSnackBar(String message, {SnackBarAction? action}) {
     final width = viewWidth;
     EdgeInsets margin;
     if (width < 600) {
-      margin = const EdgeInsets.only(
-        bottom: 16,
-        right: 16,
-        left: 16,
-      );
+      margin = const EdgeInsets.only(bottom: 16, right: 16, left: 16);
     } else {
-      margin = EdgeInsets.only(
-        bottom: 16,
-        left: 16,
-        right: width - 316,
-      );
+      margin = EdgeInsets.only(bottom: 16, left: 16, right: width - 316);
     }
     ScaffoldMessenger.of(this).showSnackBar(
       SnackBar(
@@ -53,6 +47,8 @@ extension BuildContextExtension on BuildContext {
 
   TextTheme get textTheme => Theme.of(this).textTheme;
 
+  AppLocalizations get appLocalizations => AppLocalizations.of(this);
+
   T? findLastStateOfType<T extends State>() {
     T? state;
 
@@ -76,8 +72,11 @@ extension BuildContextExtension on BuildContext {
 class BackHandleInherited extends InheritedWidget {
   final Function handleBack;
 
-  const BackHandleInherited(
-      {super.key, required this.handleBack, required super.child});
+  const BackHandleInherited({
+    super.key,
+    required this.handleBack,
+    required super.child,
+  });
 
   static BackHandleInherited? of(BuildContext context) =>
       context.dependOnInheritedWidgetOfExactType<BackHandleInherited>();

lib/common/datetime.dart

@@ -17,23 +17,25 @@ extension DateTimeExtension on DateTime {
     final difference = currentDateTime.difference(this);
     final days = difference.inDays;
     if (days >= 365) {
-      return '${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}';
+      final years = (days / 365).floor();
+      return appLocalizations.yearsAgo(years);
     }
     if (days >= 30) {
-      return '${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}';
+      final months = (days / 30).floor();
+      return appLocalizations.monthsAgo(months);
     }
     if (days >= 1) {
-      return '$days ${appLocalizations.days}${appLocalizations.ago}';
+      return appLocalizations.daysAgo(days);
     }
     final hours = difference.inHours;
     if (hours >= 1) {
-      return '$hours ${appLocalizations.hours}${appLocalizations.ago}';
+      return appLocalizations.hoursAgo(hours);
     }
     final minutes = difference.inMinutes;
     if (minutes >= 1) {
-      return '$minutes ${appLocalizations.minutes}${appLocalizations.ago}';
+      return appLocalizations.minutesAgo(minutes);
     }
-    return appLocalizations.just;
+    return appLocalizations.justNow;
   }
 
   String get show {

lib/common/function.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 
 class Debouncer {
@@ -9,23 +10,17 @@ class Debouncer {
     FunctionTag tag,
     Function func, {
     List<dynamic>? args,
-    Duration duration = const Duration(milliseconds: 600),
+    Duration? duration,
   }) {
     final timer = _operations[tag];
     if (timer != null) {
       timer.cancel();
     }
-    _operations[tag] = Timer(
-      duration,
-      () {
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-        Function.apply(
-          func,
-          args,
-        );
-      },
-    );
+    _operations[tag] = Timer(duration ?? const Duration(milliseconds: 600), () {
+      _operations[tag]?.cancel();
+      _operations.remove(tag);
+      Function.apply(func, args);
+    });
   }
 
   void cancel(dynamic tag) {
@@ -42,22 +37,25 @@ class Throttler {
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
+    bool fire = false,
   }) {
     final timer = _operations[tag];
     if (timer != null) {
       return true;
     }
-    _operations[tag] = Timer(
-      duration,
-      () {
+    if (fire) {
+      Function.apply(func, args);
+      _operations[tag] = Timer(duration, () {
         _operations[tag]?.cancel();
         _operations.remove(tag);
-        Function.apply(
-          func,
-          args,
-        );
-      },
-    );
+      });
+    } else {
+      _operations[tag] = Timer(duration, () {
+        Function.apply(func, args);
+        _operations[tag]?.cancel();
+        _operations.remove(tag);
+      });
+    }
     return false;
   }
 
@@ -71,7 +69,7 @@ Future<T> retry<T>({
   required Future<T> Function() task,
   int maxAttempts = 3,
   required bool Function(T res) retryIf,
-  Duration delay = Duration.zero,
+  Duration delay = midDuration,
 }) async {
   int attempts = 0;
   while (attempts < maxAttempts) {
@@ -81,7 +79,7 @@ Future<T> retry<T>({
     }
     attempts++;
   }
-  throw 'unknown error';
+  throw 'retry error';
 }
 
 final debouncer = Debouncer();

lib/common/future.dart

@@ -10,14 +10,14 @@ extension FutureExt<T> on Future<T> {
     VoidCallback? onLast,
     FutureOr<T> Function()? onTimeout,
   }) {
-    final realTimout = timeout ?? const Duration(minutes: 3);
-    Timer(realTimout + commonDuration, () {
+    final realTimeout = timeout ?? const Duration(minutes: 3);
+    Timer(realTimeout + commonDuration, () {
       if (onLast != null) {
         onLast();
       }
     });
     return this.timeout(
-      realTimout,
+      realTimeout,
       onTimeout: () async {
         if (onTimeout != null) {
           return onTimeout();

lib/common/iterable.dart

@@ -23,10 +23,7 @@ extension IterableExt<T> on Iterable<T> {
     }
   }
 
-  Iterable<T> fill(
-    int length, {
-    required T Function(int count) filler,
-  }) sync* {
+  Iterable<T> fill(int length, {required T Function(int count) filler}) sync* {
     int count = 0;
     for (var item in this) {
       yield item;
@@ -85,6 +82,24 @@ extension ListExt<T> on List<T> {
     if (length > index) return this[index];
     return last;
   }
+
+  void addOrRemove(T value) {
+    if (contains(value)) {
+      remove(value);
+    } else {
+      add(value);
+    }
+  }
+}
+
+extension SetExt<T> on Set<T> {
+  void addOrRemove(T value) {
+    if (contains(value)) {
+      remove(value);
+    } else {
+      add(value);
+    }
+  }
 }
 
 extension DoubleListExt on List<double> {

lib/common/measure.dart

@@ -8,26 +8,16 @@ class Measure {
   final Map<String, dynamic> _measureMap;
 
   Measure.of(this.context, double textScaleFactor)
-      : _measureMap = {},
-        _textScaler = TextScaler.linear(
-          textScaleFactor,
-        );
+    : _measureMap = {},
+      _textScaler = TextScaler.linear(textScaleFactor);
 
-  Size computeTextSize(
-    Text text, {
-    double maxWidth = double.infinity,
-  }) {
+  Size computeTextSize(Text text, {double maxWidth = double.infinity}) {
     final textPainter = TextPainter(
-      text: TextSpan(
-        text: text.data,
-        style: text.style,
-      ),
+      text: TextSpan(text: text.data, style: text.style),
       maxLines: text.maxLines,
       textScaler: _textScaler,
       textDirection: text.textDirection ?? TextDirection.ltr,
-    )..layout(
-        maxWidth: maxWidth,
-      );
+    )..layout(maxWidth: maxWidth);
     return textPainter.size;
   }
 
@@ -35,10 +25,7 @@ class Measure {
     return _measureMap.updateCacheValue(
       'bodyMediumHeight',
       () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.bodyMedium,
-        ),
+        Text('X', style: context.textTheme.bodyMedium),
       ).height,
     );
   }
@@ -46,24 +33,16 @@ class Measure {
   double get bodyLargeHeight {
     return _measureMap.updateCacheValue(
       'bodyLargeHeight',
-      () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.bodyLarge,
-        ),
-      ).height,
+      () =>
+          computeTextSize(Text('X', style: context.textTheme.bodyLarge)).height,
     );
   }
 
   double get bodySmallHeight {
     return _measureMap.updateCacheValue(
       'bodySmallHeight',
-      () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.bodySmall,
-        ),
-      ).height,
+      () =>
+          computeTextSize(Text('X', style: context.textTheme.bodySmall)).height,
     );
   }
 
@@ -71,10 +50,16 @@ class Measure {
     return _measureMap.updateCacheValue(
       'labelSmallHeight',
       () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.labelSmall,
-        ),
+        Text('X', style: context.textTheme.labelSmall),
+      ).height,
+    );
+  }
+
+  double get titleSmallHeight {
+    return _measureMap.updateCacheValue(
+      'titleSmallHeight',
+      () => computeTextSize(
+        Text('X', style: context.textTheme.titleSmall),
       ).height,
     );
   }
@@ -83,10 +68,7 @@ class Measure {
     return _measureMap.updateCacheValue(
       'labelMediumHeight',
       () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.labelMedium,
-        ),
+        Text('X', style: context.textTheme.labelMedium),
       ).height,
     );
   }
@@ -95,10 +77,7 @@ class Measure {
     return _measureMap.updateCacheValue(
       'titleLargeHeight',
       () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.titleLarge,
-        ),
+        Text('X', style: context.textTheme.titleLarge),
       ).height,
     );
   }
@@ -107,10 +86,7 @@ class Measure {
     return _measureMap.updateCacheValue(
       'titleMediumHeight',
       () => computeTextSize(
-        Text(
-          'X',
-          style: context.textTheme.titleMedium,
-        ),
+        Text('X', style: context.textTheme.titleMedium),
       ).height,
     );
   }

lib/common/mixin.dart

@@ -1,4 +1,5 @@
 import 'package:riverpod/riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 mixin AutoDisposeNotifierMixin<T> on AnyNotifier<T, T> {
   set value(T value) {
@@ -19,4 +20,32 @@ mixin AutoDisposeNotifierMixin<T> on AnyNotifier<T, T> {
   }
 
   void onUpdate(T value) {}
+
+  void update(T Function(T) builder) {
+    final value = builder(state);
+    this.value = value;
+  }
+}
+
+mixin AnyNotifierMixin<T> on AnyNotifier<T, T> {
+  T get value;
+
+  set value(T value) {
+    if (ref.mounted) {
+      state = value;
+    } else {
+      onUpdate(value);
+    }
+  }
+
+  @override
+  bool updateShouldNotify(previous, next) {
+    final res = super.updateShouldNotify(previous, next);
+    if (res) {
+      onUpdate(next);
+    }
+    return res;
+  }
+
+  void onUpdate(T value) {}
 }

lib/common/navigator.dart

@@ -1,3 +1,4 @@
+import 'package:animations/animations.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -32,6 +33,11 @@ class BaseNavigator {
   // }
 }
 
+const commonSharedXPageTransitions = SharedAxisPageTransitionsBuilder(
+  transitionType: SharedAxisTransitionType.horizontal,
+  fillColor: Colors.transparent,
+);
+
 class CommonDesktopRoute<T> extends PageRoute<T> {
   final Widget Function(BuildContext context) builder;
 
@@ -67,14 +73,45 @@ class CommonDesktopRoute<T> extends PageRoute<T> {
   Duration get reverseTransitionDuration => Duration(milliseconds: 200);
 }
 
-class CommonRoute<T> extends MaterialPageRoute<T> {
-  CommonRoute({required super.builder});
+class CommonRoute<T> extends PageRoute<T> {
+  final Widget Function(BuildContext context) builder;
+
+  CommonRoute({required this.builder});
 
   @override
-  Duration get transitionDuration => const Duration(milliseconds: 500);
+  Color? get barrierColor => null;
 
   @override
-  Duration get reverseTransitionDuration => const Duration(milliseconds: 500);
+  String? get barrierLabel => null;
+
+  @override
+  bool get maintainState => true;
+
+  @override
+  Widget buildPage(
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+  ) {
+    final Widget result = builder(context);
+    return Semantics(
+      scopesRoute: true,
+      explicitChildNodes: true,
+      child: SharedAxisTransition(
+        animation: animation,
+        secondaryAnimation: secondaryAnimation,
+        transitionType: SharedAxisTransitionType.horizontal,
+        fillColor: context.colorScheme.surface,
+        child: result,
+      ),
+    );
+  }
+
+  @override
+  Duration get transitionDuration => Duration(milliseconds: 300);
+
+  @override
+  Duration get reverseTransitionDuration => Duration(milliseconds: 300);
 }
 
 final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
@@ -134,11 +171,15 @@ class CommonPageTransition extends StatefulWidget {
     bool allowSnapshotting,
     Widget? child,
   ) {
-    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
+    final CurvedAnimation animation = CurvedAnimation(
       parent: secondaryAnimation,
       curve: Curves.linearToEaseOut,
       reverseCurve: Curves.easeInToLinear,
-    ).drive(_kMiddleLeftTween);
+    );
+    final Animation<Offset> delegatedPositionAnimation = animation.drive(
+      _kMiddleLeftTween,
+    );
+    animation.dispose();
 
     assert(debugCheckHasDirectionality(context));
     final TextDirection textDirection = Directionality.of(context);
@@ -224,7 +265,7 @@ class _CommonPageTransitionState extends State<CommonPageTransition> {
           DecorationTween(
             begin: const _CommonEdgeShadowDecoration(),
             end: _CommonEdgeShadowDecoration(<Color>[
-              widget.context.colorScheme.inverseSurface.withValues(alpha: 0.02),
+              Color(0x04000000),
               Colors.transparent,
             ]),
           ),
@@ -275,7 +316,7 @@ class _CommonEdgeShadowPainter extends BoxPainter {
       return;
     }
 
-    final double shadowWidth = 1 * configuration.size!.width;
+    final double shadowWidth = 0.05 * configuration.size!.width;
     final double shadowHeight = configuration.size!.height;
     final double bandWidth = shadowWidth / (colors.length - 1);
 

lib/common/path.dart

@@ -10,6 +10,7 @@ class AppPath {
   Completer<Directory> dataDir = Completer();
   Completer<Directory> downloadDir = Completer();
   Completer<Directory> tempDir = Completer();
+  Completer<Directory> cacheDir = Completer();
   late String appDirPath;
 
   AppPath._internal() {
@@ -23,6 +24,9 @@ class AppPath {
     getDownloadsDirectory().then((value) {
       downloadDir.complete(value);
     });
+    getApplicationCacheDirectory().then((value) {
+      cacheDir.complete(value);
+    });
   }
 
   factory AppPath() {
@@ -58,8 +62,18 @@ class AppPath {
   }
 
   Future<String> get lockFilePath async {
-    final directory = await dataDir.future;
-    return join(directory.path, 'FlClash.lock');
+    final homeDirPath = await appPath.homeDirPath;
+    return join(homeDirPath, 'FlClash.lock');
+  }
+
+  Future<String> get configFilePath async {
+    final homeDirPath = await appPath.homeDirPath;
+    return join(homeDirPath, 'config.yaml');
+  }
+
+  Future<String> get validateFilePath async {
+    final homeDirPath = await appPath.homeDirPath;
+    return join(homeDirPath, 'temp', 'validate${utils.id}.yaml');
   }
 
   Future<String> get sharedPreferencesPath async {
@@ -77,13 +91,19 @@ class AppPath {
     return join(directory, '$id.yaml');
   }
 
+  Future<String> getIconsCacheDir() async {
+    final directory = await cacheDir.future;
+    return join(directory.path, 'icons');
+  }
+
+  Future<String> getProvidersRootPath() async {
+    final directory = await profilesPath;
+    return join(directory, 'providers');
+  }
+
   Future<String> getProvidersDirPath(String id) async {
     final directory = await profilesPath;
-    return join(
-      directory,
-      'providers',
-      id,
-    );
+    return join(directory, 'providers', id);
   }
 
   Future<String> getProvidersFilePath(
@@ -92,13 +112,7 @@ class AppPath {
     String url,
   ) async {
     final directory = await profilesPath;
-    return join(
-      directory,
-      'providers',
-      id,
-      type,
-      url.toMd5(),
-    );
+    return join(directory, 'providers', id, type, url.toMd5());
   }
 
   Future<String> get tempPath async {

lib/common/print.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
@@ -12,14 +13,14 @@ class CommonPrint {
     return _instance!;
   }
 
-  void log(String? text) {
+  void log(String? text, {LogLevel logLevel = LogLevel.info}) {
     final payload = '[APP] $text';
     debugPrint(payload);
     if (!globalState.isInit) {
       return;
     }
     globalState.appController.addLog(
-      Log.app(payload),
+      Log.app(payload).copyWith(logLevel: logLevel),
     );
   }
 }

lib/common/request.dart

@@ -11,56 +11,45 @@ import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
 
 class Request {
-  late final Dio _dio;
+  late final Dio dio;
   late final Dio _clashDio;
   String? userAgent;
 
   Request() {
-    _dio = Dio(
-      BaseOptions(
-        headers: {
-          'User-Agent': browserUa,
-        },
-      ),
-    );
+    dio = Dio(BaseOptions(headers: {'User-Agent': browserUa}));
     _clashDio = Dio();
-    _clashDio.httpClientAdapter = IOHttpClientAdapter(createHttpClient: () {
-      final client = HttpClient();
-      client.findProxy = (Uri uri) {
-        client.userAgent = globalState.ua;
-        return FlClashHttpOverrides.handleFindProxy(uri);
-      };
-      return client;
-    });
-  }
-
-  Future<Response> getFileResponseForUrl(String url) async {
-    final response = await _clashDio.get(
-      url,
-      options: Options(
-        responseType: ResponseType.bytes,
-      ),
+    _clashDio.httpClientAdapter = IOHttpClientAdapter(
+      createHttpClient: () {
+        final client = HttpClient();
+        client.findProxy = (Uri uri) {
+          client.userAgent = globalState.ua;
+          return FlClashHttpOverrides.handleFindProxy(uri);
+        };
+        return client;
+      },
     );
-    return response;
   }
 
-  Future<Response> getTextResponseForUrl(String url) async {
-    final response = await _clashDio.get(
+  Future<Response<Uint8List>> getFileResponseForUrl(String url) async {
+    return await _clashDio.get<Uint8List>(
       url,
-      options: Options(
-        responseType: ResponseType.plain,
-      ),
+      options: Options(responseType: ResponseType.bytes),
+    );
+  }
+
+  Future<Response<String>> getTextResponseForUrl(String url) async {
+    final response = await _clashDio.get<String>(
+      url,
+      options: Options(responseType: ResponseType.plain),
     );
     return response;
   }
 
   Future<MemoryImage?> getImage(String url) async {
     if (url.isEmpty) return null;
-    final response = await _dio.get<Uint8List>(
+    final response = await dio.get<Uint8List>(
       url,
-      options: Options(
-        responseType: ResponseType.bytes,
-      ),
+      options: Options(responseType: ResponseType.bytes),
     );
     final data = response.data;
     if (data == null) return null;
@@ -68,11 +57,9 @@ class Request {
   }
 
   Future<Map<String, dynamic>?> checkForUpdate() async {
-    final response = await _dio.get(
+    final response = await dio.get(
       'https://api.github.com/repos/$repository/releases/latest',
-      options: Options(
-        responseType: ResponseType.json,
-      ),
+      options: Options(responseType: ResponseType.json),
     );
     if (response.statusCode != 200) return null;
     final data = response.data as Map<String, dynamic>;
@@ -85,10 +72,13 @@ class Request {
   }
 
   final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
-    'https://ipwho.is/': IpInfo.fromIpwhoIsJson,
-    'https://api.ip.sb/geoip/': IpInfo.fromIpSbJson,
-    'https://ipapi.co/json/': IpInfo.fromIpApiCoJson,
-    'https://ipinfo.io/json/': IpInfo.fromIpInfoIoJson,
+    'https://ipwho.is': IpInfo.fromIpWhoIsJson,
+    'https://api.myip.com': IpInfo.fromMyIpJson,
+    'https://ipapi.co/json': IpInfo.fromIpApiCoJson,
+    'https://ident.me/json': IpInfo.fromIdentMeJson,
+    'http://ip-api.com/json': IpInfo.fromIpAPIJson,
+    'https://api.ip.sb/geoip': IpInfo.fromIpSbJson,
+    'https://ipinfo.io/json': IpInfo.fromIpInfoIoJson,
   };
 
   Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
@@ -101,27 +91,29 @@ class Request {
         }
       }
 
-      final future = Dio().get<Map<String, dynamic>>(
-        source.key,
-        cancelToken: cancelToken,
-        options: Options(
-          responseType: ResponseType.json,
-        ),
-      );
-      future.then((res) {
-        if (res.statusCode == HttpStatus.ok && res.data != null) {
-          completer.complete(Result.success(source.value(res.data!)));
-        } else {
-          failureCount++;
-          handleFailRes();
-        }
-      }).catchError((e) {
-        failureCount++;
-        if (e is DioException && e.type == DioExceptionType.cancel) {
-          completer.complete(Result.error('cancelled'));
-        }
-        handleFailRes();
-      });
+      final future = dio
+          .get<Map<String, dynamic>>(
+            source.key,
+            cancelToken: cancelToken,
+            options: Options(responseType: ResponseType.json),
+          )
+          .timeout(const Duration(seconds: 10));
+      future
+          .then((res) {
+            if (res.statusCode == HttpStatus.ok && res.data != null) {
+              completer.complete(Result.success(source.value(res.data!)));
+              return;
+            }
+            failureCount++;
+            handleFailRes();
+          })
+          .catchError((e) {
+            failureCount++;
+            if (e is DioException && e.type == DioExceptionType.cancel) {
+              completer.complete(Result.error('cancelled'));
+            }
+            handleFailRes();
+          });
       return completer.future;
     });
     final res = await Future.any(futures);
@@ -131,18 +123,12 @@ class Request {
 
   Future<bool> pingHelper() async {
     try {
-      final response = await _dio
+      final response = await dio
           .get(
             'http://$localhost:$helperPort/ping',
-            options: Options(
-              responseType: ResponseType.plain,
-            ),
+            options: Options(responseType: ResponseType.plain),
           )
-          .timeout(
-            const Duration(
-              milliseconds: 2000,
-            ),
-          );
+          .timeout(const Duration(milliseconds: 2000));
       if (response.statusCode != HttpStatus.ok) {
         return false;
       }
@@ -154,22 +140,13 @@ class Request {
 
   Future<bool> startCoreByHelper(String arg) async {
     try {
-      final response = await _dio
+      final response = await dio
           .post(
             'http://$localhost:$helperPort/start',
-            data: json.encode({
-              'path': appPath.corePath,
-              'arg': arg,
-            }),
-            options: Options(
-              responseType: ResponseType.plain,
-            ),
+            data: json.encode({'path': appPath.corePath, 'arg': arg}),
+            options: Options(responseType: ResponseType.plain),
           )
-          .timeout(
-            const Duration(
-              milliseconds: 2000,
-            ),
-          );
+          .timeout(const Duration(milliseconds: 2000));
       if (response.statusCode != HttpStatus.ok) {
         return false;
       }
@@ -182,18 +159,12 @@ class Request {
 
   Future<bool> stopCoreByHelper() async {
     try {
-      final response = await _dio
+      final response = await dio
           .post(
             'http://$localhost:$helperPort/stop',
-            options: Options(
-              responseType: ResponseType.plain,
-            ),
+            options: Options(responseType: ResponseType.plain),
           )
-          .timeout(
-            const Duration(
-              milliseconds: 2000,
-            ),
-          );
+          .timeout(const Duration(milliseconds: 2000));
       if (response.statusCode != HttpStatus.ok) {
         return false;
       }

lib/common/scroll.dart

@@ -8,13 +8,40 @@ import 'package:flutter/material.dart';
 class BaseScrollBehavior extends MaterialScrollBehavior {
   @override
   Set<PointerDeviceKind> get dragDevices => {
-        PointerDeviceKind.touch,
-        PointerDeviceKind.stylus,
-        PointerDeviceKind.invertedStylus,
-        PointerDeviceKind.trackpad,
-        if (system.isDesktop) PointerDeviceKind.mouse,
-        PointerDeviceKind.unknown,
-      };
+    PointerDeviceKind.touch,
+    PointerDeviceKind.stylus,
+    PointerDeviceKind.invertedStylus,
+    PointerDeviceKind.trackpad,
+    if (system.isDesktop) PointerDeviceKind.mouse,
+    PointerDeviceKind.unknown,
+  };
+
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) {
+    switch (axisDirectionToAxis(details.direction)) {
+      case Axis.horizontal:
+        return child;
+      case Axis.vertical:
+        switch (getPlatform(context)) {
+          case TargetPlatform.linux:
+          case TargetPlatform.macOS:
+          case TargetPlatform.windows:
+            assert(details.controller != null);
+            return CommonScrollBar(
+              controller: details.controller,
+              child: child,
+            );
+          case TargetPlatform.android:
+          case TargetPlatform.fuchsia:
+          case TargetPlatform.iOS:
+            return child;
+        }
+    }
+  }
 }
 
 class HiddenBarScrollBehavior extends BaseScrollBehavior {
@@ -35,10 +62,7 @@ class ShowBarScrollBehavior extends BaseScrollBehavior {
     Widget child,
     ScrollableDetails details,
   ) {
-    return CommonScrollBar(
-      controller: details.controller,
-      child: child,
-    );
+    return CommonScrollBar(controller: details.controller, child: child);
   }
 }
 
@@ -52,7 +76,9 @@ class NextClampingScrollPhysics extends ClampingScrollPhysics {
 
   @override
   Simulation? createBallisticSimulation(
-      ScrollMetrics position, double velocity) {
+    ScrollMetrics position,
+    double velocity,
+  ) {
     final Tolerance tolerance = toleranceFor(position);
     if (position.outOfRange) {
       double? end;

lib/common/string.dart

@@ -11,16 +11,15 @@ extension StringExtension on String {
   }
 
   dynamic get splitByMultipleSeparators {
-    final parts =
-        split(RegExp(r'[, ;]+')).where((part) => part.isNotEmpty).toList();
+    final parts = split(
+      RegExp(r'[, ;]+'),
+    ).where((part) => part.isNotEmpty).toList();
 
     return parts.length > 1 ? parts : this;
   }
 
   int compareToLower(String other) {
-    return toLowerCase().compareTo(
-      other.toLowerCase(),
-    );
+    return toLowerCase().compareTo(other.toLowerCase());
   }
 
   List<int> get encodeUtf16LeWithBom {
@@ -66,9 +65,9 @@ extension StringExtension on String {
     return md5.convert(bytes).toString();
   }
 
-// bool containsToLower(String target) {
-//   return toLowerCase().contains(target);
-// }
+  // bool containsToLower(String target) {
+  //   return toLowerCase().contains(target);
+  // }
 }
 
 extension StringExtensionSafe on String? {

lib/common/system.dart

@@ -37,7 +37,7 @@ class System {
       'macos' => (deviceInfo as MacOsDeviceInfo).majorVersion,
       'android' => (deviceInfo as AndroidDeviceInfo).version.sdkInt,
       'windows' => (deviceInfo as WindowsDeviceInfo).majorVersion,
-      String() => 0
+      String() => 0,
     };
   }
 
@@ -104,7 +104,7 @@ class System {
       );
       final arguments = [
         '-c',
-        'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"'
+        'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"',
       ];
       final result = await Process.run(shell, arguments);
       if (result.exitCode != 0) {
@@ -148,21 +148,25 @@ class Windows {
     final argumentsPtr = arguments.toNativeUtf16();
     final operationPtr = 'runas'.toNativeUtf16();
 
-    final shellExecute = _shell32.lookupFunction<
-        Int32 Function(
+    final shellExecute = _shell32
+        .lookupFunction<
+          Int32 Function(
             Pointer<Utf16> hwnd,
             Pointer<Utf16> lpOperation,
             Pointer<Utf16> lpFile,
             Pointer<Utf16> lpParameters,
             Pointer<Utf16> lpDirectory,
-            Int32 nShowCmd),
-        int Function(
+            Int32 nShowCmd,
+          ),
+          int Function(
             Pointer<Utf16> hwnd,
             Pointer<Utf16> lpOperation,
             Pointer<Utf16> lpFile,
             Pointer<Utf16> lpParameters,
             Pointer<Utf16> lpDirectory,
-            int nShowCmd)>('ShellExecuteW');
+            int nShowCmd,
+          )
+        >('ShellExecuteW');
 
     final result = shellExecute(
       nullptr,
@@ -177,28 +181,31 @@ class Windows {
     calloc.free(argumentsPtr);
     calloc.free(operationPtr);
 
-    commonPrint.log('windows runas: $command $arguments resultCode:$result');
+    commonPrint.log(
+      'windows runas: $command $arguments resultCode:$result',
+      logLevel: LogLevel.warning,
+    );
 
-    if (result < 42) {
+    if (result <= 32) {
       return false;
     }
     return true;
   }
 
-  Future<void> _killProcess(int port) async {
-    final result = await Process.run('netstat', ['-ano']);
-    final lines = result.stdout.toString().trim().split('\n');
-    for (final line in lines) {
-      if (!line.contains(':$port') || !line.contains('LISTENING')) {
-        continue;
-      }
-      final parts = line.trim().split(RegExp(r'\s+'));
-      final pid = int.tryParse(parts.last);
-      if (pid != null) {
-        await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
-      }
-    }
-  }
+  // Future<void> _killProcess(int port) async {
+  //   final result = await Process.run('netstat', ['-ano']);
+  //   final lines = result.stdout.toString().trim().split('\n');
+  //   for (final line in lines) {
+  //     if (!line.contains(':$port') || !line.contains('LISTENING')) {
+  //       continue;
+  //     }
+  //     final parts = line.trim().split(RegExp(r'\s+'));
+  //     final pid = int.tryParse(parts.last);
+  //     if (pid != null) {
+  //      await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
+  //     }
+  //   }
+  // }
 
   Future<WindowsHelperServiceStatus> checkService() async {
     // final qcResult = await Process.run('sc', ['qc', appHelperService]);
@@ -224,16 +231,18 @@ class Windows {
       return true;
     }
 
-    await _killProcess(helperPort);
-
     final command = [
       '/c',
       if (status == WindowsHelperServiceStatus.presence) ...[
-        'sc',
+        'taskkill',
+        '/F',
+        '/IM',
+        '$appHelperService.exe'
+            ' & '
+            'sc',
         'delete',
         appHelperService,
-        '/force',
-        '&&',
+        '&',
       ],
       'sc',
       'create',
@@ -248,15 +257,18 @@ class Windows {
 
     final res = runas('cmd.exe', command);
 
-    await Future.delayed(
-      Duration(milliseconds: 300),
+    await Future.delayed(Duration(milliseconds: 300));
+    final retryStatus = await retry(
+      task: checkService,
+      retryIf: (status) => status != WindowsHelperServiceStatus.running,
+      delay: commonDuration,
     );
-
-    return res;
+    return res && retryStatus == WindowsHelperServiceStatus.running;
   }
 
   Future<bool> registerTask(String appName) async {
-    final taskXml = '''
+    final taskXml =
+        '''
 <?xml version="1.0" encoding="UTF-16"?>
 <Task version="1.3" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <Principals>
@@ -295,8 +307,9 @@ class Windows {
 </Task>''';
     final taskPath = join(await appPath.tempPath, 'task.xml');
     await File(taskPath).create(recursive: true);
-    await File(taskPath)
-        .writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
+    await File(
+      taskPath,
+    ).writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
     final commandLine = [
       '/Create',
       '/TN',
@@ -305,10 +318,7 @@ class Windows {
       '%s',
       '/F',
     ].join(' ');
-    return runas(
-      'schtasks',
-      commandLine.replaceFirst('%s', taskPath),
-    );
+    return runas('schtasks', commandLine.replaceFirst('%s', taskPath));
   }
 }
 
@@ -337,23 +347,25 @@ class MacOS {
       return null;
     }
     final device = lineSplits[1];
-    final serviceResult = await Process.run(
-      'networksetup',
-      ['-listnetworkserviceorder'],
-    );
+    final serviceResult = await Process.run('networksetup', [
+      '-listnetworkserviceorder',
+    ]);
     final serviceResultOutput = serviceResult.stdout.toString();
-    final currentService = serviceResultOutput.split('\n\n').firstWhere(
-          (s) => s.contains('Device: $device'),
-          orElse: () => '',
-        );
+    final currentService = serviceResultOutput
+        .split('\n\n')
+        .firstWhere((s) => s.contains('Device: $device'), orElse: () => '');
     if (currentService.isEmpty) {
       return null;
     }
-    final currentServiceNameLine = currentService.split('\n').firstWhere(
-        (line) => RegExp(r'^\(\d+\).*').hasMatch(line),
-        orElse: () => '');
-    final currentServiceNameLineSplits =
-        currentServiceNameLine.trim().split(' ');
+    final currentServiceNameLine = currentService
+        .split('\n')
+        .firstWhere(
+          (line) => RegExp(r'^\(\d+\).*').hasMatch(line),
+          orElse: () => '',
+        );
+    final currentServiceNameLineSplits = currentServiceNameLine.trim().split(
+      ' ',
+    );
     if (currentServiceNameLineSplits.length < 2) {
       return null;
     }
@@ -365,10 +377,10 @@ class MacOS {
     if (deviceServiceName == null) {
       return null;
     }
-    final result = await Process.run(
-      'networksetup',
-      ['-getdnsservers', deviceServiceName],
-    );
+    final result = await Process.run('networksetup', [
+      '-getdnsservers',
+      deviceServiceName,
+    ]);
     final output = result.stdout.toString().trim();
     if (output.startsWith("There aren't any DNS Servers set on")) {
       originDns = [];
@@ -400,15 +412,12 @@ class MacOS {
     if (nextDns == null) {
       return;
     }
-    await Process.run(
-      'networksetup',
-      [
-        '-setdnsservers',
-        serviceName,
-        if (nextDns.isNotEmpty) ...nextDns,
-        if (nextDns.isEmpty) 'Empty',
-      ],
-    );
+    await Process.run('networksetup', [
+      '-setdnsservers',
+      serviceName,
+      if (nextDns.isNotEmpty) ...nextDns,
+      if (nextDns.isEmpty) 'Empty',
+    ]);
   }
 }
 

lib/common/utils.dart

@@ -8,7 +8,6 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:lpinyin/lpinyin.dart';
 
 class Utils {
   Color? getDelayColor(int? delay) {
@@ -21,16 +20,15 @@ class Utils {
   String get id {
     final timestamp = DateTime.now().microsecondsSinceEpoch;
     final random = Random();
-    final randomStr =
-        String.fromCharCodes(List.generate(8, (_) => random.nextInt(26) + 97));
+    final randomStr = String.fromCharCodes(
+      List.generate(8, (_) => random.nextInt(26) + 97),
+    );
     return '$timestamp$randomStr';
   }
 
   String getDateStringLast2(int value) {
     var valueRaw = '0$value';
-    return valueRaw.substring(
-      valueRaw.length - 2,
-    );
+    return valueRaw.substring(valueRaw.length - 2);
   }
 
   String generateRandomString({int minLength = 10, int maxLength = 100}) {
@@ -43,8 +41,9 @@ class Utils {
     String result = '';
     for (int i = 0; i < length; i++) {
       if (random.nextBool()) {
-        result +=
-            String.fromCharCode(0x4E00 + random.nextInt(0x9FA5 - 0x4E00 + 1));
+        result += String.fromCharCode(
+          0x4E00 + random.nextInt(0x9FA5 - 0x4E00 + 1),
+        );
       } else {
         result += latinChars[random.nextInt(latinChars.length)];
       }
@@ -60,8 +59,9 @@ class Utils {
     bytes[6] = (bytes[6] & 0x0F) | 0x40;
     bytes[8] = (bytes[8] & 0x3F) | 0x80;
 
-    final hex =
-        bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+    final hex = bytes
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join();
 
     return '${hex.substring(0, 8)}-${hex.substring(8, 12)}-${hex.substring(12, 16)}-${hex.substring(16, 20)}-${hex.substring(20, 32)}';
   }
@@ -102,9 +102,10 @@ class Utils {
     }
     if (localSplit.length == 3) {
       return Locale.fromSubtags(
-          languageCode: localSplit[0],
-          scriptCode: localSplit[1],
-          countryCode: localSplit[2]);
+        languageCode: localSplit[0],
+        scriptCode: localSplit[1],
+        countryCode: localSplit[2],
+      );
     }
     return null;
   }
@@ -141,9 +142,7 @@ class Utils {
     }
   }
 
-  String getTrayIconPath({
-    required Brightness brightness,
-  }) {
+  String getTrayIconPath({required Brightness brightness}) {
     if (system.isMacOS) {
       return 'assets/images/icon_white.png';
     }
@@ -178,26 +177,30 @@ class Utils {
     return build1.compareTo(build2);
   }
 
-  String getPinyin(String value) {
-    return value.isNotEmpty
-        ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
-        : '';
-  }
+  // String getPinyin(String value) {
+  //   return value.isNotEmpty
+  //       ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
+  //       : '';
+  // }
 
   String? getFileNameForDisposition(String? disposition) {
     if (disposition == null) return null;
     final parseValue = HeaderValue.parse(disposition);
     final parameters = parseValue.parameters;
-    final fileNamePointKey = parameters.keys
-        .firstWhere((key) => key == 'filename*', orElse: () => '');
+    final fileNamePointKey = parameters.keys.firstWhere(
+      (key) => key == 'filename*',
+      orElse: () => '',
+    );
     if (fileNamePointKey.isNotEmpty) {
       final res = parameters[fileNamePointKey]?.split("''") ?? [];
       if (res.length >= 2) {
         return Uri.decodeComponent(res[1]);
       }
     }
-    final fileNameKey = parameters.keys
-        .firstWhere((key) => key == 'filename', orElse: () => '');
+    final fileNameKey = parameters.keys.firstWhere(
+      (key) => key == 'filename',
+      orElse: () => '',
+    );
     if (fileNameKey.isEmpty) return null;
     return parameters[fileNameKey];
   }
@@ -224,7 +227,7 @@ class Utils {
   }
 
   int getProxiesColumns(double viewWidth, ProxiesLayout proxiesLayout) {
-    final columns = max((viewWidth / 300).ceil(), 2);
+    final columns = max((viewWidth / 250).ceil(), 2);
     return switch (proxiesLayout) {
       ProxiesLayout.tight => columns + 1,
       ProxiesLayout.standard => columns,
@@ -233,22 +236,10 @@ class Utils {
   }
 
   int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 320).floor(), 1);
+    return max((viewWidth / 280).floor(), 1);
   }
 
-  final _indexPrimary = [
-    50,
-    100,
-    200,
-    300,
-    400,
-    500,
-    600,
-    700,
-    800,
-    850,
-    900,
-  ];
+  final _indexPrimary = [50, 100, 200, 300, 400, 500, 600, 700, 800, 850, 900];
 
   MaterialColor _createPrimarySwatch(Color color) {
     final Map<int, Color> swatch = <int, Color>{};
@@ -302,16 +293,15 @@ class Utils {
   }
 
   Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list(
-      includeLoopback: false,
-    )
-      ..sort((a, b) {
-        if (a.isWifi && !b.isWifi) return -1;
-        if (!a.isWifi && b.isWifi) return 1;
-        if (a.includesIPv4 && !b.includesIPv4) return -1;
-        if (!a.includesIPv4 && b.includesIPv4) return 1;
-        return 0;
-      });
+    List<NetworkInterface> interfaces =
+        await NetworkInterface.list(includeLoopback: false)
+          ..sort((a, b) {
+            if (a.isWifi && !b.isWifi) return -1;
+            if (!a.isWifi && b.isWifi) return 1;
+            if (a.includesIPv4 && !b.includesIPv4) return -1;
+            if (!a.includesIPv4 && b.includesIPv4) return 1;
+            return 0;
+          });
     for (final interface in interfaces) {
       final addresses = interface.addresses;
       if (addresses.isEmpty) {
@@ -329,65 +319,18 @@ class Utils {
 
   SingleActivator controlSingleActivator(LogicalKeyboardKey trigger) {
     final control = system.isMacOS ? false : true;
-    return SingleActivator(
-      trigger,
-      control: control,
-      meta: !control,
-    );
+    return SingleActivator(trigger, control: control, meta: !control);
   }
 
-  // dynamic convertYamlNode(dynamic node) {
-  //   if (node is YamlMap) {
-  //     final map = <String, dynamic>{};
-  //     YamlNode? mergeKeyNode;
-  //     for (final entry in node.nodes.entries) {
-  //       if (entry.key is YamlScalar &&
-  //           (entry.key as YamlScalar).value == '<<') {
-  //         mergeKeyNode = entry.value;
-  //         break;
-  //       }
-  //     }
-  //     if (mergeKeyNode != null) {
-  //       final mergeValue = mergeKeyNode.value;
-  //       if (mergeValue is YamlMap) {
-  //         map.addAll(convertYamlNode(mergeValue) as Map<String, dynamic>);
-  //       } else if (mergeValue is YamlList) {
-  //         for (final node in mergeValue.nodes) {
-  //           if (node.value is YamlMap) {
-  //             map.addAll(convertYamlNode(node.value) as Map<String, dynamic>);
-  //           }
-  //         }
-  //       }
-  //     }
-  //
-  //     node.nodes.forEach((key, value) {
-  //       String stringKey;
-  //       if (key is YamlScalar) {
-  //         stringKey = key.value.toString();
-  //       } else {
-  //         stringKey = key.toString();
-  //       }
-  //       map[stringKey] = convertYamlNode(value.value);
-  //     });
-  //     return map;
-  //   } else if (node is YamlList) {
-  //     final list = <dynamic>[];
-  //     for (final item in node.nodes) {
-  //       list.add(convertYamlNode(item.value));
-  //     }
-  //     return list;
-  //   } else if (node is YamlScalar) {
-  //     return node.value;
-  //   }
-  //   return node;
-  // }
-
-  FutureOr<T> handleWatch<T>(Function function) async {
+  FutureOr<T> handleWatch<T>({
+    required Function function,
+    required void Function(T data, int elapsedMilliseconds) onWatch,
+  }) async {
     if (kDebugMode) {
       final stopwatch = Stopwatch()..start();
       final res = await function();
       stopwatch.stop();
-      commonPrint.log('耗时：${stopwatch.elapsedMilliseconds} ms');
+      onWatch(res, stopwatch.elapsedMilliseconds);
       return res;
     }
     return await function();