Optimize desktop view

Optimize logs, requests, connection pages

Optimize windows tray auto hide

Optimize some details

Update core

.github/workflows/build.yaml

@@ -63,11 +63,19 @@ jobs:
           cache-dependency-path: |
             core/go.sum
 
-      - name: Setup Flutter
+      - name: Setup Flutter Master
+        if: startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')
         uses: subosito/flutter-action@v2
         with:
-          channel: ${{ (startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) && 'master' || 'stable' }}
+          channel: 'master'
           cache: true
+      - name: Setup Flutter
+        if: ${{ !(startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) }}
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          cache: true
+      #          flutter-version: 3.29.3
 
       - name: Get Flutter Dependency
         run: flutter pub get

CHANGELOG.md

@@ -1,3 +1,29 @@
+## v0.8.86
+
+- Fix windows tun issues
+
+- Optimize android get system dns
+
+- Optimize more details
+
+- Update changelog
+
+## v0.8.85
+
+- Support override script
+
+- Support proxies search
+
+- Support svg display
+
+- Optimize config persistence
+
+- Add some scenes auto close connections
+
+- Update core
+
+- Optimize more details
+
 ## v0.8.84
 
 - Fix windows service verify issues

analysis_options.yaml

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

android/app/build.gradle

@@ -1,98 +0,0 @@
-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"
-    compileSdk 35
-    ndkVersion = "28.0.13004108"
-
-    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 35
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-            applicationIdSuffix '.debug'
-        }
-        release {
-            debuggable false
-            if (isRelease) {
-                signingConfig signingConfigs.release
-            } else {
-                signingConfig signingConfigs.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/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/main/AndroidManifest.xml

@@ -7,6 +7,9 @@
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -22,6 +25,7 @@
 
     <application
         android:name=".FlClashApplication"
+        android:banner="@mipmap/ic_banner"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="FlClash">
@@ -88,7 +92,7 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/ic_stat_name"
+            android:icon="@drawable/ic"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             tools:targetApi="n">

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

@@ -7,6 +7,10 @@ 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
 
@@ -33,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

@@ -104,7 +104,7 @@ fun ConnectivityManager.resolveDns(network: Network?): List<String> {
 fun InetAddress.asSocketAddressText(port: Int): String {
     return when (this) {
         is Inet6Address ->
-            "[${numericToTextFormat(this.address)}]:$port"
+            "[${numericToTextFormat(this)}]:$port"
 
         is Inet4Address ->
             "${this.hostAddress}:$port"
@@ -141,7 +141,8 @@ fun Context.getActionPendingIntent(action: String): PendingIntent {
     }
 }
 
-private fun numericToTextFormat(src: ByteArray): String {
+private fun numericToTextFormat(address: Inet6Address): String {
+    val src = address.address
     val sb = StringBuilder(39)
     for (i in 0 until 8) {
         sb.append(
@@ -154,6 +155,10 @@ private fun numericToTextFormat(src: ByteArray): String {
             sb.append(":")
         }
     }
+    if (address.scopeId > 0) {
+        sb.append("%")
+        sb.append(address.scopeId)
+    }
     return sb.toString()
 }
 

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

@@ -51,6 +51,7 @@ data object ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         }
     }
 
+
     private fun handleDestroy() {
         GlobalState.destroyServiceEngine()
     }

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

@@ -100,6 +100,7 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     fun handleStart(options: VpnOptions): Boolean {
+        onUpdateNetwork();
         if (options.enable != this.options?.enable) {
             this.flClashService = null
         }
@@ -200,6 +201,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()
@@ -248,9 +256,9 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
         GlobalState.runLock.withLock {
             if (GlobalState.runState.value == RunState.STOP) return
             GlobalState.runState.value = RunState.STOP
+            flClashService?.stop()
             stopForegroundJob()
             Core.stopTun()
-            flClashService?.stop()
             GlobalState.handleTryDestroy()
         }
     }

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

@@ -16,7 +16,6 @@ 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
@@ -54,7 +53,7 @@ fun Service.createFlClashNotificationBuilder(): Deferred<NotificationCompat.Buil
                 this@createFlClashNotificationBuilder, GlobalState.NOTIFICATION_CHANNEL
             )
         ) {
-            setSmallIcon(R.drawable.ic_stat_name)
+            setSmallIcon(R.drawable.ic)
             setContentTitle("FlClash")
             setContentIntent(pendingIntent)
             setCategory(NotificationCompat.CATEGORY_SERVICE)
@@ -76,9 +75,8 @@ fun Service.startForeground(notification: Notification) {
         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
+                GlobalState.NOTIFICATION_CHANNEL, "SERVICE_CHANNEL", NotificationManager.IMPORTANCE_LOW
             )
             manager?.createNotificationChannel(channel)
         }

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/res/drawable/ic.xml

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

android/build.gradle

@@ -1,33 +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')
-    project.evaluationDependsOn(':core')
-}
-
-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/build.gradle.kts

@@ -12,7 +12,6 @@ android {
 
     defaultConfig {
         minSdk = 21
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {

android/settings.gradle

@@ -1,27 +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"
-include ':core'

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",
@@ -149,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",
@@ -185,8 +181,6 @@
   "expirationTime": "Expiration time",
   "connections": "Connections",
   "connectionsDesc": "View current connections data",
-  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No connections",
   "intranetIP": "Intranet IP",
   "view": "View",
   "cut": "Cut",
@@ -219,7 +213,6 @@
   "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?",
   "pureBlackMode": "Pure black mode",
   "keepAliveIntervalDesc": "Tcp keep alive interval",
   "entries": " entries",
@@ -250,7 +243,6 @@
   "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",
@@ -337,15 +329,12 @@
   "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 api is for reference only",
   "listen": "Listen",
-  "keyExists": "The current key already exists",
-  "valueExists": "The current value already exists",
   "undo": "undo",
   "redo": "redo",
   "none": "none",
@@ -353,28 +342,21 @@
   "basicConfigDesc": "Modify the basic configuration globally",
   "selectedCountTitle": "{count} items have been selected",
   "addRule": "Add rule",
-  "ruleProviderEmptyTip": "Rule provider cannot be empty",
   "ruleName": "Rule name",
   "content": "Content",
-  "contentEmptyTip": "Content cannot be empty",
   "subRule": "Sub rule",
-  "subRuleEmptyTip": "Sub rule content cannot be empty",
   "ruleTarget": "Rule target",
-  "ruleTargetEmptyTip": "Rule target cannot be empty",
   "sourceIp": "Source IP",
   "noResolve": "No resolve IP",
   "getOriginRules": "Get original rules",
   "overrideOriginRules": "Override the original rule",
   "addedOriginRules": "Attach on the original rules",
   "enableOverride": "Enable override",
-  "deleteRuleTip": "Are you sure you want to delete the selected rule?",
   "saveChanges": "Do you want to save the changes?",
   "generalDesc": "Modify general settings",
   "findProcessModeDesc": "There is a certain performance loss after opening",
   "tabAnimationDesc": "Effective only in mobile view",
   "saveTip": "Are you sure you want to save?",
-  "deleteColorTip": "Are you sure you want to delete the current color?",
-  "colorExists": "Current color already exists",
   "colorSchemes": "Color schemes",
   "palette": "Palette",
   "tonalSpotScheme": "TonalSpot",
@@ -400,5 +382,44 @@
   "recoveryStrategy": "Recovery strategy",
   "recoveryStrategy_override": "Override",
   "recoveryStrategy_compatible": "Compatible",
-  "logsTest": "Logs test"
+  "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",
+  "import": "Import",
+  "importFile": "Import from file",
+  "importUrl": "Import from URL",
+  "autoSetSystemDns": "Auto set system DNS",
+  "details": "{label} details",
+  "creationTime": "Creation time",
+  "progress": "Progress",
+  "host": "Host",
+  "destination": "Destination",
+  "destinationGeoIP": "Destination GeoIP",
+  "destinationIPASN": "Destination IPASN",
+  "specialProxy": "Special proxy",
+  "specialRules": "special rules",
+  "remoteDestination": "Remote destination",
+  "networkType": "Network type",
+  "proxyChains": "Proxy chains",
+  "log": "Log",
+  "connection": "Connection",
+  "request": "Request"
 }

arb/intl_ja.arb

@@ -13,7 +13,6 @@
   "resourcesDesc": "外部リソース関連情報",
   "trafficUsage": "トラフィック使用量",
   "coreInfo": "コア情報",
-  "nullCoreInfoDesc": "コア情報を取得できません",
   "networkSpeed": "ネットワーク速度",
   "outboundMode": "アウトバウンドモード",
   "networkDetection": "ネットワーク検出",
@@ -22,7 +21,6 @@
   "noProxy": "プロキシなし",
   "noProxyDesc": "プロファイルを作成するか、有効なプロファイルを追加してください",
   "nullProfileDesc": "プロファイルがありません。追加してください",
-  "nullLogsDesc": "ログがありません",
   "settings": "設定",
   "language": "言語",
   "defaultText": "デフォルト",
@@ -149,8 +147,6 @@
   "addressHelp": "WebDAVサーバーアドレス",
   "addressTip": "有効なWebDAVアドレスを入力",
   "password": "パスワード",
-  "passwordTip": "パスワードは必須です",
-  "accountTip": "アカウントは必須です",
   "checkUpdate": "更新を確認",
   "discoverNewVersion": "新バージョンを発見",
   "checkUpdateError": "アプリは最新版です",
@@ -185,8 +181,6 @@
   "expirationTime": "有効期限",
   "connections": "接続",
   "connectionsDesc": "現在の接続データを表示",
-  "nullRequestsDesc": "リクエストなし",
-  "nullConnectionsDesc": "接続なし",
   "intranetIP": "イントラネットIP",
   "view": "表示",
   "cut": "切り取り",
@@ -219,7 +213,6 @@
   "autoCloseConnectionsDesc": "ノード変更後に接続を自動閉じる",
   "onlyStatisticsProxy": "プロキシのみ統計",
   "onlyStatisticsProxyDesc": "有効化するとプロキシトラフィックのみ統計",
-  "deleteProfileTip": "現在のプロファイルを削除しますか？",
   "pureBlackMode": "純黒モード",
   "keepAliveIntervalDesc": "TCPキープアライブ間隔",
   "entries": " エントリ",
@@ -250,7 +243,6 @@
   "dnsDesc": "DNS関連設定の更新",
   "key": "キー",
   "value": "値",
-  "notEmpty": "空欄不可",
   "hostsDesc": "ホストを追加",
   "vpnTip": "変更はVPN再起動後に有効",
   "vpnEnableDesc": "VpnService経由で全システムトラフィックをルーティング",
@@ -337,15 +329,12 @@
   "fileIsUpdate": "ファイルが変更されました。保存しますか？",
   "profileHasUpdate": "プロファイルが変更されました。自動更新を無効化しますか？",
   "hasCacheChange": "変更をキャッシュしますか？",
-  "nullProxies": "プロキシなし",
   "copySuccess": "コピー成功",
   "copyLink": "リンクをコピー",
   "exportFile": "ファイルをエクスポート",
   "cacheCorrupt": "キャッシュが破損しています。クリアしますか？",
   "detectionTip": "サードパーティAPIに依存（参考値）",
   "listen": "リスン",
-  "keyExists": "現在のキーは既に存在します",
-  "valueExists": "現在の値は既に存在します",
   "undo": "元に戻す",
   "redo": "やり直す",
   "none": "なし",
@@ -353,28 +342,21 @@
   "basicConfigDesc": "基本設定をグローバルに変更",
   "selectedCountTitle": "{count} 項目が選択されています",
   "addRule": "ルールを追加",
-  "ruleProviderEmptyTip": "ルールプロバイダーは必須です",
   "ruleName": "ルール名",
   "content": "内容",
-  "contentEmptyTip": "内容は必須です",
   "subRule": "サブルール",
-  "subRuleEmptyTip": "サブルールの内容は必須です",
   "ruleTarget": "ルール対象",
-  "ruleTargetEmptyTip": "ルール対象は必須です",
   "sourceIp": "送信元IP",
   "noResolve": "IPを解決しない",
   "getOriginRules": "元のルールを取得",
   "overrideOriginRules": "元のルールを上書き",
   "addedOriginRules": "元のルールに追加",
   "enableOverride": "上書きを有効化",
-  "deleteRuleTip": "選択したルールを削除しますか？",
   "saveChanges": "変更を保存しますか？",
   "generalDesc": "一般設定を変更",
   "findProcessModeDesc": "有効化するとパフォーマンスが若干低下します",
   "tabAnimationDesc": "モバイル表示でのみ有効",
   "saveTip": "保存してもよろしいですか？",
-  "deleteColorTip": "現在の色を削除しますか？",
-  "colorExists": "この色は既に存在します",
   "colorSchemes": "カラースキーム",
   "palette": "パレット",
   "tonalSpotScheme": "トーンスポット",
@@ -401,5 +383,44 @@
   "recoveryStrategy": "リカバリー戦略",
   "recoveryStrategy_override": "オーバーライド",
   "recoveryStrategy_compatible": "互換性",
-  "logsTest": "ログテスト"
+  "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": "別のポートを入力してください",
+  "import": "インポート",
+  "importFile": "ファイルからインポート",
+  "importUrl": "URLからインポート",
+  "autoSetSystemDns": "オートセットシステムDNS",
+  "details": "{label}詳細",
+  "creationTime": "作成時間",
+  "progress": "進捗",
+  "host": "ホスト",
+  "destination": "宛先",
+  "destinationGeoIP": "宛先地理情報",
+  "destinationIPASN": "宛先IP ASN",
+  "specialProxy": "特殊プロキシ",
+  "specialRules": "特殊ルール",
+  "remoteDestination": "リモート宛先",
+  "networkType": "ネットワーク種別",
+  "proxyChains": "プロキシチェーン",
+  "log": "ログ",
+  "connection": "接続",
+  "request": "リクエスト"
 }

arb/intl_ru.arb

@@ -13,7 +13,6 @@
   "resourcesDesc": "Информация, связанная с внешними ресурсами",
   "trafficUsage": "Использование трафика",
   "coreInfo": "Информация о ядре",
-  "nullCoreInfoDesc": "Не удалось получить информацию о ядре",
   "networkSpeed": "Скорость сети",
   "outboundMode": "Режим исходящего трафика",
   "networkDetection": "Обнаружение сети",
@@ -22,7 +21,6 @@
   "noProxy": "Нет прокси",
   "noProxyDesc": "Пожалуйста, создайте профиль или добавьте действительный профиль",
   "nullProfileDesc": "Нет профиля, пожалуйста, добавьте профиль",
-  "nullLogsDesc": "Нет логов",
   "settings": "Настройки",
   "language": "Язык",
   "defaultText": "По умолчанию",
@@ -149,8 +147,6 @@
   "addressHelp": "Адрес сервера WebDAV",
   "addressTip": "Пожалуйста, введите действительный адрес WebDAV",
   "password": "Пароль",
-  "passwordTip": "Пароль не может быть пустым",
-  "accountTip": "Аккаунт не может быть пустым",
   "checkUpdate": "Проверить обновления",
   "discoverNewVersion": "Обнаружена новая версия",
   "checkUpdateError": "Текущее приложение уже является последней версией",
@@ -185,8 +181,6 @@
   "expirationTime": "Время истечения",
   "connections": "Соединения",
   "connectionsDesc": "Просмотр текущих данных о соединениях",
-  "nullRequestsDesc": "Нет запросов",
-  "nullConnectionsDesc": "Нет соединений",
   "intranetIP": "Внутренний IP",
   "view": "Просмотр",
   "cut": "Вырезать",
@@ -219,7 +213,6 @@
   "autoCloseConnectionsDesc": "Автоматически закрывать соединения после смены узла",
   "onlyStatisticsProxy": "Только статистика прокси",
   "onlyStatisticsProxyDesc": "При включении будет учитываться только трафик прокси",
-  "deleteProfileTip": "Вы уверены, что хотите удалить текущий профиль?",
   "pureBlackMode": "Чисто черный режим",
   "keepAliveIntervalDesc": "Интервал поддержания TCP-соединения",
   "entries": " записей",
@@ -250,7 +243,6 @@
   "dnsDesc": "Обновление настроек, связанных с DNS",
   "key": "Ключ",
   "value": "Значение",
-  "notEmpty": "Не может быть пустым",
   "hostsDesc": "Добавить Hosts",
   "vpnTip": "Изменения вступят в силу после перезапуска VPN",
   "vpnEnableDesc": "Автоматически направляет весь системный трафик через VpnService",
@@ -337,15 +329,12 @@
   "fileIsUpdate": "Файл был изменен. Хотите сохранить изменения?",
   "profileHasUpdate": "Профиль был изменен. Хотите отключить автообновление?",
   "hasCacheChange": "Хотите сохранить изменения в кэше?",
-  "nullProxies": "Нет прокси",
   "copySuccess": "Копирование успешно",
   "copyLink": "Копировать ссылку",
   "exportFile": "Экспорт файла",
   "cacheCorrupt": "Кэш поврежден. Хотите очистить его?",
   "detectionTip": "Опирается на сторонний API, только для справки",
   "listen": "Слушать",
-  "keyExists": "Текущий ключ уже существует",
-  "valueExists": "Текущее значение уже существует",
   "undo": "Отменить",
   "redo": "Повторить",
   "none": "Нет",
@@ -353,28 +342,21 @@
   "basicConfigDesc": "Глобальное изменение базовых настроек",
   "selectedCountTitle": "Выбрано {count} элементов",
   "addRule": "Добавить правило",
-  "ruleProviderEmptyTip": "Поставщик правил не может быть пустым",
   "ruleName": "Название правила",
   "content": "Содержание",
-  "contentEmptyTip": "Содержание не может быть пустым",
   "subRule": "Подправило",
-  "subRuleEmptyTip": "Содержание подправила не может быть пустым",
   "ruleTarget": "Цель правила",
-  "ruleTargetEmptyTip": "Цель правила не может быть пустой",
   "sourceIp": "Исходный IP",
   "noResolve": "Не разрешать IP",
   "getOriginRules": "Получить оригинальные правила",
   "overrideOriginRules": "Переопределить оригинальное правило",
   "addedOriginRules": "Добавить к оригинальным правилам",
   "enableOverride": "Включить переопределение",
-  "deleteRuleTip": "Вы уверены, что хотите удалить выбранное правило?",
   "saveChanges": "Сохранить изменения?",
   "generalDesc": "Изменение общих настроек",
   "findProcessModeDesc": "При включении возможны небольшие потери производительности",
   "tabAnimationDesc": "Действительно только в мобильном виде",
   "saveTip": "Вы уверены, что хотите сохранить?",
-  "deleteColorTip": "Удалить текущий цвет?",
-  "colorExists": "Этот цвет уже существует",
   "colorSchemes": "Цветовые схемы",
   "palette": "Палитра",
   "tonalSpotScheme": "Тональный акцент",
@@ -401,5 +383,44 @@
   "recoveryStrategy": "Стратегия восстановления",
   "recoveryStrategy_override": "Переопределение",
   "recoveryStrategy_compatible": "Совместимый",
-  "logsTest": "Тест журналов"
+  "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": "Введите другой порт",
+  "import": "Импорт",
+  "importFile": "Импорт из файла",
+  "importUrl": "Импорт по URL",
+  "autoSetSystemDns": "Автоматическая настройка системного DNS",
+  "details": "Детали {}",
+  "creationTime": "Время создания",
+  "progress": "Прогресс",
+  "host": "Хост",
+  "destination": "Назначение",
+  "destinationGeoIP": "Геолокация назначения",
+  "destinationIPASN": "ASN назначения",
+  "specialProxy": "Специальный прокси",
+  "specialRules": "Специальные правила",
+  "remoteDestination": "Удалённое назначение",
+  "networkType": "Тип сети",
+  "proxyChains": "Цепочки прокси",
+  "log": "Журнал",
+  "connection": "Соединение",
+  "request": "Запрос"
 }

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": "默认",
@@ -149,8 +147,6 @@
   "addressHelp": "WebDAV服务器地址",
   "addressTip": "请输入有效的WebDAV地址",
   "password": "密码",
-  "passwordTip": "密码不能为空",
-  "accountTip": "账号不能为空",
   "checkUpdate": "检查更新",
   "discoverNewVersion": "发现新版本",
   "checkUpdateError": "当前应用已经是最新版了",
@@ -185,8 +181,6 @@
   "expirationTime": "到期时间",
   "connections": "连接",
   "connectionsDesc": "查看当前连接数据",
-  "nullRequestsDesc": "暂无请求",
-  "nullConnectionsDesc": "暂无连接",
   "intranetIP": "内网 IP",
   "view": "查看",
   "cut": "剪切",
@@ -219,7 +213,6 @@
   "autoCloseConnectionsDesc": "切换节点后自动关闭连接",
   "onlyStatisticsProxy": "仅统计代理",
   "onlyStatisticsProxyDesc": "开启后，将只统计代理流量",
-  "deleteProfileTip": "确定要删除当前配置吗?",
   "pureBlackMode": "纯黑模式",
   "keepAliveIntervalDesc": "TCP保持活动间隔",
   "entries": "个条目",
@@ -250,7 +243,6 @@
   "dnsDesc": "更新DNS相关设置",
   "key": "键",
   "value": "值",
-  "notEmpty": "不能为空",
   "hostsDesc": "追加Hosts",
   "vpnTip": "重启VPN后改变生效",
   "vpnEnableDesc": "通过VpnService自动路由系统所有流量",
@@ -337,15 +329,12 @@
   "fileIsUpdate": "文件有修改，是否保存修改",
   "profileHasUpdate": "配置文件已经修改,是否关闭自动更新 ",
   "hasCacheChange": "是否缓存修改",
-  "nullProxies": "暂无代理",
   "copySuccess": "复制成功",
   "copyLink": "复制链接",
   "exportFile": "导出文件",
   "cacheCorrupt": "缓存已损坏，是否清空？",
   "detectionTip": "依赖第三方api，仅供参考",
   "listen": "监听",
-  "keyExists": "当前键已存在",
-  "valueExists": "当前值已存在",
   "undo": "撤销",
   "redo": "重做",
   "none": "无",
@@ -353,28 +342,21 @@
   "basicConfigDesc": "全局修改基本配置",
   "selectedCountTitle": "已选择 {count} 项",
   "addRule": "添加规则",
-  "ruleProviderEmptyTip": "规则提供者不能为空",
   "ruleName": "规则名称",
   "content": "内容",
-  "contentEmptyTip": "内容不能为空",
   "subRule": "子规则",
-  "subRuleEmptyTip": "子规则内容不能为空",
   "ruleTarget": "规则目标",
-  "ruleTargetEmptyTip": "规则目标不能为空",
   "sourceIp": "源IP",
   "noResolve": "不解析IP",
   "getOriginRules": "获取原始规则",
   "overrideOriginRules": "覆盖原始规则",
   "addedOriginRules": "附加到原始规则",
   "enableOverride": "启用覆写",
-  "deleteRuleTip": "确定要删除选中的规则吗？",
   "saveChanges": "是否保存更改？",
   "generalDesc": "修改通用设置",
   "findProcessModeDesc": "开启后会有一定性能损耗",
   "tabAnimationDesc": "仅在移动视图中有效",
   "saveTip": "确定要保存吗？",
-  "deleteColorTip": "确定删除当前颜色吗？",
-  "colorExists": "该颜色已存在",
   "colorSchemes": "配色方案",
   "palette": "调色板",
   "tonalSpotScheme": "调性点缀",
@@ -401,5 +383,44 @@
   "recoveryStrategy": "恢复策略",
   "recoveryStrategy_override": "覆盖",
   "recoveryStrategy_compatible": "兼容",
-  "logsTest": "日志测试"
+  "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": "请输入不同的端口",
+  "import": "导入",
+  "importFile": "通过文件导入",
+  "importUrl": "通过URL导入",
+  "autoSetSystemDns": "自动设置系统DNS",
+  "details": "{label}详情",
+  "creationTime": "创建时间",
+  "progress": "进度",
+  "host": "主机",
+  "destination": "目标地址",
+  "destinationGeoIP": "目标地理定位",
+  "destinationIPASN": "目标IP ASN",
+  "specialProxy": "特殊代理",
+  "specialRules": "特殊规则",
+  "remoteDestination": "远程目标",
+  "networkType": "网络类型",
+  "proxyChains": "代理链",
+  "log": "日志",
+  "connection": "连接",
+  "request": "请求"
 }

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:
 		paramsString := action.Data.(string)
-		result(handleInitClash(paramsString))
+		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,59 +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(true)
+		result.success(true)
 		handleCrash()
 	default:
-		handle := nextHandle(action, result)
-		if handle {
-			return
-		} else {
-			result(action.DefaultValue)
-		}
+		nextHandle(action, result)
 	}
 }

core/android_bride.go

@@ -43,13 +43,13 @@ var (
 	}
 )
 
