Support override script

Support proxies search

Add some scenes auto close connections

Update core

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,26 +56,25 @@ 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:
-          flutter-version: 3.24.5
-          channel: stable
+          channel: ${{ (startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) && 'master' || 'stable' }}
           cache: true
+          flutter-version: 3.29.3
 
       - 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
@@ -89,14 +88,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)
@@ -128,7 +126,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
@@ -204,32 +202,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 }}
@@ -239,7 +246,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,119 @@
+## v0.8.84
+
+- Fix windows service verify issues
+
+- Update changelog
+
+## v0.8.83
+
+- Add windows server mode start process verify
+
+- Add linux deb dependencies
+
+- Add backup recovery strategy select
+
+- Support custom text scaling
+
+- Optimize the display of different text scale
+
+- Optimize windows setup experience
+
+- Optimize startTun performance
+
+- Optimize android tv experience
+
+- Optimize default option
+
+- Optimize computed text size
+
+- Optimize hyperOS freeform window
+
+- Add developer mode
+
+- Update core
+
+- Optimize more details
+
+- Add issues template
+
+- Update changelog
+
+## v0.8.82
+
+- Optimize android vpn performance
+
+- Add custom primary color and color scheme
+
+- Add linux nad windows arm release
+
+- Optimize requests and logs page
+
+- Fix map input page delete issues
+
+- Update changelog
+
+## v0.8.81
+
+- Add rule override
+
+- Update core
+
+- Optimize more details
+
+- Update changelog
+
+## v0.8.80
+
+- Optimize dashboard performance
+
+- Fix some issues
+
+- Fix unselected proxy group delay issues
+
+- Fix asn url issues
+
+- Update changelog
+
+## v0.8.79
+
+- Fix tab delay view issues
+
+- Fix tray action issues
+
+- Fix get profile redirect client ua issues
+
+- Fix proxy card delay view issues
+
+- Add Russian, Japanese adaptation
+
+- Fix some issues
+
+- Update changelog
+
+## v0.8.78
+
+- Fix list form input view issues
+
+- Fix traffic view issues
+
+- Update changelog
+
+## v0.8.77
+
+- Optimize performance
+
+- Update core
+
+- Optimize core stability
+
+- Fix linux tun authority check error
+
+- Fix some issues
+
+- Fix scroll physics error
+
+- Update changelog
+
 ## v0.8.75
 
 - Add windows storage corruption detection

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,114 +0,0 @@
-import com.android.build.gradle.tasks.MergeSourceSetFolders
-
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-def defStoreFile = file("keystore.jks")
-def defStorePassword = localProperties.getProperty('storePassword')
-def defKeyAlias = localProperties.getProperty('keyAlias')
-def defKeyPassword = localProperties.getProperty('keyPassword')
-def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias != null && defKeyPassword != null
-
-android {
-    namespace "com.follow.clash"
-    compileSdkVersion 34
-    ndkVersion "27.1.12297006"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-    signingConfigs {
-        if (isRelease) {
-            release {
-                storeFile defStoreFile
-                storePassword defStorePassword
-                keyAlias defKeyAlias
-                keyPassword defKeyPassword
-            }
-        }
-    }
-
-
-    defaultConfig {
-        applicationId "com.follow.clash"
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-            applicationIdSuffix '.debug'
-        }
-        release {
-            if (isRelease) {
-                signingConfig signingConfigs.release
-            } else {
-                signingConfig signingConfigs.debug
-            }
-            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-        }
-    }
-}
-
-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 '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") {
-        exclude group: "com.google.guava", module: "guava"
-    }
-}
-
-
-afterEvaluate {
-    assembleDebug.dependsOn copyNativeLibs
-
-    assembleRelease.dependsOn copyNativeLibs
-}

android/app/build.gradle.kts

