Support override script

Support proxies search Support svg display Add some scenes auto close connections Update core Optimize more details
2025-06-02 15:37:08 +08:00
43 changed files with 439 additions and 245 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -63,10 +63,17 @@ 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

--- a/android/app/src/main/AndroidManifest.xml
+++ b/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">
--- a/android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt
+++ b/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)
        }
--- a/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable/ic.xml
+++ b/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>
--- a/android/app/src/main/res/mipmap-xhdpi/ic_banner.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_banner.png
--- a/arb/intl_en.arb
+++ b/arb/intl_en.arb
@@ -402,5 +402,8 @@
  "redirPort": "Redir Port",
  "tproxyPort": "Tproxy Port",
  "portTip": "{label} must be between 1024 and 49151",
-  "portConflictTip": "Please enter a different port"
+  "portConflictTip": "Please enter a different port",
+  "import": "Import",
+  "importFile": "Import from file",
+  "importUrl": "Import from URL"
 }
--- a/arb/intl_ja.arb
+++ b/arb/intl_ja.arb
@@ -403,5 +403,8 @@
  "redirPort": "Redirポート",
  "tproxyPort": "Tproxyポート",
  "portTip": "{label} は 1024 から 49151 の間でなければなりません",
-  "portConflictTip": "別のポートを入力してください"
+  "portConflictTip": "別のポートを入力してください",
+  "import": "インポート",
+  "importFile": "ファイルからインポート",
+  "importUrl": "URLからインポート"
 }
--- a/arb/intl_ru.arb
+++ b/arb/intl_ru.arb
@@ -403,5 +403,8 @@
  "redirPort": "Redir-порт",
  "tproxyPort": "Tproxy-порт",
  "portTip": "{label} должен быть числом от 1024 до 49151",
-  "portConflictTip": "Введите другой порт"
+  "portConflictTip": "Введите другой порт",
+  "import": "Импорт",
+  "importFile": "Импорт из файла",
+  "importUrl": "Импорт по URL"
 }
--- a/arb/intl_zh_CN.arb
+++ b/arb/intl_zh_CN.arb
@@ -403,5 +403,8 @@
  "redirPort": "Redir端口",
  "tproxyPort": "Tproxy端口",
  "portTip": "{label} 必须在 1024 到 49151 之间",
-  "portConflictTip": "请输入不同的端口"
+  "portConflictTip": "请输入不同的端口",
+  "import": "导入",
+  "importFile": "通过文件导入",
+  "importUrl": "通过URL导入"
 }
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/go.mod
+++ b/core/go.mod
@@ -6,7 +6,6 @@ replace github.com/metacubex/mihomo => ./Clash.Meta

 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.50.0
 	golang.org/x/sync v0.11.0
 )

@@ -21,7 +20,7 @@ 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.3-0.20250507171810-1638563e3615 // 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-20250325060835-cd0defd64358 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
@@ -51,27 +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/fswatch v0.1.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
 	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
-	github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b // indirect
+	github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 // indirect
+	github.com/metacubex/sing v0.5.3 // indirect
 	github.com/metacubex/sing-mux v0.3.2 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.9 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.3 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.10 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.4 // indirect
 	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 // indirect