-func protect(callback unsafe.Pointer, fd int) {
+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 {
+func ResolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
 	if globalCallbacks.resolveProcessFunc == nil {
 		return ""
 	}

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,31 +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"
 )
 
-func splitByMultipleSeparators(s string) interface{} {
-	isSeparator := func(r rune) bool {
-		return r == ',' || r == ' ' || r == ';'
-	}
-
-	parts := strings.FieldsFunc(s, isSeparator)
-	if len(parts) > 1 {
-		return parts
-	}
-	return s
-}
-
 var (
-	version   = 0
-	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
@@ -54,54 +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 {
-		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() {
@@ -166,143 +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 attachHosts(hosts, patchHosts map[string]any) {
-	for k, v := range patchHosts {
-		if str, ok := v.(string); ok {
-			hosts[k] = splitByMultipleSeparators(str)
-		}
-	}
-}
-
-func updatePatchDns(dns config.RawDNS) {
-	for pair := dns.NameServerPolicy.Oldest(); pair != nil; pair = pair.Next() {
-		if str, ok := pair.Value.(string); ok {
-			dns.NameServerPolicy.Set(pair.Key, splitByMultipleSeparators(str))
-		}
-	}
-}
-
-func trimArr(arr []string) (r []string) {
-	for _, e := range arr {
-		r = append(r, strings.Trim(e, " "))
-	}
-	return
-}
-
-func overrideRules(rules, patchRules []string) []string {
-	target := ""
-	for _, line := range rules {
-		rule := trimArr(strings.Split(line, ","))
-		if len(rule) != 2 {
-			continue
-		}
-		if strings.EqualFold(rule[0], "MATCH") {
-			target = rule[1]
-			break
-		}
-	}
-	if target == "" {
-		return rules
-	}
-	rulesExt := lo.Map(ips, func(ip string, _ int) string {
-		return fmt.Sprintf("DOMAIN,%s,%s", ip, target)
-	})
-	return append(append(rulesExt, patchRules...), 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"] = ""
-	}
-	attachHosts(targetConfig.Hosts, patchConfig.Hosts)
-	if configParams.OverrideDns {
-		updatePatchDns(patchConfig.DNS)
-		targetConfig.DNS = patchConfig.DNS
-	} else {
-		if targetConfig.DNS.Enable == false {
-			targetConfig.DNS.Enable = true
-		}
-	}
-	if configParams.OverrideRule {
-		targetConfig.Rule = overrideRules(patchConfig.Rule, []string{})
-	} else {
-		targetConfig.Rule = overrideRules(targetConfig.Rule, patchConfig.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)
@@ -326,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 {
@@ -351,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,7 +3,12 @@ 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"
 )
 
@@ -12,19 +17,34 @@ type InitParams struct {
 	Version int    `json:"version"`
 }
 
-type ConfigExtendedParams struct {
-	IsPatch      bool              `json:"is-patch"`
-	IsCompatible bool              `json:"is-compatible"`
-	SelectedMap  map[string]string `json:"selected-map"`
-	TestURL      *string           `json:"test-url"`
-	OverrideDns  bool              `json:"override-dns"`
-	OverrideRule bool              `json:"override-rule"`
+type SetupParams struct {
+	Config      *config.RawConfig `json:"config"`
+	SelectedMap map[string]string `json:"selected-map"`
+	TestURL     string            `json:"test-url"`
 }
 
-type GenerateConfigParams struct {
-	ProfileId string               `json:"profile-id"`
-	Config    config.RawConfig     `json:"config" `
-	Params    ConfigExtendedParams `json:"params"`
+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 {
@@ -64,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"
@@ -81,8 +102,9 @@ const (
 	getAndroidVpnOptionsMethod     Method = "getAndroidVpnOptions"
 	getRunTimeMethod               Method = "getRunTime"
 	getCurrentProfileNameMethod    Method = "getCurrentProfileName"
-	getProfileMethod               Method = "getProfile"
 	crashMethod                    Method = "crash"
+	setupConfigMethod              Method = "setupConfig"
+	getConfigMethod                Method = "getConfig"
 )
 
 type Method string

core/go.mod

@@ -6,13 +6,12 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 
 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.49.1
 	golang.org/x/sync v0.11.0
 )
 
 require (
 	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
@@ -21,13 +20,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/ebitengine/purego v0.8.3 // indirect
 	github.com/enfein/mieru/v3 v3.13.0 // indirect
-	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // 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
@@ -36,7 +35,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
@@ -51,22 +50,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/bart v0.20.5 // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
-	github.com/metacubex/chacha v0.1.2 // indirect
+	github.com/metacubex/chacha v0.1.5 // indirect
+	github.com/metacubex/fswatch v0.1.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
-	github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 // indirect
+	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
+	github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
-	github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 // indirect
-	github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 // indirect
-	github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
-	github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
-	github.com/metacubex/utls v1.7.0-alpha.1 // indirect
+	github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29 // indirect
+	github.com/metacubex/sing-mux v0.3.2 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
+	github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8 // indirect
+	github.com/metacubex/sing-vmess v0.2.2 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
+	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
+	github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 // indirect
+	github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -78,14 +82,9 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // 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/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
+	github.com/samber/lo v1.50.0 // 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

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/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc=
+github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98=
 github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
-github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
-github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
+github.com/ericlagergren/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,38 +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/bart v0.20.5 h1:XkgLZ17QxfxkqKdGsojoM2Zu01mmHyyQSFzt2/calTM=
+github.com/metacubex/bart v0.20.5/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
-github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc=
-github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
+github.com/metacubex/chacha v0.1.5 h1:fKWMb/5c7ZrY8Uoqi79PPFxl+qwR7X/q0OrsAubyX2M=
+github.com/metacubex/chacha v0.1.5/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
+github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU=
+github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI=
 github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
-github.com/metacubex/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/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.52.1-0.20250522021943-aef454b9e639 h1:L+1brQNzBhCCxWlicwfK1TlceemCRmrDE4HmcVHc29w=
+github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639/go.mod h1:Kc6h++Q/zf3AxcUCevJhJwgrskJumv+pZdR8g/E/10k=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c h1:OB3WmMA8YPJjE36RjD9X8xlrWGJ4orxbf2R/KAE28b0=
-github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
-github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
-github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
-github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
-github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 h1:vy/8ZYYtWUXYnOnw/NF8ThG1W/RqM/h5rkun+OXZMH0=
-github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63/go.mod h1:eDZ2JpkSkewGmUlCoLSn2MRFn1D0jKPIys/6aogFx7U=
-github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 h1:hcsz5e5lqhBxn3iQQDIF60FLZ8PQT542GTQZ+1wcIGo=
-github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0=
-github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 h1:zZp5uct9+/0Hb1jKGyqDjCU4/72t43rs7qOq3Rc9oU8=
-github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82/go.mod h1:nE7Mdzj/QUDwgRi/8BASPtsxtIFZTHA4Yst5GgwbGCQ=
-github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0HLTjx6BKIkV48sV/yia/GP8Bnyb5JQuGgSGzg=
-github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc=
-github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY=
-github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.7.0-alpha.1 h1:oMFsPh2oTlALJ7vKXPJuqgy0YeiZ+q/LLw+ZdxZ80l4=
-github.com/metacubex/utls v1.7.0-alpha.1/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29 h1:SD9q025FNTaepuFXFOKDhnGLVu6PQYChBvw2ZYPXeLo=
+github.com/metacubex/sing v0.5.4-0.20250605054047-54dc6097da29/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
+github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f h1:mP3vIm+9hRFI0C0Vl3pE0NESF/L85FDbuB0tGgUii6I=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f/go.mod h1:JPTpf7fpnojsSuwRJExhSZSy63pVbp3VM39+zj+sAJM=
+github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92 h1:Y9ebcKya6ow7VHoESCN5+l4zZvg5eaL2IhI5LLCQxQA=
+github.com/metacubex/sing-shadowsocks v0.2.11-0.20250621023810-0e9ef9dd0c92/go.mod h1:/squZ38pXrYjqtg8qn+joVvwbpGNYQNp8yxKsMVbCto=
+github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d h1:Ey3A1tA8lVkRbK1FDmwuWj/57Nr8JMdpoVqe45mFzJg=
+github.com/metacubex/sing-shadowsocks2 v0.2.5-0.20250621023950-93d605a2143d/go.mod h1:+ukTd0OPFglT3bnKAYTJWYPbuox6HYNXE235r5tHdUk=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
+github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8 h1:4zWKqxTx75TbfW2EmlQ3hxM6RTRg2PYOAVMCnU4I61I=
+github.com/metacubex/sing-tun v0.4.7-0.20250611091011-60774779fdd8/go.mod h1:2YywXPWW8Z97kTH7RffOeykKzU+l0aiKlglWV1PAS64=
+github.com/metacubex/sing-vmess v0.2.2 h1:nG6GIKF1UOGmlzs+BIetdGHkFZ20YqFVIYp5Htqzp+4=
+github.com/metacubex/sing-vmess v0.2.2/go.mod h1:CVDNcdSLVYFgTHQlubr88d8CdqupAUDqLjROos+H9xk=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 h1:j1VRTiC9JLR4nUbSikx9OGdu/3AgFDqgcLj4GoqyQkc=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73 h1:HWKsf92BqLYqugATFIJ3hYiEBZ7JF6AoqyvqF39afuI=
+github.com/metacubex/utls v1.7.4-0.20250610022031-808d767c8c73/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
@@ -159,25 +170,12 @@ github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++
 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/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,10 +29,8 @@ import (
 
 var (
 	isInit            = false
-	configParams      = ConfigExtendedParams{}
 	externalProviders = map[string]cp.Provider{}
 	logSubscriber     observable.Subscription[log.Event]
-	currentConfig     *config.Config
 )
 
 func handleInitClash(paramsString string) bool {
@@ -52,8 +51,8 @@ func handleStartListener() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
 	isRunning = true
-	updateListeners(true)
-	closeConnections()
+	updateListeners()
+	resolver.ResetConnection()
 	return true
 }
 
@@ -92,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)) {
@@ -185,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 {
@@ -267,13 +237,7 @@ func handleGetConnections() string {
 func handleCloseConnections() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
-	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
-		err := c.Close()
-		if err != nil {
-			return false
-		}
-		return true
-	})
+	closeConnections()
 	return true
 }
 
@@ -287,6 +251,13 @@ func closeConnections() {
 	})
 }
 
+func handleResetConnections() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	resolver.ResetConnection()
+	return true
+}
+
 func handleCloseConnection(connectionId string) bool {
 	runLock.Lock()
 	defer runLock.Unlock()
@@ -453,10 +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

@@ -58,7 +58,7 @@ func (t *TunHandler) handleProtect(fd int) {
 		return
 	}
 
-	protect(t.callback, fd)
+	Protect(t.callback, fd)
 }
 
 func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
@@ -79,7 +79,7 @@ func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
 	if version < 29 {
 		uid = platform.QuerySocketUidFromProcFs(source, target)
 	}
-	return resolveProcess(t.callback, protocol, source.String(), target.String(), uid)
+	return ResolveProcess(t.callback, protocol, source.String(), target.String(), uid)
 }
 
 var (
@@ -188,21 +188,21 @@ 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 getAndroidVpnOptionsMethod:
-		result(handleGetAndroidVpnOptions())
+		result.success(handleGetAndroidVpnOptions())
 		return true
 	case updateDnsMethod:
 		data := action.Data.(string)
 		handleUpdateDns(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
@@ -220,7 +220,7 @@ func quickStart(initParamsChar *C.char, paramsChar *C.char, stateParamsChar *C.c
 			bridge.SendToPort(i, "init error")
 		}
 		handleSetState(stateParams)
-		bridge.SendToPort(i, handleUpdateConfig(bytes))
+		bridge.SendToPort(i, handleSetupConfig(bytes))
 	}()
 }
 

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
 }

lib/application.dart

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

lib/clash/core.dart

@@ -17,7 +17,7 @@ class ClashCore {
   late ClashHandlerInterface clashInterface;
 
   ClashCore._internal() {
-    if (Platform.isAndroid) {
+    if (system.isAndroid) {
       clashInterface = clashLib!;
     } else {
       clashInterface = clashService!;
@@ -66,6 +66,11 @@ class ClashCore {
 
   Future<bool> init() async {
     await initGeo();
+    if (globalState.config.appSetting.openLogs) {
+      clashCore.startLog();
+    } else {
+      clashCore.stopLog();
+    }
     final homeDirPath = await appPath.homeDirPath;
     return await clashInterface.init(
       InitParams(
@@ -79,7 +84,7 @@ class ClashCore {
     return await clashInterface.setState(state);
   }
 
-  shutdown() async {
+  Future<void> shutdown() async {
     await clashInterface.shutdown();
   }
 
@@ -89,60 +94,64 @@ 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 {
     return await clashInterface.changeProxy(changeProxyParams);
   }
 
-  Future<List<Connection>> getConnections() async {
+  Future<List<TrackerInfo>> getConnections() async {
     final res = await clashInterface.getConnections();
     final connectionsData = json.decode(res) as Map;
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
-    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
+    return connectionsRaw.map((e) => TrackerInfo.fromJson(e)).toList();
   }
 
-  closeConnection(String id) {
+  void closeConnection(String id) {
     clashInterface.closeConnection(id);
   }
 
-  closeConnections() {
+  void closeConnections() {
     clashInterface.closeConnections();
   }
 
+  void resetConnections() {
+    clashInterface.resetConnections();
+  }
+
   Future<List<ExternalProvider>> getExternalProviders() async {
     final externalProvidersRawString =
         await clashInterface.getExternalProviders();
@@ -193,11 +202,11 @@ class ClashCore {
     return clashInterface.updateExternalProvider(providerName);
   }
 
-  startListener() async {
+  Future<void> startListener() async {
     await clashInterface.startListener();
   }
 
-  stopListener() async {
+  Future<void> stopListener() async {
     await clashInterface.stopListener();
   }
 
@@ -206,6 +215,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) {
@@ -241,31 +260,23 @@ class ClashCore {
     return int.parse(value);
   }
 
-  Future<ClashConfigSnippet?> getProfile(String id) async {
-    final res = await clashInterface.getProfile(id);
-    if (res.isEmpty) {
-      return null;
-    }
-    return Isolate.run(() => ClashConfigSnippet.fromJson(json.decode(res)));
-  }
-
-  resetTraffic() {
+  void resetTraffic() {
     clashInterface.resetTraffic();
   }
 
-  startLog() {
+  void startLog() {
     clashInterface.startLog();
   }
 
-  stopLog() {
+  void stopLog() {
     clashInterface.stopLog();
   }
 
-  requestGc() {
-    clashInterface.forceGc();
+  Future<void> requestGc() async {
+    await clashInterface.forceGc();
   }
 
-  destroy() async {
+  Future<void> destroy() async {
     await clashInterface.destroy();
   }
 }

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,
@@ -2518,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();
   }
@@ -2639,6 +2653,29 @@ class ClashFFI {
       _updateDnsPtr.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;
@@ -2647,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>)>>
@@ -2731,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;
 
@@ -2738,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),
@@ -2754,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;
@@ -2769,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;
@@ -2783,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;
@@ -2914,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;
 
@@ -2924,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()
@@ -2944,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()
@@ -2968,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;
@@ -3001,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)>>
@@ -3020,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<
@@ -3034,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;
@@ -3047,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;
@@ -3065,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;
@@ -3073,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;
@@ -3125,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;
@@ -3730,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;
@@ -3738,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;
@@ -3748,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;
@@ -3784,18 +3932,18 @@ 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 protect_func = ffi.Pointer<ffi.NativeFunction<protect_funcFunction>>;
+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 resolve_process_func
-    = ffi.Pointer<ffi.NativeFunction<resolve_process_funcFunction>>;
+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,
@@ -3808,12 +3956,35 @@ typedef Dartresolve_process_funcFunction = ffi.Pointer<ffi.Char> Function(
     ffi.Pointer<ffi.Char> source,
     ffi.Pointer<ffi.Char> target,
     int uid);
-typedef release_object_func
-    = ffi.Pointer<ffi.NativeFunction<release_object_funcFunction>>;
-typedef release_object_funcFunction = ffi.Void Function(
-    ffi.Pointer<ffi.Void> obj);
-typedef Dartrelease_object_funcFunction = void Function(
-    ffi.Pointer<ffi.Void> obj);
+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;
@@ -3831,12 +4002,6 @@ final class GoSlice extends ffi.Struct {
   external int cap;
 }
 
-typedef GoInt = GoInt64;
-typedef GoInt64 = ffi.LongLong;
-typedef DartGoInt64 = int;
-typedef GoUint8 = ffi.UnsignedChar;
-typedef DartGoUint8 = int;
-
 const int __has_safe_buffers = 1;
 
 const int __DARWIN_ONLY_64_BIT_INO_T = 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';
@@ -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);
 
@@ -52,11 +57,11 @@ mixin ClashInterface {
 
   FutureOr<String> getMemory();
 
-  resetTraffic();
+  FutureOr<void> resetTraffic();
 
-  startLog();
+  FutureOr<void> startLog();
 
-  stopLog();
+  FutureOr<void> stopLog();
 
   Future<bool> crash();
 
@@ -66,18 +71,12 @@ mixin ClashInterface {
 
   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<AndroidVpnOptions?> getAndroidVpnOptions();
@@ -90,61 +89,29 @@ 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 {
+  Future<void> 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:
-        case ActionMethod.crash:
-          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');
     }
   }
 
-  sendMessage(String message);
+  void sendMessage(String message);
 
-  reStart();
+  FutureOr<void> reStart();
 
   FutureOr<bool> destroy();
 
@@ -153,18 +120,21 @@ abstract class ClashHandlerInterface with ClashInterface {
     dynamic data,
     Duration? timeout,
     FutureOr<T> Function()? onTimeout,
+    T? defaultValue,
   }) async {
-    final id = "${method.name}#${utils.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(
@@ -173,7 +143,6 @@ abstract class ClashHandlerInterface with ClashInterface {
           id: id,
           method: method,
           data: data,
-          defaultValue: defaultValue,
         ),
       ),
     );
@@ -185,7 +154,7 @@ abstract class ClashHandlerInterface with ClashInterface {
       },
       onTimeout: onTimeout ??
           () {
-            return defaultValue;
+            return mDefaultValue;
           },
       functionName: id,
     );
@@ -211,6 +180,7 @@ abstract class ClashHandlerInterface with ClashInterface {
   shutdown() async {
     return await invoke<bool>(
       method: ActionMethod.shutdown,
+      timeout: Duration(seconds: 1),
     );
   }
 
@@ -237,10 +207,31 @@ 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<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),
     );
   }
@@ -253,8 +244,8 @@ abstract class ClashHandlerInterface with ClashInterface {
   }
 
   @override
-  Future<String> getProxies() {
-    return invoke<String>(
+  Future<Map> getProxies() {
+    return invoke<Map>(
       method: ActionMethod.getProxies,
       timeout: Duration(seconds: 5),
     );
@@ -299,8 +290,8 @@ abstract class ClashHandlerInterface with ClashInterface {
     return invoke<String>(
       method: ActionMethod.sideLoadExternalProvider,
       data: json.encode({
-        "providerName": providerName,
-        "data": data,
+        'providerName': providerName,
+        'data': data,
       }),
     );
   }
@@ -329,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,
     );
   }
@@ -392,9 +382,9 @@ abstract class ClashHandlerInterface with ClashInterface {
   @override
   Future<String> asyncTestDelay(String url, String proxyName) {
     final delayParams = {
-      "proxy-name": proxyName,
-      "timeout": httpTimeoutDuration.inMilliseconds,
-      "test-url": url,
+      'proxy-name': proxyName,
+      'timeout': httpTimeoutDuration.inMilliseconds,
+      'test-url': url,
     };
     return invoke<String>(
       method: ActionMethod.asyncTestDelay,

lib/clash/lib.dart

@@ -1,12 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi';
-import 'dart:io';
 import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:ffi/ffi.dart';
-import 'package:fl_clash/common/constant.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/plugins/service.dart';
@@ -30,7 +29,7 @@ class ClashLib extends ClashHandlerInterface with AndroidClashInterface {
     return _canSendCompleter.future;
   }
 
-  _initService() async {
+  Future<void> _initService() async {
     await service?.destroy();
     _registerMainPort(receiverPort.sendPort);
     receiverPort.listen((message) {
@@ -52,7 +51,7 @@ class ClashLib extends ClashHandlerInterface with AndroidClashInterface {
     await service?.init();
   }
 
-  _registerMainPort(SendPort sendPort) {
+  void _registerMainPort(SendPort sendPort) {
     IsolateNameServer.removePortNameMapping(mainIsolate);
     IsolateNameServer.registerPortWithName(sendPort, mainIsolate);
   }
@@ -62,26 +61,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,22 +85,6 @@ 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<bool> stopTun() {
   //   return invoke<bool>(
@@ -175,7 +138,7 @@ class ClashLibHandler {
   late final DynamicLibrary lib;
 
   ClashLibHandler._internal() {
-    lib = DynamicLibrary.open("libclash.so");
+    lib = DynamicLibrary.open('libclash.so');
     clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
@@ -205,19 +168,19 @@ class ClashLibHandler {
     return completer.future;
   }
 
-  attachMessagePort(int messagePort) {
+  void attachMessagePort(int messagePort) {
     clashFFI.attachMessagePort(
       messagePort,
     );
   }
 
-  updateDns(String dns) {
+  void updateDns(String dns) {
     final dnsChar = dns.toNativeUtf8().cast<Char>();
     clashFFI.updateDns(dnsChar);
     malloc.free(dnsChar);
   }
 
-  setState(CoreState state) {
+  void setState(CoreState state) {
     final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
     clashFFI.setState(stateChar);
     malloc.free(stateChar);
@@ -257,19 +220,42 @@ class ClashLibHandler {
     return Traffic.fromMap(json.decode(trafficString));
   }
 
-  startListener() async {
+  Future<bool> startListener() async {
     clashFFI.startListener();
     return true;
   }
 
-  stopListener() async {
+  Future<bool> stopListener() async {
     clashFFI.stopListener();
     return true;
   }
 
+  DateTime? getRunTime() {
+    final runTimeRaw = clashFFI.getRunTime();
+    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
+    if (runTimeString.isEmpty) {
+      return null;
+    }
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  }
+
+  Future<Map<String, dynamic>> getConfig(String id) async {
+    final path = await appPath.getProfilePath(id);
+    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(
     InitParams initParams,
-    UpdateConfigParams updateConfigParams,
+    SetupParams setupParams,
     CoreState state,
   ) {
     final completer = Completer<String>();
@@ -280,7 +266,7 @@ 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 initParamsChar = initValue.toNativeUtf8().cast<Char>();
@@ -297,15 +283,10 @@ class ClashLibHandler {
     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;
+    system.isAndroid && !globalState.isService ? ClashLib() : null;
+
+ClashLibHandler? get clashLibHandler =>
+    system.isAndroid && globalState.isService ? 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:
@@ -24,7 +23,7 @@ class ClashMessage {
               listener.onDelay(Delay.fromJson(m.data));
               break;
             case AppMessageType.request:
-              listener.onRequest(Connection.fromJson(m.data));
+              listener.onRequest(TrackerInfo.fromJson(m.data));
               break;
             case AppMessageType.loaded:
               listener.onLoaded(m.data);

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';
@@ -29,9 +28,9 @@ class ClashService extends ClashHandlerInterface {
     reStart();
   }
 
-  _initServer() async {
+  Future<void> _initServer() async {
     runZonedGuarded(() async {
-      final address = !Platform.isWindows
+      final address = !system.isWindows
           ? InternetAddress(
               unixSocketPath,
               type: InternetAddressType.unix,
@@ -51,23 +50,18 @@ 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());
@@ -89,10 +83,10 @@ class ClashService extends ClashHandlerInterface {
       await shutdown();
     }
     final serverSocket = await serverCompleter.future;
-    final arg = Platform.isWindows
-        ? "${serverSocket.port}"
+    final arg = system.isWindows
+        ? '${serverSocket.port}'
         : serverSocket.address.address;
-    if (Platform.isWindows && await system.checkIsAdmin()) {
+    if (system.isWindows && await system.checkIsAdmin()) {
       final isSuccess = await request.startCoreByHelper(arg);
       if (isSuccess) {
         return;
@@ -104,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;
   }
 
@@ -122,8 +122,8 @@ class ClashService extends ClashHandlerInterface {
     socket.writeln(message);
   }
 
-  _deleteSocketFile() async {
-    if (!Platform.isWindows) {
+  Future<void> _deleteSocketFile() async {
+    if (!system.isWindows) {
       final file = File(unixSocketPath);
       if (await file.exists()) {
         await file.delete();
@@ -131,7 +131,7 @@ class ClashService extends ClashHandlerInterface {
     }
   }
 
-  _destroySocket() async {
+  Future<void> _destroySocket() async {
     if (socketCompleter.isCompleted) {
       final lastSocket = await socketCompleter.future;
       await lastSocket.close();
@@ -141,7 +141,7 @@ class ClashService extends ClashHandlerInterface {
 
   @override
   shutdown() async {
-    if (Platform.isWindows) {
+    if (system.isWindows) {
       await request.stopCoreByHelper();
     }
     await _destroySocket();

lib/common/android.dart

@@ -1,14 +1,14 @@
-import 'dart:io';
-
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 
+import 'system.dart';
+
 class Android {
-  init() async {
+  Future<void> init() async {
     app?.onExit = () async {
       await globalState.appController.savePreferences();
     };
   }
 }
 
-final android = Platform.isAndroid ? Android() : null;
+final android = system.isAndroid ? Android() : null;

lib/common/archive.dart

@@ -1,10 +1,11 @@
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:archive/archive_io.dart';
 import 'package:path/path.dart';
 
 extension ArchiveExt on Archive {
-  addDirectoryToArchive(String dirPath, String parentPath) {
+  void addDirectoryToArchive(String dirPath, String parentPath) {
     final dir = Directory(dirPath);
     final entities = dir.listSync(recursive: false);
     for (final entity in entities) {
@@ -19,7 +20,7 @@ extension ArchiveExt on Archive {
     }
   }
 
-  add<T>(String name, T raw) {
+  void add<T>(String name, T raw) {
     final data = json.encode(raw);
     addFile(
       ArchiveFile(name, data.length, data),

lib/common/color.dart

@@ -23,6 +23,10 @@ extension ColorExtension on Color {
     return withAlpha(77);
   }
 
+  Color get opacity12 {
+    return withAlpha(31);
+  }
+
   Color get opacity15 {
     return withAlpha(38);
   }

lib/common/common.dart

@@ -3,7 +3,9 @@ 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';
@@ -12,28 +14,26 @@ export 'iterable.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
-export 'fixed.dart';
 export 'lock.dart';
 export 'measure.dart';
+export 'mixin.dart';
 export 'navigation.dart';
 export 'navigator.dart';
 export 'network.dart';
 export 'num.dart';
-export 'utils.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

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'dart:math';
 import 'dart:ui';
 
@@ -8,13 +7,13 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 
-const appName = "FlClash";
-const appHelperService = "FlClashHelperService";
-const coreName = "clash.meta";
+const appName = 'FlClash';
+const appHelperService = 'FlClashHelperService';
+const coreName = 'clash.meta';
 const browserUa =
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
-const packageName = "com.follow.clash";
-final unixSocketPath = "/tmp/FlClashSocket_${Random().nextInt(10000)}.sock";
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
+const packageName = 'com.follow.clash';
+final unixSocketPath = '/tmp/FlClashSocket_${Random().nextInt(10000)}.sock';
 const helperPort = 47890;
 const maxTextScale = 1.4;
 const minTextScale = 0.8;
@@ -28,27 +27,28 @@ final defaultTextScaleFactor =
 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";
-const asnFileName = "ASN.mmdb";
-const geoIpFileName = "GeoIP.dat";
-const geoSiteFileName = "GeoSite.dat";
+const mmdbFileName = 'geoip.metadb';
+const asnFileName = 'ASN.mmdb';
+const geoIpFileName = 'GeoIP.dat';
+const geoSiteFileName = 'GeoSite.dat';
 final double kHeaderHeight = system.isDesktop
-    ? !Platform.isMacOS
+    ? !system.isMacOS
         ? 40
         : 28
     : 0;
-const profilesDirectoryName = "profiles";
-const localhost = "127.0.0.1";
-const clashConfigKey = "clash_config";
-const configKey = "config";
+const profilesDirectoryName = 'profiles';
+const localhost = '127.0.0.1';
+const clashConfigKey = 'clash_config';
+const configKey = 'config';
 const double dialogCommonWidth = 300;
-const repository = "chen08209/FlClash";
-const defaultExternalController = "127.0.0.1:9090";
+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";
+const defaultTestUrl = 'https://www.gstatic.com/generate_204';
 final commonFilter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,
@@ -56,7 +56,7 @@ final commonFilter = ImageFilter.blur(
 );
 
 const navigationItemListEquality = ListEquality<NavigationItem>();
-const connectionListEquality = ListEquality<Connection>();
+const trackerInfoListEquality = ListEquality<TrackerInfo>();
 const stringListEquality = ListEquality<String>();
 const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
@@ -77,9 +77,9 @@ const viewModeColumnsMap = {
   ViewMode.desktop: [4, 3],
 };
 
-// const proxiesStoreKey = PageStorageKey<String>('proxies');
-// const toolsStoreKey = PageStorageKey<String>('tools');
-// const profilesStoreKey = PageStorageKey<String>('profiles');
+const proxiesListStoreKey = PageStorageKey<String>('proxies_list');
+const toolsStoreKey = PageStorageKey<String>('tools');
+const profilesStoreKey = PageStorageKey<String>('profiles');
 
 const defaultPrimaryColor = 0XFFD8C0C3;
 
@@ -87,11 +87,11 @@ double getWidgetHeight(num lines) {
   return max(lines * 84 + (lines - 1) * 16, 0).ap;
 }
 
-const maxLength = 150;
+const maxLength = 1000;
 
-final mainIsolate = "FlClashMainIsolate";
+final mainIsolate = 'FlClashMainIsolate';
 
-final serviceIsolate = "FlClashServiceIsolate";
+final serviceIsolate = 'FlClashServiceIsolate';
 
 const defaultPrimaryColors = [
   0xFF795548,
@@ -102,3 +102,8 @@ const defaultPrimaryColors = [
   defaultPrimaryColor,
   0XFF665390,
 ];
+
+const scriptTemplate = '''
+const main = (config) => {
+  return config;
+}''';

lib/common/context.dart

@@ -7,11 +7,11 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  showNotifier(String text) {
+  Future<void>? showNotifier(String text) {
     return findAncestorStateOfType<MessageManagerState>()?.message(text);
   }
 
-  showSnackBar(
+  void showSnackBar(
     String message, {
     SnackBarAction? action,
   }) {
@@ -72,3 +72,18 @@ extension BuildContextExtension on BuildContext {
     return state;
   }
 }
+
+class BackHandleInherited extends InheritedWidget {
+  final Function handleBack;
+
+  const BackHandleInherited(
+      {super.key, required this.handleBack, required super.child});
+
+  static BackHandleInherited? of(BuildContext context) =>
+      context.dependOnInheritedWidgetOfExactType<BackHandleInherited>();
+
+  @override
+  bool updateShouldNotify(BackHandleInherited oldWidget) {
+    return handleBack != oldWidget.handleBack;
+  }
+}

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

@@ -17,26 +17,34 @@ extension DateTimeExtension on DateTime {
     final difference = currentDateTime.difference(this);
     final days = difference.inDays;
     if (days >= 365) {
-      return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
+      return '${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}';
     }
     if (days >= 30) {
-      return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
+      return '${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}';
     }
     if (days >= 1) {
-      return "$days ${appLocalizations.days}${appLocalizations.ago}";
+      return '$days ${appLocalizations.days}${appLocalizations.ago}';
     }
     final hours = difference.inHours;
     if (hours >= 1) {
-      return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
+      return '$hours ${appLocalizations.hours}${appLocalizations.ago}';
     }
     final minutes = difference.inMinutes;
     if (minutes >= 1) {
-      return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
+      return '$minutes ${appLocalizations.minutes}${appLocalizations.ago}';
     }
     return appLocalizations.just;
   }
 
   String get show {
-    return toIso8601String().substring(0, 10);
+    return toString().substring(0, 10);
+  }
+
+  String get showFull {
+    return toString().substring(0, 19);
+  }
+
+  String get showTime {
+    return toString().substring(10, 19);
   }
 }

lib/common/dav_client.dart

@@ -38,18 +38,18 @@ class DAVClient {
     }
   }
 
-  get root => "/$appName";
+  String get root => '/$appName';
 
-  get backupFile => "$root/$fileName";
+  String get backupFile => '$root/$fileName';
 
-  backup(Uint8List data) async {
-    await client.mkdir("$root");
-    await client.write("$backupFile", data);
+  Future<bool> backup(Uint8List data) async {
+    await client.mkdir(root);
+    await client.write(backupFile, data);
     return true;
   }
 
   Future<List<int>> recovery() async {
-    await client.mkdir("$root");
+    await client.mkdir(root);
     final data = await client.read(backupFile);
     return data;
   }

lib/common/fixed.dart

@@ -1,5 +1,7 @@
 import 'iterable.dart';
 
+typedef ValueCallback<T> = T Function();
+
 class FixedList<T> {
   final int maxLength;
   final List<T> _list;
@@ -7,12 +9,12 @@ class FixedList<T> {
   FixedList(this.maxLength, {List<T>? list})
       : _list = (list ?? [])..truncate(maxLength);
 
-  add(T item) {
+  void add(T item) {
     _list.add(item);
     _list.truncate(maxLength);
   }
 
-  clear() {
+  void clear() {
     _list.clear();
   }
 
@@ -38,7 +40,7 @@ class FixedMap<K, V> {
     _map = map ?? {};
   }
 
-  updateCacheValue(K key, V Function() callback) {
+  V updateCacheValue(K key, ValueCallback<V> callback) {
     final realValue = _map.updateCacheValue(
       key,
       callback,
@@ -47,21 +49,21 @@ class FixedMap<K, V> {
     return realValue;
   }
 
-  clear() {
+  void clear() {
     _map.clear();
   }
 
-  updateMaxLength(int size) {
+  void updateMaxLength(int size) {
     maxLength = size;
     _adjustMap();
   }
 
-  updateMap(Map<K, V> map) {
+  void updateMap(Map<K, V> map) {
     _map = map;
     _adjustMap();
   }
 
-  _adjustMap() {
+  void _adjustMap() {
     if (_map.length > maxLength) {
       _map = Map.fromEntries(
         map.entries.toList()..truncate(maxLength),

lib/common/function.dart

@@ -5,7 +5,7 @@ import 'package:fl_clash/enum/enum.dart';
 class Debouncer {
   final Map<FunctionTag, Timer?> _operations = {};
 
-  call(
+  void call(
     FunctionTag tag,
     Function func, {
     List<dynamic>? args,
@@ -28,7 +28,7 @@ class Debouncer {
     );
   }
 
-  cancel(dynamic tag) {
+  void cancel(dynamic tag) {
     _operations[tag]?.cancel();
     _operations[tag] = null;
   }
@@ -37,7 +37,7 @@ class Debouncer {
 class Throttler {
   final Map<FunctionTag, Timer?> _operations = {};
 
-  call(
+  bool call(
     FunctionTag tag,
     Function func, {
     List<dynamic>? args,
@@ -61,7 +61,7 @@ class Throttler {
     return false;
   }
 
-  cancel(dynamic tag) {
+  void cancel(dynamic tag) {
     _operations[tag]?.cancel();
     _operations[tag] = null;
   }
@@ -81,7 +81,7 @@ Future<T> retry<T>({
     }
     attempts++;
   }
-  throw "unknown error";
+  throw 'unknown error';
 }
 
 final debouncer = Debouncer();

lib/common/future.dart

@@ -4,7 +4,7 @@ import 'dart:ui';
 import 'package:fl_clash/common/common.dart';
 
 extension CompleterExt<T> on Completer<T> {
-  safeFuture({
+  Future<T> safeFuture({
     Duration? timeout,
     VoidCallback? onLast,
     FutureOr<T> Function()? onTimeout,

lib/common/http.dart

@@ -6,18 +6,19 @@ import 'package:fl_clash/state.dart';
 class FlClashHttpOverrides extends HttpOverrides {
   static String handleFindProxy(Uri url) {
     if ([localhost].contains(url.host)) {
-      return "DIRECT";
+      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";
+    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 = handleFindProxy;
     return client;
   }

lib/common/icons.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-class IconsExt{
-  static const IconData target =
-      IconData(0xe900, fontFamily: "Icons");
-}
+class IconsExt {
+  static const IconData target = IconData(0xe900, fontFamily: 'Icons');
+}

lib/common/iterable.dart

@@ -47,7 +47,9 @@ extension IterableExt<T> on Iterable<T> {
 
 extension ListExt<T> on List<T> {
   void truncate(int maxLength) {
-    assert(maxLength > 0);
+    if (maxLength == 0) {
+      return;
+    }
     if (length > maxLength) {
       removeRange(0, length - maxLength);
     }
@@ -70,11 +72,19 @@ extension ListExt<T> on List<T> {
     return res;
   }
 
-  List<T> safeSublist(int start) {
+  List<T> safeSublist(int start, [int? end]) {
     if (start <= 0) return this;
     if (start > length) return [];
+    if (end != null) {
+      return sublist(start, end.clamp(start, length));
+    }
     return sublist(start);
   }
+
+  T safeGet(int index) {
+    if (length > index) return this[index];
+    return last;
+  }
 }
 
 extension DoubleListExt on List<double> {
@@ -104,10 +114,10 @@ extension DoubleListExt on List<double> {
 }
 
 extension MapExt<K, V> on Map<K, V> {
-  updateCacheValue(K key, V Function() callback) {
+  V updateCacheValue(K key, V Function() callback) {
     if (this[key] == null) {
       this[key] = callback();
     }
-    return this[key];
+    return this[key]!;
   }
 }

lib/common/keyboard.dart

@@ -1,8 +1,8 @@
-import 'dart:io';
-
 import 'package:flutter/services.dart';
 import 'package:uni_platform/uni_platform.dart';
 
+import 'system.dart';
+
 final Map<PhysicalKeyboardKey, String> _knownKeyLabels =
     <PhysicalKeyboardKey, String>{
   PhysicalKeyboardKey.keyA: 'A',
@@ -79,14 +79,14 @@ final Map<PhysicalKeyboardKey, String> _knownKeyLabels =
   PhysicalKeyboardKey.arrowLeft: '←',
   PhysicalKeyboardKey.arrowDown: '↓',
   PhysicalKeyboardKey.arrowUp: '↑',
-  PhysicalKeyboardKey.controlLeft: "CTRL",
+  PhysicalKeyboardKey.controlLeft: 'CTRL',
   PhysicalKeyboardKey.shiftLeft: 'SHIFT',
-  PhysicalKeyboardKey.altLeft: "ALT",
-  PhysicalKeyboardKey.metaLeft: Platform.isMacOS ? '⌘' : 'WIN',
-  PhysicalKeyboardKey.controlRight: "CTRL",
+  PhysicalKeyboardKey.altLeft: 'ALT',
+  PhysicalKeyboardKey.metaLeft: system.isMacOS ? '⌘' : 'WIN',
+  PhysicalKeyboardKey.controlRight: 'CTRL',
   PhysicalKeyboardKey.shiftRight: 'SHIFT',
-  PhysicalKeyboardKey.altRight: "ALT",
-  PhysicalKeyboardKey.metaRight: Platform.isMacOS ? '⌘' : 'WIN',
+  PhysicalKeyboardKey.altRight: 'ALT',
+  PhysicalKeyboardKey.metaRight: system.isMacOS ? '⌘' : 'WIN',
   PhysicalKeyboardKey.fn: 'FN',
 };
 
@@ -101,6 +101,3 @@ extension KeyboardKeyExt on KeyboardKey {
     return _knownKeyLabels[physicalKey] ?? physicalKey?.debugName ?? 'Unknown';
   }
 }
-
-
-

lib/common/launch.dart

@@ -34,8 +34,8 @@ class AutoLaunch {
     return await launchAtStartup.disable();
   }
 
-  updateStatus(bool isAutoLaunch) async {
-    if(kDebugMode){
+  Future<void> updateStatus(bool isAutoLaunch) async {
+    if (kDebugMode) {
       return;
     }
     if (await isEnable == isAutoLaunch) return;

lib/common/link.dart

@@ -15,8 +15,9 @@ class LinkManager {
     _appLinks = AppLinks();
   }
 
-  initAppLinksListen(installConfigCallBack) async {
-    commonPrint.log("initAppLinksListen");
+  Future<void> initAppLinksListen(
+      Function(String url) installConfigCallBack) async {
+    commonPrint.log('initAppLinksListen');
     destroy();
     subscription = _appLinks.uriLinkStream.listen(
       (uri) {
@@ -32,7 +33,7 @@ class LinkManager {
     );
   }
 
-  destroy() {
+  void destroy() {
     if (subscription != null) {
       subscription?.cancel();
       subscription = null;

lib/common/measure.dart

@@ -33,10 +33,10 @@ class Measure {
 
   double get bodyMediumHeight {
     return _measureMap.updateCacheValue(
-      "bodyMediumHeight",
+      'bodyMediumHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.bodyMedium,
         ),
       ).height,
@@ -45,10 +45,10 @@ class Measure {
 
   double get bodyLargeHeight {
     return _measureMap.updateCacheValue(
-      "bodyLargeHeight",
+      'bodyLargeHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.bodyLarge,
         ),
       ).height,
@@ -57,10 +57,10 @@ class Measure {
 
   double get bodySmallHeight {
     return _measureMap.updateCacheValue(
-      "bodySmallHeight",
+      'bodySmallHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.bodySmall,
         ),
       ).height,
@@ -69,10 +69,10 @@ class Measure {
 
   double get labelSmallHeight {
     return _measureMap.updateCacheValue(
-      "labelSmallHeight",
+      'labelSmallHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.labelSmall,
         ),
       ).height,
@@ -81,10 +81,10 @@ class Measure {
 
   double get labelMediumHeight {
     return _measureMap.updateCacheValue(
-      "labelMediumHeight",
+      'labelMediumHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.labelMedium,
         ),
       ).height,
@@ -93,10 +93,10 @@ class Measure {
 
   double get titleLargeHeight {
     return _measureMap.updateCacheValue(
-      "titleLargeHeight",
+      'titleLargeHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.titleLarge,
         ),
       ).height,
@@ -105,10 +105,10 @@ class Measure {
 
   double get titleMediumHeight {
     return _measureMap.updateCacheValue(
-      "titleMediumHeight",
+      'titleMediumHeight',
       () => computeTextSize(
         Text(
-          "X",
+          'X',
           style: context.textTheme.titleMedium,
         ),
       ).height,

lib/common/mixin.dart

@@ -1,7 +1,4 @@
-import 'package:fl_clash/models/models.dart';
-import 'package:flutter/material.dart';
 import 'package:riverpod/riverpod.dart';
-import 'context.dart';
 
 mixin AutoDisposeNotifierMixin<T> on AutoDisposeNotifier<T> {
   set value(T value) {
@@ -17,37 +14,31 @@ mixin AutoDisposeNotifierMixin<T> on AutoDisposeNotifier<T> {
     return res;
   }
 
-  onUpdate(T value) {}
+  void onUpdate(T value) {}
 }
 
-mixin PageMixin<T extends StatefulWidget> on State<T> {
-  void onPageShow() {
-    initPageState();
-  }
-
-  initPageState() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final commonScaffoldState = context.commonScaffoldState;
-      commonScaffoldState?.actions = actions;
-      commonScaffoldState?.floatingActionButton = floatingActionButton;
-      commonScaffoldState?.onKeywordsUpdate = onKeywordsUpdate;
-      commonScaffoldState?.updateSearchState(
-        (_) => onSearch != null
-            ? AppBarSearchState(
-                onSearch: onSearch!,
-              )
-            : null,
-      );
-    });
-  }
-
-  void onPageHidden() {}
-
-  List<Widget> get actions => [];
-
-  Widget? get floatingActionButton => null;
-
-  Function(String)? get onSearch => null;
-
-  Function(List<String>)? get onKeywordsUpdate => null;
-}
+// mixin PageMixin<T extends StatefulWidget> on State<T> {
+//   initPageState() {
+//     WidgetsBinding.instance.addPostFrameCallback((_) {
+//       final commonScaffoldState = context.commonScaffoldState;
+//       commonScaffoldState?.actions = actions;
+//       commonScaffoldState?.floatingActionButton = floatingActionButton;
+//       commonScaffoldState?.onKeywordsUpdate = onKeywordsUpdate;
+//       commonScaffoldState?.updateSearchState(
+//         (_) => onSearch != null
+//             ? AppBarSearchState(
+//                 onSearch: onSearch!,
+//               )
+//             : null,
+//       );
+//     });
+//   }
+//
+//   List<Widget> get actions => [];
+//
+//   Widget? get floatingActionButton => null;
+//
+//   Function(String)? get onSearch => null;
+//
+//   Function(List<String>)? get onKeywordsUpdate => null;
+// }

lib/common/navigation.dart

@@ -1,7 +1,9 @@
 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/providers/providers.dart';
+import 'package:fl_clash/views/views.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class Navigation {
   static Navigation? _instance;
@@ -11,62 +13,69 @@ class Navigation {
     bool hasProxies = false,
   }) {
     return [
-      const NavigationItem(
+      NavigationItem(
         keep: false,
         icon: Icon(Icons.space_dashboard),
         label: PageLabel.dashboard,
-        fragment: DashboardFragment(
+        builder: (_) => const DashboardView(
           key: GlobalObjectKey(PageLabel.dashboard),
         ),
       ),
       NavigationItem(
         icon: const Icon(Icons.article),
         label: PageLabel.proxies,
-        fragment: const ProxiesFragment(
-          key: GlobalObjectKey(
-            PageLabel.proxies,
+        builder: (_) => ProviderScope(
+          overrides: [
+            queryProvider.overrideWith(
+              () => Query(),
+            ),
+          ],
+          child: const ProxiesView(
+            key: GlobalObjectKey(
+              PageLabel.proxies,
+            ),
           ),
         ),
         modes: hasProxies
             ? [NavigationItemMode.mobile, NavigationItemMode.desktop]
             : [],
       ),
-      const NavigationItem(
+      NavigationItem(
         icon: Icon(Icons.folder),
         label: PageLabel.profiles,
-        fragment: ProfilesFragment(
+        builder: (_) => const ProfilesView(
           key: GlobalObjectKey(
             PageLabel.profiles,
           ),
         ),
       ),
-      const NavigationItem(
+      NavigationItem(
         icon: Icon(Icons.view_timeline),
         label: PageLabel.requests,
-        fragment: RequestsFragment(
+        builder: (_) => const RequestsView(
           key: GlobalObjectKey(
             PageLabel.requests,
           ),
         ),
-        description: "requestsDesc",
+        description: 'requestsDesc',
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
-      const NavigationItem(
+      NavigationItem(
         icon: Icon(Icons.ballot),
         label: PageLabel.connections,
-        fragment: ConnectionsFragment(
+        builder: (_) => const ConnectionsView(
           key: GlobalObjectKey(
             PageLabel.connections,
           ),
         ),
-        description: "connectionsDesc",
+        description: 'connectionsDesc',
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
-      const NavigationItem(
+      NavigationItem(
         icon: Icon(Icons.storage),
         label: PageLabel.resources,
-        description: "resourcesDesc",
-        fragment: Resources(
+        description: 'resourcesDesc',
+        builder: (_) => const ResourcesView(
           key: GlobalObjectKey(
             PageLabel.resources,
           ),
@@ -76,20 +85,20 @@ class Navigation {
       NavigationItem(
         icon: const Icon(Icons.adb),
         label: PageLabel.logs,
-        fragment: const LogsFragment(
+        builder: (_) => const LogsView(
           key: GlobalObjectKey(
             PageLabel.logs,
           ),
         ),
-        description: "logsDesc",
+        description: 'logsDesc',
         modes: openLogs
             ? [NavigationItemMode.desktop, NavigationItemMode.more]
             : [],
       ),
-      const NavigationItem(
+      NavigationItem(
         icon: Icon(Icons.construction),
         label: PageLabel.tools,
-        fragment: ToolsFragment(
+        builder: (_) => const ToolsView(
           key: GlobalObjectKey(
             PageLabel.tools,
           ),

lib/common/navigator.dart

@@ -19,6 +19,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> {
@@ -218,8 +233,7 @@ class _CommonPageTransitionState extends State<CommonPageTransition> {
         begin: const _CommonEdgeShadowDecoration(),
         end: _CommonEdgeShadowDecoration(
           <Color>[
-            widget.context.colorScheme.inverseSurface
-                .withValues(alpha: 0.02),
+            widget.context.colorScheme.inverseSurface.withValues(alpha: 0.02),
             Colors.transparent,
           ],
         ),

lib/common/num.dart

@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 extension NumExt on num {
-  String fixed({decimals = 2}) {
+  String fixed({int decimals = 2}) {
     String formatted = toStringAsFixed(decimals);
     if (formatted.contains('.')) {
       formatted = formatted.replaceAll(RegExp(r'0*$'), '');
@@ -20,7 +20,7 @@ extension NumExt on num {
 }
 
 extension DoubleExt on double {
-  moreOrEqual(double value) {
+  bool moreOrEqual(double value) {
     return this > value || (value - this).abs() < precisionErrorTolerance + 1;
   }
 }
@@ -46,7 +46,7 @@ extension OffsetExt on Offset {
 }
 
 extension RectExt on Rect {
-  doRectIntersect(Rect rect) {
+  bool doRectIntersect(Rect rect) {
     return left < rect.right &&
         right > rect.left &&
         top < rect.bottom &&

lib/common/package.dart

@@ -6,8 +6,8 @@ import 'common.dart';
 
 extension PackageInfoExtension on PackageInfo {
   String get ua => [
-        "$appName/v$version",
-        "clash-verge",
-        "Platform/${Platform.operatingSystem}",
-      ].join(" ");
+        '$appName/v$version',
+        'clash-verge',
+        'Platform/${Platform.operatingSystem}',
+      ].join(' ');
 }

lib/common/path.dart

@@ -1,11 +1,10 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:fl_clash/common/common.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 
-import 'constant.dart';
-
 class AppPath {
   static AppPath? _instance;
   Completer<Directory> dataDir = Completer();
@@ -32,7 +31,7 @@ class AppPath {
   }
 
   String get executableExtension {
-    return Platform.isWindows ? ".exe" : "";
+    return system.isWindows ? '.exe' : '';
   }
 
   String get executableDirPath {
@@ -41,11 +40,11 @@ class AppPath {
   }
 
   String get corePath {
-    return join(executableDirPath, "FlClashCore$executableExtension");
+    return join(executableDirPath, 'FlClashCore$executableExtension');
   }
 
   String get helperPath {
-    return join(executableDirPath, "$appHelperService$executableExtension");
+    return join(executableDirPath, '$appHelperService$executableExtension');
   }
 
   Future<String> get downloadDirPath async {
@@ -60,12 +59,12 @@ class AppPath {
 
   Future<String> get lockFilePath async {
     final directory = await dataDir.future;
-    return join(directory.path, "FlClash.lock");
+    return join(directory.path, 'FlClash.lock');
   }
 
   Future<String> get sharedPreferencesPath async {
     final directory = await dataDir.future;
-    return join(directory.path, "shared_preferences.json");
+    return join(directory.path, 'shared_preferences.json');
   }
 
   Future<String> get profilesPath async {
@@ -73,16 +72,33 @@ 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");
+    return join(directory, '$id.yaml');
   }
 
-  Future<String?> getProvidersPath(String? id) async {
-    if (id == null) return null;
+  Future<String> getProvidersDirPath(String id) async {
     final directory = await profilesPath;
-    return join(directory, "providers", id);
+    return join(
+      directory,
+      'providers',
+      id,
+    );
+  }
+
+  Future<String> getProvidersFilePath(
+    String id,
+    String type,
+    String url,
+  ) async {
+    final directory = await profilesPath;
+    return join(
+      directory,
+      'providers',
+      id,
+      type,
+      url.toMd5(),
+    );
   }
 
   Future<String> get tempPath async {

lib/common/picker.dart

@@ -20,9 +20,9 @@ class Picker {
     final path = await FilePicker.platform.saveFile(
       fileName: fileName,
       initialDirectory: await appPath.downloadDirPath,
-      bytes: Platform.isAndroid ? bytes : null,
+      bytes: system.isAndroid ? bytes : null,
     );
-    if (!Platform.isAndroid && path != null) {
+    if (!system.isAndroid && path != null) {
       final file = await File(path).create(recursive: true);
       await file.writeAsBytes(bytes);
     }

lib/common/preferences.dart

@@ -49,12 +49,12 @@ class Preferences {
         false;
   }
 
-  clearClashConfig() async {
+  Future<void> clearClashConfig() async {
     final preferences = await sharedPreferencesCompleter.future;
     preferences?.remove(clashConfigKey);
   }
 
-  clearPreferences() async {
+  Future<void> clearPreferences() async {
     final sharedPreferencesIns = await sharedPreferencesCompleter.future;
     sharedPreferencesIns?.clear();
   }

lib/common/print.dart

@@ -12,10 +12,10 @@ class CommonPrint {
     return _instance!;
   }
 
-  log(String? text) {
-    final payload = "[FlClash] $text";
+  void log(String? text) {
+    final payload = '[APP] $text';
     debugPrint(payload);
-    if (globalState.isService) {
+    if (!globalState.isInit) {
       return;
     }
     globalState.appController.addLog(

lib/common/render.dart

@@ -16,12 +16,12 @@ class Render {
     return _instance!;
   }
 
-  active() {
+  void active() {
     resume();
     pause();
   }
 
-  pause() {
+  void pause() {
     throttler.call(
       FunctionTag.renderPause,
       _pause,
@@ -29,7 +29,7 @@ class Render {
     );
   }
 
-  resume() {
+  void resume() {
     throttler.cancel(FunctionTag.renderPause);
     _resume();
   }
@@ -41,7 +41,7 @@ class Render {
     _drawFrame = _dispatcher.onDrawFrame;
     _dispatcher.onBeginFrame = null;
     _dispatcher.onDrawFrame = null;
-    commonPrint.log("pause");
+    commonPrint.log('pause');
   }
 
   void _resume() {
@@ -50,7 +50,7 @@ class Render {
     _dispatcher.onBeginFrame = _beginFrame;
     _dispatcher.onDrawFrame = _drawFrame;
     _dispatcher.scheduleFrame();
-    commonPrint.log("resume");
+    commonPrint.log('resume');
   }
 }
 

lib/common/request.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ -18,7 +19,7 @@ class Request {
     _dio = Dio(
       BaseOptions(
         headers: {
-          "User-Agent": browserUa,
+          'User-Agent': browserUa,
         },
       ),
     );
@@ -43,6 +44,16 @@ class Request {
     return response;
   }
 
+  Future<Response> getTextResponseForUrl(String url) async {
+    final response = await _clashDio.get(
+      url,
+      options: Options(
+        responseType: ResponseType.plain,
+      ),
+    );
+    return response;
+  }
+
   Future<MemoryImage?> getImage(String url) async {
     if (url.isEmpty) return null;
     final response = await _dio.get<Uint8List>(
@@ -58,7 +69,7 @@ class Request {
 
   Future<Map<String, dynamic>?> checkForUpdate() async {
     final response = await _dio.get(
-      "https://api.github.com/repos/$repository/releases/latest",
+      'https://api.github.com/repos/$repository/releases/latest',
       options: Options(
         responseType: ResponseType.json,
       ),
@@ -74,50 +85,55 @@ class Request {
   }
 
   final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
-    "https://ipwho.is/": IpInfo.fromIpwhoIsJson,
-    "https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
-    "https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
-    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
+    'https://ipwho.is/': IpInfo.fromIpwhoIsJson,
+    'https://api.ip.sb/geoip/': IpInfo.fromIpSbJson,
+    'https://ipapi.co/json/': IpInfo.fromIpApiCoJson,
+    'https://ipinfo.io/json/': IpInfo.fromIpInfoIoJson,
   };
 
-  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,
-              ),
-            )
-            .timeout(
-              Duration(
-                seconds: 30,
-              ),
-            );
-        if (response.statusCode != 200 || response.data == null) {
-          continue;
-        }
-        if (response.data == null) {
-          continue;
-        }
-        return source.value(response.data!);
-      } catch (e) {
-        commonPrint.log("checkIp error ===> $e");
-        if (e is DioException && e.type == DioExceptionType.cancel) {
-          throw "cancelled";
+  Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
+    var failureCount = 0;
+    final futures = _ipInfoSources.entries.map((source) async {
+      final Completer<Result<IpInfo?>> completer = Completer();
+      handleFailRes() {
+        if (!completer.isCompleted && failureCount == _ipInfoSources.length) {
+          completer.complete(Result.success(null));
         }
       }
-    }
-    return null;
+
+      final future = Dio().get<Map<String, dynamic>>(
+        source.key,
+        cancelToken: cancelToken,
+        options: Options(
+          responseType: ResponseType.json,
+        ),
+      );
+      future.then((res) {
+        if (res.statusCode == HttpStatus.ok && res.data != null) {
+          completer.complete(Result.success(source.value(res.data!)));
+        } else {
+          failureCount++;
+          handleFailRes();
+        }
+      }).catchError((e) {
+        failureCount++;
+        if (e is DioException && e.type == DioExceptionType.cancel) {
+          completer.complete(Result.error('cancelled'));
+        }
+        handleFailRes();
+      });
+      return completer.future;
+    });
+    final res = await Future.any(futures);
+    cancelToken?.cancel();
+    return res;
   }
 
   Future<bool> pingHelper() async {
     try {
       final response = await _dio
           .get(
-            "http://$localhost:$helperPort/ping",
+            'http://$localhost:$helperPort/ping',
             options: Options(
               responseType: ResponseType.plain,
             ),
@@ -140,10 +156,10 @@ class Request {
     try {
       final response = await _dio
           .post(
-            "http://$localhost:$helperPort/start",
+            'http://$localhost:$helperPort/start',
             data: json.encode({
-              "path": appPath.corePath,
-              "arg": arg,
+              'path': appPath.corePath,
+              'arg': arg,
             }),
             options: Options(
               responseType: ResponseType.plain,
@@ -168,7 +184,7 @@ class Request {
     try {
       final response = await _dio
           .post(
-            "http://$localhost:$helperPort/stop",
+            'http://$localhost:$helperPort/stop',
             options: Options(
               responseType: ResponseType.plain,
             ),

lib/common/scroll.dart

@@ -35,7 +35,7 @@ class ShowBarScrollBehavior extends BaseScrollBehavior {
     Widget child,
     ScrollableDetails details,
   ) {
-    return CommonAutoHiddenScrollBar(
+    return CommonScrollBar(
       controller: details.controller,
       child: child,
     );
@@ -88,6 +88,54 @@ class NextClampingScrollPhysics extends ClampingScrollPhysics {
   }
 }
 
+// class CacheScrollPositionController extends ScrollController {
+//   final String key;
+//
+//   CacheScrollPositionController({
+//     required this.key,
+//     double initialScrollOffset = 0.0,
+//     super.keepScrollOffset = true,
+//     super.debugLabel,
+//     super.onAttach,
+//     super.onDetach,
+//   });
+//
+//   @override
+//   ScrollPosition createScrollPosition(
+//     ScrollPhysics physics,
+//     ScrollContext context,
+//     ScrollPosition? oldPosition,
+//   ) {
+//     return ScrollPositionWithSingleContext(
+//       physics: physics,
+//       context: context,
+//       initialPixels:
+//           globalState.scrollPositionCache[key] ?? initialScrollOffset,
+//       keepScrollOffset: keepScrollOffset,
+//       oldPosition: oldPosition,
+//       debugLabel: debugLabel,
+//     );
+//   }
+//
+//   double? get cacheOffset => globalState.scrollPositionCache[key];
+//
+//   _handleScroll() {
+//     globalState.scrollPositionCache[key] = position.pixels;
+//   }
+//
+//   @override
+//   void attach(ScrollPosition position) {
+//     super.attach(position);
+//     addListener(_handleScroll);
+//   }
+//
+//   @override
+//   void detach(ScrollPosition position) {
+//     removeListener(_handleScroll);
+//     super.detach(position);
+//   }
+// }
+
 class ReverseScrollController extends ScrollController {
   ReverseScrollController({
     super.initialScrollOffset,

lib/common/string.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:crypto/crypto.dart';
+
 import 'print.dart';
 
 extension StringExtension on String {
@@ -8,6 +10,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(),
@@ -38,6 +47,10 @@ extension StringExtension on String {
     }
   }
 
+  bool get isSvg {
+    return endsWith('.svg');
+  }
+
   bool get isRegex {
     try {
       RegExp(this);
@@ -48,6 +61,11 @@ extension StringExtension on String {
     }
   }
 
+  String toMd5() {
+    final bytes = utf8.encode(this);
+    return md5.convert(bytes).toString();
+  }
+
 // bool containsToLower(String target) {
 //   return toLowerCase().contains(target);
 // }

lib/common/system.dart

@@ -1,12 +1,15 @@
+import 'dart:ffi';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:ffi/ffi.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/input.dart';
 import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
 class System {
   static System? _instance;
@@ -18,25 +21,32 @@ class System {
     return _instance!;
   }
 
-  bool get isDesktop =>
-      Platform.isWindows || Platform.isMacOS || Platform.isLinux;
+  bool get isDesktop => isWindows || isMacOS || isLinux;
+
+  bool get isWindows => Platform.isWindows;
+
+  bool get isMacOS => Platform.isMacOS;
+
+  bool get isAndroid => Platform.isAndroid;
+
+  bool get isLinux => Platform.isLinux;
 
   Future<int> get version async {
     final deviceInfo = await DeviceInfoPlugin().deviceInfo;
     return switch (Platform.operatingSystem) {
-      "macos" => (deviceInfo as MacOsDeviceInfo).majorVersion,
-      "android" => (deviceInfo as AndroidDeviceInfo).version.sdkInt,
-      "windows" => (deviceInfo as WindowsDeviceInfo).majorVersion,
+      'macos' => (deviceInfo as MacOsDeviceInfo).majorVersion,
+      'android' => (deviceInfo as AndroidDeviceInfo).version.sdkInt,
+      'windows' => (deviceInfo as WindowsDeviceInfo).majorVersion,
       String() => 0
     };
   }
 
   Future<bool> checkIsAdmin() async {
     final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
-    if (Platform.isWindows) {
+    if (system.isWindows) {
       final result = await windows?.checkService();
       return result == WindowsHelperServiceStatus.running;
-    } else if (Platform.isMacOS) {
+    } else if (system.isMacOS) {
       final result = await Process.run('stat', ['-f', '%Su:%Sg %Sp', corePath]);
       final output = result.stdout.trim();
       if (output.startsWith('root:admin') && output.contains('rws')) {
@@ -55,8 +65,8 @@ class System {
   }
 
   Future<AuthorizeCode> authorizeCore() async {
-    if (Platform.isAndroid) {
-      return AuthorizeCode.none;
+    if (system.isAndroid) {
+      return AuthorizeCode.error;
     }
     final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
     final isAdmin = await checkIsAdmin();
@@ -64,7 +74,7 @@ class System {
       return AuthorizeCode.none;
     }
 
-    if (Platform.isWindows) {
+    if (system.isWindows) {
       final result = await windows?.registerService();
       if (result == true) {
         return AuthorizeCode.success;
@@ -72,13 +82,13 @@ class System {
       return AuthorizeCode.error;
     }
 
-    if (Platform.isMacOS) {
+    if (system.isMacOS) {
       final shell = 'chown root:admin $corePath; chmod +sx $corePath';
       final arguments = [
-        "-e",
+        '-e',
         'do shell script "$shell" with administrator privileges',
       ];
-      final result = await Process.run("osascript", arguments);
+      final result = await Process.run('osascript', arguments);
       if (result.exitCode != 0) {
         return AuthorizeCode.error;
       }
@@ -87,12 +97,13 @@ class System {
       final shell = Platform.environment['SHELL'] ?? 'bash';
       final password = await globalState.showCommonDialog<String>(
         child: InputDialog(
+          obscureText: true,
           title: appLocalizations.pleaseInputAdminPassword,
           value: '',
         ),
       );
       final arguments = [
-        "-c",
+        '-c',
         'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"'
       ];
       final result = await Process.run(shell, arguments);
@@ -104,13 +115,13 @@ class System {
     return AuthorizeCode.error;
   }
 
-  back() async {
+  Future<void> back() async {
     await app?.moveTaskToBack();
     await window?.hide();
   }
 
-  exit() async {
-    if (Platform.isAndroid) {
+  Future<void> exit() async {
+    if (system.isAndroid) {
       await SystemNavigator.pop();
     }
     await window?.close();
@@ -118,3 +129,287 @@ class System {
 }
 
 final system = System();
+
+class Windows {
+  static Windows? _instance;
+  late DynamicLibrary _shell32;
+
+  Windows._internal() {
+    _shell32 = DynamicLibrary.open('shell32.dll');
+  }
+
+  factory Windows() {
+    _instance ??= Windows._internal();
+    return _instance!;
+  }
+
+  bool runas(String command, String arguments) {
+    final commandPtr = command.toNativeUtf16();
+    final argumentsPtr = arguments.toNativeUtf16();
+    final operationPtr = 'runas'.toNativeUtf16();
+
+    final shellExecute = _shell32.lookupFunction<
+        Int32 Function(
+            Pointer<Utf16> hwnd,
+            Pointer<Utf16> lpOperation,
+            Pointer<Utf16> lpFile,
+            Pointer<Utf16> lpParameters,
+            Pointer<Utf16> lpDirectory,
+            Int32 nShowCmd),
+        int Function(
+            Pointer<Utf16> hwnd,
+            Pointer<Utf16> lpOperation,
+            Pointer<Utf16> lpFile,
+            Pointer<Utf16> lpParameters,
+            Pointer<Utf16> lpDirectory,
+            int nShowCmd)>('ShellExecuteW');
+
+    final result = shellExecute(
+      nullptr,
+      operationPtr,
+      commandPtr,
+      argumentsPtr,
+      nullptr,
+      1,
+    );
+
+    calloc.free(commandPtr);
+    calloc.free(argumentsPtr);
+    calloc.free(operationPtr);
+
+    commonPrint.log('windows runas: $command $arguments resultCode:$result');
+
+    if (result < 42) {
+      return false;
+    }
+    return true;
+  }
+
+  Future<void> _killProcess(int port) async {
+    final result = await Process.run('netstat', ['-ano']);
+    final lines = result.stdout.toString().trim().split('\n');
+    for (final line in lines) {
+      if (!line.contains(':$port') || !line.contains('LISTENING')) {
+        continue;
+      }
+      final parts = line.trim().split(RegExp(r'\s+'));
+      final pid = int.tryParse(parts.last);
+      if (pid != null) {
+        await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
+      }
+    }
+  }
+
+  Future<WindowsHelperServiceStatus> checkService() async {
+    // final qcResult = await Process.run('sc', ['qc', appHelperService]);
+    // final qcOutput = qcResult.stdout.toString();
+    // if (qcResult.exitCode != 0 || !qcOutput.contains(appPath.helperPath)) {
+    //   return WindowsHelperServiceStatus.none;
+    // }
+    final result = await Process.run('sc', ['query', appHelperService]);
+    if (result.exitCode != 0) {
+      return WindowsHelperServiceStatus.none;
+    }
+    final output = result.stdout.toString();
+    if (output.contains('RUNNING') && await request.pingHelper()) {
+      return WindowsHelperServiceStatus.running;
+    }
+    return WindowsHelperServiceStatus.presence;
+  }
+
+  Future<bool> registerService() async {
+    final status = await checkService();
+
+    if (status == WindowsHelperServiceStatus.running) {
+      return true;
+    }
+
+    await _killProcess(helperPort);
+
+    final command = [
+      '/c',
+      if (status == WindowsHelperServiceStatus.presence) ...[
+        'sc',
+        'delete',
+        appHelperService,
+        '/force',
+        '&&',
+      ],
+      'sc',
+      'create',
+      appHelperService,
+      'binPath= "${appPath.helperPath}"',
+      'start= auto',
+      '&&',
+      'sc',
+      'start',
+      appHelperService,
+    ].join(' ');
+
+    final res = runas('cmd.exe', command);
+
+    await Future.delayed(
+      Duration(milliseconds: 300),
+    );
+
+    return res;
+  }
+
+  Future<bool> registerTask(String appName) async {
+    final taskXml = '''
+<?xml version="1.0" encoding="UTF-16"?>
+<Task version="1.3" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
+  <Principals>
+    <Principal id="Author">
+      <LogonType>InteractiveToken</LogonType>
+      <RunLevel>HighestAvailable</RunLevel>
+    </Principal>
+  </Principals>
+  <Triggers>
+    <LogonTrigger/>
+  </Triggers>
+  <Settings>
+    <MultipleInstancesPolicy>Parallel</MultipleInstancesPolicy>
+    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
+    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
+    <AllowHardTerminate>false</AllowHardTerminate>
+    <StartWhenAvailable>false</StartWhenAvailable>
+    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
+    <IdleSettings>
+      <StopOnIdleEnd>false</StopOnIdleEnd>
+      <RestartOnIdle>false</RestartOnIdle>
+    </IdleSettings>
+    <AllowStartOnDemand>true</AllowStartOnDemand>
+    <Enabled>true</Enabled>
+    <Hidden>false</Hidden>
+    <RunOnlyIfIdle>false</RunOnlyIfIdle>
+    <WakeToRun>false</WakeToRun>
+    <ExecutionTimeLimit>PT72H</ExecutionTimeLimit>
+    <Priority>7</Priority>
+  </Settings>
+  <Actions Context="Author">
+    <Exec>
+      <Command>"${Platform.resolvedExecutable}"</Command>
+    </Exec>
+  </Actions>
+</Task>''';
+    final taskPath = join(await appPath.tempPath, 'task.xml');
+    await File(taskPath).create(recursive: true);
+    await File(taskPath)
+        .writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
+    final commandLine = [
+      '/Create',
+      '/TN',
+      appName,
+      '/XML',
+      '%s',
+      '/F',
+    ].join(' ');
+    return runas(
+      'schtasks',
+      commandLine.replaceFirst('%s', taskPath),
+    );
+  }
+}
+
+final windows = system.isWindows ? Windows() : null;
+
+class MacOS {
+  static MacOS? _instance;
+
+  List<String>? originDns;
+
+  MacOS._internal();
+
+  factory MacOS() {
+    _instance ??= MacOS._internal();
+    return _instance!;
+  }
+
+  Future<String?> get defaultServiceName async {
+    final result = await Process.run('route', ['-n', 'get', 'default']);
+    final output = result.stdout.toString();
+    final deviceLine = output
+        .split('\n')
+        .firstWhere((s) => s.contains('interface:'), orElse: () => '');
+    final lineSplits = deviceLine.trim().split(' ');
+    if (lineSplits.length != 2) {
+      return null;
+    }
+    final device = lineSplits[1];
+    final serviceResult = await Process.run(
+      'networksetup',
+      ['-listnetworkserviceorder'],
+    );
+    final serviceResultOutput = serviceResult.stdout.toString();
+    final currentService = serviceResultOutput.split('\n\n').firstWhere(
+          (s) => s.contains('Device: $device'),
+          orElse: () => '',
+        );
+    if (currentService.isEmpty) {
+      return null;
+    }
+    final currentServiceNameLine = currentService.split('\n').firstWhere(
+        (line) => RegExp(r'^\(\d+\).*').hasMatch(line),
+        orElse: () => '');
+    final currentServiceNameLineSplits =
+        currentServiceNameLine.trim().split(' ');
+    if (currentServiceNameLineSplits.length < 2) {
+      return null;
+    }
+    return currentServiceNameLineSplits[1];
+  }
+
+  Future<List<String>?> get systemDns async {
+    final deviceServiceName = await defaultServiceName;
+    if (deviceServiceName == null) {
+      return null;
+    }
+    final result = await Process.run(
+      'networksetup',
+      ['-getdnsservers', deviceServiceName],
+    );
+    final output = result.stdout.toString().trim();
+    if (output.startsWith("There aren't any DNS Servers set on")) {
+      originDns = [];
+    } else {
+      originDns = output.split('\n');
+    }
+    return originDns;
+  }
+
+  Future<void> updateDns(bool restore) async {
+    final serviceName = await defaultServiceName;
+    if (serviceName == null) {
+      return;
+    }
+    List<String>? nextDns;
+    if (restore) {
+      nextDns = originDns;
+    } else {
+      final originDns = await systemDns;
+      if (originDns == null) {
+        return;
+      }
+      final needAddDns = '223.5.5.5';
+      if (originDns.contains(needAddDns)) {
+        return;
+      }
+      nextDns = List.from(originDns)..add(needAddDns);
+    }
+    if (nextDns == null) {
+      return;
+    }
+    await Process.run(
+      'networksetup',
+      [
+        '-setdnsservers',
+        serviceName,
+        if (nextDns.isNotEmpty) ...nextDns,
+        if (nextDns.isEmpty) 'Empty',
+      ],
+    );
+  }
+}
+
+final macOS = system.isMacOS ? MacOS() : null;

lib/common/theme.dart

@@ -13,7 +13,7 @@ class CommonTheme {
 
   Color get darkenSecondaryContainer {
     return _colorMap.updateCacheValue(
-      "darkenSecondaryContainer",
+      'darkenSecondaryContainer',
       () => context.colorScheme.secondaryContainer
           .blendDarken(context, factor: 0.1),
     );
@@ -21,7 +21,7 @@ class CommonTheme {
 
   Color get darkenSecondaryContainerLighter {
     return _colorMap.updateCacheValue(
-      "darkenSecondaryContainerLighter",
+      'darkenSecondaryContainerLighter',
       () => context.colorScheme.secondaryContainer
           .blendDarken(context, factor: 0.1)
           .opacity60,
@@ -30,7 +30,7 @@ class CommonTheme {
 
   Color get darken2SecondaryContainer {
     return _colorMap.updateCacheValue(
-      "darken2SecondaryContainer",
+      'darken2SecondaryContainer',
       () => context.colorScheme.secondaryContainer
           .blendDarken(context, factor: 0.2),
     );
@@ -38,7 +38,7 @@ class CommonTheme {
 
   Color get darken3PrimaryContainer {
     return _colorMap.updateCacheValue(
-      "darken3PrimaryContainer",
+      'darken3PrimaryContainer',
       () => context.colorScheme.primaryContainer
           .blendDarken(context, factor: 0.3),
     );

lib/common/tray.dart

@@ -11,6 +11,7 @@ import 'package:tray_manager/tray_manager.dart';
 
 import 'app_localizations.dart';
 import 'constant.dart';
+import 'system.dart';
 import 'window.dart';
 
 class Tray {
@@ -18,7 +19,7 @@ class Tray {
     required Brightness? brightness,
     bool force = false,
   }) async {
-    if (Platform.isAndroid) {
+    if (system.isAndroid) {
       return;
     }
     if (Platform.isLinux || force) {
@@ -38,11 +39,11 @@ class Tray {
     }
   }
 
-  update({
+  Future<void> update({
     required TrayState trayState,
     bool focus = false,
   }) async {
-    if (Platform.isAndroid) {
+    if (system.isAndroid) {
       return;
     }
     if (!Platform.isLinux) {
@@ -80,7 +81,7 @@ class Tray {
       );
     }
     menuItems.add(MenuItem.separator());
-    if (Platform.isMacOS) {
+    if (system.isMacOS) {
       for (final group in trayState.groups) {
         List<MenuItem> subMenuItems = [];
         for (final proxy in group.all) {
@@ -169,8 +170,8 @@ class Tray {
     }
   }
 
-  updateTrayTitle([Traffic? traffic]) async {
-    // if (!Platform.isMacOS) {
+  Future<void> updateTrayTitle([Traffic? traffic]) async {
+    // if (!system.isMacOS) {
     //   return;
     // }
     // if (traffic == null) {
@@ -183,11 +184,10 @@ class Tray {
   }
 
   Future<void> _copyEnv(int port) async {
-    final url = "http://127.0.0.1:$port";
+    final url = 'http://127.0.0.1:$port';
 
-    final cmdline = Platform.isWindows
-        ? "set \$env:all_proxy=$url"
-        : "export all_proxy=$url";
+    final cmdline =
+        system.isWindows ? 'set \$env:all_proxy=$url' : 'export all_proxy=$url';
 
     await Clipboard.setData(
       ClipboardData(

lib/common/utils.dart

@@ -1,9 +1,11 @@
+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';
@@ -21,11 +23,11 @@ class Utils {
     final random = Random();
     final randomStr =
         String.fromCharCodes(List.generate(8, (_) => random.nextInt(26) + 97));
-    return "$timestamp$randomStr";
+    return '$timestamp$randomStr';
   }
 
   String getDateStringLast2(int value) {
-    var valueRaw = "0$value";
+    var valueRaw = '0$value';
     return valueRaw.substring(
       valueRaw.length - 2,
     );
@@ -71,7 +73,7 @@ class Utils {
     var inMinutes = difference.inMinutes;
     var inSeconds = difference.inSeconds;
 
-    return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
+    return '${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}';
   }
 
   String getTimeText(int? timeStamp) {
@@ -81,17 +83,17 @@ class Utils {
     final diff = timeStamp / 1000;
     final inHours = (diff / 3600).floor();
     if (inHours > 99) {
-      return "99:59:59";
+      return '99:59:59';
     }
     final inMinutes = (diff / 60 % 60).floor();
     final inSeconds = (diff % 60).floor();
 
-    return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
+    return '${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}';
   }
 
   Locale? getLocaleForString(String? localString) {
     if (localString == null) return null;
-    var localSplit = localString.split("_");
+    var localSplit = localString.split('_');
     if (localSplit.length == 1) {
       return Locale(localSplit[0]);
     }
@@ -135,18 +137,18 @@ class Utils {
       final number = int.parse(match[1] ?? '0') + 1;
       return label.replaceFirst(reg, '($number)', label.length - 3 - 1);
     } else {
-      return "$label(1)";
+      return '$label(1)';
     }
   }
 
   String getTrayIconPath({
     required Brightness brightness,
   }) {
-    if (Platform.isMacOS) {
-      return "assets/images/icon_white.png";
+    if (system.isMacOS) {
+      return 'assets/images/icon_white.png';
     }
-    final suffix = Platform.isWindows ? "ico" : "png";
-    return "assets/images/icon.$suffix";
+    final suffix = system.isWindows ? 'ico' : 'png';
+    return 'assets/images/icon.$suffix';
     // return switch (brightness) {
     //   Brightness.dark => "assets/images/icon_white.$suffix",
     //   Brightness.light => "assets/images/icon_black.$suffix",
@@ -179,7 +181,7 @@ class Utils {
   String getPinyin(String value) {
     return value.isNotEmpty
         ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
-        : "";
+        : '';
   }
 
   String? getFileNameForDisposition(String? disposition) {
@@ -187,7 +189,7 @@ class Utils {
     final parseValue = HeaderValue.parse(disposition);
     final parameters = parseValue.parameters;
     final fileNamePointKey = parameters.keys
-        .firstWhere((key) => key == "filename*", orElse: () => "");
+        .firstWhere((key) => key == 'filename*', orElse: () => '');
     if (fileNamePointKey.isNotEmpty) {
       final res = parameters[fileNamePointKey]?.split("''") ?? [];
       if (res.length >= 2) {
@@ -195,7 +197,7 @@ class Utils {
       }
     }
     final fileNameKey = parameters.keys
-        .firstWhere((key) => key == "filename", orElse: () => "");
+        .firstWhere((key) => key == 'filename', orElse: () => '');
     if (fileNameKey.isEmpty) return null;
     return parameters[fileNameKey];
   }
@@ -248,7 +250,7 @@ class Utils {
     900,
   ];
 
-  _createPrimarySwatch(Color color) {
+  MaterialColor _createPrimarySwatch(Color color) {
     final Map<int, Color> swatch = <int, Color>{};
     final int a = color.alpha8bit;
     final int r = color.red8bit;
@@ -292,11 +294,11 @@ class Utils {
   }
 
   String getBackupFileName() {
-    return "${appName}_backup_${DateTime.now().show}.zip";
+    return '${appName}_backup_${DateTime.now().show}.zip';
   }
 
   String get logFile {
-    return "${appName}_${DateTime.now().show}.log";
+    return '${appName}_${DateTime.now().show}.log';
   }
 
   Future<String?> getLocalIpAddress() async {
@@ -322,17 +324,74 @@ class Utils {
       });
       return addresses.first.address;
     }
-    return "";
+    return '';
   }
 
   SingleActivator controlSingleActivator(LogicalKeyboardKey trigger) {
-    final control = Platform.isMacOS ? false : true;
+    final control = system.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 utils = Utils();

lib/common/window.dart

@@ -3,30 +3,34 @@ import 'dart:io';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_acrylic/flutter_acrylic.dart' as acrylic;
 import 'package:screen_retriever/screen_retriever.dart';
 import 'package:window_manager/window_manager.dart';
 
 class Window {
-  init(int version) async {
+  Future<void> init(int version) async {
     final props = globalState.config.windowProps;
     final acquire = await singleInstanceLock.acquire();
     if (!acquire) {
       exit(0);
     }
-    if (Platform.isWindows) {
-      protocol.register("clash");
-      protocol.register("clashmeta");
-      protocol.register("flclash");
+    if (system.isWindows) {
+      protocol.register('clash');
+      protocol.register('clashmeta');
+      protocol.register('flclash');
+    }
+    if ((version > 10 && system.isMacOS)) {
+      await acrylic.Window.initialize();
     }
     await windowManager.ensureInitialized();
     WindowOptions windowOptions = WindowOptions(
       size: Size(props.width, props.height),
       minimumSize: const Size(380, 400),
     );
-    if (!Platform.isMacOS || version > 10) {
+    if (!system.isMacOS || version > 10) {
       await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
     }
-    if (!Platform.isMacOS) {
+    if (!system.isMacOS) {
       final left = props.left ?? 0;
       final top = props.top ?? 0;
       final right = left + props.width;
@@ -62,7 +66,14 @@ class Window {
     });
   }
 
-  show() async {
+  void updateMacOSBrightness(Brightness brightness) {
+    if (!system.isMacOS) {
+      return;
+    }
+    acrylic.Window.overrideMacOSBrightness(dark: brightness == Brightness.dark);
+  }
+
+  Future<void> show() async {
     render?.resume();
     await windowManager.show();
     await windowManager.focus();
@@ -71,15 +82,15 @@ class Window {
 
   Future<bool> get isVisible async {
     final value = await windowManager.isVisible();
-    commonPrint.log("window visible check: $value");
+    commonPrint.log('window visible check: $value');
     return value;
   }
 
-  close() async {
+  Future<void> close() async {
     exit(0);
   }
 
-  hide() async {
+  Future<void> hide() async {
     render?.pause();
     await windowManager.hide();
     await windowManager.setSkipTaskbar(true);

lib/common/windows.dart

@@ -1,191 +0,0 @@
-import 'dart:ffi';
-import 'dart:io';
-
-import 'package:ffi/ffi.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:path/path.dart';
-
-class Windows {
-  static Windows? _instance;
-  late DynamicLibrary _shell32;
-
-  Windows._internal() {
-    _shell32 = DynamicLibrary.open('shell32.dll');
-  }
-
-  factory Windows() {
-    _instance ??= Windows._internal();
-    return _instance!;
-  }
-
-  bool runas(String command, String arguments) {
-    final commandPtr = command.toNativeUtf16();
-    final argumentsPtr = arguments.toNativeUtf16();
-    final operationPtr = 'runas'.toNativeUtf16();
-
-    final shellExecute = _shell32.lookupFunction<
-        Int32 Function(
-            Pointer<Utf16> hwnd,
-            Pointer<Utf16> lpOperation,
-            Pointer<Utf16> lpFile,
-            Pointer<Utf16> lpParameters,
-            Pointer<Utf16> lpDirectory,
-            Int32 nShowCmd),
-        int Function(
-            Pointer<Utf16> hwnd,
-            Pointer<Utf16> lpOperation,
-            Pointer<Utf16> lpFile,
-            Pointer<Utf16> lpParameters,
-            Pointer<Utf16> lpDirectory,
-            int nShowCmd)>('ShellExecuteW');
-
-    final result = shellExecute(
-      nullptr,
-      operationPtr,
-      commandPtr,
-      argumentsPtr,
-      nullptr,
-      1,
-    );
-
-    calloc.free(commandPtr);
-    calloc.free(argumentsPtr);
-    calloc.free(operationPtr);
-
-    commonPrint.log("windows runas: $command $arguments resultCode:$result");
-
-    if (result < 42) {
-      return false;
-    }
-    return true;
-  }
-
-  _killProcess(int port) async {
-    final result = await Process.run('netstat', ['-ano']);
-    final lines = result.stdout.toString().trim().split('\n');
-    for (final line in lines) {
-      if (!line.contains(":$port") || !line.contains("LISTENING")) {
-        continue;
-      }
-      final parts = line.trim().split(RegExp(r'\s+'));
-      final pid = int.tryParse(parts.last);
-      if (pid != null) {
-        await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
-      }
-    }
-  }
-
-  Future<WindowsHelperServiceStatus> checkService() async {
-    // final qcResult = await Process.run('sc', ['qc', appHelperService]);
-    // final qcOutput = qcResult.stdout.toString();
-    // if (qcResult.exitCode != 0 || !qcOutput.contains(appPath.helperPath)) {
-    //   return WindowsHelperServiceStatus.none;
-    // }
-    final result = await Process.run('sc', ['query', appHelperService]);
-    if(result.exitCode != 0){
-      return WindowsHelperServiceStatus.none;
-    }
-    final output = result.stdout.toString();
-    if (output.contains("RUNNING") && await request.pingHelper()) {
-      return WindowsHelperServiceStatus.running;
-    }
-    return WindowsHelperServiceStatus.presence;
-  }
-
-  Future<bool> registerService() async {
-    final status = await checkService();
-
-    if (status == WindowsHelperServiceStatus.running) {
-      return true;
-    }
-
-    await _killProcess(helperPort);
-
-    final command = [
-      "/c",
-      if (status == WindowsHelperServiceStatus.presence) ...[
-        "sc",
-        "delete",
-        appHelperService,
-        "/force",
-        "&&",
-      ],
-      "sc",
-      "create",
-      appHelperService,
-      'binPath= "${appPath.helperPath}"',
-      'start= auto',
-      "&&",
-      "sc",
-      "start",
-      appHelperService,
-    ].join(" ");
-
-    final res = runas("cmd.exe", command);
-
-    await Future.delayed(
-      Duration(milliseconds: 300),
-    );
-
-    return res;
-  }
-
-  Future<bool> registerTask(String appName) async {
-    final taskXml = '''
-<?xml version="1.0" encoding="UTF-16"?>
-<Task version="1.3" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
-  <Principals>
-    <Principal id="Author">
-      <LogonType>InteractiveToken</LogonType>
-      <RunLevel>HighestAvailable</RunLevel>
-    </Principal>
-  </Principals>
-  <Triggers>
-    <LogonTrigger/>
-  </Triggers>
-  <Settings>
-    <MultipleInstancesPolicy>Parallel</MultipleInstancesPolicy>
-    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
-    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
-    <AllowHardTerminate>false</AllowHardTerminate>
-    <StartWhenAvailable>false</StartWhenAvailable>
-    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
-    <IdleSettings>
-      <StopOnIdleEnd>false</StopOnIdleEnd>
-      <RestartOnIdle>false</RestartOnIdle>
-    </IdleSettings>
-    <AllowStartOnDemand>true</AllowStartOnDemand>
-    <Enabled>true</Enabled>
-    <Hidden>false</Hidden>
-    <RunOnlyIfIdle>false</RunOnlyIfIdle>
-    <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT72H</ExecutionTimeLimit>
-    <Priority>7</Priority>
-  </Settings>
-  <Actions Context="Author">
-    <Exec>
-      <Command>"${Platform.resolvedExecutable}"</Command>
-    </Exec>
-  </Actions>
-</Task>''';
-    final taskPath = join(await appPath.tempPath, "task.xml");
-    await File(taskPath).create(recursive: true);
-    await File(taskPath)
-        .writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
-    final commandLine = [
-      '/Create',
-      '/TN',
-      appName,
-      '/XML',
-      "%s",
-      '/F',
-    ].join(" ");
-    return runas(
-      'schtasks',
-      commandLine.replaceFirst("%s", taskPath),
-    );
-  }
-}
-
-final windows = Platform.isWindows ? Windows() : null;

lib/controller.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
-import 'dart:typed_data';
 
 import 'package:archive/archive.dart';
 import 'package:fl_clash/clash/clash.dart';
@@ -12,17 +11,18 @@ 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/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path/path.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'common/common.dart';
-import 'fragments/profiles/override_profile.dart';
 import 'models/models.dart';
+import 'views/profiles/override_profile.dart';
 
 class AppController {
-  bool lastTunEnable = false;
   int? lastProfileModified;
 
   final BuildContext context;
@@ -30,24 +30,29 @@ class AppController {
 
   AppController(this.context, WidgetRef ref) : _ref = ref;
 
-  updateClashConfigDebounce() {
-    debouncer.call(FunctionTag.updateClashConfig, () async {
-      final isPatch = globalState.appState.needApply ? false : true;
-      await updateClashConfig(isPatch);
+  void setupClashConfigDebounce() {
+    debouncer.call(FunctionTag.setupClashConfig, () async {
+      await setupClashConfig();
     });
   }
 
-  updateGroupsDebounce() {
+  Future<void> updateClashConfigDebounce() async {
+    debouncer.call(FunctionTag.updateClashConfig, () async {
+      await updateClashConfig();
+    });
+  }
+
+  void updateGroupsDebounce() {
     debouncer.call(FunctionTag.updateGroups, updateGroups);
   }
 
-  addCheckIpNumDebounce() {
+  void addCheckIpNumDebounce() {
     debouncer.call(FunctionTag.addCheckIpNum, () {
       _ref.read(checkIpNumProvider.notifier).add();
     });
   }
 
-  applyProfileDebounce({
+  void applyProfileDebounce({
     bool silence = false,
   }) {
     debouncer.call(FunctionTag.applyProfile, (silence) {
@@ -55,11 +60,11 @@ class AppController {
     }, args: [silence]);
   }
 
-  savePreferencesDebounce() {
+  void savePreferencesDebounce() {
     debouncer.call(FunctionTag.savePreferences, savePreferences);
   }
 
-  changeProxyDebounce(String groupName, String proxyName) {
+  void changeProxyDebounce(String groupName, String proxyName) {
     debouncer.call(FunctionTag.changeProxy,
         (String groupName, String proxyName) async {
       await changeProxy(
@@ -70,16 +75,16 @@ class AppController {
     }, args: [groupName, proxyName]);
   }
 
-  restartCore() async {
+  Future<void> restartCore() async {
+    commonPrint.log('restart core');
     await clashService?.reStart();
     await _initCore();
-
     if (_ref.read(runTimeProvider.notifier).isStart) {
       await globalState.handleStart();
     }
   }
 
-  updateStatus(bool isStart) async {
+  Future<void> updateStatus(bool isStart) async {
     if (isStart) {
       await globalState.handleStart([
         updateRunTime,
@@ -98,7 +103,7 @@ class AppController {
       applyProfileDebounce();
     } else {
       await globalState.handleStop();
-      await clashCore.resetTraffic();
+      clashCore.resetTraffic();
       _ref.read(trafficsProvider.notifier).clear();
       _ref.read(totalTrafficProvider.notifier).value = Traffic();
       _ref.read(runTimeProvider.notifier).value = null;
@@ -106,7 +111,7 @@ class AppController {
     }
   }
 
-  updateRunTime() {
+  void updateRunTime() {
     final startTime = globalState.startTime;
     if (startTime != null) {
       final startTimeStamp = startTime.millisecondsSinceEpoch;
@@ -117,20 +122,20 @@ class AppController {
     }
   }
 
-  updateTraffic() async {
+  Future<void> updateTraffic() async {
     final traffic = await clashCore.getTraffic();
     _ref.read(trafficsProvider.notifier).addTraffic(traffic);
     _ref.read(totalTrafficProvider.notifier).value =
         await clashCore.getTotalTraffic();
   }
 
-  addProfile(Profile profile) async {
+  Future<void> addProfile(Profile profile) async {
     _ref.read(profilesProvider.notifier).setProfile(profile);
     if (_ref.read(currentProfileIdProvider) != null) return;
     _ref.read(currentProfileIdProvider.notifier).value = profile.id;
   }
 
-  deleteProfile(String id) async {
+  Future<void> deleteProfile(String id) async {
     _ref.read(profilesProvider.notifier).deleteProfileById(id);
     clearEffect(id);
     if (globalState.config.currentProfileId == id) {
@@ -146,12 +151,12 @@ class AppController {
     }
   }
 
-  updateProviders() async {
+  Future<void> updateProviders() async {
     _ref.read(providersProvider.notifier).value =
         await clashCore.getExternalProviders();
   }
 
-  updateLocalIp() async {
+  Future<void> updateLocalIp() async {
     _ref.read(localIpProvider.notifier).value = null;
     await Future.delayed(commonDuration);
     _ref.read(localIpProvider.notifier).value = await utils.getLocalIpAddress();
@@ -167,26 +172,26 @@ class AppController {
     }
   }
 
-  setProfile(Profile profile) {
+  void setProfile(Profile profile) {
     _ref.read(profilesProvider.notifier).setProfile(profile);
   }
 
-  setProfileAndAutoApply(Profile profile) {
+  void setProfileAndAutoApply(Profile profile) {
     _ref.read(profilesProvider.notifier).setProfile(profile);
     if (profile.id == _ref.read(currentProfileIdProvider)) {
       applyProfileDebounce(silence: true);
     }
   }
 
-  setProfiles(List<Profile> profiles) {
+  void setProfiles(List<Profile> profiles) {
     _ref.read(profilesProvider.notifier).value = profiles;
   }
 
-  addLog(Log log) {
+  void addLog(Log log) {
     _ref.read(logsProvider).add(log);
   }
 
-  updateOrAddHotKeyAction(HotKeyAction hotKeyAction) {
+  void updateOrAddHotKeyAction(HotKeyAction hotKeyAction) {
     final hotKeyActions = _ref.read(hotKeyActionsProvider);
     final index =
         hotKeyActions.indexWhere((item) => item.action == hotKeyAction.action);
@@ -215,26 +220,26 @@ class AppController {
     return _ref.read(getProxiesColumnsProvider);
   }
 
-  addSortNum() {
+  dynamic addSortNum() {
     return _ref.read(sortNumProvider.notifier).add();
   }
 
-  getCurrentGroupName() {
+  String? getCurrentGroupName() {
     final currentGroupName = _ref.read(currentProfileProvider.select(
       (state) => state?.currentGroupName,
     ));
     return currentGroupName;
   }
 
-  ProxyCardState getProxyCardState(proxyName) {
+  ProxyCardState getProxyCardState(String proxyName) {
     return _ref.read(getProxyCardStateProvider(proxyName));
   }
 
-  getSelectedProxyName(groupName) {
+  String? getSelectedProxyName(String groupName) {
     return _ref.read(getSelectedProxyNameProvider(groupName));
   }
 
-  updateCurrentGroupName(String groupName) {
+  void updateCurrentGroupName(String groupName) {
     final profile = _ref.read(currentProfileProvider);
     if (profile == null || profile.currentGroupName == groupName) {
       return;
@@ -244,55 +249,87 @@ class AppController {
     );
   }
 
-  Future<void> updateClashConfig([bool? isPatch]) async {
-    commonPrint.log("update clash patch: ${isPatch ?? false}");
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted != true) return;
-    await commonScaffoldState?.loadingRun(() async {
-      await _updateClashConfig(
-        isPatch,
-      );
-    });
+  Future<void> updateClashConfig() async {
+    await safeRun(
+      () async {
+        await _updateClashConfig();
+      },
+      needLoading: true,
+    );
   }
 
-  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) {
+  Future<void> _updateClashConfig() async {
+    final updateParams = _ref.read(updateParamsProvider);
+    final res = await _requestAdmin(updateParams.tun.enable);
+    if (res.isError) {
+      return;
+    }
+    final realTunEnable = _ref.read(realTunEnableProvider);
+    final message = await clashCore.updateConfig(
+      updateParams.copyWith.tun(
+        enable: realTunEnable,
+      ),
+    );
+    if (message.isNotEmpty) throw message;
+  }
+
+  Future<Result<bool>> _requestAdmin(bool enableTun) async {
+    if(system.isWindows && kDebugMode){
+      return Result.success(false);
+    }
+    final realTunEnable = _ref.read(realTunEnableProvider);
+    if (enableTun != realTunEnable && realTunEnable == false) {
       final code = await system.authorizeCore();
       switch (code) {
+        case AuthorizeCode.success:
+          await restartCore();
+          return Result.error('');
         case AuthorizeCode.none:
           break;
-        case AuthorizeCode.success:
-          lastTunEnable = enableTun;
-          await restartCore();
-          return;
         case AuthorizeCode.error:
           enableTun = false;
+          break;
       }
     }
-    if (appSetting.openLogs) {
-      clashCore.startLog();
-    } else {
-      clashCore.stopLog();
-    }
-    final res = await clashCore.updateConfig(
-      globalState.getUpdateConfigParams(isPatch),
+    _ref.read(realTunEnableProvider.notifier).value = enableTun;
+    return Result.success(enableTun);
+  }
+
+  Future<void> setupClashConfig() async {
+    await safeRun(
+      () async {
+        await _setupClashConfig();
+      },
+      needLoading: true,
     );
-    if (isPatch == false) {
-      _ref.read(needApplyProvider.notifier).value = false;
+  }
+
+  Future<void> _setupClashConfig() async {
+    await _ref.read(currentProfileProvider)?.checkAndUpdate();
+    final patchConfig = _ref.read(patchClashConfigProvider);
+    final res = await _requestAdmin(patchConfig.tun.enable);
+    if (res.isError) {
+      return;
+    }
+    final realTunEnable = _ref.read(realTunEnableProvider);
+    final realPatchConfig = patchConfig.copyWith.tun(enable: realTunEnable);
+    final params = await globalState.getSetupParams(
+      pathConfig: realPatchConfig,
+    );
+    final message = await clashCore.setupConfig(params);
+    lastProfileModified = await _ref.read(
+      currentProfileProvider.select(
+        (state) => state?.profileLastModified,
+      ),
+    );
+    if (message.isNotEmpty) {
+      throw message;
     }
-    if (res.isNotEmpty) throw res;
-    lastTunEnable = enableTun;
-    lastProfileModified = await profile?.profileLastModified;
   }
 
   Future _applyProfile() async {
     await clashCore.requestGc();
-    await updateClashConfig();
+    await setupClashConfig();
     await updateGroups();
     await updateProviders();
   }
@@ -301,29 +338,32 @@ class AppController {
     if (silence) {
       await _applyProfile();
     } else {
-      final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-      if (commonScaffoldState?.mounted != true) return;
-      await commonScaffoldState?.loadingRun(() async {
-        await _applyProfile();
-      });
+      await safeRun(
+        () async {
+          await _applyProfile();
+        },
+        needLoading: true,
+      );
     }
     addCheckIpNumDebounce();
   }
 
-  handleChangeProfile() {
+  void 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 = {};
+    globalState.computeHeightMapCache = {};
   }
 
-  updateBrightness(Brightness brightness) {
-    _ref.read(appBrightnessProvider.notifier).value = brightness;
+  void updateBrightness() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _ref.read(systemBrightnessProvider.notifier).value =
+          WidgetsBinding.instance.platformDispatcher.platformBrightness;
+    });
   }
 
-  autoUpdateProfiles() async {
+  Future<void> autoUpdateProfiles() async {
     for (final profile in _ref.read(profilesProvider)) {
       if (!profile.autoUpdate) continue;
       final isNotNeedUpdate = profile.lastUpdateDate
@@ -355,7 +395,7 @@ class AppController {
     }
   }
 
-  updateProfiles() async {
+  Future<void> updateProfiles() async {
     for (final profile in _ref.read(profilesProvider)) {
       if (profile.type == ProfileType.file) {
         continue;
@@ -364,12 +404,12 @@ class AppController {
     }
   }
 
-  savePreferences() async {
-    commonPrint.log("save preferences");
+  Future<void> savePreferences() async {
+    commonPrint.log('save preferences');
     await preferences.saveConfig(globalState.config);
   }
 
-  changeProxy({
+  Future<void> changeProxy({
     required String groupName,
     required String proxyName,
   }) async {
@@ -385,13 +425,13 @@ class AppController {
     addCheckIpNumDebounce();
   }
 
-  handleBackOrExit() async {
+  Future<void> handleBackOrExit() async {
     if (_ref.read(backBlockProvider)) {
       return;
     }
     if (_ref.read(appSettingProvider).minimizeOnExit) {
       if (system.isDesktop) {
-        await savePreferencesDebounce();
+        await savePreferences();
       }
       await system.back();
     } else {
@@ -399,21 +439,24 @@ class AppController {
     }
   }
 
-  backBlock() {
+  void backBlock() {
     _ref.read(backBlockProvider.notifier).value = true;
   }
 
-  unBackBlock() {
+  void unBackBlock() {
     _ref.read(backBlockProvider.notifier).value = false;
   }
 
-  handleExit() async {
+  Future<void> handleExit() async {
+    Future.delayed(commonDuration, () {
+      system.exit();
+    });
     try {
-      await updateStatus(false);
+      await savePreferences();
+      await macOS?.updateDns(true);
       await proxy?.stopProxy();
       await clashCore.shutdown();
       await clashService?.destroy();
-      await savePreferences();
     } finally {
       system.exit();
     }
@@ -421,19 +464,19 @@ class AppController {
 
   Future handleClear() async {
     await preferences.clearPreferences();
-    commonPrint.log("clear preferences");
+    commonPrint.log('clear preferences');
     globalState.config = Config(
       themeProps: defaultThemeProps,
     );
   }
 
-  autoCheckUpdate() async {
+  Future<void> autoCheckUpdate() async {
     if (!_ref.read(appSettingProvider).autoCheckUpdate) return;
     final res = await request.checkForUpdate();
     checkUpdateResultHandle(data: res);
   }
 
-  checkUpdateResultHandle({
+  Future<void> checkUpdateResultHandle({
     Map<String, dynamic>? data,
     bool handleError = false,
   }) async {
@@ -448,16 +491,16 @@ class AppController {
       final res = await globalState.showMessage(
         title: appLocalizations.discoverNewVersion,
         message: TextSpan(
-          text: "$tagName \n",
+          text: '$tagName \n',
           style: textTheme.headlineSmall,
           children: [
             TextSpan(
-              text: "\n",
+              text: '\n',
               style: textTheme.bodyMedium,
             ),
             for (final submit in submits)
               TextSpan(
-                text: "- $submit \n",
+                text: '- $submit \n',
                 style: textTheme.bodyMedium,
               ),
           ],
@@ -468,7 +511,7 @@ class AppController {
         return;
       }
       launchUrl(
-        Uri.parse("https://github.com/$repository/releases/latest"),
+        Uri.parse('https://github.com/$repository/releases/latest'),
       );
     } else if (handleError) {
       globalState.showMessage(
@@ -480,7 +523,7 @@ class AppController {
     }
   }
 
-  _handlePreference() async {
+  Future<void> _handlePreference() async {
     if (await preferences.isInit) {
       return;
     }
@@ -509,13 +552,15 @@ class AppController {
     await applyProfile();
   }
 
-  init() async {
+  Future<void> init() async {
     FlutterError.onError = (details) {
-      commonPrint.log(details.stack.toString());
+      if (kDebugMode) {
+        commonPrint.log(details.stack.toString());
+      }
     };
+    updateTray(true);
     await _initCore();
     await _initStatus();
-    updateTray(true);
     autoLaunch?.updateStatus(
       _ref.read(appSettingProvider).autoLaunch,
     );
@@ -531,8 +576,8 @@ class AppController {
     _ref.read(initProvider.notifier).value = true;
   }
 
-  _initStatus() async {
-    if (Platform.isAndroid) {
+  Future<void> _initStatus() async {
+    if (system.isAndroid) {
       await globalState.updateStartTime();
     }
     final status = globalState.isStart == true
@@ -545,28 +590,28 @@ class AppController {
     }
   }
 
-  setDelay(Delay delay) {
+  void setDelay(Delay delay) {
     _ref.read(delayDataSourceProvider.notifier).setDelay(delay);
   }
 
-  toPage(PageLabel pageLabel) {
+  void toPage(PageLabel pageLabel) {
     _ref.read(currentPageLabelProvider.notifier).value = pageLabel;
   }
 
-  toProfiles() {
+  void toProfiles() {
     toPage(PageLabel.profiles);
   }
 
-  initLink() {
+  void initLink() {
     linkManager.initAppLinksListen(
       (url) async {
         final res = await globalState.showMessage(
-          title: "${appLocalizations.add}${appLocalizations.profile}",
+          title: '${appLocalizations.add}${appLocalizations.profile}',
           message: TextSpan(
             children: [
               TextSpan(text: appLocalizations.doYouWantToPass),
               TextSpan(
-                text: " $url ",
+                text: ' $url ',
                 style: TextStyle(
                   color: Theme.of(context).colorScheme.primary,
                   decoration: TextDecoration.underline,
@@ -575,7 +620,7 @@ class AppController {
               ),
               TextSpan(
                   text:
-                      "${appLocalizations.create}${appLocalizations.profile}"),
+                      '${appLocalizations.create}${appLocalizations.profile}'),
             ],
           ),
         );
@@ -618,7 +663,7 @@ class AppController {
         false;
   }
 
-  _handlerDisclaimer() async {
+  Future<void> _handlerDisclaimer() async {
     if (_ref.read(appSettingProvider).disclaimerAccepted) {
       return;
     }
@@ -629,62 +674,64 @@ class AppController {
     return;
   }
 
-  addProfileFormURL(String url) async {
+  Future<void> addProfileFormURL(String url) async {
     if (globalState.navigatorKey.currentState?.canPop() ?? false) {
       globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     }
     toProfiles();
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted != true) return;
-    final profile = await commonScaffoldState?.loadingRun<Profile>(
+
+    final profile = await safeRun(
       () async {
         return await Profile.normal(
           url: url,
         ).update();
       },
-      title: "${appLocalizations.add}${appLocalizations.profile}",
+      needLoading: true,
+      title: '${appLocalizations.add}${appLocalizations.profile}',
     );
     if (profile != null) {
       await addProfile(profile);
     }
   }
 
-  addProfileFormFile() async {
-    final platformFile = await globalState.safeRun(picker.pickerFile);
+  Future<void> addProfileFormFile() async {
+    final platformFile = await safeRun(picker.pickerFile);
     final bytes = platformFile?.bytes;
     if (bytes == null) {
-      return null;
+      return;
     }
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted != true) return;
-    final profile = await commonScaffoldState?.loadingRun<Profile?>(
+
+    final profile = await safeRun(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
         return await Profile.normal(label: platformFile?.name).saveFile(bytes);
       },
-      title: "${appLocalizations.add}${appLocalizations.profile}",
+      needLoading: true,
+      title: '${appLocalizations.add}${appLocalizations.profile}',
     );
     if (profile != null) {
       await addProfile(profile);
     }
   }
 
-  addProfileFormQrCode() async {
-    final url = await globalState.safeRun(picker.pickerConfigQRCode);
+  Future<void> addProfileFormQrCode() async {
+    final url = await safeRun(
+      picker.pickerConfigQRCode,
+    );
     if (url == null) return;
     addProfileFormURL(url);
   }
 
-  updateViewSize(Size size) {
+  void updateViewSize(Size size) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _ref.read(viewSizeProvider.notifier).value = size;
     });
   }
 
-  setProvider(ExternalProvider? provider) {
+  void setProvider(ExternalProvider? provider) {
     _ref.read(providersProvider.notifier).setProvider(provider);
   }
 
@@ -729,45 +776,45 @@ class AppController {
       );
   }
 
-  List<Proxy> getSortProxies(List<Proxy> proxies, [String? url]) {
-    return switch (_ref.read(proxiesStyleSettingProvider).sortType) {
+  List<Proxy> getSortProxies({
+    required List<Proxy> proxies,
+    required ProxiesSortType sortType,
+    String? testUrl,
+  }) {
+    return switch (sortType) {
       ProxiesSortType.none => proxies,
       ProxiesSortType.delay => _sortOfDelay(
           proxies: proxies,
-          testUrl: url,
+          testUrl: testUrl,
         ),
       ProxiesSortType.name => _sortOfName(proxies),
     };
   }
 
-  clearEffect(String profileId) async {
+  Future<Null> clearEffect(String profileId) async {
     final profilePath = await appPath.getProfilePath(profileId);
-    final providersPath = await appPath.getProvidersPath(profileId);
+    final providersDirPath = await appPath.getProvidersDirPath(profileId);
     return await Isolate.run(() async {
-      if (profilePath != null) {
-        final profileFile = File(profilePath);
-        final isExists = await profileFile.exists();
-        if (isExists) {
-          profileFile.delete(recursive: true);
-        }
+      final profileFile = File(profilePath);
+      final isExists = await profileFile.exists();
+      if (isExists) {
+        profileFile.delete(recursive: true);
       }
-      if (providersPath != null) {
-        final providersFileDir = File(providersPath);
-        final isExists = await providersFileDir.exists();
-        if (isExists) {
-          providersFileDir.delete(recursive: true);
-        }
+      final providersFileDir = File(providersDirPath);
+      final providersFileIsExists = await providersFileDir.exists();
+      if (providersFileIsExists) {
+        providersFileDir.delete(recursive: true);
       }
     });
   }
 
-  updateTun() {
+  void updateTun() {
     _ref.read(patchClashConfigProvider.notifier).updateState(
           (state) => state.copyWith.tun(enable: !state.tun.enable),
         );
   }
 
-  updateSystemProxy() {
+  void updateSystemProxy() {
     _ref.read(networkSettingProvider.notifier).updateState(
           (state) => state.copyWith(
             systemProxy: !state.systemProxy,
@@ -786,11 +833,11 @@ class AppController {
     return _ref.read(packagesProvider);
   }
 
-  updateStart() {
+  void updateStart() {
     updateStatus(!_ref.read(runTimeProvider.notifier).isStart);
   }
 
-  updateCurrentSelectedMap(String groupName, String proxyName) {
+  void updateCurrentSelectedMap(String groupName, String proxyName) {
     final currentProfile = _ref.read(currentProfileProvider);
     if (currentProfile != null &&
         currentProfile.selectedMap[groupName] != proxyName) {
@@ -805,7 +852,7 @@ class AppController {
     }
   }
 
-  updateCurrentUnfoldSet(Set<String> value) {
+  void updateCurrentUnfoldSet(Set<String> value) {
     final currentProfile = _ref.read(currentProfileProvider);
     if (currentProfile == null) {
       return;
@@ -817,7 +864,7 @@ class AppController {
         );
   }
 
-  changeMode(Mode mode) {
+  void changeMode(Mode mode) {
     _ref.read(patchClashConfigProvider.notifier).updateState(
           (state) => state.copyWith(mode: mode),
         );
@@ -827,7 +874,7 @@ class AppController {
     addCheckIpNumDebounce();
   }
 
-  updateAutoLaunch() {
+  void updateAutoLaunch() {
     _ref.read(appSettingProvider.notifier).updateState(
           (state) => state.copyWith(
             autoLaunch: !state.autoLaunch,
@@ -835,7 +882,7 @@ class AppController {
         );
   }
 
-  updateVisible() async {
+  Future<void> updateVisible() async {
     final visible = await window?.isVisible;
     if (visible != null && !visible) {
       window?.show();
@@ -844,7 +891,7 @@ class AppController {
     }
   }
 
-  updateMode() {
+  void updateMode() {
     _ref.read(patchClashConfigProvider.notifier).updateState(
       (state) {
         final index = Mode.values.indexWhere((item) => item == state.mode);
@@ -859,7 +906,7 @@ class AppController {
     );
   }
 
-  handleAddOrUpdate(WidgetRef ref, [Rule? rule]) async {
+  Future<void> handleAddOrUpdate(WidgetRef ref, [Rule? rule]) async {
     final res = await globalState.showCommonDialog<Rule>(
       child: AddRuleDialog(
         rule: rule,
@@ -896,7 +943,7 @@ class AppController {
           (item) => item.toString(),
         );
     final data = await Isolate.run<List<int>>(() async {
-      final logsRawString = logsRaw.join("\n");
+      final logsRawString = logsRaw.join('\n');
       return utf8.encode(logsRawString);
     });
     return await picker.saveFile(
@@ -912,20 +959,20 @@ class AppController {
     final configJson = globalState.config.toJson();
     return Isolate.run<List<int>>(() async {
       final archive = Archive();
-      archive.add("config.json", configJson);
-      await archive.addDirectoryToArchive(profilesPath, homeDirPath);
+      archive.add('config.json', configJson);
+      archive.addDirectoryToArchive(profilesPath, homeDirPath);
       final zipEncoder = ZipEncoder();
       return zipEncoder.encode(archive) ?? [];
     });
   }
 
-  updateTray([bool focus = false]) async {
+  Future<void> updateTray([bool focus = false]) async {
     tray.update(
       trayState: _ref.read(trayStateProvider),
     );
   }
 
-  recoveryData(
+  Future<void> recoveryData(
     List<int> data,
     RecoveryOption recoveryOption,
   ) async {
@@ -935,12 +982,12 @@ class AppController {
     });
     final homeDirPath = await appPath.homeDirPath;
     final configs =
-        archive.files.where((item) => item.name.endsWith(".json")).toList();
+        archive.files.where((item) => item.name.endsWith('.json')).toList();
     final profiles =
-        archive.files.where((item) => !item.name.endsWith(".json"));
+        archive.files.where((item) => !item.name.endsWith('.json'));
     final configIndex =
-        configs.indexWhere((config) => config.name == "config.json");
-    if (configIndex == -1) throw "invalid backup file";
+        configs.indexWhere((config) => config.name == 'config.json');
+    if (configIndex == -1) throw 'invalid backup file';
     final configFile = configs[configIndex];
     var tempConfig = Config.compatibleFromJson(
       json.decode(
@@ -954,7 +1001,7 @@ class AppController {
       await file.writeAsBytes(profile.content);
     }
     final clashConfigIndex =
-        configs.indexWhere((config) => config.name == "clashConfig.json");
+        configs.indexWhere((config) => config.name == 'clashConfig.json');
     if (clashConfigIndex != -1) {
       final clashConfigFile = configs[clashConfigIndex];
       tempConfig = tempConfig.copyWith(
@@ -973,7 +1020,7 @@ class AppController {
     );
   }
 
-  _recovery(Config config, RecoveryOption recoveryOption) {
+  void _recovery(Config config, RecoveryOption recoveryOption) {
     final recoveryStrategy = _ref.read(appSettingProvider.select(
       (state) => state.recoveryStrategy,
     ));
@@ -1003,10 +1050,42 @@ class AppController {
       _ref.read(overrideDnsProvider.notifier).value = config.overrideDns;
       _ref.read(networkSettingProvider.notifier).value = config.networkProps;
       _ref.read(hotKeyActionsProvider.notifier).value = config.hotKeyActions;
+      _ref.read(scriptStateProvider.notifier).value = config.scriptProps;
     }
     final currentProfile = _ref.read(currentProfileProvider);
     if (currentProfile == null) {
       _ref.read(currentProfileIdProvider.notifier).value = profiles.first.id;
     }
   }
+
+  Future<T?> safeRun<T>(
+    FutureOr<T> Function() futureFunction, {
+    String? title,
+    bool needLoading = false,
+    bool silence = true,
+  }) async {
+    final realSilence = needLoading == true ? true : silence;
+    try {
+      if (needLoading) {
+        _ref.read(loadingProvider.notifier).value = true;
+      }
+      final res = await futureFunction();
+      return res;
+    } catch (e) {
+      commonPrint.log('$e');
+      if (realSilence) {
+        globalState.showNotifier(e.toString());
+      } else {
+        globalState.showMessage(
+          title: title ?? appLocalizations.tip,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+      return null;
+    } finally {
+      _ref.read(loadingProvider.notifier).value = false;
+    }
+  }
 }

lib/enum/enum.dart

@@ -2,8 +2,10 @@
 
 import 'dart:io';
 
-import 'package:fl_clash/fragments/dashboard/widgets/widgets.dart';
+import 'package:fl_clash/common/system.dart';
+import 'package:fl_clash/views/dashboard/widgets/widgets.dart';
 import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
@@ -15,16 +17,16 @@ enum SupportPlatform {
   Android;
 
   static SupportPlatform get currentPlatform {
-    if (Platform.isWindows) {
+    if (system.isWindows) {
       return SupportPlatform.Windows;
-    } else if (Platform.isMacOS) {
+    } else if (system.isMacOS) {
       return SupportPlatform.MacOS;
     } else if (Platform.isLinux) {
       return SupportPlatform.Linux;
-    } else if (Platform.isAndroid) {
+    } else if (system.isAndroid) {
       return SupportPlatform.Android;
     }
-    throw "invalid platform";
+    throw 'invalid platform';
   }
 }
 
@@ -43,11 +45,11 @@ enum GroupType {
 
   static GroupType parseProfileType(String type) {
     return switch (type) {
-      "url-test" => URLTest,
-      "select" => Selector,
-      "fallback" => Fallback,
-      "load-balance" => LoadBalance,
-      "relay" => Relay,
+      'url-test' => URLTest,
+      'select' => Selector,
+      'fallback' => Fallback,
+      'load-balance' => LoadBalance,
+      'relay' => Relay,
       String() => throw UnimplementedError(),
     };
   }
@@ -58,7 +60,7 @@ enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 extension GroupTypeExtension on GroupType {
   static List<String> get valueList => GroupType.values
       .map(
-        (e) => e.toString().split(".").last,
+        (e) => e.toString().split('.').last,
       )
       .toList();
 
@@ -80,7 +82,7 @@ enum UsedProxy { GLOBAL, DIRECT, REJECT }
 extension UsedProxyExtension on UsedProxy {
   static List<String> get valueList => UsedProxy.values
       .map(
-        (e) => e.toString().split(".").last,
+        (e) => e.toString().split('.').last,
       )
       .toList();
 
@@ -97,7 +99,18 @@ enum LogLevel {
   warning,
   error,
   silent,
-  app,
+}
+
+extension LogLevelExt on LogLevel {
+  Color? get color {
+    return switch (this) {
+      LogLevel.silent => Colors.grey.shade700,
+      LogLevel.debug => Colors.grey.shade400,
+      LogLevel.info => null,
+      LogLevel.warning => Colors.yellowAccent,
+      LogLevel.error => Colors.redAccent,
+    };
+  }
 }
 
 enum TransportProtocol { udp, tcp }
@@ -118,7 +131,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,
@@ -155,18 +173,22 @@ enum ProxyCardType { expand, shrink, min }
 
 enum DnsMode {
   normal,
-  @JsonValue("fake-ip")
+  @JsonValue('fake-ip')
   fakeIp,
-  @JsonValue("redir-host")
+  @JsonValue('redir-host')
   redirHost,
   hosts
 }
 
 enum ExternalControllerStatus {
-  @JsonValue("")
-  close,
-  @JsonValue("127.0.0.1:9090")
-  open
+  @JsonValue('')
+  close(''),
+  @JsonValue('127.0.0.1:9090')
+  open('127.0.0.1:9090');
+
+  final String value;
+
+  const ExternalControllerStatus(this.value);
 }
 
 enum KeyboardModifier {
@@ -226,9 +248,9 @@ enum ProxiesIconStyle {
 }
 
 enum FontFamily {
-  twEmoji("Twemoji"),
-  jetBrainsMono("JetBrainsMono"),
-  icon("Icons");
+  twEmoji('Twemoji'),
+  jetBrainsMono('JetBrainsMono'),
+  icon('Icons');
 
   final String value;
 
@@ -248,6 +270,7 @@ enum ActionMethod {
   shutdown,
   validateConfig,
   updateConfig,
+  getConfig,
   getProxies,
   changeProxy,
   getTraffic,
@@ -256,6 +279,7 @@ enum ActionMethod {
   asyncTestDelay,
   getConnections,
   closeConnections,
+  resetConnections,
   closeConnection,
   getExternalProviders,
   getExternalProvider,
@@ -268,12 +292,10 @@ enum ActionMethod {
   stopListener,
   getCountryCode,
   getMemory,
-  getProfile,
   crash,
+  setupConfig,
 
   ///Android,
-  setFdMap,
-  setProcessMap,
   setState,
   startTun,
   stopTun,
@@ -293,6 +315,7 @@ enum WindowsHelperServiceStatus {
 
 enum FunctionTag {
   updateClashConfig,
+  setupClashConfig,
   updateStatus,
   updateGroups,
   addCheckIpNum,
@@ -310,7 +333,7 @@ enum FunctionTag {
   proxiesTabChange,
   logs,
   requests,
-
+  autoScrollToEnd,
 }
 
 enum DashboardWidget {
@@ -414,39 +437,39 @@ enum PageLabel {
 }
 
 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");
+  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;
 
@@ -484,4 +507,22 @@ enum CacheTag {
   logs,
   rules,
   requests,
+  proxiesList,
+}
+
+enum Language {
+  yaml,
+  javaScript,
+}
+
+enum ImportOption {
+  file,
+  url,
+}
+
+enum ScrollPositionCacheKeys {
+  tools,
+  profiles,
+  proxiesList,
+  proxiesTabList,
 }

lib/fragments/config/config.dart

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

lib/fragments/config/general.dart

@@ -1,430 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-class LogLevelItem extends ConsumerWidget {
-  const LogLevelItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final logLevel =
-        ref.watch(patchClashConfigProvider.select((state) => state.logLevel));
-    return ListItem<LogLevel>.options(
-      leading: const Icon(Icons.info_outline),
-      title: Text(appLocalizations.logLevel),
-      subtitle: Text(logLevel.name),
-      delegate: OptionsDelegate<LogLevel>(
-        title: appLocalizations.logLevel,
-        options: LogLevel.values,
-        onChanged: (LogLevel? value) {
-          if (value == null) {
-            return;
-          }
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  logLevel: value,
-                ),
-              );
-        },
-        textBuilder: (logLevel) => logLevel.name,
-        value: logLevel,
-      ),
-    );
-  }
-}
-
-class UaItem extends ConsumerWidget {
-  const UaItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final globalUa =
-        ref.watch(patchClashConfigProvider.select((state) => state.globalUa));
-    return ListItem<String?>.options(
-      leading: const Icon(Icons.computer_outlined),
-      title: const Text("UA"),
-      subtitle: Text(globalUa ?? appLocalizations.defaultText),
-      delegate: OptionsDelegate<String?>(
-        title: "UA",
-        options: [
-          null,
-          "clash-verge/v1.6.6",
-          "ClashforWindows/0.19.23",
-        ],
-        value: globalUa,
-        onChanged: (value) {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  globalUa: value,
-                ),
-              );
-        },
-        textBuilder: (ua) => ua ?? appLocalizations.defaultText,
-      ),
-    );
-  }
-}
-
-class KeepAliveIntervalItem extends ConsumerWidget {
-  const KeepAliveIntervalItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final keepAliveInterval = ref.watch(
-        patchClashConfigProvider.select((state) => state.keepAliveInterval));
-    return ListItem.input(
-      leading: const Icon(Icons.timer_outlined),
-      title: Text(appLocalizations.keepAliveIntervalDesc),
-      subtitle: Text("$keepAliveInterval ${appLocalizations.seconds}"),
-      delegate: InputDelegate(
-        title: appLocalizations.keepAliveIntervalDesc,
-        suffixText: appLocalizations.seconds,
-        resetValue: "$defaultKeepAliveInterval",
-        value: "$keepAliveInterval",
-        onChanged: (String? value) {
-          if (value == null) {
-            return;
-          }
-          globalState.safeRun(
-            () {
-              final intValue = int.parse(value);
-              if (intValue <= 0) {
-                throw "Invalid keepAliveInterval";
-              }
-              ref.read(patchClashConfigProvider.notifier).updateState(
-                    (state) => state.copyWith(
-                      keepAliveInterval: intValue,
-                    ),
-                  );
-            },
-            silence: false,
-            title: appLocalizations.keepAliveIntervalDesc,
-          );
-        },
-      ),
-    );
-  }
-}
-
-class TestUrlItem extends ConsumerWidget {
-  const TestUrlItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final testUrl =
-        ref.watch(appSettingProvider.select((state) => state.testUrl));
-    return ListItem.input(
-      leading: const Icon(Icons.timeline),
-      title: Text(appLocalizations.testUrl),
-      subtitle: Text(testUrl),
-      delegate: InputDelegate(
-          resetValue: defaultTestUrl,
-          title: appLocalizations.testUrl,
-          value: testUrl,
-          onChanged: (String? value) {
-            if (value == null) {
-              return;
-            }
-            globalState.safeRun(
-              () {
-                if (!value.isUrl) {
-                  throw "Invalid url";
-                }
-                ref.read(appSettingProvider.notifier).updateState(
-                      (state) => state.copyWith(
-                        testUrl: value,
-                      ),
-                    );
-              },
-              silence: false,
-              title: appLocalizations.testUrl,
-            );
-          }),
-    );
-  }
-}
-
-class MixedPortItem extends ConsumerWidget {
-  const MixedPortItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final mixedPort =
-        ref.watch(patchClashConfigProvider.select((state) => state.mixedPort));
-    return ListItem.input(
-      leading: const Icon(Icons.adjust_outlined),
-      title: Text(appLocalizations.proxyPort),
-      subtitle: Text("$mixedPort"),
-      delegate: InputDelegate(
-        title: appLocalizations.proxyPort,
-        value: "$mixedPort",
-        onChanged: (String? value) {
-          if (value == null) {
-            return;
-          }
-          globalState.safeRun(
-            () {
-              final mixedPort = int.parse(value);
-              if (mixedPort < 1024 || mixedPort > 49151) {
-                throw "Invalid port";
-              }
-              ref.read(patchClashConfigProvider.notifier).updateState(
-                    (state) => state.copyWith(
-                      mixedPort: mixedPort,
-                    ),
-                  );
-            },
-            silence: false,
-            title: appLocalizations.proxyPort,
-          );
-        },
-        resetValue: "$defaultMixedPort",
-      ),
-    );
-  }
-}
-
-class HostsItem extends StatelessWidget {
-  const HostsItem({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem.open(
-      leading: const Icon(Icons.view_list_outlined),
-      title: const Text("Hosts"),
-      subtitle: Text(appLocalizations.hostsDesc),
-      delegate: OpenDelegate(
-        blur: false,
-        title: "Hosts",
-        widget: Consumer(
-          builder: (_, ref, __) {
-            final hosts = ref
-                .watch(patchClashConfigProvider.select((state) => state.hosts));
-            return MapInputPage(
-              title: "Hosts",
-              map: hosts,
-              titleBuilder: (item) => Text(item.key),
-              subtitleBuilder: (item) => Text(item.value),
-              onChange: (value) {
-                ref.read(patchClashConfigProvider.notifier).updateState(
-                      (state) => state.copyWith(
-                        hosts: value,
-                      ),
-                    );
-              },
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
-
-class Ipv6Item extends ConsumerWidget {
-  const Ipv6Item({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final ipv6 =
-        ref.watch(patchClashConfigProvider.select((state) => state.ipv6));
-    return ListItem.switchItem(
-      leading: const Icon(Icons.water_outlined),
-      title: const Text("IPv6"),
-      subtitle: Text(appLocalizations.ipv6Desc),
-      delegate: SwitchDelegate(
-        value: ipv6,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  ipv6: value,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class AllowLanItem extends ConsumerWidget {
-  const AllowLanItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final allowLan =
-        ref.watch(patchClashConfigProvider.select((state) => state.allowLan));
-    return ListItem.switchItem(
-      leading: const Icon(Icons.device_hub),
-      title: Text(appLocalizations.allowLan),
-      subtitle: Text(appLocalizations.allowLanDesc),
-      delegate: SwitchDelegate(
-        value: allowLan,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  allowLan: value,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class UnifiedDelayItem extends ConsumerWidget {
-  const UnifiedDelayItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final unifiedDelay = ref
-        .watch(patchClashConfigProvider.select((state) => state.unifiedDelay));
-
-    return ListItem.switchItem(
-      leading: const Icon(Icons.compress_outlined),
-      title: Text(appLocalizations.unifiedDelay),
-      subtitle: Text(appLocalizations.unifiedDelayDesc),
-      delegate: SwitchDelegate(
-        value: unifiedDelay,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  unifiedDelay: value,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class FindProcessItem extends ConsumerWidget {
-  const FindProcessItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final findProcess = ref.watch(patchClashConfigProvider
-        .select((state) => state.findProcessMode == FindProcessMode.always));
-
-    return ListItem.switchItem(
-      leading: const Icon(Icons.polymer_outlined),
-      title: Text(appLocalizations.findProcessMode),
-      subtitle: Text(appLocalizations.findProcessModeDesc),
-      delegate: SwitchDelegate(
-        value: findProcess,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  findProcessMode:
-                      value ? FindProcessMode.always : FindProcessMode.off,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class TcpConcurrentItem extends ConsumerWidget {
-  const TcpConcurrentItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final tcpConcurrent = ref
-        .watch(patchClashConfigProvider.select((state) => state.tcpConcurrent));
-    return ListItem.switchItem(
-      leading: const Icon(Icons.double_arrow_outlined),
-      title: Text(appLocalizations.tcpConcurrent),
-      subtitle: Text(appLocalizations.tcpConcurrentDesc),
-      delegate: SwitchDelegate(
-        value: tcpConcurrent,
-        onChanged: (value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  tcpConcurrent: value,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class GeodataLoaderItem extends ConsumerWidget {
-  const GeodataLoaderItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final isMemconservative = ref.watch(patchClashConfigProvider.select(
-        (state) => state.geodataLoader == GeodataLoader.memconservative));
-    return ListItem.switchItem(
-      leading: const Icon(Icons.memory),
-      title: Text(appLocalizations.geodataLoader),
-      subtitle: Text(appLocalizations.geodataLoaderDesc),
-      delegate: SwitchDelegate(
-        value: isMemconservative,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  geodataLoader: value
-                      ? GeodataLoader.memconservative
-                      : GeodataLoader.standard,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class ExternalControllerItem extends ConsumerWidget {
-  const ExternalControllerItem({super.key});
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final hasExternalController = ref.watch(patchClashConfigProvider.select(
-        (state) => state.externalController == ExternalControllerStatus.open));
-    return ListItem.switchItem(
-      leading: const Icon(Icons.api_outlined),
-      title: Text(appLocalizations.externalController),
-      subtitle: Text(appLocalizations.externalControllerDesc),
-      delegate: SwitchDelegate(
-        value: hasExternalController,
-        onChanged: (bool value) async {
-          ref.read(patchClashConfigProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  externalController: value
-                      ? ExternalControllerStatus.open
-                      : ExternalControllerStatus.close,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-final generalItems = <Widget>[
-  LogLevelItem(),
-  UaItem(),
-  if (system.isDesktop) KeepAliveIntervalItem(),
-  TestUrlItem(),
-  MixedPortItem(),
-  HostsItem(),
-  Ipv6Item(),
-  AllowLanItem(),
-  UnifiedDelayItem(),
-  FindProcessItem(),
-  TcpConcurrentItem(),
-  GeodataLoaderItem(),
-  ExternalControllerItem(),
-]
-    .separated(
-      const Divider(
-        height: 0,
-      ),
-    )
-    .toList();

lib/fragments/connection/connections.dart

@@ -1,150 +0,0 @@
-import 'dart:async';
-
-import 'package:fl_clash/clash/clash.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/providers/providers.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'item.dart';
-
-class ConnectionsFragment extends ConsumerStatefulWidget {
-  const ConnectionsFragment({super.key});
-
-  @override
-  ConsumerState<ConnectionsFragment> createState() =>
-      _ConnectionsFragmentState();
-}
-
-class _ConnectionsFragmentState extends ConsumerState<ConnectionsFragment>
-    with PageMixin {
-  final _connectionsStateNotifier = ValueNotifier<ConnectionsState>(
-    const ConnectionsState(),
-  );
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  List<Widget> get actions => [
-        IconButton(
-          onPressed: () async {
-            clashCore.closeConnections();
-            _connectionsStateNotifier.value =
-                _connectionsStateNotifier.value.copyWith(
-              connections: await clashCore.getConnections(),
-            );
-          },
-          icon: const Icon(Icons.delete_sweep_outlined),
-        ),
-      ];
-
-  @override
-  get onSearch => (value) {
-        _connectionsStateNotifier.value =
-            _connectionsStateNotifier.value.copyWith(
-          query: value,
-        );
-      };
-
-  @override
-  get onKeywordsUpdate => (keywords) {
-        _connectionsStateNotifier.value =
-            _connectionsStateNotifier.value.copyWith(keywords: keywords);
-      };
-
-  _updateConnections() async {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      _connectionsStateNotifier.value =
-          _connectionsStateNotifier.value.copyWith(
-        connections: await clashCore.getConnections(),
-      );
-      timer = Timer(Duration(seconds: 1), () async {
-        _updateConnections();
-      });
-    });
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    ref.listenManual(
-      isCurrentPageProvider(
-        PageLabel.connections,
-        handler: (pageLabel, viewMode) =>
-            pageLabel == PageLabel.tools && viewMode == ViewMode.mobile,
-      ),
-      (prev, next) {
-        if (prev != next && next == true) {
-          initPageState();
-        }
-      },
-      fireImmediately: true,
-    );
-    _updateConnections();
-  }
-
-  _handleBlockConnection(String id) async {
-    clashCore.closeConnection(id);
-    _connectionsStateNotifier.value = _connectionsStateNotifier.value.copyWith(
-      connections: await clashCore.getConnections(),
-    );
-  }
-
-  @override
-  void dispose() {
-    timer?.cancel();
-    _connectionsStateNotifier.dispose();
-    _scrollController.dispose();
-    timer = null;
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ValueListenableBuilder<ConnectionsState>(
-      valueListenable: _connectionsStateNotifier,
-      builder: (_, state, __) {
-        final connections = state.list;
-        if (connections.isEmpty) {
-          return NullStatus(
-            label: appLocalizations.nullConnectionsDesc,
-          );
-        }
-        return CommonScrollBar(
-          controller: _scrollController,
-          child: ListView.separated(
-            controller: _scrollController,
-            itemBuilder: (_, index) {
-              final connection = connections[index];
-              return ConnectionItem(
-                key: Key(connection.id),
-                connection: connection,
-                onClickKeyword: (value) {
-                  context.commonScaffoldState?.addKeyword(value);
-                },
-                trailing: IconButton(
-                  icon: const Icon(Icons.block),
-                  onPressed: () {
-                    _handleBlockConnection(connection.id);
-                  },
-                ),
-              );
-            },
-            separatorBuilder: (BuildContext context, int index) {
-              return const Divider(
-                height: 0,
-              );
-            },
-            itemCount: connections.length,
-          ),
-        );
-      },
-    );
-  }
-}

lib/fragments/connection/item.dart

@@ -1,210 +0,0 @@
-import 'dart:io';
-
-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/plugins/app.dart';
-import 'package:fl_clash/providers/config.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-class ConnectionItem extends ConsumerWidget {
-  final Connection connection;
-  final Function(String)? onClickKeyword;
-  final Widget? trailing;
-
-  const ConnectionItem({
-    super.key,
-    required this.connection,
-    this.onClickKeyword,
-    this.trailing,
-  });
-
-  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
-    return await app?.getPackageIcon(connection.metadata.process);
-  }
-
-  String _getSourceText(Connection connection) {
-    final metadata = connection.metadata;
-    if (metadata.process.isEmpty) {
-      return connection.start.lastUpdateTimeDesc;
-    }
-    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
-  }
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final value = ref.watch(
-      patchClashConfigProvider.select(
-        (state) =>
-            state.findProcessMode == FindProcessMode.always &&
-            Platform.isAndroid,
-      ),
-    );
-    final title = Text(
-      connection.desc,
-      style: context.textTheme.bodyLarge,
-    );
-    final subTitle = Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(
-          height: 8,
-        ),
-        Text(
-          _getSourceText(connection),
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
-        ),
-        const SizedBox(
-          height: 8,
-        ),
-        Wrap(
-          runSpacing: 6,
-          spacing: 6,
-          children: [
-            for (final chain in connection.chains)
-              CommonChip(
-                label: chain,
-                onPressed: () {
-                  if (onClickKeyword == null) return;
-                  onClickKeyword!(chain);
-                },
-              ),
-          ],
-        ),
-      ],
-    );
-    return CommonPopupBox(
-      targetBuilder: (open) {
-        return ListItem(
-          padding: const EdgeInsets.symmetric(
-            horizontal: 16,
-            vertical: 4,
-          ),
-          tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-          leading: value
-              ? GestureDetector(
-            onTap: () {
-              if (onClickKeyword == null) return;
-              final process = connection.metadata.process;
-              if (process.isEmpty) return;
-              onClickKeyword!(process);
-            },
-            child: Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 48,
-              height: 48,
-              child: FutureBuilder<ImageProvider?>(
-                future: _getPackageIcon(connection),
-                builder: (_, snapshot) {
-                  if (!snapshot.hasData && snapshot.data == null) {
-                    return Container();
-                  } else {
-                    return Image(
-                      image: snapshot.data!,
-                      gaplessPlayback: true,
-                      width: 48,
-                      height: 48,
-                    );
-                  }
-                },
-              ),
-            ),
-          )
-              : null,
-          title: title,
-          subtitle: subTitle,
-          trailing: trailing,
-        );
-        // return InkWell(
-        //   child: GestureDetector(
-        //     onLongPressStart: (details) {
-        //       if (!system.isDesktop) {
-        //         return;
-        //       }
-        //       open(
-        //         offset: details.localPosition.translate(
-        //           0,
-        //           -12,
-        //         ),
-        //       );
-        //     },
-        //     onSecondaryTapDown: (details) {
-        //       if (!system.isDesktop) {
-        //         return;
-        //       }
-        //       open(
-        //         offset: details.localPosition.translate(
-        //           0,
-        //           -12,
-        //         ),
-        //       );
-        //     },
-        //     child: ListItem(
-        //       padding: const EdgeInsets.symmetric(
-        //         horizontal: 16,
-        //         vertical: 4,
-        //       ),
-        //       tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-        //       leading: value
-        //           ? GestureDetector(
-        //               onTap: () {
-        //                 if (onClickKeyword == null) return;
-        //                 final process = connection.metadata.process;
-        //                 if (process.isEmpty) return;
-        //                 onClickKeyword!(process);
-        //               },
-        //               child: Container(
-        //                 margin: const EdgeInsets.only(top: 4),
-        //                 width: 48,
-        //                 height: 48,
-        //                 child: FutureBuilder<ImageProvider?>(
-        //                   future: _getPackageIcon(connection),
-        //                   builder: (_, snapshot) {
-        //                     if (!snapshot.hasData && snapshot.data == null) {
-        //                       return Container();
-        //                     } else {
-        //                       return Image(
-        //                         image: snapshot.data!,
-        //                         gaplessPlayback: true,
-        //                         width: 48,
-        //                         height: 48,
-        //                       );
-        //                     }
-        //                   },
-        //                 ),
-        //               ),
-        //             )
-        //           : null,
-        //       title: title,
-        //       subtitle: subTitle,
-        //       trailing: trailing,
-        //     ),
-        //   ),
-        //   onTap: () {},
-        // );
-      },
-      popup: CommonPopupMenu(
-        minWidth: 160,
-        items: [
-          PopupMenuItemData(
-            label: "编辑规则",
-            onPressed: () {
-              // _handleShowEditExtendPage(context);
-            },
-          ),
-          PopupMenuItemData(
-            label: "设置直连",
-            onPressed: () {},
-          ),
-          PopupMenuItemData(
-            label: "一键屏蔽",
-            onPressed: () {},
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/fragments/connection/requests.dart

@@ -1,267 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'item.dart';
-
-class RequestsFragment extends ConsumerStatefulWidget {
-  const RequestsFragment({super.key});
-
-  @override
-  ConsumerState<RequestsFragment> createState() => _RequestsFragmentState();
-}
-
-class _RequestsFragmentState extends ConsumerState<RequestsFragment>
-    with PageMixin {
-  final _requestsStateNotifier = ValueNotifier<ConnectionsState>(
-    const ConnectionsState(loading: true),
-  );
-  List<Connection> _requests = [];
-  final _tag = CacheTag.requests;
-  late ScrollController _scrollController;
-  bool _isLoad = false;
-
-  double _currentMaxWidth = 0;
-
-  @override
-  get onSearch => (value) {
-        _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-          query: value,
-        );
-      };
-
-  @override
-  get onKeywordsUpdate => (keywords) {
-        _requestsStateNotifier.value =
-            _requestsStateNotifier.value.copyWith(keywords: keywords);
-      };
-
-  @override
-  void initState() {
-    super.initState();
-    final preOffset = globalState.cacheScrollPosition[_tag] ?? -1;
-    _scrollController = ScrollController(
-      initialScrollOffset: preOffset > 0 ? preOffset : double.maxFinite,
-    );
-    _requests = globalState.appState.requests.list;
-    _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-      connections: _requests,
-    );
-    ref.listenManual(
-      isCurrentPageProvider(
-        PageLabel.requests,
-        handler: (pageLabel, viewMode) =>
-            pageLabel == PageLabel.tools && viewMode == ViewMode.mobile,
-      ),
-      (prev, next) {
-        if (prev != next && next == true) {
-          initPageState();
-        }
-      },
-      fireImmediately: true,
-    );
-    ref.listenManual(
-      requestsProvider.select((state) => state.list),
-      (prev, next) {
-        if (!connectionListEquality.equals(prev, next)) {
-          _requests = next;
-          updateRequestsThrottler();
-        }
-      },
-    );
-  }
-
-  double _calcCacheHeight(Connection item) {
-    final size = globalState.measure.computeTextSize(
-      Text(
-        item.desc,
-        style: context.textTheme.bodyLarge,
-      ),
-      maxWidth: _currentMaxWidth,
-    );
-    final chainsText = item.chains.join("");
-    final length = item.chains.length;
-    final chainSize = globalState.measure.computeTextSize(
-      Text(
-        chainsText,
-        style: context.textTheme.bodyMedium,
-      ),
-      maxWidth: (_currentMaxWidth - (length - 1) * 6 - length * 24),
-    );
-    final baseHeight = globalState.measure.bodyMediumHeight;
-    final lines = (chainSize.height / baseHeight).round();
-    final computerHeight =
-        size.height + chainSize.height + 24 + 24 * (lines - 1);
-    return computerHeight + 8 + 32 + globalState.measure.bodyMediumHeight;
-  }
-
-  @override
-  void dispose() {
-    _requestsStateNotifier.dispose();
-    _scrollController.dispose();
-    _currentMaxWidth = 0;
-    super.dispose();
-  }
-
-  updateRequestsThrottler() {
-    throttler.call(FunctionTag.requests, () {
-      final isEquality = connectionListEquality.equals(
-        _requests,
-        _requestsStateNotifier.value.connections,
-      );
-      if (isEquality) {
-        return;
-      }
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if(mounted){
-          _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-            connections: _requests,
-          );
-        }
-      });
-    }, duration: commonDuration);
-  }
-
-  _preLoad() {
-    if (_isLoad == true) {
-      return;
-    }
-    _isLoad = true;
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (!mounted) {
-        return;
-      }
-      final isMobileView = ref.read(isMobileViewProvider);
-      if (isMobileView) {
-        await Future.delayed(Duration(milliseconds: 300));
-      }
-      final parts = _requests.batch(10);
-      globalState.cacheHeightMap[_tag] ??= FixedMap(
-        _requests.length,
-      );
-      for (int i = 0; i < parts.length; i++) {
-        final part = parts[i];
-        await Future(
-          () {
-            for (final request in part) {
-              globalState.cacheHeightMap[_tag]?.updateCacheValue(
-                request.id,
-                () => _calcCacheHeight(request),
-              );
-            }
-          },
-        );
-      }
-      _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-        loading: false,
-      );
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (_, constraints) {
-        return Consumer(
-          builder: (_, ref, child) {
-            final value = ref.watch(
-              patchClashConfigProvider.select(
-                (state) =>
-                    state.findProcessMode == FindProcessMode.always &&
-                    Platform.isAndroid,
-              ),
-            );
-            _currentMaxWidth = constraints.maxWidth - 40 - (value ? 60 : 0);
-            return child!;
-          },
-          child: TextScaleNotification(
-            child: ValueListenableBuilder<ConnectionsState>(
-              valueListenable: _requestsStateNotifier,
-              builder: (_, state, __) {
-                _preLoad();
-                final connections = state.list;
-                if (connections.isEmpty) {
-                  return NullStatus(
-                    label: appLocalizations.nullRequestsDesc,
-                  );
-                }
-                final items = connections
-                    .map<Widget>(
-                      (connection) => ConnectionItem(
-                        key: Key(connection.id),
-                        connection: connection,
-                        onClickKeyword: (value) {
-                          context.commonScaffoldState?.addKeyword(value);
-                        },
-                      ),
-                    )
-                    .separated(
-                      const Divider(
-                        height: 0,
-                      ),
-                    )
-                    .toList();
-                final content = connections.isEmpty
-                    ? NullStatus(
-                        label: appLocalizations.nullRequestsDesc,
-                      )
-                    : Align(
-                        alignment: Alignment.topCenter,
-                        child: ScrollToEndBox(
-                          controller: _scrollController,
-                          tag: _tag,
-                          dataSource: connections,
-                          child: CommonScrollBar(
-                            controller: _scrollController,
-                            child: CacheItemExtentListView(
-                              tag: _tag,
-                              reverse: true,
-                              shrinkWrap: true,
-                              physics: NextClampingScrollPhysics(),
-                              controller: _scrollController,
-                              itemExtentBuilder: (index) {
-                                if (index.isOdd) {
-                                  return 0;
-                                }
-                                return _calcCacheHeight(
-                                    connections[index ~/ 2]);
-                              },
-                              itemBuilder: (_, index) {
-                                return items[index];
-                              },
-                              itemCount: items.length,
-                              keyBuilder: (int index) {
-                                if (index.isOdd) {
-                                  return "divider";
-                                }
-                                return connections[index ~/ 2].id;
-                              },
-                            ),
-                          ),
-                        ),
-                      );
-                return FadeBox(
-                  child: state.loading
-                      ? Center(
-                          child: CircularProgressIndicator(),
-                        )
-                      : content,
-                );
-              },
-            ),
-            onNotification: (_) {
-              globalState.cacheHeightMap[_tag]?.clear();
-            },
-          ),
-        );
-      },
-    );
-  }
-}

lib/fragments/dashboard/dashboard.dart

@@ -1,148 +0,0 @@
-import 'dart:math';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'widgets/start_button.dart';
-
-class DashboardFragment extends ConsumerStatefulWidget {
-  const DashboardFragment({super.key});
-
-  @override
-  ConsumerState<DashboardFragment> createState() => _DashboardFragmentState();
-}
-
-class _DashboardFragmentState extends ConsumerState<DashboardFragment>
-    with PageMixin {
-  final key = GlobalKey<SuperGridState>();
-
-  @override
-  initState() {
-    ref.listenManual(
-      isCurrentPageProvider(PageLabel.dashboard),
-      (prev, next) {
-        if (prev != next && next == true) {
-          initPageState();
-        }
-      },
-      fireImmediately: true,
-    );
-    return super.initState();
-  }
-
-  @override
-  Widget? get floatingActionButton => const StartButton();
-
-  @override
-  List<Widget> get actions => [
-        ValueListenableBuilder(
-          valueListenable: key.currentState!.addedChildrenNotifier,
-          builder: (_, addedChildren, child) {
-            return ValueListenableBuilder(
-              valueListenable: key.currentState!.isEditNotifier,
-              builder: (_, isEdit, child) {
-                if (!isEdit || addedChildren.isEmpty) {
-                  return Container();
-                }
-                return child!;
-              },
-              child: child,
-            );
-          },
-          child: IconButton(
-            onPressed: () {
-              key.currentState!.showAddModal();
-            },
-            icon: Icon(
-              Icons.add_circle,
-            ),
-          ),
-        ),
-        IconButton(
-          icon: ValueListenableBuilder(
-            valueListenable: key.currentState!.isEditNotifier,
-            builder: (_, isEdit, ___) {
-              return isEdit
-                  ? SystemBackBlock(
-                      child: CommonPopScope(
-                        child: Icon(Icons.save),
-                        onPop: () {
-                          key.currentState!.isEditNotifier.value =
-                              !key.currentState!.isEditNotifier.value;
-                          return false;
-                        },
-                      ),
-                    )
-                  : Icon(
-                      Icons.edit,
-                    );
-            },
-          ),
-          onPressed: () {
-            key.currentState!.isEditNotifier.value =
-                !key.currentState!.isEditNotifier.value;
-          },
-        ),
-      ];
-
-  _handleSave(List<GridItem> girdItems, WidgetRef ref) {
-    final dashboardWidgets = girdItems
-        .map(
-          (item) => DashboardWidget.getDashboardWidget(item),
-        )
-        .toList();
-    ref.read(appSettingProvider.notifier).updateState(
-          (state) => state.copyWith(dashboardWidgets: dashboardWidgets),
-        );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final dashboardState = ref.watch(dashboardStateProvider);
-    final columns = max(4 * ((dashboardState.viewWidth / 320).ceil()), 8);
-    return Align(
-      alignment: Alignment.topCenter,
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.all(16).copyWith(
-          bottom: 88,
-        ),
-        child: SuperGrid(
-          key: key,
-          crossAxisCount: columns,
-          crossAxisSpacing: 16.ap,
-          mainAxisSpacing: 16.ap,
-          children: [
-            ...dashboardState.dashboardWidgets
-                .where(
-                  (item) => item.platforms.contains(
-                    SupportPlatform.currentPlatform,
-                  ),
-                )
-                .map(
-                  (item) => item.widget,
-                ),
-          ],
-          onSave: (girdItems) {
-            _handleSave(girdItems, ref);
-          },
-          addedItemsBuilder: (girdItems) {
-            return DashboardWidget.values
-                .where(
-                  (item) =>
-                      !girdItems.contains(item.widget) &&
-                      item.platforms.contains(
-                        SupportPlatform.currentPlatform,
-                      ),
-                )
-                .map((item) => item.widget)
-                .toList();
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/start_button.dart

@@ -1,143 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/state.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-class StartButton extends StatefulWidget {
-  const StartButton({super.key});
-
-  @override
-  State<StartButton> createState() => _StartButtonState();
-}
-
-class _StartButtonState extends State<StartButton>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-  bool isStart = false;
-
-  @override
-  void initState() {
-    super.initState();
-    isStart = globalState.appState.runTime != null;
-    _controller = AnimationController(
-      vsync: this,
-      value: isStart ? 1 : 0,
-      duration: const Duration(milliseconds: 200),
-    );
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  handleSwitchStart() {
-    isStart = !isStart;
-    updateController();
-    debouncer.call(
-      FunctionTag.updateStatus,
-      () {
-        globalState.appController.updateStatus(isStart);
-      },
-      duration: moreDuration,
-    );
-  }
-
-  updateController() {
-    if (isStart) {
-      _controller.forward();
-    } else {
-      _controller.reverse();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer(
-      builder: (_, ref, child) {
-        final state = ref.watch(startButtonSelectorStateProvider);
-        if (!state.isInit || !state.hasProfile) {
-          return Container();
-        }
-        ref.listenManual(
-          runTimeProvider.select((state) => state != null),
-          (prev, next) {
-            if (next != isStart) {
-              isStart = next;
-              updateController();
-            }
-          },
-          fireImmediately: true,
-        );
-        final textWidth = globalState.measure
-                .computeTextSize(
-                  Text(
-                    utils.getTimeDifference(
-                      DateTime.now(),
-                    ),
-                    style: context.textTheme.titleMedium?.toSoftBold,
-                  ),
-                )
-                .width +
-            16;
-        return AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56 + textWidth * _controller.value,
-              height: 56,
-              child: FloatingActionButton(
-                heroTag: null,
-                onPressed: () {
-                  handleSwitchStart();
-                },
-                child: Row(
-                  children: [
-                    Container(
-                      width: 56,
-                      height: 56,
-                      alignment: Alignment.center,
-                      child: AnimatedIcon(
-                        icon: AnimatedIcons.play_pause,
-                        progress: _controller,
-                      ),
-                    ),
-                    Expanded(
-                      child: ClipRect(
-                        child: OverflowBox(
-                          maxWidth: textWidth,
-                          child: Container(
-                            alignment: Alignment.centerLeft,
-                            child: child!,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-          child: child,
-        );
-      },
-      child: Consumer(
-        builder: (_, ref, __) {
-          final runTime = ref.watch(runTimeProvider);
-          final text = utils.getTimeText(runTime);
-          return Text(
-            text,
-            style: Theme.of(context)
-                .textTheme
-                .titleMedium
-                ?.toSoftBold
-                .copyWith(color: context.colorScheme.onPrimaryContainer),
-          );
-        },
-      ),
-    );
-  }
-}

lib/fragments/logs.dart

@@ -1,313 +0,0 @@
-import 'dart:math';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/state.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../models/models.dart';
-import '../widgets/widgets.dart';
-
-class LogsFragment extends ConsumerStatefulWidget {
-  const LogsFragment({super.key});
-
-  @override
-  ConsumerState<LogsFragment> createState() => _LogsFragmentState();
-}
-
-class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
-  final _logsStateNotifier = ValueNotifier<LogsState>(
-    LogsState(loading: true),
-  );
-  late ScrollController _scrollController;
-
-  double _currentMaxWidth = 0;
-  final _tag = CacheTag.rules;
-  bool _isLoad = false;
-
-  List<Log> _logs = [];
-
-  @override
-  void initState() {
-    super.initState();
-    final position = globalState.cacheScrollPosition[_tag] ?? -1;
-    _scrollController = ScrollController(
-      initialScrollOffset: position > 0 ? position : double.maxFinite,
-    );
-    _logs = globalState.appState.logs.list;
-    _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-      logs: _logs,
-    );
-    ref.listenManual(
-      isCurrentPageProvider(
-        PageLabel.logs,
-        handler: (pageLabel, viewMode) =>
-            pageLabel == PageLabel.tools && viewMode == ViewMode.mobile,
-      ),
-      (prev, next) {
-        if (prev != next && next == true) {
-          initPageState();
-        }
-      },
-      fireImmediately: true,
-    );
-    ref.listenManual(
-      logsProvider.select((state) => state.list),
-      (prev, next) {
-        if (prev != next) {
-          final isEquality = logListEquality.equals(prev, next);
-          if (!isEquality) {
-            _logs = next;
-            updateLogsThrottler();
-          }
-        }
-      },
-    );
-  }
-
-  @override
-  List<Widget> get actions => [
-        IconButton(
-          onPressed: () {
-            _handleExport();
-          },
-          icon: const Icon(
-            Icons.file_download_outlined,
-          ),
-        ),
-      ];
-
-  @override
-  get onSearch => (value) {
-        _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-          query: value,
-        );
-      };
-
-  @override
-  get onKeywordsUpdate => (keywords) {
-        _logsStateNotifier.value =
-            _logsStateNotifier.value.copyWith(keywords: keywords);
-      };
-
-  @override
-  void dispose() {
-    _logsStateNotifier.dispose();
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  _handleExport() async {
-    final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(
-      () async {
-        return await globalState.appController.exportLogs();
-      },
-      title: appLocalizations.exportLogs,
-    );
-    if (res != true) return;
-    globalState.showMessage(
-      title: appLocalizations.tip,
-      message: TextSpan(text: appLocalizations.exportSuccess),
-    );
-  }
-
-  double _getItemHeight(Log log) {
-    final measure = globalState.measure;
-    final bodySmallHeight = measure.bodySmallHeight;
-    final bodyMediumHeight = measure.bodyMediumHeight;
-    final height = globalState.measure
-        .computeTextSize(
-          Text(
-            log.payload,
-            style: context.textTheme.bodyLarge,
-          ),
-          maxWidth: _currentMaxWidth,
-        )
-        .height;
-    return height + bodySmallHeight + 8 + bodyMediumHeight + 40 + 8;
-  }
-
-  updateLogsThrottler() {
-    throttler.call(FunctionTag.logs, () {
-      final isEquality = logListEquality.equals(
-        _logs,
-        _logsStateNotifier.value.logs,
-      );
-      if (isEquality) {
-        return;
-      }
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted) {
-          _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-            logs: _logs,
-          );
-        }
-      });
-    }, duration: commonDuration);
-  }
-
-  _preLoad() {
-    if (_isLoad == true) {
-      return;
-    }
-    _isLoad = true;
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (!mounted) {
-        return;
-      }
-      final isMobileView = ref.read(isMobileViewProvider);
-      if (isMobileView) {
-        await Future.delayed(Duration(milliseconds: 300));
-      }
-      final parts = _logs.batch(10);
-      globalState.cacheHeightMap[_tag] ??= FixedMap(
-        _logs.length,
-      );
-      for (int i = 0; i < parts.length; i++) {
-        final part = parts[i];
-        await Future(
-          () {
-            for (final log in part) {
-              globalState.cacheHeightMap[_tag]?.updateCacheValue(
-                log.payload,
-                () => _getItemHeight(log),
-              );
-            }
-          },
-        );
-      }
-      _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-        loading: false,
-      );
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (_, constraints) {
-        _currentMaxWidth = constraints.maxWidth - 40;
-        return ValueListenableBuilder<LogsState>(
-          valueListenable: _logsStateNotifier,
-          builder: (_, state, __) {
-            _preLoad();
-            final logs = state.list;
-            final items = logs
-                .map<Widget>(
-                  (log) => LogItem(
-                    key: Key(log.dateTime),
-                    log: log,
-                    onClick: (value) {
-                      context.commonScaffoldState?.addKeyword(value);
-                    },
-                  ),
-                )
-                .separated(
-                  const Divider(
-                    height: 0,
-                  ),
-                )
-                .toList();
-            final content = logs.isEmpty
-                ? NullStatus(
-                    label: appLocalizations.nullLogsDesc,
-                  )
-                : Align(
-                    alignment: Alignment.topCenter,
-                    child: CommonScrollBar(
-                      controller: _scrollController,
-                      child: ScrollToEndBox(
-                        controller: _scrollController,
-                        tag: _tag,
-                        dataSource: logs,
-                        child: CacheItemExtentListView(
-                          tag: _tag,
-                          reverse: true,
-                          shrinkWrap: true,
-                          physics: NextClampingScrollPhysics(),
-                          controller: _scrollController,
-                          itemBuilder: (_, index) {
-                            return items[index];
-                          },
-                          itemExtentBuilder: (index) {
-                            if (index.isOdd) {
-                              return 0;
-                            }
-                            return _getItemHeight(logs[index ~/ 2]);
-                          },
-                          itemCount: items.length,
-                          keyBuilder: (int index) {
-                            if (index.isOdd) {
-                              return "divider";
-                            }
-                            return logs[index ~/ 2].payload;
-                          },
-                        ),
-                      ),
-                    ),
-                  );
-            return FadeBox(
-              child: state.loading
-                  ? Center(
-                      child: CircularProgressIndicator(),
-                    )
-                  : content,
-            );
-          },
-        );
-      },
-    );
-  }
-}
-
-class LogItem extends StatelessWidget {
-  final Log log;
-  final Function(String)? onClick;
-
-  const LogItem({
-    super.key,
-    required this.log,
-    this.onClick,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
-      title: SelectableText(
-        log.payload,
-        style: context.textTheme.bodyLarge,
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SelectableText(
-            log.dateTime,
-            style: context.textTheme.bodySmall?.copyWith(
-              color: context.colorScheme.primary,
-            ),
-          ),
-          const SizedBox(
-            height: 8,
-          ),
-          Container(
-            alignment: Alignment.centerLeft,
-            child: CommonChip(
-              onPressed: () {
-                if (onClick == null) return;
-                onClick!(log.logLevel.name);
-              },
-              label: log.logLevel.name,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/fragments/proxies/proxies.dart

@@ -1,272 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/fragments/proxies/list.dart';
-import 'package:fl_clash/fragments/proxies/providers.dart';
-import 'package:fl_clash/models/common.dart';
-import 'package:fl_clash/providers/providers.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'common.dart';
-import 'setting.dart';
-import 'tab.dart';
-
-class ProxiesFragment extends ConsumerStatefulWidget {
-  const ProxiesFragment({super.key});
-
-  @override
-  ConsumerState<ProxiesFragment> createState() => _ProxiesFragmentState();
-}
-
-class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>
-    with PageMixin {
-  final GlobalKey<ProxiesTabFragmentState> _proxiesTabKey = GlobalKey();
-  bool _hasProviders = false;
-  bool _isTab = false;
-
-  @override
-  get actions => [
-        CommonPopupBox(
-          targetBuilder: (open) {
-            return IconButton(
-              onPressed: () {
-                open(
-                  offset: Offset(0, 20),
-                );
-              },
-              icon: Icon(
-                Icons.more_vert,
-              ),
-            );
-          },
-          popup: CommonPopupMenu(
-            minWidth: 180,
-            items: [
-              PopupMenuItemData(
-                icon: Icons.tune,
-                label: appLocalizations.settings,
-                onPressed: () {
-                  showSheet(
-                    context: context,
-                    props: SheetProps(
-                      isScrollControlled: true,
-                    ),
-                    builder: (_, type) {
-                      return AdaptiveSheetScaffold(
-                        type: type,
-                        body: const ProxiesSetting(),
-                        title: appLocalizations.settings,
-                      );
-                    },
-                  );
-                },
-              ),
-              if (_hasProviders)
-                PopupMenuItemData(
-                  icon: Icons.poll_outlined,
-                  label: appLocalizations.providers,
-                  onPressed: () {
-                    showExtend(
-                      context,
-                      builder: (_, type) {
-                        return ProvidersView(
-                          type: type,
-                        );
-                      },
-                    );
-                  },
-                ),
-              _isTab
-                  ? PopupMenuItemData(
-                      icon: Icons.adjust_outlined,
-                      label: "聚焦",
-                      onPressed: () {
-                        _proxiesTabKey.currentState?.scrollToGroupSelected();
-                      },
-                    )
-                  : PopupMenuItemData(
-                      icon: Icons.style_outlined,
-                      label: appLocalizations.iconConfiguration,
-                      onPressed: () {
-                        showExtend(
-                          context,
-                          builder: (_, type) {
-                            return AdaptiveSheetScaffold(
-                              type: type,
-                              body: const _IconConfigView(),
-                              title: appLocalizations.iconConfiguration,
-                            );
-                          },
-                        );
-                      },
-                    ),
-            ],
-          ),
-        )
-      ];
-
-  @override
-  get onSearch => (value) {
-        ref.read(proxiesQueryProvider.notifier).value = value;
-      };
-
-  @override
-  void dispose() {
-    super.dispose();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(proxiesQueryProvider.notifier).value = "";
-    });
-  }
-
-  @override
-  get floatingActionButton => _isTab
-      ? DelayTestButton(
-          onClick: () async {
-            await delayTest(
-              currentTabProxies,
-              currentTabTestUrl,
-            );
-          },
-        )
-      : null;
-
-  @override
-  void initState() {
-    [
-      if (_hasProviders)
-        IconButton(
-          onPressed: () {
-            showExtend(
-              context,
-              builder: (_, type) {
-                return ProvidersView(
-                  type: type,
-                );
-              },
-            );
-          },
-          icon: const Icon(
-            Icons.poll_outlined,
-          ),
-        ),
-      _isTab
-          ? IconButton(
-              onPressed: () {
-                _proxiesTabKey.currentState?.scrollToGroupSelected();
-              },
-              icon: const Icon(
-                Icons.adjust_outlined,
-              ),
-            )
-          : IconButton(
-              onPressed: () {
-                showExtend(
-                  context,
-                  builder: (_, type) {
-                    return AdaptiveSheetScaffold(
-                      type: type,
-                      body: const _IconConfigView(),
-                      title: appLocalizations.iconConfiguration,
-                    );
-                  },
-                );
-              },
-              icon: const Icon(
-                Icons.style_outlined,
-              ),
-            ),
-      IconButton(
-        onPressed: () {
-          showSheet(
-            context: context,
-            props: SheetProps(
-              isScrollControlled: true,
-            ),
-            builder: (_, type) {
-              return AdaptiveSheetScaffold(
-                type: type,
-                body: const ProxiesSetting(),
-                title: appLocalizations.settings,
-              );
-            },
-          );
-        },
-        icon: const Icon(
-          Icons.tune,
-        ),
-      )
-    ];
-    ref.listenManual(
-      proxiesActionsStateProvider,
-      fireImmediately: true,
-      (prev, next) {
-        if (prev == next) {
-          return;
-        }
-        if (next.pageLabel == PageLabel.proxies) {
-          _hasProviders = next.hasProviders;
-          _isTab = next.type == ProxiesType.tab;
-          initPageState();
-          return;
-        }
-      },
-    );
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final proxiesType = ref.watch(
-      proxiesStyleSettingProvider.select(
-        (state) => state.type,
-      ),
-    );
-    return switch (proxiesType) {
-      ProxiesType.tab => ProxiesTabFragment(
-          key: _proxiesTabKey,
-        ),
-      ProxiesType.list => const ProxiesListFragment(),
-    };
-  }
-}
-
-class _IconConfigView extends ConsumerWidget {
-  const _IconConfigView();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final iconMap = ref.watch(proxiesStyleSettingProvider.select(
-      (state) => state.iconMap,
-    ));
-    return MapInputPage(
-      title: appLocalizations.iconConfiguration,
-      map: iconMap,
-      keyLabel: appLocalizations.regExp,
-      valueLabel: appLocalizations.icon,
-      titleBuilder: (item) => Text(item.key),
-      leadingBuilder: (item) => Container(
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(16),
-        ),
-        clipBehavior: Clip.antiAlias,
-        child: CommonTargetIcon(
-          src: item.value,
-          size: 42,
-        ),
-      ),
-      subtitleBuilder: (item) => Text(
-        item.value,
-        maxLines: 2,
-        overflow: TextOverflow.ellipsis,
-      ),
-      onChange: (value) {
-        ref.read(proxiesStyleSettingProvider.notifier).updateState(
-              (state) => state.copyWith(
-                iconMap: value,
-              ),
-            );
-      },
-    );
-  }
-}

lib/l10n/intl/messages_en.dart

@@ -20,7 +20,27 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
 
-  static String m0(count) => "${count} items have been selected";
+  static String m0(label) =>
+      "Are you sure you want to delete the selected ${label}?";
+
+  static String m1(label) =>
+      "Are you sure you want to delete the current ${label}?";
+
+  static String m2(label) => "${label} details";
+
+  static String m3(label) => "${label} cannot be empty";
+
+  static String m4(label) => "Current ${label} already exists";
+
+  static String m5(label) => "No ${label} at the moment";
+
+  static String m6(label) => "${label} must be a number";
+
+  static String m7(label) => "${label} must be between 1024 and 49151";
+
+  static String m8(count) => "${count} items have been selected";
+
+  static String m9(label) => "${label} must be a url";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -36,9 +56,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "The selected application will be excluded from VPN",
     ),
     "account": MessageLookupByLibrary.simpleMessage("Account"),
-    "accountTip": MessageLookupByLibrary.simpleMessage(
-      "Account cannot be empty",
-    ),
     "action": MessageLookupByLibrary.simpleMessage("Action"),
     "action_mode": MessageLookupByLibrary.simpleMessage("Switch mode"),
     "action_proxy": MessageLookupByLibrary.simpleMessage("System proxy"),
@@ -108,6 +125,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "autoRunDesc": MessageLookupByLibrary.simpleMessage(
       "Auto run when the application is opened",
     ),
+    "autoSetSystemDns": MessageLookupByLibrary.simpleMessage(
+      "Auto set system DNS",
+    ),
     "autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"),
     "autoUpdateInterval": MessageLookupByLibrary.simpleMessage(
       "Auto update interval (minutes)",
@@ -149,9 +169,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "clearData": MessageLookupByLibrary.simpleMessage("Clear Data"),
     "clipboardExport": MessageLookupByLibrary.simpleMessage("Export clipboard"),
     "clipboardImport": MessageLookupByLibrary.simpleMessage("Clipboard import"),
-    "colorExists": MessageLookupByLibrary.simpleMessage(
-      "Current color already exists",
-    ),
+    "color": MessageLookupByLibrary.simpleMessage("Color"),
     "colorSchemes": MessageLookupByLibrary.simpleMessage("Color schemes"),
     "columns": MessageLookupByLibrary.simpleMessage("Columns"),
     "compatible": MessageLookupByLibrary.simpleMessage("Compatibility mode"),
@@ -159,6 +177,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
     ),
     "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
+    "connection": MessageLookupByLibrary.simpleMessage("Connection"),
     "connections": MessageLookupByLibrary.simpleMessage("Connections"),
     "connectionsDesc": MessageLookupByLibrary.simpleMessage(
       "View current connections data",
@@ -166,9 +185,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
     "contactMe": MessageLookupByLibrary.simpleMessage("Contact me"),
     "content": MessageLookupByLibrary.simpleMessage("Content"),
-    "contentEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Content cannot be empty",
-    ),
     "contentScheme": MessageLookupByLibrary.simpleMessage("Content"),
     "copy": MessageLookupByLibrary.simpleMessage("Copy"),
     "copyEnvVar": MessageLookupByLibrary.simpleMessage(
@@ -181,6 +197,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "country": MessageLookupByLibrary.simpleMessage("Country"),
     "crashTest": MessageLookupByLibrary.simpleMessage("Crash test"),
     "create": MessageLookupByLibrary.simpleMessage("Create"),
+    "creationTime": MessageLookupByLibrary.simpleMessage("Creation time"),
     "cut": MessageLookupByLibrary.simpleMessage("Cut"),
     "dark": MessageLookupByLibrary.simpleMessage("Dark"),
     "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
@@ -196,18 +213,19 @@ class MessageLookup extends MessageLookupByLibrary {
     "delay": MessageLookupByLibrary.simpleMessage("Delay"),
     "delaySort": MessageLookupByLibrary.simpleMessage("Sort by delay"),
     "delete": MessageLookupByLibrary.simpleMessage("Delete"),
-    "deleteColorTip": MessageLookupByLibrary.simpleMessage(
-      "Are you sure you want to delete the current color?",
-    ),
-    "deleteProfileTip": MessageLookupByLibrary.simpleMessage(
-      "Sure you want to delete the current profile?",
-    ),
-    "deleteRuleTip": MessageLookupByLibrary.simpleMessage(
-      "Are you sure you want to delete the selected rule?",
-    ),
+    "deleteMultipTip": m0,
+    "deleteTip": m1,
     "desc": MessageLookupByLibrary.simpleMessage(
       "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
     ),
+    "destination": MessageLookupByLibrary.simpleMessage("Destination"),
+    "destinationGeoIP": MessageLookupByLibrary.simpleMessage(
+      "Destination GeoIP",
+    ),
+    "destinationIPASN": MessageLookupByLibrary.simpleMessage(
+      "Destination IPASN",
+    ),
+    "details": m2,
     "detectionTip": MessageLookupByLibrary.simpleMessage(
       "Relying on third-party api is for reference only",
     ),
@@ -236,6 +254,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "domain": MessageLookupByLibrary.simpleMessage("Domain"),
     "download": MessageLookupByLibrary.simpleMessage("Download"),
     "edit": MessageLookupByLibrary.simpleMessage("Edit"),
+    "emptyTip": m3,
     "en": MessageLookupByLibrary.simpleMessage("English"),
     "enableOverride": MessageLookupByLibrary.simpleMessage("Enable override"),
     "entries": MessageLookupByLibrary.simpleMessage(" entries"),
@@ -243,6 +262,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "excludeDesc": MessageLookupByLibrary.simpleMessage(
       "When the app is in the background, the app is hidden from the recent task",
     ),
+    "existsTip": m4,
     "exit": MessageLookupByLibrary.simpleMessage("Exit"),
     "expand": MessageLookupByLibrary.simpleMessage("Standard"),
     "expirationTime": MessageLookupByLibrary.simpleMessage("Expiration time"),
@@ -304,6 +324,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hasCacheChange": MessageLookupByLibrary.simpleMessage(
       "Do you want to cache the changes?",
     ),
+    "host": MessageLookupByLibrary.simpleMessage("Host"),
     "hostsDesc": MessageLookupByLibrary.simpleMessage("Add Hosts"),
     "hotkeyConflict": MessageLookupByLibrary.simpleMessage("Hotkey conflict"),
     "hotkeyManagement": MessageLookupByLibrary.simpleMessage(
@@ -318,7 +339,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Icon configuration",
     ),
     "iconStyle": MessageLookupByLibrary.simpleMessage("Icon style"),
+    "import": MessageLookupByLibrary.simpleMessage("Import"),
+    "importFile": MessageLookupByLibrary.simpleMessage("Import from file"),
     "importFromURL": MessageLookupByLibrary.simpleMessage("Import from URL"),
+    "importUrl": MessageLookupByLibrary.simpleMessage("Import from URL"),
     "infiniteTime": MessageLookupByLibrary.simpleMessage("Long term effective"),
     "init": MessageLookupByLibrary.simpleMessage("Init"),
     "inputCorrectHotkey": MessageLookupByLibrary.simpleMessage(
@@ -328,6 +352,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Intelligent selection",
     ),
     "internet": MessageLookupByLibrary.simpleMessage("Internet"),
+    "interval": MessageLookupByLibrary.simpleMessage("Interval"),
     "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
     "ipcidr": MessageLookupByLibrary.simpleMessage("Ipcidr"),
     "ipv6Desc": MessageLookupByLibrary.simpleMessage(
@@ -342,9 +367,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Tcp keep alive interval",
     ),
     "key": MessageLookupByLibrary.simpleMessage("Key"),
-    "keyExists": MessageLookupByLibrary.simpleMessage(
-      "The current key already exists",
-    ),
     "language": MessageLookupByLibrary.simpleMessage("Language"),
     "layout": MessageLookupByLibrary.simpleMessage("Layout"),
     "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -357,6 +379,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "localRecoveryDesc": MessageLookupByLibrary.simpleMessage(
       "Recovery data from file",
     ),
+    "log": MessageLookupByLibrary.simpleMessage("Log"),
     "logLevel": MessageLookupByLibrary.simpleMessage("LogLevel"),
     "logcat": MessageLookupByLibrary.simpleMessage("Logcat"),
     "logcatDesc": MessageLookupByLibrary.simpleMessage(
@@ -381,6 +404,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Modify the default system exit event",
     ),
     "minutes": MessageLookupByLibrary.simpleMessage("Minutes"),
+    "mixedPort": MessageLookupByLibrary.simpleMessage("Mixed Port"),
     "mode": MessageLookupByLibrary.simpleMessage("Mode"),
     "monochromeScheme": MessageLookupByLibrary.simpleMessage("Monochrome"),
     "months": MessageLookupByLibrary.simpleMessage("Months"),
@@ -405,6 +429,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Network detection",
     ),
     "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
+    "networkType": MessageLookupByLibrary.simpleMessage("Network type"),
     "neutralScheme": MessageLookupByLibrary.simpleMessage("Neutral"),
     "noData": MessageLookupByLibrary.simpleMessage("No data"),
     "noHotKey": MessageLookupByLibrary.simpleMessage("No HotKey"),
@@ -419,22 +444,14 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "noResolve": MessageLookupByLibrary.simpleMessage("No resolve IP"),
     "none": MessageLookupByLibrary.simpleMessage("none"),
-    "notEmpty": MessageLookupByLibrary.simpleMessage("Cannot be empty"),
     "notSelectedTip": MessageLookupByLibrary.simpleMessage(
       "The current proxy group cannot be selected.",
     ),
-    "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage(
-      "No connections",
-    ),
-    "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage(
-      "Unable to obtain core info",
-    ),
-    "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
     "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
       "No profile, Please add a profile",
     ),
-    "nullProxies": MessageLookupByLibrary.simpleMessage("No proxies"),
-    "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
+    "nullTip": m5,
+    "numberTip": m6,
     "oneColumn": MessageLookupByLibrary.simpleMessage("One column"),
     "onlyIcon": MessageLookupByLibrary.simpleMessage("Icon"),
     "onlyOtherApps": MessageLookupByLibrary.simpleMessage(
@@ -460,18 +477,21 @@ class MessageLookup extends MessageLookupByLibrary {
     "overrideDnsDesc": MessageLookupByLibrary.simpleMessage(
       "Turning it on will override the DNS options in the profile",
     ),
+    "overrideInvalidTip": MessageLookupByLibrary.simpleMessage(
+      "Does not take effect in script mode",
+    ),
     "overrideOriginRules": MessageLookupByLibrary.simpleMessage(
       "Override the original rule",
     ),
     "palette": MessageLookupByLibrary.simpleMessage("Palette"),
     "password": MessageLookupByLibrary.simpleMessage("Password"),
-    "passwordTip": MessageLookupByLibrary.simpleMessage(
-      "Password cannot be empty",
-    ),
     "paste": MessageLookupByLibrary.simpleMessage("Paste"),
     "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage(
       "Please bind WebDAV",
     ),
+    "pleaseEnterScriptName": MessageLookupByLibrary.simpleMessage(
+      "Please enter a script name",
+    ),
     "pleaseInputAdminPassword": MessageLookupByLibrary.simpleMessage(
       "Please enter the admin password",
     ),
@@ -482,6 +502,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Please upload a valid QR code",
     ),
     "port": MessageLookupByLibrary.simpleMessage("Port"),
+    "portConflictTip": MessageLookupByLibrary.simpleMessage(
+      "Please enter a different port",
+    ),
+    "portTip": m7,
     "preferH3Desc": MessageLookupByLibrary.simpleMessage(
       "Prioritize the use of DOH\'s http/3",
     ),
@@ -515,10 +539,12 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("Profiles"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("Profiles sort"),
+    "progress": MessageLookupByLibrary.simpleMessage("Progress"),
     "project": MessageLookupByLibrary.simpleMessage("Project"),
     "providers": MessageLookupByLibrary.simpleMessage("Providers"),
     "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
     "proxiesSetting": MessageLookupByLibrary.simpleMessage("Proxies setting"),
+    "proxyChains": MessageLookupByLibrary.simpleMessage("Proxy chains"),
     "proxyGroup": MessageLookupByLibrary.simpleMessage("Proxy group"),
     "proxyNameserver": MessageLookupByLibrary.simpleMessage("Proxy nameserver"),
     "proxyNameserverDesc": MessageLookupByLibrary.simpleMessage(
@@ -550,16 +576,22 @@ class MessageLookup extends MessageLookupByLibrary {
       "Override",
     ),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage("Recovery success"),
+    "redirPort": MessageLookupByLibrary.simpleMessage("Redir Port"),
     "redo": MessageLookupByLibrary.simpleMessage("redo"),
     "regExp": MessageLookupByLibrary.simpleMessage("RegExp"),
     "remote": MessageLookupByLibrary.simpleMessage("Remote"),
     "remoteBackupDesc": MessageLookupByLibrary.simpleMessage(
       "Backup local data to WebDAV",
     ),
+    "remoteDestination": MessageLookupByLibrary.simpleMessage(
+      "Remote destination",
+    ),
     "remoteRecoveryDesc": MessageLookupByLibrary.simpleMessage(
       "Recovery data from WebDAV",
     ),
     "remove": MessageLookupByLibrary.simpleMessage("Remove"),
+    "rename": MessageLookupByLibrary.simpleMessage("Rename"),
+    "request": MessageLookupByLibrary.simpleMessage("Request"),
     "requests": MessageLookupByLibrary.simpleMessage("Requests"),
     "requestsDesc": MessageLookupByLibrary.simpleMessage(
       "View recently request records",
@@ -586,14 +618,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "ru": MessageLookupByLibrary.simpleMessage("Russian"),
     "rule": MessageLookupByLibrary.simpleMessage("Rule"),
     "ruleName": MessageLookupByLibrary.simpleMessage("Rule name"),
-    "ruleProviderEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Rule provider cannot be empty",
-    ),
     "ruleProviders": MessageLookupByLibrary.simpleMessage("Rule providers"),
     "ruleTarget": MessageLookupByLibrary.simpleMessage("Rule target"),
-    "ruleTargetEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Rule target cannot be empty",
-    ),
     "save": MessageLookupByLibrary.simpleMessage("Save"),
     "saveChanges": MessageLookupByLibrary.simpleMessage(
       "Do you want to save the changes?",
@@ -601,11 +627,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "saveTip": MessageLookupByLibrary.simpleMessage(
       "Are you sure you want to save?",
     ),
+    "script": MessageLookupByLibrary.simpleMessage("Script"),
     "search": MessageLookupByLibrary.simpleMessage("Search"),
     "seconds": MessageLookupByLibrary.simpleMessage("Seconds"),
     "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
     "selected": MessageLookupByLibrary.simpleMessage("Selected"),
-    "selectedCountTitle": m0,
+    "selectedCountTitle": m8,
     "settings": MessageLookupByLibrary.simpleMessage("Settings"),
     "show": MessageLookupByLibrary.simpleMessage("Show"),
     "shrink": MessageLookupByLibrary.simpleMessage("Shrink"),
@@ -614,9 +641,12 @@ class MessageLookup extends MessageLookupByLibrary {
       "Start in the background",
     ),
     "size": MessageLookupByLibrary.simpleMessage("Size"),
+    "socksPort": MessageLookupByLibrary.simpleMessage("Socks Port"),
     "sort": MessageLookupByLibrary.simpleMessage("Sort"),
     "source": MessageLookupByLibrary.simpleMessage("Source"),
     "sourceIp": MessageLookupByLibrary.simpleMessage("Source IP"),
+    "specialProxy": MessageLookupByLibrary.simpleMessage("Special proxy"),
+    "specialRules": MessageLookupByLibrary.simpleMessage("special rules"),
     "stackMode": MessageLookupByLibrary.simpleMessage("Stack mode"),
     "standard": MessageLookupByLibrary.simpleMessage("Standard"),
     "start": MessageLookupByLibrary.simpleMessage("Start"),
@@ -629,9 +659,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
     "style": MessageLookupByLibrary.simpleMessage("Style"),
     "subRule": MessageLookupByLibrary.simpleMessage("Sub rule"),
-    "subRuleEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Sub rule content cannot be empty",
-    ),
     "submit": MessageLookupByLibrary.simpleMessage("Submit"),
     "sync": MessageLookupByLibrary.simpleMessage("Sync"),
     "system": MessageLookupByLibrary.simpleMessage("System"),
@@ -665,6 +692,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "toggle": MessageLookupByLibrary.simpleMessage("Toggle"),
     "tonalSpotScheme": MessageLookupByLibrary.simpleMessage("TonalSpot"),
     "tools": MessageLookupByLibrary.simpleMessage("Tools"),
+    "tproxyPort": MessageLookupByLibrary.simpleMessage("Tproxy Port"),
     "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
     "tun": MessageLookupByLibrary.simpleMessage("TUN"),
     "tunDesc": MessageLookupByLibrary.simpleMessage(
@@ -680,18 +708,17 @@ class MessageLookup extends MessageLookupByLibrary {
       "Remove extra delays such as handshaking",
     ),
     "unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
+    "unnamed": MessageLookupByLibrary.simpleMessage("Unnamed"),
     "update": MessageLookupByLibrary.simpleMessage("Update"),
     "upload": MessageLookupByLibrary.simpleMessage("Upload"),
     "url": MessageLookupByLibrary.simpleMessage("URL"),
     "urlDesc": MessageLookupByLibrary.simpleMessage(
       "Obtain profile through URL",
     ),
+    "urlTip": m9,
     "useHosts": MessageLookupByLibrary.simpleMessage("Use hosts"),
     "useSystemHosts": MessageLookupByLibrary.simpleMessage("Use system hosts"),
     "value": MessageLookupByLibrary.simpleMessage("Value"),
-    "valueExists": MessageLookupByLibrary.simpleMessage(
-      "The current value already exists",
-    ),
     "vibrantScheme": MessageLookupByLibrary.simpleMessage("Vibrant"),
     "view": MessageLookupByLibrary.simpleMessage("View"),
     "vpnDesc": MessageLookupByLibrary.simpleMessage(

lib/l10n/intl/messages_ja.dart

@@ -20,7 +20,25 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ja';
 
-  static String m0(count) => "${count} 項目が選択されています";
+  static String m0(label) => "選択された${label}を削除してもよろしいですか？";
+
+  static String m1(label) => "現在の${label}を削除してもよろしいですか？";
+
+  static String m2(label) => "${label}詳細";
+
+  static String m3(label) => "${label}は空欄にできません";
+
+  static String m4(label) => "現在の${label}は既に存在しています";
+
+  static String m5(label) => "現在${label}はありません";
+
+  static String m6(label) => "${label}は数字でなければなりません";
+
+  static String m7(label) => "${label} は 1024 から 49151 の間でなければなりません";
+
+  static String m8(count) => "${count} 項目が選択されています";
+
+  static String m9(label) => "${label}はURLである必要があります";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -36,7 +54,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "選択したアプリをVPNから除外",
     ),
     "account": MessageLookupByLibrary.simpleMessage("アカウント"),
-    "accountTip": MessageLookupByLibrary.simpleMessage("アカウントは必須です"),
     "action": MessageLookupByLibrary.simpleMessage("アクション"),
     "action_mode": MessageLookupByLibrary.simpleMessage("モード切替"),
     "action_proxy": MessageLookupByLibrary.simpleMessage("システムプロキシ"),
@@ -78,6 +95,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "autoLaunchDesc": MessageLookupByLibrary.simpleMessage("システムの自動起動に従う"),
     "autoRun": MessageLookupByLibrary.simpleMessage("自動実行"),
     "autoRunDesc": MessageLookupByLibrary.simpleMessage("アプリ起動時に自動実行"),
+    "autoSetSystemDns": MessageLookupByLibrary.simpleMessage("オートセットシステムDNS"),
     "autoUpdate": MessageLookupByLibrary.simpleMessage("自動更新"),
     "autoUpdateInterval": MessageLookupByLibrary.simpleMessage("自動更新間隔（分）"),
     "backup": MessageLookupByLibrary.simpleMessage("バックアップ"),
@@ -107,7 +125,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "clearData": MessageLookupByLibrary.simpleMessage("データを消去"),
     "clipboardExport": MessageLookupByLibrary.simpleMessage("クリップボードにエクスポート"),
     "clipboardImport": MessageLookupByLibrary.simpleMessage("クリップボードからインポート"),
-    "colorExists": MessageLookupByLibrary.simpleMessage("この色は既に存在します"),
+    "color": MessageLookupByLibrary.simpleMessage("カラー"),
     "colorSchemes": MessageLookupByLibrary.simpleMessage("カラースキーム"),
     "columns": MessageLookupByLibrary.simpleMessage("列"),
     "compatible": MessageLookupByLibrary.simpleMessage("互換モード"),
@@ -115,12 +133,12 @@ class MessageLookup extends MessageLookupByLibrary {
       "有効化すると一部機能を失いますが、Clashの完全サポートを獲得",
     ),
     "confirm": MessageLookupByLibrary.simpleMessage("確認"),
+    "connection": MessageLookupByLibrary.simpleMessage("接続"),
     "connections": MessageLookupByLibrary.simpleMessage("接続"),
     "connectionsDesc": MessageLookupByLibrary.simpleMessage("現在の接続データを表示"),
     "connectivity": MessageLookupByLibrary.simpleMessage("接続性："),
     "contactMe": MessageLookupByLibrary.simpleMessage("連絡する"),
     "content": MessageLookupByLibrary.simpleMessage("内容"),
-    "contentEmptyTip": MessageLookupByLibrary.simpleMessage("内容は必須です"),
     "contentScheme": MessageLookupByLibrary.simpleMessage("コンテンツテーマ"),
     "copy": MessageLookupByLibrary.simpleMessage("コピー"),
     "copyEnvVar": MessageLookupByLibrary.simpleMessage("環境変数をコピー"),
@@ -131,6 +149,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "country": MessageLookupByLibrary.simpleMessage("国"),
     "crashTest": MessageLookupByLibrary.simpleMessage("クラッシュテスト"),
     "create": MessageLookupByLibrary.simpleMessage("作成"),
+    "creationTime": MessageLookupByLibrary.simpleMessage("作成時間"),
     "cut": MessageLookupByLibrary.simpleMessage("切り取り"),
     "dark": MessageLookupByLibrary.simpleMessage("ダーク"),
     "dashboard": MessageLookupByLibrary.simpleMessage("ダッシュボード"),
@@ -144,14 +163,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "delay": MessageLookupByLibrary.simpleMessage("遅延"),
     "delaySort": MessageLookupByLibrary.simpleMessage("遅延順"),
     "delete": MessageLookupByLibrary.simpleMessage("削除"),
-    "deleteColorTip": MessageLookupByLibrary.simpleMessage("現在の色を削除しますか？"),
-    "deleteProfileTip": MessageLookupByLibrary.simpleMessage(
-      "現在のプロファイルを削除しますか？",
-    ),
-    "deleteRuleTip": MessageLookupByLibrary.simpleMessage("選択したルールを削除しますか？"),
+    "deleteMultipTip": m0,
+    "deleteTip": m1,
     "desc": MessageLookupByLibrary.simpleMessage(
       "ClashMetaベースのマルチプラットフォームプロキシクライアント。シンプルで使いやすく、オープンソースで広告なし。",
     ),
+    "destination": MessageLookupByLibrary.simpleMessage("宛先"),
+    "destinationGeoIP": MessageLookupByLibrary.simpleMessage("宛先地理情報"),
+    "destinationIPASN": MessageLookupByLibrary.simpleMessage("宛先IP ASN"),
+    "details": m2,
     "detectionTip": MessageLookupByLibrary.simpleMessage("サードパーティAPIに依存（参考値）"),
     "developerMode": MessageLookupByLibrary.simpleMessage("デベロッパーモード"),
     "developerModeEnableTip": MessageLookupByLibrary.simpleMessage(
@@ -170,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "domain": MessageLookupByLibrary.simpleMessage("ドメイン"),
     "download": MessageLookupByLibrary.simpleMessage("ダウンロード"),
     "edit": MessageLookupByLibrary.simpleMessage("編集"),
+    "emptyTip": m3,
     "en": MessageLookupByLibrary.simpleMessage("英語"),
     "enableOverride": MessageLookupByLibrary.simpleMessage("上書きを有効化"),
     "entries": MessageLookupByLibrary.simpleMessage(" エントリ"),
@@ -177,6 +198,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "excludeDesc": MessageLookupByLibrary.simpleMessage(
       "アプリがバックグラウンド時に最近のタスクから非表示",
     ),
+    "existsTip": m4,
     "exit": MessageLookupByLibrary.simpleMessage("終了"),
     "expand": MessageLookupByLibrary.simpleMessage("標準"),
     "expirationTime": MessageLookupByLibrary.simpleMessage("有効期限"),
@@ -222,6 +244,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "go": MessageLookupByLibrary.simpleMessage("移動"),
     "goDownload": MessageLookupByLibrary.simpleMessage("ダウンロードへ"),
     "hasCacheChange": MessageLookupByLibrary.simpleMessage("変更をキャッシュしますか？"),
+    "host": MessageLookupByLibrary.simpleMessage("ホスト"),
     "hostsDesc": MessageLookupByLibrary.simpleMessage("ホストを追加"),
     "hotkeyConflict": MessageLookupByLibrary.simpleMessage("ホットキー競合"),
     "hotkeyManagement": MessageLookupByLibrary.simpleMessage("ホットキー管理"),
@@ -232,12 +255,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "icon": MessageLookupByLibrary.simpleMessage("アイコン"),
     "iconConfiguration": MessageLookupByLibrary.simpleMessage("アイコン設定"),
     "iconStyle": MessageLookupByLibrary.simpleMessage("アイコンスタイル"),
+    "import": MessageLookupByLibrary.simpleMessage("インポート"),
+    "importFile": MessageLookupByLibrary.simpleMessage("ファイルからインポート"),
     "importFromURL": MessageLookupByLibrary.simpleMessage("URLからインポート"),
+    "importUrl": MessageLookupByLibrary.simpleMessage("URLからインポート"),
     "infiniteTime": MessageLookupByLibrary.simpleMessage("長期有効"),
     "init": MessageLookupByLibrary.simpleMessage("初期化"),
     "inputCorrectHotkey": MessageLookupByLibrary.simpleMessage("正しいホットキーを入力"),
     "intelligentSelected": MessageLookupByLibrary.simpleMessage("インテリジェント選択"),
     "internet": MessageLookupByLibrary.simpleMessage("インターネット"),
+    "interval": MessageLookupByLibrary.simpleMessage("インターバル"),
     "intranetIP": MessageLookupByLibrary.simpleMessage("イントラネットIP"),
     "ipcidr": MessageLookupByLibrary.simpleMessage("IPCIDR"),
     "ipv6Desc": MessageLookupByLibrary.simpleMessage("有効化するとIPv6トラフィックを受信可能"),
@@ -248,7 +275,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "TCPキープアライブ間隔",
     ),
     "key": MessageLookupByLibrary.simpleMessage("キー"),
-    "keyExists": MessageLookupByLibrary.simpleMessage("現在のキーは既に存在します"),
     "language": MessageLookupByLibrary.simpleMessage("言語"),
     "layout": MessageLookupByLibrary.simpleMessage("レイアウト"),
     "light": MessageLookupByLibrary.simpleMessage("ライト"),
@@ -257,6 +283,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "local": MessageLookupByLibrary.simpleMessage("ローカル"),
     "localBackupDesc": MessageLookupByLibrary.simpleMessage("ローカルにデータをバックアップ"),
     "localRecoveryDesc": MessageLookupByLibrary.simpleMessage("ファイルからデータを復元"),
+    "log": MessageLookupByLibrary.simpleMessage("ログ"),
     "logLevel": MessageLookupByLibrary.simpleMessage("ログレベル"),
     "logcat": MessageLookupByLibrary.simpleMessage("ログキャット"),
     "logcatDesc": MessageLookupByLibrary.simpleMessage("無効化するとログエントリを非表示"),
@@ -275,6 +302,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "システムの終了イベントを変更",
     ),
     "minutes": MessageLookupByLibrary.simpleMessage("分"),
+    "mixedPort": MessageLookupByLibrary.simpleMessage("混合ポート"),
     "mode": MessageLookupByLibrary.simpleMessage("モード"),
     "monochromeScheme": MessageLookupByLibrary.simpleMessage("モノクローム"),
     "months": MessageLookupByLibrary.simpleMessage("月"),
@@ -291,6 +319,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "networkDesc": MessageLookupByLibrary.simpleMessage("ネットワーク関連設定の変更"),
     "networkDetection": MessageLookupByLibrary.simpleMessage("ネットワーク検出"),
     "networkSpeed": MessageLookupByLibrary.simpleMessage("ネットワーク速度"),
+    "networkType": MessageLookupByLibrary.simpleMessage("ネットワーク種別"),
     "neutralScheme": MessageLookupByLibrary.simpleMessage("ニュートラル"),
     "noData": MessageLookupByLibrary.simpleMessage("データなし"),
     "noHotKey": MessageLookupByLibrary.simpleMessage("ホットキーなし"),
@@ -305,18 +334,14 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "noResolve": MessageLookupByLibrary.simpleMessage("IPを解決しない"),
     "none": MessageLookupByLibrary.simpleMessage("なし"),
-    "notEmpty": MessageLookupByLibrary.simpleMessage("空欄不可"),
     "notSelectedTip": MessageLookupByLibrary.simpleMessage(
       "現在のプロキシグループは選択できません",
     ),
-    "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage("接続なし"),
-    "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("コア情報を取得できません"),
-    "nullLogsDesc": MessageLookupByLibrary.simpleMessage("ログがありません"),
     "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
       "プロファイルがありません。追加してください",
     ),
-    "nullProxies": MessageLookupByLibrary.simpleMessage("プロキシなし"),
-    "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("リクエストなし"),
+    "nullTip": m5,
+    "numberTip": m6,
     "oneColumn": MessageLookupByLibrary.simpleMessage("1列"),
     "onlyIcon": MessageLookupByLibrary.simpleMessage("アイコンのみ"),
     "onlyOtherApps": MessageLookupByLibrary.simpleMessage("サードパーティアプリのみ"),
@@ -334,14 +359,19 @@ class MessageLookup extends MessageLookupByLibrary {
     "overrideDnsDesc": MessageLookupByLibrary.simpleMessage(
       "有効化するとプロファイルのDNS設定を上書き",
     ),
+    "overrideInvalidTip": MessageLookupByLibrary.simpleMessage(
+      "スクリプトモードでは有効になりません",
+    ),
     "overrideOriginRules": MessageLookupByLibrary.simpleMessage("元のルールを上書き"),
     "palette": MessageLookupByLibrary.simpleMessage("パレット"),
     "password": MessageLookupByLibrary.simpleMessage("パスワード"),
-    "passwordTip": MessageLookupByLibrary.simpleMessage("パスワードは必須です"),
     "paste": MessageLookupByLibrary.simpleMessage("貼り付け"),
     "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage(
       "WebDAVをバインドしてください",
     ),
+    "pleaseEnterScriptName": MessageLookupByLibrary.simpleMessage(
+      "スクリプト名を入力してください",
+    ),
     "pleaseInputAdminPassword": MessageLookupByLibrary.simpleMessage(
       "管理者パスワードを入力",
     ),
@@ -352,6 +382,8 @@ class MessageLookup extends MessageLookupByLibrary {
       "有効なQRコードをアップロードしてください",
     ),
     "port": MessageLookupByLibrary.simpleMessage("ポート"),
+    "portConflictTip": MessageLookupByLibrary.simpleMessage("別のポートを入力してください"),
+    "portTip": m7,
     "preferH3Desc": MessageLookupByLibrary.simpleMessage("DOHのHTTP/3を優先使用"),
     "pressKeyboard": MessageLookupByLibrary.simpleMessage("キーボードを押してください"),
     "preview": MessageLookupByLibrary.simpleMessage("プレビュー"),
@@ -377,10 +409,12 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("プロファイル一覧"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("プロファイルの並び替え"),
+    "progress": MessageLookupByLibrary.simpleMessage("進捗"),
     "project": MessageLookupByLibrary.simpleMessage("プロジェクト"),
     "providers": MessageLookupByLibrary.simpleMessage("プロバイダー"),
     "proxies": MessageLookupByLibrary.simpleMessage("プロキシ"),
     "proxiesSetting": MessageLookupByLibrary.simpleMessage("プロキシ設定"),
+    "proxyChains": MessageLookupByLibrary.simpleMessage("プロキシチェーン"),
     "proxyGroup": MessageLookupByLibrary.simpleMessage("プロキシグループ"),
     "proxyNameserver": MessageLookupByLibrary.simpleMessage("プロキシネームサーバー"),
     "proxyNameserverDesc": MessageLookupByLibrary.simpleMessage(
@@ -402,16 +436,20 @@ class MessageLookup extends MessageLookupByLibrary {
       "オーバーライド",
     ),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage("復元成功"),
+    "redirPort": MessageLookupByLibrary.simpleMessage("Redirポート"),
     "redo": MessageLookupByLibrary.simpleMessage("やり直す"),
     "regExp": MessageLookupByLibrary.simpleMessage("正規表現"),
     "remote": MessageLookupByLibrary.simpleMessage("リモート"),
     "remoteBackupDesc": MessageLookupByLibrary.simpleMessage(
       "WebDAVにデータをバックアップ",
     ),
+    "remoteDestination": MessageLookupByLibrary.simpleMessage("リモート宛先"),
     "remoteRecoveryDesc": MessageLookupByLibrary.simpleMessage(
       "WebDAVからデータを復元",
     ),
     "remove": MessageLookupByLibrary.simpleMessage("削除"),
+    "rename": MessageLookupByLibrary.simpleMessage("リネーム"),
+    "request": MessageLookupByLibrary.simpleMessage("リクエスト"),
     "requests": MessageLookupByLibrary.simpleMessage("リクエスト"),
     "requestsDesc": MessageLookupByLibrary.simpleMessage("最近のリクエスト記録を表示"),
     "reset": MessageLookupByLibrary.simpleMessage("リセット"),
@@ -432,29 +470,29 @@ class MessageLookup extends MessageLookupByLibrary {
     "ru": MessageLookupByLibrary.simpleMessage("ロシア語"),
     "rule": MessageLookupByLibrary.simpleMessage("ルール"),
     "ruleName": MessageLookupByLibrary.simpleMessage("ルール名"),
-    "ruleProviderEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "ルールプロバイダーは必須です",
-    ),
     "ruleProviders": MessageLookupByLibrary.simpleMessage("ルールプロバイダー"),
     "ruleTarget": MessageLookupByLibrary.simpleMessage("ルール対象"),
-    "ruleTargetEmptyTip": MessageLookupByLibrary.simpleMessage("ルール対象は必須です"),
     "save": MessageLookupByLibrary.simpleMessage("保存"),
     "saveChanges": MessageLookupByLibrary.simpleMessage("変更を保存しますか？"),
     "saveTip": MessageLookupByLibrary.simpleMessage("保存してもよろしいですか？"),
+    "script": MessageLookupByLibrary.simpleMessage("スクリプト"),
     "search": MessageLookupByLibrary.simpleMessage("検索"),
     "seconds": MessageLookupByLibrary.simpleMessage("秒"),
     "selectAll": MessageLookupByLibrary.simpleMessage("すべて選択"),
     "selected": MessageLookupByLibrary.simpleMessage("選択済み"),
-    "selectedCountTitle": m0,
+    "selectedCountTitle": m8,
     "settings": MessageLookupByLibrary.simpleMessage("設定"),
     "show": MessageLookupByLibrary.simpleMessage("表示"),
     "shrink": MessageLookupByLibrary.simpleMessage("縮小"),
     "silentLaunch": MessageLookupByLibrary.simpleMessage("バックグラウンド起動"),
     "silentLaunchDesc": MessageLookupByLibrary.simpleMessage("バックグラウンドで起動"),
     "size": MessageLookupByLibrary.simpleMessage("サイズ"),
+    "socksPort": MessageLookupByLibrary.simpleMessage("Socksポート"),
     "sort": MessageLookupByLibrary.simpleMessage("並び替え"),
     "source": MessageLookupByLibrary.simpleMessage("ソース"),
     "sourceIp": MessageLookupByLibrary.simpleMessage("送信元IP"),
+    "specialProxy": MessageLookupByLibrary.simpleMessage("特殊プロキシ"),
+    "specialRules": MessageLookupByLibrary.simpleMessage("特殊ルール"),
     "stackMode": MessageLookupByLibrary.simpleMessage("スタックモード"),
     "standard": MessageLookupByLibrary.simpleMessage("標準"),
     "start": MessageLookupByLibrary.simpleMessage("開始"),
@@ -465,7 +503,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "stopVpn": MessageLookupByLibrary.simpleMessage("VPNを停止中..."),
     "style": MessageLookupByLibrary.simpleMessage("スタイル"),
     "subRule": MessageLookupByLibrary.simpleMessage("サブルール"),
-    "subRuleEmptyTip": MessageLookupByLibrary.simpleMessage("サブルールの内容は必須です"),
     "submit": MessageLookupByLibrary.simpleMessage("送信"),
     "sync": MessageLookupByLibrary.simpleMessage("同期"),
     "system": MessageLookupByLibrary.simpleMessage("システム"),
@@ -493,6 +530,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "toggle": MessageLookupByLibrary.simpleMessage("トグル"),
     "tonalSpotScheme": MessageLookupByLibrary.simpleMessage("トーンスポット"),
     "tools": MessageLookupByLibrary.simpleMessage("ツール"),
+    "tproxyPort": MessageLookupByLibrary.simpleMessage("Tproxyポート"),
     "trafficUsage": MessageLookupByLibrary.simpleMessage("トラフィック使用量"),
     "tun": MessageLookupByLibrary.simpleMessage("TUN"),
     "tunDesc": MessageLookupByLibrary.simpleMessage("管理者モードでのみ有効"),
@@ -506,14 +544,15 @@ class MessageLookup extends MessageLookupByLibrary {
       "ハンドシェイクなどの余分な遅延を削除",
     ),
     "unknown": MessageLookupByLibrary.simpleMessage("不明"),
+    "unnamed": MessageLookupByLibrary.simpleMessage("無題"),
     "update": MessageLookupByLibrary.simpleMessage("更新"),
     "upload": MessageLookupByLibrary.simpleMessage("アップロード"),
     "url": MessageLookupByLibrary.simpleMessage("URL"),
     "urlDesc": MessageLookupByLibrary.simpleMessage("URL経由でプロファイルを取得"),
+    "urlTip": m9,
     "useHosts": MessageLookupByLibrary.simpleMessage("ホストを使用"),
     "useSystemHosts": MessageLookupByLibrary.simpleMessage("システムホストを使用"),
     "value": MessageLookupByLibrary.simpleMessage("値"),
-    "valueExists": MessageLookupByLibrary.simpleMessage("現在の値は既に存在します"),
     "vibrantScheme": MessageLookupByLibrary.simpleMessage("ビブラント"),
     "view": MessageLookupByLibrary.simpleMessage("表示"),
     "vpnDesc": MessageLookupByLibrary.simpleMessage("VPN関連設定の変更"),

lib/l10n/intl/messages_ru.dart

@@ -20,7 +20,26 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ru';
 
-  static String m0(count) => "Выбрано ${count} элементов";
+  static String m0(label) =>
+      "Вы уверены, что хотите удалить выбранные ${label}?";
+
+  static String m1(label) => "Вы уверены, что хотите удалить текущий ${label}?";
+
+  static String m2(label) => "Детали {}";
+
+  static String m3(label) => "${label} не может быть пустым";
+
+  static String m4(label) => "Текущий ${label} уже существует";
+
+  static String m5(label) => "Сейчас ${label} нет";
+
+  static String m6(label) => "${label} должно быть числом";
+
+  static String m7(label) => "${label} должен быть числом от 1024 до 49151";
+
+  static String m8(count) => "Выбрано ${count} элементов";
+
+  static String m9(label) => "${label} должен быть URL";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -36,9 +55,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Выбранные приложения будут исключены из VPN",
     ),
     "account": MessageLookupByLibrary.simpleMessage("Аккаунт"),
-    "accountTip": MessageLookupByLibrary.simpleMessage(
-      "Аккаунт не может быть пустым",
-    ),
     "action": MessageLookupByLibrary.simpleMessage("Действие"),
     "action_mode": MessageLookupByLibrary.simpleMessage("Переключить режим"),
     "action_proxy": MessageLookupByLibrary.simpleMessage("Системный прокси"),
@@ -106,6 +122,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "autoRunDesc": MessageLookupByLibrary.simpleMessage(
       "Автоматический запуск при открытии приложения",
     ),
+    "autoSetSystemDns": MessageLookupByLibrary.simpleMessage(
+      "Автоматическая настройка системного DNS",
+    ),
     "autoUpdate": MessageLookupByLibrary.simpleMessage("Автообновление"),
     "autoUpdateInterval": MessageLookupByLibrary.simpleMessage(
       "Интервал автообновления (минуты)",
@@ -155,9 +174,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "clipboardImport": MessageLookupByLibrary.simpleMessage(
       "Импорт из буфера обмена",
     ),
-    "colorExists": MessageLookupByLibrary.simpleMessage(
-      "Этот цвет уже существует",
-    ),
+    "color": MessageLookupByLibrary.simpleMessage("Цвет"),
     "colorSchemes": MessageLookupByLibrary.simpleMessage("Цветовые схемы"),
     "columns": MessageLookupByLibrary.simpleMessage("Столбцы"),
     "compatible": MessageLookupByLibrary.simpleMessage("Режим совместимости"),
@@ -165,6 +182,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Включение приведет к потере части функциональности приложения, но обеспечит полную поддержку Clash.",
     ),
     "confirm": MessageLookupByLibrary.simpleMessage("Подтвердить"),
+    "connection": MessageLookupByLibrary.simpleMessage("Соединение"),
     "connections": MessageLookupByLibrary.simpleMessage("Соединения"),
     "connectionsDesc": MessageLookupByLibrary.simpleMessage(
       "Просмотр текущих данных о соединениях",
@@ -172,9 +190,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "connectivity": MessageLookupByLibrary.simpleMessage("Связь："),
     "contactMe": MessageLookupByLibrary.simpleMessage("Свяжитесь со мной"),
     "content": MessageLookupByLibrary.simpleMessage("Содержание"),
-    "contentEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Содержание не может быть пустым",
-    ),
     "contentScheme": MessageLookupByLibrary.simpleMessage("Контентная тема"),
     "copy": MessageLookupByLibrary.simpleMessage("Копировать"),
     "copyEnvVar": MessageLookupByLibrary.simpleMessage(
@@ -187,6 +202,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "country": MessageLookupByLibrary.simpleMessage("Страна"),
     "crashTest": MessageLookupByLibrary.simpleMessage("Тест на сбои"),
     "create": MessageLookupByLibrary.simpleMessage("Создать"),
+    "creationTime": MessageLookupByLibrary.simpleMessage("Время создания"),
     "cut": MessageLookupByLibrary.simpleMessage("Вырезать"),
     "dark": MessageLookupByLibrary.simpleMessage("Темный"),
     "dashboard": MessageLookupByLibrary.simpleMessage("Панель управления"),
@@ -204,18 +220,17 @@ class MessageLookup extends MessageLookupByLibrary {
     "delay": MessageLookupByLibrary.simpleMessage("Задержка"),
     "delaySort": MessageLookupByLibrary.simpleMessage("Сортировка по задержке"),
     "delete": MessageLookupByLibrary.simpleMessage("Удалить"),
-    "deleteColorTip": MessageLookupByLibrary.simpleMessage(
-      "Удалить текущий цвет?",
-    ),
-    "deleteProfileTip": MessageLookupByLibrary.simpleMessage(
-      "Вы уверены, что хотите удалить текущий профиль?",
-    ),
-    "deleteRuleTip": MessageLookupByLibrary.simpleMessage(
-      "Вы уверены, что хотите удалить выбранное правило?",
-    ),
+    "deleteMultipTip": m0,
+    "deleteTip": m1,
     "desc": MessageLookupByLibrary.simpleMessage(
       "Многоплатформенный прокси-клиент на основе ClashMeta, простой и удобный в использовании, с открытым исходным кодом и без рекламы.",
     ),
+    "destination": MessageLookupByLibrary.simpleMessage("Назначение"),
+    "destinationGeoIP": MessageLookupByLibrary.simpleMessage(
+      "Геолокация назначения",
+    ),
+    "destinationIPASN": MessageLookupByLibrary.simpleMessage("ASN назначения"),
+    "details": m2,
     "detectionTip": MessageLookupByLibrary.simpleMessage(
       "Опирается на сторонний API, только для справки",
     ),
@@ -246,6 +261,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "domain": MessageLookupByLibrary.simpleMessage("Домен"),
     "download": MessageLookupByLibrary.simpleMessage("Скачивание"),
     "edit": MessageLookupByLibrary.simpleMessage("Редактировать"),
+    "emptyTip": m3,
     "en": MessageLookupByLibrary.simpleMessage("Английский"),
     "enableOverride": MessageLookupByLibrary.simpleMessage(
       "Включить переопределение",
@@ -257,6 +273,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "excludeDesc": MessageLookupByLibrary.simpleMessage(
       "Когда приложение находится в фоновом режиме, оно скрыто из последних задач",
     ),
+    "existsTip": m4,
     "exit": MessageLookupByLibrary.simpleMessage("Выход"),
     "expand": MessageLookupByLibrary.simpleMessage("Стандартный"),
     "expirationTime": MessageLookupByLibrary.simpleMessage("Время истечения"),
@@ -322,6 +339,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hasCacheChange": MessageLookupByLibrary.simpleMessage(
       "Хотите сохранить изменения в кэше?",
     ),
+    "host": MessageLookupByLibrary.simpleMessage("Хост"),
     "hostsDesc": MessageLookupByLibrary.simpleMessage("Добавить Hosts"),
     "hotkeyConflict": MessageLookupByLibrary.simpleMessage(
       "Конфликт горячих клавиш",
@@ -338,7 +356,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Конфигурация иконки",
     ),
     "iconStyle": MessageLookupByLibrary.simpleMessage("Стиль иконки"),
+    "import": MessageLookupByLibrary.simpleMessage("Импорт"),
+    "importFile": MessageLookupByLibrary.simpleMessage("Импорт из файла"),
     "importFromURL": MessageLookupByLibrary.simpleMessage("Импорт из URL"),
+    "importUrl": MessageLookupByLibrary.simpleMessage("Импорт по URL"),
     "infiniteTime": MessageLookupByLibrary.simpleMessage(
       "Долгосрочное действие",
     ),
@@ -350,6 +371,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Интеллектуальный выбор",
     ),
     "internet": MessageLookupByLibrary.simpleMessage("Интернет"),
+    "interval": MessageLookupByLibrary.simpleMessage("Интервал"),
     "intranetIP": MessageLookupByLibrary.simpleMessage("Внутренний IP"),
     "ipcidr": MessageLookupByLibrary.simpleMessage("IPCIDR"),
     "ipv6Desc": MessageLookupByLibrary.simpleMessage(
@@ -364,9 +386,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Интервал поддержания TCP-соединения",
     ),
     "key": MessageLookupByLibrary.simpleMessage("Ключ"),
-    "keyExists": MessageLookupByLibrary.simpleMessage(
-      "Текущий ключ уже существует",
-    ),
     "language": MessageLookupByLibrary.simpleMessage("Язык"),
     "layout": MessageLookupByLibrary.simpleMessage("Макет"),
     "light": MessageLookupByLibrary.simpleMessage("Светлый"),
@@ -379,6 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "localRecoveryDesc": MessageLookupByLibrary.simpleMessage(
       "Восстановление данных из файла",
     ),
+    "log": MessageLookupByLibrary.simpleMessage("Журнал"),
     "logLevel": MessageLookupByLibrary.simpleMessage("Уровень логов"),
     "logcat": MessageLookupByLibrary.simpleMessage("Logcat"),
     "logcatDesc": MessageLookupByLibrary.simpleMessage(
@@ -407,6 +427,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Изменить стандартное событие выхода из системы",
     ),
     "minutes": MessageLookupByLibrary.simpleMessage("Минут"),
+    "mixedPort": MessageLookupByLibrary.simpleMessage("Смешанный порт"),
     "mode": MessageLookupByLibrary.simpleMessage("Режим"),
     "monochromeScheme": MessageLookupByLibrary.simpleMessage("Монохром"),
     "months": MessageLookupByLibrary.simpleMessage("Месяцев"),
@@ -431,6 +452,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Обнаружение сети",
     ),
     "networkSpeed": MessageLookupByLibrary.simpleMessage("Скорость сети"),
+    "networkType": MessageLookupByLibrary.simpleMessage("Тип сети"),
     "neutralScheme": MessageLookupByLibrary.simpleMessage("Нейтральные"),
     "noData": MessageLookupByLibrary.simpleMessage("Нет данных"),
     "noHotKey": MessageLookupByLibrary.simpleMessage("Нет горячей клавиши"),
@@ -447,22 +469,14 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "noResolve": MessageLookupByLibrary.simpleMessage("Не разрешать IP"),
     "none": MessageLookupByLibrary.simpleMessage("Нет"),
-    "notEmpty": MessageLookupByLibrary.simpleMessage("Не может быть пустым"),
     "notSelectedTip": MessageLookupByLibrary.simpleMessage(
       "Текущая группа прокси не может быть выбрана.",
     ),
-    "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage(
-      "Нет соединений",
-    ),
-    "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage(
-      "Не удалось получить информацию о ядре",
-    ),
-    "nullLogsDesc": MessageLookupByLibrary.simpleMessage("Нет логов"),
     "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
       "Нет профиля, пожалуйста, добавьте профиль",
     ),
-    "nullProxies": MessageLookupByLibrary.simpleMessage("Нет прокси"),
-    "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("Нет запросов"),
+    "nullTip": m5,
+    "numberTip": m6,
     "oneColumn": MessageLookupByLibrary.simpleMessage("Один столбец"),
     "onlyIcon": MessageLookupByLibrary.simpleMessage("Только иконка"),
     "onlyOtherApps": MessageLookupByLibrary.simpleMessage(
@@ -490,18 +504,21 @@ class MessageLookup extends MessageLookupByLibrary {
     "overrideDnsDesc": MessageLookupByLibrary.simpleMessage(
       "Включение переопределит настройки DNS в профиле",
     ),
+    "overrideInvalidTip": MessageLookupByLibrary.simpleMessage(
+      "В скриптовом режиме не действует",
+    ),
     "overrideOriginRules": MessageLookupByLibrary.simpleMessage(
       "Переопределить оригинальное правило",
     ),
     "palette": MessageLookupByLibrary.simpleMessage("Палитра"),
     "password": MessageLookupByLibrary.simpleMessage("Пароль"),
-    "passwordTip": MessageLookupByLibrary.simpleMessage(
-      "Пароль не может быть пустым",
-    ),
     "paste": MessageLookupByLibrary.simpleMessage("Вставить"),
     "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage(
       "Пожалуйста, привяжите WebDAV",
     ),
+    "pleaseEnterScriptName": MessageLookupByLibrary.simpleMessage(
+      "Пожалуйста, введите название скрипта",
+    ),
     "pleaseInputAdminPassword": MessageLookupByLibrary.simpleMessage(
       "Пожалуйста, введите пароль администратора",
     ),
@@ -512,6 +529,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Пожалуйста, загрузите действительный QR-код",
     ),
     "port": MessageLookupByLibrary.simpleMessage("Порт"),
+    "portConflictTip": MessageLookupByLibrary.simpleMessage(
+      "Введите другой порт",
+    ),
+    "portTip": m7,
     "preferH3Desc": MessageLookupByLibrary.simpleMessage(
       "Приоритетное использование HTTP/3 для DOH",
     ),
@@ -545,10 +566,12 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "profiles": MessageLookupByLibrary.simpleMessage("Профили"),
     "profilesSort": MessageLookupByLibrary.simpleMessage("Сортировка профилей"),
+    "progress": MessageLookupByLibrary.simpleMessage("Прогресс"),
     "project": MessageLookupByLibrary.simpleMessage("Проект"),
     "providers": MessageLookupByLibrary.simpleMessage("Провайдеры"),
     "proxies": MessageLookupByLibrary.simpleMessage("Прокси"),
     "proxiesSetting": MessageLookupByLibrary.simpleMessage("Настройка прокси"),
+    "proxyChains": MessageLookupByLibrary.simpleMessage("Цепочки прокси"),
     "proxyGroup": MessageLookupByLibrary.simpleMessage("Группа прокси"),
     "proxyNameserver": MessageLookupByLibrary.simpleMessage(
       "Прокси-сервер имен",
@@ -586,16 +609,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "recoverySuccess": MessageLookupByLibrary.simpleMessage(
       "Восстановление успешно",
     ),
+    "redirPort": MessageLookupByLibrary.simpleMessage("Redir-порт"),
     "redo": MessageLookupByLibrary.simpleMessage("Повторить"),
     "regExp": MessageLookupByLibrary.simpleMessage("Регулярное выражение"),
     "remote": MessageLookupByLibrary.simpleMessage("Удаленный"),
     "remoteBackupDesc": MessageLookupByLibrary.simpleMessage(
       "Резервное копирование локальных данных на WebDAV",
     ),
+    "remoteDestination": MessageLookupByLibrary.simpleMessage(
+      "Удалённое назначение",
+    ),
     "remoteRecoveryDesc": MessageLookupByLibrary.simpleMessage(
       "Восстановление данных с WebDAV",
     ),
     "remove": MessageLookupByLibrary.simpleMessage("Удалить"),
+    "rename": MessageLookupByLibrary.simpleMessage("Переименовать"),
+    "request": MessageLookupByLibrary.simpleMessage("Запрос"),
     "requests": MessageLookupByLibrary.simpleMessage("Запросы"),
     "requestsDesc": MessageLookupByLibrary.simpleMessage(
       "Просмотр последних записей запросов",
@@ -626,24 +655,19 @@ class MessageLookup extends MessageLookupByLibrary {
     "ru": MessageLookupByLibrary.simpleMessage("Русский"),
     "rule": MessageLookupByLibrary.simpleMessage("Правило"),
     "ruleName": MessageLookupByLibrary.simpleMessage("Название правила"),
-    "ruleProviderEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Поставщик правил не может быть пустым",
-    ),
     "ruleProviders": MessageLookupByLibrary.simpleMessage("Провайдеры правил"),
     "ruleTarget": MessageLookupByLibrary.simpleMessage("Цель правила"),
-    "ruleTargetEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Цель правила не может быть пустой",
-    ),
     "save": MessageLookupByLibrary.simpleMessage("Сохранить"),
     "saveChanges": MessageLookupByLibrary.simpleMessage("Сохранить изменения?"),
     "saveTip": MessageLookupByLibrary.simpleMessage(
       "Вы уверены, что хотите сохранить?",
     ),
+    "script": MessageLookupByLibrary.simpleMessage("Скрипт"),
     "search": MessageLookupByLibrary.simpleMessage("Поиск"),
     "seconds": MessageLookupByLibrary.simpleMessage("Секунд"),
     "selectAll": MessageLookupByLibrary.simpleMessage("Выбрать все"),
     "selected": MessageLookupByLibrary.simpleMessage("Выбрано"),
-    "selectedCountTitle": m0,
+    "selectedCountTitle": m8,
     "settings": MessageLookupByLibrary.simpleMessage("Настройки"),
     "show": MessageLookupByLibrary.simpleMessage("Показать"),
     "shrink": MessageLookupByLibrary.simpleMessage("Сжать"),
@@ -652,9 +676,12 @@ class MessageLookup extends MessageLookupByLibrary {
       "Запуск в фоновом режиме",
     ),
     "size": MessageLookupByLibrary.simpleMessage("Размер"),
+    "socksPort": MessageLookupByLibrary.simpleMessage("Socks-порт"),
     "sort": MessageLookupByLibrary.simpleMessage("Сортировка"),
     "source": MessageLookupByLibrary.simpleMessage("Источник"),
     "sourceIp": MessageLookupByLibrary.simpleMessage("Исходный IP"),
+    "specialProxy": MessageLookupByLibrary.simpleMessage("Специальный прокси"),
+    "specialRules": MessageLookupByLibrary.simpleMessage("Специальные правила"),
     "stackMode": MessageLookupByLibrary.simpleMessage("Режим стека"),
     "standard": MessageLookupByLibrary.simpleMessage("Стандартный"),
     "start": MessageLookupByLibrary.simpleMessage("Старт"),
@@ -667,9 +694,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "stopVpn": MessageLookupByLibrary.simpleMessage("Остановка VPN..."),
     "style": MessageLookupByLibrary.simpleMessage("Стиль"),
     "subRule": MessageLookupByLibrary.simpleMessage("Подправило"),
-    "subRuleEmptyTip": MessageLookupByLibrary.simpleMessage(
-      "Содержание подправила не может быть пустым",
-    ),
     "submit": MessageLookupByLibrary.simpleMessage("Отправить"),
     "sync": MessageLookupByLibrary.simpleMessage("Синхронизация"),
     "system": MessageLookupByLibrary.simpleMessage("Система"),
@@ -703,6 +727,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "toggle": MessageLookupByLibrary.simpleMessage("Переключить"),
     "tonalSpotScheme": MessageLookupByLibrary.simpleMessage("Тональный акцент"),
     "tools": MessageLookupByLibrary.simpleMessage("Инструменты"),
+    "tproxyPort": MessageLookupByLibrary.simpleMessage("Tproxy-порт"),
     "trafficUsage": MessageLookupByLibrary.simpleMessage(
       "Использование трафика",
     ),
@@ -722,20 +747,19 @@ class MessageLookup extends MessageLookupByLibrary {
       "Убрать дополнительные задержки, такие как рукопожатие",
     ),
     "unknown": MessageLookupByLibrary.simpleMessage("Неизвестно"),
+    "unnamed": MessageLookupByLibrary.simpleMessage("Без имени"),
     "update": MessageLookupByLibrary.simpleMessage("Обновить"),
     "upload": MessageLookupByLibrary.simpleMessage("Загрузка"),
     "url": MessageLookupByLibrary.simpleMessage("URL"),
     "urlDesc": MessageLookupByLibrary.simpleMessage(
       "Получить профиль через URL",
     ),
+    "urlTip": m9,
     "useHosts": MessageLookupByLibrary.simpleMessage("Использовать hosts"),
     "useSystemHosts": MessageLookupByLibrary.simpleMessage(
       "Использовать системные hosts",
     ),
     "value": MessageLookupByLibrary.simpleMessage("Значение"),
-    "valueExists": MessageLookupByLibrary.simpleMessage(
-      "Текущее значение уже существует",
-    ),
     "vibrantScheme": MessageLookupByLibrary.simpleMessage("Яркие"),
     "view": MessageLookupByLibrary.simpleMessage("Просмотр"),
     "vpnDesc": MessageLookupByLibrary.simpleMessage(