@@ -0,0 +1,93 @@
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+val localPropertiesFile = rootProject.file("local.properties")
+val localProperties = Properties().apply {
+    if (localPropertiesFile.exists()) {
+        localPropertiesFile.inputStream().use { load(it) }
+    }
+}
+
+val mStoreFile: File = file("keystore.jks")
+val mStorePassword: String? = localProperties.getProperty("storePassword")
+val mKeyAlias: String? = localProperties.getProperty("keyAlias")
+val mKeyPassword: String? = localProperties.getProperty("keyPassword")
+val isRelease = mStoreFile.exists()
+        && mStorePassword != null
+        && mKeyAlias != null
+        && mKeyPassword != null
+
+android {
+    namespace = "com.follow.clash"
+    compileSdk = 35
+    ndkVersion = "28.0.13004108"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        applicationId = "com.follow.clash"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    signingConfigs {
+        if (isRelease) {
+            create("release") {
+                storeFile = mStoreFile
+                storePassword = mStorePassword
+                keyAlias = mKeyAlias
+                keyPassword = mKeyPassword
+            }
+        }
+    }
+
+    buildTypes {
+        debug {
+            isMinifyEnabled = false
+            applicationIdSuffix = ".debug"
+        }
+
+        release {
+            isMinifyEnabled = true
+            isDebuggable = false
+
+            signingConfig = if (isRelease) {
+                signingConfigs.getByName("release")
+            } else {
+                signingConfigs.getByName("debug")
+            }
+
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
+
+dependencies {
+    implementation(project(":core"))
+    implementation("androidx.core:core-splashscreen:1.0.1")
+    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")
+    }
+}

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,14 +1,16 @@
 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
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 
@@ -22,6 +24,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
@@ -31,6 +37,15 @@ object GlobalState {
         return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 
+    fun syncStatus() {
+        CoroutineScope(Dispatchers.Default).launch {
+            val status = getCurrentVPNPlugin()?.getStatus() ?: false
+            withContext(Dispatchers.Main){
+                runState.value = if (status) RunState.START else RunState.STOP
+            }
+        }
+    }
+
     suspend fun getText(text: String): String {
         return getCurrentAppPlugin()?.getText(text) ?: ""
     }

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

@@ -17,6 +17,7 @@ class MainActivity : FlutterActivity() {
 
     override fun onDestroy() {
         GlobalState.flutterEngine = null
+        GlobalState.runState.value = RunState.STOP
         super.onDestroy()
     }
 }

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
@@ -52,8 +51,8 @@ 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()
@@ -249,6 +200,13 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         timerJob = null
     }
 
+
+    suspend fun getStatus(): Boolean? {
+        return withContext(Dispatchers.Default) {
+            flutterMethodChannel.awaitResult<Boolean>("status", null)
+        }
+    }
+
     private fun handleStartService() {
         if (flClashService == null) {
             bindService()
@@ -257,26 +215,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()
             flClashService?.stop()
+            stopForegroundJob()
+            Core.stopTun()
             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/FlClashTileService.kt

@@ -33,6 +33,7 @@ class FlClashTileService : TileService() {
 
     override fun onStartListening() {
         super.onStartListening()
+        GlobalState.syncStatus()
         GlobalState.runState.value?.let { updateTile(it) }
         GlobalState.runState.observeForever(observer)
     }

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

@@ -1,32 +0,0 @@
-buildscript {
-    ext.kotlin_version = "${kotlin_version}"
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
-

android/build.gradle.kts

@@ -0,0 +1,22 @@
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

android/core/.gitignore

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

android/core/build.gradle.kts

@@ -0,0 +1,65 @@
+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
+    }
+
+    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

@@ -1,26 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
-
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "$agp_version" apply false
-    id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
-}
-
-include ":app"

android/settings.gradle.kts

@@ -0,0 +1,29 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.9.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+}
+
+
+include(":app")
+include(":core")

arb/intl_en.arb

@@ -13,7 +13,6 @@
   "resourcesDesc": "External resource related info",
   "trafficUsage": "Traffic usage",
   "coreInfo": "Core info",
-  "nullCoreInfoDesc": "Unable to obtain core info",
   "networkSpeed": "Network speed",
   "outboundMode": "Outbound mode",
   "networkDetection": "Network detection",
@@ -22,7 +21,6 @@
   "noProxy": "No proxy",
   "noProxyDesc": "Please create a profile or add a valid profile",
   "nullProfileDesc": "No profile, Please add a profile",
-  "nullLogsDesc": "No logs",
   "settings": "Settings",
   "language": "Language",
   "defaultText": "Default",
@@ -30,6 +28,8 @@
   "other": "Other",
   "about": "About",
   "en": "English",
+  "ja": "Japanese",
+  "ru": "Russian",
   "zh_CN": "Simplified Chinese",
   "theme": "Theme",
   "themeDesc": "Set dark mode,adjust the color",
@@ -121,7 +121,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...",
@@ -148,8 +147,6 @@
   "addressHelp": "WebDAV server address",
   "addressTip": "Please enter a valid WebDAV address",
   "password": "Password",
-  "passwordTip": "Password cannot be empty",
-  "accountTip": "Account cannot be empty",
   "checkUpdate": "Check for updates",
   "discoverNewVersion": "Discover the new version",
   "checkUpdateError": "The current application is already the latest version",
@@ -179,14 +176,11 @@
   "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",
   "connections": "Connections",
   "connectionsDesc": "View current connections data",
-  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No connections",
   "intranetIP": "Intranet IP",
   "view": "View",
   "cut": "Cut",
@@ -215,12 +209,11 @@
   "go": "Go",
   "externalLink": "External link",
   "otherContributors": "Other contributors",
-  "autoCloseConnections": "Auto lose connections",
+  "autoCloseConnections": "Auto close connections",
   "autoCloseConnectionsDesc": "Auto close connections after change node",
   "onlyStatisticsProxy": "Only statistics proxy",
   "onlyStatisticsProxyDesc": "When turned on, only statistics proxy traffic",
-  "deleteProfileTip": "Sure you want to delete the current profile?",
-  "prueBlackMode": "Prue black mode",
+  "pureBlackMode": "Pure black mode",
   "keepAliveIntervalDesc": "Tcp keep alive interval",
   "entries": " entries",
   "local": "Local",
@@ -247,11 +240,9 @@
   "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",
-  "notEmpty": "Cannot be empty",
   "hostsDesc": "Add Hosts",
   "vpnTip": "Changes take effect after restarting the VPN",
   "vpnEnableDesc": "Auto routes all system traffic through VpnService",
@@ -338,10 +329,78 @@
   "fileIsUpdate": "The file has been modified. Do you want to save the changes?",
   "profileHasUpdate": "The profile has been modified. Do you want to disable auto update?",
   "hasCacheChange": "Do you want to cache the changes?",
-  "nullProxies": "No proxies",
   "copySuccess": "Copy success",
   "copyLink": "Copy link",
   "exportFile": "Export file",
   "cacheCorrupt": "The cache is corrupt. Do you want to clear it?",
-  "detectionTip": "Relying on third-party APIs is for reference only"
+  "detectionTip": "Relying on third-party api is for reference only",
+  "listen": "Listen",
+  "undo": "undo",
+  "redo": "redo",
+  "none": "none",
+  "basicConfig": "Basic configuration",
+  "basicConfigDesc": "Modify the basic configuration globally",
+  "selectedCountTitle": "{count} items have been selected",
+  "addRule": "Add rule",
+  "ruleName": "Rule name",
+  "content": "Content",
+  "subRule": "Sub rule",
+  "ruleTarget": "Rule target",
+  "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",
+  "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?",
+  "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",
+  "emptyTip": "{label} cannot be empty",
+  "urlTip": "{label} must be a url",
+  "numberTip": "{label} must be a number",
+  "interval": "Interval",
+  "existsTip": "Current {label} already exists",
+  "deleteTip": "Are you sure you want to delete the current {label}?",
+  "deleteMultipTip": "Are you sure you want to delete the selected {label}?",
+  "nullTip": "No {label} at the moment",
+  "script": "Script",
+  "color": "Color",
+  "rename": "Rename",
+  "unnamed": "Unnamed",
+  "pleaseEnterScriptName": "Please enter a script name",
+  "overrideInvalidTip": "Does not take effect in script mode",
+  "mixedPort": "Mixed Port",
+  "socksPort": "Socks Port",
+  "redirPort": "Redir Port",
+  "tproxyPort": "Tproxy Port",
+  "portTip": "{label} must be between 1024 and 49151",
+  "portConflictTip": "Please enter a different port"
 }

arb/intl_ja.arb

@@ -0,0 +1,407 @@
+{
+  "rule": "ルール",
+  "global": "グローバル",
+  "direct": "ダイレクト",
+  "dashboard": "ダッシュボード",
+  "proxies": "プロキシ",
+  "profile": "プロファイル",
+  "profiles": "プロファイル一覧",
+  "tools": "ツール",
+  "logs": "ログ",
+  "logsDesc": "ログキャプチャ記録",
+  "resources": "リソース",
+  "resourcesDesc": "外部リソース関連情報",
+  "trafficUsage": "トラフィック使用量",
+  "coreInfo": "コア情報",
+  "networkSpeed": "ネットワーク速度",
+  "outboundMode": "アウトバウンドモード",
+  "networkDetection": "ネットワーク検出",
+  "upload": "アップロード",
+  "download": "ダウンロード",
+  "noProxy": "プロキシなし",
+  "noProxyDesc": "プロファイルを作成するか、有効なプロファイルを追加してください",
+  "nullProfileDesc": "プロファイルがありません。追加してください",
+  "settings": "設定",
+  "language": "言語",
+  "defaultText": "デフォルト",
+  "more": "詳細",
+  "other": "その他",
+  "about": "について",
+  "en": "英語",
+  "ja": "日本語",
+  "ru": "ロシア語",
+  "zh_CN": "簡体字中国語",
+  "theme": "テーマ",
+  "themeDesc": "ダークモードの設定、色の調整",
+  "override": "上書き",
+  "overrideDesc": "プロキシ関連設定を上書き",
+  "allowLan": "LANを許可",
+  "allowLanDesc": "LAN経由でのプロキシアクセスを許可",
+  "tun": "TUN",
+  "tunDesc": "管理者モードでのみ有効",
+  "minimizeOnExit": "終了時に最小化",
+  "minimizeOnExitDesc": "システムの終了イベントを変更",
+  "autoLaunch": "自動起動",
+  "autoLaunchDesc": "システムの自動起動に従う",
+  "silentLaunch": "バックグラウンド起動",
+  "silentLaunchDesc": "バックグラウンドで起動",
+  "autoRun": "自動実行",
+  "autoRunDesc": "アプリ起動時に自動実行",
+  "logcat": "ログキャット",
+  "logcatDesc": "無効化するとログエントリを非表示",
+  "autoCheckUpdate": "自動更新チェック",
+  "autoCheckUpdateDesc": "起動時に更新を自動チェック",
+  "accessControl": "アクセス制御",
+  "accessControlDesc": "アプリケーションのプロキシアクセスを設定",
+  "application": "アプリケーション",
+  "applicationDesc": "アプリ関連設定を変更",
+  "edit": "編集",
+  "confirm": "確認",
+  "update": "更新",
+  "add": "追加",
+  "save": "保存",
+  "delete": "削除",
+  "years": "年",
+  "months": "月",
+  "hours": "時間",
+  "days": "日",
+  "minutes": "分",
+  "seconds": "秒",
+  "ago": "前",
+  "just": "たった今",
+  "qrcode": "QRコード",
+  "qrcodeDesc": "QRコードをスキャンしてプロファイルを取得",
+  "url": "URL",
+  "urlDesc": "URL経由でプロファイルを取得",
+  "file": "ファイル",
+  "fileDesc": "プロファイルを直接アップロード",
+  "name": "名前",
+  "profileNameNullValidationDesc": "プロファイル名を入力してください",
+  "profileUrlNullValidationDesc": "プロファイルURLを入力してください",
+  "profileUrlInvalidValidationDesc": "有効なプロファイルURLを入力してください",
+  "autoUpdate": "自動更新",
+  "autoUpdateInterval": "自動更新間隔（分）",
+  "profileAutoUpdateIntervalNullValidationDesc": "自動更新間隔を入力してください",
+  "profileAutoUpdateIntervalInvalidValidationDesc": "有効な間隔形式を入力してください",
+  "themeMode": "テーマモード",
+  "themeColor": "テーマカラー",
+  "preview": "プレビュー",
+  "auto": "自動",
+  "light": "ライト",
+  "dark": "ダーク",
+  "importFromURL": "URLからインポート",
+  "submit": "送信",
+  "doYouWantToPass": "通過させますか？",
+  "create": "作成",
+  "defaultSort": "デフォルト順",
+  "delaySort": "遅延順",
+  "nameSort": "名前順",
+  "pleaseUploadFile": "ファイルをアップロードしてください",
+  "pleaseUploadValidQrcode": "有効なQRコードをアップロードしてください",
+  "blacklistMode": "ブラックリストモード",
+  "whitelistMode": "ホワイトリストモード",
+  "filterSystemApp": "システムアプリを除外",
+  "cancelFilterSystemApp": "システムアプリの除外を解除",
+  "selectAll": "すべて選択",
+  "cancelSelectAll": "全選択解除",
+  "appAccessControl": "アプリアクセス制御",
+  "accessControlAllowDesc": "選択したアプリのみVPNを許可",
+  "accessControlNotAllowDesc": "選択したアプリをVPNから除外",
+  "selected": "選択済み",
+  "unableToUpdateCurrentProfileDesc": "現在のプロファイルを更新できません",
+  "noMoreInfoDesc": "追加情報なし",
+  "profileParseErrorDesc": "プロファイル解析エラー",
+  "proxyPort": "プロキシポート",
+  "proxyPortDesc": "Clashのリスニングポートを設定",
+  "port": "ポート",
+  "logLevel": "ログレベル",
+  "show": "表示",
+  "exit": "終了",
+  "systemProxy": "システムプロキシ",
+  "project": "プロジェクト",
+  "core": "コア",
+  "tabAnimation": "タブアニメーション",
+  "desc": "ClashMetaベースのマルチプラットフォームプロキシクライアント。シンプルで使いやすく、オープンソースで広告なし。",
+  "startVpn": "VPNを開始中...",
+  "stopVpn": "VPNを停止中...",
+  "discovery": "新しいバージョンを発見",
+  "compatible": "互換モード",
+  "compatibleDesc": "有効化すると一部機能を失いますが、Clashの完全サポートを獲得",
+  "notSelectedTip": "現在のプロキシグループは選択できません",
+  "tip": "ヒント",
+  "backupAndRecovery": "バックアップと復元",
+  "backupAndRecoveryDesc": "WebDAVまたはファイルでデータを同期",
+  "account": "アカウント",
+  "backup": "バックアップ",
+  "recovery": "復元",
+  "recoveryProfiles": "プロファイルのみ復元",
+  "recoveryAll": "全データ復元",
+  "recoverySuccess": "復元成功",
+  "backupSuccess": "バックアップ成功",
+  "noInfo": "情報なし",
+  "pleaseBindWebDAV": "WebDAVをバインドしてください",
+  "bind": "バインド",
+  "connectivity": "接続性：",
+  "webDAVConfiguration": "WebDAV設定",
+  "address": "アドレス",
+  "addressHelp": "WebDAVサーバーアドレス",
+  "addressTip": "有効なWebDAVアドレスを入力",
+  "password": "パスワード",
+  "checkUpdate": "更新を確認",
+  "discoverNewVersion": "新バージョンを発見",
+  "checkUpdateError": "アプリは最新版です",
+  "goDownload": "ダウンロードへ",
+  "unknown": "不明",
+  "geoData": "地域データ",
+  "externalResources": "外部リソース",
+  "checking": "確認中...",
+  "country": "国",
+  "checkError": "確認エラー",
+  "search": "検索",
+  "allowBypass": "アプリがVPNをバイパスすることを許可",
+  "allowBypassDesc": "有効化すると一部アプリがVPNをバイパス",
+  "externalController": "外部コントローラー",
+  "externalControllerDesc": "有効化するとClashコアをポート9090で制御可能",
+  "ipv6Desc": "有効化するとIPv6トラフィックを受信可能",
+  "app": "アプリ",
+  "general": "一般",
+  "vpnSystemProxyDesc": "HTTPプロキシをVpnServiceに接続",
+  "systemProxyDesc": "HTTPプロキシをVpnServiceに接続",
+  "unifiedDelay": "統一遅延",
+  "unifiedDelayDesc": "ハンドシェイクなどの余分な遅延を削除",
+  "tcpConcurrent": "TCP並列処理",
+  "tcpConcurrentDesc": "TCP並列処理を許可",
+  "geodataLoader": "Geo低メモリモード",
+  "geodataLoaderDesc": "有効化するとGeo低メモリローダーを使用",
+  "requests": "リクエスト",
+  "requestsDesc": "最近のリクエスト記録を表示",
+  "findProcessMode": "プロセス検出",
+  "init": "初期化",
+  "infiniteTime": "長期有効",
+  "expirationTime": "有効期限",
+  "connections": "接続",
+  "connectionsDesc": "現在の接続データを表示",
+  "intranetIP": "イントラネットIP",
+  "view": "表示",
+  "cut": "切り取り",
+  "copy": "コピー",
+  "paste": "貼り付け",
+  "testUrl": "URLテスト",
+  "sync": "同期",
+  "exclude": "最近のタスクから非表示",
+  "excludeDesc": "アプリがバックグラウンド時に最近のタスクから非表示",
+  "oneColumn": "1列",
+  "twoColumns": "2列",
+  "threeColumns": "3列",
+  "fourColumns": "4列",
+  "expand": "標準",
+  "shrink": "縮小",
+  "min": "最小化",
+  "tab": "タブ",
+  "list": "リスト",
+  "delay": "遅延",
+  "style": "スタイル",
+  "size": "サイズ",
+  "sort": "並び替え",
+  "columns": "列",
+  "proxiesSetting": "プロキシ設定",
+  "proxyGroup": "プロキシグループ",
+  "go": "移動",
+  "externalLink": "外部リンク",
+  "otherContributors": "その他の貢献者",
+  "autoCloseConnections": "接続を自動閉じる",
+  "autoCloseConnectionsDesc": "ノード変更後に接続を自動閉じる",
+  "onlyStatisticsProxy": "プロキシのみ統計",
+  "onlyStatisticsProxyDesc": "有効化するとプロキシトラフィックのみ統計",
+  "pureBlackMode": "純黒モード",
+  "keepAliveIntervalDesc": "TCPキープアライブ間隔",
+  "entries": " エントリ",
+  "local": "ローカル",
+  "remote": "リモート",
+  "remoteBackupDesc": "WebDAVにデータをバックアップ",
+  "remoteRecoveryDesc": "WebDAVからデータを復元",
+  "localBackupDesc": "ローカルにデータをバックアップ",
+  "localRecoveryDesc": "ファイルからデータを復元",
+  "mode": "モード",
+  "time": "時間",
+  "source": "ソース",
+  "allApps": "全アプリ",
+  "onlyOtherApps": "サードパーティアプリのみ",
+  "action": "アクション",
+  "intelligentSelected": "インテリジェント選択",
+  "clipboardImport": "クリップボードからインポート",
+  "clipboardExport": "クリップボードにエクスポート",
+  "layout": "レイアウト",
+  "tight": "密",
+  "standard": "標準",
+  "loose": "疎",
+  "profilesSort": "プロファイルの並び替え",
+  "start": "開始",
+  "stop": "停止",
+  "appDesc": "アプリ関連設定の処理",
+  "vpnDesc": "VPN関連設定の変更",
+  "dnsDesc": "DNS関連設定の更新",
+  "key": "キー",
+  "value": "値",
+  "hostsDesc": "ホストを追加",
+  "vpnTip": "変更はVPN再起動後に有効",
+  "vpnEnableDesc": "VpnService経由で全システムトラフィックをルーティング",
+  "options": "オプション",
+  "loopback": "ループバック解除ツール",
+  "loopbackDesc": "UWPループバック解除用",
+  "providers": "プロバイダー",
+  "proxyProviders": "プロキシプロバイダー",
+  "ruleProviders": "ルールプロバイダー",
+  "overrideDns": "DNS上書き",
+  "overrideDnsDesc": "有効化するとプロファイルのDNS設定を上書き",
+  "status": "ステータス",
+  "statusDesc": "無効時はシステムDNSを使用",
+  "preferH3Desc": "DOHのHTTP/3を優先使用",
+  "respectRules": "ルール尊重",
+  "respectRulesDesc": "DNS接続がルールに従う（proxy-server-nameserverの設定が必要）",
+  "dnsMode": "DNSモード",
+  "fakeipRange": "Fakeip範囲",
+  "fakeipFilter": "Fakeipフィルター",
+  "defaultNameserver": "デフォルトネームサーバー",
+  "defaultNameserverDesc": "DNSサーバーの解決用",
+  "nameserver": "ネームサーバー",
+  "nameserverDesc": "ドメイン解決用",
+  "useHosts": "ホストを使用",
+  "useSystemHosts": "システムホストを使用",
+  "nameserverPolicy": "ネームサーバーポリシー",
+  "nameserverPolicyDesc": "対応するネームサーバーポリシーを指定",
+  "proxyNameserver": "プロキシネームサーバー",
+  "proxyNameserverDesc": "プロキシノード解決用ドメイン",
+  "fallback": "フォールバック",
+  "fallbackDesc": "通常はオフショアDNSを使用",
+  "fallbackFilter": "フォールバックフィルター",
+  "geoipCode": "GeoIPコード",
+  "ipcidr": "IPCIDR",
+  "domain": "ドメイン",
+  "reset": "リセット",
+  "action_view": "表示/非表示",
+  "action_start": "開始/停止",
+  "action_mode": "モード切替",
+  "action_proxy": "システムプロキシ",
+  "action_tun": "TUN",
+  "disclaimer": "免責事項",
+  "disclaimerDesc": "本ソフトウェアは学習交流や科学研究などの非営利目的でのみ使用されます。商用利用は厳禁です。いかなる商用活動も本ソフトウェアとは無関係です。",
+  "agree": "同意",
+  "hotkeyManagement": "ホットキー管理",
+  "hotkeyManagementDesc": "キーボードでアプリを制御",
+  "pressKeyboard": "キーボードを押してください",
+  "inputCorrectHotkey": "正しいホットキーを入力",
+  "hotkeyConflict": "ホットキー競合",
+  "remove": "削除",
+  "noHotKey": "ホットキーなし",
+  "noNetwork": "ネットワークなし",
+  "ipv6InboundDesc": "IPv6インバウンドを許可",
+  "exportLogs": "ログをエクスポート",
+  "exportSuccess": "エクスポート成功",
+  "iconStyle": "アイコンスタイル",
+  "onlyIcon": "アイコンのみ",
+  "noIcon": "なし",
+  "stackMode": "スタックモード",
+  "network": "ネットワーク",
+  "networkDesc": "ネットワーク関連設定の変更",
+  "bypassDomain": "バイパスドメイン",
+  "bypassDomainDesc": "システムプロキシ有効時のみ適用",
+  "resetTip": "リセットを確定",
+  "regExp": "正規表現",
+  "icon": "アイコン",
+  "iconConfiguration": "アイコン設定",
+  "noData": "データなし",
+  "adminAutoLaunch": "管理者自動起動",
+  "adminAutoLaunchDesc": "管理者モードで起動",
+  "fontFamily": "フォントファミリー",
+  "systemFont": "システムフォント",
+  "toggle": "トグル",
+  "system": "システム",
+  "routeMode": "ルートモード",
+  "routeMode_bypassPrivate": "プライベートルートをバイパス",
+  "routeMode_config": "設定を使用",
+  "routeAddress": "ルートアドレス",
+  "routeAddressDesc": "ルートアドレスを設定",
+  "pleaseInputAdminPassword": "管理者パスワードを入力",
+  "copyEnvVar": "環境変数をコピー",
+  "memoryInfo": "メモリ情報",
+  "cancel": "キャンセル",
+  "fileIsUpdate": "ファイルが変更されました。保存しますか？",
+  "profileHasUpdate": "プロファイルが変更されました。自動更新を無効化しますか？",
+  "hasCacheChange": "変更をキャッシュしますか？",
+  "copySuccess": "コピー成功",
+  "copyLink": "リンクをコピー",
+  "exportFile": "ファイルをエクスポート",
+  "cacheCorrupt": "キャッシュが破損しています。クリアしますか？",
+  "detectionTip": "サードパーティAPIに依存（参考値）",
+  "listen": "リスン",
+  "undo": "元に戻す",
+  "redo": "やり直す",
+  "none": "なし",
+  "basicConfig": "基本設定",
+  "basicConfigDesc": "基本設定をグローバルに変更",
+  "selectedCountTitle": "{count} 項目が選択されています",
+  "addRule": "ルールを追加",
+  "ruleName": "ルール名",
+  "content": "内容",
+  "subRule": "サブルール",
+  "ruleTarget": "ルール対象",
+  "sourceIp": "送信元IP",
+  "noResolve": "IPを解決しない",
+  "getOriginRules": "元のルールを取得",
+  "overrideOriginRules": "元のルールを上書き",
+  "addedOriginRules": "元のルールに追加",
+  "enableOverride": "上書きを有効化",
+  "saveChanges": "変更を保存しますか？",
+  "generalDesc": "一般設定を変更",
+  "findProcessModeDesc": "有効化するとパフォーマンスが若干低下します",
+  "tabAnimationDesc": "モバイル表示でのみ有効",
+  "saveTip": "保存してもよろしいですか？",
+  "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": "ログテスト",
+  "emptyTip": "{label}は空欄にできません",
+  "urlTip": "{label}はURLである必要があります",
+  "numberTip": "{label}は数字でなければなりません",
+  "interval": "インターバル",
+  "existsTip": "現在の{label}は既に存在しています",
+  "deleteTip": "現在の{label}を削除してもよろしいですか？",
+  "deleteMultipTip": "選択された{label}を削除してもよろしいですか？",
+  "nullTip": "現在{label}はありません",
+  "script": "スクリプト",
+  "color": "カラー",
+  "rename": "リネーム",
+  "unnamed": "無題",
+  "pleaseEnterScriptName": "スクリプト名を入力してください",
+  "overrideInvalidTip": "スクリプトモードでは有効になりません",
+  "mixedPort": "混合ポート",
+  "socksPort": "Socksポート",
+  "redirPort": "Redirポート",
+  "tproxyPort": "Tproxyポート",
+  "portTip": "{label} は 1024 から 49151 の間でなければなりません",
+  "portConflictTip": "別のポートを入力してください"
+}

arb/intl_ru.arb

@@ -0,0 +1,407 @@
+{
+  "rule": "Правило",
+  "global": "Глобальный",
+  "direct": "Прямой",
+  "dashboard": "Панель управления",
+  "proxies": "Прокси",
+  "profile": "Профиль",
+  "profiles": "Профили",
+  "tools": "Инструменты",
+  "logs": "Логи",
+  "logsDesc": "Записи захвата логов",
+  "resources": "Ресурсы",
+  "resourcesDesc": "Информация, связанная с внешними ресурсами",
+  "trafficUsage": "Использование трафика",
+  "coreInfo": "Информация о ядре",
+  "networkSpeed": "Скорость сети",
+  "outboundMode": "Режим исходящего трафика",
+  "networkDetection": "Обнаружение сети",
+  "upload": "Загрузка",
+  "download": "Скачивание",
+  "noProxy": "Нет прокси",
+  "noProxyDesc": "Пожалуйста, создайте профиль или добавьте действительный профиль",
+  "nullProfileDesc": "Нет профиля, пожалуйста, добавьте профиль",
+  "settings": "Настройки",
+  "language": "Язык",
+  "defaultText": "По умолчанию",
+  "more": "Еще",
+  "other": "Другое",
+  "about": "О программе",
+  "en": "Английский",
+  "ja": "Японский",
+  "ru": "Русский",
+  "zh_CN": "Упрощенный китайский",
+  "theme": "Тема",
+  "themeDesc": "Установить темный режим, настроить цвет",
+  "override": "Переопределить",
+  "overrideDesc": "Переопределить конфигурацию, связанную с прокси",
+  "allowLan": "Разрешить LAN",
+  "allowLanDesc": "Разрешить доступ к прокси через локальную сеть",
+  "tun": "TUN",
+  "tunDesc": "действительно только в режиме администратора",
+  "minimizeOnExit": "Свернуть при выходе",
+  "minimizeOnExitDesc": "Изменить стандартное событие выхода из системы",
+  "autoLaunch": "Автозапуск",
+  "autoLaunchDesc": "Следовать автозапуску системы",
+  "silentLaunch": "Тихий запуск",
+  "silentLaunchDesc": "Запуск в фоновом режиме",
+  "autoRun": "Автозапуск",
+  "autoRunDesc": "Автоматический запуск при открытии приложения",
+  "logcat": "Logcat",
+  "logcatDesc": "Отключение скроет запись логов",
+  "autoCheckUpdate": "Автопроверка обновлений",
+  "autoCheckUpdateDesc": "Автоматически проверять обновления при запуске приложения",
+  "accessControl": "Контроль доступа",
+  "accessControlDesc": "Настройка доступа приложений к прокси",
+  "application": "Приложение",
+  "applicationDesc": "Изменение настроек, связанных с приложением",
+  "edit": "Редактировать",
+  "confirm": "Подтвердить",
+  "update": "Обновить",
+  "add": "Добавить",
+  "save": "Сохранить",
+  "delete": "Удалить",
+  "years": "Лет",
+  "months": "Месяцев",
+  "hours": "Часов",
+  "days": "Дней",
+  "minutes": "Минут",
+  "seconds": "Секунд",
+  "ago": " назад",
+  "just": "Только что",
+  "qrcode": "QR-код",
+  "qrcodeDesc": "Сканируйте QR-код для получения профиля",
+  "url": "URL",
+  "urlDesc": "Получить профиль через URL",
+  "file": "Файл",
+  "fileDesc": "Прямая загрузка профиля",
+  "name": "Имя",
+  "profileNameNullValidationDesc": "Пожалуйста, введите имя профиля",
+  "profileUrlNullValidationDesc": "Пожалуйста, введите URL профиля",
+  "profileUrlInvalidValidationDesc": "Пожалуйста, введите действительный URL профиля",
+  "autoUpdate": "Автообновление",
+  "autoUpdateInterval": "Интервал автообновления (минуты)",
+  "profileAutoUpdateIntervalNullValidationDesc": "Пожалуйста, введите интервал времени для автообновления",
+  "profileAutoUpdateIntervalInvalidValidationDesc": "Пожалуйста, введите действительный формат интервала времени",
+  "themeMode": "Режим темы",
+  "themeColor": "Цвет темы",
+  "preview": "Предпросмотр",
+  "auto": "Авто",
+  "light": "Светлый",
+  "dark": "Темный",
+  "importFromURL": "Импорт из URL",
+  "submit": "Отправить",
+  "doYouWantToPass": "Вы хотите пропустить",
+  "create": "Создать",
+  "defaultSort": "Сортировка по умолчанию",
+  "delaySort": "Сортировка по задержке",
+  "nameSort": "Сортировка по имени",
+  "pleaseUploadFile": "Пожалуйста, загрузите файл",
+  "pleaseUploadValidQrcode": "Пожалуйста, загрузите действительный QR-код",
+  "blacklistMode": "Режим черного списка",
+  "whitelistMode": "Режим белого списка",
+  "filterSystemApp": "Фильтровать системные приложения",
+  "cancelFilterSystemApp": "Отменить фильтрацию системных приложений",
+  "selectAll": "Выбрать все",
+  "cancelSelectAll": "Отменить выбор всего",
+  "appAccessControl": "Контроль доступа приложений",
+  "accessControlAllowDesc": "Разрешить только выбранным приложениям доступ к VPN",
+  "accessControlNotAllowDesc": "Выбранные приложения будут исключены из VPN",
+  "selected": "Выбрано",
+  "unableToUpdateCurrentProfileDesc": "невозможно обновить текущий профиль",
+  "noMoreInfoDesc": "Нет дополнительной информации",
+  "profileParseErrorDesc": "ошибка разбора профиля",
+  "proxyPort": "Порт прокси",
+  "proxyPortDesc": "Установить порт прослушивания Clash",
+  "port": "Порт",
+  "logLevel": "Уровень логов",
+  "show": "Показать",
+  "exit": "Выход",
+  "systemProxy": "Системный прокси",
+  "project": "Проект",
+  "core": "Ядро",
+  "tabAnimation": "Анимация вкладок",
+  "desc": "Многоплатформенный прокси-клиент на основе ClashMeta, простой и удобный в использовании, с открытым исходным кодом и без рекламы.",
+  "startVpn": "Запуск VPN...",
+  "stopVpn": "Остановка VPN...",
+  "discovery": "Обнаружена новая версия",
+  "compatible": "Режим совместимости",
+  "compatibleDesc": "Включение приведет к потере части функциональности приложения, но обеспечит полную поддержку Clash.",
+  "notSelectedTip": "Текущая группа прокси не может быть выбрана.",
+  "tip": "подсказка",
+  "backupAndRecovery": "Резервное копирование и восстановление",
+  "backupAndRecoveryDesc": "Синхронизация данных через WebDAV или файл",
+  "account": "Аккаунт",
+  "backup": "Резервное копирование",
+  "recovery": "Восстановление",
+  "recoveryProfiles": "Только восстановление профилей",
+  "recoveryAll": "Восстановить все данные",
+  "recoverySuccess": "Восстановление успешно",
+  "backupSuccess": "Резервное копирование успешно",
+  "noInfo": "Нет информации",
+  "pleaseBindWebDAV": "Пожалуйста, привяжите WebDAV",
+  "bind": "Привязать",
+  "connectivity": "Связь：",
+  "webDAVConfiguration": "Конфигурация WebDAV",
+  "address": "Адрес",
+  "addressHelp": "Адрес сервера WebDAV",
+  "addressTip": "Пожалуйста, введите действительный адрес WebDAV",
+  "password": "Пароль",
+  "checkUpdate": "Проверить обновления",
+  "discoverNewVersion": "Обнаружена новая версия",
+  "checkUpdateError": "Текущее приложение уже является последней версией",
+  "goDownload": "Перейти к загрузке",
+  "unknown": "Неизвестно",
+  "geoData": "Геоданные",
+  "externalResources": "Внешние ресурсы",
+  "checking": "Проверка...",
+  "country": "Страна",
+  "checkError": "Ошибка проверки",
+  "search": "Поиск",
+  "allowBypass": "Разрешить приложениям обходить VPN",
+  "allowBypassDesc": "Некоторые приложения могут обходить VPN при включении",
+  "externalController": "Внешний контроллер",
+  "externalControllerDesc": "При включении ядро Clash можно контролировать на порту 9090",
+  "ipv6Desc": "При включении будет возможно получать IPv6 трафик",
+  "app": "Приложение",
+  "general": "Общие",
+  "vpnSystemProxyDesc": "Прикрепить HTTP-прокси к VpnService",
+  "systemProxyDesc": "Прикрепить HTTP-прокси к VpnService",
+  "unifiedDelay": "Унифицированная задержка",
+  "unifiedDelayDesc": "Убрать дополнительные задержки, такие как рукопожатие",
+  "tcpConcurrent": "TCP параллелизм",
+  "tcpConcurrentDesc": "Включение позволит использовать параллелизм TCP",
+  "geodataLoader": "Режим низкого потребления памяти для геоданных",
+  "geodataLoaderDesc": "Включение будет использовать загрузчик геоданных с низким потреблением памяти",
+  "requests": "Запросы",
+  "requestsDesc": "Просмотр последних записей запросов",
+  "findProcessMode": "Режим поиска процесса",
+  "init": "Инициализация",
+  "infiniteTime": "Долгосрочное действие",
+  "expirationTime": "Время истечения",
+  "connections": "Соединения",
+  "connectionsDesc": "Просмотр текущих данных о соединениях",
+  "intranetIP": "Внутренний IP",
+  "view": "Просмотр",
+  "cut": "Вырезать",
+  "copy": "Копировать",
+  "paste": "Вставить",
+  "testUrl": "Тест URL",
+  "sync": "Синхронизация",
+  "exclude": "Скрыть из последних задач",
+  "excludeDesc": "Когда приложение находится в фоновом режиме, оно скрыто из последних задач",
+  "oneColumn": "Один столбец",
+  "twoColumns": "Два столбца",
+  "threeColumns": "Три столбца",
+  "fourColumns": "Четыре столбца",
+  "expand": "Стандартный",
+  "shrink": "Сжать",
+  "min": "Мин",
+  "tab": "Вкладка",
+  "list": "Список",
+  "delay": "Задержка",
+  "style": "Стиль",
+  "size": "Размер",
+  "sort": "Сортировка",
+  "columns": "Столбцы",
+  "proxiesSetting": "Настройка прокси",
+  "proxyGroup": "Группа прокси",
+  "go": "Перейти",
+  "externalLink": "Внешняя ссылка",
+  "otherContributors": "Другие участники",
+  "autoCloseConnections": "Автоматическое закрытие соединений",
+  "autoCloseConnectionsDesc": "Автоматически закрывать соединения после смены узла",
+  "onlyStatisticsProxy": "Только статистика прокси",
+  "onlyStatisticsProxyDesc": "При включении будет учитываться только трафик прокси",
+  "pureBlackMode": "Чисто черный режим",
+  "keepAliveIntervalDesc": "Интервал поддержания TCP-соединения",
+  "entries": " записей",
+  "local": "Локальный",
+  "remote": "Удаленный",
+  "remoteBackupDesc": "Резервное копирование локальных данных на WebDAV",
+  "remoteRecoveryDesc": "Восстановление данных с WebDAV",
+  "localBackupDesc": "Резервное копирование локальных данных на локальный диск",
+  "localRecoveryDesc": "Восстановление данных из файла",
+  "mode": "Режим",
+  "time": "Время",
+  "source": "Источник",
+  "allApps": "Все приложения",
+  "onlyOtherApps": "Только сторонние приложения",
+  "action": "Действие",
+  "intelligentSelected": "Интеллектуальный выбор",
+  "clipboardImport": "Импорт из буфера обмена",
+  "clipboardExport": "Экспорт в буфер обмена",
+  "layout": "Макет",
+  "tight": "Плотный",
+  "standard": "Стандартный",
+  "loose": "Свободный",
+  "profilesSort": "Сортировка профилей",
+  "start": "Старт",
+  "stop": "Стоп",
+  "appDesc": "Обработка настроек, связанных с приложением",
+  "vpnDesc": "Изменение настроек, связанных с VPN",
+  "dnsDesc": "Обновление настроек, связанных с DNS",
+  "key": "Ключ",
+  "value": "Значение",
+  "hostsDesc": "Добавить Hosts",
+  "vpnTip": "Изменения вступят в силу после перезапуска VPN",
+  "vpnEnableDesc": "Автоматически направляет весь системный трафик через VpnService",
+  "options": "Опции",
+  "loopback": "Инструмент разблокировки Loopback",
+  "loopbackDesc": "Используется для разблокировки Loopback UWP",
+  "providers": "Провайдеры",
+  "proxyProviders": "Провайдеры прокси",
+  "ruleProviders": "Провайдеры правил",
+  "overrideDns": "Переопределить DNS",
+  "overrideDnsDesc": "Включение переопределит настройки DNS в профиле",
+  "status": "Статус",
+  "statusDesc": "Системный DNS будет использоваться при выключении",
+  "preferH3Desc": "Приоритетное использование HTTP/3 для DOH",
+  "respectRules": "Соблюдение правил",
+  "respectRulesDesc": "DNS-соединение следует правилам, необходимо настроить proxy-server-nameserver",
+  "dnsMode": "Режим DNS",
+  "fakeipRange": "Диапазон Fakeip",
+  "fakeipFilter": "Фильтр Fakeip",
+  "defaultNameserver": "Сервер имен по умолчанию",
+  "defaultNameserverDesc": "Для разрешения DNS-сервера",
+  "nameserver": "Сервер имен",
+  "nameserverDesc": "Для разрешения домена",
+  "useHosts": "Использовать hosts",
+  "useSystemHosts": "Использовать системные hosts",
+  "nameserverPolicy": "Политика сервера имен",
+  "nameserverPolicyDesc": "Указать соответствующую политику сервера имен",
+  "proxyNameserver": "Прокси-сервер имен",
+  "proxyNameserverDesc": "Домен для разрешения прокси-узлов",
+  "fallback": "Резервный",
+  "fallbackDesc": "Обычно используется оффшорный DNS",
+  "fallbackFilter": "Фильтр резервного DNS",
+  "geoipCode": "Код Geoip",
+  "ipcidr": "IPCIDR",
+  "domain": "Домен",
+  "reset": "Сброс",
+  "action_view": "Показать/Скрыть",
+  "action_start": "Старт/Стоп",
+  "action_mode": "Переключить режим",
+  "action_proxy": "Системный прокси",
+  "action_tun": "TUN",
+  "disclaimer": "Отказ от ответственности",
+  "disclaimerDesc": "Это программное обеспечение используется только в некоммерческих целях, таких как учебные обмены и научные исследования. Запрещено использовать это программное обеспечение в коммерческих целях. Любая коммерческая деятельность, если таковая имеется, не имеет отношения к этому программному обеспечению.",
+  "agree": "Согласен",
+  "hotkeyManagement": "Управление горячими клавишами",
+  "hotkeyManagementDesc": "Использование клавиатуры для управления приложением",
+  "pressKeyboard": "Пожалуйста, нажмите клавишу.",
+  "inputCorrectHotkey": "Пожалуйста, введите правильную горячую клавишу",
+  "hotkeyConflict": "Конфликт горячих клавиш",
+  "remove": "Удалить",
+  "noHotKey": "Нет горячей клавиши",
+  "noNetwork": "Нет сети",
+  "ipv6InboundDesc": "Разрешить входящий IPv6",
+  "exportLogs": "Экспорт логов",
+  "exportSuccess": "Экспорт успешен",
+  "iconStyle": "Стиль иконки",
+  "onlyIcon": "Только иконка",
+  "noIcon": "Нет иконки",
+  "stackMode": "Режим стека",
+  "network": "Сеть",
+  "networkDesc": "Изменение настроек, связанных с сетью",
+  "bypassDomain": "Обход домена",
+  "bypassDomainDesc": "Действует только при включенном системном прокси",
+  "resetTip": "Убедитесь, что хотите сбросить",
+  "regExp": "Регулярное выражение",
+  "icon": "Иконка",
+  "iconConfiguration": "Конфигурация иконки",
+  "noData": "Нет данных",
+  "adminAutoLaunch": "Автозапуск с правами администратора",
+  "adminAutoLaunchDesc": "Запуск с правами администратора при загрузке системы",
+  "fontFamily": "Семейство шрифтов",
+  "systemFont": "Системный шрифт",
+  "toggle": "Переключить",
+  "system": "Система",
+  "routeMode": "Режим маршрутизации",
+  "routeMode_bypassPrivate": "Обход частных адресов маршрутизации",
+  "routeMode_config": "Использовать конфигурацию",
+  "routeAddress": "Адрес маршрутизации",
+  "routeAddressDesc": "Настройка адреса прослушивания маршрутизации",
+  "pleaseInputAdminPassword": "Пожалуйста, введите пароль администратора",
+  "copyEnvVar": "Копирование переменных окружения",
+  "memoryInfo": "Информация о памяти",
+  "cancel": "Отмена",
+  "fileIsUpdate": "Файл был изменен. Хотите сохранить изменения?",
+  "profileHasUpdate": "Профиль был изменен. Хотите отключить автообновление?",
+  "hasCacheChange": "Хотите сохранить изменения в кэше?",
+  "copySuccess": "Копирование успешно",
+  "copyLink": "Копировать ссылку",
+  "exportFile": "Экспорт файла",
+  "cacheCorrupt": "Кэш поврежден. Хотите очистить его?",
+  "detectionTip": "Опирается на сторонний API, только для справки",
+  "listen": "Слушать",
+  "undo": "Отменить",
+  "redo": "Повторить",
+  "none": "Нет",
+  "basicConfig": "Базовая конфигурация",
+  "basicConfigDesc": "Глобальное изменение базовых настроек",
+  "selectedCountTitle": "Выбрано {count} элементов",
+  "addRule": "Добавить правило",
+  "ruleName": "Название правила",
+  "content": "Содержание",
+  "subRule": "Подправило",
+  "ruleTarget": "Цель правила",
+  "sourceIp": "Исходный IP",
+  "noResolve": "Не разрешать IP",
+  "getOriginRules": "Получить оригинальные правила",
+  "overrideOriginRules": "Переопределить оригинальное правило",
+  "addedOriginRules": "Добавить к оригинальным правилам",
+  "enableOverride": "Включить переопределение",
+  "saveChanges": "Сохранить изменения?",
+  "generalDesc": "Изменение общих настроек",
+  "findProcessModeDesc": "При включении возможны небольшие потери производительности",
+  "tabAnimationDesc": "Действительно только в мобильном виде",
+  "saveTip": "Вы уверены, что хотите сохранить?",
+  "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": "Тест журналов",
+  "emptyTip": "{label} не может быть пустым",
+  "urlTip": "{label} должен быть URL",
+  "numberTip": "{label} должно быть числом",
+  "interval": "Интервал",
+  "existsTip": "Текущий {label} уже существует",
+  "deleteTip": "Вы уверены, что хотите удалить текущий {label}?",
+  "deleteMultipTip": "Вы уверены, что хотите удалить выбранные {label}?",
+  "nullTip": "Сейчас {label} нет",
+  "script": "Скрипт",
+  "color": "Цвет",
+  "rename": "Переименовать",
+  "unnamed": "Без имени",
+  "pleaseEnterScriptName": "Пожалуйста, введите название скрипта",
+  "overrideInvalidTip": "В скриптовом режиме не действует",
+  "mixedPort": "Смешанный порт",
+  "socksPort": "Socks-порт",
+  "redirPort": "Redir-порт",
+  "tproxyPort": "Tproxy-порт",
+  "portTip": "{label} должен быть числом от 1024 до 49151",
+  "portConflictTip": "Введите другой порт"
+}

arb/intl_zh_CN.arb

@@ -13,7 +13,6 @@
   "resourcesDesc": "外部资源相关信息",
   "trafficUsage": "流量统计",
   "coreInfo": "内核信息",
-  "nullCoreInfoDesc": "无法获取内核信息",
   "networkSpeed": "网络速度",
   "outboundMode": "出站模式",
   "networkDetection": "网络检测",
@@ -22,7 +21,6 @@
   "noProxy": "暂无代理",
   "noProxyDesc": "请创建配置文件或者添加有效配置文件",
   "nullProfileDesc": "没有配置文件,请先添加配置文件",
-  "nullLogsDesc": "暂无日志",
   "settings": "设置",
   "language": "语言",
   "defaultText": "默认",
@@ -30,6 +28,8 @@
   "other": "其他",
   "about": "关于",
   "en": "英语",
+  "ja": "日语",
+  "ru": "俄语",
   "zh_CN": "中文简体",
   "theme": "主题",
   "themeDesc": "设置深色模式，调整色彩",
@@ -121,7 +121,6 @@
   "project": "项目",
   "core": "内核",
   "tabAnimation": "选项卡动画",
-  "tabAnimationDesc": "开启后，主页选项卡将添加切换动画",
   "desc": "基于ClashMeta的多平台代理客户端，简单易用，开源无广告。",
   "startVpn": "正在启动VPN...",
   "stopVpn": "正在停止VPN...",
@@ -148,8 +147,6 @@
   "addressHelp": "WebDAV服务器地址",
   "addressTip": "请输入有效的WebDAV地址",
   "password": "密码",
-  "passwordTip": "密码不能为空",
-  "accountTip": "账号不能为空",
   "checkUpdate": "检查更新",
   "discoverNewVersion": "发现新版本",
   "checkUpdateError": "当前应用已经是最新版了",
@@ -167,7 +164,7 @@
   "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
   "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
-  "general": "基础",
+  "general": "常规",
   "vpnSystemProxyDesc": "为VpnService附加HTTP代理",
   "systemProxyDesc": "设置系统代理",
   "unifiedDelay": "统一延迟",
@@ -179,14 +176,11 @@
   "requests": "请求",
   "requestsDesc": "查看最近请求记录",
   "findProcessMode": "查找进程",
-  "findProcessModeDesc": "开启后存在闪退风险",
   "init": "初始化",
   "infiniteTime": "长期有效",
   "expirationTime": "到期时间",
   "connections": "连接",
   "connectionsDesc": "查看当前连接数据",
-  "nullRequestsDesc": "暂无请求",
-  "nullConnectionsDesc": "暂无连接",
   "intranetIP": "内网 IP",
   "view": "查看",
   "cut": "剪切",
@@ -219,8 +213,7 @@
   "autoCloseConnectionsDesc": "切换节点后自动关闭连接",
   "onlyStatisticsProxy": "仅统计代理",
   "onlyStatisticsProxyDesc": "开启后，将只统计代理流量",
-  "deleteProfileTip": "确定要删除当前配置吗?",
-  "prueBlackMode": "纯黑模式",
+  "pureBlackMode": "纯黑模式",
   "keepAliveIntervalDesc": "TCP保持活动间隔",
   "entries": "个条目",
   "local": "本地",
@@ -247,11 +240,9 @@
   "stop": "暂停",
   "appDesc": "处理应用相关设置",
   "vpnDesc": "修改VPN相关设置",
-  "generalDesc": "覆写基础设置",
   "dnsDesc": "更新DNS相关设置",
   "key": "键",
   "value": "值",
-  "notEmpty": "不能为空",
   "hostsDesc": "追加Hosts",
   "vpnTip": "重启VPN后改变生效",
   "vpnEnableDesc": "通过VpnService自动路由系统所有流量",
@@ -338,10 +329,79 @@
   "fileIsUpdate": "文件有修改，是否保存修改",
   "profileHasUpdate": "配置文件已经修改,是否关闭自动更新 ",
   "hasCacheChange": "是否缓存修改",
-  "nullProxies": "暂无代理",
   "copySuccess": "复制成功",
   "copyLink": "复制链接",
   "exportFile": "导出文件",
   "cacheCorrupt": "缓存已损坏，是否清空？",
-  "detectionTip": "依赖第三方程序仅供参考"
+  "detectionTip": "依赖第三方api，仅供参考",
+  "listen": "监听",
+  "undo": "撤销",
+  "redo": "重做",
+  "none": "无",
+  "basicConfig": "基本配置",
+  "basicConfigDesc": "全局修改基本配置",
+  "selectedCountTitle": "已选择 {count} 项",
+  "addRule": "添加规则",
+  "ruleName": "规则名称",
+  "content": "内容",
+  "subRule": "子规则",
+  "ruleTarget": "规则目标",
+  "sourceIp": "源IP",
+  "noResolve": "不解析IP",
+  "getOriginRules": "获取原始规则",
+  "overrideOriginRules": "覆盖原始规则",
+  "addedOriginRules": "附加到原始规则",
+  "enableOverride": "启用覆写",
+  "saveChanges": "是否保存更改？",
+  "generalDesc": "修改通用设置",
+  "findProcessModeDesc": "开启后会有一定性能损耗",
+  "tabAnimationDesc": "仅在移动视图中有效",
+  "saveTip": "确定要保存吗？",
+  "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": "日志测试",
+  "emptyTip": "{label}不能为空",
+  "urlTip": "{label}必须为URL",
+  "numberTip": "{label}必须为数字",
+  "interval": "间隔",
+  "existsTip": "{label}当前已存在",
+  "deleteTip": "确定删除当前{label}吗？",
+  "deleteMultipTip": "确定删除选中的{label}吗？",
+  "nullTip": "暂无{label}",
+  "script": "脚本",
+  "color": "颜色",
+  "rename": "重命名",
+  "unnamed": "未命名",
+  "pleaseEnterScriptName": "请输入脚本名称",
+  "overrideInvalidTip": "在脚本模式下不生效",
+  "mixedPort": "混合端口",
+  "socksPort": "Socks端口",
+  "redirPort": "Redir端口",
+  "tproxyPort": "Tproxy端口",
+  "portTip": "{label} 必须在 1024 到 49151 之间",
+  "portConflictTip": "请输入不同的端口"
 }

core/action.go

@@ -5,16 +5,17 @@ import (
 )
 
 type Action struct {
-	Id           string      `json:"id"`
-	Method       Method      `json:"method"`
-	Data         interface{} `json:"data"`
-	DefaultValue interface{} `json:"default-value"`
+	Id     string      `json:"id"`
+	Method Method      `json:"method"`
+	Data   interface{} `json:"data"`
 }
 
 type ActionResult struct {
 	Id     string      `json:"id"`
 	Method Method      `json:"method"`
 	Data   interface{} `json:"data"`
+	Code   int         `json:"code"`
+	Port   int64
 }
 
 func (result ActionResult) Json() ([]byte, error) {
@@ -22,99 +23,117 @@ func (result ActionResult) Json() ([]byte, error) {
 	return data, err
 }
 
-func (action Action) getResult(data interface{}) []byte {
-	resultAction := ActionResult{
-		Id:     action.Id,
-		Method: action.Method,
-		Data:   data,
-	}
-	res, _ := resultAction.Json()
-	return res
+func (result ActionResult) success(data interface{}) {
+	result.Code = 0
+	result.Data = data
+	result.send()
 }
 
-func handleAction(action *Action, result func(data interface{})) {
+func (result ActionResult) error(data interface{}) {
+	result.Code = -1
+	result.Data = data
+	result.send()
+}
+
+func handleAction(action *Action, result ActionResult) {
 	switch action.Method {
 	case initClashMethod:
-		data := action.Data.(string)
-		result(handleInitClash(data))
+		paramsString := action.Data.(string)
+		result.success(handleInitClash(paramsString))
 		return
 	case getIsInitMethod:
-		result(handleGetIsInit())
+		result.success(handleGetIsInit())
 		return
 	case forceGcMethod:
 		handleForceGc()
-		result(true)
+		result.success(true)
 		return
 	case shutdownMethod:
-		result(handleShutdown())
+		result.success(handleShutdown())
 		return
 	case validateConfigMethod:
 		data := []byte(action.Data.(string))
-		result(handleValidateConfig(data))
+		result.success(handleValidateConfig(data))
 		return
 	case updateConfigMethod:
 		data := []byte(action.Data.(string))
-		result(handleUpdateConfig(data))
+		result.success(handleUpdateConfig(data))
+		return
+	case setupConfigMethod:
+		data := []byte(action.Data.(string))
+		result.success(handleSetupConfig(data))
 		return
 	case getProxiesMethod:
-		result(handleGetProxies())
+		result.success(handleGetProxies())
 		return
 	case changeProxyMethod:
 		data := action.Data.(string)
 		handleChangeProxy(data, func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case getTrafficMethod:
-		result(handleGetTraffic())
+		result.success(handleGetTraffic())
 		return
 	case getTotalTrafficMethod:
-		result(handleGetTotalTraffic())
+		result.success(handleGetTotalTraffic())
 		return
 	case resetTrafficMethod:
 		handleResetTraffic()
-		result(true)
+		result.success(true)
 		return
 	case asyncTestDelayMethod:
 		data := action.Data.(string)
 		handleAsyncTestDelay(data, func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case getConnectionsMethod:
-		result(handleGetConnections())
+		result.success(handleGetConnections())
 		return
 	case closeConnectionsMethod:
-		result(handleCloseConnections())
+		result.success(handleCloseConnections())
+		return
+	case resetConnectionsMethod:
+		result.success(handleResetConnections())
+		return
+	case getConfigMethod:
+		path := action.Data.(string)
+		config, err := handleGetConfig(path)
+		if err != nil {
+			result.error(err)
+			return
+		}
+		result.success(config)
 		return
 	case closeConnectionMethod:
 		id := action.Data.(string)
-		result(handleCloseConnection(id))
+		result.success(handleCloseConnection(id))
 		return
 	case getExternalProvidersMethod:
-		result(handleGetExternalProviders())
+		result.success(handleGetExternalProviders())
 		return
 	case getExternalProviderMethod:
 		externalProviderName := action.Data.(string)
-		result(handleGetExternalProvider(externalProviderName))
+		result.success(handleGetExternalProvider(externalProviderName))
 	case updateGeoDataMethod:
 		paramsString := action.Data.(string)
 		var params = map[string]string{}
 		err := json.Unmarshal([]byte(paramsString), &params)
 		if err != nil {
-			result(err.Error())
+			result.success(err.Error())
 			return
 		}
 		geoType := params["geo-type"]
 		geoName := params["geo-name"]
 		handleUpdateGeoData(geoType, geoName, func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case updateExternalProviderMethod:
 		providerName := action.Data.(string)
 		handleUpdateExternalProvider(providerName, func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case sideLoadExternalProviderMethod:
@@ -122,56 +141,48 @@ func handleAction(action *Action, result func(data interface{})) {
 		var params = map[string]string{}
 		err := json.Unmarshal([]byte(paramsString), &params)
 		if err != nil {
-			result(err.Error())
+			result.success(err.Error())
 			return
 		}
 		providerName := params["providerName"]
 		data := params["data"]
 		handleSideLoadExternalProvider(providerName, []byte(data), func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case startLogMethod:
 		handleStartLog()
-		result(true)
+		result.success(true)
 		return
 	case stopLogMethod:
 		handleStopLog()
-		result(true)
+		result.success(true)
 		return
 	case startListenerMethod:
-		result(handleStartListener())
+		result.success(handleStartListener())
 		return
 	case stopListenerMethod:
-		result(handleStopListener())
+		result.success(handleStopListener())
 		return
 	case getCountryCodeMethod:
 		ip := action.Data.(string)
 		handleGetCountryCode(ip, func(value string) {
-			result(value)
+			result.success(value)
 		})
 		return
 	case getMemoryMethod:
 		handleGetMemory(func(value string) {
-			result(value)
-		})
-		return
-	case getProfileMethod:
-		profileId := action.Data.(string)
-		handleGetMemory(func(value string) {
-			result(handleGetProfile(profileId))
+			result.success(value)
 		})
 		return
 	case setStateMethod:
 		data := action.Data.(string)
 		handleSetState(data)
-		result(true)
+		result.success(true)
+	case crashMethod:
+		result.success(true)
+		handleCrash()
 	default:
-		handle := nextHandle(action, result)
-		if handle {
-			return
-		} else {
-			result(action.DefaultValue)
-		}
+		nextHandle(action, result)
 	}
 }

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

@@ -1,9 +1,10 @@
 package main
 
 import (
+	b "bytes"
 	"context"
+	"encoding/json"
 	"errors"
-	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
@@ -21,18 +22,16 @@ import (
 	"github.com/metacubex/mihomo/log"
 	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
-	"github.com/samber/lo"
 	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 )
 
 var (
-	isRunning = false
-	runLock   sync.Mutex
-	ips       = []string{"ipwho.is", "api.ip.sb", "ipapi.co", "ipinfo.io"}
-	b, _      = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
+	currentConfig *config.Config
+	version       = 0
+	isRunning     = false
+	runLock       sync.Mutex
+	mBatch, _     = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
 )
 
 type ExternalProviders []ExternalProvider
@@ -41,55 +40,6 @@ func (a ExternalProviders) Len() int           { return len(a) }
 func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
 func (a ExternalProviders) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 
-func readFile(path string) ([]byte, error) {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return nil, err
-	}
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return data, err
-}
-
-func getProfilePath(id string) string {
-	return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
-}
-
-func getProfileProvidersPath(id string) string {
-	return filepath.Join(constant.Path.HomeDir(), "providers", id)
-}
-
-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)
-	if err != nil {
-		log.Errorln("unmarshalRawConfig error %v", err)
-		return config.DefaultRawConfig()
-	}
-	for _, mapping := range prof.ProxyProvider {
-		value, exist := mapping["path"].(string)
-		if !exist {
-			continue
-		}
-		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
-	}
-	for _, mapping := range prof.RuleProvider {
-		value, exist := mapping["path"].(string)
-		if !exist {
-			continue
-		}
-		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
-	}
-	return prof
-}
-
 func getExternalProvidersRaw() map[string]cp.Provider {
 	eps := make(map[string]cp.Provider)
 	for n, p := range tunnel.Providers() {
@@ -154,129 +104,15 @@ func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
 	}
 }
 
-func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig {
-	prof := getRawConfigWithId(profileId)
-	overwriteConfig(prof, cfg)
-	return prof
-}
-
-func genHosts(hosts, patchHosts map[string]any) {
-	for k, v := range patchHosts {
-		hosts[k] = v
-	}
-}
-
-func trimArr(arr []string) (r []string) {
-	for _, e := range arr {
-		r = append(r, strings.Trim(e, " "))
-	}
-	return
-}
-
-func overrideRules(rules *[]string) {
-	var target = ""
-	for _, line := range *rules {
-		rule := trimArr(strings.Split(line, ","))
-		l := len(rule)
-		if l != 2 {
-			return
-		}
-		if strings.ToUpper(rule[0]) == "MATCH" {
-			target = rule[1]
-			break
-		}
-	}
-	if target == "" {
-		return
-	}
-	var rulesExt = lo.Map(ips, func(ip string, index int) string {
-		return fmt.Sprintf("DOMAIN %s %s", ip, target)
-	})
-	*rules = append(rulesExt, *rules...)
-}
-
-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
-	targetConfig.ExternalController = patchConfig.ExternalController
-	targetConfig.ExternalUI = ""
-	targetConfig.Interface = ""
-	targetConfig.ExternalUIURL = ""
-	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
-	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
-	targetConfig.IPv6 = patchConfig.IPv6
-	targetConfig.LogLevel = patchConfig.LogLevel
-	targetConfig.Port = 0
-	targetConfig.SocksPort = 0
-	targetConfig.KeepAliveInterval = patchConfig.KeepAliveInterval
-	targetConfig.MixedPort = patchConfig.MixedPort
-	targetConfig.FindProcessMode = patchConfig.FindProcessMode
-	targetConfig.AllowLan = patchConfig.AllowLan
-	targetConfig.Mode = patchConfig.Mode
-	targetConfig.Tun.Enable = patchConfig.Tun.Enable
-	targetConfig.Tun.Device = patchConfig.Tun.Device
-	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	targetConfig.Tun.Stack = patchConfig.Tun.Stack
-	targetConfig.Tun.RouteAddress = patchConfig.Tun.RouteAddress
-	targetConfig.GeodataLoader = patchConfig.GeodataLoader
-	targetConfig.Profile.StoreSelected = false
-	targetConfig.GeoXUrl = patchConfig.GeoXUrl
-	targetConfig.GlobalUA = patchConfig.GlobalUA
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
-	}
-	for idx := range targetConfig.ProxyGroup {
-		targetConfig.ProxyGroup[idx]["url"] = ""
-	}
-	genHosts(targetConfig.Hosts, patchConfig.Hosts)
-	if configParams.OverrideDns {
-		targetConfig.DNS = patchConfig.DNS
-	} else {
-		if targetConfig.DNS.Enable == false {
-			targetConfig.DNS.Enable = true
-		}
-	}
-	overrideRules(&targetConfig.Rule)
-}
-
-func patchConfig() {
-	log.Infoln("[Apply] patch")
-	general := currentConfig.General
-	controller := currentConfig.Controller
-	tls := currentConfig.TLS
-	tunnel.SetSniffing(general.Sniffing)
-	tunnel.SetFindProcessMode(general.FindProcessMode)
-	dialer.SetTcpConcurrent(general.TCPConcurrent)
-	dialer.DefaultInterface.Store(general.Interface)
-	adapter.UnifiedDelay.Store(general.UnifiedDelay)
-	tunnel.SetMode(general.Mode)
-	log.SetLevel(general.LogLevel)
-	resolver.DisableIPv6 = !general.IPv6
-
-	route.ReCreateServer(&route.Config{
-		Addr:        controller.ExternalController,
-		TLSAddr:     controller.ExternalControllerTLS,
-		UnixAddr:    controller.ExternalControllerUnix,
-		PipeAddr:    controller.ExternalControllerPipe,
-		Secret:      controller.Secret,
-		Certificate: tls.Certificate,
-		PrivateKey:  tls.PrivateKey,
-		DohServer:   controller.ExternalDohServer,
-		IsDebug:     false,
-		Cors: route.Cors{
-			AllowOrigins:        controller.Cors.AllowOrigins,
-			AllowPrivateNetwork: controller.Cors.AllowPrivateNetwork,
-		},
-	})
-}
-
-func updateListeners(force bool) {
+func updateListeners() {
 	if !isRunning {
 		return
 	}
-	general := currentConfig.General
-	listeners := currentConfig.Listeners
-	if force == true {
-		stopListeners()
+	if currentConfig == nil {
+		return
 	}
+	listeners := currentConfig.Listeners
+	general := currentConfig.General
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -300,11 +136,7 @@ func stopListeners() {
 	listener.StopListener()
 }
 
-func patchSelectGroup() {
-	mapping := configParams.SelectedMap
-	if mapping == nil {
-		return
-	}
+func patchSelectGroup(mapping map[string]string) {
 	for name, proxy := range tunnel.ProxiesWithProviders() {
 		outbound, ok := proxy.(*adapter.Proxy)
 		if !ok {
@@ -325,20 +157,102 @@ func patchSelectGroup() {
 	}
 }
 
-func applyConfig(rawConfig *config.RawConfig) error {
+func defaultSetupParams() *SetupParams {
+	return &SetupParams{
+		Config:      config.DefaultRawConfig(),
+		TestURL:     "https://www.gstatic.com/generate_204",
+		SelectedMap: map[string]string{},
+	}
+}
+
+func readFile(path string) ([]byte, error) {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return nil, err
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, err
+}
+
+func updateConfig(params *UpdateParams) {
+	runLock.Lock()
+	defer runLock.Unlock()
+	general := currentConfig.General
+	if params.MixedPort != nil {
+		general.MixedPort = *params.MixedPort
+	}
+	if params.Sniffing != nil {
+		general.Sniffing = *params.Sniffing
+		tunnel.SetSniffing(general.Sniffing)
+	}
+	if params.FindProcessMode != nil {
+		general.FindProcessMode = *params.FindProcessMode
+		tunnel.SetFindProcessMode(general.FindProcessMode)
+	}
+	if params.TCPConcurrent != nil {
+		general.TCPConcurrent = *params.TCPConcurrent
+		dialer.SetTcpConcurrent(general.TCPConcurrent)
+	}
+	if params.Interface != nil {
+		general.Interface = *params.Interface
+		dialer.DefaultInterface.Store(general.Interface)
+	}
+	if params.UnifiedDelay != nil {
+		general.UnifiedDelay = *params.UnifiedDelay
+		adapter.UnifiedDelay.Store(general.UnifiedDelay)
+	}
+	if params.Mode != nil {
+		general.Mode = *params.Mode
+		tunnel.SetMode(general.Mode)
+	}
+	if params.LogLevel != nil {
+		general.LogLevel = *params.LogLevel
+		log.SetLevel(general.LogLevel)
+	}
+	if params.IPv6 != nil {
+		general.IPv6 = *params.IPv6
+		resolver.DisableIPv6 = !general.IPv6
+	}
+	if params.ExternalController != nil {
+		currentConfig.Controller.ExternalController = *params.ExternalController
+		route.ReCreateServer(&route.Config{
+			Addr: currentConfig.Controller.ExternalController,
+		})
+	}
+
+	if params.Tun != nil {
+		general.Tun.Enable = params.Tun.Enable
+		general.Tun.AutoRoute = *params.Tun.AutoRoute
+		general.Tun.Device = *params.Tun.Device
+		general.Tun.RouteAddress = *params.Tun.RouteAddress
+		general.Tun.DNSHijack = *params.Tun.DNSHijack
+		general.Tun.Stack = *params.Tun.Stack
+	}
+
+	updateListeners()
+}
+
+func setupConfig(params *SetupParams) error {
 	runLock.Lock()
 	defer runLock.Unlock()
 	var err error
-	currentConfig, err = config.ParseRawConfig(rawConfig)
+	constant.DefaultTestURL = params.TestURL
+	currentConfig, err = config.ParseRawConfig(params.Config)
 	if err != nil {
 		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if configParams.IsPatch {
-		patchConfig()
-	} else {
-		hub.ApplyConfig(currentConfig)
-		patchSelectGroup()
-	}
-	updateListeners(false)
+	hub.ApplyConfig(currentConfig)
+	patchSelectGroup(params.SelectedMap)
+	updateListeners()
+	return err
+}
+
+func UnmarshalJson(data []byte, v any) error {
+	decoder := json.NewDecoder(b.NewReader(data))
+	decoder.UseNumber()
+	err := decoder.Decode(v)
 	return err
 }

core/constant.go

@@ -3,22 +3,48 @@ package main
 import (
 	"encoding/json"
 	"github.com/metacubex/mihomo/adapter/provider"
+	P "github.com/metacubex/mihomo/component/process"
 	"github.com/metacubex/mihomo/config"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/log"
+	"github.com/metacubex/mihomo/tunnel"
+	"net/netip"
 	"time"
 )
 
-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"`
+type InitParams struct {
+	HomeDir string `json:"home-dir"`
+	Version int    `json:"version"`
 }
 
-type GenerateConfigParams struct {
-	ProfileId string               `json:"profile-id"`
-	Config    config.RawConfig     `json:"config" `
-	Params    ConfigExtendedParams `json:"params"`
+type SetupParams struct {
+	Config      *config.RawConfig `json:"config"`
+	SelectedMap map[string]string `json:"selected-map"`
+	TestURL     string            `json:"test-url"`
+}
+
+type UpdateParams struct {
+	Tun                *tunSchema         `json:"tun"`
+	AllowLan           *bool              `json:"allow-lan"`
+	MixedPort          *int               `json:"mixed-port"`
+	FindProcessMode    *P.FindProcessMode `json:"find-process-mode"`
+	Mode               *tunnel.TunnelMode `json:"mode"`
+	LogLevel           *log.LogLevel      `json:"log-level"`
+	IPv6               *bool              `json:"ipv6"`
+	Sniffing           *bool              `json:"sniffing"`
+	TCPConcurrent      *bool              `json:"tcp-concurrent"`
+	ExternalController *string            `json:"external-controller"`
+	Interface          *string            `json:"interface-name"`
+	UnifiedDelay       *bool              `json:"unified-delay"`
+}
+
+type tunSchema struct {
+	Enable       bool               `yaml:"enable" json:"enable"`
+	Device       *string            `yaml:"device" json:"device"`
+	Stack        *constant.TUNStack `yaml:"stack" json:"stack"`
+	DNSHijack    *[]string          `yaml:"dns-hijack" json:"dns-hijack"`
+	AutoRoute    *bool              `yaml:"auto-route" json:"auto-route"`
+	RouteAddress *[]netip.Prefix    `yaml:"route-address" json:"route-address,omitempty"`
 }
 
 type ChangeProxyParams struct {
@@ -58,6 +84,7 @@ const (
 	asyncTestDelayMethod           Method = "asyncTestDelay"
 	getConnectionsMethod           Method = "getConnections"
 	closeConnectionsMethod         Method = "closeConnections"
+	resetConnectionsMethod         Method = "resetConnectionsMethod"
 	closeConnectionMethod          Method = "closeConnection"
 	getExternalProvidersMethod     Method = "getExternalProviders"
 	getExternalProviderMethod      Method = "getExternalProvider"
@@ -70,16 +97,14 @@ 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"
+	setupConfigMethod              Method = "setupConfig"
+	getConfigMethod                Method = "getConfig"
 )
 
 type Method string
@@ -108,20 +133,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

@@ -6,12 +6,13 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 
 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.49.1
+	github.com/samber/lo v1.50.0
+	golang.org/x/sync v0.11.0
 )
 
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
-	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
+	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
@@ -20,13 +21,13 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	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/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
+	github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 // indirect
+	github.com/enfein/mieru/v3 v3.13.0 // indirect
+	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-chi/chi/v5 v5.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
@@ -35,7 +36,7 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.3.1 // indirect
+	github.com/gofrs/uuid/v5 v5.3.2 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
@@ -50,21 +51,27 @@ 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/fswatch v0.1.1 // 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/quic-go v0.49.1-0.20250212162123-c135a4412996 // indirect
+	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
+	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
+	github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b // 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-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-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/sing v0.5.3-0.20250504031621-1f99e54c15b7 // indirect
+	github.com/metacubex/sing-mux v0.3.2 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.9 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.3 // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 // indirect
+	github.com/metacubex/sing-vmess v0.2.1 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
+	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
+	github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf // indirect
+	github.com/metacubex/utls v1.7.0-alpha.3 // 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,17 +81,10 @@ 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
-	github.com/sagernet/fswatch v0.1.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
-	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
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -106,7 +106,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

@@ -1,8 +1,8 @@
 github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
 github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
-github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A=
-github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go=
-github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
+github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg=
+github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM=
+github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
@@ -26,12 +26,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.8.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/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/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 h1:W7mpP4uiOAbBOdDnRXT9EUdauFv7bz+ERT5rPIord00=
+github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+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-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
+github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
@@ -39,8 +39,8 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
@@ -59,8 +59,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.3.1 h1:aPx49MwJbekCzOyhZDjJVb0hx3A0KLjlbLx6p2gY0p0=
-github.com/gofrs/uuid/v5 v5.3.1/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
+github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -97,36 +97,49 @@ 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/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU=
+github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
-github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a h1:cZ6oNVrsmsi3SNlnSnRio4zOgtQq+/XidwsaNgKICcg=
-github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a/go.mod h1:xBw/SYJPgUMPQ1tklV/brGn2nxhfr3BnvBzNlyi4Nic=
-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/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/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo=
+github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA=
+github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b h1:8oDU32eJ+RRhl1FodGgPfxQxtoBAiD9D40XG2XtU/SE=
+github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b/go.mod h1:9R1NOzCgTcWsdWvOMlmtMuF0uKzuOpsfvEf7U3I8zM0=
 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-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-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/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 h1:m4nSxvw46JEgxMzzmnXams+ebwabcry4Ydep/zNiesQ=
+github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
+github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
+github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 h1:wfmYgtECbEYo1slMtyo+2kMqscYYDSjU/TVgS3018F4=
+github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2/go.mod h1:P1kd57U6XXmXv9PbwWdznUGT0k9bKgFJXF0fEORbIlk=
+github.com/metacubex/sing-shadowsocks v0.2.9 h1:2e++13WNN7EGjGtvrGLUzW1xrCdQbW2gIFpgw5GEw00=
+github.com/metacubex/sing-shadowsocks v0.2.9/go.mod h1:CJSEGO4FWQAWe+ZiLZxCweGdjRR60A61SIoVjdjQeBA=
+github.com/metacubex/sing-shadowsocks2 v0.2.3 h1:v3rNS/5Ywh0NIZ6VU/NmdERQIN5RePzyxCFeQsU4Cx0=
+github.com/metacubex/sing-shadowsocks2 v0.2.3/go.mod h1:/WNy/Q8ahLCoPRriWuFZFD0Jy+JNp1MEQl28Zw6SaF8=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
+github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 h1:TAwL91XPa6x1QK55CRm+VTzPvLPUfEr/uFDnOZArqEU=
+github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
+github.com/metacubex/sing-vmess v0.2.1 h1:I6gM3VUjtvJ15D805EUbNH+SRBuqzJeFnuIbKYUsWZ0=
+github.com/metacubex/sing-vmess v0.2.1/go.mod h1:DsODWItJtOMZNna8Qhheg8r3tUivrcO3vWgaTYKnfTo=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
+github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf h1:LwID1wz4tzypidd412dd4dC1H0m1TgRCQ/XvRvMJDFM=
+github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.7.0-alpha.3 h1:cp1cEMUnoifiWrGHRzo+nCwPRveN9yPD8QaRFmfcYxA=
+github.com/metacubex/utls v1.7.0-alpha.3/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,31 +166,16 @@ 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=
-github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
 github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
-github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
-github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
-github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
-github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
-github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-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=
-github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
+github.com/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY=
+github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc=
 github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
 github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
@@ -189,9 +187,16 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
@@ -251,7 +256,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=

core/hub.go

@@ -10,6 +10,7 @@ import (
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/mmdb"
+	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
@@ -28,15 +29,19 @@ import (
 
 var (
 	isInit            = false
-	configParams      = ConfigExtendedParams{}
 	externalProviders = map[string]cp.Provider{}
 	logSubscriber     observable.Subscription[log.Event]
-	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
@@ -46,7 +51,8 @@ func handleStartListener() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
 	isRunning = true
-	updateListeners(true)
+	updateListeners()
+	resolver.ResetConnection()
 	return true
 }
 
@@ -85,30 +91,10 @@ func handleValidateConfig(bytes []byte) string {
 	return ""
 }
 
-func handleUpdateConfig(bytes []byte) string {
-	var params = &GenerateConfigParams{}
-	err := json.Unmarshal(bytes, params)
-	if err != nil {
-		return err.Error()
-	}
-
-	configParams = params.Params
-	prof := decorationConfig(params.ProfileId, params.Config)
-	err = applyConfig(prof)
-	if err != nil {
-		return err.Error()
-	}
-	return ""
-}
-
-func handleGetProxies() string {
+func handleGetProxies() map[string]constant.Proxy {
 	runLock.Lock()
 	defer runLock.Unlock()
-	data, err := json.Marshal(tunnel.ProxiesWithProviders())
-	if err != nil {
-		return ""
-	}
-	return string(data)
+	return tunnel.ProxiesWithProviders()
 }
 
 func handleChangeProxy(data string, fn func(string string)) {
@@ -178,21 +164,12 @@ func handleGetTotalTraffic() string {
 	return string(data)
 }
 
-func handleGetProfile(profileId string) string {
-	prof := getRawConfigWithId(profileId)
-	data, err := json.Marshal(prof)
-	if err != nil {
-		return ""
-	}
-	return string(data)
-}
-
 func handleResetTraffic() {
 	statistic.DefaultManager.ResetStatistic()
 }
 
 func handleAsyncTestDelay(paramsString string, fn func(string)) {
-	b.Go(paramsString, func() (bool, error) {
+	mBatch.Go(paramsString, func() (bool, error) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -260,6 +237,11 @@ func handleGetConnections() string {
 func handleCloseConnections() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
+	closeConnections()
+	return true
+}
+
+func closeConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -267,6 +249,12 @@ func handleCloseConnections() bool {
 		}
 		return true
 	})
+}
+
+func handleResetConnections() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	resolver.ResetConnection()
 	return true
 }
 
@@ -436,6 +424,47 @@ func handleSetState(params string) {
 	_ = json.Unmarshal([]byte(params), state.CurrentState)
 }
 
+func handleGetConfig(path string) (*config.RawConfig, error) {
+	bytes, err := readFile(path)
+	if err != nil {
+		return nil, err
+	}
+	prof, err := config.UnmarshalRawConfig(bytes)
+	if err != nil {
+		return nil, err
+	}
+	return prof, nil
+}
+
+func handleCrash() {
+	panic("handle invoke crash")
+}
+
+func handleUpdateConfig(bytes []byte) string {
+	var params = &UpdateParams{}
+	err := json.Unmarshal(bytes, params)
+	if err != nil {
+		return err.Error()
+	}
+	updateConfig(params)
+	return ""
+}
+
+func handleSetupConfig(bytes []byte) string {
+	var params = defaultSetupParams()
+	err := UnmarshalJson(bytes, params)
+	if err != nil {
+		log.Errorln("unmarshalRawConfig error %v", err)
+		_ = setupConfig(defaultSetupParams())
+		return err.Error()
+	}
+	err = setupConfig(params)
+	if err != nil {
+		return err.Error()
+	}
+	return ""
+}
+
 func init() {
 	adapter.UrlTestHook = func(url string, name string, delay uint16) {
 		delayData := &Delay{

core/lib.go

@@ -39,6 +39,14 @@ func freeCString(s *C.char) {
 	C.free(unsafe.Pointer(s))
 }
 
+func (result ActionResult) send() {
+	data, err := result.Json()
+	if err != nil {
+		return
+	}
+	bridge.SendToPort(result.Port, string(data))
+}
+
 //export invokeAction
 func invokeAction(paramsChar *C.char, port C.longlong) {
 	params := C.GoString(paramsChar)
@@ -49,22 +57,38 @@ func invokeAction(paramsChar *C.char, port C.longlong) {
 		bridge.SendToPort(i, err.Error())
 		return
 	}
-	go handleAction(action, func(data interface{}) {
-		bridge.SendToPort(i, string(action.getResult(data)))
-	})
+	result := ActionResult{
+		Id:     action.Id,
+		Method: action.Method,
+		Port:   i,
+	}
+	go handleAction(action, result)
 }
 
 func sendMessage(message Message) {
 	if messagePort == -1 {
 		return
 	}
-	res, err := message.Json()
-	if err != nil {
-		return
-	}
-	bridge.SendToPort(messagePort, string(Action{
+	result := ActionResult{
 		Method: messageMethod,
-	}.getResult(res)))
+		Port:   messagePort,
+		Data:   message,
+	}
+	result.send()
+}
+
+//export getConfig
+func getConfig(s *C.char) *C.char {
+	path := C.GoString(s)
+	config, err := handleGetConfig(path)
+	if err != nil {
+		return C.CString("")
+	}
+	marshal, err := json.Marshal(config)
+	if err != nil {
+		return C.CString("")
+	}
+	return C.CString(string(marshal))
 }
 
 //export startListener

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()
@@ -248,66 +188,48 @@ func handleGetCurrentProfileName() string {
 	return state.CurrentState.CurrentProfileName
 }
 
-func nextHandle(action *Action, result func(data interface{})) bool {
+func nextHandle(action *Action, result ActionResult) 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())
+		result.success(handleGetAndroidVpnOptions())
 		return true
 	case updateDnsMethod:
 		data := action.Data.(string)
 		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)
+		result.success(true)
 		return true
 	case getRunTimeMethod:
-		result(handleGetRunTime())
+		result.success(handleGetRunTime())
 		return true
 	case getCurrentProfileNameMethod:
-		result(handleGetCurrentProfileName())
+		result.success(handleGetCurrentProfileName())
 		return true
 	}
 	return false
 }
 
 //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")
 		}
 		handleSetState(stateParams)
-		bridge.SendToPort(i, handleUpdateConfig(bytes))
+		bridge.SendToPort(i, handleSetupConfig(bytes))
 	}()
 }
 
 //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/server.go

@@ -12,14 +12,20 @@ import (
 
 var conn net.Conn
 
-func sendMessage(message Message) {
-	res, err := message.Json()
+func (result ActionResult) send() {
+	data, err := result.Json()
 	if err != nil {
 		return
 	}
-	send(Action{
+	send(data)
+}
+
+func sendMessage(message Message) {
+	result := ActionResult{
 		Method: messageMethod,
-	}.getResult(res))
+		Data:   message,
+	}
+	result.send()
 }
 
 func send(data []byte) {
@@ -61,12 +67,15 @@ func startServer(arg string) {
 			return
 		}
 
-		go handleAction(action, func(data interface{}) {
-			send(action.getResult(data))
-		})
+		result := ActionResult{
+			Id:     action.Id,
+			Method: action.Method,
+		}
+
+		go handleAction(action, result)
 	}
 }
 
-func nextHandle(action *Action, result func(data interface{})) bool {
+func nextHandle(action *Action, result ActionResult) bool {
 	return false
 }

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,19 @@
 import 'dart:async';
 
-import 'package:dynamic_color/dynamic_color.dart';
+import 'package:connectivity_plus/connectivity_plus.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 +26,6 @@ class Application extends ConsumerStatefulWidget {
 }
 
 class ApplicationState extends ConsumerState<Application> {
-  late ColorSchemes systemColorSchemes;
   Timer? _autoUpdateGroupTaskTimer;
   Timer? _autoUpdateProfilesTaskTimer;
 
@@ -43,16 +41,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 +51,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 +78,7 @@ class ApplicationState extends ConsumerState<Application> {
     });
   }
 
-  _buildPlatformWrap(Widget child) {
+  _buildPlatformState(Widget child) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
@@ -117,22 +97,14 @@ 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: (results) async {
+            if (!results.contains(ConnectivityResult.vpn)) {
+              await clashCore.closeConnections();
+            }
             globalState.appController.updateLocalIp();
             globalState.appController.addCheckIpNumDebounce();
           },
@@ -142,79 +114,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,
-                    fontFamily: themeProps.fontFamily.value,
-                    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,
-                    fontFamily: themeProps.fontFamily.value,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.dark,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: themeProps.primaryColor,
-                    ).toPrueBlack(themeProps.prueBlack),
-                  ),
-                  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 {
@@ -83,39 +89,39 @@ class ClashCore {
     return clashInterface.validateConfig(data);
   }
 
-  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
-    return await clashInterface.updateConfig(updateConfigParams);
+  Future<String> updateConfig(UpdateParams updateParams) async {
+    return await clashInterface.updateConfig(updateParams);
+  }
+
+  Future<String> setupConfig(SetupParams setupParams) async {
+    return await clashInterface.setupConfig(setupParams);
   }
 
   Future<List<Group>> getProxiesGroups() async {
-    final proxiesRawString = await clashInterface.getProxies();
-    return Isolate.run<List<Group>>(() {
-      if (proxiesRawString.isEmpty) return [];
-      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
-      if (proxies.isEmpty) return [];
-      final groupNames = [
-        UsedProxy.GLOBAL.name,
-        ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-          final proxy = proxies[e] ?? {};
-          return GroupTypeExtension.valueList.contains(proxy['type']);
-        })
-      ];
-      final groupsRaw = groupNames.map((groupName) {
-        final group = proxies[groupName];
-        group["all"] = ((group["all"] ?? []) as List)
-            .map(
-              (name) => proxies[name],
-            )
-            .where((proxy) => proxy != null)
-            .toList();
-        return group;
-      }).toList();
-      return groupsRaw
+    final proxies = await clashInterface.getProxies();
+    if (proxies.isEmpty) return [];
+    final groupNames = [
+      UsedProxy.GLOBAL.name,
+      ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
+        final proxy = proxies[e] ?? {};
+        return GroupTypeExtension.valueList.contains(proxy['type']);
+      })
+    ];
+    final groupsRaw = groupNames.map((groupName) {
+      final group = proxies[groupName];
+      group["all"] = ((group["all"] ?? []) as List)
           .map(
-            (e) => Group.fromJson(e),
+            (name) => proxies[name],
           )
+          .where((proxy) => proxy != null)
           .toList();
-    });
+      return group;
+    }).toList();
+    return groupsRaw
+        .map(
+          (e) => Group.fromJson(e),
+        )
+        .toList();
   }
 
   FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) async {
@@ -137,6 +143,10 @@ class ClashCore {
     clashInterface.closeConnections();
   }
 
+  resetConnections() {
+    clashInterface.resetConnections();
+  }
+
   Future<List<ExternalProvider>> getExternalProviders() async {
     final externalProvidersRawString =
         await clashInterface.getExternalProviders();
@@ -200,6 +210,16 @@ class ClashCore {
     return Delay.fromJson(json.decode(data));
   }
 
+  Future<Map<String, dynamic>> getConfig(String id) async {
+    final profilePath = await appPath.getProfilePath(id);
+    final res = await clashInterface.getConfig(profilePath);
+    if (res.isSuccess) {
+      return res.data as Map<String, dynamic>;
+    } else {
+      throw res.message;
+    }
+  }
+
   Future<Traffic> getTraffic() async {
     final trafficString = await clashInterface.getTraffic();
     if (trafficString.isEmpty) {
@@ -235,14 +255,6 @@ class ClashCore {
     return int.parse(value);
   }
 
-  Future<ClashConfig?> getProfile(String id) async {
-    final res = await clashInterface.getProfile(id);
-    if (res.isEmpty) {
-      return null;
-    }
-    return ClashConfig.fromJson(json.decode(res));
-  }
-
   resetTraffic() {
     clashInterface.resetTraffic();
   }

lib/clash/generated/clash_ffi.dart

@@ -154,18 +154,18 @@ class ClashFFI {
   late final _setrlimit =
       _setrlimitPtr.asFunction<int Function(int, ffi.Pointer<rlimit>)>();
 
-  int wait1(
+  int wait$1(
     ffi.Pointer<ffi.Int> arg0,
   ) {
-    return _wait1(
+    return _wait$1(
       arg0,
     );
   }
 
-  late final _wait1Ptr =
+  late final _wait$1Ptr =
       _lookup<ffi.NativeFunction<pid_t Function(ffi.Pointer<ffi.Int>)>>('wait');
-  late final _wait1 =
-      _wait1Ptr.asFunction<int Function(ffi.Pointer<ffi.Int>)>();
+  late final _wait$1 =
+      _wait$1Ptr.asFunction<int Function(ffi.Pointer<ffi.Int>)>();
 
   int waitpid(
     int arg0,
@@ -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,
   ) {
@@ -2427,6 +2518,20 @@ class ClashFFI {
   late final _invokeAction =
       _invokeActionPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
+  ffi.Pointer<ffi.Char> getConfig(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _getConfig(
+      s,
+    );
+  }
+
+  late final _getConfigPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>>('getConfig');
+  late final _getConfig = _getConfigPtr
+      .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
+
   void startListener() {
     return _startListener();
   }
@@ -2443,28 +2548,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 +2570,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 +2604,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,22 +2651,31 @@ 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>)>();
 }
 
+typedef __int8_t = ffi.SignedChar;
+typedef Dart__int8_t = int;
+typedef __uint8_t = ffi.UnsignedChar;
+typedef Dart__uint8_t = int;
+typedef __int16_t = ffi.Short;
+typedef Dart__int16_t = int;
+typedef __uint16_t = ffi.UnsignedShort;
+typedef Dart__uint16_t = int;
+typedef __int32_t = ffi.Int;
+typedef Dart__int32_t = int;
+typedef __uint32_t = ffi.UnsignedInt;
+typedef Dart__uint32_t = int;
+typedef __int64_t = ffi.LongLong;
+typedef Dart__int64_t = int;
+typedef __uint64_t = ffi.UnsignedLongLong;
+typedef Dart__uint64_t = int;
+typedef __darwin_intptr_t = ffi.Long;
+typedef Dart__darwin_intptr_t = int;
+typedef __darwin_natural_t = ffi.UnsignedInt;
+typedef Dart__darwin_natural_t = int;
+typedef __darwin_ct_rune_t = ffi.Int;
+typedef Dart__darwin_ct_rune_t = int;
+
 final class __mbstate_t extends ffi.Union {
   @ffi.Array.multi([128])
   external ffi.Array<ffi.Char> __mbstate8;
@@ -2596,6 +2684,46 @@ final class __mbstate_t extends ffi.Union {
   external int _mbstateL;
 }
 
+typedef __darwin_mbstate_t = __mbstate_t;
+typedef __darwin_ptrdiff_t = ffi.Long;
+typedef Dart__darwin_ptrdiff_t = int;
+typedef __darwin_size_t = ffi.UnsignedLong;
+typedef Dart__darwin_size_t = int;
+typedef __builtin_va_list = ffi.Pointer<ffi.Char>;
+typedef __darwin_va_list = __builtin_va_list;
+typedef __darwin_wchar_t = ffi.Int;
+typedef Dart__darwin_wchar_t = int;
+typedef __darwin_rune_t = __darwin_wchar_t;
+typedef __darwin_wint_t = ffi.Int;
+typedef Dart__darwin_wint_t = int;
+typedef __darwin_clock_t = ffi.UnsignedLong;
+typedef Dart__darwin_clock_t = int;
+typedef __darwin_socklen_t = __uint32_t;
+typedef __darwin_ssize_t = ffi.Long;
+typedef Dart__darwin_ssize_t = int;
+typedef __darwin_time_t = ffi.Long;
+typedef Dart__darwin_time_t = int;
+typedef __darwin_blkcnt_t = __int64_t;
+typedef __darwin_blksize_t = __int32_t;
+typedef __darwin_dev_t = __int32_t;
+typedef __darwin_fsblkcnt_t = ffi.UnsignedInt;
+typedef Dart__darwin_fsblkcnt_t = int;
+typedef __darwin_fsfilcnt_t = ffi.UnsignedInt;
+typedef Dart__darwin_fsfilcnt_t = int;
+typedef __darwin_gid_t = __uint32_t;
+typedef __darwin_id_t = __uint32_t;
+typedef __darwin_ino64_t = __uint64_t;
+typedef __darwin_ino_t = __darwin_ino64_t;
+typedef __darwin_mach_port_name_t = __darwin_natural_t;
+typedef __darwin_mach_port_t = __darwin_mach_port_name_t;
+typedef __darwin_mode_t = __uint16_t;
+typedef __darwin_off_t = __int64_t;
+typedef __darwin_pid_t = __int32_t;
+typedef __darwin_sigset_t = __uint32_t;
+typedef __darwin_suseconds_t = __int32_t;
+typedef __darwin_uid_t = __uint32_t;
+typedef __darwin_useconds_t = __uint32_t;
+
 final class __darwin_pthread_handler_rec extends ffi.Struct {
   external ffi
       .Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
@@ -2680,6 +2808,48 @@ final class _opaque_pthread_t extends ffi.Struct {
   external ffi.Array<ffi.Char> __opaque;
 }
 
+typedef __darwin_pthread_attr_t = _opaque_pthread_attr_t;
+typedef __darwin_pthread_cond_t = _opaque_pthread_cond_t;
+typedef __darwin_pthread_condattr_t = _opaque_pthread_condattr_t;
+typedef __darwin_pthread_key_t = ffi.UnsignedLong;
+typedef Dart__darwin_pthread_key_t = int;
+typedef __darwin_pthread_mutex_t = _opaque_pthread_mutex_t;
+typedef __darwin_pthread_mutexattr_t = _opaque_pthread_mutexattr_t;
+typedef __darwin_pthread_once_t = _opaque_pthread_once_t;
+typedef __darwin_pthread_rwlock_t = _opaque_pthread_rwlock_t;
+typedef __darwin_pthread_rwlockattr_t = _opaque_pthread_rwlockattr_t;
+typedef __darwin_pthread_t = ffi.Pointer<_opaque_pthread_t>;
+typedef __darwin_nl_item = ffi.Int;
+typedef Dart__darwin_nl_item = int;
+typedef __darwin_wctrans_t = ffi.Int;
+typedef Dart__darwin_wctrans_t = int;
+typedef __darwin_wctype_t = __uint32_t;
+typedef u_int8_t = ffi.UnsignedChar;
+typedef Dartu_int8_t = int;
+typedef u_int16_t = ffi.UnsignedShort;
+typedef Dartu_int16_t = int;
+typedef u_int32_t = ffi.UnsignedInt;
+typedef Dartu_int32_t = int;
+typedef u_int64_t = ffi.UnsignedLongLong;
+typedef Dartu_int64_t = int;
+typedef register_t = ffi.Int64;
+typedef Dartregister_t = int;
+typedef user_addr_t = u_int64_t;
+typedef user_size_t = u_int64_t;
+typedef user_ssize_t = ffi.Int64;
+typedef Dartuser_ssize_t = int;
+typedef user_long_t = ffi.Int64;
+typedef Dartuser_long_t = int;
+typedef user_ulong_t = u_int64_t;
+typedef user_time_t = ffi.Int64;
+typedef Dartuser_time_t = int;
+typedef user_off_t = ffi.Int64;
+typedef Dartuser_off_t = int;
+typedef syscall_arg_t = u_int64_t;
+typedef ptrdiff_t = __darwin_ptrdiff_t;
+typedef rsize_t = __darwin_size_t;
+typedef wint_t = __darwin_wint_t;
+
 final class _GoString_ extends ffi.Struct {
   external ffi.Pointer<ffi.Char> p;
 
@@ -2687,10 +2857,6 @@ final class _GoString_ extends ffi.Struct {
   external int n;
 }
 
-typedef ptrdiff_t = __darwin_ptrdiff_t;
-typedef __darwin_ptrdiff_t = ffi.Long;
-typedef Dart__darwin_ptrdiff_t = int;
-
 enum idtype_t {
   P_ALL(0),
   P_PID(1),
@@ -2703,10 +2869,15 @@ enum idtype_t {
         0 => P_ALL,
         1 => P_PID,
         2 => P_PGID,
-        _ => throw ArgumentError("Unknown value for idtype_t: $value"),
+        _ => throw ArgumentError('Unknown value for idtype_t: $value'),
       };
 }
 
+typedef pid_t = __darwin_pid_t;
+typedef id_t = __darwin_id_t;
+typedef sig_atomic_t = ffi.Int;
+typedef Dartsig_atomic_t = int;
+
 final class __darwin_arm_exception_state extends ffi.Struct {
   @__uint32_t()
   external int __exception;
@@ -2718,9 +2889,6 @@ final class __darwin_arm_exception_state extends ffi.Struct {
   external int __far;
 }
 
-typedef __uint32_t = ffi.UnsignedInt;
-typedef Dart__uint32_t = int;
-
 final class __darwin_arm_exception_state64 extends ffi.Struct {
   @__uint64_t()
   external int __far;
@@ -2732,9 +2900,6 @@ final class __darwin_arm_exception_state64 extends ffi.Struct {
   external int __exception;
 }
 
-typedef __uint64_t = ffi.UnsignedLongLong;
-typedef Dart__uint64_t = int;
-
 final class __darwin_arm_exception_state64_v2 extends ffi.Struct {
   @__uint64_t()
   external int __far;
@@ -2863,6 +3028,9 @@ final class __darwin_mcontext32 extends ffi.Struct {
 
 final class __darwin_mcontext64 extends ffi.Opaque {}
 
+typedef mcontext_t = ffi.Pointer<__darwin_mcontext64>;
+typedef pthread_attr_t = __darwin_pthread_attr_t;
+
 final class __darwin_sigaltstack extends ffi.Struct {
   external ffi.Pointer<ffi.Void> ss_sp;
 
@@ -2873,8 +3041,7 @@ final class __darwin_sigaltstack extends ffi.Struct {
   external int ss_flags;
 }
 
-typedef __darwin_size_t = ffi.UnsignedLong;
-typedef Dart__darwin_size_t = int;
+typedef stack_t = __darwin_sigaltstack;
 
 final class __darwin_ucontext extends ffi.Struct {
   @ffi.Int()
@@ -2893,7 +3060,9 @@ final class __darwin_ucontext extends ffi.Struct {
   external ffi.Pointer<__darwin_mcontext64> uc_mcontext;
 }
 
-typedef __darwin_sigset_t = __uint32_t;
+typedef ucontext_t = __darwin_ucontext;
+typedef sigset_t = __darwin_sigset_t;
+typedef uid_t = __darwin_uid_t;
 
 final class sigval extends ffi.Union {
   @ffi.Int()
@@ -2917,9 +3086,6 @@ final class sigevent extends ffi.Struct {
   external ffi.Pointer<pthread_attr_t> sigev_notify_attributes;
 }
 
-typedef pthread_attr_t = __darwin_pthread_attr_t;
-typedef __darwin_pthread_attr_t = _opaque_pthread_attr_t;
-
 final class __siginfo extends ffi.Struct {
   @ffi.Int()
   external int si_signo;
@@ -2950,12 +3116,7 @@ final class __siginfo extends ffi.Struct {
   external ffi.Array<ffi.UnsignedLong> __pad;
 }
 
-typedef pid_t = __darwin_pid_t;
-typedef __darwin_pid_t = __int32_t;
-typedef __int32_t = ffi.Int;
-typedef Dart__int32_t = int;
-typedef uid_t = __darwin_uid_t;
-typedef __darwin_uid_t = __uint32_t;
+typedef siginfo_t = __siginfo;
 
 final class __sigaction_u extends ffi.Union {
   external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>
@@ -2969,7 +3130,7 @@ final class __sigaction_u extends ffi.Union {
 }
 
 final class __sigaction extends ffi.Struct {
-  external __sigaction_u __sigaction_u1;
+  external __sigaction_u __sigaction_u$1;
 
   external ffi.Pointer<
       ffi.NativeFunction<
@@ -2983,11 +3144,8 @@ final class __sigaction extends ffi.Struct {
   external int sa_flags;
 }
 
-typedef siginfo_t = __siginfo;
-typedef sigset_t = __darwin_sigset_t;
-
 final class sigaction extends ffi.Struct {
-  external __sigaction_u __sigaction_u1;
+  external __sigaction_u __sigaction_u$1;
 
   @sigset_t()
   external int sa_mask;
@@ -2996,6 +3154,10 @@ final class sigaction extends ffi.Struct {
   external int sa_flags;
 }
 
+typedef sig_tFunction = ffi.Void Function(ffi.Int);
+typedef Dartsig_tFunction = void Function(int);
+typedef sig_t = ffi.Pointer<ffi.NativeFunction<sig_tFunction>>;
+
 final class sigvec extends ffi.Struct {
   external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>
       sv_handler;
@@ -3014,6 +3176,43 @@ final class sigstack extends ffi.Struct {
   external int ss_onstack;
 }
 
+typedef int_least8_t = ffi.Int8;
+typedef Dartint_least8_t = int;
+typedef int_least16_t = ffi.Int16;
+typedef Dartint_least16_t = int;
+typedef int_least32_t = ffi.Int32;
+typedef Dartint_least32_t = int;
+typedef int_least64_t = ffi.Int64;
+typedef Dartint_least64_t = int;
+typedef uint_least8_t = ffi.Uint8;
+typedef Dartuint_least8_t = int;
+typedef uint_least16_t = ffi.Uint16;
+typedef Dartuint_least16_t = int;
+typedef uint_least32_t = ffi.Uint32;
+typedef Dartuint_least32_t = int;
+typedef uint_least64_t = ffi.Uint64;
+typedef Dartuint_least64_t = int;
+typedef int_fast8_t = ffi.Int8;
+typedef Dartint_fast8_t = int;
+typedef int_fast16_t = ffi.Int16;
+typedef Dartint_fast16_t = int;
+typedef int_fast32_t = ffi.Int32;
+typedef Dartint_fast32_t = int;
+typedef int_fast64_t = ffi.Int64;
+typedef Dartint_fast64_t = int;
+typedef uint_fast8_t = ffi.Uint8;
+typedef Dartuint_fast8_t = int;
+typedef uint_fast16_t = ffi.Uint16;
+typedef Dartuint_fast16_t = int;
+typedef uint_fast32_t = ffi.Uint32;
+typedef Dartuint_fast32_t = int;
+typedef uint_fast64_t = ffi.Uint64;
+typedef Dartuint_fast64_t = int;
+typedef intmax_t = ffi.Long;
+typedef Dartintmax_t = int;
+typedef uintmax_t = ffi.UnsignedLong;
+typedef Dartuintmax_t = int;
+
 final class timeval extends ffi.Struct {
   @__darwin_time_t()
   external int tv_sec;
@@ -3022,9 +3221,7 @@ final class timeval extends ffi.Struct {
   external int tv_usec;
 }
 
-typedef __darwin_time_t = ffi.Long;
-typedef Dart__darwin_time_t = int;
-typedef __darwin_suseconds_t = __int32_t;
+typedef rlim_t = __uint64_t;
 
 final class rusage extends ffi.Struct {
   external timeval ru_utime;
@@ -3074,6 +3271,8 @@ final class rusage extends ffi.Struct {
   external int ru_nivcsw;
 }
 
+typedef rusage_info_t = ffi.Pointer<ffi.Void>;
+
 final class rusage_info_v0 extends ffi.Struct {
   @ffi.Array.multi([16])
   external ffi.Array<ffi.Uint8> ri_uuid;
@@ -3679,6 +3878,8 @@ final class rusage_info_v6 extends ffi.Struct {
   external ffi.Array<ffi.Uint64> ri_reserved;
 }
 
+typedef rusage_info_current = rusage_info_v6;
+
 final class rlimit extends ffi.Struct {
   @rlim_t()
   external int rlim_cur;
@@ -3687,8 +3888,6 @@ final class rlimit extends ffi.Struct {
   external int rlim_max;
 }
 
-typedef rlim_t = __uint64_t;
-
 final class proc_rlimit_control_wakeupmon extends ffi.Struct {
   @ffi.Uint32()
   external int wm_flags;
@@ -3697,11 +3896,11 @@ final class proc_rlimit_control_wakeupmon extends ffi.Struct {
   external int wm_rate;
 }
 
-typedef id_t = __darwin_id_t;
-typedef __darwin_id_t = __uint32_t;
-
 final class wait extends ffi.Opaque {}
 
+typedef ct_rune_t = __darwin_ct_rune_t;
+typedef rune_t = __darwin_rune_t;
+
 final class div_t extends ffi.Struct {
   @ffi.Int()
   external int quot;
@@ -3733,11 +3932,59 @@ final class _malloc_zone_t extends ffi.Opaque {}
 
 typedef malloc_zone_t = _malloc_zone_t;
 typedef dev_t = __darwin_dev_t;
-typedef __darwin_dev_t = __int32_t;
 typedef mode_t = __darwin_mode_t;
-typedef __darwin_mode_t = __uint16_t;
-typedef __uint16_t = ffi.UnsignedShort;
-typedef Dart__uint16_t = int;
+typedef release_object_funcFunction = ffi.Void Function(
+    ffi.Pointer<ffi.Void> obj);
+typedef Dartrelease_object_funcFunction = void Function(
+    ffi.Pointer<ffi.Void> obj);
+typedef release_object_func
+    = ffi.Pointer<ffi.NativeFunction<release_object_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 protect_func = ffi.Pointer<ffi.NativeFunction<protect_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 resolve_process_func
+    = ffi.Pointer<ffi.NativeFunction<resolve_process_funcFunction>>;
+typedef GoInt8 = ffi.SignedChar;
+typedef DartGoInt8 = int;
+typedef GoUint8 = ffi.UnsignedChar;
+typedef DartGoUint8 = int;
+typedef GoInt16 = ffi.Short;
+typedef DartGoInt16 = int;
+typedef GoUint16 = ffi.UnsignedShort;
+typedef DartGoUint16 = int;
+typedef GoInt32 = ffi.Int;
+typedef DartGoInt32 = int;
+typedef GoUint32 = ffi.UnsignedInt;
+typedef DartGoUint32 = int;
+typedef GoInt64 = ffi.LongLong;
+typedef DartGoInt64 = int;
+typedef GoUint64 = ffi.UnsignedLongLong;
+typedef DartGoUint64 = int;
+typedef GoInt = GoInt64;
+typedef GoUint = GoUint64;
+typedef GoUintptr = ffi.Size;
+typedef DartGoUintptr = int;
+typedef GoFloat32 = ffi.Float;
+typedef DartGoFloat32 = double;
+typedef GoFloat64 = ffi.Double;
+typedef DartGoFloat64 = double;
+typedef GoString = _GoString_;
+typedef GoMap = ffi.Pointer<ffi.Void>;
+typedef GoChan = ffi.Pointer<ffi.Void>;
 
 final class GoInterface extends ffi.Struct {
   external ffi.Pointer<ffi.Void> t;
@@ -3755,10 +4002,6 @@ final class GoSlice extends ffi.Struct {
   external int cap;
 }
 
-typedef GoInt = GoInt64;
-typedef GoInt64 = ffi.LongLong;
-typedef DartGoInt64 = int;
-
 const int __has_safe_buffers = 1;
 
 const int __DARWIN_ONLY_64_BIT_INO_T = 1;
@@ -3973,6 +4216,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 +4380,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 +4480,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 +4582,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 +4640,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 +4672,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 +4684,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 +4812,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

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:isolate';
 
 import 'package:fl_clash/clash/message.dart';
 import 'package:fl_clash/common/common.dart';
@@ -7,7 +8,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();
 
@@ -19,11 +20,15 @@ mixin ClashInterface {
 
   FutureOr<String> validateConfig(String data);
 
+  FutureOr<Result> getConfig(String path);
+
   Future<String> asyncTestDelay(String url, String proxyName);
 
-  FutureOr<String> updateConfig(UpdateConfigParams updateConfigParams);
+  FutureOr<String> updateConfig(UpdateParams updateParams);
 
-  FutureOr<String> getProxies();
+  FutureOr<String> setupConfig(SetupParams setupParams);
+
+  FutureOr<Map> getProxies();
 
   FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams);
 
@@ -58,28 +63,22 @@ mixin ClashInterface {
 
   stopLog();
 
+  Future<bool> crash();
+
   FutureOr<String> getConnections();
 
   FutureOr<bool> closeConnection(String id);
 
   FutureOr<bool> closeConnections();
 
-  FutureOr<String> getProfile(String id);
+  FutureOr<bool> resetConnections();
 
   Future<bool> setState(CoreState state);
 }
 
 mixin AndroidClashInterface {
-  Future<bool> setFdMap(int fd);
-
-  Future<bool> setProcessMap(ProcessMapItem item);
-
-  Future<bool> stopTun();
-
   Future<bool> updateDns(String value);
 
-  Future<DateTime?> startTun(int fd);
-
   Future<AndroidVpnOptions?> getAndroidVpnOptions();
 
   Future<String> getCurrentProfileName();
@@ -90,54 +89,23 @@ mixin AndroidClashInterface {
 abstract class ClashHandlerInterface with ClashInterface {
   Map<String, Completer> callbackCompleterMap = {};
 
-  Future<bool> nextHandleResult(ActionResult result, Completer? completer) =>
-      Future.value(false);
-
   handleResult(ActionResult result) async {
     final completer = callbackCompleterMap[result.id];
     try {
       switch (result.method) {
-        case ActionMethod.initClash:
-        case ActionMethod.shutdown:
-        case ActionMethod.getIsInit:
-        case ActionMethod.startListener:
-        case ActionMethod.resetTraffic:
-        case ActionMethod.closeConnections:
-        case ActionMethod.closeConnection:
-        case ActionMethod.stopListener:
-        case ActionMethod.setState:
-          completer?.complete(result.data as bool);
-          return;
-        case ActionMethod.changeProxy:
-        case ActionMethod.getProxies:
-        case ActionMethod.getTraffic:
-        case ActionMethod.getTotalTraffic:
-        case ActionMethod.asyncTestDelay:
-        case ActionMethod.getConnections:
-        case ActionMethod.getExternalProviders:
-        case ActionMethod.getExternalProvider:
-        case ActionMethod.validateConfig:
-        case ActionMethod.updateConfig:
-        case ActionMethod.updateGeoData:
-        case ActionMethod.updateExternalProvider:
-        case ActionMethod.sideLoadExternalProvider:
-        case ActionMethod.getCountryCode:
-        case ActionMethod.getMemory:
-          completer?.complete(result.data as String);
-          return;
         case ActionMethod.message:
-          clashMessage.controller.add(result.data as String);
+          clashMessage.controller.add(result.data);
           completer?.complete(true);
           return;
+        case ActionMethod.getConfig:
+          completer?.complete(result.toResult);
+          return;
         default:
-          final isHandled = await nextHandleResult(result, completer);
-          if (isHandled) {
-            return;
-          }
           completer?.complete(result.data);
+          return;
       }
-    } catch (_) {
-      commonPrint.log(result.id);
+    } catch (e) {
+      commonPrint.log("${result.id} error $e");
     }
   }
 
@@ -152,18 +120,21 @@ abstract class ClashHandlerInterface with ClashInterface {
     dynamic data,
     Duration? timeout,
     FutureOr<T> Function()? onTimeout,
+    T? defaultValue,
   }) async {
-    final id = "${method.name}#${other.id}";
+    final id = "${method.name}#${utils.id}";
 
     callbackCompleterMap[id] = Completer<T>();
 
-    dynamic defaultValue;
-
-    if (T == String) {
-      defaultValue = "";
-    }
-    if (T == bool) {
-      defaultValue = false;
+    dynamic mDefaultValue = defaultValue;
+    if (mDefaultValue == null) {
+      if (T == String) {
+        mDefaultValue = "";
+      } else if (T == bool) {
+        mDefaultValue = false;
+      } else if (T == Map) {
+        mDefaultValue = {};
+      }
     }
 
     sendMessage(
@@ -172,7 +143,6 @@ abstract class ClashHandlerInterface with ClashInterface {
           id: id,
           method: method,
           data: data,
-          defaultValue: defaultValue,
         ),
       ),
     );
@@ -184,17 +154,17 @@ abstract class ClashHandlerInterface with ClashInterface {
       },
       onTimeout: onTimeout ??
           () {
-            return defaultValue;
+            return mDefaultValue;
           },
       functionName: id,
     );
   }
 
   @override
-  Future<bool> init(String homeDir) {
+  Future<bool> init(InitParams params) {
     return invoke<bool>(
       method: ActionMethod.initClash,
-      data: homeDir,
+      data: json.encode(params),
     );
   }
 
@@ -210,6 +180,7 @@ abstract class ClashHandlerInterface with ClashInterface {
   shutdown() async {
     return await invoke<bool>(
       method: ActionMethod.shutdown,
+      timeout: Duration(seconds: 1),
     );
   }
 
@@ -236,17 +207,45 @@ abstract class ClashHandlerInterface with ClashInterface {
   }
 
   @override
-  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
+  Future<String> updateConfig(UpdateParams updateParams) async {
     return await invoke<String>(
       method: ActionMethod.updateConfig,
-      data: json.encode(updateConfigParams),
+      data: json.encode(updateParams),
       timeout: Duration(minutes: 2),
     );
   }
 
   @override
-  Future<String> getProxies() {
-    return invoke<String>(
+  Future<Result> getConfig(String path) async {
+    final res = await invoke<Result>(
+      method: ActionMethod.getConfig,
+      data: path,
+      timeout: Duration(minutes: 2),
+      defaultValue: Result.success({}),
+    );
+    return res;
+  }
+
+  @override
+  Future<String> setupConfig(SetupParams setupParams) async {
+    final data = await Isolate.run(() => json.encode(setupParams));
+    return await invoke<String>(
+      method: ActionMethod.setupConfig,
+      data: data,
+      timeout: Duration(minutes: 2),
+    );
+  }
+
+  @override
+  Future<bool> crash() {
+    return invoke<bool>(
+      method: ActionMethod.crash,
+    );
+  }
+
+  @override
+  Future<Map> getProxies() {
+    return invoke<Map>(
       method: ActionMethod.getProxies,
       timeout: Duration(seconds: 5),
     );
@@ -321,17 +320,16 @@ abstract class ClashHandlerInterface with ClashInterface {
   }
 
   @override
-  Future<bool> closeConnection(String id) {
+  Future<bool> resetConnections() {
     return invoke<bool>(
-      method: ActionMethod.closeConnection,
-      data: id,
+      method: ActionMethod.resetConnections,
     );
   }
 
   @override
-  Future<String> getProfile(String id) {
-    return invoke<String>(
-      method: ActionMethod.getProfile,
+  Future<bool> closeConnection(String id) {
+    return invoke<bool>(
+      method: ActionMethod.closeConnection,
       data: id,
     );
   }

lib/clash/lib.dart

@@ -62,26 +62,6 @@ class ClashLib extends ClashHandlerInterface with AndroidClashInterface {
     return _instance!;
   }
 
-  @override
-  Future<bool> nextHandleResult(result, completer) async {
-    switch (result.method) {
-      case ActionMethod.setFdMap:
-      case ActionMethod.setProcessMap:
-      case ActionMethod.stopTun:
-      case ActionMethod.updateDns:
-        completer?.complete(result.data as bool);
-        return true;
-      case ActionMethod.getRunTime:
-      case ActionMethod.startTun:
-      case ActionMethod.getAndroidVpnOptions:
-      case ActionMethod.getCurrentProfileName:
-        completer?.complete(result.data as String);
-        return true;
-      default:
-        return false;
-    }
-  }
-
   @override
   destroy() async {
     await service?.destroy();
@@ -106,41 +86,12 @@ class ClashLib extends ClashHandlerInterface with AndroidClashInterface {
     sendPort?.send(message);
   }
 
-  @override
-  Future<bool> setFdMap(int fd) {
-    return invoke<bool>(
-      method: ActionMethod.setFdMap,
-      data: json.encode(fd),
-    );
-  }
-
-  @override
-  Future<bool> setProcessMap(item) {
-    return invoke<bool>(
-      method: ActionMethod.setProcessMap,
-      data: item,
-    );
-  }
-
-  @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 +175,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 +231,33 @@ class ClashLibHandler {
     return true;
   }
 
-  setFdMap(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.setFdMap(idChar);
-    malloc.free(idChar);
+  DateTime? getRunTime() {
+    final runTimeRaw = clashFFI.getRunTime();
+    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
+    if (runTimeString.isEmpty) {
+      return null;
+    }
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
   }
 
+  // Map<String, dynamic> getConfig(String path) {
+  //   final pathChar = path.toNativeUtf8().cast<Char>();
+  //   final configRaw = clashFFI.getConfig(pathChar);
+  //   final configString = configRaw.cast<Utf8>().toDartString();
+  //   if (configString.isEmpty) {
+  //     return {};
+  //   }
+  //   final config = json.decode(configString);
+  //   malloc.free(pathChar);
+  //   clashFFI.freeCString(configRaw);
+  //   return config;
+  // }
+
   Future<String> quickStart(
-      String homeDir,
-      UpdateConfigParams updateConfigParams,
-      CoreState state,
-      ) {
+    InitParams initParams,
+    SetupParams setupParams,
+    CoreState state,
+  ) {
     final completer = Completer<String>();
     final receiver = ReceivePort();
     receiver.listen((message) {
@@ -324,31 +266,27 @@ class ClashLibHandler {
         receiver.close();
       }
     });
-    final params = json.encode(updateConfigParams);
+    final params = json.encode(setupParams);
+    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;
   }
-
-  DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(runTimeRaw);
-    if (runTimeString.isEmpty) return null;
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
 }
 
 ClashLib? get clashLib =>
     Platform.isAndroid && !globalState.isService ? ClashLib() : null;
+
+ClashLibHandler? get clashLibHandler =>
+    Platform.isAndroid ? ClashLibHandler() : null;

lib/clash/message.dart

@@ -1,20 +1,19 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/foundation.dart';
 
 class ClashMessage {
-  final controller = StreamController<String>();
+  final controller = StreamController<Map<String, Object?>>();
 
   ClashMessage._() {
     controller.stream.listen(
       (message) {
-        if(message.isEmpty){
+        if (message.isEmpty) {
           return;
         }
-        final m = AppMessage.fromJson(json.decode(message));
+        final m = AppMessage.fromJson(message);
         for (final AppMessageListener listener in _listeners) {
           switch (m.type) {
             case AppMessageType.log:

lib/clash/service.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
@@ -51,29 +50,24 @@ class ClashService extends ClashHandlerInterface {
         await _destroySocket();
         socketCompleter.complete(socket);
         socket
-            .transform(
-              StreamTransformer<Uint8List, String>.fromHandlers(
-                handleData: (Uint8List data, EventSink<String> sink) {
-                  sink.add(utf8.decode(data, allowMalformed: true));
-                },
-              ),
-            )
+            .transform(uint8ListToListIntConverter)
+            .transform(utf8.decoder)
             .transform(LineSplitter())
             .listen(
-              (data) {
-                handleResult(
-                  ActionResult.fromJson(
-                    json.decode(data.trim()),
-                  ),
-                );
-              },
+          (data) {
+            handleResult(
+              ActionResult.fromJson(
+                json.decode(data.trim()),
+              ),
             );
+          },
+        );
       }
     }, (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 +86,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,
@@ -105,7 +98,13 @@ class ClashService extends ClashHandlerInterface {
         arg,
       ],
     );
-    process!.stdout.listen((_) {});
+    process?.stdout.listen((_) {});
+    process?.stderr.listen((e) {
+      final error = utf8.decode(e);
+      if (error.isNotEmpty) {
+        commonPrint.log(error);
+      }
+    });
     isStarting = false;
   }
 

lib/common/color.dart

@@ -1,28 +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(
@@ -51,11 +115,11 @@ extension ColorExtension on Color {
 }
 
 extension ColorSchemeExtension on ColorScheme {
-  ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
+  ColorScheme toPureBlack(bool isPrueBlack) => isPrueBlack
       ? copyWith(
           surface: Colors.black,
           surfaceContainer: surfaceContainer.darken(
-            0.05,
+            5,
           ),
         )
       : this;

lib/common/common.dart

@@ -3,37 +3,39 @@ export 'app_localizations.dart';
 export 'color.dart';
 export 'constant.dart';
 export 'context.dart';
+export 'converter.dart';
 export 'datetime.dart';
+export 'fixed.dart';
 export 'function.dart';
 export 'future.dart';
 export 'http.dart';
 export 'icons.dart';
 export 'iterable.dart';
+export 'javascript.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
-export 'list.dart';
 export 'lock.dart';
 export 'measure.dart';
+export 'mixin.dart';
 export 'navigation.dart';
 export 'navigator.dart';
 export 'network.dart';
 export 'num.dart';
-export 'other.dart';
 export 'package.dart';
 export 'path.dart';
 export 'picker.dart';
 export 'preferences.dart';
+export 'print.dart';
 export 'protocol.dart';
 export 'proxy.dart';
+export 'render.dart';
 export 'request.dart';
 export 'scroll.dart';
 export 'string.dart';
 export 'system.dart';
 export 'text.dart';
 export 'tray.dart';
+export 'utils.dart';
 export 'window.dart';
 export 'windows.dart';
-export 'render.dart';
-export 'mixin.dart';
-export 'print.dart';

lib/common/constant.dart

@@ -16,14 +16,19 @@ 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);
+const midDuration = Duration(milliseconds: 200);
 const commonDuration = Duration(milliseconds: 300);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
@@ -39,14 +44,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 +59,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 +78,33 @@ 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,
+];
+
+const scriptTemplate = """
+const main = (config) => {
+  return config;
+}""";

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/converter.dart

@@ -0,0 +1,32 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+class Uint8ListToListIntConverter extends Converter<Uint8List, List<int>> {
+  @override
+  List<int> convert(Uint8List input) {
+    return input.toList();
+  }
+
+  @override
+  Sink<Uint8List> startChunkedConversion(Sink<List<int>> sink) {
+    return _Uint8ListToListIntConverterSink(sink);
+  }
+}
+
+class _Uint8ListToListIntConverterSink implements Sink<Uint8List> {
+  const _Uint8ListToListIntConverterSink(this._target);
+
+  final Sink<List<int>> _target;
+
+  @override
+  void add(Uint8List data) {
+    _target.add(data.toList());
+  }
+
+  @override
+  void close() {
+    _target.close();
+  }
+}
+
+final uint8ListToListIntConverter = Uint8ListToListIntConverter();

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/http.dart

@@ -1,24 +1,24 @@
 import 'dart:io';
 
 import 'package:fl_clash/common/common.dart';
-
-import '../state.dart';
+import 'package:fl_clash/state.dart';
 
 class FlClashHttpOverrides extends HttpOverrides {
+  static String handleFindProxy(Uri url) {
+    if ([localhost].contains(url.host)) {
+      return "DIRECT";
+    }
+    final port = globalState.config.patchClashConfig.mixedPort;
+    final isStart = globalState.appState.runTime != null;
+    commonPrint.log("find $url proxy:$isStart");
+    if (!isStart) return "DIRECT";
+    return "PROXY localhost:$port";
+  }
+
   @override
   HttpClient createHttpClient(SecurityContext? context) {
     final client = super.createHttpClient(context);
-    client.badCertificateCallback = (_, __, ___) => true;
-    client.findProxy = (url) {
-      if ([localhost].contains(url.host)) {
-        return "DIRECT";
-      }
-      final port = globalState.config.patchClashConfig.mixedPort;
-      final isStart = globalState.appState.runTime != null;
-      commonPrint.log("find $url proxy:$isStart");
-      if (!isStart) return "DIRECT";
-      return "PROXY localhost:$port";
-    };
+    client.findProxy = handleFindProxy;
     return client;
   }
 }

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/javascript.dart

@@ -0,0 +1,18 @@
+import 'package:flutter_js/flutter_js.dart';
+
+class Javascript {
+  static Javascript? _instance;
+
+  Javascript._internal();
+
+  JavascriptRuntime get runTime {
+    return getJavascriptRuntime();
+  }
+
+  factory Javascript() {
+    _instance ??= Javascript._internal();
+    return _instance!;
+  }
+}
+
+final js = Javascript();

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

@@ -1,6 +1,6 @@
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/fragments/fragments.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/views/views.dart';
 import 'package:flutter/material.dart';
 
 class Navigation {
@@ -12,16 +12,17 @@ class Navigation {
   }) {
     return [
       const NavigationItem(
+        keep: false,
         icon: Icon(Icons.space_dashboard),
         label: PageLabel.dashboard,
-        fragment: DashboardFragment(
+        view: DashboardView(
           key: GlobalObjectKey(PageLabel.dashboard),
         ),
       ),
       NavigationItem(
         icon: const Icon(Icons.article),
         label: PageLabel.proxies,
-        fragment: const ProxiesFragment(
+        view: const ProxiesView(
           key: GlobalObjectKey(
             PageLabel.proxies,
           ),
@@ -33,7 +34,7 @@ class Navigation {
       const NavigationItem(
         icon: Icon(Icons.folder),
         label: PageLabel.profiles,
-        fragment: ProfilesFragment(
+        view: ProfilesView(
           key: GlobalObjectKey(
             PageLabel.profiles,
           ),
@@ -42,7 +43,7 @@ class Navigation {
       const NavigationItem(
         icon: Icon(Icons.view_timeline),
         label: PageLabel.requests,
-        fragment: RequestsFragment(
+        view: RequestsView(
           key: GlobalObjectKey(
             PageLabel.requests,
           ),
@@ -53,7 +54,7 @@ class Navigation {
       const NavigationItem(
         icon: Icon(Icons.ballot),
         label: PageLabel.connections,
-        fragment: ConnectionsFragment(
+        view: ConnectionsView(
           key: GlobalObjectKey(
             PageLabel.connections,
           ),
@@ -65,8 +66,7 @@ class Navigation {
         icon: Icon(Icons.storage),
         label: PageLabel.resources,
         description: "resourcesDesc",
-        keep: false,
-        fragment: Resources(
+        view: ResourcesView(
           key: GlobalObjectKey(
             PageLabel.resources,
           ),
@@ -76,7 +76,7 @@ class Navigation {
       NavigationItem(
         icon: const Icon(Icons.adb),
         label: PageLabel.logs,
-        fragment: const LogsFragment(
+        view: const LogsView(
           key: GlobalObjectKey(
             PageLabel.logs,
           ),
@@ -89,7 +89,7 @@ class Navigation {
       const NavigationItem(
         icon: Icon(Icons.construction),
         label: PageLabel.tools,
-        fragment: ToolsFragment(
+        view: ToolsView(
           key: GlobalObjectKey(
             PageLabel.tools,
           ),

lib/common/navigator.dart

@@ -2,6 +2,7 @@ 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:fl_clash/widgets/dialog.dart';
 import 'package:flutter/material.dart';
 
 class BaseNavigator {
@@ -19,6 +20,21 @@ class BaseNavigator {
       ),
     );
   }
+
+  static Future<T?> modal<T>(BuildContext context, Widget child) async {
+    if (globalState.appState.viewMode != ViewMode.mobile) {
+      return await globalState.showCommonDialog<T>(
+        child: CommonModal(
+          child: child,
+        ),
+      );
+    }
+    return await Navigator.of(context).push<T>(
+      CommonRoute(
+        builder: (context) => child,
+      ),
+    );
+  }
 }
 
 class CommonDesktopRoute<T> extends PageRoute<T> {
@@ -70,7 +86,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 +210,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 +234,7 @@ 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 +288,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/path.dart

@@ -73,16 +73,22 @@ class AppPath {
     return join(directory.path, profilesDirectoryName);
   }
 
-  Future<String?> getProfilePath(String? id) async {
-    if (id == null) return null;
+  Future<String> getProfilePath(String id) async {
     final directory = await profilesPath;
     return join(directory, "$id.yaml");
   }
 
-  Future<String?> getProvidersPath(String? id) async {
-    if (id == null) return null;
+  Future<String> getProvidersPath(String id, {String filePath = ""}) async {
     final directory = await profilesPath;
-    return join(directory, "providers", id);
+    final path = join(
+      directory,
+      "providers",
+      id,
+    );
+    if (filePath.isNotEmpty) {
+      return join(path, filePath);
+    }
+    return path;
   }
 
   Future<String> get tempPath async {

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';
@@ -16,14 +15,11 @@ class CommonPrint {
   log(String? text) {
     final payload = "[FlClash] $text";
     debugPrint(payload);
-    if (globalState.isService) {
+    if (!globalState.isInit) {
       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

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
+import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -10,6 +11,7 @@ import 'package:flutter/cupertino.dart';
 
 class Request {
   late final Dio _dio;
+  late final Dio _clashDio;
   String? userAgent;
 
   Request() {
@@ -20,22 +22,34 @@ class Request {
         },
       ),
     );
+    _clashDio = Dio();
+    _clashDio.httpClientAdapter = IOHttpClientAdapter(createHttpClient: () {
+      final client = HttpClient();
+      client.findProxy = (Uri uri) {
+        client.userAgent = globalState.ua;
+        return FlClashHttpOverrides.handleFindProxy(uri);
+      };
+      return client;
+    });
   }
 
   Future<Response> getFileResponseForUrl(String url) async {
-    final response = await _dio
-        .get(
-          url,
-          options: Options(
-            headers: {
-              "User-Agent": globalState.ua,
-            },
-            responseType: ResponseType.bytes,
-          ),
-        )
-        .timeout(
-          httpTimeoutDuration * 6,
-        );
+    final response = await _clashDio.get(
+      url,
+      options: Options(
+        responseType: ResponseType.bytes,
+      ),
+    );
+    return response;
+  }
+
+  Future<Response> getTextResponseForUrl(String url) async {
+    final response = await _clashDio.get(
+      url,
+      options: Options(
+        responseType: ResponseType.plain,
+      ),
+    );
     return response;
   }
 
@@ -64,7 +78,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;
   }
@@ -79,13 +93,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;
         }
@@ -109,9 +129,6 @@ class Request {
           .get(
             "http://$localhost:$helperPort/ping",
             options: Options(
-              headers: {
-                "User-Agent": browserUa,
-              },
               responseType: ResponseType.plain,
             ),
           )
@@ -123,7 +140,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

@@ -8,6 +8,13 @@ extension StringExtension on String {
     return RegExp(r'^(http|https|ftp)://').hasMatch(this);
   }
 
+  dynamic get splitByMultipleSeparators {
+    final parts =
+        split(RegExp(r'[, ;]+')).where((part) => part.isNotEmpty).toList();
+
+    return parts.length > 1 ? parts : this;
+  }
+
   int compareToLower(String other) {
     return toLowerCase().compareTo(
       other.toLowerCase(),
@@ -47,6 +54,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.error;
+    }
     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

@@ -1,13 +1,17 @@
+import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:ui';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
+import 'package:yaml/yaml.dart';
 
-class Other {
+class Utils {
   Color? getDelayColor(int? delay) {
     if (delay == null) return null;
     if (delay < 0) return Colors.red;
@@ -230,7 +234,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 +302,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 +327,72 @@ class Other {
     }
     return "";
   }
+
+  SingleActivator controlSingleActivator(LogicalKeyboardKey trigger) {
+    final control = Platform.isMacOS ? false : true;
+    return SingleActivator(
+      trigger,
+      control: control,
+      meta: !control,
+    );
+  }
+
+  dynamic convertYamlNode(dynamic node) {
+    if (node is YamlMap) {
+      final map = <String, dynamic>{};
+      YamlNode? mergeKeyNode;
+      for (final entry in node.nodes.entries) {
+        if (entry.key is YamlScalar &&
+            (entry.key as YamlScalar).value == '<<') {
+          mergeKeyNode = entry.value;
+          break;
+        }
+      }
+      if (mergeKeyNode != null) {
+        final mergeValue = mergeKeyNode.value;
+        if (mergeValue is YamlMap) {
+          map.addAll(convertYamlNode(mergeValue) as Map<String, dynamic>);
+        } else if (mergeValue is YamlList) {
+          for (final node in mergeValue.nodes) {
+            if (node.value is YamlMap) {
+              map.addAll(convertYamlNode(node.value) as Map<String, dynamic>);
+            }
+          }
+        }
+      }
+
+      node.nodes.forEach((key, value) {
+        String stringKey;
+        if (key is YamlScalar) {
+          stringKey = key.value.toString();
+        } else {
+          stringKey = key.toString();
+        }
+        map[stringKey] = convertYamlNode(value.value);
+      });
+      return map;
+    } else if (node is YamlList) {
+      final list = <dynamic>[];
+      for (final item in node.nodes) {
+        list.add(convertYamlNode(item.value));
+      }
+      return list;
+    } else if (node is YamlScalar) {
+      return node.value;
+    }
+    return node;
+  }
+
+  FutureOr<T> handleWatch<T>(Function function) async {
+    if (kDebugMode) {
+      final stopwatch = Stopwatch()..start();
+      final res = await function();
+      stopwatch.stop();
+      commonPrint.log('耗时：${stopwatch.elapsedMilliseconds} ms');
+      return res;
+    }
+    return await function();
+  }
 }
 
-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,8 +8,10 @@ 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';
@@ -17,6 +19,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import 'common/common.dart';
 import 'models/models.dart';
+import 'views/profiles/override_profile.dart';
 
 class AppController {
   bool lastTunEnable = false;
@@ -27,32 +30,42 @@ class AppController {
 
   AppController(this.context, WidgetRef ref) : _ref = ref;
 
+  setupClashConfigDebounce() {
+    debouncer.call(FunctionTag.setupClashConfig, () async {
+      await setupClashConfig();
+    });
+  }
+
   updateClashConfigDebounce() {
-    debouncer.call(DebounceTag.updateClashConfig, updateClashConfig);
+    debouncer.call(FunctionTag.updateClashConfig, () async {
+      await updateClashConfig();
+    });
   }
 
   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();
     });
   }
 
-  applyProfileDebounce() {
-    debouncer.call(DebounceTag.addCheckIpNum, () {
-      applyProfile();
-    });
+  applyProfileDebounce({
+    bool silence = false,
+  }) {
+    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,
@@ -63,9 +76,9 @@ class AppController {
   }
 
   restartCore() async {
+    commonPrint.log("restart core");
     await clashService?.reStart();
-    await initCore();
-
+    await _initCore();
     if (_ref.read(runTimeProvider.notifier).isStart) {
       await globalState.handleStart();
     }
@@ -94,7 +107,6 @@ class AppController {
       _ref.read(trafficsProvider.notifier).clear();
       _ref.read(totalTrafficProvider.notifier).value = Traffic();
       _ref.read(runTimeProvider.notifier).value = null;
-      // tray.updateTrayTitle(null);
       addCheckIpNumDebounce();
     }
   }
@@ -147,7 +159,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 {
@@ -156,18 +168,18 @@ class AppController {
         .read(profilesProvider.notifier)
         .setProfile(newProfile.copyWith(isUpdating: false));
     if (profile.id == _ref.read(currentProfileIdProvider)) {
-      applyProfileDebounce();
+      applyProfileDebounce(silence: true);
     }
   }
 
-  _setProfile(Profile profile) {
+  setProfile(Profile profile) {
     _ref.read(profilesProvider.notifier).setProfile(profile);
   }
 
-  setProfile(Profile profile) {
-    _setProfile(profile);
+  setProfileAndAutoApply(Profile profile) {
+    _ref.read(profilesProvider.notifier).setProfile(profile);
     if (profile.id == _ref.read(currentProfileIdProvider)) {
-      applyProfileDebounce();
+      applyProfileDebounce(silence: true);
     }
   }
 
@@ -219,8 +231,8 @@ class AppController {
     return currentGroupName;
   }
 
-  getRealProxyName(proxyName) {
-    return _ref.read(getRealTestUrlProvider(proxyName));
+  ProxyCardState getProxyCardState(proxyName) {
+    return _ref.read(getProxyCardStateProvider(proxyName));
   }
 
   getSelectedProxyName(groupName) {
@@ -232,58 +244,85 @@ class AppController {
     if (profile == null || profile.currentGroupName == groupName) {
       return;
     }
-    _setProfile(
+    setProfile(
       profile.copyWith(currentGroupName: groupName),
     );
   }
 
-  Future<void> updateClashConfig([bool? isPatch]) async {
+  Future<void> updateClashConfig() async {
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     await commonScaffoldState?.loadingRun(() async {
-      await _updateClashConfig(
-        isPatch,
-      );
+      await _updateClashConfig();
     });
   }
 
-  Future<void> _updateClashConfig([bool? isPatch]) async {
-    final profile = _ref.watch(currentProfileProvider);
-    await _ref.read(currentProfileProvider)?.checkAndUpdate();
-    final patchConfig = _ref.read(patchClashConfigProvider);
-    final appSetting = _ref.read(appSettingProvider);
-    bool enableTun = patchConfig.tun.enable;
-    if (enableTun != lastTunEnable &&
-        lastTunEnable == false &&
-        !Platform.isAndroid) {
+  Future<void> _updateClashConfig() async {
+    final updateParams = _ref.read(updateParamsProvider);
+    final res = await _requestAdmin(updateParams.tun.enable);
+    if (res.isError) {
+      return;
+    }
+    lastTunEnable = res.data == true;
+    final message = await clashCore.updateConfig(
+      updateParams.copyWith.tun(
+        enable: lastTunEnable,
+      ),
+    );
+    if (message.isNotEmpty) throw message;
+  }
+
+  Future<Result<bool>> _requestAdmin(bool enableTun) async {
+    if (enableTun != lastTunEnable && lastTunEnable == false) {
       final code = await system.authorizeCore();
       switch (code) {
         case AuthorizeCode.none:
-          break;
+          return Result.success(enableTun);
         case AuthorizeCode.success:
-          lastTunEnable = enableTun;
           await restartCore();
-          return;
+          return Result.error("");
         case AuthorizeCode.error:
           enableTun = false;
+          return Result.success(false);
       }
     }
-    if (appSetting.openLogs) {
-      clashCore.startLog();
-    } else {
-      clashCore.stopLog();
+    return Result.success(enableTun);
+  }
+
+  Future<void> setupClashConfig() async {
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    await commonScaffoldState?.loadingRun(() async {
+      await _setupClashConfig();
+    });
+  }
+
+  _setupClashConfig() async {
+    await _ref.read(currentProfileProvider)?.checkAndUpdate();
+    final patchConfig = _ref.read(patchClashConfigProvider);
+    final res = await _requestAdmin(patchConfig.tun.enable);
+    if (res.isError) {
+      return;
     }
-    final res = await clashCore.updateConfig(
-      globalState.getUpdateConfigParams(isPatch),
+    lastTunEnable = res.data == true;
+    final realPatchConfig = patchConfig.copyWith.tun(enable: lastTunEnable);
+    final params = await globalState.getSetupParams(
+      pathConfig: realPatchConfig,
     );
-    if (res.isNotEmpty) throw res;
-    lastTunEnable = enableTun;
-    lastProfileModified = await profile?.profileLastModified;
+    final message = await clashCore.setupConfig(params);
+    lastProfileModified = await _ref.read(
+      currentProfileProvider.select(
+        (state) => state?.profileLastModified,
+      ),
+    );
+    if (message.isNotEmpty) {
+      throw message;
+    }
   }
 
   Future _applyProfile() async {
     await clashCore.requestGc();
-    await updateClashConfig();
+    await setupClashConfig();
     await updateGroups();
     await updateProviders();
   }
@@ -304,6 +343,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) {
@@ -324,23 +367,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 {
@@ -352,10 +394,6 @@ class AppController {
     }
   }
 
-  updateSystemColorSchemes(ColorSchemes colorSchemes) {
-    _ref.read(appSchemesProvider.notifier).value = colorSchemes;
-  }
-
   savePreferences() async {
     commonPrint.log("save preferences");
     await preferences.saveConfig(globalState.config);
@@ -378,6 +416,9 @@ class AppController {
   }
 
   handleBackOrExit() async {
+    if (_ref.read(backBlockProvider)) {
+      return;
+    }
     if (_ref.read(appSettingProvider).minimizeOnExit) {
       if (system.isDesktop) {
         await savePreferencesDebounce();
@@ -388,18 +429,36 @@ class AppController {
     }
   }
 
+  backBlock() {
+    _ref.read(backBlockProvider.notifier).value = true;
+  }
+
+  unBackBlock() {
+    _ref.read(backBlockProvider.notifier).value = false;
+  }
+
   handleExit() async {
+    Future.delayed(commonDuration, () {
+      system.exit();
+    });
     try {
-      await updateStatus(false);
+      await savePreferences();
+      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();
@@ -410,10 +469,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,
@@ -468,23 +530,24 @@ 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();
-    await _initStatus();
+    FlutterError.onError = (details) {
+      commonPrint.log(details.stack.toString());
+    };
     updateTray(true);
+    await _initCore();
+    await _initStatus();
     autoLaunch?.updateStatus(
       _ref.read(appSettingProvider).autoLaunch,
     );
@@ -495,6 +558,8 @@ class AppController {
     } else {
       window?.hide();
     }
+    await _handlePreference();
+    await _handlerDisclaimer();
     _ref.read(initProvider.notifier).value = true;
   }
 
@@ -516,37 +581,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() {
@@ -583,17 +623,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: () {
@@ -611,6 +642,9 @@ class AppController {
                 child: Text(appLocalizations.agree),
               )
             ],
+            child: SelectableText(
+              appLocalizations.disclaimerDesc,
+            ),
           ),
         ) ??
         false;
@@ -676,9 +710,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;
     });
   }
 
@@ -689,9 +723,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),
         ),
       );
   }
@@ -703,10 +737,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;
           }
@@ -736,11 +776,15 @@ class AppController {
     final profilePath = await appPath.getProfilePath(profileId);
     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 providersFileIsExists = await providersFileDir.exists();
+      if (providersFileIsExists) {
+        providersFileDir.delete(recursive: true);
       }
     });
   }
@@ -754,13 +798,24 @@ class AppController {
   updateSystemProxy() {
     _ref.read(networkSettingProvider.notifier).updateState(
           (state) => state.copyWith(
-            systemProxy: state.systemProxy,
+            systemProxy: !state.systemProxy,
           ),
         );
   }
 
+  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);
+    updateStatus(!_ref.read(runTimeProvider.notifier).isStart);
   }
 
   updateCurrentSelectedMap(String groupName, String proxyName) {
@@ -809,7 +864,7 @@ class AppController {
   }
 
   updateVisible() async {
-    final visible = await window?.isVisible();
+    final visible = await window?.isVisible;
     if (visible != null && !visible) {
       window?.show();
     } else {
@@ -832,6 +887,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(),
@@ -841,7 +928,7 @@ class AppController {
       return utf8.encode(logsRawString);
     });
     return await picker.saveFile(
-          other.logFile,
+          utils.logFile,
           Uint8List.fromList(data),
         ) !=
         null;
@@ -915,30 +1002,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

@@ -2,7 +2,7 @@
 
 import 'dart:io';
 
-import 'package:fl_clash/fragments/dashboard/widgets/widgets.dart';
+import 'package:fl_clash/views/dashboard/widgets/widgets.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/services.dart';
 import 'package:freezed_annotation/freezed_annotation.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 }
 
@@ -111,7 +118,12 @@ enum AccessSortType { none, name, time }
 
 enum ProfileType { file, url }
 
-enum ResultType { success, error }
+enum ResultType {
+  @JsonValue(0)
+  success,
+  @JsonValue(-1)
+  error,
+}
 
 enum AppMessageType {
   log,
@@ -157,9 +169,13 @@ enum DnsMode {
 
 enum ExternalControllerStatus {
   @JsonValue("")
-  close,
+  close(""),
   @JsonValue("127.0.0.1:9090")
-  open
+  open("127.0.0.1:9090");
+
+  final String value;
+
+  const ExternalControllerStatus(this.value);
 }
 
 enum KeyboardModifier {
@@ -219,14 +235,13 @@ enum ProxiesIconStyle {
 }
 
 enum FontFamily {
-  system(),
-  miSans("MiSans"),
   twEmoji("Twemoji"),
+  jetBrainsMono("JetBrainsMono"),
   icon("Icons");
 
-  final String? value;
+  final String value;
 
-  const FontFamily([this.value]);
+  const FontFamily(this.value);
 }
 
 enum RouteMode {
@@ -242,6 +257,7 @@ enum ActionMethod {
   shutdown,
   validateConfig,
   updateConfig,
+  getConfig,
   getProxies,
   changeProxy,
   getTraffic,
@@ -250,6 +266,7 @@ enum ActionMethod {
   asyncTestDelay,
   getConnections,
   closeConnections,
+  resetConnections,
   closeConnection,
   getExternalProviders,
   getExternalProvider,
@@ -262,11 +279,10 @@ enum ActionMethod {
   stopListener,
   getCountryCode,
   getMemory,
-  getProfile,
+  crash,
+  setupConfig,
 
   ///Android,
-  setFdMap,
-  setProcessMap,
   setState,
   startTun,
   stopTun,
@@ -284,8 +300,10 @@ enum WindowsHelperServiceStatus {
   running,
 }
 
-enum DebounceTag {
+enum FunctionTag {
   updateClashConfig,
+  setupClashConfig,
+  updateStatus,
   updateGroups,
   addCheckIpNum,
   applyProfile,
@@ -300,6 +318,8 @@ enum DebounceTag {
   updatePageIndex,
   pageChange,
   proxiesTabChange,
+  logs,
+  requests,
 }
 
 enum DashboardWidget {
@@ -309,6 +329,12 @@ enum DashboardWidget {
       child: NetworkSpeed(),
     ),
   ),
+  outboundModeV2(
+    GridItem(
+      crossAxisCellCount: 8,
+      child: OutboundModeV2(),
+    ),
+  ),
   outboundMode(
     GridItem(
       crossAxisCellCount: 4,
@@ -334,6 +360,15 @@ enum DashboardWidget {
     ),
     platforms: desktopPlatforms,
   ),
+  vpnButton(
+    GridItem(
+      crossAxisCellCount: 4,
+      child: VpnButton(),
+    ),
+    platforms: [
+      SupportPlatform.Android,
+    ],
+  ),
   systemProxyButton(
     GridItem(
       crossAxisCellCount: 4,
@@ -386,3 +421,81 @@ 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,
+}
+
+enum Language {
+  yaml,
+  javaScript,
+}