Add some scenes auto close connections

Support proxies query

Optimize more details

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,57 @@
+name: 问题反馈 / Bug report
+title: "[BUG] "
+description: 反馈你遇到的问题 / Report the issue you are experiencing
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 在提交问题之前，请确认以下事项：
+        1. 请务必给issue填写一个简洁明了的标题，以便他人快速检索
+        2. 请确保[已有的问题](https://github.com/chen08209/FlClash/issues?q=is%3Aissue) 中没有人提交过相似issue，否则请在已有的issue下进行讨论
+        3. 请务必按照模板规范详细描述问题，否则issue将会被直接关闭
+        ## Before submitting the issue, please make sure of the following checklist:
+        1. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
+        2. Please make sure there is no similar issue in the [existing issues](https://github.com/chen08209/FlClash/issues?q=is%3Aissue), otherwise please discuss under the existing issue
+        3. Please describe the problem in detail according to the template specification, otherwise issue will be closed directly.
+  - type: textarea
+    id: description
+    attributes:
+      label: 问题描述 / Describe the bug
+      description: 详细清晰地描述你遇到的问题，并配合截图 / Describe the problem you encountered in detail and clearly, and provide screenshots
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 软件版本 / Version
+      description: 请提供FlClash的具体版本 / Please provide the specific version of FlClash.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 复现步骤 / To Reproduce
+      description: 请提供复现问题的步骤 / Steps to reproduce the behavior
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: 操作系统 / OS
+      options:
+        - Android
+        - Windows
+        - MacOS
+        - Linux
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 操作系统版本 / OS Version
+      description: 请提供你的操作系统版本，Linux请额外提供桌面环境及窗口系统 / Please provide your OS version, for Linux, please also provide the desktop environment and window system
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 日志(勿上传日志文件，请粘贴日志内容) / Log (Do not upload the log file, paste the log content directly)
+      description: 请提供完整或相关部分的Debug日志（请在“软件左侧菜单”->“设置”->“日志等级”调整到debug / Please provide a complete or relevant Debug log (please adjust it to debug in the left menu of software-> Settings-> Log Level)
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: 讨论交流 / Communication
+    url: https://t.me/+G-veVtwBOl4wODc1
+    about: 在 Telegram 群组中与其他用户讨论交流 / Communicate with other users in the Telegram group

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,42 @@
+name: 功能请求 / Feature request
+title: "[Feature] "
+description: 提出你的功能请求 / Propose your feature request
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 在提交问题之前，请确认以下事项：
+        1. 请务必给issue填写一个简洁明了的标题，以便他人快速检索
+        2. 请确保[已有的问题](https://github.com/chen08209/FlClash/issues?q=is%3Aissue) 中没有人提交过相似issue，否则请在已有的issue下进行讨论
+        3. 请务必按照模板规范详细描述问题，否则issue将会被直接关闭
+        ## Before submitting the issue, please make sure of the following checklist:
+        1. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
+        2. Please make sure there is no similar issue in the [existing issues](https://github.com/chen08209/FlClash/issues?q=is%3Aissue), otherwise please discuss under the existing issue
+        3. Please describe the problem in detail according to the template specification, otherwise issue will be closed directly.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: 功能描述 / Feature description
+      description: 详细清晰地描述你的功能请求 / A clear and concise description of what the feature is
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 使用场景 / Use case
+      description: 请描述你的功能请求的使用场景 / Please describe the use case of your feature request
+    validations:
+      required: true
+  - type: checkboxes
+    id: os-labels
+    attributes:
+      label: 适用系统 / Target OS
+      description: 请选择该功能适用的操作系统（至少选择一个） / Please select the operating system(s) for this feature request (select at least one)
+      options:
+        - label: Android
+        - label: Windows
+        - label: MacOS
+        - label: Linux
+    validations:
+      required: true

.github/workflows/build.yaml

@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - 'v*'
+env:
+  IS_STABLE: ${{ !contains(github.ref, '-') }}
 
 jobs:
   build:
@@ -17,7 +19,7 @@ jobs:
             os: windows-latest
             arch: amd64
           - platform: linux
-            os: ubuntu-latest
+            os: ubuntu-22.04
             arch: amd64
           - platform: macos
             os: macos-13
@@ -25,29 +27,27 @@ jobs:
           - platform: macos
             os: macos-latest
             arch: arm64
+          - platform: windows
+            os: windows-11-arm
+            arch: arm64
+          - platform: linux
+            os: ubuntu-24.04-arm
+            arch: arm64
 
     steps:
+      - name: Setup rust
+        if: startsWith(matrix.os, 'windows-11-arm')
+        run: |
+          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
+          .\rustup-init.exe -y --default-toolchain stable
+          $cargoPath = "$env:USERPROFILE\.cargo\bin"
+          Add-Content $env:GITHUB_PATH $cargoPath
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Setup JAVA
-        if: startsWith(matrix.platform,'android')
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Setup NDK
-        if: startsWith(matrix.platform,'android')
-        uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r26b
-          add-to-path: true
-          link-to-sdk: true
-
       - name: Setup Android Signing
         if: startsWith(matrix.platform,'android')
         run: |
@@ -56,25 +56,24 @@ jobs:
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
 
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 'stable'
+          go-version: '1.24.0'
           cache-dependency-path: |
             core/go.sum
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: stable
+          channel: ${{ (startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) && 'master' || 'stable' }}
           cache: true
 
       - name: Get Flutter Dependency
         run: flutter pub get
 
       - name: Setup
-        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
+        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }} ${{ env.IS_STABLE == 'true' && '--env stable' || '' }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
@@ -88,14 +87,13 @@ jobs:
     needs: [ build ]
     steps:
       - name: Checkout
-        if: ${{ !contains(github.ref, '+') }}
         uses: actions/checkout@v4
+        if: ${{ env.IS_STABLE == 'true' }}
         with:
           fetch-depth: 0
           ref: refs/heads/main
-
       - name: Generate
-        if: ${{ !contains(github.ref, '+') }}
+        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)
@@ -127,7 +125,7 @@ jobs:
           cat NEW_CHANGELOG.md > CHANGELOG.md
 
       - name: Commit
-        if: ${{ !contains(github.ref, '+') }}
+        if: ${{ env.IS_STABLE == 'true' }}
         run: |
           git add CHANGELOG.md
           if ! git diff --cached --quiet; then
@@ -203,32 +201,41 @@ jobs:
         env:
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
           TAG: ${{ github.ref_name }}
+          RUN_ID: ${{ github.run_id }}
         run: |
           python -m pip install --upgrade pip
           pip install requests
-          python release.py
+          python release_telegram.py
 
       - name: Patch release.md
         run: |
           version=$(echo "${{ github.ref_name }}" | sed 's/^v//')
           sed "s|VERSION|$version|g" ./.github/release_template.md >> release.md
 
+      - name: Generate sha256
+        if: env.IS_STABLE == 'true'
+        run: |
+          cd ./dist
+          for file in $(find . -type f -not -name "*.sha256"); do
+            sha256sum "$file" > "${file}.sha256"
+          done  
+
       - name: Release
-        if: ${{ !contains(github.ref, '+') }}
+        if: ${{ env.IS_STABLE == 'true' }}
         uses: softprops/action-gh-release@v2
         with:
           files: ./dist/*
           body_path: './release.md'
 
       - name: Create Fdroid Source Dir
-        if: ${{ !contains(github.ref, '+') }}
+        if: ${{ env.IS_STABLE == 'true' }}
         run: |
           mkdir -p ./tmp
           cp ./dist/*android-arm64-v8a* ./tmp/ || true
           echo "Files copied successfully"
 
       - name: Push to fdroid repo
-        if: ${{ !contains(github.ref, '+') }}
+        if: ${{ env.IS_STABLE == 'true' }}
         uses: cpina/github-action-push-to-another-repository@v1.7.2
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -238,7 +245,7 @@ jobs:
           destination-repository-name: FlClash-fdroid-repo
           user-name: 'github-actions[bot]'
           user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: action-pr
+          target-branch: main
           commit-message: Update from ${{ github.ref_name }}
           target-directory: /tmp/
 

.gitmodules

@@ -1,14 +1,10 @@
 [submodule "core/Clash.Meta"]
 	path = core/Clash.Meta
 	url = git@github.com:chen08209/Clash.Meta.git
-	branch = FlClash-Alpha
+	branch = FlClash
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
 	branch = FlClash
-[submodule "plugins/tray_manager"]
-	path = plugins/tray_manager
-	url = git@github.com:chen08209/tray_manager.git
-	branch = main
 
 

CHANGELOG.md

@@ -1,3 +1,95 @@
+## 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

Makefile

@@ -0,0 +1,10 @@
+android_arm64:
+	dart ./setup.dart android --arch arm64
+macos_arm64:
+	dart ./setup.dart macos --arch arm64
+android_app:
+	dart ./setup.dart android
+android_arm64_core:
+	dart ./setup.dart android --arch arm64 --out core
+macos_arm64_core:
+	dart ./setup.dart macos --arch arm64  --out core

README.md

@@ -41,8 +41,8 @@ on Mobile:
 ⚠️ Make sure to install the following dependencies before using them
 
    ```bash
-    sudo apt-get install appindicator3-0.1 libappindicator3-dev
-    sudo apt-get install keybinder-3.0
+    sudo apt-get install libayatana-appindicator3-dev
+    sudo apt-get install libkeybinder-3.0-dev
    ```
 
 ### Android

README_zh_CN.md

@@ -41,8 +41,8 @@ on Mobile:
 ⚠️ 使用前请确保安装以下依赖
 
    ```bash
-    sudo apt-get install appindicator3-0.1 libappindicator3-dev
-    sudo apt-get install keybinder-3.0
+    sudo apt-get install libayatana-appindicator3-dev
+    sudo apt-get install libkeybinder-3.0-dev
    ```
 
 ### Android

analysis_options.yaml

@@ -1,8 +1 @@
 include: package:flutter_lints/flutter.yaml
-
-linter:
-  rules:
-
-analyzer:
-  plugins:
-    - custom_lint

android/app/build.gradle

@@ -1,5 +1,3 @@
-import com.android.build.gradle.tasks.MergeSourceSetFolders
-
 plugins {
     id "com.android.application"
     id "kotlin-android"
@@ -33,8 +31,8 @@ def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias
 
 android {
     namespace "com.follow.clash"
-    compileSdkVersion 34
-    ndkVersion "27.1.12297006"
+    compileSdk 35
+    ndkVersion = "28.0.13004108"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -48,6 +46,7 @@ android {
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+    
     signingConfigs {
         if (isRelease) {
             release {
@@ -63,7 +62,7 @@ android {
     defaultConfig {
         applicationId "com.follow.clash"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -74,6 +73,7 @@ android {
             applicationIdSuffix '.debug'
         }
         release {
+            debuggable false
             if (isRelease) {
                 signingConfig signingConfigs.release
             } else {
@@ -84,31 +84,15 @@ android {
     }
 }
 
-tasks.register('copyNativeLibs', Copy) {
-    delete('src/main/jniLibs')
-    from('../../libclash/android')
-    into('src/main/jniLibs')
-}
-
-tasks.withType(MergeSourceSetFolders).configureEach {
-    dependsOn copyNativeLibs
-}
-
 flutter {
     source '../..'
 }
 
 dependencies {
+    implementation project(":core")
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation("com.android.tools.smali:smali-dexlib2:3.0.7") {
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation("com.android.tools.smali:smali-dexlib2:3.0.9") {
         exclude group: "com.google.guava", module: "guava"
     }
-}
-
-
-afterEvaluate {
-    assembleDebug.dependsOn copyNativeLibs
-
-    assembleRelease.dependsOn copyNativeLibs
-}
+}

android/app/src/debug/AndroidManifest.xml

@@ -1,13 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <application android:label="FlClash Debug" tools:replace="android:label">
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:label="FlClash Debug"
+        tools:replace="android:label">
         <service
-                android:name=".services.FlClashTileService"
-                android:label="FlClash Debug"
-                tools:replace="android:label">
-        </service>
+            android:name=".services.FlClashTileService"
+            android:label="FlClash Debug"
+            tools:replace="android:label"
+            tools:targetApi="24" />
     </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -10,14 +10,12 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
-        tools:ignore="SystemPermissionTypo" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
@@ -46,6 +44,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
@@ -64,7 +63,9 @@
             </intent-filter>
         </activity>
 
-        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableImpeller"
+            android:value="false" />
 
         <activity
             android:name=".TempActivity"
@@ -87,7 +88,6 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:foregroundServiceType="specialUse"
             android:icon="@drawable/ic_stat_name"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -125,7 +125,7 @@
         <service
             android:name=".services.FlClashVpnService"
             android:exported="false"
-            android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="dataSync"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -138,7 +138,7 @@
         <service
             android:name=".services.FlClashService"
             android:exported="false"
-            android:foregroundServiceType="specialUse">
+            android:foregroundServiceType="dataSync">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
                 android:value="service" />

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

@@ -1,7 +1,7 @@
 package com.follow.clash;
 
 import android.app.Application
-import android.content.Context;
+import android.content.Context
 
 class FlClashApplication : Application() {
     companion object {

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

@@ -1,9 +1,7 @@
 package com.follow.clash
 
-import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
 import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
@@ -22,6 +20,10 @@ enum class RunState {
 object GlobalState {
     val runLock = ReentrantLock()
 
+    const val NOTIFICATION_CHANNEL = "FlClash"
+
+    const val NOTIFICATION_ID = 1
+
     val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
     var flutterEngine: FlutterEngine? = null
     private var serviceEngine: FlutterEngine? = null

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

@@ -27,7 +27,6 @@ import java.util.concurrent.locks.ReentrantLock
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-
 suspend fun Drawable.getBase64(): String {
     val drawable = this
     return withContext(Dispatchers.IO) {

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

@@ -3,6 +3,7 @@ package com.follow.clash.models
 data class Package(
     val packageName: String,
     val label: String,
-    val isSystem: Boolean,
+    val system: Boolean,
+    val internet: Boolean,
     val lastUpdateTime: Long,
 )

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

@@ -291,19 +291,19 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private fun getPackages(): List<Package> {
         val packageManager = FlClashApplication.getAppContext().packageManager
         if (packages.isNotEmpty()) return packages
-        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
-            it.packageName != FlClashApplication.getAppContext().packageName
-                    || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                    || it.packageName == "android"
+        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS)
+            ?.filter {
+                it.packageName != FlClashApplication.getAppContext().packageName || it.packageName == "android"
 
-        }?.map {
-            Package(
-                packageName = it.packageName,
-                label = it.applicationInfo.loadLabel(packageManager).toString(),
-                isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1,
-                lastUpdateTime = it.lastUpdateTime
-            )
-        }?.let { packages.addAll(it) }
+            }?.map {
+                Package(
+                    packageName = it.packageName,
+                    label = it.applicationInfo?.loadLabel(packageManager).toString(),
+                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
+                    lastUpdateTime = it.lastUpdateTime,
+                    internet = it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                )
+            }?.let { packages.addAll(it) }
         return packages
     }
 
@@ -353,7 +353,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     suspend fun getText(text: String): String? {
-        return withContext(Dispatchers.Default){
+        return withContext(Dispatchers.Default) {
             channel.awaitResult<String>("getText", text)
         }
     }
@@ -391,31 +391,33 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             }.forEach {
                 if (it.name.matches(chinaAppRegex)) return true
             }
-            ZipFile(File(packageInfo.applicationInfo.publicSourceDir)).use {
-                for (packageEntry in it.entries()) {
-                    if (packageEntry.name.startsWith("firebase-")) return false
-                }
-                for (packageEntry in it.entries()) {
-                    if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
-                            ".dex"
-                        ))
-                    ) {
-                        continue
+            packageInfo.applicationInfo?.publicSourceDir?.let {
+                ZipFile(File(it)).use {
+                    for (packageEntry in it.entries()) {
+                        if (packageEntry.name.startsWith("firebase-")) return false
                     }
-                    if (packageEntry.size > 15000000) {
-                        return true
-                    }
-                    val input = it.getInputStream(packageEntry).buffered()
-                    val dexFile = try {
-                        DexBackedDexFile.fromInputStream(null, input)
-                    } catch (e: Exception) {
-                        return false
-                    }
-                    for (clazz in dexFile.classes) {
-                        val clazzName =
-                            clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
-                                .replace("$", ".")
-                        if (clazzName.matches(chinaAppRegex)) return true
+                    for (packageEntry in it.entries()) {
+                        if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
+                                ".dex"
+                            ))
+                        ) {
+                            continue
+                        }
+                        if (packageEntry.size > 15000000) {
+                            return true
+                        }
+                        val input = it.getInputStream(packageEntry).buffered()
+                        val dexFile = try {
+                            DexBackedDexFile.fromInputStream(null, input)
+                        } catch (e: Exception) {
+                            return false
+                        }
+                        for (clazz in dexFile.classes) {
+                            val clazzName =
+                                clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
+                                    .replace("$", ".")
+                            if (clazzName.matches(chinaAppRegex)) return true
+                        }
                     }
                 }
             }

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

@@ -1,6 +1,5 @@
 package com.follow.clash.plugins
 
-import com.follow.clash.FlClashApplication
 import com.follow.clash.GlobalState
 import com.follow.clash.models.VpnOptions
 import com.google.gson.Gson
@@ -53,7 +52,6 @@ data object ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     private fun handleDestroy() {
-        GlobalState.getCurrentVPNPlugin()?.handleStop()
         GlobalState.destroyServiceEngine()
     }
 }

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

@@ -10,15 +10,13 @@ import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import android.os.Build
 import android.os.IBinder
-import android.util.Log
 import androidx.core.content.getSystemService
 import com.follow.clash.FlClashApplication
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
+import com.follow.clash.core.Core
 import com.follow.clash.extensions.awaitResult
-import com.follow.clash.extensions.getProtocol
 import com.follow.clash.extensions.resolveDns
-import com.follow.clash.models.Process
 import com.follow.clash.models.StartForegroundParams
 import com.follow.clash.models.VpnOptions
 import com.follow.clash.services.BaseServiceInterface
@@ -41,10 +39,12 @@ import kotlin.concurrent.withLock
 data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     private lateinit var flutterMethodChannel: MethodChannel
     private var flClashService: BaseServiceInterface? = null
-    private lateinit var options: VpnOptions
+    private var options: VpnOptions? = null
+    private var isBind: Boolean = false
     private lateinit var scope: CoroutineScope
     private var lastStartForegroundParams: StartForegroundParams? = null
     private var timerJob: Job? = null
+    private val uidPageNameMap = mutableMapOf<Int, String>()
 
     private val connectivity by lazy {
         FlClashApplication.getAppContext().getSystemService<ConnectivityManager>()
@@ -52,6 +52,7 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            isBind = true
             flClashService = when (service) {
                 is FlClashVpnService.LocalBinder -> service.getService()
                 is FlClashService.LocalBinder -> service.getService()
@@ -61,6 +62,7 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         }
 
         override fun onServiceDisconnected(arg: ComponentName) {
+            isBind = false
             flClashService = null
         }
     }
@@ -91,62 +93,6 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
                 result.success(true)
             }
 
-            "setProtect" -> {
-                val fd = call.argument<Int>("fd")
-                if (fd != null && flClashService is FlClashVpnService) {
-                    try {
-                        (flClashService as FlClashVpnService).protect(fd)
-                        result.success(true)
-                    } catch (e: RuntimeException) {
-                        result.success(false)
-                    }
-                } else {
-                    result.success(false)
-                }
-            }
-
-            "resolverProcess" -> {
-                val data = call.argument<String>("data")
-                val process = if (data != null) Gson().fromJson(
-                    data, Process::class.java
-                ) else null
-                val metadata = process?.metadata
-                if (metadata == null) {
-                    result.success(null)
-                    return
-                }
-                val protocol = metadata.getProtocol()
-                if (protocol == null) {
-                    result.success(null)
-                    return
-                }
-                scope.launch {
-                    withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val dst = InetSocketAddress(
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
-                        if (uid == null || uid == -1) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        val packages =
-                            FlClashApplication.getAppContext().packageManager?.getPackagesForUid(uid)
-                        result.success(packages?.first())
-                    }
-                }
-            }
-
             else -> {
                 result.notImplemented()
             }
@@ -154,6 +100,9 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     fun handleStart(options: VpnOptions): Boolean {
+        if (options.enable != this.options?.enable) {
+            this.flClashService = null
+        }
         this.options = options
         when (options.enable) {
             true -> handleStartVpn()
@@ -163,10 +112,9 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     private fun handleStartVpn() {
-        GlobalState.getCurrentAppPlugin()
-            ?.requestVpnPermission {
-                handleStartService()
-            }
+        GlobalState.getCurrentAppPlugin()?.requestVpnPermission {
+            handleStartService()
+        }
     }
 
     fun requestGc() {
@@ -220,8 +168,10 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         try {
             if (GlobalState.runState.value != RunState.START) return
             val data = flutterMethodChannel.awaitResult<String>("getStartForegroundParams")
-            val startForegroundParams = Gson().fromJson(
+            val startForegroundParams = if (data != null) Gson().fromJson(
                 data, StartForegroundParams::class.java
+            ) else StartForegroundParams(
+                title = "", content = ""
             )
             if (lastStartForegroundParams != startForegroundParams) {
                 lastStartForegroundParams = startForegroundParams
@@ -236,6 +186,7 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     private fun startForegroundJob() {
+        stopForegroundJob()
         timerJob = CoroutineScope(Dispatchers.Main).launch {
             while (isActive) {
                 startForeground()
@@ -257,26 +208,58 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         GlobalState.runLock.withLock {
             if (GlobalState.runState.value == RunState.START) return
             GlobalState.runState.value = RunState.START
-            val fd = flClashService?.start(options)
-            flutterMethodChannel.invokeMethod(
-                "started", fd
+            val fd = flClashService?.start(options!!)
+            Core.startTun(
+                fd = fd ?: 0,
+                protect = this::protect,
+                resolverProcess = this::resolverProcess,
             )
-            startForegroundJob();
+            startForegroundJob()
         }
     }
 
+    private fun protect(fd: Int): Boolean {
+        return (flClashService as? FlClashVpnService)?.protect(fd) == true
+    }
+
+    private fun resolverProcess(
+        protocol: Int,
+        source: InetSocketAddress,
+        target: InetSocketAddress,
+        uid: Int,
+    ): String {
+        val nextUid = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            connectivity?.getConnectionOwnerUid(protocol, source, target) ?: -1
+        } else {
+            uid
+        }
+        if (nextUid == -1) {
+            return ""
+        }
+        if (!uidPageNameMap.containsKey(nextUid)) {
+            uidPageNameMap[nextUid] =
+                FlClashApplication.getAppContext().packageManager?.getPackagesForUid(nextUid)
+                    ?.first() ?: ""
+        }
+        return uidPageNameMap[nextUid] ?: ""
+    }
+
     fun handleStop() {
         GlobalState.runLock.withLock {
             if (GlobalState.runState.value == RunState.STOP) return
             GlobalState.runState.value = RunState.STOP
             stopForegroundJob()
+            Core.stopTun()
             flClashService?.stop()
             GlobalState.handleTryDestroy()
         }
     }
 
     private fun bindService() {
-        val intent = when (options.enable) {
+        if (isBind) {
+            FlClashApplication.getAppContext().unbindService(connection)
+        }
+        val intent = when (options?.enable == true) {
             true -> Intent(FlClashApplication.getAppContext(), FlClashVpnService::class.java)
             false -> Intent(FlClashApplication.getAppContext(), FlClashService::class.java)
         }

android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt

@@ -1,6 +1,26 @@
 package com.follow.clash.services
 
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import com.follow.clash.GlobalState
+import com.follow.clash.MainActivity
+import com.follow.clash.R
+import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.models.VpnOptions
+import io.flutter.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 
 interface BaseServiceInterface {
 
@@ -9,4 +29,70 @@ interface BaseServiceInterface {
     fun stop()
 
     suspend fun startForeground(title: String, content: String)
+}
+
+fun Service.createFlClashNotificationBuilder(): Deferred<NotificationCompat.Builder> =
+    CoroutineScope(Dispatchers.Main).async {
+        val stopText = GlobalState.getText("stop")
+        val intent = Intent(this@createFlClashNotificationBuilder, MainActivity::class.java)
+
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
+                this@createFlClashNotificationBuilder,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        } else {
+            PendingIntent.getActivity(
+                this@createFlClashNotificationBuilder, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+
+        with(
+            NotificationCompat.Builder(
+                this@createFlClashNotificationBuilder, GlobalState.NOTIFICATION_CHANNEL
+            )
+        ) {
+            setSmallIcon(R.drawable.ic_stat_name)
+            setContentTitle("FlClash")
+            setContentIntent(pendingIntent)
+            setCategory(NotificationCompat.CATEGORY_SERVICE)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+            }
+            setOngoing(true)
+            addAction(
+                0, stopText, getActionPendingIntent("STOP")
+            )
+            setShowWhen(false)
+            setOnlyAlertOnce(true)
+        }
+    }
+
+@SuppressLint("ForegroundServiceType")
+fun Service.startForeground(notification: Notification) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val manager = getSystemService(NotificationManager::class.java)
+        var channel = manager?.getNotificationChannel(GlobalState.NOTIFICATION_CHANNEL)
+        if (channel == null) {
+            Log.d("[FlClash]","createNotificationChannel===>")
+            channel = NotificationChannel(
+                GlobalState.NOTIFICATION_CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW
+            )
+            manager?.createNotificationChannel(channel)
+        }
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        try {
+            startForeground(
+                GlobalState.NOTIFICATION_ID, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            )
+        } catch (_: Exception) {
+            startForeground(GlobalState.NOTIFICATION_ID, notification)
+        }
+    } else {
+        startForeground(GlobalState.NOTIFICATION_ID, notification)
+    }
 }

android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt

@@ -1,29 +1,51 @@
 package com.follow.clash.services
 
 import android.annotation.SuppressLint
-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
 import android.app.Service
 import android.content.Intent
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
-import com.follow.clash.MainActivity
-import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.models.VpnOptions
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 
 
 class FlClashService : Service(), BaseServiceInterface {
 
+    override fun start(options: VpnOptions) = 0
+
+    override fun stop() {
+        stopSelf()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        }
+    }
+    
+    private var cachedBuilder: NotificationCompat.Builder? = null
+
+    private suspend fun notificationBuilder(): NotificationCompat.Builder {
+        if (cachedBuilder == null) {
+            cachedBuilder = createFlClashNotificationBuilder().await()
+        }
+        return cachedBuilder!!
+    }
+
+    @SuppressLint("ForegroundServiceType")
+    override suspend fun startForeground(title: String, content: String) {
+        startForeground(
+            notificationBuilder()
+                .setContentTitle(title)
+                .setContentText(content).build()
+        )
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        GlobalState.getCurrentVPNPlugin()?.requestGc()
+    }
+
+
     private val binder = LocalBinder()
 
     inner class LocalBinder : Binder() {
@@ -38,87 +60,8 @@ class FlClashService : Service(), BaseServiceInterface {
         return super.onUnbind(intent)
     }
 
-    private val CHANNEL = "FlClash"
-
-    private val notificationId: Int = 1
-
-    private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
-        CoroutineScope(Dispatchers.Main).async {
-            val stopText = GlobalState.getText("stop")
-
-            val intent = Intent(
-                this@FlClashService, MainActivity::class.java
-            )
-
-            val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-                PendingIntent.getActivity(
-                    this@FlClashService,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            } else {
-                PendingIntent.getActivity(
-                    this@FlClashService,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            }
-
-            with(NotificationCompat.Builder(this@FlClashService, CHANNEL)) {
-                setSmallIcon(com.follow.clash.R.drawable.ic_stat_name)
-                setContentTitle("FlClash")
-                setContentIntent(pendingIntent)
-                setCategory(NotificationCompat.CATEGORY_SERVICE)
-                priority = NotificationCompat.PRIORITY_MIN
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-                }
-                addAction(
-                    0,
-                    stopText, // 使用 suspend 函数获取的文本
-                    getActionPendingIntent("STOP")
-                )
-                setOngoing(true)
-                setShowWhen(false)
-                setOnlyAlertOnce(true)
-                setAutoCancel(true)
-            }
-        }
-    }
-    private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
-        return notificationBuilderDeferred.await()
-    }
-
-    override fun start(options: VpnOptions) = 0
-
-    override fun stop() {
-        stopSelf()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        }
-    }
-
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
-    override suspend fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
-        }
-        val notification =
-            getNotificationBuilder()
-                .setContentTitle(title)
-                .setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
-        }
+    override fun onDestroy() {
+        stop()
+        super.onDestroy()
     }
 }

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -1,12 +1,7 @@
 package com.follow.clash.services
 
 import android.annotation.SuppressLint
-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Intent
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Binder
@@ -17,18 +12,13 @@ import android.os.RemoteException
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
-import com.follow.clash.MainActivity
-import com.follow.clash.R
-import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.extensions.getIpv4RouteAddress
 import com.follow.clash.extensions.getIpv6RouteAddress
 import com.follow.clash.extensions.toCIDR
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 
 
@@ -43,28 +33,59 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
             if (options.ipv4Address.isNotEmpty()) {
                 val cidr = options.ipv4Address.toCIDR()
                 addAddress(cidr.address, cidr.prefixLength)
+                Log.d(
+                    "addAddress",
+                    "address: ${cidr.address} prefixLength:${cidr.prefixLength}"
+                )
                 val routeAddress = options.getIpv4RouteAddress()
                 if (routeAddress.isNotEmpty()) {
-                    routeAddress.forEach { i ->
-                        Log.d("addRoute4", "address: ${i.address} prefixLength:${i.prefixLength}")
-                        addRoute(i.address, i.prefixLength)
+                    try {
+                        routeAddress.forEach { i ->
+                            Log.d(
+                                "addRoute4",
+                                "address: ${i.address} prefixLength:${i.prefixLength}"
+                            )
+                            addRoute(i.address, i.prefixLength)
+                        }
+                    } catch (_: Exception) {
+                        addRoute("0.0.0.0", 0)
                     }
                 } else {
                     addRoute("0.0.0.0", 0)
                 }
+            } else {
+                addRoute("0.0.0.0", 0)
             }
-            if (options.ipv6Address.isNotEmpty()) {
-                val cidr = options.ipv6Address.toCIDR()
-                addAddress(cidr.address, cidr.prefixLength)
-                val routeAddress = options.getIpv6RouteAddress()
-                if (routeAddress.isNotEmpty()) {
-                    routeAddress.forEach { i ->
-                        Log.d("addRoute6", "address: ${i.address} prefixLength:${i.prefixLength}")
-                        addRoute(i.address, i.prefixLength)
+            try {
+                if (options.ipv6Address.isNotEmpty()) {
+                    val cidr = options.ipv6Address.toCIDR()
+                    Log.d(
+                        "addAddress6",
+                        "address: ${cidr.address} prefixLength:${cidr.prefixLength}"
+                    )
+                    addAddress(cidr.address, cidr.prefixLength)
+                    val routeAddress = options.getIpv6RouteAddress()
+                    if (routeAddress.isNotEmpty()) {
+                        try {
+                            routeAddress.forEach { i ->
+                                Log.d(
+                                    "addRoute6",
+                                    "address: ${i.address} prefixLength:${i.prefixLength}"
+                                )
+                                addRoute(i.address, i.prefixLength)
+                            }
+                        } catch (_: Exception) {
+                            addRoute("::", 0)
+                        }
+                    } else {
+                        addRoute("::", 0)
                     }
-                } else {
-                    addRoute("::", 0)
                 }
+            }catch (_:Exception){
+                Log.d(
+                    "addAddress6",
+                    "IPv6 is not supported."
+                )
             }
             addDnsServer(options.dnsServerAddress)
             setMtu(9000)
@@ -114,78 +135,22 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
         }
     }
 
-    private val CHANNEL = "FlClash"
+    private var cachedBuilder: NotificationCompat.Builder? = null
 
-    private val notificationId: Int = 1
-
-    private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
-        CoroutineScope(Dispatchers.Main).async {
-            val stopText = GlobalState.getText("stop")
-            val intent = Intent(this@FlClashVpnService, MainActivity::class.java)
-
-            val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-                PendingIntent.getActivity(
-                    this@FlClashVpnService,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            } else {
-                PendingIntent.getActivity(
-                    this@FlClashVpnService,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            }
-
-            with(NotificationCompat.Builder(this@FlClashVpnService, CHANNEL)) {
-                setSmallIcon(R.drawable.ic_stat_name)
-                setContentTitle("FlClash")
-                setContentIntent(pendingIntent)
-                setCategory(NotificationCompat.CATEGORY_SERVICE)
-                priority = NotificationCompat.PRIORITY_MIN
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-                }
-                setOngoing(true)
-                addAction(
-                    0,
-                    stopText,
-                    getActionPendingIntent("STOP")
-                )
-                setShowWhen(false)
-                setOnlyAlertOnce(true)
-                setAutoCancel(true)
-            }
+    private suspend fun notificationBuilder(): NotificationCompat.Builder {
+        if (cachedBuilder == null) {
+            cachedBuilder = createFlClashNotificationBuilder().await()
         }
+        return cachedBuilder!!
     }
 
-    private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
-        return notificationBuilderDeferred.await()
-    }
-
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
+    @SuppressLint("ForegroundServiceType")
     override suspend fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
-        }
-        val notification =
-            getNotificationBuilder()
+        startForeground(
+            notificationBuilder()
                 .setContentTitle(title)
-                .setContentText(content)
-                .build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
-        }
+                .setContentText(content).build()
+        )
     }
 
     override fun onTrimMemory(level: Int) {

android/build.gradle

@@ -24,6 +24,7 @@ subprojects {
 }
 subprojects {
     project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(':core')
 }
 
 tasks.register("clean", Delete) {

android/core/.gitignore

@@ -0,0 +1 @@
+/build

android/core/build.gradle.kts

@@ -0,0 +1,66 @@
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.argumentsWithVarargAsSingleArray
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.follow.clash.core"
+    compileSdk = 35
+    ndkVersion = "28.0.13004108"
+
+    defaultConfig {
+        minSdk = 21
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isJniDebuggable = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    sourceSets {
+        getByName("main") {
+            jniLibs.srcDirs("src/main/jniLibs")
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+            version = "3.22.1"
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+dependencies {
+    implementation("androidx.annotation:annotation-jvm:1.9.1")
+}
+
+val copyNativeLibs by tasks.register<Copy>("copyNativeLibs") {
+    doFirst {
+        delete("src/main/jniLibs")
+    }
+    from("../../libclash/android")
+    into("src/main/jniLibs")
+}
+
+afterEvaluate {
+    tasks.named("preBuild") {
+        dependsOn(copyNativeLibs)
+    }
+}

android/core/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android/core/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

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

@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.22.1)
+
+project("core")
+
+message("CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}")
+
+message("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")
+
+if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+    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)
+endif ()
+
+set(LIB_CLASH_PATH "${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libclash.so")
+
+message("LIB_CLASH_PATH ${LIB_CLASH_PATH}")
+if (EXISTS ${LIB_CLASH_PATH})
+    message("Found libclash.so for ABI ${ANDROID_ABI}")
+    add_compile_definitions(LIBCLASH)
+    include_directories(${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI})
+    link_directories(${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI})
+    add_library(${CMAKE_PROJECT_NAME} SHARED
+            jni_helper.cpp
+            core.cpp)
+    target_link_libraries(${CMAKE_PROJECT_NAME}
+            clash)
+else ()
+    message("Not found libclash.so for ABI ${ANDROID_ABI}")
+    add_library(${CMAKE_PROJECT_NAME} SHARED
+            jni_helper.cpp
+            core.cpp)
+    target_link_libraries(${CMAKE_PROJECT_NAME})
+endif ()

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

@@ -0,0 +1,72 @@
+#ifdef LIBCLASH
+#include <jni.h>
+#include "jni_helper.h"
+#include "libclash.h"
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject, const jint fd, jobject cb) {
+    const auto interface = new_global(cb);
+    startTUN(fd, interface);
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_follow_clash_core_Core_stopTun(JNIEnv *) {
+    stopTun();
+}
+
+
+static jmethodID m_tun_interface_protect;
+static jmethodID m_tun_interface_resolve_process;
+
+
+static void release_jni_object_impl(void *obj) {
+    ATTACH_JNI();
+    del_global(static_cast<jobject>(obj));
+}
+
+static void call_tun_interface_protect_impl(void *tun_interface, const int fd) {
+    ATTACH_JNI();
+    env->CallVoidMethod(static_cast<jobject>(tun_interface),
+                        m_tun_interface_protect,
+                        fd);
+}
+
+static const char *
+call_tun_interface_resolve_process_impl(void *tun_interface, int protocol,
+                                        const char *source,
+                                        const char *target,
+                                        const int uid) {
+    ATTACH_JNI();
+    const auto packageName = reinterpret_cast<jstring>(env->CallObjectMethod(static_cast<jobject>(tun_interface),
+                                                                       m_tun_interface_resolve_process,
+                                                                       protocol,
+                                                                       new_string(source),
+                                                                       new_string(target),
+                                                                       uid));
+    return get_string(packageName);
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void *) {
+    JNIEnv *env = nullptr;
+    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        return JNI_ERR;
+    }
+
+    initialize_jni(vm, env);
+
+    const auto c_tun_interface = find_class("com/follow/clash/core/TunInterface");
+
+    m_tun_interface_protect = find_method(c_tun_interface, "protect", "(I)V");
+    m_tun_interface_resolve_process = find_method(c_tun_interface, "resolverProcess",
+                                                  "(ILjava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
+
+    registerCallbacks(&call_tun_interface_protect_impl,
+                      &call_tun_interface_resolve_process_impl,
+                      &release_jni_object_impl);
+    return JNI_VERSION_1_6;
+}
+#endif

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

@@ -0,0 +1,71 @@
+#include "jni_helper.h"
+
+#include <cstdlib>
+#include <malloc.h>
+#include <cstring>
+
+static JavaVM *global_vm;
+
+static jclass c_string;
+static jmethodID m_new_string;
+static jmethodID m_get_bytes;
+
+void initialize_jni(JavaVM *vm, JNIEnv *env) {
+    global_vm = vm;
+
+    c_string = reinterpret_cast<jclass>(new_global(find_class("java/lang/String")));
+    m_new_string = find_method(c_string, "<init>", "([B)V");
+    m_get_bytes = find_method(c_string, "getBytes", "()[B");
+}
+
+JavaVM *global_java_vm() {
+    return global_vm;
+}
+
+char *jni_get_string(JNIEnv *env, jstring str) {
+    const auto array = reinterpret_cast<jbyteArray>(env->CallObjectMethod(str, m_get_bytes));
+    const int length = env->GetArrayLength(array);
+    const auto content = static_cast<char *>(malloc(length + 1));
+    env->GetByteArrayRegion(array, 0, length, reinterpret_cast<jbyte *>(content));
+    content[length] = 0;
+    return content;
+}
+
+jstring jni_new_string(JNIEnv *env, const char *str) {
+    const auto length = static_cast<int>(strlen(str));
+    const auto array = env->NewByteArray(length);
+    env->SetByteArrayRegion(array, 0, length, reinterpret_cast<const jbyte *>(str));
+    return reinterpret_cast<jstring>(env->NewObject(c_string, m_new_string, array));
+}
+
+int jni_catch_exception(JNIEnv *env) {
+    const int result = env->ExceptionCheck();
+    if (result) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+    return result;
+}
+
+void jni_attach_thread(scoped_jni *jni) {
+    JavaVM *vm = global_java_vm();
+    if (vm->GetEnv(reinterpret_cast<void **>(&jni->env), JNI_VERSION_1_6) == JNI_OK) {
+        jni->require_release = 0;
+        return;
+    }
+    if (vm->AttachCurrentThread(&jni->env, nullptr) != JNI_OK) {
+        abort();
+    }
+    jni->require_release = 1;
+}
+
+void jni_detach_thread(const scoped_jni *env) {
+    JavaVM *vm = global_java_vm();
+    if (env->require_release) {
+        vm->DetachCurrentThread();
+    }
+}
+
+void release_string(char **str) {
+    free(*str);
+}

android/core/src/main/cpp/jni_helper.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <jni.h>
+
+struct scoped_jni {
+    JNIEnv *env;
+    int require_release;
+};
+
+extern void initialize_jni(JavaVM *vm, JNIEnv *env);
+
+extern jstring jni_new_string(JNIEnv *env, const char *str);
+
+extern char *jni_get_string(JNIEnv *env, jstring str);
+
+extern int jni_catch_exception(JNIEnv *env);
+
+extern void jni_attach_thread(scoped_jni *jni);
+
+extern void jni_detach_thread(const scoped_jni *env);
+
+extern void release_string(char **str);
+
+#define ATTACH_JNI() __attribute__((unused, cleanup(jni_detach_thread))) \
+                    scoped_jni _jni{}; \
+                    jni_attach_thread(&_jni); \
+                    JNIEnv *env = _jni.env
+
+#define scoped_string __attribute__((cleanup(release_string))) char*
+
+#define find_class(name) env->FindClass(name)
+#define find_method(cls, name, signature) env->GetMethodID(cls, name, signature)
+#define new_global(obj) env->NewGlobalRef(obj)
+#define del_global(obj) env->DeleteGlobalRef(obj)
+#define get_string(jstr) jni_get_string(env, jstr)
+#define new_string(cstr) jni_new_string(env, cstr)

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

@@ -0,0 +1,50 @@
+package com.follow.clash.core
+
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.URL
+
+data object Core {
+    private external fun startTun(
+        fd: Int,
+        cb: TunInterface
+    )
+
+    private fun parseInetSocketAddress(address: String): InetSocketAddress {
+        val url = URL("https://$address")
+
+        return InetSocketAddress(InetAddress.getByName(url.host), url.port)
+    }
+
+    fun startTun(
+        fd: Int,
+        protect: (Int) -> Boolean,
+        resolverProcess: (protocol: Int, source: InetSocketAddress, target: InetSocketAddress, uid: Int) -> String
+    ) {
+        startTun(fd, object : TunInterface {
+            override fun protect(fd: Int) {
+                protect(fd)
+            }
+
+            override fun resolverProcess(
+                protocol: Int,
+                source: String,
+                target: String,
+                uid: Int
+            ): String {
+                return resolverProcess(
+                    protocol,
+                    parseInetSocketAddress(source),
+                    parseInetSocketAddress(target),
+                    uid,
+                )
+            }
+        });
+    }
+
+    external fun stopTun()
+
+    init {
+        System.loadLibrary("core")
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.follow.clash.core
+
+import androidx.annotation.Keep
+
+@Keep
+interface TunInterface {
+    fun protect(fd: Int)
+    fun resolverProcess(protocol: Int, source: String, target: String, uid: Int): String
+}

android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin_version=1.9.22
-agp_version=8.2.1
+agp_version=8.9.2

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 

android/settings.gradle

@@ -24,3 +24,4 @@ plugins {
 }
 
 include ":app"
+include ':core'

arb/intl_en.arb

@@ -123,7 +123,6 @@
   "project": "Project",
   "core": "Core",
   "tabAnimation": "Tab animation",
-  "tabAnimationDesc": "When enabled, the home tab will add a toggle animation",
   "desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
   "startVpn": "Starting VPN...",
   "stopVpn": "Stopping VPN...",
@@ -181,7 +180,6 @@
   "requests": "Requests",
   "requestsDesc": "View recently request records",
   "findProcessMode": "Find process",
-  "findProcessModeDesc": "There is a risk of flashback after opening",
   "init": "Init",
   "infiniteTime": "Long term effective",
   "expirationTime": "Expiration time",
@@ -249,7 +247,6 @@
   "stop": "Stop",
   "appDesc": "Processing app related settings",
   "vpnDesc": "Modify VPN related settings",
-  "generalDesc": "Overwrite general settings",
   "dnsDesc": "Update DNS related settings",
   "key": "Key",
   "value": "Value",
@@ -346,5 +343,62 @@
   "exportFile": "Export file",
   "cacheCorrupt": "The cache is corrupt. Do you want to clear it?",
   "detectionTip": "Relying on third-party api is for reference only",
-  "listen": "Listen"
+  "listen": "Listen",
+  "keyExists": "The current key already exists",
+  "valueExists": "The current value already exists",
+  "undo": "undo",
+  "redo": "redo",
+  "none": "none",
+  "basicConfig": "Basic configuration",
+  "basicConfigDesc": "Modify the basic configuration globally",
+  "selectedCountTitle": "{count} items have been selected",
+  "addRule": "Add rule",
+  "ruleProviderEmptyTip": "Rule provider cannot be empty",
+  "ruleName": "Rule name",
+  "content": "Content",
+  "contentEmptyTip": "Content cannot be empty",
+  "subRule": "Sub rule",
+  "subRuleEmptyTip": "Sub rule content cannot be empty",
+  "ruleTarget": "Rule target",
+  "ruleTargetEmptyTip": "Rule target cannot be empty",
+  "sourceIp": "Source IP",
+  "noResolve": "No resolve IP",
+  "getOriginRules": "Get original rules",
+  "overrideOriginRules": "Override the original rule",
+  "addedOriginRules": "Attach on the original rules",
+  "enableOverride": "Enable override",
+  "deleteRuleTip": "Are you sure you want to delete the selected rule?",
+  "saveChanges": "Do you want to save the changes?",
+  "generalDesc": "Modify general settings",
+  "findProcessModeDesc": "There is a certain performance loss after opening",
+  "tabAnimationDesc": "Effective only in mobile view",
+  "saveTip": "Are you sure you want to save?",
+  "deleteColorTip": "Are you sure you want to delete the current color?",
+  "colorExists": "Current color already exists",
+  "colorSchemes": "Color schemes",
+  "palette": "Palette",
+  "tonalSpotScheme": "TonalSpot",
+  "fidelityScheme": "Fidelity",
+  "monochromeScheme": "Monochrome",
+  "neutralScheme": "Neutral",
+  "vibrantScheme": "Vibrant",
+  "expressiveScheme": "Expressive",
+  "contentScheme": "Content",
+  "rainbowScheme": "Rainbow",
+  "fruitSaladScheme": "FruitSalad",
+  "developerMode": "Developer mode",
+  "developerModeEnableTip": "Developer mode is enabled.",
+  "messageTest": "Message test",
+  "messageTestTip": "This is a message.",
+  "crashTest": "Crash test",
+  "clearData": "Clear Data",
+  "textScale": "Text Scaling",
+  "internet": "Internet",
+  "systemApp": "System APP",
+  "noNetworkApp": "No network APP",
+  "contactMe": "Contact me",
+  "recoveryStrategy": "Recovery strategy",
+  "recoveryStrategy_override": "Override",
+  "recoveryStrategy_compatible": "Compatible",
+  "logsTest": "Logs test"
 }

arb/intl_ja.arb

@@ -123,7 +123,6 @@
   "project": "プロジェクト",
   "core": "コア",
   "tabAnimation": "タブアニメーション",
-  "tabAnimationDesc": "有効化するとホームタブに切り替えアニメーションを追加",
   "desc": "ClashMetaベースのマルチプラットフォームプロキシクライアント。シンプルで使いやすく、オープンソースで広告なし。",
   "startVpn": "VPNを開始中...",
   "stopVpn": "VPNを停止中...",
@@ -181,7 +180,6 @@
   "requests": "リクエスト",
   "requestsDesc": "最近のリクエスト記録を表示",
   "findProcessMode": "プロセス検出",
-  "findProcessModeDesc": "有効化するとフラッシュバックのリスクあり",
   "init": "初期化",
   "infiniteTime": "長期有効",
   "expirationTime": "有効期限",
@@ -249,7 +247,6 @@
   "stop": "停止",
   "appDesc": "アプリ関連設定の処理",
   "vpnDesc": "VPN関連設定の変更",
-  "generalDesc": "一般設定の上書き",
   "dnsDesc": "DNS関連設定の更新",
   "key": "キー",
   "value": "値",
@@ -346,5 +343,63 @@
   "exportFile": "ファイルをエクスポート",
   "cacheCorrupt": "キャッシュが破損しています。クリアしますか？",
   "detectionTip": "サードパーティAPIに依存（参考値）",
-  "listen": "リスン"
+  "listen": "リスン",
+  "keyExists": "現在のキーは既に存在します",
+  "valueExists": "現在の値は既に存在します",
+  "undo": "元に戻す",
+  "redo": "やり直す",
+  "none": "なし",
+  "basicConfig": "基本設定",
+  "basicConfigDesc": "基本設定をグローバルに変更",
+  "selectedCountTitle": "{count} 項目が選択されています",
+  "addRule": "ルールを追加",
+  "ruleProviderEmptyTip": "ルールプロバイダーは必須です",
+  "ruleName": "ルール名",
+  "content": "内容",
+  "contentEmptyTip": "内容は必須です",
+  "subRule": "サブルール",
+  "subRuleEmptyTip": "サブルールの内容は必須です",
+  "ruleTarget": "ルール対象",
+  "ruleTargetEmptyTip": "ルール対象は必須です",
+  "sourceIp": "送信元IP",
+  "noResolve": "IPを解決しない",
+  "getOriginRules": "元のルールを取得",
+  "overrideOriginRules": "元のルールを上書き",
+  "addedOriginRules": "元のルールに追加",
+  "enableOverride": "上書きを有効化",
+  "deleteRuleTip": "選択したルールを削除しますか？",
+  "saveChanges": "変更を保存しますか？",
+  "generalDesc": "一般設定を変更",
+  "findProcessModeDesc": "有効化するとパフォーマンスが若干低下します",
+  "tabAnimationDesc": "モバイル表示でのみ有効",
+  "saveTip": "保存してもよろしいですか？",
+  "deleteColorTip": "現在の色を削除しますか？",
+  "colorExists": "この色は既に存在します",
+  "colorSchemes": "カラースキーム",
+  "palette": "パレット",
+  "tonalSpotScheme": "トーンスポット",
+  "fidelityScheme": "ハイファイデリティー",
+  "monochromeScheme": "モノクローム",
+  "neutralScheme": "ニュートラル",
+  "vibrantScheme": "ビブラント",
+  "expressiveScheme": "エクスプレッシブ",
+  "contentScheme": "コンテンツテーマ",
+  "rainbowScheme": "レインボー",
+  "fruitSaladScheme": "フルーツサラダ",
+  "developerMode": "デベロッパーモード",
+  "developerModeEnableTip": "デベロッパーモードが有効になりました。",
+  "messageTest": "メッセージテスト",
+  "messageTestTip": "これはメッセージです。",
+  "crashTest": "クラッシュテスト",
+  "clearData": "データを消去",
+  "zoom": "ズーム",
+  "textScale": "テキストスケーリング",
+  "internet": "インターネット",
+  "systemApp": "システムアプリ",
+  "noNetworkApp": "ネットワークなしアプリ",
+  "contactMe": "連絡する",
+  "recoveryStrategy": "リカバリー戦略",
+  "recoveryStrategy_override": "オーバーライド",
+  "recoveryStrategy_compatible": "互換性",
+  "logsTest": "ログテスト"
 }

arb/intl_ru.arb

@@ -123,7 +123,6 @@
   "project": "Проект",
   "core": "Ядро",
   "tabAnimation": "Анимация вкладок",
-  "tabAnimationDesc": "При включении домашняя вкладка добавит анимацию переключения",
   "desc": "Многоплатформенный прокси-клиент на основе ClashMeta, простой и удобный в использовании, с открытым исходным кодом и без рекламы.",
   "startVpn": "Запуск VPN...",
   "stopVpn": "Остановка VPN...",
@@ -181,7 +180,6 @@
   "requests": "Запросы",
   "requestsDesc": "Просмотр последних записей запросов",
   "findProcessMode": "Режим поиска процесса",
-  "findProcessModeDesc": "Есть риск сбоя после включения",
   "init": "Инициализация",
   "infiniteTime": "Долгосрочное действие",
   "expirationTime": "Время истечения",
@@ -249,7 +247,6 @@
   "stop": "Стоп",
   "appDesc": "Обработка настроек, связанных с приложением",
   "vpnDesc": "Изменение настроек, связанных с VPN",
-  "generalDesc": "Переопределение общих настроек",
   "dnsDesc": "Обновление настроек, связанных с DNS",
   "key": "Ключ",
   "value": "Значение",
@@ -346,5 +343,63 @@
   "exportFile": "Экспорт файла",
   "cacheCorrupt": "Кэш поврежден. Хотите очистить его?",
   "detectionTip": "Опирается на сторонний API, только для справки",
-  "listen": "Слушать"
+  "listen": "Слушать",
+  "keyExists": "Текущий ключ уже существует",
+  "valueExists": "Текущее значение уже существует",
+  "undo": "Отменить",
+  "redo": "Повторить",
+  "none": "Нет",
+  "basicConfig": "Базовая конфигурация",
+  "basicConfigDesc": "Глобальное изменение базовых настроек",
+  "selectedCountTitle": "Выбрано {count} элементов",
+  "addRule": "Добавить правило",
+  "ruleProviderEmptyTip": "Поставщик правил не может быть пустым",
+  "ruleName": "Название правила",
+  "content": "Содержание",
+  "contentEmptyTip": "Содержание не может быть пустым",
+  "subRule": "Подправило",
+  "subRuleEmptyTip": "Содержание подправила не может быть пустым",
+  "ruleTarget": "Цель правила",
+  "ruleTargetEmptyTip": "Цель правила не может быть пустой",
+  "sourceIp": "Исходный IP",
+  "noResolve": "Не разрешать IP",
+  "getOriginRules": "Получить оригинальные правила",
+  "overrideOriginRules": "Переопределить оригинальное правило",
+  "addedOriginRules": "Добавить к оригинальным правилам",
+  "enableOverride": "Включить переопределение",
+  "deleteRuleTip": "Вы уверены, что хотите удалить выбранное правило?",
+  "saveChanges": "Сохранить изменения?",
+  "generalDesc": "Изменение общих настроек",
+  "findProcessModeDesc": "При включении возможны небольшие потери производительности",
+  "tabAnimationDesc": "Действительно только в мобильном виде",
+  "saveTip": "Вы уверены, что хотите сохранить?",
+  "deleteColorTip": "Удалить текущий цвет?",
+  "colorExists": "Этот цвет уже существует",
+  "colorSchemes": "Цветовые схемы",
+  "palette": "Палитра",
+  "tonalSpotScheme": "Тональный акцент",
+  "fidelityScheme": "Точная передача",
+  "monochromeScheme": "Монохром",
+  "neutralScheme": "Нейтральные",
+  "vibrantScheme": "Яркие",
+  "expressiveScheme": "Экспрессивные",
+  "contentScheme": "Контентная тема",
+  "rainbowScheme": "Радужные",
+  "fruitSaladScheme": "Фруктовый микс",
+  "developerMode": "Режим разработчика",
+  "developerModeEnableTip": "Режим разработчика активирован.",
+  "messageTest": "Тестирование сообщения",
+  "messageTestTip": "Это сообщение.",
+  "crashTest": "Тест на сбои",
+  "clearData": "Очистить данные",
+  "zoom": "Масштаб",
+  "textScale": "Масштабирование текста",
+  "internet": "Интернет",
+  "systemApp": "Системное приложение",
+  "noNetworkApp": "Приложение без сети",
+  "contactMe": "Свяжитесь со мной",
+  "recoveryStrategy": "Стратегия восстановления",
+  "recoveryStrategy_override": "Переопределение",
+  "recoveryStrategy_compatible": "Совместимый",
+  "logsTest": "Тест журналов"
 }

arb/intl_zh_CN.arb

@@ -123,7 +123,6 @@
   "project": "项目",
   "core": "内核",
   "tabAnimation": "选项卡动画",
-  "tabAnimationDesc": "开启后，主页选项卡将添加切换动画",
   "desc": "基于ClashMeta的多平台代理客户端，简单易用，开源无广告。",
   "startVpn": "正在启动VPN...",
   "stopVpn": "正在停止VPN...",
@@ -169,7 +168,7 @@
   "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
   "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
-  "general": "基础",
+  "general": "常规",
   "vpnSystemProxyDesc": "为VpnService附加HTTP代理",
   "systemProxyDesc": "设置系统代理",
   "unifiedDelay": "统一延迟",
@@ -181,7 +180,6 @@
   "requests": "请求",
   "requestsDesc": "查看最近请求记录",
   "findProcessMode": "查找进程",
-  "findProcessModeDesc": "开启后存在闪退风险",
   "init": "初始化",
   "infiniteTime": "长期有效",
   "expirationTime": "到期时间",
@@ -249,7 +247,6 @@
   "stop": "暂停",
   "appDesc": "处理应用相关设置",
   "vpnDesc": "修改VPN相关设置",
-  "generalDesc": "覆写基础设置",
   "dnsDesc": "更新DNS相关设置",
   "key": "键",
   "value": "值",
@@ -346,5 +343,63 @@
   "exportFile": "导出文件",
   "cacheCorrupt": "缓存已损坏，是否清空？",
   "detectionTip": "依赖第三方api，仅供参考",
-  "listen": "监听"
+  "listen": "监听",
+  "keyExists": "当前键已存在",
+  "valueExists": "当前值已存在",
+  "undo": "撤销",
+  "redo": "重做",
+  "none": "无",
+  "basicConfig": "基本配置",
+  "basicConfigDesc": "全局修改基本配置",
+  "selectedCountTitle": "已选择 {count} 项",
+  "addRule": "添加规则",
+  "ruleProviderEmptyTip": "规则提供者不能为空",
+  "ruleName": "规则名称",
+  "content": "内容",
+  "contentEmptyTip": "内容不能为空",
+  "subRule": "子规则",
+  "subRuleEmptyTip": "子规则内容不能为空",
+  "ruleTarget": "规则目标",
+  "ruleTargetEmptyTip": "规则目标不能为空",
+  "sourceIp": "源IP",
+  "noResolve": "不解析IP",
+  "getOriginRules": "获取原始规则",
+  "overrideOriginRules": "覆盖原始规则",
+  "addedOriginRules": "附加到原始规则",
+  "enableOverride": "启用覆写",
+  "deleteRuleTip": "确定要删除选中的规则吗？",
+  "saveChanges": "是否保存更改？",
+  "generalDesc": "修改通用设置",
+  "findProcessModeDesc": "开启后会有一定性能损耗",
+  "tabAnimationDesc": "仅在移动视图中有效",
+  "saveTip": "确定要保存吗？",
+  "deleteColorTip": "确定删除当前颜色吗？",
+  "colorExists": "该颜色已存在",
+  "colorSchemes": "配色方案",
+  "palette": "调色板",
+  "tonalSpotScheme": "调性点缀",
+  "fidelityScheme": "高保真",
+  "monochromeScheme": "单色",
+  "neutralScheme": "中性",
+  "vibrantScheme": "活力",
+  "expressiveScheme": "表现力",
+  "contentScheme": "内容主题",
+  "rainbowScheme": "彩虹",
+  "fruitSaladScheme": "果缤纷",
+  "developerMode": "开发者模式",
+  "developerModeEnableTip": "开发者模式已启用。",
+  "messageTest": "消息测试",
+  "messageTestTip": "这是一条消息。",
+  "crashTest": "崩溃测试",
+  "clearData": "清除数据",
+  "zoom": "缩放",
+  "textScale": "文本缩放",
+  "internet": "互联网",
+  "systemApp": "系统应用",
+  "noNetworkApp": "无网络应用",
+  "contactMe": "联系我",
+  "recoveryStrategy": "恢复策略",
+  "recoveryStrategy_override": "覆盖",
+  "recoveryStrategy_compatible": "兼容",
+  "logsTest": "日志测试"
 }

core/action.go

@@ -35,8 +35,8 @@ func (action Action) getResult(data interface{}) []byte {
 func handleAction(action *Action, result func(data interface{})) {
 	switch action.Method {
 	case initClashMethod:
-		data := action.Data.(string)
-		result(handleInitClash(data))
+		paramsString := action.Data.(string)
+		result(handleInitClash(paramsString))
 		return
 	case getIsInitMethod:
 		result(handleGetIsInit())
@@ -166,6 +166,9 @@ func handleAction(action *Action, result func(data interface{})) {
 		data := action.Data.(string)
 		handleSetState(data)
 		result(true)
+	case crashMethod:
+		result(true)
+		handleCrash()
 	default:
 		handle := nextHandle(action, result)
 		if handle {

core/android_bride.go

@@ -0,0 +1,77 @@
+//go:build android && cgo
+
+package main
+
+/*
+#include <stdlib.h>
+
+typedef void (*release_object_func)(void *obj);
+
+typedef void (*protect_func)(void *tun_interface, int fd);
+
+typedef const char* (*resolve_process_func)(void *tun_interface, int protocol, const char *source, const char *target, int uid);
+
+static void protect(protect_func fn, void *tun_interface, int fd) {
+    if (fn) {
+        fn(tun_interface, fd);
+    }
+}
+
+static const char* resolve_process(resolve_process_func fn, void *tun_interface, int protocol, const char *source, const char *target, int uid) {
+    if (fn) {
+        return fn(tun_interface, protocol, source, target, uid);
+    }
+    return "";
+}
+
+static void release_object(release_object_func fn, void *obj) {
+    if (fn) {
+        return fn(obj);
+    }
+}
+*/
+import "C"
+import (
+	"unsafe"
+)
+
+var (
+	globalCallbacks struct {
+		releaseObjectFunc  C.release_object_func
+		protectFunc        C.protect_func
+		resolveProcessFunc C.resolve_process_func
+	}
+)
+
+func protect(callback unsafe.Pointer, fd int) {
+	if globalCallbacks.protectFunc != nil {
+		C.protect(globalCallbacks.protectFunc, callback, C.int(fd))
+	}
+}
+
+func resolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
+	if globalCallbacks.resolveProcessFunc == nil {
+		return ""
+	}
+	s := C.CString(source)
+	defer C.free(unsafe.Pointer(s))
+	t := C.CString(target)
+	defer C.free(unsafe.Pointer(t))
+	res := C.resolve_process(globalCallbacks.resolveProcessFunc, callback, C.int(protocol), s, t, C.int(uid))
+	defer C.free(unsafe.Pointer(res))
+	return C.GoString(res)
+}
+
+func releaseObject(callback unsafe.Pointer) {
+	if globalCallbacks.releaseObjectFunc == nil {
+		return
+	}
+	C.release_object(globalCallbacks.releaseObjectFunc, callback)
+}
+
+//export registerCallbacks
+func registerCallbacks(markSocketFunc C.protect_func, resolveProcessFunc C.resolve_process_func, releaseObjectFunc C.release_object_func) {
+	globalCallbacks.protectFunc = markSocketFunc
+	globalCallbacks.resolveProcessFunc = resolveProcessFunc
+	globalCallbacks.releaseObjectFunc = releaseObjectFunc
+}

core/common.go

@@ -28,8 +28,12 @@ import (
 	"sync"
 )
 
-func splitByComma(s string) interface{} {
-	parts := strings.Split(s, ",")
+func splitByMultipleSeparators(s string) interface{} {
+	isSeparator := func(r rune) bool {
+		return r == ',' || r == ' ' || r == ';'
+	}
+
+	parts := strings.FieldsFunc(s, isSeparator)
 	if len(parts) > 1 {
 		return parts
 	}
@@ -37,6 +41,7 @@ func splitByComma(s string) interface{} {
 }
 
 var (
+	version   = 0
 	isRunning = false
 	runLock   sync.Mutex
 	ips       = []string{"ipwho.is", "api.ip.sb", "ipapi.co", "ipinfo.io"}
@@ -73,7 +78,6 @@ func getRawConfigWithId(id string) *config.RawConfig {
 	path := getProfilePath(id)
 	bytes, err := readFile(path)
 	if err != nil {
-		log.Errorln("profile is not exist")
 		return config.DefaultRawConfig()
 	}
 	prof, err := config.UnmarshalRawConfig(bytes)
@@ -168,18 +172,18 @@ func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig
 	return prof
 }
 
-func genHosts(hosts, patchHosts map[string]any) {
+func attachHosts(hosts, patchHosts map[string]any) {
 	for k, v := range patchHosts {
 		if str, ok := v.(string); ok {
-			hosts[k] = splitByComma(str)
+			hosts[k] = splitByMultipleSeparators(str)
 		}
 	}
 }
 
-func modPatchDns(dns *config.RawDNS) {
+func updatePatchDns(dns config.RawDNS) {
 	for pair := dns.NameServerPolicy.Oldest(); pair != nil; pair = pair.Next() {
 		if str, ok := pair.Value.(string); ok {
-			dns.NameServerPolicy.Set(pair.Key, splitByComma(str))
+			dns.NameServerPolicy.Set(pair.Key, splitByMultipleSeparators(str))
 		}
 	}
 }
@@ -191,26 +195,25 @@ func trimArr(arr []string) (r []string) {
 	return
 }
 
-func overrideRules(rules *[]string) {
-	var target = ""
-	for _, line := range *rules {
+func overrideRules(rules, patchRules []string) []string {
+	target := ""
+	for _, line := range rules {
 		rule := trimArr(strings.Split(line, ","))
-		l := len(rule)
-		if l != 2 {
-			return
+		if len(rule) != 2 {
+			continue
 		}
-		if strings.ToUpper(rule[0]) == "MATCH" {
+		if strings.EqualFold(rule[0], "MATCH") {
 			target = rule[1]
 			break
 		}
 	}
 	if target == "" {
-		return
+		return rules
 	}
-	var rulesExt = lo.Map(ips, func(ip string, index int) string {
-		return fmt.Sprintf("DOMAIN %s %s", ip, target)
+	rulesExt := lo.Map(ips, func(ip string, _ int) string {
+		return fmt.Sprintf("DOMAIN,%s,%s", ip, target)
 	})
-	*rules = append(rulesExt, *rules...)
+	return append(append(rulesExt, patchRules...), rules...)
 }
 
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
@@ -244,16 +247,20 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	for idx := range targetConfig.ProxyGroup {
 		targetConfig.ProxyGroup[idx]["url"] = ""
 	}
-	genHosts(targetConfig.Hosts, patchConfig.Hosts)
+	attachHosts(targetConfig.Hosts, patchConfig.Hosts)
 	if configParams.OverrideDns {
-		modPatchDns(&patchConfig.DNS)
+		updatePatchDns(patchConfig.DNS)
 		targetConfig.DNS = patchConfig.DNS
 	} else {
 		if targetConfig.DNS.Enable == false {
 			targetConfig.DNS.Enable = true
 		}
 	}
-	overrideRules(&targetConfig.Rule)
+	if configParams.OverrideRule {
+		targetConfig.Rule = overrideRules(patchConfig.Rule, []string{})
+	} else {
+		targetConfig.Rule = overrideRules(targetConfig.Rule, patchConfig.Rule)
+	}
 }
 
 func patchConfig() {

core/constant.go

@@ -7,12 +7,18 @@ import (
 	"time"
 )
 
+type InitParams struct {
+	HomeDir string `json:"home-dir"`
+	Version int    `json:"version"`
+}
+
 type ConfigExtendedParams struct {
 	IsPatch      bool              `json:"is-patch"`
 	IsCompatible bool              `json:"is-compatible"`
 	SelectedMap  map[string]string `json:"selected-map"`
 	TestURL      *string           `json:"test-url"`
 	OverrideDns  bool              `json:"override-dns"`
+	OverrideRule bool              `json:"override-rule"`
 }
 
 type GenerateConfigParams struct {
@@ -70,16 +76,13 @@ const (
 	stopLogMethod                  Method = "stopLog"
 	startListenerMethod            Method = "startListener"
 	stopListenerMethod             Method = "stopListener"
-	startTunMethod                 Method = "startTun"
-	stopTunMethod                  Method = "stopTun"
 	updateDnsMethod                Method = "updateDns"
-	setProcessMapMethod            Method = "setProcessMap"
-	setFdMapMethod                 Method = "setFdMap"
 	setStateMethod                 Method = "setState"
 	getAndroidVpnOptionsMethod     Method = "getAndroidVpnOptions"
 	getRunTimeMethod               Method = "getRunTime"
 	getCurrentProfileNameMethod    Method = "getCurrentProfileName"
 	getProfileMethod               Method = "getProfile"
+	crashMethod                    Method = "crash"
 )
 
 type Method string
@@ -108,20 +111,3 @@ func (message *Message) Json() (string, error) {
 	data, err := json.Marshal(message)
 	return string(data), err
 }
-
-type InvokeMessage struct {
-	Type InvokeType  `json:"type"`
-	Data interface{} `json:"data"`
-}
-
-type InvokeType string
-
-const (
-	ProtectInvoke InvokeType = "protect"
-	ProcessInvoke InvokeType = "process"
-)
-
-func (message *InvokeMessage) Json() string {
-	data, _ := json.Marshal(message)
-	return string(data)
-}

core/go.mod

@@ -7,6 +7,7 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
 	github.com/samber/lo v1.49.1
+	golang.org/x/sync v0.11.0
 )
 
 require (
@@ -21,7 +22,7 @@ require (
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/ebitengine/purego v0.8.2 // indirect
-	github.com/enfein/mieru/v3 v3.11.2 // indirect
+	github.com/enfein/mieru/v3 v3.13.0 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
@@ -50,21 +51,22 @@ require (
 	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.19.0 // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
-	github.com/metacubex/chacha v0.1.1 // indirect
+	github.com/metacubex/chacha v0.1.2 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
-	github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a // indirect
+	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
 	github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
-	github.com/metacubex/sing-tun v0.4.5 // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 // indirect
 	github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 // indirect
 	github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
 	github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
-	github.com/metacubex/utls v1.6.6 // indirect
+	github.com/metacubex/utls v1.7.0-alpha.1 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -74,7 +76,7 @@ require (
 	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/puzpuzpuz/xsync/v3 v3.5.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/cors v1.2.1 // indirect
@@ -83,7 +85,6 @@ require (
 	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
 	github.com/sagernet/sing v0.5.2 // indirect
 	github.com/sagernet/sing-mux v0.2.1 // indirect
-	github.com/sagernet/sing-shadowtls v0.1.5 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
@@ -106,7 +107,6 @@ require (
 	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.7.0 // indirect

core/go.sum

@@ -28,8 +28,8 @@ github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZ
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
 github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/enfein/mieru/v3 v3.11.2 h1:06KyGbXiiGz2nSHLJDOOkztAVY3cRr3wBMOpYxPotTo=
-github.com/enfein/mieru/v3 v3.11.2/go.mod h1:XvVfNsM78lUMSlJJKXJZ0Hn3lAB2o/ETXTbb84x5egw=
+github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98=
+github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -97,36 +97,38 @@ 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.19.0 h1:XQ9AJeI+WO+phRPkUOoflAFwlqDJnm5BPQpixciJQBY=
+github.com/metacubex/bart v0.19.0/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
-github.com/metacubex/chacha v0.1.1 h1:OHIv11Nd9CISAIzegpjfupIoZp9DYm6uQw41RxvmU/c=
-github.com/metacubex/chacha v0.1.1/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
+github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc=
+github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/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-20241126021258-5b028898cc5a h1:cZ6oNVrsmsi3SNlnSnRio4zOgtQq+/XidwsaNgKICcg=
-github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a/go.mod h1:xBw/SYJPgUMPQ1tklV/brGn2nxhfr3BnvBzNlyi4Nic=
+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/quic-go v0.49.1-0.20250212162123-c135a4412996 h1:B+AP/Pj2/jBDS/kCYjz/x+0BCOKfd2VODYevyeIt+Ds=
 github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996/go.mod h1:ExVjGyEwTUjCFqx+5uxgV7MOoA3fZI+th4D40H35xmY=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629 h1:aHsYiTvubfgMa3JMTDY//hDXVvFWrHg6ARckR52ttZs=
-github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629/go.mod h1:TTeIOZLdGmzc07Oedn++vWUUfkZoXLF4sEMxWuhBFr8=
-github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925 h1:UkPoRAnoBQMn7IK5qpoIV3OejU15q+rqel3NrbSCFKA=
-github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
+github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c h1:OB3WmMA8YPJjE36RjD9X8xlrWGJ4orxbf2R/KAE28b0=
+github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
 github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
 github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
 github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-tun v0.4.5 h1:kWSyQzuzHI40r50OFBczfWIDvMBMy1RIk+JsXeBPRB0=
-github.com/metacubex/sing-tun v0.4.5/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0=
+github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 h1:vy/8ZYYtWUXYnOnw/NF8ThG1W/RqM/h5rkun+OXZMH0=
+github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63/go.mod h1:eDZ2JpkSkewGmUlCoLSn2MRFn1D0jKPIys/6aogFx7U=
+github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 h1:hcsz5e5lqhBxn3iQQDIF60FLZ8PQT542GTQZ+1wcIGo=
+github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0=
 github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 h1:zZp5uct9+/0Hb1jKGyqDjCU4/72t43rs7qOq3Rc9oU8=
 github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82/go.mod h1:nE7Mdzj/QUDwgRi/8BASPtsxtIFZTHA4Yst5GgwbGCQ=
 github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0HLTjx6BKIkV48sV/yia/GP8Bnyb5JQuGgSGzg=
 github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc=
 github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY=
 github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
-github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
+github.com/metacubex/utls v1.7.0-alpha.1 h1:oMFsPh2oTlALJ7vKXPJuqgy0YeiZ+q/LLw+ZdxZ80l4=
+github.com/metacubex/utls v1.7.0-alpha.1/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
@@ -153,8 +155,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 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/puzpuzpuz/xsync/v3 v3.5.0 h1:i+cMcpEDY1BkNm7lPDkCtE4oElsYLn+EKF8kAu2vXT4=
-github.com/puzpuzpuz/xsync/v3 v3.5.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
+github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 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/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -172,8 +174,6 @@ github.com/sagernet/sing v0.5.2 h1:2OZQJNKGtji/66QLxbf/T/dqtK/3+fF/zuHH9tsGK7M=
 github.com/sagernet/sing v0.5.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.2.1 h1:N/3MHymfnFZRd29tE3TaXwPUVVgKvxhtOkiCMLp9HVo=
 github.com/sagernet/sing-mux v0.2.1/go.mod h1:dm3BWL6NvES9pbib7llpylrq7Gq+LjlzG+0RacdxcyE=
-github.com/sagernet/sing-shadowtls v0.1.5 h1:uXxmq/HXh8DIiBGLzpMjCbWnzIAFs+lIxiTOjdgG5qo=
-github.com/sagernet/sing-shadowtls v0.1.5/go.mod h1:tvrDPTGLrSM46Wnf7mSr+L8NHvgvF8M4YnJF790rZX4=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
 github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=

core/hub.go

@@ -34,9 +34,15 @@ var (
 	currentConfig     *config.Config
 )
 
-func handleInitClash(homeDirStr string) bool {
+func handleInitClash(paramsString string) bool {
+	var params = InitParams{}
+	err := json.Unmarshal([]byte(paramsString), &params)
+	if err != nil {
+		return false
+	}
+	version = params.Version
 	if !isInit {
-		constant.SetHomeDir(homeDirStr)
+		constant.SetHomeDir(params.HomeDir)
 		isInit = true
 	}
 	return isInit
@@ -47,6 +53,7 @@ func handleStartListener() bool {
 	defer runLock.Unlock()
 	isRunning = true
 	updateListeners(true)
+	closeConnections()
 	return true
 }
 
@@ -270,6 +277,16 @@ func handleCloseConnections() bool {
 	return true
 }
 
+func closeConnections() {
+	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
+		err := c.Close()
+		if err != nil {
+			return false
+		}
+		return true
+	})
+}
+
 func handleCloseConnection(connectionId string) bool {
 	runLock.Lock()
 	defer runLock.Unlock()
@@ -436,6 +453,10 @@ func handleSetState(params string) {
 	_ = json.Unmarshal([]byte(params), state.CurrentState)
 }
 
+func handleCrash() {
+	panic("handle invoke crash")
+}
+
 func init() {
 	adapter.UrlTestHook = func(url string, name string, delay uint16) {
 		delayData := &Delay{

core/lib_android.go

@@ -4,6 +4,7 @@ package main
 
 import "C"
 import (
+	"context"
 	bridge "core/dart-bridge"
 	"core/platform"
 	"core/state"
@@ -11,118 +12,111 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/process"
 	"github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/dns"
 	"github.com/metacubex/mihomo/listener/sing_tun"
 	"github.com/metacubex/mihomo/log"
+	"golang.org/x/sync/semaphore"
+	"net"
 	"strconv"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
+	"unsafe"
 )
 
-type Fd struct {
-	Id    string `json:"id"`
-	Value int64  `json:"value"`
+type TunHandler struct {
+	listener *sing_tun.Listener
+	callback unsafe.Pointer
+
+	limit *semaphore.Weighted
 }
 
-type Process struct {
-	Id       string             `json:"id"`
-	Metadata *constant.Metadata `json:"metadata"`
-}
-
-type ProcessMapItem struct {
-	Id    string `json:"id"`
-	Value string `json:"value"`
-}
-
-type InvokeManager struct {
-	invokeMap sync.Map
-	chanMap   map[string]chan struct{}
-	chanLock  sync.Mutex
-}
-
-func NewInvokeManager() *InvokeManager {
-	return &InvokeManager{
-		chanMap: make(map[string]chan struct{}),
+func (t *TunHandler) close() {
+	_ = t.limit.Acquire(context.TODO(), 4)
+	defer t.limit.Release(4)
+	removeTunHook()
+	if t.listener != nil {
+		_ = t.listener.Close()
 	}
+
+	if t.callback != nil {
+		releaseObject(t.callback)
+	}
+	t.callback = nil
+	t.listener = nil
 }
 
-func (m *InvokeManager) completer(id string, value string) {
-	m.invokeMap.Store(id, value)
-	m.chanLock.Lock()
-	if ch, ok := m.chanMap[id]; ok {
-		close(ch)
-		delete(m.chanMap, id)
+func (t *TunHandler) handleProtect(fd int) {
+	_ = t.limit.Acquire(context.Background(), 1)
+	defer t.limit.Release(1)
+
+	if t.listener == nil {
+		return
 	}
-	m.chanLock.Unlock()
+
+	protect(t.callback, fd)
 }
 
-func (m *InvokeManager) await(id string) string {
-	m.chanLock.Lock()
-	if _, ok := m.chanMap[id]; !ok {
-		m.chanMap[id] = make(chan struct{})
-	}
-	ch := m.chanMap[id]
-	m.chanLock.Unlock()
+func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
+	_ = t.limit.Acquire(context.Background(), 1)
+	defer t.limit.Release(1)
 
-	timeout := time.After(500 * time.Millisecond)
-	select {
-	case <-ch:
-		res, ok := m.invokeMap.Load(id)
-		m.invokeMap.Delete(id)
-		if ok {
-			return res.(string)
-		} else {
-			return ""
-		}
-	case <-timeout:
-		m.completer(id, "")
+	if t.listener == nil {
 		return ""
 	}
+	var protocol int
+	uid := -1
+	switch source.Network() {
+	case "udp", "udp4", "udp6":
+		protocol = syscall.IPPROTO_UDP
+	case "tcp", "tcp4", "tcp6":
+		protocol = syscall.IPPROTO_TCP
+	}
+	if version < 29 {
+		uid = platform.QuerySocketUidFromProcFs(source, target)
+	}
+	return resolveProcess(t.callback, protocol, source.String(), target.String(), uid)
 }
 
 var (
-	invokePort       int64 = -1
-	tunListener      *sing_tun.Listener
-	fdInvokeMap      = NewInvokeManager()
-	processInvokeMap = NewInvokeManager()
-	tunLock          sync.Mutex
-	runTime          *time.Time
-	errBlocked       = errors.New("blocked")
+	tunLock    sync.Mutex
+	runTime    *time.Time
+	errBlocked = errors.New("blocked")
+	tunHandler *TunHandler
 )
 
-func handleStartTun(fd int) string {
-	handleStopTun()
-	tunLock.Lock()
-	defer tunLock.Unlock()
-	if fd == 0 {
-		now := time.Now()
-		runTime = &now
-	} else {
-		initSocketHook()
-		tunListener, _ = t.Start(fd, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
-		if tunListener != nil {
-			log.Infoln("TUN address: %v", tunListener.Address())
-		}
-		now := time.Now()
-		runTime = &now
-	}
-	return handleGetRunTime()
-}
-
 func handleStopTun() {
 	tunLock.Lock()
 	defer tunLock.Unlock()
-	removeSocketHook()
 	runTime = nil
-	if tunListener != nil {
-		log.Infoln("TUN close")
-		_ = tunListener.Close()
+	if tunHandler != nil {
+		tunHandler.close()
+	}
+}
+
+func handleStartTun(fd int, callback unsafe.Pointer) {
+	handleStopTun()
+	tunLock.Lock()
+	defer tunLock.Unlock()
+	now := time.Now()
+	runTime = &now
+	if fd != 0 {
+		tunHandler = &TunHandler{
+			callback: callback,
+			limit:    semaphore.NewWeighted(4),
+		}
+		initTunHook()
+		tunListener, _ := t.Start(fd, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
+		if tunListener != nil {
+			log.Infoln("TUN address: %v", tunListener.Address())
+			tunHandler.listener = tunListener
+		} else {
+			removeTunHook()
+		}
 	}
 }
 
@@ -133,83 +127,29 @@ func handleGetRunTime() string {
 	return strconv.FormatInt(runTime.UnixMilli(), 10)
 }
 
-func handleSetProcessMap(params string) {
-	var processMapItem = &ProcessMapItem{}
-	err := json.Unmarshal([]byte(params), processMapItem)
-	if err == nil {
-		processInvokeMap.completer(processMapItem.Id, processMapItem.Value)
-	}
-}
-
-//export attachInvokePort
-func attachInvokePort(mPort C.longlong) {
-	invokePort = int64(mPort)
-}
-
-func sendInvokeMessage(message InvokeMessage) {
-	if invokePort == -1 {
-		return
-	}
-	bridge.SendToPort(invokePort, message.Json())
-}
-
-func handleMarkSocket(fd Fd) {
-	sendInvokeMessage(InvokeMessage{
-		Type: ProtectInvoke,
-		Data: fd,
-	})
-}
-
-func handleParseProcess(process Process) {
-	sendInvokeMessage(InvokeMessage{
-		Type: ProcessInvoke,
-		Data: process,
-	})
-}
-
-func handleSetFdMap(id string) {
-	go func() {
-		fdInvokeMap.completer(id, "")
-	}()
-}
-
-func initSocketHook() {
+func initTunHook() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
 		if platform.ShouldBlockConnection() {
 			return errBlocked
 		}
 		return conn.Control(func(fd uintptr) {
-			fdInt := int64(fd)
-			id := utils.NewUUIDV1().String()
-
-			handleMarkSocket(Fd{
-				Id:    id,
-				Value: fdInt,
-			})
-
-			fdInvokeMap.await(id)
+			tunHandler.handleProtect(int(fd))
 		})
 	}
-}
-
-func removeSocketHook() {
-	dialer.DefaultSocketHook = nil
-}
-
-func init() {
 	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
-		if metadata == nil {
+		src, dst := metadata.RawSrcAddr, metadata.RawDstAddr
+		if src == nil || dst == nil {
 			return "", process.ErrInvalidNetwork
 		}
-		id := utils.NewUUIDV1().String()
-		handleParseProcess(Process{
-			Id:       id,
-			Metadata: metadata,
-		})
-		return processInvokeMap.await(id), nil
+		return tunHandler.handleResolveProcess(src, dst), nil
 	}
 }
 
+func removeTunHook() {
+	dialer.DefaultSocketHook = nil
+	process.DefaultPackageNameResolver = nil
+}
+
 func handleGetAndroidVpnOptions() string {
 	tunLock.Lock()
 	defer tunLock.Unlock()
@@ -250,16 +190,6 @@ func handleGetCurrentProfileName() string {
 
 func nextHandle(action *Action, result func(data interface{})) bool {
 	switch action.Method {
-	case startTunMethod:
-		data := action.Data.(string)
-		var fd int
-		_ = json.Unmarshal([]byte(data), &fd)
-		result(handleStartTun(fd))
-		return true
-	case stopTunMethod:
-		handleStopTun()
-		result(true)
-		return true
 	case getAndroidVpnOptionsMethod:
 		result(handleGetAndroidVpnOptions())
 		return true
@@ -268,16 +198,6 @@ func nextHandle(action *Action, result func(data interface{})) bool {
 		handleUpdateDns(data)
 		result(true)
 		return true
-	case setFdMapMethod:
-		fdId := action.Data.(string)
-		handleSetFdMap(fdId)
-		result(true)
-		return true
-	case setProcessMapMethod:
-		data := action.Data.(string)
-		handleSetProcessMap(data)
-		result(true)
-		return true
 	case getRunTimeMethod:
 		result(handleGetRunTime())
 		return true
@@ -289,13 +209,13 @@ func nextHandle(action *Action, result func(data interface{})) bool {
 }
 
 //export quickStart
-func quickStart(dirChar *C.char, paramsChar *C.char, stateParamsChar *C.char, port C.longlong) {
+func quickStart(initParamsChar *C.char, paramsChar *C.char, stateParamsChar *C.char, port C.longlong) {
 	i := int64(port)
-	dir := C.GoString(dirChar)
+	paramsString := C.GoString(initParamsChar)
 	bytes := []byte(C.GoString(paramsChar))
 	stateParams := C.GoString(stateParamsChar)
 	go func() {
-		res := handleInitClash(dir)
+		res := handleInitClash(paramsString)
 		if res == false {
 			bridge.SendToPort(i, "init error")
 		}
@@ -305,9 +225,11 @@ func quickStart(dirChar *C.char, paramsChar *C.char, stateParamsChar *C.char, po
 }
 
 //export startTUN
-func startTUN(fd C.int) *C.char {
-	f := int(fd)
-	return C.CString(handleStartTun(f))
+func startTUN(fd C.int, callback unsafe.Pointer) bool {
+	go func() {
+		handleStartTun(int(fd), callback)
+	}()
+	return true
 }
 
 //export getRunTime
@@ -317,13 +239,9 @@ func getRunTime() *C.char {
 
 //export stopTun
 func stopTun() {
-	handleStopTun()
-}
-
-//export setFdMap
-func setFdMap(fdIdChar *C.char) {
-	fdId := C.GoString(fdIdChar)
-	handleSetFdMap(fdId)
+	go func() {
+		handleStopTun()
+	}()
 }
 
 //export getCurrentProfileName
@@ -347,12 +265,3 @@ func updateDns(s *C.char) {
 	dnsList := C.GoString(s)
 	handleUpdateDns(dnsList)
 }
-
-//export setProcessMap
-func setProcessMap(s *C.char) {
-	if s == nil {
-		return
-	}
-	paramsString := C.GoString(s)
-	handleSetProcessMap(paramsString)
-}

core/platform/procfs.go

@@ -0,0 +1,176 @@
+//go:build linux
+// +build linux
+
+package platform
+
+import (
+	"bufio"
+	"encoding/binary"
+	"encoding/hex"
+	"fmt"
+	"net"
+	"os"
+	"strconv"
+	"strings"
+	"unsafe"
+)
+
+var netIndexOfLocal = -1
+var netIndexOfUid = -1
+
+var nativeEndian binary.ByteOrder
+
+func QuerySocketUidFromProcFs(source, _ net.Addr) int {
+	if netIndexOfLocal < 0 || netIndexOfUid < 0 {
+		return -1
+	}
+
+	network := source.Network()
+
+	if strings.HasSuffix(network, "4") || strings.HasSuffix(network, "6") {
+		network = network[:len(network)-1]
+	}
+
+	path := "/proc/net/" + network
+
+	var sIP net.IP
+	var sPort int
+
+	switch s := source.(type) {
+	case *net.TCPAddr:
+		sIP = s.IP
+		sPort = s.Port
+	case *net.UDPAddr:
+		sIP = s.IP
+		sPort = s.Port
+	default:
+		return -1
+	}
+
+	sIP = sIP.To16()
+	if sIP == nil {
+		return -1
+	}
+
+	uid := doQuery(path+"6", sIP, sPort)
+	if uid == -1 {
+		sIP = sIP.To4()
+		if sIP == nil {
+			return -1
+		}
+		uid = doQuery(path, sIP, sPort)
+	}
+
+	return uid
+}
+
+func doQuery(path string, sIP net.IP, sPort int) int {
+	file, err := os.Open(path)
+	if err != nil {
+		return -1
+	}
+
+	defer func(file *os.File) {
+		_ = file.Close()
+	}(file)
+
+	reader := bufio.NewReader(file)
+
+	var bytes [2]byte
+
+	binary.BigEndian.PutUint16(bytes[:], uint16(sPort))
+
+	local := fmt.Sprintf("%s:%s", hex.EncodeToString(nativeEndianIP(sIP)), hex.EncodeToString(bytes[:]))
+
+	for {
+		row, _, err := reader.ReadLine()
+		if err != nil {
+			return -1
+		}
+
+		fields := strings.Fields(string(row))
+
+		if len(fields) <= netIndexOfLocal || len(fields) <= netIndexOfUid {
+			continue
+		}
+
+		if strings.EqualFold(local, fields[netIndexOfLocal]) {
+			uid, err := strconv.Atoi(fields[netIndexOfUid])
+			if err != nil {
+				return -1
+			}
+
+			return uid
+		}
+	}
+}
+
+func nativeEndianIP(ip net.IP) []byte {
+	result := make([]byte, len(ip))
+
+	for i := 0; i < len(ip); i += 4 {
+		value := binary.BigEndian.Uint32(ip[i:])
+
+		nativeEndian.PutUint32(result[i:], value)
+	}
+
+	return result
+}
+
+func init() {
+	file, err := os.Open("/proc/net/tcp")
+	if err != nil {
+		return
+	}
+
+	defer func(file *os.File) {
+		_ = file.Close()
+	}(file)
+
+	reader := bufio.NewReader(file)
+
+	header, _, err := reader.ReadLine()
+	if err != nil {
+		return
+	}
+
+	columns := strings.Fields(string(header))
+
+	var txQueue, rxQueue, tr, tmWhen bool
+
+	for idx, col := range columns {
+		offset := 0
+
+		if txQueue && rxQueue {
+			offset--
+		}
+
+		if tr && tmWhen {
+			offset--
+		}
+
+		switch col {
+		case "tx_queue":
+			txQueue = true
+		case "rx_queue":
+			rxQueue = true
+		case "tr":
+			tr = true
+		case "tm->when":
+			tmWhen = true
+		case "local_address":
+			netIndexOfLocal = idx + offset
+		case "uid":
+			netIndexOfUid = idx + offset
+		}
+	}
+}
+
+func init() {
+	var x uint32 = 0x01020304
+	if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
+		nativeEndian = binary.BigEndian
+	} else {
+		nativeEndian = binary.LittleEndian
+	}
+}

core/state/state.go

@@ -24,7 +24,6 @@ type AccessControl struct {
 	Mode              string   `json:"mode"`
 	AcceptList        []string `json:"acceptList"`
 	RejectList        []string `json:"rejectList"`
-	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
 }
 
 type AndroidVpnRawOptions struct {

lib/application.dart

@@ -1,20 +1,18 @@
 import 'dart:async';
 
-import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/manager/hotkey_manager.dart';
 import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/providers/config.dart';
+import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'controller.dart';
-import 'models/models.dart';
 import 'pages/pages.dart';
 
 class Application extends ConsumerStatefulWidget {
@@ -27,7 +25,6 @@ class Application extends ConsumerStatefulWidget {
 }
 
 class ApplicationState extends ConsumerState<Application> {
-  late ColorSchemes systemColorSchemes;
   Timer? _autoUpdateGroupTaskTimer;
   Timer? _autoUpdateProfilesTaskTimer;
 
@@ -43,16 +40,8 @@ class ApplicationState extends ConsumerState<Application> {
   ColorScheme _getAppColorScheme({
     required Brightness brightness,
     int? primaryColor,
-    required ColorSchemes systemColorSchemes,
   }) {
-    if (primaryColor != null) {
-      return ColorScheme.fromSeed(
-        seedColor: Color(primaryColor),
-        brightness: brightness,
-      );
-    } else {
-      return systemColorSchemes.getColorSchemeForBrightness(brightness);
-    }
+    return ref.read(genColorSchemeProvider(brightness));
   }
 
   @override
@@ -61,16 +50,6 @@ class ApplicationState extends ConsumerState<Application> {
     _autoUpdateGroupTask();
     _autoUpdateProfilesTask();
     globalState.appController = AppController(context, ref);
-    globalState.measure = Measure.of(context);
-    // ref.listenManual(themeSettingProvider.select((state) => state.fontFamily),
-    //     (prev, next) {
-    //   if (prev != next) {
-    //     globalState.measure = Measure.of(
-    //       context,
-    //       fontFamily: next.value,
-    //     );
-    //   }
-    // }, fireImmediately: true);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
       final currentContext = globalState.navigatorKey.currentContext;
       if (currentContext != null) {
@@ -98,7 +77,7 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  _buildPlatformWrap(Widget child) {
+  _buildPlatformState(Widget child) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
@@ -117,22 +96,12 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  _buildPage(Widget page) {
-    if (system.isDesktop) {
-      return WindowHeaderContainer(
-        child: page,
-      );
-    }
-    return VpnManager(
-      child: page,
-    );
-  }
-
-  _buildWrap(Widget child) {
+  _buildState(Widget child) {
     return AppStateManager(
       child: ClashManager(
         child: ConnectivityManager(
-          onConnectivityChanged: () {
+          onConnectivityChanged: () async {
+            await clashCore.closeConnections();
             globalState.appController.updateLocalIp();
             globalState.appController.addCheckIpNumDebounce();
           },
@@ -142,77 +111,72 @@ class ApplicationState extends ConsumerState<Application> {
     );
   }
 
-  _updateSystemColorSchemes(
-    ColorScheme? lightDynamic,
-    ColorScheme? darkDynamic,
-  ) {
-    systemColorSchemes = ColorSchemes(
-      lightColorScheme: lightDynamic,
-      darkColorScheme: darkDynamic,
+  _buildPlatformApp(Widget child) {
+    if (system.isDesktop) {
+      return WindowHeaderContainer(
+        child: child,
+      );
+    }
+    return VpnManager(
+      child: child,
+    );
+  }
+
+  _buildApp(Widget child) {
+    return MessageManager(
+      child: ThemeManager(
+        child: child,
+      ),
     );
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      globalState.appController.updateSystemColorSchemes(systemColorSchemes);
-    });
   }
 
   @override
   Widget build(context) {
-    return _buildPlatformWrap(
-      _buildWrap(
+    return _buildPlatformState(
+      _buildState(
         Consumer(
           builder: (_, ref, child) {
             final locale =
                 ref.watch(appSettingProvider.select((state) => state.locale));
             final themeProps = ref.watch(themeSettingProvider);
-            return DynamicColorBuilder(
-              builder: (lightDynamic, darkDynamic) {
-                _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                return MaterialApp(
-                  navigatorKey: globalState.navigatorKey,
-                  localizationsDelegates: const [
-                    AppLocalizations.delegate,
-                    GlobalMaterialLocalizations.delegate,
-                    GlobalCupertinoLocalizations.delegate,
-                    GlobalWidgetsLocalizations.delegate
-                  ],
-                  builder: (_, child) {
-                    return MessageManager(
-                      child: LayoutBuilder(
-                        builder: (_, container) {
-                          globalState.appController.updateViewWidth(
-                            container.maxWidth,
-                          );
-                          return _buildPage(child!);
-                        },
-                      ),
-                    );
-                  },
-                  scrollBehavior: BaseScrollBehavior(),
-                  title: appName,
-                  locale: other.getLocaleForString(locale),
-                  supportedLocales: AppLocalizations.delegate.supportedLocales,
-                  themeMode: themeProps.themeMode,
-                  theme: ThemeData(
-                    useMaterial3: true,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.light,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: themeProps.primaryColor,
-                    ),
+            return MaterialApp(
+              debugShowCheckedModeBanner: false,
+              navigatorKey: globalState.navigatorKey,
+              localizationsDelegates: const [
+                AppLocalizations.delegate,
+                GlobalMaterialLocalizations.delegate,
+                GlobalCupertinoLocalizations.delegate,
+                GlobalWidgetsLocalizations.delegate
+              ],
+              builder: (_, child) {
+                return AppEnvManager(
+                  child: _buildPlatformApp(
+                    _buildApp(child!),
                   ),
-                  darkTheme: ThemeData(
-                    useMaterial3: true,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.dark,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: themeProps.primaryColor,
-                    ).toPureBlack(themeProps.pureBlack),
-                  ),
-                  home: 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,
+                ),
+              ),
+              darkTheme: ThemeData(
+                useMaterial3: true,
+                pageTransitionsTheme: _pageTransitionsTheme,
+                colorScheme: _getAppColorScheme(
+                  brightness: Brightness.dark,
+                  primaryColor: themeProps.primaryColor,
+                ).toPureBlack(themeProps.pureBlack),
+              ),
+              home: child,
             );
           },
           child: const HomePage(),

lib/clash/core.dart

@@ -8,6 +8,7 @@ import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
 import 'package:flutter/services.dart';
 import 'package:path/path.dart';
 
@@ -66,7 +67,12 @@ class ClashCore {
   Future<bool> init() async {
     await initGeo();
     final homeDirPath = await appPath.homeDirPath;
-    return await clashInterface.init(homeDirPath);
+    return await clashInterface.init(
+      InitParams(
+        homeDir: homeDirPath,
+        version: globalState.appState.version,
+      ),
+    );
   }
 
   Future<bool> setState(CoreState state) async {
@@ -235,12 +241,12 @@ class ClashCore {
     return int.parse(value);
   }
 
-  Future<ClashConfig?> getProfile(String id) async {
+  Future<ClashConfigSnippet?> getProfile(String id) async {
     final res = await clashInterface.getProfile(id);
     if (res.isEmpty) {
       return null;
     }
-    return ClashConfig.fromJson(json.decode(res));
+    return Isolate.run(() => ClashConfigSnippet.fromJson(json.decode(res)));
   }
 
   resetTraffic() {

lib/clash/generated/clash_ffi.dart

@@ -2348,6 +2348,97 @@ class ClashFFI {
 
   set suboptarg(ffi.Pointer<ffi.Char> value) => _suboptarg.value = value;
 
+  void protect(
+    protect_func fn,
+    ffi.Pointer<ffi.Void> tun_interface,
+    int fd,
+  ) {
+    return _protect(
+      fn,
+      tun_interface,
+      fd,
+    );
+  }
+
+  late final _protectPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              protect_func, ffi.Pointer<ffi.Void>, ffi.Int)>>('protect');
+  late final _protect = _protectPtr
+      .asFunction<void Function(protect_func, ffi.Pointer<ffi.Void>, int)>();
+
+  ffi.Pointer<ffi.Char> resolve_process(
+    resolve_process_func fn,
+    ffi.Pointer<ffi.Void> tun_interface,
+    int protocol,
+    ffi.Pointer<ffi.Char> source,
+    ffi.Pointer<ffi.Char> target,
+    int uid,
+  ) {
+    return _resolve_process(
+      fn,
+      tun_interface,
+      protocol,
+      source,
+      target,
+      uid,
+    );
+  }
+
+  late final _resolve_processPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Pointer<ffi.Char> Function(
+              resolve_process_func,
+              ffi.Pointer<ffi.Void>,
+              ffi.Int,
+              ffi.Pointer<ffi.Char>,
+              ffi.Pointer<ffi.Char>,
+              ffi.Int)>>('resolve_process');
+  late final _resolve_process = _resolve_processPtr.asFunction<
+      ffi.Pointer<ffi.Char> Function(
+          resolve_process_func,
+          ffi.Pointer<ffi.Void>,
+          int,
+          ffi.Pointer<ffi.Char>,
+          ffi.Pointer<ffi.Char>,
+          int)>();
+
+  void release_object(
+    release_object_func fn,
+    ffi.Pointer<ffi.Void> obj,
+  ) {
+    return _release_object(
+      fn,
+      obj,
+    );
+  }
+
+  late final _release_objectPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              release_object_func, ffi.Pointer<ffi.Void>)>>('release_object');
+  late final _release_object = _release_objectPtr
+      .asFunction<void Function(release_object_func, ffi.Pointer<ffi.Void>)>();
+
+  void registerCallbacks(
+    protect_func markSocketFunc,
+    resolve_process_func resolveProcessFunc,
+    release_object_func releaseObjectFunc,
+  ) {
+    return _registerCallbacks(
+      markSocketFunc,
+      resolveProcessFunc,
+      releaseObjectFunc,
+    );
+  }
+
+  late final _registerCallbacksPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(protect_func, resolve_process_func,
+              release_object_func)>>('registerCallbacks');
+  late final _registerCallbacks = _registerCallbacksPtr.asFunction<
+      void Function(protect_func, resolve_process_func, release_object_func)>();
+
   void initNativeApiBridge(
     ffi.Pointer<ffi.Void> api,
   ) {
@@ -2443,28 +2534,14 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopListener');
   late final _stopListener = _stopListenerPtr.asFunction<void Function()>();
 
-  void attachInvokePort(
-    int mPort,
-  ) {
-    return _attachInvokePort(
-      mPort,
-    );
-  }
-
-  late final _attachInvokePortPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.LongLong)>>(
-          'attachInvokePort');
-  late final _attachInvokePort =
-      _attachInvokePortPtr.asFunction<void Function(int)>();
-
   void quickStart(
-    ffi.Pointer<ffi.Char> dirChar,
+    ffi.Pointer<ffi.Char> initParamsChar,
     ffi.Pointer<ffi.Char> paramsChar,
     ffi.Pointer<ffi.Char> stateParamsChar,
     int port,
   ) {
     return _quickStart(
-      dirChar,
+      initParamsChar,
       paramsChar,
       stateParamsChar,
       port,
@@ -2479,19 +2556,21 @@ class ClashFFI {
       void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
           ffi.Pointer<ffi.Char>, int)>();
 
-  ffi.Pointer<ffi.Char> startTUN(
+  int startTUN(
     int fd,
+    ffi.Pointer<ffi.Void> callback,
   ) {
     return _startTUN(
       fd,
+      callback,
     );
   }
 
-  late final _startTUNPtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function(ffi.Int)>>(
-          'startTUN');
+  late final _startTUNPtr = _lookup<
+          ffi.NativeFunction<GoUint8 Function(ffi.Int, ffi.Pointer<ffi.Void>)>>(
+      'startTUN');
   late final _startTUN =
-      _startTUNPtr.asFunction<ffi.Pointer<ffi.Char> Function(int)>();
+      _startTUNPtr.asFunction<int Function(int, ffi.Pointer<ffi.Void>)>();
 
   ffi.Pointer<ffi.Char> getRunTime() {
     return _getRunTime();
@@ -2511,20 +2590,6 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopTun');
   late final _stopTun = _stopTunPtr.asFunction<void Function()>();
 
-  void setFdMap(
-    ffi.Pointer<ffi.Char> fdIdChar,
-  ) {
-    return _setFdMap(
-      fdIdChar,
-    );
-  }
-
-  late final _setFdMapPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setFdMap');
-  late final _setFdMap =
-      _setFdMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
   ffi.Pointer<ffi.Char> getCurrentProfileName() {
     return _getCurrentProfileName();
   }
@@ -2572,20 +2637,6 @@ class ClashFFI {
           'updateDns');
   late final _updateDns =
       _updateDnsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
-  void setProcessMap(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _setProcessMap(
-      s,
-    );
-  }
-
-  late final _setProcessMapPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setProcessMap');
-  late final _setProcessMap =
-      _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 }
 
 final class __mbstate_t extends ffi.Union {
@@ -3738,6 +3789,31 @@ typedef mode_t = __darwin_mode_t;
 typedef __darwin_mode_t = __uint16_t;
 typedef __uint16_t = ffi.UnsignedShort;
 typedef Dart__uint16_t = int;
+typedef protect_func = ffi.Pointer<ffi.NativeFunction<protect_funcFunction>>;
+typedef protect_funcFunction = ffi.Void Function(
+    ffi.Pointer<ffi.Void> tun_interface, ffi.Int fd);
+typedef Dartprotect_funcFunction = void Function(
+    ffi.Pointer<ffi.Void> tun_interface, int fd);
+typedef resolve_process_func
+    = ffi.Pointer<ffi.NativeFunction<resolve_process_funcFunction>>;
+typedef resolve_process_funcFunction = ffi.Pointer<ffi.Char> Function(
+    ffi.Pointer<ffi.Void> tun_interface,
+    ffi.Int protocol,
+    ffi.Pointer<ffi.Char> source,
+    ffi.Pointer<ffi.Char> target,
+    ffi.Int uid);
+typedef Dartresolve_process_funcFunction = ffi.Pointer<ffi.Char> Function(
+    ffi.Pointer<ffi.Void> tun_interface,
+    int protocol,
+    ffi.Pointer<ffi.Char> source,
+    ffi.Pointer<ffi.Char> target,
+    int uid);
+typedef release_object_func
+    = ffi.Pointer<ffi.NativeFunction<release_object_funcFunction>>;
+typedef release_object_funcFunction = ffi.Void Function(
+    ffi.Pointer<ffi.Void> obj);
+typedef Dartrelease_object_funcFunction = void Function(
+    ffi.Pointer<ffi.Void> obj);
 
 final class GoInterface extends ffi.Struct {
   external ffi.Pointer<ffi.Void> t;
@@ -3758,6 +3834,8 @@ final class GoSlice extends ffi.Struct {
 typedef GoInt = GoInt64;
 typedef GoInt64 = ffi.LongLong;
 typedef DartGoInt64 = int;
+typedef GoUint8 = ffi.UnsignedChar;
+typedef DartGoUint8 = int;
 
 const int __has_safe_buffers = 1;
 
@@ -3973,6 +4051,8 @@ const int __MAC_15_0 = 150000;
 
 const int __MAC_15_1 = 150100;
 
+const int __MAC_15_2 = 150200;
+
 const int __IPHONE_2_0 = 20000;
 
 const int __IPHONE_2_1 = 20100;
@@ -4135,6 +4215,8 @@ const int __IPHONE_18_0 = 180000;
 
 const int __IPHONE_18_1 = 180100;
 
+const int __IPHONE_18_2 = 180200;
+
 const int __WATCHOS_1_0 = 10000;
 
 const int __WATCHOS_2_0 = 20000;
@@ -4233,6 +4315,8 @@ const int __WATCHOS_11_0 = 110000;
 
 const int __WATCHOS_11_1 = 110100;
 
+const int __WATCHOS_11_2 = 110200;
+
 const int __TVOS_9_0 = 90000;
 
 const int __TVOS_9_1 = 90100;
@@ -4333,6 +4417,8 @@ const int __TVOS_18_0 = 180000;
 
 const int __TVOS_18_1 = 180100;
 
+const int __TVOS_18_2 = 180200;
+
 const int __BRIDGEOS_2_0 = 20000;
 
 const int __BRIDGEOS_3_0 = 30000;
@@ -4389,6 +4475,8 @@ const int __BRIDGEOS_9_0 = 90000;
 
 const int __BRIDGEOS_9_1 = 90100;
 
+const int __BRIDGEOS_9_2 = 90200;
+
 const int __DRIVERKIT_19_0 = 190000;
 
 const int __DRIVERKIT_20_0 = 200000;
@@ -4419,6 +4507,8 @@ const int __DRIVERKIT_24_0 = 240000;
 
 const int __DRIVERKIT_24_1 = 240100;
 
+const int __DRIVERKIT_24_2 = 240200;
+
 const int __VISIONOS_1_0 = 10000;
 
 const int __VISIONOS_1_1 = 10100;
@@ -4429,6 +4519,8 @@ const int __VISIONOS_2_0 = 20000;
 
 const int __VISIONOS_2_1 = 20100;
 
+const int __VISIONOS_2_2 = 20200;
+
 const int MAC_OS_X_VERSION_10_0 = 1000;
 
 const int MAC_OS_X_VERSION_10_1 = 1010;
@@ -4555,9 +4647,11 @@ const int MAC_OS_VERSION_15_0 = 150000;
 
 const int MAC_OS_VERSION_15_1 = 150100;
 
+const int MAC_OS_VERSION_15_2 = 150200;
+
 const int __MAC_OS_X_VERSION_MIN_REQUIRED = 150000;
 
-const int __MAC_OS_X_VERSION_MAX_ALLOWED = 150100;
+const int __MAC_OS_X_VERSION_MAX_ALLOWED = 150200;
 
 const int __ENABLE_LEGACY_MAC_AVAILABILITY = 1;
 

lib/clash/interface.dart

@@ -7,7 +7,7 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 
 mixin ClashInterface {
-  Future<bool> init(String homeDir);
+  Future<bool> init(InitParams params);
 
   Future<bool> preload();
 
@@ -58,6 +58,8 @@ mixin ClashInterface {
 
   stopLog();
 
+  Future<bool> crash();
+
   FutureOr<String> getConnections();
 
   FutureOr<bool> closeConnection(String id);
@@ -74,12 +76,10 @@ mixin AndroidClashInterface {
 
   Future<bool> setProcessMap(ProcessMapItem item);
 
-  Future<bool> stopTun();
+  // Future<bool> stopTun();
 
   Future<bool> updateDns(String value);
 
-  Future<DateTime?> startTun(int fd);
-
   Future<AndroidVpnOptions?> getAndroidVpnOptions();
 
   Future<String> getCurrentProfileName();
@@ -106,6 +106,7 @@ abstract class ClashHandlerInterface with ClashInterface {
         case ActionMethod.closeConnection:
         case ActionMethod.stopListener:
         case ActionMethod.setState:
+        case ActionMethod.crash:
           completer?.complete(result.data as bool);
           return;
         case ActionMethod.changeProxy:
@@ -153,7 +154,7 @@ abstract class ClashHandlerInterface with ClashInterface {
     Duration? timeout,
     FutureOr<T> Function()? onTimeout,
   }) async {
-    final id = "${method.name}#${other.id}";
+    final id = "${method.name}#${utils.id}";
 
     callbackCompleterMap[id] = Completer<T>();
 
@@ -191,10 +192,10 @@ abstract class ClashHandlerInterface with ClashInterface {
   }
 
   @override
-  Future<bool> init(String homeDir) {
+  Future<bool> init(InitParams params) {
     return invoke<bool>(
       method: ActionMethod.initClash,
-      data: homeDir,
+      data: json.encode(params),
     );
   }
 
@@ -244,6 +245,13 @@ abstract class ClashHandlerInterface with ClashInterface {
     );
   }
 
+  @override
+  Future<bool> crash() {
+    return invoke<bool>(
+      method: ActionMethod.crash,
+    );
+  }
+
   @override
   Future<String> getProxies() {
     return invoke<String>(

lib/clash/lib.dart

@@ -122,25 +122,12 @@ class ClashLib extends ClashHandlerInterface with AndroidClashInterface {
     );
   }
 
-  @override
-  Future<DateTime?> startTun(int fd) async {
-    final res = await invoke<String>(
-      method: ActionMethod.startTun,
-      data: json.encode(fd),
-    );
-
-    if (res.isEmpty) {
-      return null;
-    }
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(res));
-  }
-
-  @override
-  Future<bool> stopTun() {
-    return invoke<bool>(
-      method: ActionMethod.stopTun,
-    );
-  }
+  // @override
+  // Future<bool> stopTun() {
+  //   return invoke<bool>(
+  //     method: ActionMethod.stopTun,
+  //   );
+  // }
 
   @override
   Future<AndroidVpnOptions?> getAndroidVpnOptions() async {
@@ -224,37 +211,12 @@ class ClashLibHandler {
     );
   }
 
-  attachInvokePort(int invokePort) {
-    clashFFI.attachInvokePort(
-      invokePort,
-    );
-  }
-
-  DateTime? startTun(int fd) {
-    final runTimeRaw = clashFFI.startTUN(fd);
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(runTimeRaw);
-    if (runTimeString.isEmpty) return null;
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
-  stopTun() {
-    clashFFI.stopTun();
-  }
-
   updateDns(String dns) {
     final dnsChar = dns.toNativeUtf8().cast<Char>();
     clashFFI.updateDns(dnsChar);
     malloc.free(dnsChar);
   }
 
-  setProcessMap(ProcessMapItem processMapItem) {
-    final processMapItemChar =
-    json.encode(processMapItem).toNativeUtf8().cast<Char>();
-    clashFFI.setProcessMap(processMapItemChar);
-    malloc.free(processMapItemChar);
-  }
-
   setState(CoreState state) {
     final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
     clashFFI.setState(stateChar);
@@ -305,17 +267,11 @@ class ClashLibHandler {
     return true;
   }
 
-  setFdMap(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.setFdMap(idChar);
-    malloc.free(idChar);
-  }
-
   Future<String> quickStart(
-      String homeDir,
-      UpdateConfigParams updateConfigParams,
-      CoreState state,
-      ) {
+    InitParams initParams,
+    UpdateConfigParams updateConfigParams,
+    CoreState state,
+  ) {
     final completer = Completer<String>();
     final receiver = ReceivePort();
     receiver.listen((message) {
@@ -325,17 +281,18 @@ class ClashLibHandler {
       }
     });
     final params = json.encode(updateConfigParams);
+    final initValue = json.encode(initParams);
     final stateParams = json.encode(state);
-    final homeChar = homeDir.toNativeUtf8().cast<Char>();
+    final initParamsChar = initValue.toNativeUtf8().cast<Char>();
     final paramsChar = params.toNativeUtf8().cast<Char>();
     final stateParamsChar = stateParams.toNativeUtf8().cast<Char>();
     clashFFI.quickStart(
-      homeChar,
+      initParamsChar,
       paramsChar,
       stateParamsChar,
       receiver.sendPort.nativePort,
     );
-    malloc.free(homeChar);
+    malloc.free(initParamsChar);
     malloc.free(paramsChar);
     malloc.free(stateParamsChar);
     return completer.future;

lib/clash/service.dart

@@ -71,9 +71,9 @@ class ClashService extends ClashHandlerInterface {
       }
     }, (error, stack) {
       commonPrint.log(error.toString());
-      if(error is SocketException){
+      if (error is SocketException) {
         globalState.showNotifier(error.toString());
-        globalState.appController.restartCore();
+        // globalState.appController.restartCore();
       }
     });
   }
@@ -92,12 +92,11 @@ class ClashService extends ClashHandlerInterface {
     final arg = Platform.isWindows
         ? "${serverSocket.port}"
         : serverSocket.address.address;
-    bool isSuccess = false;
     if (Platform.isWindows && await system.checkIsAdmin()) {
-      isSuccess = await request.startCoreByHelper(arg);
-    }
-    if (isSuccess) {
-      return;
+      final isSuccess = await request.startCoreByHelper(arg);
+      if (isSuccess) {
+        return;
+      }
     }
     process = await Process.start(
       appPath.corePath,

lib/common/color.dart

@@ -1,27 +1,92 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 
 extension ColorExtension on Color {
-  Color get toLight {
-    return withOpacity(0.8);
+  Color get opacity80 {
+    return withAlpha(204);
   }
 
-  Color get toLighter {
-    return withOpacity(0.6);
+  Color get opacity60 {
+    return withAlpha(153);
   }
 
-  Color get toSoft {
-    return withOpacity(0.15);
+  Color get opacity50 {
+    return withAlpha(128);
   }
 
-  Color get toLittle {
-    return withOpacity(0.03);
+  Color get opacity38 {
+    return withAlpha(97);
   }
 
-  Color darken([double amount = .1]) {
-    assert(amount >= 0 && amount <= 1);
-    final hsl = HSLColor.fromColor(this);
-    final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
-    return hslDark.toColor();
+  Color get opacity30 {
+    return withAlpha(77);
+  }
+
+  Color get opacity15 {
+    return withAlpha(38);
+  }
+
+  Color get opacity10 {
+    return withAlpha(15);
+  }
+
+  Color get opacity3 {
+    return withAlpha(76);
+  }
+
+  Color get opacity0 {
+    return withAlpha(0);
+  }
+
+  int get value32bit {
+    return _floatToInt8(a) << 24 |
+        _floatToInt8(r) << 16 |
+        _floatToInt8(g) << 8 |
+        _floatToInt8(b) << 0;
+  }
+
+  int get alpha8bit => (0xff000000 & value32bit) >> 24;
+
+  int get red8bit => (0x00ff0000 & value32bit) >> 16;
+
+  int get green8bit => (0x0000ff00 & value32bit) >> 8;
+
+  int get blue8bit => (0x000000ff & value32bit) >> 0;
+
+  int _floatToInt8(double x) {
+    return (x * 255.0).round() & 0xff;
+  }
+
+  Color lighten([double amount = 10]) {
+    if (amount <= 0) return this;
+    if (amount > 100) return Colors.white;
+    final HSLColor hsl = this == const Color(0xFF000000)
+        ? HSLColor.fromColor(this).withSaturation(0)
+        : HSLColor.fromColor(this);
+    return hsl
+        .withLightness(min(1, max(0, hsl.lightness + amount / 100)))
+        .toColor();
+  }
+
+  String get hex {
+    final value = toARGB32();
+    final red = (value >> 16) & 0xFF;
+    final green = (value >> 8) & 0xFF;
+    final blue = value & 0xFF;
+    return '#${red.toRadixString(16).padLeft(2, '0')}'
+            '${green.toRadixString(16).padLeft(2, '0')}'
+            '${blue.toRadixString(16).padLeft(2, '0')}'
+        .toUpperCase();
+  }
+
+  Color darken([final int amount = 10]) {
+    if (amount <= 0) return this;
+    if (amount > 100) return Colors.black;
+    final HSLColor hsl = HSLColor.fromColor(this);
+    return hsl
+        .withLightness(min(1, max(0, hsl.lightness - amount / 100)))
+        .toColor();
   }
 
   Color blendDarken(
@@ -54,7 +119,7 @@ extension ColorSchemeExtension on ColorScheme {
       ? copyWith(
           surface: Colors.black,
           surfaceContainer: surfaceContainer.darken(
-            0.05,
+            5,
           ),
         )
       : this;

lib/common/common.dart

@@ -12,14 +12,14 @@ export 'iterable.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
-export 'list.dart';
+export 'fixed.dart';
 export 'lock.dart';
 export 'measure.dart';
 export 'navigation.dart';
 export 'navigator.dart';
 export 'network.dart';
 export 'num.dart';
-export 'other.dart';
+export 'utils.dart';
 export 'package.dart';
 export 'path.dart';
 export 'picker.dart';
@@ -36,4 +36,4 @@ export 'window.dart';
 export 'windows.dart';
 export 'render.dart';
 export 'mixin.dart';
-export 'print.dart';
+export 'print.dart';

lib/common/constant.dart

@@ -16,11 +16,15 @@ const browserUa =
 const packageName = "com.follow.clash";
 final unixSocketPath = "/tmp/FlClashSocket_${Random().nextInt(10000)}.sock";
 const helperPort = 47890;
-const helperTag = "2024125";
-const baseInfoEdgeInsets = EdgeInsets.symmetric(
-  vertical: 16,
-  horizontal: 16,
+const maxTextScale = 1.4;
+const minTextScale = 0.8;
+final baseInfoEdgeInsets = EdgeInsets.symmetric(
+  vertical: 16.ap,
+  horizontal: 16.ap,
 );
+
+final defaultTextScaleFactor =
+    WidgetsBinding.instance.platformDispatcher.textScaleFactor;
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
@@ -39,14 +43,13 @@ const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
 const configKey = "config";
-const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
 const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 const defaultTestUrl = "https://www.gstatic.com/generate_204";
-final filter = ImageFilter.blur(
+final commonFilter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,
   tileMode: TileMode.mirror,
@@ -55,6 +58,7 @@ final filter = ImageFilter.blur(
 const navigationItemListEquality = ListEquality<NavigationItem>();
 const connectionListEquality = ListEquality<Connection>();
 const stringListEquality = ListEquality<String>();
+const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
 const groupListEquality = ListEquality<Group>();
 const externalProviderListEquality = ListEquality<ExternalProvider>();
@@ -73,12 +77,28 @@ const viewModeColumnsMap = {
   ViewMode.desktop: [4, 3],
 };
 
-const defaultPrimaryColor = Colors.brown;
+// const proxiesStoreKey = PageStorageKey<String>('proxies');
+// const toolsStoreKey = PageStorageKey<String>('tools');
+// const profilesStoreKey = PageStorageKey<String>('profiles');
+
+const defaultPrimaryColor = 0XFFD8C0C3;
 
 double getWidgetHeight(num lines) {
-  return max(lines * 84 + (lines - 1) * 16, 0);
+  return max(lines * 84 + (lines - 1) * 16, 0).ap;
 }
 
+const maxLength = 150;
+
 final mainIsolate = "FlClashMainIsolate";
 
 final serviceIsolate = "FlClashServiceIsolate";
+
+const defaultPrimaryColors = [
+  0xFF795548,
+  0xFF03A9F4,
+  0xFFFFFF00,
+  0XFFBBC9CC,
+  0XFFABD397,
+  defaultPrimaryColor,
+  0XFF665390,
+];

lib/common/context.dart

@@ -1,4 +1,4 @@
-import 'package:fl_clash/manager/manager.dart';
+import 'package:fl_clash/manager/message_manager.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -11,6 +11,36 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<MessageManagerState>()?.message(text);
   }
 
+  showSnackBar(
+    String message, {
+    SnackBarAction? action,
+  }) {
+    final width = viewWidth;
+    EdgeInsets margin;
+    if (width < 600) {
+      margin = const EdgeInsets.only(
+        bottom: 16,
+        right: 16,
+        left: 16,
+      );
+    } else {
+      margin = EdgeInsets.only(
+        bottom: 16,
+        left: 16,
+        right: width - 316,
+      );
+    }
+    ScaffoldMessenger.of(this).showSnackBar(
+      SnackBar(
+        action: action,
+        content: Text(message),
+        behavior: SnackBarBehavior.floating,
+        duration: const Duration(milliseconds: 1500),
+        margin: margin,
+      ),
+    );
+  }
+
   Size get appSize {
     return MediaQuery.of(this).size;
   }
@@ -27,10 +57,10 @@ extension BuildContextExtension on BuildContext {
     T? state;
 
     visitor(Element element) {
-      if(!element.mounted){
+      if (!element.mounted) {
         return;
       }
-      if(element is StatefulElement){
+      if (element is StatefulElement) {
         if (element.state is T) {
           state = element.state as T;
         }

lib/common/fixed.dart

@@ -0,0 +1,79 @@
+import 'iterable.dart';
+
+class FixedList<T> {
+  final int maxLength;
+  final List<T> _list;
+
+  FixedList(this.maxLength, {List<T>? list})
+      : _list = (list ?? [])..truncate(maxLength);
+
+  add(T item) {
+    _list.add(item);
+    _list.truncate(maxLength);
+  }
+
+  clear() {
+    _list.clear();
+  }
+
+  List<T> get list => List.unmodifiable(_list);
+
+  int get length => _list.length;
+
+  T operator [](int index) => _list[index];
+
+  FixedList<T> copyWith() {
+    return FixedList(
+      maxLength,
+      list: _list,
+    );
+  }
+}
+
+class FixedMap<K, V> {
+  int maxLength;
+  late Map<K, V> _map;
+
+  FixedMap(this.maxLength, {Map<K, V>? map}) {
+    _map = map ?? {};
+  }
+
+  updateCacheValue(K key, V Function() callback) {
+    final realValue = _map.updateCacheValue(
+      key,
+      callback,
+    );
+    _adjustMap();
+    return realValue;
+  }
+
+  clear() {
+    _map.clear();
+  }
+
+  updateMaxLength(int size) {
+    maxLength = size;
+    _adjustMap();
+  }
+
+  updateMap(Map<K, V> map) {
+    _map = map;
+    _adjustMap();
+  }
+
+  _adjustMap() {
+    if (_map.length > maxLength) {
+      _map = Map.fromEntries(
+        map.entries.toList()..truncate(maxLength),
+      );
+    }
+  }
+
+  V? get(K key) => _map[key];
+
+  bool containsKey(K key) => _map.containsKey(key);
+
+  int get length => _map.length;
+
+  Map<K, V> get map => Map.unmodifiable(_map);
+}

lib/common/function.dart

@@ -1,10 +1,12 @@
 import 'dart:async';
 
+import 'package:fl_clash/enum/enum.dart';
+
 class Debouncer {
-  final Map<dynamic, Timer> _operations = {};
+  final Map<FunctionTag, Timer?> _operations = {};
 
   call(
-    dynamic tag,
+    FunctionTag tag,
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
@@ -28,14 +30,15 @@ class Debouncer {
 
   cancel(dynamic tag) {
     _operations[tag]?.cancel();
+    _operations[tag] = null;
   }
 }
 
 class Throttler {
-  final Map<dynamic, Timer> _operations = {};
+  final Map<FunctionTag, Timer?> _operations = {};
 
   call(
-    String tag,
+    FunctionTag tag,
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
@@ -60,6 +63,7 @@ class Throttler {
 
   cancel(dynamic tag) {
     _operations[tag]?.cancel();
+    _operations[tag] = null;
   }
 }
 

lib/common/iterable.dart

@@ -38,6 +38,43 @@ extension IterableExt<T> on Iterable<T> {
       count++;
     }
   }
+
+  Iterable<T> takeLast({int count = 50}) {
+    if (count <= 0) return Iterable.empty();
+    return count >= length ? this : toList().skip(length - count);
+  }
+}
+
+extension ListExt<T> on List<T> {
+  void truncate(int maxLength) {
+    assert(maxLength > 0);
+    if (length > maxLength) {
+      removeRange(0, length - maxLength);
+    }
+  }
+
+  List<T> intersection(List<T> list) {
+    return where((item) => list.contains(item)).toList();
+  }
+
+  List<List<T>> batch(int maxConcurrent) {
+    final batches = (length / maxConcurrent).ceil();
+    final List<List<T>> res = [];
+    for (int i = 0; i < batches; i++) {
+      if (i != batches - 1) {
+        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
+      } else {
+        res.add(sublist(i * maxConcurrent, length));
+      }
+    }
+    return res;
+  }
+
+  List<T> safeSublist(int start) {
+    if (start <= 0) return this;
+    if (start > length) return [];
+    return sublist(start);
+  }
 }
 
 extension DoubleListExt on List<double> {
@@ -65,3 +102,12 @@ extension DoubleListExt on List<double> {
     return -1;
   }
 }
+
+extension MapExt<K, V> on Map<K, V> {
+  updateCacheValue(K key, V Function() callback) {
+    if (this[key] == null) {
+      this[key] = callback();
+    }
+    return this[key];
+  }
+}

lib/common/launch.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:launch_at_startup/launch_at_startup.dart';
 
 import 'constant.dart';
@@ -34,6 +35,9 @@ class AutoLaunch {
   }
 
   updateStatus(bool isAutoLaunch) async {
+    if(kDebugMode){
+      return;
+    }
     if (await isEnable == isAutoLaunch) return;
     if (isAutoLaunch == true) {
       enable();

lib/common/list.dart

@@ -1,87 +0,0 @@
-import 'dart:collection';
-
-class FixedList<T> {
-  final int maxLength;
-  final List<T> _list;
-
-  FixedList(this.maxLength, {List<T>? list}) : _list = list ?? [];
-
-  add(T item) {
-    if (_list.length == maxLength) {
-      _list.removeAt(0);
-    }
-    _list.add(item);
-  }
-
-  clear() {
-    _list.clear();
-  }
-
-  List<T> get list => List.unmodifiable(_list);
-
-  int get length => _list.length;
-
-  T operator [](int index) => _list[index];
-
-  FixedList<T> copyWith() {
-    return FixedList(
-      maxLength,
-      list: _list,
-    );
-  }
-}
-
-class FixedMap<K, V> {
-  final int maxSize;
-  final Map<K, V> _map = {};
-  final Queue<K> _queue = Queue<K>();
-
-  FixedMap(this.maxSize);
-
-  put(K key, V value) {
-    if (_map.length == maxSize) {
-      final oldestKey = _queue.removeFirst();
-      _map.remove(oldestKey);
-    }
-    _map[key] = value;
-    _queue.add(key);
-  }
-
-  clear() {
-    _map.clear();
-    _queue.clear();
-  }
-
-  V? get(K key) => _map[key];
-
-  bool containsKey(K key) => _map.containsKey(key);
-
-  int get length => _map.length;
-
-  Map<K, V> get map => Map.unmodifiable(_map);
-}
-
-extension ListExtension<T> on List<T> {
-  List<T> intersection(List<T> list) {
-    return where((item) => list.contains(item)).toList();
-  }
-
-  List<List<T>> batch(int maxConcurrent) {
-    final batches = (length / maxConcurrent).ceil();
-    final List<List<T>> res = [];
-    for (int i = 0; i < batches; i++) {
-      if (i != batches - 1) {
-        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
-      } else {
-        res.add(sublist(i * maxConcurrent, length));
-      }
-    }
-    return res;
-  }
-
-  List<T> safeSublist(int start) {
-    if (start <= 0) return this;
-    if (start > length) return [];
-    return sublist(start);
-  }
-}

lib/common/measure.dart

@@ -3,15 +3,15 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class Measure {
-  final TextScaler _textScale;
+  final TextScaler _textScaler;
   final BuildContext context;
-  final String? _fontFamily;
+  final Map<String, dynamic> _measureMap;
 
-  Measure.of(this.context, {String? fontFamily})
-      : _textScale = TextScaler.linear(
-          WidgetsBinding.instance.platformDispatcher.textScaleFactor,
-        ),
-        _fontFamily = fontFamily ?? "";
+  Measure.of(this.context, double textScaleFactor)
+      : _measureMap = {},
+        _textScaler = TextScaler.linear(
+          textScaleFactor,
+        );
 
   Size computeTextSize(
     Text text, {
@@ -20,12 +20,10 @@ class Measure {
     final textPainter = TextPainter(
       text: TextSpan(
         text: text.data,
-        style: text.style?.copyWith(
-          fontFamily: _fontFamily,
-        ),
+        style: text.style,
       ),
       maxLines: text.maxLines,
-      textScaler: _textScale,
+      textScaler: _textScaler,
       textDirection: text.textDirection ?? TextDirection.ltr,
     )..layout(
         maxWidth: maxWidth,
@@ -33,81 +31,87 @@ class Measure {
     return textPainter.size;
   }
 
-  double? _bodyMediumHeight;
-  Size? _bodyLargeSize;
-  double? _bodySmallHeight;
-  double? _labelSmallHeight;
-  double? _labelMediumHeight;
-  double? _titleLargeHeight;
-  double? _titleMediumHeight;
-
   double get bodyMediumHeight {
-    _bodyMediumHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.bodyMedium,
-      ),
-    ).height;
-    return _bodyMediumHeight!;
+    return _measureMap.updateCacheValue(
+      "bodyMediumHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.bodyMedium,
+        ),
+      ).height,
+    );
   }
 
-  Size get bodyLargeSize {
-    _bodyLargeSize ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.bodyLarge,
-      ),
+  double get bodyLargeHeight {
+    return _measureMap.updateCacheValue(
+      "bodyLargeHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.bodyLarge,
+        ),
+      ).height,
     );
-    return _bodyLargeSize!;
   }
 
   double get bodySmallHeight {
-    _bodySmallHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.bodySmall,
-      ),
-    ).height;
-    return _bodySmallHeight!;
+    return _measureMap.updateCacheValue(
+      "bodySmallHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.bodySmall,
+        ),
+      ).height,
+    );
   }
 
   double get labelSmallHeight {
-    _labelSmallHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.labelSmall,
-      ),
-    ).height;
-    return _labelSmallHeight!;
+    return _measureMap.updateCacheValue(
+      "labelSmallHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.labelSmall,
+        ),
+      ).height,
+    );
   }
 
   double get labelMediumHeight {
-    _labelMediumHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.labelMedium,
-      ),
-    ).height;
-    return _labelMediumHeight!;
+    return _measureMap.updateCacheValue(
+      "labelMediumHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.labelMedium,
+        ),
+      ).height,
+    );
   }
 
   double get titleLargeHeight {
-    _titleLargeHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.titleLarge,
-      ),
-    ).height;
-    return _titleLargeHeight!;
+    return _measureMap.updateCacheValue(
+      "titleLargeHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.titleLarge,
+        ),
+      ).height,
+    );
   }
 
   double get titleMediumHeight {
-    _titleMediumHeight ??= computeTextSize(
-      Text(
-        "X",
-        style: context.textTheme.titleMedium,
-      ),
-    ).height;
-    return _titleMediumHeight!;
+    return _measureMap.updateCacheValue(
+      "titleMediumHeight",
+      () => computeTextSize(
+        Text(
+          "X",
+          style: context.textTheme.titleMedium,
+        ),
+      ).height,
+    );
   }
 }

lib/common/mixin.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:riverpod/riverpod.dart';
 import 'context.dart';
@@ -29,8 +30,14 @@ mixin PageMixin<T extends StatefulWidget> on State<T> {
       final commonScaffoldState = context.commonScaffoldState;
       commonScaffoldState?.actions = actions;
       commonScaffoldState?.floatingActionButton = floatingActionButton;
-      commonScaffoldState?.onSearch = onSearch;
       commonScaffoldState?.onKeywordsUpdate = onKeywordsUpdate;
+      commonScaffoldState?.updateSearchState(
+        (_) => onSearch != null
+            ? AppBarSearchState(
+                onSearch: onSearch!,
+              )
+            : null,
+      );
     });
   }
 

lib/common/navigation.dart

@@ -12,6 +12,7 @@ class Navigation {
   }) {
     return [
       const NavigationItem(
+        keep: false,
         icon: Icon(Icons.space_dashboard),
         label: PageLabel.dashboard,
         fragment: DashboardFragment(
@@ -65,7 +66,6 @@ class Navigation {
         icon: Icon(Icons.storage),
         label: PageLabel.resources,
         description: "resourcesDesc",
-        keep: false,
         fragment: Resources(
           key: GlobalObjectKey(
             PageLabel.resources,

lib/common/navigator.dart

@@ -70,7 +70,7 @@ class CommonRoute<T> extends MaterialPageRoute<T> {
   Duration get transitionDuration => const Duration(milliseconds: 500);
 
   @override
-  Duration get reverseTransitionDuration => const Duration(milliseconds: 250);
+  Duration get reverseTransitionDuration => const Duration(milliseconds: 500);
 }
 
 final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
@@ -194,7 +194,7 @@ class _CommonPageTransitionState extends State<CommonPageTransition> {
       _primaryPositionCurve = CurvedAnimation(
         parent: widget.primaryRouteAnimation,
         curve: Curves.fastEaseInToSlowEaseOut,
-        reverseCurve: Curves.easeInOut,
+        reverseCurve: Curves.fastEaseInToSlowEaseOut.flipped,
       );
       _secondaryPositionCurve = CurvedAnimation(
         parent: widget.secondaryRouteAnimation,
@@ -218,9 +218,8 @@ class _CommonPageTransitionState extends State<CommonPageTransition> {
         begin: const _CommonEdgeShadowDecoration(),
         end: _CommonEdgeShadowDecoration(
           <Color>[
-            widget.context.colorScheme.inverseSurface.withOpacity(
-              0.06,
-            ),
+            widget.context.colorScheme.inverseSurface
+                .withValues(alpha: 0.02),
             Colors.transparent,
           ],
         ),
@@ -274,7 +273,7 @@ class _CommonEdgeShadowPainter extends BoxPainter {
       return;
     }
 
-    final double shadowWidth = 0.03 * configuration.size!.width;
+    final double shadowWidth = 1 * configuration.size!.width;
     final double shadowHeight = configuration.size!.height;
     final double bandWidth = shadowWidth / (colors.length - 1);
 

lib/common/num.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/state.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -12,6 +13,10 @@ extension NumExt on num {
     }
     return formatted;
   }
+
+  double get ap {
+    return this * (1 + (globalState.theme.textScaleFactor - 1) * 0.5);
+  }
 }
 
 extension DoubleExt on double {

lib/common/print.dart

@@ -1,4 +1,3 @@
-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';
@@ -20,10 +19,7 @@ class CommonPrint {
       return;
     }
     globalState.appController.addLog(
-      Log(
-        logLevel: LogLevel.info,
-        payload: payload,
-      ),
+      Log.app(payload),
     );
   }
 }

lib/common/protocol.dart

@@ -14,15 +14,13 @@ class Protocol {
 
   void register(String scheme) {
     String protocolRegKey = 'Software\\Classes\\$scheme';
-    RegistryValue protocolRegValue = const RegistryValue(
+    RegistryValue protocolRegValue = RegistryValue.string(
       'URL Protocol',
-      RegistryValueType.string,
       '',
     );
     String protocolCmdRegKey = 'shell\\open\\command';
-    RegistryValue protocolCmdRegValue = RegistryValue(
+    RegistryValue protocolCmdRegValue = RegistryValue.string(
       '',
-      RegistryValueType.string,
       '"${Platform.resolvedExecutable}" "%1"',
     );
     final regKey = Registry.currentUser.createKey(protocolRegKey);
@@ -31,4 +29,4 @@ class Protocol {
   }
 }
 
-final protocol = Protocol();
+final protocol = Protocol();

lib/common/render.dart

@@ -22,19 +22,19 @@ class Render {
   }
 
   pause() {
-    debouncer.call(
-      DebounceTag.renderPause,
+    throttler.call(
+      FunctionTag.renderPause,
       _pause,
-      duration: Duration(seconds: 15),
+      duration: Duration(seconds: 5),
     );
   }
 
   resume() {
-    debouncer.cancel(DebounceTag.renderPause);
+    throttler.cancel(FunctionTag.renderPause);
     _resume();
   }
 
-  void _pause() {
+  void _pause() async {
     if (_isPaused) return;
     _isPaused = true;
     _beginFrame = _dispatcher.onBeginFrame;
@@ -54,4 +54,4 @@ class Render {
   }
 }
 
-final render = system.isDesktop ? Render() : null;
+final Render? render = system.isDesktop ? Render() : null;

lib/common/request.dart

@@ -68,7 +68,7 @@ class Request {
     final remoteVersion = data['tag_name'];
     final version = globalState.packageInfo.version;
     final hasUpdate =
-        other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
+        utils.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
     if (!hasUpdate) return null;
     return data;
   }
@@ -83,13 +83,19 @@ class Request {
   Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
     for (final source in _ipInfoSources.entries) {
       try {
-        final response = await _dio.get<Map<String, dynamic>>(
-          source.key,
-          cancelToken: cancelToken,
-          options: Options(
-            responseType: ResponseType.json,
-          ),
-        );
+        final response = await Dio()
+            .get<Map<String, dynamic>>(
+              source.key,
+              cancelToken: cancelToken,
+              options: Options(
+                responseType: ResponseType.json,
+              ),
+            )
+            .timeout(
+              Duration(
+                seconds: 30,
+              ),
+            );
         if (response.statusCode != 200 || response.data == null) {
           continue;
         }
@@ -124,7 +130,7 @@ class Request {
       if (response.statusCode != HttpStatus.ok) {
         return false;
       }
-      return (response.data as String) == helperTag;
+      return (response.data as String) == globalState.coreSHA256;
     } catch (_) {
       return false;
     }

lib/common/scroll.dart

@@ -2,6 +2,7 @@ import 'dart:math';
 import 'dart:ui';
 
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/widgets/scroll.dart';
 import 'package:flutter/material.dart';
 
 class BaseScrollBehavior extends MaterialScrollBehavior {
@@ -16,8 +17,6 @@ class BaseScrollBehavior extends MaterialScrollBehavior {
       };
 }
 
-class BaseScrollBehavior2 extends ScrollBehavior {}
-
 class HiddenBarScrollBehavior extends BaseScrollBehavior {
   @override
   Widget buildScrollbar(
@@ -36,8 +35,7 @@ class ShowBarScrollBehavior extends BaseScrollBehavior {
     Widget child,
     ScrollableDetails details,
   ) {
-    return Scrollbar(
-      interactive: true,
+    return CommonAutoHiddenScrollBar(
       controller: details.controller,
       child: child,
     );

lib/common/string.dart

@@ -47,6 +47,10 @@ extension StringExtension on String {
       return false;
     }
   }
+
+// bool containsToLower(String target) {
+//   return toLowerCase().contains(target);
+// }
 }
 
 extension StringExtensionSafe on String? {

lib/common/system.dart

@@ -55,18 +55,24 @@ class System {
   }
 
   Future<AuthorizeCode> authorizeCore() async {
+    if (Platform.isAndroid) {
+      return AuthorizeCode.none;
+    }
     final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
     final isAdmin = await checkIsAdmin();
     if (isAdmin) {
       return AuthorizeCode.none;
     }
+
     if (Platform.isWindows) {
       final result = await windows?.registerService();
       if (result == true) {
         return AuthorizeCode.success;
       }
       return AuthorizeCode.error;
-    } else if (Platform.isMacOS) {
+    }
+
+    if (Platform.isMacOS) {
       final shell = 'chown root:admin $corePath; chmod +sx $corePath';
       final arguments = [
         "-e",

lib/common/text.dart

@@ -1,15 +1,20 @@
+import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 import 'color.dart';
 
 extension TextStyleExtension on TextStyle {
-  TextStyle get toLight => copyWith(color: color?.toLight);
+  TextStyle get toLight => copyWith(color: color?.opacity80);
 
-  TextStyle get toLighter => copyWith(color: color?.toLighter);
+  TextStyle get toLighter => copyWith(color: color?.opacity60);
 
   TextStyle get toSoftBold => copyWith(fontWeight: FontWeight.w500);
 
   TextStyle get toBold => copyWith(fontWeight: FontWeight.bold);
 
+  TextStyle get toJetBrainsMono => copyWith(
+        fontFamily: FontFamily.jetBrainsMono.value,
+      );
+
   TextStyle adjustSize(int size) => copyWith(
         fontSize: fontSize! + size,
       );

lib/common/theme.dart

@@ -0,0 +1,46 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:flutter/material.dart';
+
+class CommonTheme {
+  final BuildContext context;
+  final Map<String, Color> _colorMap;
+  final double textScaleFactor;
+
+  CommonTheme.of(
+    this.context,
+    this.textScaleFactor,
+  ) : _colorMap = {};
+
+  Color get darkenSecondaryContainer {
+    return _colorMap.updateCacheValue(
+      "darkenSecondaryContainer",
+      () => context.colorScheme.secondaryContainer
+          .blendDarken(context, factor: 0.1),
+    );
+  }
+
+  Color get darkenSecondaryContainerLighter {
+    return _colorMap.updateCacheValue(
+      "darkenSecondaryContainerLighter",
+      () => context.colorScheme.secondaryContainer
+          .blendDarken(context, factor: 0.1)
+          .opacity60,
+    );
+  }
+
+  Color get darken2SecondaryContainer {
+    return _colorMap.updateCacheValue(
+      "darken2SecondaryContainer",
+      () => context.colorScheme.secondaryContainer
+          .blendDarken(context, factor: 0.2),
+    );
+  }
+
+  Color get darken3PrimaryContainer {
+    return _colorMap.updateCacheValue(
+      "darken3PrimaryContainer",
+      () => context.colorScheme.primaryContainer
+          .blendDarken(context, factor: 0.3),
+    );
+  }
+}

lib/common/tray.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:fl_clash/common/utils.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -10,7 +11,6 @@ import 'package:tray_manager/tray_manager.dart';
 
 import 'app_localizations.dart';
 import 'constant.dart';
-import 'other.dart';
 import 'window.dart';
 
 class Tray {
@@ -25,7 +25,7 @@ class Tray {
       await trayManager.destroy();
     }
     await trayManager.setIcon(
-      other.getTrayIconPath(
+      utils.getTrayIconPath(
         brightness: brightness ??
             WidgetsBinding.instance.platformDispatcher.platformBrightness,
       ),
@@ -80,7 +80,7 @@ class Tray {
       );
     }
     menuItems.add(MenuItem.separator());
-    if (!Platform.isWindows) {
+    if (Platform.isMacOS) {
       for (final group in trayState.groups) {
         List<MenuItem> subMenuItems = [];
         for (final proxy in group.all) {

lib/common/utils.dart

@@ -5,9 +5,10 @@ import 'dart:ui';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
 
-class Other {
+class Utils {
   Color? getDelayColor(int? delay) {
     if (delay == null) return null;
     if (delay < 0) return Colors.red;
@@ -230,7 +231,64 @@ class Other {
   }
 
   int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 350).floor(), 1);
+    return max((viewWidth / 320).floor(), 1);
+  }
+
+  final _indexPrimary = [
+    50,
+    100,
+    200,
+    300,
+    400,
+    500,
+    600,
+    700,
+    800,
+    850,
+    900,
+  ];
+
+  _createPrimarySwatch(Color color) {
+    final Map<int, Color> swatch = <int, Color>{};
+    final int a = color.alpha8bit;
+    final int r = color.red8bit;
+    final int g = color.green8bit;
+    final int b = color.blue8bit;
+    for (final int strength in _indexPrimary) {
+      final double ds = 0.5 - strength / 1000;
+      swatch[strength] = Color.fromARGB(
+        a,
+        r + ((ds < 0 ? r : (255 - r)) * ds).round(),
+        g + ((ds < 0 ? g : (255 - g)) * ds).round(),
+        b + ((ds < 0 ? b : (255 - b)) * ds).round(),
+      );
+    }
+    swatch[50] = swatch[50]!.lighten(18);
+    swatch[100] = swatch[100]!.lighten(16);
+    swatch[200] = swatch[200]!.lighten(14);
+    swatch[300] = swatch[300]!.lighten(10);
+    swatch[400] = swatch[400]!.lighten(6);
+    swatch[700] = swatch[700]!.darken(2);
+    swatch[800] = swatch[800]!.darken(3);
+    swatch[900] = swatch[900]!.darken(4);
+    return MaterialColor(color.value32bit, swatch);
+  }
+
+  List<Color> getMaterialColorShades(Color color) {
+    final swatch = _createPrimarySwatch(color);
+    return <Color>[
+      if (swatch[50] != null) swatch[50]!,
+      if (swatch[100] != null) swatch[100]!,
+      if (swatch[200] != null) swatch[200]!,
+      if (swatch[300] != null) swatch[300]!,
+      if (swatch[400] != null) swatch[400]!,
+      if (swatch[500] != null) swatch[500]!,
+      if (swatch[600] != null) swatch[600]!,
+      if (swatch[700] != null) swatch[700]!,
+      if (swatch[800] != null) swatch[800]!,
+      if (swatch[850] != null) swatch[850]!,
+      if (swatch[900] != null) swatch[900]!,
+    ];
   }
 
   String getBackupFileName() {
@@ -241,11 +299,6 @@ class Other {
     return "${appName}_${DateTime.now().show}.log";
   }
 
-  Size getScreenSize() {
-    final view = WidgetsBinding.instance.platformDispatcher.views.first;
-    return view.physicalSize / view.devicePixelRatio;
-  }
-
   Future<String?> getLocalIpAddress() async {
     List<NetworkInterface> interfaces = await NetworkInterface.list(
       includeLoopback: false,
@@ -271,6 +324,15 @@ class Other {
     }
     return "";
   }
+
+  SingleActivator controlSingleActivator(LogicalKeyboardKey trigger) {
+    final control = Platform.isMacOS ? false : true;
+    return SingleActivator(
+      trigger,
+      control: control,
+      meta: !control,
+    );
+  }
 }
 
-final other = Other();
+final utils = Utils();

lib/common/window.dart

@@ -21,12 +21,12 @@ class Window {
     await windowManager.ensureInitialized();
     WindowOptions windowOptions = WindowOptions(
       size: Size(props.width, props.height),
-      minimumSize: const Size(380, 500),
+      minimumSize: const Size(380, 400),
     );
     if (!Platform.isMacOS || version > 10) {
       await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
     }
-    if(!Platform.isMacOS){
+    if (!Platform.isMacOS) {
       final left = props.left ?? 0;
       final top = props.top ?? 0;
       final right = left + props.width;
@@ -36,7 +36,7 @@ class Window {
       } else {
         final displays = await screenRetriever.getAllDisplays();
         final isPositionValid = displays.any(
-              (display) {
+          (display) {
             final displayBounds = Rect.fromLTWH(
               display.visiblePosition!.dx,
               display.visiblePosition!.dy,
@@ -69,8 +69,10 @@ class Window {
     await windowManager.setSkipTaskbar(false);
   }
 
-  Future<bool> isVisible() async {
-    return await windowManager.isVisible();
+  Future<bool> get isVisible async {
+    final value = await windowManager.isVisible();
+    commonPrint.log("window visible check: $value");
+    return value;
   }
 
   close() async {

lib/controller.dart

@@ -8,14 +8,17 @@ import 'package:archive/archive.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path/path.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'common/common.dart';
+import 'fragments/profiles/override_profile.dart';
 import 'models/models.dart';
 
 class AppController {
@@ -28,17 +31,18 @@ class AppController {
   AppController(this.context, WidgetRef ref) : _ref = ref;
 
   updateClashConfigDebounce() {
-    debouncer.call(DebounceTag.updateClashConfig, () {
-      updateClashConfig(true);
+    debouncer.call(FunctionTag.updateClashConfig, () async {
+      final isPatch = globalState.appState.needApply ? false : true;
+      await updateClashConfig(isPatch);
     });
   }
 
   updateGroupsDebounce() {
-    debouncer.call(DebounceTag.updateGroups, updateGroups);
+    debouncer.call(FunctionTag.updateGroups, updateGroups);
   }
 
   addCheckIpNumDebounce() {
-    debouncer.call(DebounceTag.addCheckIpNum, () {
+    debouncer.call(FunctionTag.addCheckIpNum, () {
       _ref.read(checkIpNumProvider.notifier).add();
     });
   }
@@ -46,17 +50,17 @@ class AppController {
   applyProfileDebounce({
     bool silence = false,
   }) {
-    debouncer.call(DebounceTag.applyProfile, (silence) {
+    debouncer.call(FunctionTag.applyProfile, (silence) {
       applyProfile(silence: silence);
     }, args: [silence]);
   }
 
   savePreferencesDebounce() {
-    debouncer.call(DebounceTag.savePreferences, savePreferences);
+    debouncer.call(FunctionTag.savePreferences, savePreferences);
   }
 
   changeProxyDebounce(String groupName, String proxyName) {
-    debouncer.call(DebounceTag.changeProxy,
+    debouncer.call(FunctionTag.changeProxy,
         (String groupName, String proxyName) async {
       await changeProxy(
         groupName: groupName,
@@ -68,7 +72,7 @@ class AppController {
 
   restartCore() async {
     await clashService?.reStart();
-    await initCore();
+    await _initCore();
 
     if (_ref.read(runTimeProvider.notifier).isStart) {
       await globalState.handleStart();
@@ -98,7 +102,6 @@ class AppController {
       _ref.read(trafficsProvider.notifier).clear();
       _ref.read(totalTrafficProvider.notifier).value = Traffic();
       _ref.read(runTimeProvider.notifier).value = null;
-      // tray.updateTrayTitle(null);
       addCheckIpNumDebounce();
     }
   }
@@ -151,7 +154,7 @@ class AppController {
   updateLocalIp() async {
     _ref.read(localIpProvider.notifier).value = null;
     await Future.delayed(commonDuration);
-    _ref.read(localIpProvider.notifier).value = await other.getLocalIpAddress();
+    _ref.read(localIpProvider.notifier).value = await utils.getLocalIpAddress();
   }
 
   Future<void> updateProfile(Profile profile) async {
@@ -242,6 +245,7 @@ class AppController {
   }
 
   Future<void> updateClashConfig([bool? isPatch]) async {
+    commonPrint.log("update clash patch: ${isPatch ?? false}");
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     await commonScaffoldState?.loadingRun(() async {
@@ -257,9 +261,7 @@ class AppController {
     final patchConfig = _ref.read(patchClashConfigProvider);
     final appSetting = _ref.read(appSettingProvider);
     bool enableTun = patchConfig.tun.enable;
-    if (enableTun != lastTunEnable &&
-        lastTunEnable == false &&
-        !Platform.isAndroid) {
+    if (enableTun != lastTunEnable && lastTunEnable == false) {
       final code = await system.authorizeCore();
       switch (code) {
         case AuthorizeCode.none:
@@ -280,6 +282,9 @@ class AppController {
     final res = await clashCore.updateConfig(
       globalState.getUpdateConfigParams(isPatch),
     );
+    if (isPatch == false) {
+      _ref.read(needApplyProvider.notifier).value = false;
+    }
     if (res.isNotEmpty) throw res;
     lastTunEnable = enableTun;
     lastProfileModified = await profile?.profileLastModified;
@@ -308,6 +313,10 @@ class AppController {
   handleChangeProfile() {
     _ref.read(delayDataSourceProvider.notifier).value = {};
     applyProfile();
+    _ref.read(logsProvider.notifier).value = FixedList(500);
+    _ref.read(requestsProvider.notifier).value = FixedList(500);
+    globalState.cacheHeightMap = {};
+    globalState.cacheScrollPosition = {};
   }
 
   updateBrightness(Brightness brightness) {
@@ -328,23 +337,22 @@ class AppController {
       try {
         await updateProfile(profile);
       } catch (e) {
-        _ref.read(logsProvider.notifier).addLog(
-              Log(
-                logLevel: LogLevel.info,
-                payload: e.toString(),
-              ),
-            );
+        commonPrint.log(e.toString());
       }
     }
   }
 
   Future<void> updateGroups() async {
-    _ref.read(groupsProvider.notifier).value = await retry(
-      task: () async {
-        return await clashCore.getProxiesGroups();
-      },
-      retryIf: (res) => res.isEmpty,
-    );
+    try {
+      _ref.read(groupsProvider.notifier).value = await retry(
+        task: () async {
+          return await clashCore.getProxiesGroups();
+        },
+        retryIf: (res) => res.isEmpty,
+      );
+    } catch (_) {
+      _ref.read(groupsProvider.notifier).value = [];
+    }
   }
 
   updateProfiles() async {
@@ -356,10 +364,6 @@ class AppController {
     }
   }
 
-  updateSystemColorSchemes(ColorSchemes colorSchemes) {
-    _ref.read(appSchemesProvider.notifier).value = colorSchemes;
-  }
-
   savePreferences() async {
     commonPrint.log("save preferences");
     await preferences.saveConfig(globalState.config);
@@ -382,6 +386,9 @@ class AppController {
   }
 
   handleBackOrExit() async {
+    if (_ref.read(backBlockProvider)) {
+      return;
+    }
     if (_ref.read(appSettingProvider).minimizeOnExit) {
       if (system.isDesktop) {
         await savePreferencesDebounce();
@@ -392,18 +399,34 @@ class AppController {
     }
   }
 
+  backBlock() {
+    _ref.read(backBlockProvider.notifier).value = true;
+  }
+
+  unBackBlock() {
+    _ref.read(backBlockProvider.notifier).value = false;
+  }
+
   handleExit() async {
     try {
       await updateStatus(false);
+      await proxy?.stopProxy();
       await clashCore.shutdown();
       await clashService?.destroy();
-      await proxy?.stopProxy();
       await savePreferences();
     } finally {
       system.exit();
     }
   }
 
+  Future handleClear() async {
+    await preferences.clearPreferences();
+    commonPrint.log("clear preferences");
+    globalState.config = Config(
+      themeProps: defaultThemeProps,
+    );
+  }
+
   autoCheckUpdate() async {
     if (!_ref.read(appSettingProvider).autoCheckUpdate) return;
     final res = await request.checkForUpdate();
@@ -414,10 +437,13 @@ class AppController {
     Map<String, dynamic>? data,
     bool handleError = false,
   }) async {
+    if (globalState.isPre) {
+      return;
+    }
     if (data != null) {
       final tagName = data['tag_name'];
       final body = data['body'];
-      final submits = other.parseReleaseBody(body);
+      final submits = utils.parseReleaseBody(body);
       final textTheme = context.textTheme;
       final res = await globalState.showMessage(
         title: appLocalizations.discoverNewVersion,
@@ -472,21 +498,22 @@ class AppController {
     await handleExit();
   }
 
-  Future<void> initCore() async {
+  Future<void> _initCore() async {
     final isInit = await clashCore.isInit;
     if (!isInit) {
+      await clashCore.init();
       await clashCore.setState(
         globalState.getCoreState(),
       );
-      await clashCore.init();
     }
     await applyProfile();
   }
 
   init() async {
-    await _handlePreference();
-    await _handlerDisclaimer();
-    await initCore();
+    FlutterError.onError = (details) {
+      commonPrint.log(details.stack.toString());
+    };
+    await _initCore();
     await _initStatus();
     updateTray(true);
     autoLaunch?.updateStatus(
@@ -499,6 +526,8 @@ class AppController {
     } else {
       window?.hide();
     }
+    await _handlePreference();
+    await _handlerDisclaimer();
     _ref.read(initProvider.notifier).value = true;
   }
 
@@ -520,37 +549,12 @@ class AppController {
     _ref.read(delayDataSourceProvider.notifier).setDelay(delay);
   }
 
-  toPage(
-    int index, {
-    bool hasAnimate = false,
-  }) {
-    final navigations = _ref.read(currentNavigationsStateProvider).value;
-    if (index > navigations.length - 1) {
-      return;
-    }
-    _ref.read(currentPageLabelProvider.notifier).value =
-        navigations[index].label;
-    final isAnimateToPage = _ref.read(appSettingProvider).isAnimateToPage;
-    final isMobile =
-        _ref.read(viewWidthProvider.notifier).viewMode == ViewMode.mobile;
-    if (isAnimateToPage && isMobile || hasAnimate) {
-      globalState.pageController?.animateToPage(
-        index,
-        duration: kTabScrollDuration,
-        curve: Curves.easeOut,
-      );
-    } else {
-      globalState.pageController?.jumpToPage(index);
-    }
+  toPage(PageLabel pageLabel) {
+    _ref.read(currentPageLabelProvider.notifier).value = pageLabel;
   }
 
   toProfiles() {
-    final index = _ref.read(currentNavigationsStateProvider).value.indexWhere(
-          (element) => element.label == PageLabel.profiles,
-        );
-    if (index != -1) {
-      toPage(index);
-    }
+    toPage(PageLabel.profiles);
   }
 
   initLink() {
@@ -587,17 +591,8 @@ class AppController {
   Future<bool> showDisclaimer() async {
     return await globalState.showCommonDialog<bool>(
           dismissible: false,
-          child: AlertDialog(
-            title: Text(appLocalizations.disclaimer),
-            content: Container(
-              width: dialogCommonWidth,
-              constraints: const BoxConstraints(maxHeight: 200),
-              child: SingleChildScrollView(
-                child: SelectableText(
-                  appLocalizations.disclaimerDesc,
-                ),
-              ),
-            ),
+          child: CommonDialog(
+            title: appLocalizations.disclaimer,
             actions: [
               TextButton(
                 onPressed: () {
@@ -615,6 +610,9 @@ class AppController {
                 child: Text(appLocalizations.agree),
               )
             ],
+            child: SelectableText(
+              appLocalizations.disclaimerDesc,
+            ),
           ),
         ) ??
         false;
@@ -680,9 +678,9 @@ class AppController {
     addProfileFormURL(url);
   }
 
-  updateViewWidth(double width) {
+  updateViewSize(Size size) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      _ref.read(viewWidthProvider.notifier).value = width;
+      _ref.read(viewSizeProvider.notifier).value = size;
     });
   }
 
@@ -693,9 +691,9 @@ class AppController {
   List<Proxy> _sortOfName(List<Proxy> proxies) {
     return List.of(proxies)
       ..sort(
-        (a, b) => other.sortByChar(
-          other.getPinyin(a.name),
-          other.getPinyin(b.name),
+        (a, b) => utils.sortByChar(
+          utils.getPinyin(a.name),
+          utils.getPinyin(b.name),
         ),
       );
   }
@@ -707,10 +705,16 @@ class AppController {
     return List.of(proxies)
       ..sort(
         (a, b) {
-          final aDelay =
-              _ref.read(getDelayProvider(proxyName: a.name, testUrl: testUrl));
-          final bDelay =
-              _ref.read(getDelayProvider(proxyName: b.name, testUrl: testUrl));
+          final aDelay = _ref.read(getDelayProvider(
+            proxyName: a.name,
+            testUrl: testUrl,
+          ));
+          final bDelay = _ref.read(
+            getDelayProvider(
+              proxyName: b.name,
+              testUrl: testUrl,
+            ),
+          );
           if (aDelay == null && bDelay == null) {
             return 0;
           }
@@ -741,10 +745,18 @@ class AppController {
     final providersPath = await appPath.getProvidersPath(profileId);
     return await Isolate.run(() async {
       if (profilePath != null) {
-        await File(profilePath).delete(recursive: true);
+        final profileFile = File(profilePath);
+        final isExists = await profileFile.exists();
+        if (isExists) {
+          profileFile.delete(recursive: true);
+        }
       }
       if (providersPath != null) {
-        await File(providersPath).delete(recursive: true);
+        final providersFileDir = File(providersPath);
+        final isExists = await providersFileDir.exists();
+        if (isExists) {
+          providersFileDir.delete(recursive: true);
+        }
       }
     });
   }
@@ -763,6 +775,17 @@ class AppController {
         );
   }
 
+  Future<List<Package>> getPackages() async {
+    if (_ref.read(isMobileViewProvider)) {
+      await Future.delayed(commonDuration);
+    }
+    if (_ref.read(packagesProvider).isEmpty) {
+      _ref.read(packagesProvider.notifier).value =
+          await app?.getPackages() ?? [];
+    }
+    return _ref.read(packagesProvider);
+  }
+
   updateStart() {
     updateStatus(!_ref.read(runTimeProvider.notifier).isStart);
   }
@@ -798,10 +821,10 @@ class AppController {
     _ref.read(patchClashConfigProvider.notifier).updateState(
           (state) => state.copyWith(mode: mode),
         );
-    // if (mode == Mode.global) {
-    //   updateCurrentGroupName(GroupName.GLOBAL.name);
-    // }
-    // addCheckIpNumDebounce();
+    if (mode == Mode.global) {
+      updateCurrentGroupName(GroupName.GLOBAL.name);
+    }
+    addCheckIpNumDebounce();
   }
 
   updateAutoLaunch() {
@@ -813,7 +836,7 @@ class AppController {
   }
 
   updateVisible() async {
-    final visible = await window?.isVisible();
+    final visible = await window?.isVisible;
     if (visible != null && !visible) {
       window?.show();
     } else {
@@ -836,6 +859,38 @@ class AppController {
     );
   }
 
+  handleAddOrUpdate(WidgetRef ref, [Rule? rule]) async {
+    final res = await globalState.showCommonDialog<Rule>(
+      child: AddRuleDialog(
+        rule: rule,
+        snippet: ref.read(
+          profileOverrideStateProvider.select(
+            (state) => state.snippet!,
+          ),
+        ),
+      ),
+    );
+    if (res == null) {
+      return;
+    }
+    ref.read(profileOverrideStateProvider.notifier).updateState(
+      (state) {
+        final model = state.copyWith.overrideData!(
+          rule: state.overrideData!.rule.updateRules(
+            (rules) {
+              final index = rules.indexWhere((item) => item.id == res.id);
+              if (index == -1) {
+                return List.from([res, ...rules]);
+              }
+              return List.from(rules)..[index] = res;
+            },
+          ),
+        );
+        return model;
+      },
+    );
+  }
+
   Future<bool> exportLogs() async {
     final logsRaw = _ref.read(logsProvider).list.map(
           (item) => item.toString(),
@@ -845,7 +900,7 @@ class AppController {
       return utf8.encode(logsRawString);
     });
     return await picker.saveFile(
-          other.logFile,
+          utils.logFile,
           Uint8List.fromList(data),
         ) !=
         null;
@@ -919,30 +974,39 @@ class AppController {
   }
 
   _recovery(Config config, RecoveryOption recoveryOption) {
+    final recoveryStrategy = _ref.read(appSettingProvider.select(
+      (state) => state.recoveryStrategy,
+    ));
     final profiles = config.profiles;
-    for (final profile in profiles) {
-      _ref.read(profilesProvider.notifier).setProfile(profile);
+    if (recoveryStrategy == RecoveryStrategy.override) {
+      _ref.read(profilesProvider.notifier).value = profiles;
+    } else {
+      for (final profile in profiles) {
+        _ref.read(profilesProvider.notifier).setProfile(
+              profile,
+            );
+      }
     }
     final onlyProfiles = recoveryOption == RecoveryOption.onlyProfiles;
-    if (onlyProfiles) {
-      final currentProfile = _ref.read(currentProfileProvider);
-      if (currentProfile != null) {
-        _ref.read(currentProfileIdProvider.notifier).value = profiles.first.id;
-      }
-      return;
+    if (!onlyProfiles) {
+      _ref.read(patchClashConfigProvider.notifier).value =
+          config.patchClashConfig;
+      _ref.read(appSettingProvider.notifier).value = config.appSetting;
+      _ref.read(currentProfileIdProvider.notifier).value =
+          config.currentProfileId;
+      _ref.read(appDAVSettingProvider.notifier).value = config.dav;
+      _ref.read(themeSettingProvider.notifier).value = config.themeProps;
+      _ref.read(windowSettingProvider.notifier).value = config.windowProps;
+      _ref.read(vpnSettingProvider.notifier).value = config.vpnProps;
+      _ref.read(proxiesStyleSettingProvider.notifier).value =
+          config.proxiesStyle;
+      _ref.read(overrideDnsProvider.notifier).value = config.overrideDns;
+      _ref.read(networkSettingProvider.notifier).value = config.networkProps;
+      _ref.read(hotKeyActionsProvider.notifier).value = config.hotKeyActions;
+    }
+    final currentProfile = _ref.read(currentProfileProvider);
+    if (currentProfile == null) {
+      _ref.read(currentProfileIdProvider.notifier).value = profiles.first.id;
     }
-    _ref.read(patchClashConfigProvider.notifier).value =
-        config.patchClashConfig;
-    _ref.read(appSettingProvider.notifier).value = config.appSetting;
-    _ref.read(currentProfileIdProvider.notifier).value =
-        config.currentProfileId;
-    _ref.read(appDAVSettingProvider.notifier).value = config.dav;
-    _ref.read(themeSettingProvider.notifier).value = config.themeProps;
-    _ref.read(windowSettingProvider.notifier).value = config.windowProps;
-    _ref.read(vpnSettingProvider.notifier).value = config.vpnProps;
-    _ref.read(proxiesStyleSettingProvider.notifier).value = config.proxiesStyle;
-    _ref.read(overrideDnsProvider.notifier).value = config.overrideDns;
-    _ref.read(networkSettingProvider.notifier).value = config.networkProps;
-    _ref.read(hotKeyActionsProvider.notifier).value = config.hotKeyActions;
   }
 }

lib/enum/enum.dart

@@ -91,7 +91,14 @@ enum Mode { rule, global, direct }
 
 enum ViewMode { mobile, laptop, desktop }
 
-enum LogLevel { debug, info, warning, error, silent }
+enum LogLevel {
+  debug,
+  info,
+  warning,
+  error,
+  silent,
+  app,
+}
 
 enum TransportProtocol { udp, tcp }
 
@@ -220,11 +227,12 @@ enum ProxiesIconStyle {
 
 enum FontFamily {
   twEmoji("Twemoji"),
+  jetBrainsMono("JetBrainsMono"),
   icon("Icons");
 
-  final String? value;
+  final String value;
 
-  const FontFamily([this.value]);
+  const FontFamily(this.value);
 }
 
 enum RouteMode {
@@ -261,6 +269,7 @@ enum ActionMethod {
   getCountryCode,
   getMemory,
   getProfile,
+  crash,
 
   ///Android,
   setFdMap,
@@ -282,8 +291,9 @@ enum WindowsHelperServiceStatus {
   running,
 }
 
-enum DebounceTag {
+enum FunctionTag {
   updateClashConfig,
+  updateStatus,
   updateGroups,
   addCheckIpNum,
   applyProfile,
@@ -298,6 +308,9 @@ enum DebounceTag {
   updatePageIndex,
   pageChange,
   proxiesTabChange,
+  logs,
+  requests,
+
 }
 
 enum DashboardWidget {
@@ -307,6 +320,12 @@ enum DashboardWidget {
       child: NetworkSpeed(),
     ),
   ),
+  outboundModeV2(
+    GridItem(
+      crossAxisCellCount: 8,
+      child: OutboundModeV2(),
+    ),
+  ),
   outboundMode(
     GridItem(
       crossAxisCellCount: 4,
@@ -332,6 +351,15 @@ enum DashboardWidget {
     ),
     platforms: desktopPlatforms,
   ),
+  vpnButton(
+    GridItem(
+      crossAxisCellCount: 4,
+      child: VpnButton(),
+    ),
+    platforms: [
+      SupportPlatform.Android,
+    ],
+  ),
   systemProxyButton(
     GridItem(
       crossAxisCellCount: 4,
@@ -384,3 +412,76 @@ enum PageLabel {
   resources,
   connections,
 }
+
+enum RuleAction {
+  DOMAIN("DOMAIN"),
+  DOMAIN_SUFFIX("DOMAIN-SUFFIX"),
+  DOMAIN_KEYWORD("DOMAIN-KEYWORD"),
+  DOMAIN_REGEX("DOMAIN-REGEX"),
+  GEOSITE("GEOSITE"),
+  IP_CIDR("IP-CIDR"),
+  IP_CIDR6("IP-CIDR6"),
+  IP_SUFFIX("IP-SUFFIX"),
+  IP_ASN("IP-ASN"),
+  GEOIP("GEOIP"),
+  SRC_GEOIP("SRC-GEOIP"),
+  SRC_IP_ASN("SRC-IP-ASN"),
+  SRC_IP_CIDR("SRC-IP-CIDR"),
+  SRC_IP_SUFFIX("SRC-IP-SUFFIX"),
+  DST_PORT("DST-PORT"),
+  SRC_PORT("SRC-PORT"),
+  IN_PORT("IN-PORT"),
+  IN_TYPE("IN-TYPE"),
+  IN_USER("IN-USER"),
+  IN_NAME("IN-NAME"),
+  PROCESS_PATH("PROCESS-PATH"),
+  PROCESS_PATH_REGEX("PROCESS-PATH-REGEX"),
+  PROCESS_NAME("PROCESS-NAME"),
+  PROCESS_NAME_REGEX("PROCESS-NAME-REGEX"),
+  UID("UID"),
+  NETWORK("NETWORK"),
+  DSCP("DSCP"),
+  RULE_SET("RULE-SET"),
+  AND("AND"),
+  OR("OR"),
+  NOT("NOT"),
+  SUB_RULE("SUB-RULE"),
+  MATCH("MATCH");
+
+  final String value;
+
+  const RuleAction(this.value);
+}
+
+extension RuleActionExt on RuleAction {
+  bool get hasParams => [
+        RuleAction.GEOIP,
+        RuleAction.IP_ASN,
+        RuleAction.SRC_IP_ASN,
+        RuleAction.IP_CIDR,
+        RuleAction.IP_CIDR6,
+        RuleAction.IP_SUFFIX,
+        RuleAction.RULE_SET,
+      ].contains(this);
+}
+
+enum OverrideRuleType {
+  override,
+  added,
+}
+
+enum RuleTarget {
+  DIRECT,
+  REJECT,
+}
+
+enum RecoveryStrategy {
+  compatible,
+  override,
+}
+
+enum CacheTag {
+  logs,
+  rules,
+  requests,
+}

lib/fragments/about.dart

@@ -1,7 +1,11 @@
+import 'dart:async';
+
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/list.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 @immutable
 class Contributor {
@@ -43,6 +47,15 @@ class AboutFragment extends StatelessWidget {
             _checkUpdate(context);
           },
         ),
+        ListItem(
+          title: Text(appLocalizations.contactMe),
+          onTap: () {
+            globalState.showMessage(
+              title: appLocalizations.contactMe,
+              message: TextSpan(text: "chen08209@gmail.com"),
+            );
+          },
+        ),
         ListItem(
           title: const Text("Telegram"),
           onTap: () {
@@ -116,33 +129,43 @@ class AboutFragment extends StatelessWidget {
         title: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Wrap(
-              spacing: 16,
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(12),
-                  child: Image.asset(
-                    'assets/images/icon.png',
-                    width: 64,
-                    height: 64,
-                  ),
-                ),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+            Consumer(builder: (_, ref, ___) {
+              return _DeveloperModeDetector(
+                child: Wrap(
+                  spacing: 16,
+                  crossAxisAlignment: WrapCrossAlignment.center,
                   children: [
-                    Text(
-                      appName,
-                      style: Theme.of(context).textTheme.headlineSmall,
+                    Padding(
+                      padding: const EdgeInsets.all(12),
+                      child: Image.asset(
+                        'assets/images/icon.png',
+                        width: 64,
+                        height: 64,
+                      ),
                     ),
-                    Text(
-                      globalState.packageInfo.version,
-                      style: Theme.of(context).textTheme.labelLarge,
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          appName,
+                          style: Theme.of(context).textTheme.headlineSmall,
+                        ),
+                        Text(
+                          globalState.packageInfo.version,
+                          style: Theme.of(context).textTheme.labelLarge,
+                        )
+                      ],
                     )
                   ],
-                )
-              ],
-            ),
+                ),
+                onEnterDeveloperMode: () {
+                  ref.read(appSettingProvider.notifier).updateState(
+                        (state) => state.copyWith(developerMode: true),
+                      );
+                  context.showNotifier(appLocalizations.developerModeEnableTip);
+                },
+              );
+            }),
             const SizedBox(
               height: 24,
             ),
@@ -179,10 +202,7 @@ class Avatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
-      splashColor: Colors.transparent,
-      highlightColor: Colors.transparent,
-      hoverColor: Colors.transparent,
+    return GestureDetector(
       child: Column(
         children: [
           SizedBox(
@@ -209,3 +229,52 @@ class Avatar extends StatelessWidget {
     );
   }
 }
+
+class _DeveloperModeDetector extends StatefulWidget {
+  final Widget child;
+  final VoidCallback onEnterDeveloperMode;
+
+  const _DeveloperModeDetector({
+    required this.child,
+    required this.onEnterDeveloperMode,
+  });
+
+  @override
+  State<_DeveloperModeDetector> createState() => _DeveloperModeDetectorState();
+}
+
+class _DeveloperModeDetectorState extends State<_DeveloperModeDetector> {
+  int _counter = 0;
+  Timer? _timer;
+
+  void _handleTap() {
+    _counter++;
+    if (_counter >= 5) {
+      widget.onEnterDeveloperMode();
+      _resetCounter();
+    } else {
+      _timer?.cancel();
+      _timer = Timer(Duration(seconds: 1), _resetCounter);
+    }
+  }
+
+  void _resetCounter() {
+    _counter = 0;
+    _timer?.cancel();
+    _timer = null;
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: _handleTap,
+      child: widget.child,
+    );
+  }
+}

lib/fragments/access.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:fl_clash/enum/enum.dart';
@@ -22,21 +23,14 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
   List<String> acceptList = [];
   List<String> rejectList = [];
   late ScrollController _controller;
+  final _completer = Completer();
 
   @override
   void initState() {
     super.initState();
     _updateInitList();
     _controller = ScrollController();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appState;
-      if (appState.packages.isEmpty) {
-        Future.delayed(const Duration(milliseconds: 300), () async {
-          ref.read(packagesProvider.notifier).value =
-              await app?.getPackages() ?? [];
-        });
-      }
-    });
+    _completer.complete(globalState.appController.getPackages());
   }
 
   @override
@@ -113,15 +107,11 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
   }
 
   _intelligentSelected() async {
-    final appState = globalState.appState;
-    final config = globalState.config;
-    final accessControl = config.vpnProps.accessControl;
-    final packageNames = appState.packages
-        .where(
-          (item) =>
-              accessControl.isFilterSystemApp ? item.isSystem == false : true,
-        )
-        .map((item) => item.packageName);
+    final packageNames = ref.read(
+      packageListSelectorStateProvider.select(
+        (state) => state.list.map((item) => item.packageName),
+      ),
+    );
     final commonScaffoldState = context.commonScaffoldState;
     if (commonScaffoldState?.mounted != true) return;
     final selectedPackageNames =
@@ -150,9 +140,17 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
     return IconButton(
       onPressed: () async {
         final res = await showSheet<int>(
-          title: appLocalizations.proxiesSetting,
           context: context,
-          body: AccessControlPanel(),
+          props: SheetProps(
+            isScrollControlled: true,
+          ),
+          builder: (_, type) {
+            return AdaptiveSheetScaffold(
+              type: type,
+              body: AccessControlPanel(),
+              title: appLocalizations.proxiesSetting,
+            );
+          },
         );
         if (res == 1) {
           _intelligentSelected();
@@ -186,7 +184,7 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
     final state = ref.watch(packageListSelectorStateProvider);
     final accessControl = state.accessControl;
     final accessControlMode = accessControl.mode;
-    final packages = state.getList(
+    final packages = state.getSortList(
       accessControlMode == AccessControlMode.acceptSelected
           ? acceptList
           : rejectList,
@@ -315,31 +313,42 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
                 ),
                 Expanded(
                   flex: 1,
-                  child: packages.isEmpty
-                      ? const Center(
-                          child: CircularProgressIndicator(),
-                        )
-                      : CommonScrollBar(
-                          controller: _controller,
-                          child: ListView.builder(
-                            controller: _controller,
-                            itemCount: packages.length,
-                            itemExtent: 72,
-                            itemBuilder: (_, index) {
-                              final package = packages[index];
-                              return PackageListItem(
-                                key: Key(package.packageName),
-                                package: package,
-                                value: valueList.contains(package.packageName),
-                                isActive: accessControl.enable,
-                                onChanged: (value) {
-                                  _handleSelected(valueList, package, value);
-                                },
+                  child: FutureBuilder(
+                      future: _completer.future,
+                      builder: (_, snapshot) {
+                        if (snapshot.connectionState != ConnectionState.done) {
+                          return Center(
+                            child: CircularProgressIndicator(),
+                          );
+                        }
+                        return packages.isEmpty
+                            ? NullStatus(
+                                label: appLocalizations.noData,
+                              )
+                            : CommonScrollBar(
+                                controller: _controller,
+                                child: ListView.builder(
+                                  controller: _controller,
+                                  itemCount: packages.length,
+                                  itemExtent: 72,
+                                  itemBuilder: (_, index) {
+                                    final package = packages[index];
+                                    return PackageListItem(
+                                      key: Key(package.packageName),
+                                      package: package,
+                                      value: valueList
+                                          .contains(package.packageName),
+                                      isActive: accessControl.enable,
+                                      onChanged: (value) {
+                                        _handleSelected(
+                                            valueList, package, value);
+                                      },
+                                    );
+                                  },
+                                ),
                               );
-                            },
-                          ),
-                        ),
-                ),
+                      }),
+                )
               ],
             ),
           ),
@@ -474,14 +483,20 @@ class AccessControlSearchDelegate extends SearchDelegate {
     final lowQuery = query.toLowerCase();
     return Consumer(
       builder: (context, ref, __) {
-        final state = ref.watch(packageListSelectorStateProvider);
-        final accessControl = state.accessControl;
-        final accessControlMode = accessControl.mode;
-        final packages = state.getList(
-          accessControlMode == AccessControlMode.acceptSelected
-              ? acceptList
-              : rejectList,
+        final vm3 = ref.watch(
+          packageListSelectorStateProvider.select(
+            (state) => VM3(
+              a: state.getSortList(
+                state.accessControl.mode == AccessControlMode.acceptSelected
+                    ? acceptList
+                    : rejectList,
+              ),
+              b: state.accessControl.enable,
+              c: state.accessControl.currentList,
+            ),
+          ),
         );
+        final packages = vm3.a;
         final queryPackages = packages
             .where(
               (package) =>
@@ -489,8 +504,8 @@ class AccessControlSearchDelegate extends SearchDelegate {
                   package.packageName.contains(lowQuery),
             )
             .toList();
-        final isAccessControl = state.accessControl.enable;
-        final currentList = accessControl.currentList;
+        final isAccessControl = vm3.b;
+        final currentList = vm3.c;
         final packageNameList = packages.map((e) => e.packageName).toList();
         final valueList = currentList.intersection(packageNameList);
         return DisabledMask(
@@ -571,13 +586,6 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
     };
   }
 
-  String _getTextWithIsFilterSystemApp(bool isFilterSystemApp) {
-    return switch (isFilterSystemApp) {
-      true => appLocalizations.onlyOtherApps,
-      false => appLocalizations.allApps,
-    };
-  }
-
   List<Widget> _buildModeSetting() {
     return generateSection(
       title: appLocalizations.mode,
@@ -665,25 +673,39 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
           scrollDirection: Axis.horizontal,
           child: Consumer(
             builder: (_, ref, __) {
-              final isFilterSystemApp = ref.watch(
-                vpnSettingProvider
-                    .select((state) => state.accessControl.isFilterSystemApp),
+              final vm2 = ref.watch(
+                vpnSettingProvider.select(
+                  (state) => VM2(
+                    a: state.accessControl.isFilterSystemApp,
+                    b: state.accessControl.isFilterNonInternetApp,
+                  ),
+                ),
               );
               return Wrap(
                 spacing: 16,
                 children: [
-                  for (final item in [false, true])
-                    SettingTextCard(
-                      _getTextWithIsFilterSystemApp(item),
-                      isSelected: isFilterSystemApp == item,
-                      onPressed: () {
-                        ref.read(vpnSettingProvider.notifier).updateState(
-                              (state) => state.copyWith.accessControl(
-                                isFilterSystemApp: item,
-                              ),
-                            );
-                      },
-                    )
+                  SettingTextCard(
+                    appLocalizations.systemApp,
+                    isSelected: vm2.a == false,
+                    onPressed: () {
+                      ref.read(vpnSettingProvider.notifier).updateState(
+                            (state) => state.copyWith.accessControl(
+                              isFilterSystemApp: !vm2.a,
+                            ),
+                          );
+                    },
+                  ),
+                  SettingTextCard(
+                    appLocalizations.noNetworkApp,
+                    isSelected: vm2.b == false,
+                    onPressed: () {
+                      ref.read(vpnSettingProvider.notifier).updateState(
+                            (state) => state.copyWith.accessControl(
+                              isFilterNonInternetApp: !vm2.b,
+                            ),
+                          );
+                    },
+                  )
                 ],
               );
             },
@@ -763,17 +785,19 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 32),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ..._buildModeSetting(),
-          ..._buildSortSetting(),
-          ..._buildSourceSetting(),
-          ..._buildActionSetting(),
-        ],
+    return SingleChildScrollView(
+      child: Padding(
+        padding: const EdgeInsets.only(bottom: 32),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            ..._buildModeSetting(),
+            ..._buildSortSetting(),
+            ..._buildSourceSetting(),
+            ..._buildActionSetting(),
+          ],
+        ),
       ),
     );
   }

lib/fragments/application_setting.dart

@@ -276,8 +276,8 @@ class ApplicationSettingFragment extends StatelessWidget {
       AutoRunItem(),
       if (Platform.isAndroid) ...[
         HiddenItem(),
-        AnimateTabItem(),
       ],
+      AnimateTabItem(),
       OpenLogsItem(),
       CloseConnectionsItem(),
       UsageItem(),

lib/fragments/backup_and_recovery.dart

@@ -6,11 +6,14 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/dialog.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
+import 'package:fl_clash/widgets/input.dart';
 import 'package:fl_clash/widgets/list.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
 
 class BackupAndRecovery extends ConsumerWidget {
   const BackupAndRecovery({super.key});
@@ -74,7 +77,7 @@ class BackupAndRecovery extends ConsumerWidget {
       () async {
         final backupData = await globalState.appController.backupData();
         final value = await picker.saveFile(
-          other.getBackupFileName(),
+          utils.getBackupFileName(),
           Uint8List.fromList(backupData),
         );
         if (value == null) return false;
@@ -133,6 +136,30 @@ class BackupAndRecovery extends ConsumerWidget {
         );
   }
 
+  _handleUpdateRecoveryStrategy(WidgetRef ref) async {
+    final recoveryStrategy = ref.read(appSettingProvider.select(
+      (state) => state.recoveryStrategy,
+    ));
+    final res = await globalState.showCommonDialog(
+      child: OptionsDialog<RecoveryStrategy>(
+        title: appLocalizations.recoveryStrategy,
+        options: RecoveryStrategy.values,
+        textBuilder: (mode) => Intl.message(
+          "recoveryStrategy_${mode.name}",
+        ),
+        value: recoveryStrategy,
+      ),
+    );
+    if (res == null) {
+      return;
+    }
+    ref.read(appSettingProvider.notifier).updateState(
+          (state) => state.copyWith(
+            recoveryStrategy: res,
+          ),
+        );
+  }
+
   @override
   Widget build(BuildContext context, ref) {
     final dav = ref.watch(appDAVSettingProvider);
@@ -174,26 +201,26 @@ class BackupAndRecovery extends ConsumerWidget {
                     future: client!.pingCompleter.future,
                     builder: (_, snapshot) {
                       return Center(
-                        child: FadeBox(
-                          child: snapshot.connectionState ==
-                                  ConnectionState.waiting
-                              ? const SizedBox(
-                                  width: 12,
-                                  height: 12,
-                                  child: CircularProgressIndicator(
-                                    strokeWidth: 1,
-                                  ),
-                                )
-                              : Container(
-                                  decoration: BoxDecoration(
-                                    shape: BoxShape.circle,
-                                    color: snapshot.data == true
-                                        ? Colors.green
-                                        : Colors.red,
-                                  ),
-                                  width: 12,
-                                  height: 12,
-                                ),
+                        child: FadeThroughBox(
+                          child:
+                              snapshot.connectionState != ConnectionState.done
+                                  ? const SizedBox(
+                                      width: 12,
+                                      height: 12,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 1,
+                                      ),
+                                    )
+                                  : Container(
+                                      decoration: BoxDecoration(
+                                        shape: BoxShape.circle,
+                                        color: snapshot.data == true
+                                            ? Colors.green
+                                            : Colors.red,
+                                      ),
+                                      width: 12,
+                                      height: 12,
+                                    ),
                         ),
                       );
                     },
@@ -255,6 +282,26 @@ class BackupAndRecovery extends ConsumerWidget {
           title: Text(appLocalizations.recovery),
           subtitle: Text(appLocalizations.localRecoveryDesc),
         ),
+        ListHeader(title: appLocalizations.options),
+        Consumer(builder: (_, ref, __) {
+          final recoveryStrategy = ref.watch(appSettingProvider.select(
+            (state) => state.recoveryStrategy,
+          ));
+          return ListItem(
+            onTap: () {
+              _handleUpdateRecoveryStrategy(ref);
+            },
+            title: Text(appLocalizations.recoveryStrategy),
+            trailing: FilledButton(
+              onPressed: () {
+                _handleUpdateRecoveryStrategy(ref);
+              },
+              child: Text(
+                Intl.message("recoveryStrategy_${recoveryStrategy.name}"),
+              ),
+            ),
+          );
+        }),
       ],
     );
   }
@@ -275,30 +322,27 @@ class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.recovery),
-      contentPadding: const EdgeInsets.symmetric(
+    return CommonDialog(
+      title: appLocalizations.recovery,
+      padding: const EdgeInsets.symmetric(
         horizontal: 8,
         vertical: 16,
       ),
-      content: SizedBox(
-        width: 250,
-        child: Wrap(
-          children: [
-            ListItem(
-              onTap: () {
-                _handleOnTab(RecoveryOption.onlyProfiles);
-              },
-              title: Text(appLocalizations.recoveryProfiles),
-            ),
-            ListItem(
-              onTap: () {
-                _handleOnTab(RecoveryOption.all);
-              },
-              title: Text(appLocalizations.recoveryAll),
-            )
-          ],
-        ),
+      child: Wrap(
+        children: [
+          ListItem(
+            onTap: () {
+              _handleOnTab(RecoveryOption.onlyProfiles);
+            },
+            title: Text(appLocalizations.recoveryProfiles),
+          ),
+          ListItem(
+            onTap: () {
+              _handleOnTab(RecoveryOption.all);
+            },
+            title: Text(appLocalizations.recoveryAll),
+          )
+        ],
       ),
     );
   }
@@ -351,78 +395,8 @@ class _WebDAVFormDialogState extends ConsumerState<WebDAVFormDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.webDAVConfiguration),
-      content: Form(
-        key: _formKey,
-        child: SizedBox(
-          width: dialogCommonWidth,
-          child: Wrap(
-            runSpacing: 16,
-            children: [
-              TextFormField(
-                controller: uriController,
-                maxLines: 5,
-                minLines: 1,
-                decoration: InputDecoration(
-                  prefixIcon: const Icon(Icons.link),
-                  border: const OutlineInputBorder(),
-                  labelText: appLocalizations.address,
-                  helperText: appLocalizations.addressHelp,
-                ),
-                validator: (String? value) {
-                  if (value == null || value.isEmpty || !value.isUrl) {
-                    return appLocalizations.addressTip;
-                  }
-                  return null;
-                },
-              ),
-              TextFormField(
-                controller: userController,
-                decoration: InputDecoration(
-                  prefixIcon: const Icon(Icons.account_circle),
-                  border: const OutlineInputBorder(),
-                  labelText: appLocalizations.account,
-                ),
-                validator: (String? value) {
-                  if (value == null || value.isEmpty) {
-                    return appLocalizations.accountTip;
-                  }
-                  return null;
-                },
-              ),
-              ValueListenableBuilder(
-                valueListenable: _obscureController,
-                builder: (_, obscure, __) {
-                  return TextFormField(
-                    controller: passwordController,
-                    obscureText: obscure,
-                    decoration: InputDecoration(
-                      prefixIcon: const Icon(Icons.password),
-                      border: const OutlineInputBorder(),
-                      suffixIcon: IconButton(
-                        icon: Icon(
-                          obscure ? Icons.visibility : Icons.visibility_off,
-                        ),
-                        onPressed: () {
-                          _obscureController.value = !obscure;
-                        },
-                      ),
-                      labelText: appLocalizations.password,
-                    ),
-                    validator: (String? value) {
-                      if (value == null || value.isEmpty) {
-                        return appLocalizations.passwordTip;
-                      }
-                      return null;
-                    },
-                  );
-                },
-              ),
-            ],
-          ),
-        ),
-      ),
+    return CommonDialog(
+      title: appLocalizations.webDAVConfiguration,
       actions: [
         if (widget.dav != null)
           TextButton(
@@ -434,6 +408,73 @@ class _WebDAVFormDialogState extends ConsumerState<WebDAVFormDialog> {
           child: Text(appLocalizations.save),
         )
       ],
+      child: Form(
+        key: _formKey,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextFormField(
+              controller: uriController,
+              maxLines: 5,
+              minLines: 1,
+              decoration: InputDecoration(
+                prefixIcon: const Icon(Icons.link),
+                border: const OutlineInputBorder(),
+                labelText: appLocalizations.address,
+                helperText: appLocalizations.addressHelp,
+              ),
+              validator: (String? value) {
+                if (value == null || value.isEmpty || !value.isUrl) {
+                  return appLocalizations.addressTip;
+                }
+                return null;
+              },
+            ),
+            TextFormField(
+              controller: userController,
+              decoration: InputDecoration(
+                prefixIcon: const Icon(Icons.account_circle),
+                border: const OutlineInputBorder(),
+                labelText: appLocalizations.account,
+              ),
+              validator: (String? value) {
+                if (value == null || value.isEmpty) {
+                  return appLocalizations.accountTip;
+                }
+                return null;
+              },
+            ),
+            ValueListenableBuilder(
+              valueListenable: _obscureController,
+              builder: (_, obscure, __) {
+                return TextFormField(
+                  controller: passwordController,
+                  obscureText: obscure,
+                  decoration: InputDecoration(
+                    prefixIcon: const Icon(Icons.password),
+                    border: const OutlineInputBorder(),
+                    suffixIcon: IconButton(
+                      icon: Icon(
+                        obscure ? Icons.visibility : Icons.visibility_off,
+                      ),
+                      onPressed: () {
+                        _obscureController.value = !obscure;
+                      },
+                    ),
+                    labelText: appLocalizations.password,
+                  ),
+                  validator: (String? value) {
+                    if (value == null || value.isEmpty) {
+                      return appLocalizations.passwordTip;
+                    }
+                    return null;
+                  },
+                );
+              },
+            ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/fragments/config/config.dart

@@ -2,8 +2,13 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/fragments/config/dns.dart';
 import 'package:fl_clash/fragments/config/general.dart';
 import 'package:fl_clash/fragments/config/network.dart';
+import 'package:fl_clash/models/clash_config.dart';
+import 'package:fl_clash/providers/config.dart' show patchClashConfigProvider;
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../state.dart';
 
 class ConfigFragment extends StatefulWidget {
   const ConfigFragment({super.key});
@@ -16,18 +21,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
   @override
   Widget build(BuildContext context) {
     List<Widget> items = [
-      ListItem.open(
-        title: Text(appLocalizations.network),
-        subtitle: Text(appLocalizations.networkDesc),
-        leading: const Icon(Icons.vpn_key),
-        delegate: OpenDelegate(
-          title: appLocalizations.network,
-          isScaffold: true,
-          isBlur: false,
-          extendPageWidth: 360,
-          widget: const NetworkListView(),
-        ),
-      ),
       ListItem.open(
         title: Text(appLocalizations.general),
         subtitle: Text(appLocalizations.generalDesc),
@@ -37,20 +30,51 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           widget: generateListView(
             generalItems,
           ),
-          isBlur: false,
-          extendPageWidth: 360,
+          blur: false,
+        ),
+      ),
+      ListItem.open(
+        title: Text(appLocalizations.network),
+        subtitle: Text(appLocalizations.networkDesc),
+        leading: const Icon(Icons.vpn_key),
+        delegate: OpenDelegate(
+          title: appLocalizations.network,
+          blur: false,
+          widget: const NetworkListView(),
         ),
       ),
       ListItem.open(
         title: const Text("DNS"),
         subtitle: Text(appLocalizations.dnsDesc),
         leading: const Icon(Icons.dns),
-        delegate: const OpenDelegate(
+        delegate: OpenDelegate(
           title: "DNS",
-          widget: DnsListView(),
-          isScaffold: true,
-          isBlur: false,
-          extendPageWidth: 360,
+          action: Consumer(builder: (_, ref, __) {
+            return IconButton(
+              onPressed: () async {
+                final res = await globalState.showMessage(
+                  title: appLocalizations.reset,
+                  message: TextSpan(
+                    text: appLocalizations.resetTip,
+                  ),
+                );
+                if (res != true) {
+                  return;
+                }
+                ref.read(patchClashConfigProvider.notifier).updateState(
+                      (state) => state.copyWith(
+                        dns: defaultDns,
+                      ),
+                    );
+              },
+              tooltip: appLocalizations.reset,
+              icon: const Icon(
+                Icons.replay,
+              ),
+            );
+          }),
+          widget: const DnsListView(),
+          blur: false,
         ),
       )
     ];

lib/fragments/config/dns.dart

@@ -1,8 +1,6 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/providers/config.dart';
-import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -205,7 +203,7 @@ class FakeIpFilterItem extends StatelessWidget {
     return ListItem.open(
       title: Text(appLocalizations.fakeipFilter),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.fakeipFilter,
         widget: Consumer(
           builder: (_, ref, __) {
@@ -213,7 +211,7 @@ class FakeIpFilterItem extends StatelessWidget {
               patchClashConfigProvider
                   .select((state) => state.dns.fakeIpFilter),
             );
-            return ListPage(
+            return ListInputPage(
               title: appLocalizations.fakeipFilter,
               items: fakeIpFilter,
               titleBuilder: (item) => Text(item),
@@ -227,7 +225,6 @@ class FakeIpFilterItem extends StatelessWidget {
             );
           },
         ),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -242,14 +239,14 @@ class DefaultNameserverItem extends StatelessWidget {
       title: Text(appLocalizations.defaultNameserver),
       subtitle: Text(appLocalizations.defaultNameserverDesc),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.defaultNameserver,
         widget: Consumer(builder: (_, ref, __) {
           final defaultNameserver = ref.watch(
             patchClashConfigProvider
                 .select((state) => state.dns.defaultNameserver),
           );
-          return ListPage(
+          return ListInputPage(
             title: appLocalizations.defaultNameserver,
             items: defaultNameserver,
             titleBuilder: (item) => Text(item),
@@ -262,7 +259,6 @@ class DefaultNameserverItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -278,13 +274,13 @@ class NameserverItem extends StatelessWidget {
       subtitle: Text(appLocalizations.nameserverDesc),
       delegate: OpenDelegate(
         title: appLocalizations.nameserver,
-        isBlur: false,
+        blur: false,
         widget: Consumer(builder: (_, ref, __) {
           final nameserver = ref.watch(
             patchClashConfigProvider.select((state) => state.dns.nameserver),
           );
-          return ListPage(
-            title: "域名服务器",
+          return ListInputPage(
+            title: appLocalizations.nameserver,
             items: nameserver,
             titleBuilder: (item) => Text(item),
             onChange: (items) {
@@ -296,7 +292,6 @@ class NameserverItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -357,28 +352,27 @@ class NameserverPolicyItem extends StatelessWidget {
       title: Text(appLocalizations.nameserverPolicy),
       subtitle: Text(appLocalizations.nameserverPolicyDesc),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.nameserverPolicy,
         widget: Consumer(builder: (_, ref, __) {
           final nameserverPolicy = ref.watch(
             patchClashConfigProvider
                 .select((state) => state.dns.nameserverPolicy),
           );
-          return ListPage(
+          return MapInputPage(
             title: appLocalizations.nameserverPolicy,
-            items: nameserverPolicy.entries,
+            map: nameserverPolicy,
             titleBuilder: (item) => Text(item.key),
             subtitleBuilder: (item) => Text(item.value),
-            onChange: (items) {
+            onChange: (value) {
               ref.read(patchClashConfigProvider.notifier).updateState(
                     (state) => state.copyWith.dns(
-                      nameserverPolicy: Map.fromEntries(items),
+                      nameserverPolicy: value,
                     ),
                   );
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -393,7 +387,7 @@ class ProxyServerNameserverItem extends StatelessWidget {
       title: Text(appLocalizations.proxyNameserver),
       subtitle: Text(appLocalizations.proxyNameserverDesc),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.proxyNameserver,
         widget: Consumer(
           builder: (_, ref, __) {
@@ -401,7 +395,7 @@ class ProxyServerNameserverItem extends StatelessWidget {
               patchClashConfigProvider
                   .select((state) => state.dns.proxyServerNameserver),
             );
-            return ListPage(
+            return ListInputPage(
               title: appLocalizations.proxyNameserver,
               items: proxyServerNameserver,
               titleBuilder: (item) => Text(item),
@@ -415,7 +409,6 @@ class ProxyServerNameserverItem extends StatelessWidget {
             );
           },
         ),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -430,13 +423,13 @@ class FallbackItem extends StatelessWidget {
       title: Text(appLocalizations.fallback),
       subtitle: Text(appLocalizations.fallbackDesc),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.fallback,
         widget: Consumer(builder: (_, ref, __) {
           final fallback = ref.watch(
             patchClashConfigProvider.select((state) => state.dns.fallback),
           );
-          return ListPage(
+          return ListInputPage(
             title: appLocalizations.fallback,
             items: fallback,
             titleBuilder: (item) => Text(item),
@@ -449,7 +442,6 @@ class FallbackItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -518,14 +510,14 @@ class GeositeItem extends StatelessWidget {
     return ListItem.open(
       title: const Text("Geosite"),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: "Geosite",
         widget: Consumer(builder: (_, ref, __) {
           final geosite = ref.watch(
             patchClashConfigProvider
                 .select((state) => state.dns.fallbackFilter.geosite),
           );
-          return ListPage(
+          return ListInputPage(
             title: "Geosite",
             items: geosite,
             titleBuilder: (item) => Text(item),
@@ -538,7 +530,6 @@ class GeositeItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -552,14 +543,14 @@ class IpcidrItem extends StatelessWidget {
     return ListItem.open(
       title: Text(appLocalizations.ipcidr),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.ipcidr,
         widget: Consumer(builder: (_, ref, ___) {
           final ipcidr = ref.watch(
             patchClashConfigProvider
                 .select((state) => state.dns.fallbackFilter.ipcidr),
           );
-          return ListPage(
+          return ListInputPage(
             title: appLocalizations.ipcidr,
             items: ipcidr,
             titleBuilder: (item) => Text(item),
@@ -572,7 +563,6 @@ class IpcidrItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -586,14 +576,14 @@ class DomainItem extends StatelessWidget {
     return ListItem.open(
       title: Text(appLocalizations.domain),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: appLocalizations.domain,
         widget: Consumer(builder: (_, ref, __) {
           final domain = ref.watch(
             patchClashConfigProvider
                 .select((state) => state.dns.fallbackFilter.domain),
           );
-          return ListPage(
+          return ListInputPage(
             title: appLocalizations.domain,
             items: domain,
             titleBuilder: (item) => Text(item),
@@ -606,7 +596,6 @@ class DomainItem extends StatelessWidget {
             },
           );
         }),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -671,39 +660,8 @@ const dnsItems = <Widget>[
 class DnsListView extends ConsumerWidget {
   const DnsListView({super.key});
 
-  _initActions(BuildContext context, WidgetRef ref) {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      context.commonScaffoldState?.actions = [
-        IconButton(
-          onPressed: () async {
-            final res = await globalState.showMessage(
-              title: appLocalizations.reset,
-              message: TextSpan(
-                text: appLocalizations.resetTip,
-              ),
-            );
-            if (res != true) {
-              return;
-            }
-
-            ref.read(patchClashConfigProvider.notifier).updateState(
-                  (state) => state.copyWith(
-                    dns: defaultDns,
-                  ),
-                );
-          },
-          tooltip: appLocalizations.reset,
-          icon: const Icon(
-            Icons.replay,
-          ),
-        )
-      ];
-    });
-  }
-
   @override
   Widget build(BuildContext context, ref) {
-    _initActions(context, ref);
     return generateListView(
       dnsItems,
     );

lib/fragments/config/general.dart

@@ -199,28 +199,27 @@ class HostsItem extends StatelessWidget {
       title: const Text("Hosts"),
       subtitle: Text(appLocalizations.hostsDesc),
       delegate: OpenDelegate(
-        isBlur: false,
+        blur: false,
         title: "Hosts",
         widget: Consumer(
           builder: (_, ref, __) {
             final hosts = ref
                 .watch(patchClashConfigProvider.select((state) => state.hosts));
-            return ListPage(
+            return MapInputPage(
               title: "Hosts",
-              items: hosts.entries,
+              map: hosts,
               titleBuilder: (item) => Text(item.key),
               subtitleBuilder: (item) => Text(item.value),
-              onChange: (items) {
+              onChange: (value) {
                 ref.read(patchClashConfigProvider.notifier).updateState(
                       (state) => state.copyWith(
-                        hosts: Map.fromEntries(items),
+                        hosts: value,
                       ),
                     );
               },
             );
           },
         ),
-        extendPageWidth: 360,
       ),
     );
   }

lib/fragments/config/network.dart

@@ -224,15 +224,14 @@ class BypassDomainItem extends StatelessWidget {
       title: Text(appLocalizations.bypassDomain),
       subtitle: Text(appLocalizations.bypassDomainDesc),
       delegate: OpenDelegate(
-        isBlur: false,
-        isScaffold: true,
+        blur: false,
         title: appLocalizations.bypassDomain,
         widget: Consumer(
           builder: (_, ref, __) {
             _initActions(context, ref);
             final bypassDomain = ref.watch(
                 networkSettingProvider.select((state) => state.bypassDomain));
-            return ListPage(
+            return ListInputPage(
               title: appLocalizations.bypassDomain,
               items: bypassDomain,
               titleBuilder: (item) => Text(item),
@@ -246,7 +245,6 @@ class BypassDomainItem extends StatelessWidget {
             );
           },
         ),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -298,14 +296,17 @@ class RouteAddressItem extends ConsumerWidget {
       title: Text(appLocalizations.routeAddress),
       subtitle: Text(appLocalizations.routeAddressDesc),
       delegate: OpenDelegate(
-        isBlur: false,
-        isScaffold: true,
+        blur: false,
+        maxWidth: 360,
         title: appLocalizations.routeAddress,
         widget: Consumer(
           builder: (_, ref, __) {
-            final routeAddress = ref.watch(patchClashConfigProvider
-                .select((state) => state.tun.routeAddress));
-            return ListPage(
+            final routeAddress = ref.watch(
+              patchClashConfigProvider.select(
+                (state) => state.tun.routeAddress,
+              ),
+            );
+            return ListInputPage(
               title: appLocalizations.routeAddress,
               items: routeAddress,
               titleBuilder: (item) => Text(item),
@@ -319,7 +320,6 @@ class RouteAddressItem extends ConsumerWidget {
             );
           },
         ),
-        extendPageWidth: 360,
       ),
     );
   }
@@ -374,7 +374,9 @@ class NetworkListView extends ConsumerWidget {
               return;
             }
             ref.read(vpnSettingProvider.notifier).updateState(
-                  (state) => defaultVpnProps,
+                  (state) => defaultVpnProps.copyWith(
+                    accessControl: state.accessControl,
+                  ),
                 );
             ref.read(patchClashConfigProvider.notifier).updateState(
                   (state) => state.copyWith(

lib/fragments/connection/connections.dart

@@ -125,7 +125,7 @@ class _ConnectionsFragmentState extends ConsumerState<ConnectionsFragment>
               return ConnectionItem(
                 key: Key(connection.id),
                 connection: connection,
-                onClick: (value) {
+                onClickKeyword: (value) {
                   context.commonScaffoldState?.addKeyword(value);
                 },
                 trailing: IconButton(

lib/fragments/connection/item.dart

@@ -9,40 +9,15 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class FindProcessBuilder extends StatelessWidget {
-  final Widget Function(bool value) builder;
-
-  const FindProcessBuilder({
-    super.key,
-    required this.builder,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer(
-      builder: (_, ref, __) {
-        final value = ref.watch(
-          patchClashConfigProvider.select(
-            (state) =>
-                state.findProcessMode == FindProcessMode.always &&
-                Platform.isAndroid,
-          ),
-        );
-        return builder(value);
-      },
-    );
-  }
-}
-
-class ConnectionItem extends StatelessWidget {
+class ConnectionItem extends ConsumerWidget {
   final Connection connection;
-  final Function(String)? onClick;
+  final Function(String)? onClickKeyword;
   final Widget? trailing;
 
   const ConnectionItem({
     super.key,
     required this.connection,
-    this.onClick,
+    this.onClickKeyword,
     this.trailing,
   });
 
@@ -59,7 +34,14 @@ class ConnectionItem extends StatelessWidget {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, ref) {
+    final value = ref.watch(
+      patchClashConfigProvider.select(
+        (state) =>
+            state.findProcessMode == FindProcessMode.always &&
+            Platform.isAndroid,
+      ),
+    );
     final title = Text(
       connection.desc,
       style: context.textTheme.bodyLarge,
@@ -86,70 +68,143 @@ class ConnectionItem extends StatelessWidget {
               CommonChip(
                 label: chain,
                 onPressed: () {
-                  if (onClick == null) return;
-                  onClick!(chain);
+                  if (onClickKeyword == null) return;
+                  onClickKeyword!(chain);
                 },
               ),
           ],
         ),
       ],
     );
-    if (!Platform.isAndroid) {
-      return ListItem(
-        padding: const EdgeInsets.symmetric(
-          horizontal: 16,
-          vertical: 4,
-        ),
-        tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-        title: title,
-        subtitle: subTitle,
-        trailing: trailing,
-      );
-    }
-    return FindProcessBuilder(
-      builder: (bool value) {
-        final leading = value
-            ? GestureDetector(
-                onTap: () {
-                  if (onClick == null) return;
-                  final process = connection.metadata.process;
-                  if (process.isEmpty) return;
-                  onClick!(process);
-                },
-                child: Container(
-                  margin: const EdgeInsets.only(top: 4),
-                  width: 48,
-                  height: 48,
-                  child: FutureBuilder<ImageProvider?>(
-                    future: _getPackageIcon(connection),
-                    builder: (_, snapshot) {
-                      if (!snapshot.hasData && snapshot.data == null) {
-                        return Container();
-                      } else {
-                        return Image(
-                          image: snapshot.data!,
-                          gaplessPlayback: true,
-                          width: 48,
-                          height: 48,
-                        );
-                      }
-                    },
-                  ),
-                ),
-              )
-            : null;
+    return CommonPopupBox(
+      targetBuilder: (open) {
         return ListItem(
           padding: const EdgeInsets.symmetric(
             horizontal: 16,
             vertical: 4,
           ),
           tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-          leading: leading,
+          leading: value
+              ? GestureDetector(
+            onTap: () {
+              if (onClickKeyword == null) return;
+              final process = connection.metadata.process;
+              if (process.isEmpty) return;
+              onClickKeyword!(process);
+            },
+            child: Container(
+              margin: const EdgeInsets.only(top: 4),
+              width: 48,
+              height: 48,
+              child: FutureBuilder<ImageProvider?>(
+                future: _getPackageIcon(connection),
+                builder: (_, snapshot) {
+                  if (!snapshot.hasData && snapshot.data == null) {
+                    return Container();
+                  } else {
+                    return Image(
+                      image: snapshot.data!,
+                      gaplessPlayback: true,
+                      width: 48,
+                      height: 48,
+                    );
+                  }
+                },
+              ),
+            ),
+          )
+              : null,
           title: title,
           subtitle: subTitle,
           trailing: trailing,
         );
+        // return InkWell(
+        //   child: GestureDetector(
+        //     onLongPressStart: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     onSecondaryTapDown: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     child: ListItem(
+        //       padding: const EdgeInsets.symmetric(
+        //         horizontal: 16,
+        //         vertical: 4,
+        //       ),
+        //       tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+        //       leading: value
+        //           ? GestureDetector(
+        //               onTap: () {
+        //                 if (onClickKeyword == null) return;
+        //                 final process = connection.metadata.process;
+        //                 if (process.isEmpty) return;
+        //                 onClickKeyword!(process);
+        //               },
+        //               child: Container(
+        //                 margin: const EdgeInsets.only(top: 4),
+        //                 width: 48,
+        //                 height: 48,
+        //                 child: FutureBuilder<ImageProvider?>(
+        //                   future: _getPackageIcon(connection),
+        //                   builder: (_, snapshot) {
+        //                     if (!snapshot.hasData && snapshot.data == null) {
+        //                       return Container();
+        //                     } else {
+        //                       return Image(
+        //                         image: snapshot.data!,
+        //                         gaplessPlayback: true,
+        //                         width: 48,
+        //                         height: 48,
+        //                       );
+        //                     }
+        //                   },
+        //                 ),
+        //               ),
+        //             )
+        //           : null,
+        //       title: title,
+        //       subtitle: subTitle,
+        //       trailing: trailing,
+        //     ),
+        //   ),
+        //   onTap: () {},
+        // );
       },
+      popup: CommonPopupMenu(
+        minWidth: 160,
+        items: [
+          PopupMenuItemData(
+            label: "编辑规则",
+            onPressed: () {
+              // _handleShowEditExtendPage(context);
+            },
+          ),
+          PopupMenuItemData(
+            label: "设置直连",
+            onPressed: () {},
+          ),
+          PopupMenuItemData(
+            label: "一键屏蔽",
+            onPressed: () {},
+          ),
+        ],
+      ),
     );
   }
 }

lib/fragments/connection/requests.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -9,8 +11,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'item.dart';
 
-double _preOffset = 0;
-
 class RequestsFragment extends ConsumerStatefulWidget {
   const RequestsFragment({super.key});
 
@@ -20,15 +20,13 @@ class RequestsFragment extends ConsumerStatefulWidget {
 
 class _RequestsFragmentState extends ConsumerState<RequestsFragment>
     with PageMixin {
-  final _requestsStateNotifier =
-      ValueNotifier<ConnectionsState>(const ConnectionsState());
-  List<Connection> _requests = [];
-
-  final ScrollController _scrollController = ScrollController(
-    initialScrollOffset: _preOffset != 0 ? _preOffset : double.maxFinite,
+  final _requestsStateNotifier = ValueNotifier<ConnectionsState>(
+    const ConnectionsState(loading: true),
   );
-
-  final FixedMap<String, double?> _cacheDynamicHeightMap = FixedMap(1000);
+  List<Connection> _requests = [];
+  final _tag = CacheTag.requests;
+  late ScrollController _scrollController;
+  bool _isLoad = false;
 
   double _currentMaxWidth = 0;
 
@@ -48,10 +46,14 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
   @override
   void initState() {
     super.initState();
-    _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-      connections: globalState.appState.requests.list,
+    final preOffset = globalState.cacheScrollPosition[_tag] ?? -1;
+    _scrollController = ScrollController(
+      initialScrollOffset: preOffset > 0 ? preOffset : double.maxFinite,
+    );
+    _requests = globalState.appState.requests.list;
+    _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
+      connections: _requests,
     );
-
     ref.listenManual(
       isCurrentPageProvider(
         PageLabel.requests,
@@ -73,15 +75,10 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
           updateRequestsThrottler();
         }
       },
-      fireImmediately: true,
     );
   }
 
   double _calcCacheHeight(Connection item) {
-    final cacheHeight = _cacheDynamicHeightMap.get(item.id);
-    if (cacheHeight != null) {
-      return cacheHeight;
-    }
     final size = globalState.measure.computeTextSize(
       Text(
         item.desc,
@@ -102,15 +99,7 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
     final lines = (chainSize.height / baseHeight).round();
     final computerHeight =
         size.height + chainSize.height + 24 + 24 * (lines - 1);
-    _cacheDynamicHeightMap.put(item.id, computerHeight);
-    return computerHeight;
-  }
-
-  _handleTryClearCache(double maxWidth) {
-    if (_currentMaxWidth != maxWidth) {
-      _currentMaxWidth = maxWidth;
-      _cacheDynamicHeightMap.clear();
-    }
+    return computerHeight + 8 + 32 + globalState.measure.bodyMediumHeight;
   }
 
   @override
@@ -118,12 +107,11 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
     _requestsStateNotifier.dispose();
     _scrollController.dispose();
     _currentMaxWidth = 0;
-    _cacheDynamicHeightMap.clear();
     super.dispose();
   }
 
   updateRequestsThrottler() {
-    throttler.call("request", () {
+    throttler.call(FunctionTag.requests, () {
       final isEquality = connectionListEquality.equals(
         _requests,
         _requestsStateNotifier.value.connections,
@@ -132,80 +120,147 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
         return;
       }
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-          connections: _requests,
-        );
+        if(mounted){
+          _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
+            connections: _requests,
+          );
+        }
       });
     }, duration: commonDuration);
   }
 
+  _preLoad() {
+    if (_isLoad == true) {
+      return;
+    }
+    _isLoad = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (!mounted) {
+        return;
+      }
+      final isMobileView = ref.read(isMobileViewProvider);
+      if (isMobileView) {
+        await Future.delayed(Duration(milliseconds: 300));
+      }
+      final parts = _requests.batch(10);
+      globalState.cacheHeightMap[_tag] ??= FixedMap(
+        _requests.length,
+      );
+      for (int i = 0; i < parts.length; i++) {
+        final part = parts[i];
+        await Future(
+          () {
+            for (final request in part) {
+              globalState.cacheHeightMap[_tag]?.updateCacheValue(
+                request.id,
+                () => _calcCacheHeight(request),
+              );
+            }
+          },
+        );
+      }
+      _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
+        loading: false,
+      );
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (_, constraints) {
-        return FindProcessBuilder(builder: (value) {
-          _handleTryClearCache(constraints.maxWidth - 40 - (value ? 60 : 0));
-          return ValueListenableBuilder<ConnectionsState>(
-            valueListenable: _requestsStateNotifier,
-            builder: (_, state, __) {
-              final connections = state.list;
-              if (connections.isEmpty) {
-                return NullStatus(
-                  label: appLocalizations.nullRequestsDesc,
+        return Consumer(
+          builder: (_, ref, child) {
+            final value = ref.watch(
+              patchClashConfigProvider.select(
+                (state) =>
+                    state.findProcessMode == FindProcessMode.always &&
+                    Platform.isAndroid,
+              ),
+            );
+            _currentMaxWidth = constraints.maxWidth - 40 - (value ? 60 : 0);
+            return child!;
+          },
+          child: TextScaleNotification(
+            child: ValueListenableBuilder<ConnectionsState>(
+              valueListenable: _requestsStateNotifier,
+              builder: (_, state, __) {
+                _preLoad();
+                final connections = state.list;
+                if (connections.isEmpty) {
+                  return NullStatus(
+                    label: appLocalizations.nullRequestsDesc,
+                  );
+                }
+                final items = connections
+                    .map<Widget>(
+                      (connection) => ConnectionItem(
+                        key: Key(connection.id),
+                        connection: connection,
+                        onClickKeyword: (value) {
+                          context.commonScaffoldState?.addKeyword(value);
+                        },
+                      ),
+                    )
+                    .separated(
+                      const Divider(
+                        height: 0,
+                      ),
+                    )
+                    .toList();
+                final content = connections.isEmpty
+                    ? NullStatus(
+                        label: appLocalizations.nullRequestsDesc,
+                      )
+                    : Align(
+                        alignment: Alignment.topCenter,
+                        child: ScrollToEndBox(
+                          controller: _scrollController,
+                          tag: _tag,
+                          dataSource: connections,
+                          child: CommonScrollBar(
+                            controller: _scrollController,
+                            child: CacheItemExtentListView(
+                              tag: _tag,
+                              reverse: true,
+                              shrinkWrap: true,
+                              physics: NextClampingScrollPhysics(),
+                              controller: _scrollController,
+                              itemExtentBuilder: (index) {
+                                if (index.isOdd) {
+                                  return 0;
+                                }
+                                return _calcCacheHeight(
+                                    connections[index ~/ 2]);
+                              },
+                              itemBuilder: (_, index) {
+                                return items[index];
+                              },
+                              itemCount: items.length,
+                              keyBuilder: (int index) {
+                                if (index.isOdd) {
+                                  return "divider";
+                                }
+                                return connections[index ~/ 2].id;
+                              },
+                            ),
+                          ),
+                        ),
+                      );
+                return FadeBox(
+                  child: state.loading
+                      ? Center(
+                          child: CircularProgressIndicator(),
+                        )
+                      : content,
                 );
-              }
-              final items = connections
-                  .map<Widget>(
-                    (connection) => ConnectionItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: (value) {
-                        context.commonScaffoldState?.addKeyword(value);
-                      },
-                    ),
-                  )
-                  .separated(
-                    const Divider(
-                      height: 0,
-                    ),
-                  )
-                  .toList();
-              return Align(
-                alignment: Alignment.topCenter,
-                child: NotificationListener<ScrollEndNotification>(
-                  onNotification: (details) {
-                    _preOffset = details.metrics.pixels;
-                    return false;
-                  },
-                  child: CommonScrollBar(
-                    controller: _scrollController,
-                    child: ListView.builder(
-                      reverse: true,
-                      shrinkWrap: true,
-                      physics: NextClampingScrollPhysics(),
-                      controller: _scrollController,
-                      itemExtentBuilder: (index, __) {
-                        final widget = items[index];
-                        if (widget.runtimeType == Divider) {
-                          return 0;
-                        }
-                        final measure = globalState.measure;
-                        final bodyMediumHeight = measure.bodyMediumHeight;
-                        final connection = connections[(index / 2).floor()];
-                        final height = _calcCacheHeight(connection);
-                        return height + bodyMediumHeight + 32;
-                      },
-                      itemBuilder: (_, index) {
-                        return items[index];
-                      },
-                      itemCount: items.length,
-                    ),
-                  ),
-                ),
-              );
+              },
+            ),
+            onNotification: (_) {
+              globalState.cacheHeightMap[_tag]?.clear();
             },
-          );
-        });
+          ),
+        );
       },
     );
   }

lib/fragments/dashboard/dashboard.dart

@@ -6,6 +6,7 @@ import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+
 import 'widgets/start_button.dart';
 
 class DashboardFragment extends ConsumerStatefulWidget {
@@ -66,7 +67,16 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
             valueListenable: key.currentState!.isEditNotifier,
             builder: (_, isEdit, ___) {
               return isEdit
-                  ? Icon(Icons.save)
+                  ? SystemBackBlock(
+                      child: CommonPopScope(
+                        child: Icon(Icons.save),
+                        onPop: () {
+                          key.currentState!.isEditNotifier.value =
+                              !key.currentState!.isEditNotifier.value;
+                          return false;
+                        },
+                      ),
+                    )
                   : Icon(
                       Icons.edit,
                     );
@@ -93,7 +103,7 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
   @override
   Widget build(BuildContext context) {
     final dashboardState = ref.watch(dashboardStateProvider);
-    final columns = max(4 * ((dashboardState.viewWidth / 350).ceil()), 8);
+    final columns = max(4 * ((dashboardState.viewWidth / 320).ceil()), 8);
     return Align(
       alignment: Alignment.topCenter,
       child: SingleChildScrollView(
@@ -103,8 +113,8 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
         child: SuperGrid(
           key: key,
           crossAxisCount: columns,
-          crossAxisSpacing: 16,
-          mainAxisSpacing: 16,
+          crossAxisSpacing: 16.ap,
+          mainAxisSpacing: 16.ap,
           children: [
             ...dashboardState.dashboardWidgets
                 .where(