-	github.com/metacubex/sing-vmess v0.2.1 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c // 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-20250503140532-decbcfccbfdf // indirect
-	github.com/metacubex/utls v1.7.0-alpha.3 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 // indirect
+	github.com/metacubex/utls v1.7.3 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -85,6 +84,7 @@ require (
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/sagernet/cors v1.2.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/samber/lo v1.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
--- a/core/go.sum
+++ b/core/go.sum
@@ -26,8 +26,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 h1:W7mpP4uiOAbBOdDnRXT9EUdauFv7bz+ERT5rPIord00=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615/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-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
@@ -97,8 +97,8 @@ 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=
@@ -111,35 +111,35 @@ github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM
 github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
 github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo=
 github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA=
-github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b h1:8oDU32eJ+RRhl1FodGgPfxQxtoBAiD9D40XG2XtU/SE=
-github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b/go.mod h1:9R1NOzCgTcWsdWvOMlmtMuF0uKzuOpsfvEf7U3I8zM0=
+github.com/metacubex/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 v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 h1:m4nSxvw46JEgxMzzmnXams+ebwabcry4Ydep/zNiesQ=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.3 h1:QWdN16WFKMk06x4nzkc8SvZ7y2x+TLQrpkPoHs+WSVM=
+github.com/metacubex/sing v0.5.3/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
 github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
 github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
-github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 h1:wfmYgtECbEYo1slMtyo+2kMqscYYDSjU/TVgS3018F4=
-github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2/go.mod h1:P1kd57U6XXmXv9PbwWdznUGT0k9bKgFJXF0fEORbIlk=
-github.com/metacubex/sing-shadowsocks v0.2.9 h1:2e++13WNN7EGjGtvrGLUzW1xrCdQbW2gIFpgw5GEw00=
-github.com/metacubex/sing-shadowsocks v0.2.9/go.mod h1:CJSEGO4FWQAWe+ZiLZxCweGdjRR60A61SIoVjdjQeBA=
-github.com/metacubex/sing-shadowsocks2 v0.2.3 h1:v3rNS/5Ywh0NIZ6VU/NmdERQIN5RePzyxCFeQsU4Cx0=
-github.com/metacubex/sing-shadowsocks2 v0.2.3/go.mod h1:/WNy/Q8ahLCoPRriWuFZFD0Jy+JNp1MEQl28Zw6SaF8=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f h1:mP3vIm+9hRFI0C0Vl3pE0NESF/L85FDbuB0tGgUii6I=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f/go.mod h1:JPTpf7fpnojsSuwRJExhSZSy63pVbp3VM39+zj+sAJM=
+github.com/metacubex/sing-shadowsocks v0.2.10 h1:Pr7LDbjMANIQHl07zWgl1vDuhpsfDQUpZ8cX6DPabfg=
+github.com/metacubex/sing-shadowsocks v0.2.10/go.mod h1:MtRM0ZZjR0kaDOzy9zWSt6/4/UlrnsNBq+1FNAF4vBk=
+github.com/metacubex/sing-shadowsocks2 v0.2.4 h1:Ec0x3hHR7xkld5Z09IGh16wtUUpBb2HgqZ9DExd8Q7s=
+github.com/metacubex/sing-shadowsocks2 v0.2.4/go.mod h1:WP8+S0kqtnSbX1vlIpo5i8Irm/ijZITEPBcZ26B5unY=
 github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
 github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
-github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 h1:TAwL91XPa6x1QK55CRm+VTzPvLPUfEr/uFDnOZArqEU=
-github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
-github.com/metacubex/sing-vmess v0.2.1 h1:I6gM3VUjtvJ15D805EUbNH+SRBuqzJeFnuIbKYUsWZ0=
-github.com/metacubex/sing-vmess v0.2.1/go.mod h1:DsODWItJtOMZNna8Qhheg8r3tUivrcO3vWgaTYKnfTo=
+github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c h1:Y6jk7AH5BEg9Dsvczrf/KokYsvxeKSZZlCLHg+hC4ro=
+github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
+github.com/metacubex/sing-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-20250503140532-decbcfccbfdf h1:LwID1wz4tzypidd412dd4dC1H0m1TgRCQ/XvRvMJDFM=
-github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.7.0-alpha.3 h1:cp1cEMUnoifiWrGHRzo+nCwPRveN9yPD8QaRFmfcYxA=
-github.com/metacubex/utls v1.7.0-alpha.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 h1:j1VRTiC9JLR4nUbSikx9OGdu/3AgFDqgcLj4GoqyQkc=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.7.3 h1:yDcMEWojFh+t8rU9X0HPcZDPAoFze/rIIyssqivzj8A=
+github.com/metacubex/utls v1.7.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
 github.com/metacubex/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=
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -214,7 +214,10 @@ class ClashCore {
    final profilePath = await appPath.getProfilePath(id);
    final res = await clashInterface.getConfig(profilePath);
    if (res.isSuccess) {
-      return res.data as Map<String, dynamic>;
+      final data = (res.data ?? {}) as Map<String, dynamic>;
+      data["rules"] = data["rule"];
+      data.remove("rule");
+      return data;
    } else {
      throw res.message;
    }
--- a/lib/clash/lib.dart
+++ b/lib/clash/lib.dart
@@ -6,7 +6,7 @@ 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';
@@ -240,18 +240,21 @@ class ClashLibHandler {
    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
  }

-  // Map<String, dynamic> getConfig(String path) {
-  //   final pathChar = path.toNativeUtf8().cast<Char>();
-  //   final configRaw = clashFFI.getConfig(pathChar);
-  //   final configString = configRaw.cast<Utf8>().toDartString();
-  //   if (configString.isEmpty) {
-  //     return {};
-  //   }
-  //   final config = json.decode(configString);
-  //   malloc.free(pathChar);
-  //   clashFFI.freeCString(configRaw);
-  //   return config;
-  // }
+  Future<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);
+    config["rules"] = config["rule"];
+    config.remove("rule");
+    malloc.free(pathChar);
+    clashFFI.freeCString(configRaw);
+    return config;
+  }

  Future<String> quickStart(
    InitParams initParams,
@@ -289,4 +292,4 @@ ClashLib? get clashLib =>
    Platform.isAndroid && !globalState.isService ? ClashLib() : null;

 ClashLibHandler? get clashLibHandler =>
-    Platform.isAndroid ? ClashLibHandler() : null;
+    Platform.isAndroid && globalState.isService ? ClashLibHandler() : null;
--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -11,7 +11,6 @@ export 'future.dart';
 export 'http.dart';
 export 'icons.dart';
 export 'iterable.dart';
-export 'javascript.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
--- a/lib/common/http.dart
+++ b/lib/common/http.dart
@@ -18,6 +18,7 @@ class FlClashHttpOverrides extends HttpOverrides {
  @override
  HttpClient createHttpClient(SecurityContext? context) {
    final client = super.createHttpClient(context);
+    client.badCertificateCallback = (_, __, ___) => true;
    client.findProxy = handleFindProxy;
    return client;
  }
--- a/lib/common/javascript.dart
+++ b/lib/common/javascript.dart
@@ -1,18 +0,0 @@
-import 'package:flutter_js/flutter_js.dart';
-
-class Javascript {
-  static Javascript? _instance;
-
-  Javascript._internal();
-
-  JavascriptRuntime get runTime {
-    return getJavascriptRuntime();
-  }
-
-  factory Javascript() {
-    _instance ??= Javascript._internal();
-    return _instance!;
-  }
-}
-
-final js = Javascript();
--- a/lib/common/path.dart
+++ b/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();
@@ -78,17 +77,28 @@ class AppPath {
    return join(directory, "$id.yaml");
  }

-  Future<String> getProvidersPath(String id, {String filePath = ""}) async {
+  Future<String> getProvidersDirPath(String id) async {
    final directory = await profilesPath;
-    final path = join(
+    return join(
      directory,
      "providers",
      id,
    );
-    if (filePath.isNotEmpty) {
-      return join(path, filePath);
-    }
-    return path;
+  }
+
+  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 {
--- a/lib/common/string.dart
+++ b/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 {
@@ -45,6 +47,10 @@ extension StringExtension on String {
    }
  }

+  bool get isSvg {
+    return endsWith(".svg");
+  }
+
  bool get isRegex {
    try {
      RegExp(this);
@@ -55,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);
 // }
--- a/lib/common/utils.dart
+++ b/lib/common/utils.dart
@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
-import 'package:yaml/yaml.dart';

 class Utils {
  Color? getDelayColor(int? delay) {
@@ -337,51 +336,51 @@ class Utils {
    );
  }

-  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;
-  }
+  // 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) {
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -774,14 +774,14 @@ class AppController {

  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 {
      final profileFile = File(profilePath);
      final isExists = await profileFile.exists();
      if (isExists) {
        profileFile.delete(recursive: true);
      }
-      final providersFileDir = File(providersPath);
+      final providersFileDir = File(providersDirPath);
      final providersFileIsExists = await providersFileDir.exists();
      if (providersFileIsExists) {
        providersFileDir.delete(recursive: true);
@@ -1031,6 +1031,7 @@ 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) {
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -499,3 +499,8 @@ enum Language {
  yaml,
  javaScript,
 }
+
+enum ImportOption {
+  file,
+  url,
+}
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -323,7 +323,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(
--- a/lib/l10n/intl/messages_ja.dart
+++ b/lib/l10n/intl/messages_ja.dart
@@ -245,7 +245,10 @@ 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("正しいホットキーを入力"),
--- a/lib/l10n/intl/messages_ru.dart
+++ b/lib/l10n/intl/messages_ru.dart
@@ -342,7 +342,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(
      "Долгосрочное действие",
    ),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -221,7 +221,10 @@ 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("请输入正确的快捷键"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -3104,6 +3104,31 @@ class AppLocalizations {
      args: [],
    );
  }
+
+  /// `Import`
+  String get import {
+    return Intl.message('Import', name: 'import', desc: '', args: []);
+  }
+
+  /// `Import from file`
+  String get importFile {
+    return Intl.message(
+      'Import from file',
+      name: 'importFile',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Import from URL`
+  String get importUrl {
+    return Intl.message(
+      'Import from URL',
+      name: 'importUrl',
+      desc: '',
+      args: [],
+    );
+  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/pages/editor.dart
+++ b/lib/pages/editor.dart
@@ -111,10 +111,25 @@ class _EditorPageState extends ConsumerState<EditorPage> {
    _findController.findMode();
  }

-  _handleRemoteDownload() async {
+  _handleImport() async {
+    final option = await globalState.showCommonDialog<ImportOption>(
+      child: _ImportOptionsDialog(),
+    );
+    if (option == null) {
+      return;
+    }
+    if (option == ImportOption.file) {
+      final file = await picker.pickerFile();
+      if (file == null) {
+        return;
+      }
+      final res = String.fromCharCodes(file.bytes?.toList() ?? []);
+      _controller.text = res;
+      return;
+    }
    final url = await globalState.showCommonDialog(
      child: InputDialog(
-        title: appLocalizations.download,
+        title: "导入",
        value: "",
        labelText: appLocalizations.url,
        validator: (value) {
@@ -186,7 +201,7 @@ class _EditorPageState extends ConsumerState<EditorPage> {
              ),
            if (widget.supportRemoteDownload)
              IconButton(
-                onPressed: _handleRemoteDownload,
+                onPressed: _handleImport,
                icon: Icon(
                  Icons.arrow_downward,
                ),
@@ -236,6 +251,7 @@ class _EditorPageState extends ConsumerState<EditorPage> {
          padding: EdgeInsets.only(
            right: 16,
          ),
+          autocompleteSymbols: true,
          focusNode: _focusNode,
          scrollbarBuilder: (context, child, details) {
            return CommonScrollBar(
@@ -662,7 +678,45 @@ class _NoInputBorder extends InputBorder {
    double gapExtent = 0.0,
    double gapPercentage = 0.0,
    TextDirection? textDirection,
-  }) {
-    // Do not paint.
+  }) {}
+}
+
+class _ImportOptionsDialog extends StatefulWidget {
+  const _ImportOptionsDialog();
+
+  @override
+  State<_ImportOptionsDialog> createState() => _ImportOptionsDialogState();
+}
+
+class _ImportOptionsDialogState extends State<_ImportOptionsDialog> {
+  _handleOnTab(ImportOption value) {
+    Navigator.of(context).pop(value);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonDialog(
+      title: appLocalizations.import,
+      padding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 16,
+      ),
+      child: Wrap(
+        children: [
+          ListItem(
+            onTap: () {
+              _handleOnTab(ImportOption.url);
+            },
+            title: Text(appLocalizations.importUrl),
+          ),
+          ListItem(
+            onTap: () {
+              _handleOnTab(ImportOption.file);
+            },
+            title: Text(appLocalizations.importFile),
+          )
+        ],
+      ),
+    );
  }
 }
--- a/lib/providers/generated/state.g.dart
+++ b/lib/providers/generated/state.g.dart
@@ -1959,11 +1959,11 @@ class _GenColorSchemeProviderElement
  bool get ignoreConfig => (origin as GenColorSchemeProvider).ignoreConfig;
 }

-String _$needSetupHash() => r'1116c73bb2964321de63bdca631a983d31e30d69';
+String _$needSetupHash() => r'db01ec73ea3232c99d1c5445c80e31b98785f416';

 /// See also [needSetup].
@ProviderFor(needSetup)
-final needSetupProvider = AutoDisposeProvider<VM2>.internal(
+final needSetupProvider = AutoDisposeProvider<VM3>.internal(
  needSetup,
  name: r'needSetupProvider',
  debugGetCreateSourceHash:
@@ -1974,7 +1974,7 @@ final needSetupProvider = AutoDisposeProvider<VM2>.internal(

@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef NeedSetupRef = AutoDisposeProviderRef<VM2>;
+typedef NeedSetupRef = AutoDisposeProviderRef<VM3>;
 String _$profileOverrideStateHash() =>
    r'fa26570a355ab39e27b1f93d1d2f358717065592';

--- a/lib/providers/state.dart
+++ b/lib/providers/state.dart
@@ -590,9 +590,19 @@ ColorScheme genColorScheme(
 }

@riverpod
-VM2 needSetup(Ref ref) {
+VM3 needSetup(Ref ref) {
  final profileId = ref.watch(currentProfileIdProvider);
  final content = ref.watch(
      scriptStateProvider.select((state) => state.currentScript?.content));
-  return VM2(a: profileId, b: content);
+  final overrideDns = ref.watch(overrideDnsProvider);
+  final dns = overrideDns == true
+      ? ref.watch(patchClashConfigProvider.select(
+          (state) => state.dns,
+        ))
+      : null;
+  return VM3(
+    a: profileId,
+    b: content,
+    c: dns,
+  );
 }
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -1,8 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi' show Pointer;
-import 'dart:io';
-import 'dart:isolate';

 import 'package:animations/animations.dart';
 import 'package:dio/dio.dart';
@@ -15,10 +13,10 @@ import 'package:fl_clash/plugins/service.dart';
 import 'package:fl_clash/widgets/dialog.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_js/flutter_js.dart';
 import 'package:material_color_utilities/palettes/core_palette.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:yaml/yaml.dart';

 import 'common/common.dart';
 import 'controller.dart';
@@ -193,26 +191,26 @@ class GlobalState {
    );
  }

-  Future<Map<String, dynamic>> getProfileMap(String id) async {
-    final profilePath = await appPath.getProfilePath(id);
-    final res = await Isolate.run<Result<dynamic>>(() async {
-      try {
-        final file = File(profilePath);
-        if (!await file.exists()) {
-          return Result.error("");
-        }
-        final value = await file.readAsString();
-        return Result.success(utils.convertYamlNode(loadYaml(value)));
-      } catch (e) {
-        return Result.error(e.toString());
-      }
-    });
-    if (res.isSuccess) {
-      return res.data as Map<String, dynamic>;
-    } else {
-      throw res.message;
-    }
-  }
+  // Future<Map<String, dynamic>> getProfileMap(String id) async {
+  //   final profilePath = await appPath.getProfilePath(id);
+  //   final res = await Isolate.run<Result<dynamic>>(() async {
+  //     try {
+  //       final file = File(profilePath);
+  //       if (!await file.exists()) {
+  //         return Result.error("");
+  //       }
+  //       final value = await file.readAsString();
+  //       return Result.success(utils.convertYamlNode(loadYaml(value)));
+  //     } catch (e) {
+  //       return Result.error(e.toString());
+  //     }
+  //   });
+  //   if (res.isSuccess) {
+  //     return res.data as Map<String, dynamic>;
+  //   } else {
+  //     throw res.message;
+  //   }
+  // }

  Future<T?> showCommonDialog<T>({
    required Widget child,
@@ -315,10 +313,11 @@ class GlobalState {
      return {};
    }
    final profileId = profile.id;
-
-    final rawConfig =
-        await handleEvaluate(await globalState.getProfileMap(profileId));
-
+    final configMap = await switch (clashLibHandler != null) {
+      true => clashLibHandler!.getConfig(profileId),
+      false => clashCore.getConfig(profileId),
+    };
+    final rawConfig = await handleEvaluate(configMap);
    final routeAddress =
        config.networkProps.routeMode == RouteMode.bypassPrivate
            ? defaultBypassPrivateRouteAddress
@@ -356,8 +355,13 @@ class GlobalState {
    rawConfig["tun"]["route-address"] = realPatchConfig.tun.routeAddress;
    rawConfig["tun"]["auto-route"] = realPatchConfig.tun.autoRoute;
    rawConfig["geodata-loader"] = realPatchConfig.geodataLoader.name;
-    if (rawConfig["sniffer"] != null) {
-      rawConfig["sniffer"] = Sniffer.fromJson(rawConfig["sniffer"]);
+    if (rawConfig["sniffer"]?["sniff"] != null) {
+      for (final value in (rawConfig["sniffer"]?["sniff"] as Map).values) {
+        if (value["ports"] != null && value["ports"] is List) {
+          value["ports"] =
+              value["ports"]?.map((item) => item.toString()).toList() ?? [];
+        }
+      }
    }
    if (rawConfig["profile"] == null) {
      rawConfig["profile"] = {};
@@ -366,9 +370,15 @@ class GlobalState {
      final proxyProviders = rawConfig["proxy-providers"] as Map;
      for (final key in proxyProviders.keys) {
        final proxyProvider = proxyProviders[key];
-        if (proxyProvider["path"] != null) {
-          proxyProvider["path"] = await appPath.getProvidersPath(profile.id,
-              filePath: proxyProvider["path"]);
+        if (proxyProvider["type"] != "http") {
+          continue;
+        }
+        if (proxyProvider["url"] != null) {
+          proxyProvider["path"] = await appPath.getProvidersFilePath(
+            profile.id,
+            "proxies",
+            proxyProvider["url"],
+          );
        }
      }
    }
@@ -377,9 +387,15 @@ class GlobalState {
      final ruleProviders = rawConfig["rule-providers"] as Map;
      for (final key in ruleProviders.keys) {
        final ruleProvider = ruleProviders[key];
-        if (ruleProvider["path"] != null) {
-          ruleProvider["path"] = await appPath.getProvidersPath(profile.id,
-              filePath: ruleProvider["path"]);
+        if (ruleProvider["type"] != "http") {
+          continue;
+        }
+        if (ruleProvider["url"] != null) {
+          ruleProvider["path"] = await appPath.getProvidersFilePath(
+            profile.id,
+            "rules",
+            ruleProvider["url"],
+          );
        }
      }
    }
@@ -410,11 +426,8 @@ class GlobalState {
      }
    }
    var rules = [];
-    // if (rawConfig["rule"] != null) {
-    //   rules.addAll(rawConfig["rule"]);
-    // }
    if (rawConfig["rules"] != null) {
-      rules.addAll(rawConfig["rules"]);
+      rules = rawConfig["rules"];
    }
    rawConfig.remove("rules");

@@ -423,7 +436,7 @@ class GlobalState {
      if (overrideData.rule.type == OverrideRuleType.override) {
        rules = overrideData.runningRule;
      } else {
-        rules.addAll(overrideData.runningRule);
+        rules = [...overrideData.runningRule, ...rules];
      }
    }
    rawConfig["rule"] = rules;
@@ -437,9 +450,12 @@ class GlobalState {
    if (currentScript == null) {
      return config;
    }
+    if (config["proxy-providers"] == null) {
+      config["proxy-providers"] = {};
+    }
    final configJs = json.encode(config);
-    final runtime = js.runTime;
-    final res = await js.runTime.evaluateAsync("""
+    final runtime = getJavascriptRuntime();
+    final res = await runtime.evaluateAsync("""
      ${currentScript.content}
      main($configJs)
    """);
--- a/lib/views/about.dart
+++ b/lib/views/about.dart
@@ -47,15 +47,15 @@ class AboutView extends StatelessWidget {
            _checkUpdate(context);
          },
        ),
-        ListItem(
-          title: Text(appLocalizations.contactMe),
-          onTap: () {
-            globalState.showMessage(
-              title: appLocalizations.contactMe,
-              message: TextSpan(text: "chen08209@gmail.com"),
-            );
-          },
-        ),
+        // ListItem(
+        //   title: Text(appLocalizations.contactMe),
+        //   onTap: () {
+        //     globalState.showMessage(
+        //       title: appLocalizations.contactMe,
+        //       message: TextSpan(text: "chen08209@gmail.com"),
+        //     );
+        //   },
+        // ),
        ListItem(
          title: const Text("Telegram"),
          onTap: () {
--- a/lib/views/config/general.dart
+++ b/lib/views/config/general.dart
@@ -601,7 +601,8 @@ class _PortDialogState extends ConsumerState<_PortDialog> {
                          .numberTip(appLocalizations.mixedPort);
                    }
                    if (port < 1024 || port > 49151) {
-                      return appLocalizations.mixedPort;
+                      return appLocalizations
+                          .portTip(appLocalizations.mixedPort);
                    }
                    final ports = [
                      _portController.text,
--- a/lib/widgets/icon.dart
+++ b/lib/widgets/icon.dart
@@ -1,6 +1,7 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_svg/svg.dart';

 class CommonTargetIcon extends StatelessWidget {
  final String src;
@@ -33,11 +34,23 @@ class CommonTargetIcon extends StatelessWidget {
        },
      );
    }
-    return CachedNetworkImage(
-      imageUrl: src,
-      fadeInDuration: Duration.zero,
-      fadeOutDuration: Duration.zero,
-      errorWidget: (_, __, ___) => _defaultIcon(),
+    return FutureBuilder(
+      future: DefaultCacheManager().getSingleFile(src),
+      builder: (_, snapshot) {
+        final data = snapshot.data;
+        if (data == null) {
+          return SizedBox();
+        }
+        return src.isSvg
+            ? SvgPicture.file(
+                data,
+                errorBuilder: (_, __, ___) => _defaultIcon(),
+              )
+            : Image.file(
+                data,
+                errorBuilder: (_, __, ___) => _defaultIcon(),
+              );
+      },
    );
  }

--- a/lib/widgets/list.dart
+++ b/lib/widgets/list.dart
@@ -422,6 +422,7 @@ class ListItem<T> extends StatelessWidget {
          value: radioDelegate.value,
          groupValue: radioDelegate.groupValue,
          onChanged: radioDelegate.onChanged,
+          toggleable: true,
        ),
        trailing: trailing,
      );
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -161,30 +161,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.9.5"
-  cached_network_image:
-    dependency: "direct main"
-    description:
-      name: cached_network_image
-      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.1"
-  cached_network_image_platform_interface:
-    dependency: transitive
-    description:
-      name: cached_network_image_platform_interface
-      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.1"
-  cached_network_image_web:
-    dependency: transitive
-    description:
-      name: cached_network_image_web
-      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
  characters:
    dependency: transitive
    description:
@@ -274,7 +250,7 @@ packages:
    source: hosted
    version: "0.3.4+2"
  crypto:
-    dependency: "direct dev"
+    dependency: "direct main"
    description:
      name: crypto
      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
@@ -479,7 +455,7 @@ packages:
    source: sdk
    version: "0.0.0"
  flutter_cache_manager:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: flutter_cache_manager
      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
@@ -524,6 +500,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.6.1"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -886,14 +870,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.0"
-  octo_image:
-    dependency: transitive
-    description:
-      name: octo_image
-      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
  package_config:
    dependency: transitive
    description:
@@ -926,6 +902,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.9.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
  path_provider:
    dependency: "direct main"
    description:
@@ -1086,7 +1070,7 @@ packages:
    source: hosted
    version: "2.6.4"
  riverpod_lint:
-    dependency: "direct dev"
+    dependency: "direct main"
    description:
      name: riverpod_lint
      sha256: b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693
@@ -1474,6 +1458,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.5.1"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.18"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.17"
  vector_math:
    dependency: transitive
    description:
@@ -1578,7 +1586,7 @@ packages:
    source: hosted
    version: "6.5.0"
  yaml:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: yaml
      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.85+202505282
+version: 0.8.85+202506021
 environment:
  sdk: '>=3.1.0 <4.0.0'

@@ -42,7 +42,6 @@ dependencies:
  archive: ^3.6.1
  lpinyin: ^2.0.3
  emoji_regex: ^0.0.5
-  cached_network_image: ^3.4.0
  hotkey_manager: ^0.2.3
  uni_platform: ^0.1.3
  device_info_plus: ^11.3.3
@@ -57,7 +56,11 @@ dependencies:
    git:
      url: https://github.com/chen08209/flutter_js
      ref: master
-  yaml: ^3.1.3
+  #  yaml: ^3.1.3
+  flutter_svg: ^2.1.0
+  flutter_cache_manager: ^3.4.1
+  riverpod_lint: ^2.6.3
+  crypto: ^3.0.3
 dev_dependencies:
  flutter_test:
    sdk: flutter
@@ -69,8 +72,6 @@ dev_dependencies:
  freezed: ^2.5.1
  riverpod_generator: ^2.6.3
  custom_lint: ^0.7.0
-  riverpod_lint: ^2.6.3
-  crypto: ^3.0.3

 flutter:
  uses-material-design: true
--- a/services/helper/build.rs
+++ b/services/helper/build.rs
@@ -1,4 +1,5 @@
 fn main() {
    let version = std::env::var("TOKEN").unwrap_or_default();
    println!("cargo:rustc-env=TOKEN={}", version);
+    println!("cargo:rerun-if-env-changed=TOKEN");
 }