Remake dashboard

Optimize theme

Optimize more details

Update flutter version

.github/release_template.md

@@ -0,0 +1,58 @@
+<div align=center>
+
+[![Release Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/vVERSION/total?style=flat-square&logo=github)](https://img.shields.io/github/downloads/chen08209/FlClash/vVERSION/)
+
+</div>
+
+**Download based on your OS:**
+
+<div align=left>
+<table>
+    <thead align=left>
+        <tr>
+            <th>OS</th>
+            <th>Download</th>
+        </tr>
+    </thead>
+    <tbody align=left>
+        <tr>
+        <td>Android</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-arm64-v8a.apk"><img src="https://img.shields.io/badge/APK-ARMv8-168039.svg?logo=android"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-armeabi-v7a.apk"><img src="https://img.shields.io/badge/APK-ARMv7-45bf55.svg?logo=android"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-x86_64.apk"><img src="https://img.shields.io/badge/APK-x64-96ed89.svg?logo=android"></a>
+            </td>
+        </tr>
+        <tr>
+            <td>Windows</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64-setup.exe"><img src="https://img.shields.io/badge/Setup-x64-2d7d9a.svg?logo=windows"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64.zip"><img src="https://img.shields.io/badge/Portable-x64-67b7d1.svg?logo=windows"></a>
+            </td>
+        </tr>
+        <tr>
+            <td>macOS</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-arm64.dmg"><img src="https://img.shields.io/badge/DMG-Apple%20Silicon-%23000000.svg?logo=apple"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Intel%20X64-%2300A9E0.svg?logo=apple"></a><br>
+            </td>
+        </tr>
+        <tr>
+            <td>Linux</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.AppImage"><img src="https://img.shields.io/badge/AppImage-x64-f84e29.svg?logo=linux"> </a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/DebPackage-x64-FF9966.svg?logo=debian"> </a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/RpmPackage-x64-F1B42F.svg?logo=redhat"> </a>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+
+</div>
+
+<div dir="ltr">
+
+**List of all changes:** [ChangeLog](https://github.com/chen08209/FlClash/blob/main/CHANGELOG.md)
+
+</div>

.github/workflows/build.yaml

@@ -0,0 +1,245 @@
+name: build
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - platform: android
+            os: ubuntu-latest
+          - platform: windows
+            os: windows-latest
+            arch: amd64
+          - platform: linux
+            os: ubuntu-latest
+            arch: amd64
+          - platform: macos
+            os: macos-13
+            arch: amd64
+          - platform: macos
+            os: macos-latest
+            arch: arm64
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup JAVA
+        if: startsWith(matrix.platform,'android')
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup NDK
+        if: startsWith(matrix.platform,'android')
+        uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r26b
+          add-to-path: true
+          link-to-sdk: true
+
+      - name: Setup Android Signing
+        if: startsWith(matrix.platform,'android')
+        run: |
+          echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
+
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+          cache-dependency-path: |
+            core/go.sum
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.x'
+          channel: 'stable'
+          cache: true
+
+      - name: Get Flutter Dependency
+        run: flutter pub get
+
+      - name: Setup
+        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
+          path: ./dist
+          overwrite: true
+
+  changelog:
+    runs-on: ubuntu-latest
+    needs: [ build ]
+    steps:
+      - name: Checkout
+        if: ${{ !contains(github.ref, '+') }}
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: refs/heads/main
+
+      - name: Generate
+        if: ${{ !contains(github.ref, '+') }}
+        run: |
+          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
+          preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
+          currentTag=""
+          for ((i = 0; i <= ${#tags[@]}; i++)); do
+            if (( i < ${#tags[@]} )); then
+              tag=${tags[$i]}
+            else
+              tag=""
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
+                break
+              fi
+            fi
+            if [ -n "$currentTag" ]; then
+              echo "## $currentTag" >> NEW_CHANGELOG.md
+              echo "" >> NEW_CHANGELOG.md
+              if [ -n "$tag" ]; then
+                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
+              else
+                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
+              fi
+              echo "" >> NEW_CHANGELOG.md
+            fi
+            currentTag=$tag
+          done
+          cat CHANGELOG.md >> NEW_CHANGELOG.md
+          cat NEW_CHANGELOG.md > CHANGELOG.md
+
+      - name: Commit
+        if: ${{ !contains(github.ref, '+') }}
+        run: |
+          git add CHANGELOG.md
+          if ! git diff --cached --quiet; then
+            echo "Commit pushing"
+            git config --local user.email "chen08209@gmail.com"
+            git config --local user.name "chen08209"
+            git commit -m "Update changelog"
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Push succeeded"
+            else
+              echo "Push failed"
+              exit 1
+            fi
+          fi
+
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  upload:
+    permissions: write-all
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    services:
+      telegram-bot-api:
+        image: aiogram/telegram-bot-api:latest
+        env:
+          TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID }}
+          TELEGRAM_API_HASH: ${{ secrets.TELEGRAM_API_HASH }}
+        ports:
+          - 8081:8081
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download
+        uses: actions/download-artifact@v4
+        with:
+          path: ./dist/
+          pattern: artifact-*
+          merge-multiple: true
+
+      - name: Generate release.md
+        run: |
+          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
+          preTag=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          currentTag=""
+          for ((i = 0; i <= ${#tags[@]}; i++)); do
+            if (( i < ${#tags[@]} )); then
+              tag=${tags[$i]}
+            else
+              tag=""
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
+                break
+              fi
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ -n "$tag" ]; then
+                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              else
+                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              fi
+              echo "" >> release.md
+            fi
+            currentTag=$tag
+          done
+
+      - name: Push to telegram
+        env:
+          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          TAG: ${{ github.ref_name }}
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+          python release.py
+
+      - name: Patch release.md
+        run: |
+          version=$(echo "${{ github.ref_name }}" | sed 's/^v//')
+          sed "s|VERSION|$version|g" ./.github/release_template.md >> release.md
+
+      - name: Release
+        if: ${{ !contains(github.ref, '+') }}
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./dist/*
+          body_path: './release.md'
+
+      - name: Create Fdroid Source Dir
+        if: ${{ !contains(github.ref, '+') }}
+        run: |
+          mkdir -p ./tmp
+          cp ./dist/*android-arm64-v8a* ./tmp/ || true
+          echo "Files copied successfully"
+
+      - name: Push to fdroid repo
+        if: ${{ !contains(github.ref, '+') }}
+        uses: cpina/github-action-push-to-another-repository@v1.7.2
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: ./tmp/
+          destination-github-username: chen08209
+          destination-repository-name: FlClash-fdroid-repo
+          user-name: 'github-actions[bot]'
+          user-email: 'github-actions[bot]@users.noreply.github.com'
+          target-branch: action-pr
+          commit-message: Update from ${{ github.ref_name }}
+          target-directory: /tmp/
+

.github/workflows/build.yml

@@ -1,157 +0,0 @@
-name: build
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - platform: android
-            os: ubuntu-latest
-          - platform: windows
-            os: windows-latest
-            arch: amd64
-          - platform: linux
-            os: ubuntu-latest
-            arch: amd64
-          - platform: macos
-            os: macos-13
-            arch: amd64
-          - platform: macos
-            os: macos-latest
-            arch: arm64
-
-    steps:
-      - name: Setup Mingw64
-        if: startsWith(matrix.platform,'windows')
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          install: mingw-w64-x86_64-gcc
-          update: true
-
-
-      - name: Set Mingw64 Env
-        if: startsWith(matrix.platform,'windows')
-        run: |
-          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Check Matrix
-        run: |
-          echo "Running on ${{ matrix.os }}"
-          echo "Arch: ${{ runner.arch }}"
-          gcc --version
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup JAVA
-        if: startsWith(matrix.platform,'android')
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Setup NDK
-        if: startsWith(matrix.platform,'android')
-        uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r26b
-          add-to-path: true
-          link-to-sdk: true
-
-      - name: Setup Android Signing
-        if: startsWith(matrix.platform,'android')
-        run: |
-          echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
-          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: 'core/go.mod'
-          cache-dependency-path: |
-            core/go.sum
-
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: '3.x'
-          channel: 'stable'
-          cache: true
-
-      - name: Get Flutter Dependency
-        run: flutter pub get
-
-      - name: Setup
-        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
-          path: ./dist
-          retention-days: 1
-          overwrite: true
-
-
-  upload-release:
-    if: ${{ !contains(github.ref, '+') }}
-    permissions: write-all
-    needs: [ build ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Download
-        uses: actions/download-artifact@v4
-        with:
-          path: ./dist/
-          pattern: artifact-*
-          merge-multiple: true
-
-      - name: Pre Release
-        run: |
-          pip install gitchangelog pystache mustache markdown
-          pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
-          if [ -z "pre" ]; then
-            echo "init" > release.md
-          else
-            current="${{ github.ref_name }}"
-            echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
-            gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
-            echo -e "\n\n</details>" >> release.md
-          fi
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./dist/*
-          body_path: './release.md'
-
-      - name: Push to fdroid repo
-        uses: cpina/github-action-push-to-another-repository@v1.7.2
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: ./dist/
-          destination-github-username: chen08209
-          destination-repository-name: FlClash-fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: action-pr
-          commit-message: Update from ${{ github.ref_name }}
-          target-directory: /tmp/

.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

.gitmodules

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

CHANGELOG.md

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

README.md

@@ -6,13 +6,9 @@
 
 ## FlClash
 
-<p style="text-align: left;">
-    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
-    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
-    <a href="LICENSE">
-        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
-    </a>
-</p>
+[![Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/total?style=flat-square&logo=github)](https://github.com/chen08209/FlClash/releases/)[![Last Version](https://img.shields.io/github/release/chen08209/FlClash/all.svg?style=flat-square)](https://github.com/chen08209/FlClash/releases/)[![License](https://img.shields.io/github/license/chen08209/FlClash?style=flat-square)](LICENSE)
+
+[![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)
 
 A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 
@@ -38,14 +34,33 @@ on Mobile:
 
 ✨ Support subscription link, Dark mode
 
+## Use
+
+### Linux
+
+⚠️ Make sure to install the following dependencies before using them
+
+   ```bash
+    sudo apt-get install appindicator3-0.1 libappindicator3-dev
+    sudo apt-get install keybinder-3.0
+   ```
+
+### Android
+
+Support the following actions
+
+   ```bash
+    com.follow.clash.action.START
+    
+    com.follow.clash.action.STOP
+    
+    com.follow.clash.action.CHANGE
+   ```
+
 ## Download
 
 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
 
-## Contact
-
-[Telegram](https://t.me/+G-veVtwBOl4wODc1)
-
 ## Build
 
 1. Update submodules
@@ -78,7 +93,7 @@ on Mobile:
         3. Run build script
 
            ```bash
-           dart .\setup.dart	
+           dart .\setup.dart windows --arch <arm64 | amd64>
            ```
 
     - linux
@@ -88,7 +103,7 @@ on Mobile:
         2. Run build script
 
            ```bash
-           dart .\setup.dart	
+           dart .\setup.dart linux --arch <arm64 | amd64>
            ```
 
     - macOS
@@ -98,11 +113,8 @@ on Mobile:
         2. Run build script
 
            ```bash
-           dart .\setup.dart	
+           dart .\setup.dart macos --arch <arm64 | amd64>
            ```
-           
-
-    
 
 ## Star
 

README_zh_CN.md

@@ -6,13 +6,9 @@
 
 ## FlClash
 
-<p style="text-align: left;">
-    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
-    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
-    <a href="LICENSE">
-        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
-    </a>
-</p>
+[![Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/total?style=flat-square&logo=github)](https://github.com/chen08209/FlClash/releases/)[![Last Version](https://img.shields.io/github/release/chen08209/FlClash/all.svg?style=flat-square)](https://github.com/chen08209/FlClash/releases/)[![License](https://img.shields.io/github/license/chen08209/FlClash?style=flat-square)](LICENSE)
+
+[![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)
 
 基于ClashMeta的多平台代理客户端，简单易用，开源无广告。
 
@@ -38,15 +34,33 @@ on Mobile:
 
 ✨ 支持一键导入订阅, 深色模式
 
+## Use
+
+### Linux
+
+⚠️ 使用前请确保安装以下依赖
+
+   ```bash
+    sudo apt-get install appindicator3-0.1 libappindicator3-dev
+    sudo apt-get install keybinder-3.0
+   ```
+
+### Android
+
+支持下列操作
+
+   ```bash
+    com.follow.clash.action.START
+    
+    com.follow.clash.action.STOP
+    
+    com.follow.clash.action.CHANGE
+   ```
+
 ## Download
 
 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
 
-
-## Contact
-
-[Telegram](https://t.me/+G-veVtwBOl4wODc1)
-
 ## Build
 
 1. 更新 submodules
@@ -79,7 +93,7 @@ on Mobile:
         3. 运行构建脚本
 
            ```bash
-           dart .\setup.dart	
+           dart .\setup.dart windows --arch <arm64 | amd64>
            ```
 
     - linux
@@ -89,7 +103,7 @@ on Mobile:
         2. 运行构建脚本
 
            ```bash
-           dart .\setup.dart	
+           dart .\setup.dart linux --arch <arm64 | amd64>
            ```
 
     - macOS
@@ -99,7 +113,7 @@ on Mobile:
         2. 运行构建脚本
 
            ```bash
-             dart .\setup.dart	
+           dart .\setup.dart macos --arch <arm64 | amd64>
            ```
 
 ## Star History

android/app/build.gradle

@@ -34,22 +34,22 @@ def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias
 android {
     namespace "com.follow.clash"
     compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    ndkVersion "27.1.12297006"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     signingConfigs {
-        if (isRelease){
+        if (isRelease) {
             release {
                 storeFile defStoreFile
                 storePassword defStorePassword
@@ -74,10 +74,9 @@ android {
             applicationIdSuffix '.debug'
         }
         release {
-            minifyEnabled true
-            if(isRelease){
+            if (isRelease) {
                 signingConfig signingConfigs.release
-            }else{
+            } else {
                 signingConfig signingConfigs.debug
             }
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
@@ -102,6 +101,9 @@ flutter {
 dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation 'com.google.code.gson:gson:2.10'
+    implementation("com.android.tools.smali:smali-dexlib2:3.0.7") {
+        exclude group: "com.google.guava", module: "guava"
+    }
 }
 
 

android/app/src/main/AndroidManifest.xml

@@ -2,31 +2,31 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature
-            android:name="android.hardware.touchscreen"
-            android:required="false" />
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
     <uses-feature
-            android:name="android.hardware.camera"
-            android:required="false" />
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+        tools:ignore="SystemPermissionTypo" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
-        tools:ignore="SystemPermissionTypo" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
     <application
         android:name="${applicationName}"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:extractNativeLibs="true"
-        android:enableOnBackInvokedCallback="true"
-        android:label="FlClash"
-        tools:targetApi="tiramisu">
+        android:label="FlClash">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -56,30 +56,44 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="clash"/>
-                <data android:scheme="clashmeta"/>
-                <data android:scheme="flclash"/>
+                <data android:scheme="clash" />
+                <data android:scheme="clashmeta" />
+                <data android:scheme="flclash" />
 
-                <data android:host="install-config"/>
+                <data android:host="install-config" />
             </intent-filter>
         </activity>
 
-<!--        <meta-data-->
-<!--                android:name="io.flutter.embedding.android.EnableImpeller"-->
-<!--                android:value="true" />-->
+        <!--        <meta-data-->
+        <!--                android:name="io.flutter.embedding.android.EnableImpeller"-->
+        <!--                android:value="true" />-->
 
         <activity
             android:name=".TempActivity"
-            android:theme="@style/TransparentTheme" />
+            android:exported="true"
+            android:theme="@style/TransparentTheme">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="${applicationId}.action.START" />
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="${applicationId}.action.STOP" />
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="${applicationId}.action.CHANGE" />
+            </intent-filter>
+        </activity>
 
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/ic_stat_name"
             android:foregroundServiceType="specialUse"
+            android:icon="@drawable/ic_stat_name"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            >
+            tools:targetApi="n">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -114,11 +128,22 @@
             android:name=".services.FlClashVpnService"
             android:exported="false"
             android:foregroundServiceType="specialUse"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            >
+            android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="vpn" />
+        </service>
+
+        <service
+            android:name=".services.FlClashService"
+            android:exported="false"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="service" />
         </service>
 
         <meta-data

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

@@ -0,0 +1,10 @@
+package com.follow.clash
+
+
+import com.follow.clash.models.VpnOptions
+
+interface BaseServiceInterface {
+    fun start(options: VpnOptions): Int
+    fun stop()
+    fun startForeground(title: String, content: String)
+}

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

@@ -1,11 +1,11 @@
 package com.follow.clash
 
 import android.content.Context
-import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ProxyPlugin
+import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
@@ -20,8 +20,7 @@ enum class RunState {
 
 
 object GlobalState {
-
-    private val lock = ReentrantLock()
+    val runLock = ReentrantLock()
 
     val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
     var flutterEngine: FlutterEngine? = null
@@ -32,24 +31,65 @@ object GlobalState {
         return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 
-    fun getCurrentTitlePlugin(): TilePlugin? {
+    fun getText(text: String): String {
+        return getCurrentAppPlugin()?.getText(text) ?: ""
+    }
+
+    fun getCurrentTilePlugin(): TilePlugin? {
         val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
         return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
     }
 
+    fun getCurrentVPNPlugin(): VpnPlugin? {
+        return serviceEngine?.plugins?.get(VpnPlugin::class.java) as VpnPlugin?
+    }
+
+    fun handleToggle(context: Context) {
+        val starting = handleStart(context)
+        if (!starting) {
+            handleStop()
+        }
+    }
+
+    fun handleStart(context: Context): Boolean {
+        if (runState.value == RunState.STOP) {
+            runState.value = RunState.PENDING
+            runLock.lock()
+            val tilePlugin = getCurrentTilePlugin()
+            if (tilePlugin != null) {
+                tilePlugin.handleStart()
+            } else {
+                initServiceEngine(context)
+            }
+            return true
+        }
+        return false
+    }
+
+    fun handleStop() {
+        if (runState.value == RunState.START) {
+            runState.value = RunState.PENDING
+            runLock.lock()
+            getCurrentTilePlugin()?.handleStop()
+        }
+    }
+
     fun destroyServiceEngine() {
-        serviceEngine?.destroy()
-        serviceEngine = null
+        runLock.withLock {
+            serviceEngine?.destroy()
+            serviceEngine = null
+        }
     }
 
     fun initServiceEngine(context: Context) {
         if (serviceEngine != null) return
-        lock.withLock {
-            destroyServiceEngine()
+        destroyServiceEngine()
+        runLock.withLock {
             serviceEngine = FlutterEngine(context)
-            serviceEngine?.plugins?.add(ProxyPlugin())
+            serviceEngine?.plugins?.add(VpnPlugin())
             serviceEngine?.plugins?.add(AppPlugin())
             serviceEngine?.plugins?.add(TilePlugin())
+            serviceEngine?.plugins?.add(ServicePlugin())
             val vpnService = DartExecutor.DartEntrypoint(
                 FlutterInjector.instance().flutterLoader().findAppBundlePath(),
                 "vpnService"

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

@@ -2,17 +2,18 @@ package com.follow.clash
 
 
 import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ProxyPlugin
+import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 
 class MainActivity : FlutterActivity() {
-
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
-        flutterEngine.plugins.add(ProxyPlugin())
+        flutterEngine.plugins.add(VpnPlugin())
+        flutterEngine.plugins.add(ServicePlugin())
         flutterEngine.plugins.add(TilePlugin())
         GlobalState.flutterEngine = flutterEngine
     }

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

@@ -2,10 +2,24 @@ package com.follow.clash
 
 import android.app.Activity
 import android.os.Bundle
+import com.follow.clash.extensions.wrapAction
 
 class TempActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        when (intent.action) {
+            wrapAction("START") -> {
+                GlobalState.handleStart(applicationContext)
+            }
+
+            wrapAction("STOP") -> {
+                GlobalState.handleStop()
+            }
+
+            wrapAction("CHANGE") -> {
+                GlobalState.handleToggle(applicationContext)
+            }
+        }
         finishAndRemoveTask()
     }
 }

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

@@ -1,37 +0,0 @@
-package com.follow.clash.extensions
-
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.system.OsConstants.IPPROTO_TCP
-import android.system.OsConstants.IPPROTO_UDP
-import android.util.Base64
-import java.net.URL
-import androidx.core.graphics.drawable.toBitmap
-import com.follow.clash.models.Metadata
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.ByteArrayOutputStream
-import java.net.InetAddress
-import java.net.InetSocketAddress
-
-
-suspend fun Drawable.getBase64(): String {
-    val drawable = this
-    return withContext(Dispatchers.IO) {
-        val bitmap = drawable.toBitmap()
-        val byteArrayOutputStream = ByteArrayOutputStream()
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
-        Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
-    }
-}
-
-fun Metadata.getProtocol(): Int? {
-    if (network.startsWith("tcp")) return IPPROTO_TCP
-    if (network.startsWith("udp")) return IPPROTO_UDP
-    return null
-}
-
-fun String.getInetSocketAddress(): InetSocketAddress {
-    val url = URL("https://$this")
-    return InetSocketAddress(InetAddress.getByName(url.host), url.port)
-}

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

@@ -0,0 +1,198 @@
+package com.follow.clash.extensions
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.net.ConnectivityManager
+import android.net.Network
+import android.os.Build
+import android.system.OsConstants.IPPROTO_TCP
+import android.system.OsConstants.IPPROTO_UDP
+import android.util.Base64
+import androidx.core.graphics.drawable.toBitmap
+import com.follow.clash.TempActivity
+import com.follow.clash.models.CIDR
+import com.follow.clash.models.Metadata
+import com.follow.clash.models.VpnOptions
+import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
+import java.net.Inet4Address
+import java.net.Inet6Address
+import java.net.InetAddress
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+
+suspend fun Drawable.getBase64(): String {
+    val drawable = this
+    return withContext(Dispatchers.IO) {
+        val bitmap = drawable.toBitmap()
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
+        Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
+    }
+}
+
+fun Metadata.getProtocol(): Int? {
+    if (network.startsWith("tcp")) return IPPROTO_TCP
+    if (network.startsWith("udp")) return IPPROTO_UDP
+    return null
+}
+
+fun VpnOptions.getIpv4RouteAddress(): List<CIDR> {
+    return routeAddress.filter {
+        it.isIpv4()
+    }.map {
+        it.toCIDR()
+    }
+}
+
+fun VpnOptions.getIpv6RouteAddress(): List<CIDR> {
+    return routeAddress.filter {
+        it.isIpv6()
+    }.map {
+        it.toCIDR()
+    }
+}
+
+fun String.isIpv4(): Boolean {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val address = InetAddress.getByName(parts[0])
+    return address.address.size == 4
+}
+
+fun String.isIpv6(): Boolean {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val address = InetAddress.getByName(parts[0])
+    return address.address.size == 16
+}
+
+fun String.toCIDR(): CIDR {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val ipAddress = parts[0]
+    val prefixLength = parts[1].toIntOrNull()
+        ?: throw IllegalArgumentException("Invalid prefix length")
+
+    val address = InetAddress.getByName(ipAddress)
+
+    val maxPrefix = if (address.address.size == 4) 32 else 128
+    if (prefixLength < 0 || prefixLength > maxPrefix) {
+        throw IllegalArgumentException("Invalid prefix length for IP version")
+    }
+
+    return CIDR(address, prefixLength)
+}
+
+
+fun ConnectivityManager.resolveDns(network: Network?): List<String> {
+    val properties = getLinkProperties(network) ?: return listOf()
+    return properties.dnsServers.map { it.asSocketAddressText(53) }
+}
+
+fun InetAddress.asSocketAddressText(port: Int): String {
+    return when (this) {
+        is Inet6Address ->
+            "[${numericToTextFormat(this.address)}]:$port"
+
+        is Inet4Address ->
+            "${this.hostAddress}:$port"
+
+        else -> throw IllegalArgumentException("Unsupported Inet type ${this.javaClass}")
+    }
+}
+
+fun Context.wrapAction(action: String): String {
+    return "${this.packageName}.action.$action"
+}
+
+fun Context.getActionIntent(action: String): Intent {
+    val actionIntent = Intent(this, TempActivity::class.java)
+    actionIntent.action = wrapAction(action)
+    return actionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+}
+
+fun Context.getActionPendingIntent(action: String): PendingIntent {
+    return if (Build.VERSION.SDK_INT >= 31) {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    } else {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+}
+
+
+private fun numericToTextFormat(src: ByteArray): String {
+    val sb = StringBuilder(39)
+    for (i in 0 until 8) {
+        sb.append(
+            Integer.toHexString(
+                src[i shl 1].toInt() shl 8 and 0xff00
+                        or (src[(i shl 1) + 1].toInt() and 0xff)
+            )
+        )
+        if (i < 7) {
+            sb.append(":")
+        }
+    }
+    return sb.toString()
+}
+
+suspend fun <T> MethodChannel.awaitResult(
+    method: String,
+    arguments: Any? = null
+): T? = withContext(Dispatchers.Main) { // 切换到主线程
+    suspendCoroutine { continuation ->
+        invokeMethod(method, arguments, object : MethodChannel.Result {
+            override fun success(result: Any?) {
+                @Suppress("UNCHECKED_CAST")
+                continuation.resume(result as T)
+            }
+
+            override fun error(code: String, message: String?, details: Any?) {
+                continuation.resume(null)
+            }
+
+            override fun notImplemented() {
+                continuation.resume(null)
+            }
+        })
+    }
+}
+
+fun ReentrantLock.safeLock() {
+    if (this.isLocked) {
+        return
+    }
+    this.lock()
+}
+
+fun ReentrantLock.safeUnlock() {
+    if (!this.isLocked) {
+        return
+    }
+
+    this.unlock()
+}

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

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

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

@@ -1,8 +1,9 @@
 package com.follow.clash.models
 
+import java.net.InetAddress
+
 enum class AccessControlMode {
-    acceptSelected,
-    rejectSelected,
+    acceptSelected, rejectSelected,
 }
 
 data class AccessControl(
@@ -11,8 +12,17 @@ data class AccessControl(
     val rejectList: List<String>,
 )
 
-data class Props(
+data class CIDR(val address: InetAddress, val prefixLength: Int)
+
+data class VpnOptions(
+    val enable: Boolean,
+    val port: Int,
     val accessControl: AccessControl?,
-    val allowBypass: Boolean?,
-    val systemProxy: Boolean?,
-)
+    val allowBypass: Boolean,
+    val systemProxy: Boolean,
+    val bypassDomain: List<String>,
+    val routeAddress: List<String>,
+    val ipv4Address: String,
+    val ipv6Address: String,
+    val dnsServerAddress: String,
+)

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

@@ -6,19 +6,27 @@ import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
+import android.content.pm.ComponentInfo
 import android.content.pm.PackageManager
-import android.net.ConnectivityManager
+import android.net.VpnService
 import android.os.Build
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.content.FileProvider
-import androidx.core.content.getSystemService
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
 import com.follow.clash.GlobalState
+import com.follow.clash.R
+import com.follow.clash.extensions.awaitResult
+import com.follow.clash.extensions.getActionIntent
 import com.follow.clash.extensions.getBase64
-import com.follow.clash.extensions.getProtocol
 import com.follow.clash.models.Package
-import com.follow.clash.models.Process
 import com.google.gson.Gson
+import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
@@ -29,35 +37,105 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.net.InetSocketAddress
-
+import java.util.zip.ZipFile
 
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
     private var activity: Activity? = null
 
-    private var toast: Toast? = null
-
-    private var context: Context? = null
+    private lateinit var context: Context
 
     private lateinit var channel: MethodChannel
 
     private lateinit var scope: CoroutineScope
 
-    private var connectivity: ConnectivityManager? = null
+    private var vpnCallBack: (() -> Unit)? = null
 
     private val iconMap = mutableMapOf<String, String?>()
 
+    private val packages = mutableListOf<Package>()
+
+    private val skipPrefixList = listOf(
+        "com.google",
+        "com.android.chrome",
+        "com.android.vending",
+        "com.microsoft",
+        "com.apple",
+        "com.zhiliaoapp.musically", // Banned by China
+    )
+
+    private val chinaAppPrefixList = listOf(
+        "com.tencent",
+        "com.alibaba",
+        "com.umeng",
+        "com.qihoo",
+        "com.ali",
+        "com.alipay",
+        "com.amap",
+        "com.sina",
+        "com.weibo",
+        "com.vivo",
+        "com.xiaomi",
+        "com.huawei",
+        "com.taobao",
+        "com.secneo",
+        "s.h.e.l.l",
+        "com.stub",
+        "com.kiwisec",
+        "com.secshell",
+        "com.wrapper",
+        "cn.securitystack",
+        "com.mogosec",
+        "com.secoen",
+        "com.netease",
+        "com.mx",
+        "com.qq.e",
+        "com.baidu",
+        "com.bytedance",
+        "com.bugly",
+        "com.miui",
+        "com.oppo",
+        "com.coloros",
+        "com.iqoo",
+        "com.meizu",
+        "com.gionee",
+        "cn.nubia",
+        "com.oplus",
+        "andes.oplus",
+        "com.unionpay",
+        "cn.wps"
+    )
+
+    private val chinaAppRegex by lazy {
+        ("(" + chinaAppPrefixList.joinToString("|").replace(".", "\\.") + ").*").toRegex()
+    }
+
+    val VPN_PERMISSION_REQUEST_CODE = 1001
+
+    val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
+
+    private var isBlockNotification: Boolean = false
+
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         scope = CoroutineScope(Dispatchers.Default)
-        context = flutterPluginBinding.applicationContext;
+        context = flutterPluginBinding.applicationContext
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
         channel.setMethodCallHandler(this)
-
     }
 
+    private fun initShortcuts(label: String) {
+        val shortcut = ShortcutInfoCompat.Builder(context, "toggle")
+            .setShortLabel(label)
+            .setIcon(IconCompat.createWithResource(context, R.mipmap.ic_launcher_round))
+            .setIntent(context.getActionIntent("CHANGE"))
+            .build()
+        ShortcutManagerCompat.setDynamicShortcuts(context, listOf(shortcut))
+    }
+
+
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
         scope.cancel()
@@ -65,11 +143,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private fun tip(message: String?) {
         if (GlobalState.flutterEngine == null) {
-            if (toast != null) {
-                toast!!.cancel()
-            }
-            toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
-            toast!!.show()
+            Toast.makeText(context, message, Toast.LENGTH_LONG).show()
         }
     }
 
@@ -77,18 +151,29 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         when (call.method) {
             "moveTaskToBack" -> {
                 activity?.moveTaskToBack(true)
-                result.success(true);
+                result.success(true)
             }
 
             "updateExcludeFromRecents" -> {
                 val value = call.argument<Boolean>("value")
                 updateExcludeFromRecents(value)
-                result.success(true);
+                result.success(true)
+            }
+
+            "initShortcuts" -> {
+                initShortcuts(call.arguments as String)
+                result.success(true)
             }
 
             "getPackages" -> {
                 scope.launch {
-                    result.success(getPackages())
+                    result.success(getPackagesToJson())
+                }
+            }
+
+            "getChinaPackageNames" -> {
+                scope.launch {
+                    result.success(getChinaPackageNames())
                 }
             }
 
@@ -107,7 +192,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                         }
                         if (iconMap["default"] == null) {
                             iconMap["default"] =
-                                context?.packageManager?.defaultActivityIcon?.getBase64()
+                                context.packageManager?.defaultActivityIcon?.getBase64()
                         }
                         result.success(iconMap["default"])
                         return@launch
@@ -115,52 +200,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
             }
 
-            "resolverProcess" -> {
-                val data = call.argument<String>("data")
-                val process =
-                    if (data != null) Gson().fromJson(
-                        data,
-                        Process::class.java
-                    ) else null
-                val metadata = process?.metadata
-                val protocol = metadata?.getProtocol()
-                if (protocol == null) {
-                    result.success(null)
-                    return
-                }
-                scope.launch {
-                    withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        if (context == null) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        if (connectivity == null) {
-                            connectivity = context!!.getSystemService<ConnectivityManager>()
-                        }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val dst = InetSocketAddress(
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
-                        if (uid == null || uid == -1) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        val packages = context?.packageManager?.getPackagesForUid(uid)
-                        result.success(packages?.first())
-                    }
-                }
-            }
-
             "tip" -> {
                 val message = call.argument<String>("message")
                 tip(message)
@@ -174,52 +213,49 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             }
 
             else -> {
-                result.notImplemented();
+                result.notImplemented()
             }
         }
     }
 
     private fun openFile(path: String) {
-        context?.let {
-            val file = File(path)
-            val uri = FileProvider.getUriForFile(
-                it,
-                "${it.packageName}.fileProvider",
-                file
-            )
+        val file = File(path)
+        val uri = FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.fileProvider",
+            file
+        )
 
-            val intent = Intent(Intent.ACTION_VIEW).setDataAndType(
+        val intent = Intent(Intent.ACTION_VIEW).setDataAndType(
+            uri,
+            "text/plain"
+        )
+
+        val flags =
+            Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
+
+        val resInfoList = context.packageManager.queryIntentActivities(
+            intent, PackageManager.MATCH_DEFAULT_ONLY
+        )
+
+        for (resolveInfo in resInfoList) {
+            val packageName = resolveInfo.activityInfo.packageName
+            context.grantUriPermission(
+                packageName,
                 uri,
-                "text/plain"
+                flags
             )
+        }
 
-            val flags =
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
-
-            val resInfoList = it.packageManager.queryIntentActivities(
-                intent, PackageManager.MATCH_DEFAULT_ONLY
-            )
-
-            for (resolveInfo in resInfoList) {
-                val packageName = resolveInfo.activityInfo.packageName
-                it.grantUriPermission(
-                    packageName,
-                    uri,
-                    flags
-                )
-            }
-
-            try {
-                activity?.startActivity(intent)
-            } catch (e: Exception) {
-                println(e)
-            }
+        try {
+            activity?.startActivity(intent)
+        } catch (e: Exception) {
+            println(e)
         }
     }
 
     private fun updateExcludeFromRecents(value: Boolean?) {
-        if (context == null) return
-        val am = getSystemService(context!!, ActivityManager::class.java)
+        val am = getSystemService(context, ActivityManager::class.java)
         val task = am?.appTasks?.firstOrNull {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 it.taskInfo.taskId == activity?.taskId
@@ -236,7 +272,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     private suspend fun getPackageIcon(packageName: String): String? {
-        val packageManager = context?.packageManager
+        val packageManager = context.packageManager
         if (iconMap[packageName] == null) {
             iconMap[packageName] = try {
                 packageManager?.getApplicationIcon(packageName)?.getBase64()
@@ -248,32 +284,145 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         return iconMap[packageName]
     }
 
-    private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default) {
-            val packageManager = context?.packageManager
-            val packages: List<Package>? =
-                packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
-                    it.packageName != context?.packageName
-                            || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                            || it.packageName == "android"
+    private fun getPackages(): List<Package> {
+        val packageManager = context.packageManager
+        if (packages.isNotEmpty()) return packages
+        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
+            it.packageName != context.packageName
+                    || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                    || it.packageName == "android"
 
-                }?.map {
-                    Package(
-                        packageName = it.packageName,
-                        label = it.applicationInfo.loadLabel(packageManager).toString(),
-                        isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1
-                    )
-                }
+        }?.map {
+            Package(
+                packageName = it.packageName,
+                label = it.applicationInfo.loadLabel(packageManager).toString(),
+                isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1,
+                firstInstallTime = it.firstInstallTime
+            )
+        }?.let { packages.addAll(it) }
+        return packages
+    }
+
+    private suspend fun getPackagesToJson(): String {
+        return withContext(Dispatchers.Default) {
+            Gson().toJson(getPackages())
+        }
+    }
+
+    private suspend fun getChinaPackageNames(): String {
+        return withContext(Dispatchers.Default) {
+            val packages: List<String> =
+                getPackages().map { it.packageName }.filter { isChinaPackage(it) }
             Gson().toJson(packages)
         }
     }
 
-    fun requestGc() {
-        channel.invokeMethod("gc", null)
+    fun requestVpnPermission(context: Context, callBack: () -> Unit) {
+        vpnCallBack = callBack
+        val intent = VpnService.prepare(context)
+        if (intent != null) {
+            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
+            return
+        }
+        vpnCallBack?.invoke()
+    }
+
+    fun requestNotificationsPermission(context: Context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val permission = ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.POST_NOTIFICATIONS
+            )
+            if (permission != PackageManager.PERMISSION_GRANTED) {
+                if (isBlockNotification) return
+                if (activity == null) return
+                ActivityCompat.requestPermissions(
+                    activity!!,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    NOTIFICATION_PERMISSION_REQUEST_CODE
+                )
+                return
+            }
+        }
+    }
+
+    fun getText(text: String): String? {
+        return runBlocking {
+            channel.awaitResult<String>("getText", text)
+        }
+    }
+
+    private fun isChinaPackage(packageName: String): Boolean {
+        val packageManager = context.packageManager ?: return false
+        skipPrefixList.forEach {
+            if (packageName == it || packageName.startsWith("$it.")) return false
+        }
+        val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
+        } else {
+            @Suppress("DEPRECATION")
+            PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
+        }
+        if (packageName.matches(chinaAppRegex)) {
+            return true
+        }
+        try {
+            val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                packageManager.getPackageInfo(
+                    packageName,
+                    PackageManager.PackageInfoFlags.of(packageManagerFlags.toLong())
+                )
+            } else {
+                @Suppress("DEPRECATION") packageManager.getPackageInfo(
+                    packageName, packageManagerFlags
+                )
+            }
+            mutableListOf<ComponentInfo>().apply {
+                packageInfo.services?.let { addAll(it) }
+                packageInfo.activities?.let { addAll(it) }
+                packageInfo.receivers?.let { addAll(it) }
+                packageInfo.providers?.let { addAll(it) }
+            }.forEach {
+                if (it.name.matches(chinaAppRegex)) return true
+            }
+            ZipFile(File(packageInfo.applicationInfo.publicSourceDir)).use {
+                for (packageEntry in it.entries()) {
+                    if (packageEntry.name.startsWith("firebase-")) return false
+                }
+                for (packageEntry in it.entries()) {
+                    if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
+                            ".dex"
+                        ))
+                    ) {
+                        continue
+                    }
+                    if (packageEntry.size > 15000000) {
+                        return true
+                    }
+                    val input = it.getInputStream(packageEntry).buffered()
+                    val dexFile = try {
+                        DexBackedDexFile.fromInputStream(null, input)
+                    } catch (e: Exception) {
+                        return false
+                    }
+                    for (clazz in dexFile.classes) {
+                        val clazzName =
+                            clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
+                                .replace("$", ".")
+                        if (clazzName.matches(chinaAppRegex)) return true
+                    }
+                }
+            }
+        } catch (_: Exception) {
+            return false
+        }
+        return false
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
+        binding.addActivityResultListener(::onActivityResult)
+        binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
@@ -281,11 +430,32 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
     }
 
     override fun onDetachedFromActivity() {
         channel.invokeMethod("exit", null)
         activity = null
     }
-}
+
+    private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+        if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
+            if (resultCode == FlutterActivity.RESULT_OK) {
+                GlobalState.initServiceEngine(context)
+                vpnCallBack?.invoke()
+            }
+        }
+        return true
+    }
+
+    private fun onRequestPermissionsResultListener(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ): Boolean {
+        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
+            isBlockNotification = true
+        }
+        return true
+    }
+}

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

@@ -1,220 +0,0 @@
-package com.follow.clash.plugins
-
-import android.Manifest
-import android.app.Activity
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.content.pm.PackageManager
-import android.net.VpnService
-import android.os.Build
-import android.os.IBinder
-import android.util.Log
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import com.follow.clash.GlobalState
-import com.follow.clash.RunState
-import com.follow.clash.models.Props
-import com.follow.clash.services.FlClashVpnService
-import com.google.gson.Gson
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-
-
-class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
-
-    private lateinit var flutterMethodChannel: MethodChannel
-
-    val VPN_PERMISSION_REQUEST_CODE = 1001
-    val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
-
-    private var activity: Activity? = null
-    private var context: Context? = null
-    private var flClashVpnService: FlClashVpnService? = null
-    private var port: Int = 7890
-    private var props: Props? = null
-    private var isBlockNotification: Boolean = false
-    private var isStart: Boolean = false
-
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as FlClashVpnService.LocalBinder
-            flClashVpnService = binder.getService()
-            if (isStart) {
-                startVpn()
-            } else {
-                flClashVpnService?.initServiceEngine()
-            }
-        }
-
-        override fun onServiceDisconnected(arg: ComponentName) {
-            flClashVpnService = null
-        }
-    }
-
-    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        context = flutterPluginBinding.applicationContext
-        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "proxy")
-        flutterMethodChannel.setMethodCallHandler(this)
-    }
-
-    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        flutterMethodChannel.setMethodCallHandler(null)
-    }
-
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
-        "initService" -> {
-            isStart = false
-            initService()
-            requestNotificationsPermission()
-            result.success(true)
-        }
-
-        "startProxy" -> {
-            isStart = true
-            port = call.argument<Int>("port")!!
-            val args = call.argument<String>("args")
-            props =
-                if (args != null) Gson().fromJson(args, Props::class.java) else null
-            startVpn()
-            result.success(true)
-        }
-
-        "stopProxy" -> {
-            stopVpn()
-            result.success(true)
-        }
-
-        "setProtect" -> {
-            val fd = call.argument<Int>("fd")
-            if (fd != null) {
-                flClashVpnService?.protect(fd)
-                result.success(true)
-            } else {
-                result.success(false)
-            }
-        }
-
-        "startForeground" -> {
-            val title = call.argument<String>("title") as String
-            val content = call.argument<String>("content") as String
-            startForeground(title, content)
-            result.success(true)
-        }
-
-        else -> {
-            result.notImplemented()
-        }
-    }
-
-    private fun initService() {
-        val intent = VpnService.prepare(context)
-        if (intent != null) {
-            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
-        } else {
-            if (flClashVpnService != null) {
-                flClashVpnService!!.initServiceEngine()
-            } else {
-                bindService()
-            }
-        }
-    }
-
-    private fun startVpn() {
-        if (flClashVpnService == null) {
-            bindService()
-            return
-        }
-        if (GlobalState.runState.value == RunState.START) return
-        GlobalState.runState.value = RunState.START
-        val intent = VpnService.prepare(context)
-        if (intent != null) {
-            stopVpn()
-            return
-        }
-        val fd = flClashVpnService?.start(port, props)
-        flutterMethodChannel.invokeMethod("started", fd)
-    }
-
-    private fun stopVpn() {
-        if (GlobalState.runState.value == RunState.STOP) return
-        GlobalState.runState.value = RunState.STOP
-        flClashVpnService?.stop()
-        GlobalState.destroyServiceEngine()
-    }
-
-    private fun startForeground(title: String, content: String) {
-        if (GlobalState.runState.value != RunState.START) return
-        flClashVpnService?.startForeground(title, content)
-    }
-
-    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-        activity = binding.activity
-        binding.addActivityResultListener(::onActivityResult)
-        binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
-    }
-
-    private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-        if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
-            if (resultCode == FlutterActivity.RESULT_OK) {
-                bindService()
-            } else {
-                stopVpn()
-            }
-        }
-        return true
-    }
-
-    private fun onRequestPermissionsResultListener(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ): Boolean {
-        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            isBlockNotification = true
-        }
-        return false
-    }
-
-    private fun requestNotificationsPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val permission = context?.let {
-                ContextCompat.checkSelfPermission(
-                    it,
-                    Manifest.permission.POST_NOTIFICATIONS
-                )
-            }
-            if (permission != PackageManager.PERMISSION_GRANTED) {
-                if (isBlockNotification) return
-                if (activity == null) return
-                ActivityCompat.requestPermissions(
-                    activity!!,
-                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    NOTIFICATION_PERMISSION_REQUEST_CODE
-                )
-            }
-        }
-    }
-
-    override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
-    }
-
-    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-        activity = binding.activity
-    }
-
-    override fun onDetachedFromActivity() {
-        activity = null
-    }
-
-    private fun bindService() {
-        val intent = Intent(context, FlClashVpnService::class.java)
-        context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-}

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

@@ -0,0 +1,47 @@
+package com.follow.clash.plugins
+
+import android.content.Context
+import com.follow.clash.GlobalState
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+
+
+class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
+
+    private lateinit var flutterMethodChannel: MethodChannel
+
+    private lateinit var context: Context
+
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        context = flutterPluginBinding.applicationContext
+        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "service")
+        flutterMethodChannel.setMethodCallHandler(this)
+    }
+
+    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        flutterMethodChannel.setMethodCallHandler(null)
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
+        "init" -> {
+            GlobalState.getCurrentAppPlugin()?.requestNotificationsPermission(context)
+            GlobalState.initServiceEngine(context)
+            result.success(true)
+        }
+
+        "destroy" -> {
+            handleDestroy()
+            result.success(true)
+        }
+
+        else -> {
+            result.notImplemented()
+        }
+    }
+
+    private fun handleDestroy() {
+        GlobalState.getCurrentVPNPlugin()?.stop()
+        GlobalState.destroyServiceEngine()
+    }
+}

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

@@ -0,0 +1,260 @@
+package com.follow.clash.plugins
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.os.Build
+import android.os.IBinder
+import androidx.core.content.getSystemService
+import com.follow.clash.BaseServiceInterface
+import com.follow.clash.GlobalState
+import com.follow.clash.RunState
+import com.follow.clash.extensions.getProtocol
+import com.follow.clash.extensions.resolveDns
+import com.follow.clash.models.Process
+import com.follow.clash.models.VpnOptions
+import com.follow.clash.services.FlClashService
+import com.follow.clash.services.FlClashVpnService
+import com.google.gson.Gson
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.net.InetSocketAddress
+import kotlin.concurrent.withLock
+
+
+class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
+    private lateinit var flutterMethodChannel: MethodChannel
+    private lateinit var context: Context
+    private var flClashService: BaseServiceInterface? = null
+    private lateinit var options: VpnOptions
+    private lateinit var scope: CoroutineScope
+
+    private val connectivity by lazy {
+        context.getSystemService<ConnectivityManager>()
+    }
+
+    private val connection = object : ServiceConnection {
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            flClashService = when (service) {
+                is FlClashVpnService.LocalBinder -> service.getService()
+                is FlClashService.LocalBinder -> service.getService()
+                else -> throw Exception("invalid binder")
+            }
+            start()
+        }
+
+        override fun onServiceDisconnected(arg: ComponentName) {
+            flClashService = null
+        }
+    }
+
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        scope = CoroutineScope(Dispatchers.Default)
+        context = flutterPluginBinding.applicationContext
+        scope.launch {
+            registerNetworkCallback()
+        }
+        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "vpn")
+        flutterMethodChannel.setMethodCallHandler(this)
+    }
+
+    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        unRegisterNetworkCallback()
+        flutterMethodChannel.setMethodCallHandler(null)
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "start" -> {
+                val data = call.argument<String>("data")
+                options = Gson().fromJson(data, VpnOptions::class.java)
+                when (options.enable) {
+                    true -> handleStartVpn()
+                    false -> start()
+                }
+                result.success(true)
+            }
+
+            "stop" -> {
+                stop()
+                result.success(true)
+            }
+
+            "setProtect" -> {
+                val fd = call.argument<Int>("fd")
+                if (fd != null) {
+                    if (flClashService is FlClashVpnService) {
+                        (flClashService as FlClashVpnService).protect(fd)
+                    }
+                    result.success(true)
+                } else {
+                    result.success(false)
+                }
+            }
+
+            "startForeground" -> {
+                val title = call.argument<String>("title") as String
+                val content = call.argument<String>("content") as String
+                startForeground(title, content)
+                result.success(true)
+            }
+
+            "resolverProcess" -> {
+                val data = call.argument<String>("data")
+                val process = if (data != null) Gson().fromJson(
+                    data, Process::class.java
+                ) else null
+                val metadata = process?.metadata
+                if (metadata == null) {
+                    result.success(null)
+                    return
+                }
+                val protocol = metadata.getProtocol()
+                if (protocol == null) {
+                    result.success(null)
+                    return
+                }
+                scope.launch {
+                    withContext(Dispatchers.Default) {
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val dst = InetSocketAddress(
+                            metadata.destinationIP.ifEmpty { metadata.host },
+                            metadata.destinationPort
+                        )
+                        val uid = try {
+                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
+                        } catch (_: Exception) {
+                            null
+                        }
+                        if (uid == null || uid == -1) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        val packages = context.packageManager?.getPackagesForUid(uid)
+                        result.success(packages?.first())
+                    }
+                }
+            }
+
+            else -> {
+                result.notImplemented()
+            }
+        }
+    }
+
+    private fun handleStartVpn() {
+        GlobalState.getCurrentAppPlugin()?.requestVpnPermission(context) {
+            start()
+        }
+    }
+
+    fun requestGc() {
+        flutterMethodChannel.invokeMethod("gc", null)
+    }
+
+    val networks = mutableSetOf<Network>()
+
+    fun onUpdateNetwork() {
+        val dns = networks.flatMap { network ->
+            connectivity?.resolveDns(network) ?: emptyList()
+        }.toSet().joinToString(",")
+        scope.launch {
+            withContext(Dispatchers.Main) {
+                flutterMethodChannel.invokeMethod("dnsChanged", dns)
+            }
+        }
+//        if (flClashService is FlClashVpnService) {
+//            val network = networks.maxByOrNull { net ->
+//                connectivity?.getNetworkCapabilities(net)?.let { cap ->
+//                    TRANSPORT_PRIORITY.indexOfFirst { cap.hasTransport(it) }
+//                } ?: -1
+//            }
+//            network?.let {
+//                (flClashService as FlClashVpnService).updateUnderlyingNetworks(arrayOf(network))
+//            }
+//        }
+    }
+
+    private val callback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            networks.add(network)
+            onUpdateNetwork()
+        }
+
+        override fun onLost(network: Network) {
+            networks.remove(network)
+            onUpdateNetwork()
+        }
+    }
+
+    private val request = NetworkRequest.Builder().apply {
+        addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+        addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+        addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
+    }.build()
+
+    private fun registerNetworkCallback() {
+        networks.clear()
+        connectivity?.registerNetworkCallback(request, callback)
+    }
+
+    private fun unRegisterNetworkCallback() {
+        connectivity?.unregisterNetworkCallback(callback)
+        networks.clear()
+        onUpdateNetwork()
+    }
+
+    private fun startForeground(title: String, content: String) {
+        GlobalState.runLock.withLock {
+            if (GlobalState.runState.value != RunState.START) return
+            flClashService?.startForeground(title, content)
+        }
+    }
+
+    private fun start() {
+        if (flClashService == null) {
+            bindService()
+            return
+        }
+        GlobalState.runLock.withLock {
+            if (GlobalState.runState.value == RunState.START) return
+            GlobalState.runState.value = RunState.START
+            val fd = flClashService?.start(options)
+            flutterMethodChannel.invokeMethod(
+                "started", fd
+            )
+        }
+    }
+
+    fun stop() {
+        GlobalState.runLock.withLock {
+            if (GlobalState.runState.value == RunState.STOP) return
+            GlobalState.runState.value = RunState.STOP
+            flClashService?.stop()
+        }
+        GlobalState.destroyServiceEngine()
+    }
+
+    private fun bindService() {
+        val intent = when (options.enable) {
+            true -> Intent(context, FlClashVpnService::class.java)
+            false -> Intent(context, FlClashService::class.java)
+        }
+        context.bindService(intent, connection, Context.BIND_AUTO_CREATE)
+    }
+
+}

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

@@ -0,0 +1,114 @@
+package com.follow.clash.services
+
+import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
+import android.os.Binder
+import android.os.Build
+import android.os.IBinder
+import androidx.core.app.NotificationCompat
+import com.follow.clash.BaseServiceInterface
+import com.follow.clash.GlobalState
+import com.follow.clash.MainActivity
+import com.follow.clash.extensions.getActionPendingIntent
+import com.follow.clash.models.VpnOptions
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+
+class FlClashService : Service(), BaseServiceInterface {
+
+    private val binder = LocalBinder()
+
+    inner class LocalBinder : Binder() {
+        fun getService(): FlClashService = this@FlClashService
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return binder
+    }
+
+    override fun onUnbind(intent: Intent?): Boolean {
+        return super.onUnbind(intent)
+    }
+
+    private val CHANNEL = "FlClash"
+
+    private val notificationId: Int = 1
+
+    private val notificationBuilder: NotificationCompat.Builder by lazy {
+        val intent = Intent(this, MainActivity::class.java)
+
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        with(NotificationCompat.Builder(this, CHANNEL)) {
+            setSmallIcon(com.follow.clash.R.drawable.ic_stat_name)
+            setContentTitle("FlClash")
+            setContentIntent(pendingIntent)
+            setCategory(NotificationCompat.CATEGORY_SERVICE)
+            priority = NotificationCompat.PRIORITY_MIN
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+            }
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("STOP")
+            )
+            setOngoing(true)
+            setShowWhen(false)
+            setOnlyAlertOnce(true)
+            setAutoCancel(true)
+        }
+    }
+
+    override fun start(options: VpnOptions) = 0
+
+    override fun stop() {
+        stopSelf()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        }
+    }
+
+    @SuppressLint("ForegroundServiceType", "WrongConstant")
+    override fun startForeground(title: String, content: String) {
+        CoroutineScope(Dispatchers.Default).launch {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val manager = getSystemService(NotificationManager::class.java)
+                var channel = manager?.getNotificationChannel(CHANNEL)
+                if (channel == null) {
+                    channel =
+                        NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                    manager?.createNotificationChannel(channel)
+                }
+            }
+            val notification =
+                notificationBuilder.setContentTitle(title).setContentText(content).build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            } else {
+                startForeground(notificationId, notification)
+            }
+        }
+    }
+}

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

@@ -1,9 +1,9 @@
 package com.follow.clash.services
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -37,6 +37,7 @@ class FlClashTileService : TileService() {
         GlobalState.runState.observeForever(observer)
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     private fun activityTransfer() {
         val intent = Intent(this, TempActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
@@ -65,19 +66,7 @@ class FlClashTileService : TileService() {
     override fun onClick() {
         super.onClick()
         activityTransfer()
-        if (GlobalState.runState.value == RunState.STOP) {
-            GlobalState.runState.value = RunState.PENDING
-            val titlePlugin = GlobalState.getCurrentTitlePlugin()
-            if (titlePlugin != null) {
-                titlePlugin.handleStart()
-            } else {
-                GlobalState.initServiceEngine(applicationContext)
-            }
-        } else if (GlobalState.runState.value == RunState.START) {
-            GlobalState.runState.value = RunState.PENDING
-            GlobalState.getCurrentTitlePlugin()?.handleStop()
-        }
-
+        GlobalState.handleToggle(applicationContext)
     }
 
     override fun onDestroy() {

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

@@ -1,11 +1,13 @@
 package com.follow.clash.services
 
+import android.annotation.SuppressLint
 import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
+import android.net.Network
 import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Binder
@@ -15,52 +17,58 @@ import android.os.Parcel
 import android.os.RemoteException
 import android.util.Log
 import androidx.core.app.NotificationCompat
+import com.follow.clash.BaseServiceInterface
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
+import com.follow.clash.extensions.getActionPendingIntent
+import com.follow.clash.extensions.getIpv4RouteAddress
+import com.follow.clash.extensions.getIpv6RouteAddress
+import com.follow.clash.extensions.toCIDR
 import com.follow.clash.models.AccessControlMode
-import com.follow.clash.models.Props
+import com.follow.clash.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 
-class FlClashVpnService : VpnService() {
-    private val CHANNEL = "FlClash"
-
-    private val notificationId: Int = 1
-
-    private val passList = listOf(
-        "*zhihu.com",
-        "*zhimg.com",
-        "*jd.com",
-        "100ime-iat-api.xfyun.cn",
-        "*360buyimg.com",
-        "localhost",
-        "*.local",
-        "127.*",
-        "10.*",
-        "172.16.*",
-        "172.17.*",
-        "172.18.*",
-        "172.19.*",
-        "172.2*",
-        "172.30.*",
-        "172.31.*",
-        "192.168.*"
-    )
-
+class FlClashVpnService : VpnService(), BaseServiceInterface {
     override fun onCreate() {
         super.onCreate()
-        initServiceEngine()
+        GlobalState.initServiceEngine(applicationContext)
     }
 
-    fun start(port: Int, props: Props?): Int? {
+    override fun start(options: VpnOptions): Int {
         return with(Builder()) {
-            addAddress("172.16.0.1", 30)
+            if (options.ipv4Address.isNotEmpty()) {
+                val cidr = options.ipv4Address.toCIDR()
+                addAddress(cidr.address, cidr.prefixLength)
+                val routeAddress = options.getIpv4RouteAddress()
+                if (routeAddress.isNotEmpty()) {
+                    routeAddress.forEach { i ->
+                        Log.d("addRoute4", "address: ${i.address} prefixLength:${i.prefixLength}")
+                        addRoute(i.address, i.prefixLength)
+                    }
+                } else {
+                    addRoute("0.0.0.0", 0)
+                }
+            }
+            if (options.ipv6Address.isNotEmpty()) {
+                val cidr = options.ipv6Address.toCIDR()
+                addAddress(cidr.address, cidr.prefixLength)
+                val routeAddress = options.getIpv6RouteAddress()
+                if (routeAddress.isNotEmpty()) {
+                    routeAddress.forEach { i ->
+                        Log.d("addRoute6", "address: ${i.address} prefixLength:${i.prefixLength}")
+                        addRoute(i.address, i.prefixLength)
+                    }
+                } else {
+                    addRoute("::", 0)
+                }
+            }
+            addDnsServer(options.dnsServerAddress)
             setMtu(9000)
-            addRoute("0.0.0.0", 0)
-            props?.accessControl?.let { accessControl ->
+            options.accessControl?.let { accessControl ->
                 when (accessControl.mode) {
                     AccessControlMode.acceptSelected -> {
                         (accessControl.acceptList + packageName).forEach {
@@ -75,33 +83,45 @@ class FlClashVpnService : VpnService() {
                     }
                 }
             }
-            addDnsServer("172.16.0.2")
             setSession("FlClash")
             setBlocking(false)
             if (Build.VERSION.SDK_INT >= 29) {
                 setMetered(false)
             }
-            if (props?.allowBypass == true) {
+            if (options.allowBypass) {
                 allowBypass()
             }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1",
-                        port,
-                        passList
+                        options.port,
+                        options.bypassDomain
                     )
                 )
             }
             establish()?.detachFd()
+                ?: throw NullPointerException("Establish VPN rejected by system")
         }
     }
 
-    fun stop() {
-        stopSelf()
-        stopForeground()
+    fun updateUnderlyingNetworks(networks: Array<Network>) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            this.setUnderlyingNetworks(networks)
+        }
     }
 
+    override fun stop() {
+        stopSelf()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        }
+    }
+
+    private val CHANNEL = "FlClash"
+
+    private val notificationId: Int = 1
+
     private val notificationBuilder: NotificationCompat.Builder by lazy {
         val intent = Intent(this, MainActivity::class.java)
 
@@ -120,6 +140,7 @@ class FlClashVpnService : VpnService() {
                 PendingIntent.FLAG_UPDATE_CURRENT
             )
         }
+
         with(NotificationCompat.Builder(this, CHANNEL)) {
             setSmallIcon(R.drawable.ic_stat_name)
             setContentTitle("FlClash")
@@ -130,44 +151,45 @@ class FlClashVpnService : VpnService() {
                 foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             }
             setOngoing(true)
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("STOP")
+            )
             setShowWhen(false)
             setOnlyAlertOnce(true)
             setAutoCancel(true)
         }
     }
 
-    fun initServiceEngine() {
-        GlobalState.initServiceEngine(applicationContext)
+    @SuppressLint("ForegroundServiceType", "WrongConstant")
+    override fun startForeground(title: String, content: String) {
+        CoroutineScope(Dispatchers.Default).launch {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val manager = getSystemService(NotificationManager::class.java)
+                var channel = manager?.getNotificationChannel(CHANNEL)
+                if (channel == null) {
+                    channel =
+                        NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                    manager?.createNotificationChannel(channel)
+                }
+            }
+            val notification =
+                notificationBuilder
+                    .setContentTitle(title)
+                    .setContentText(content)
+                    .build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            } else {
+                startForeground(notificationId, notification)
+            }
+        }
     }
 
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
-        GlobalState.getCurrentAppPlugin()?.requestGc()
-    }
-
-    fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
-        }
-        val notification =
-            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
-        }
-    }
-
-    private fun stopForeground() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        }
+        GlobalState.getCurrentVPNPlugin()?.requestGc()
     }
 
     private val binder = LocalBinder()
@@ -180,7 +202,7 @@ class FlClashVpnService : VpnService() {
                 val isSuccess = super.onTransact(code, data, reply, flags)
                 if (!isSuccess) {
                     CoroutineScope(Dispatchers.Main).launch {
-                        GlobalState.getCurrentTitlePlugin()?.handleStop()
+                        GlobalState.getCurrentTilePlugin()?.handleStop()
                     }
                 }
                 return isSuccess
@@ -190,7 +212,6 @@ class FlClashVpnService : VpnService() {
         }
     }
 
-
     override fun onBind(intent: Intent): IBinder {
         return binder
     }

core/action.go

@@ -0,0 +1,32 @@
+//go:build !cgo
+
+package main
+
+import (
+	"encoding/json"
+)
+
+func (action Action) Json() ([]byte, error) {
+	data, err := json.Marshal(action)
+	return data, err
+}
+
+func (action Action) callback(data interface{}) bool {
+	if conn == nil {
+		return false
+	}
+	sendAction := Action{
+		Id:     action.Id,
+		Method: action.Method,
+		Data:   data,
+	}
+	res, err := sendAction.Json()
+	if err != nil {
+		return false
+	}
+	_, err = conn.Write(append(res, []byte("\n")...))
+	if err != nil {
+		return false
+	}
+	return true
+}

core/common.go

@@ -1,123 +1,51 @@
 package main
 
-import "C"
 import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	ap "github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/common/batch"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/features"
+	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
-	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
+	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
+	"github.com/samber/lo"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
-	"syscall"
-	"time"
 )
 
-type healthCheckSchema struct {
-	Enable         bool   `provider:"enable"`
-	URL            string `provider:"url"`
-	Interval       int    `provider:"interval"`
-	TestTimeout    int    `provider:"timeout,omitempty"`
-	Lazy           bool   `provider:"lazy,omitempty"`
-	ExpectedStatus string `provider:"expected-status,omitempty"`
-}
+var (
+	isRunning = false
+	runLock   sync.Mutex
+	ips       = []string{"ipwho.is", "ifconfig.me", "icanhazip.com", "api.ip.sb", "ipinfo.io"}
+	b, _      = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
+)
 
-type proxyProviderSchema struct {
-	Type          string `provider:"type"`
-	Path          string `provider:"path,omitempty"`
-	URL           string `provider:"url,omitempty"`
-	Proxy         string `provider:"proxy,omitempty"`
-	Interval      int    `provider:"interval,omitempty"`
-	Filter        string `provider:"filter,omitempty"`
-	ExcludeFilter string `provider:"exclude-filter,omitempty"`
-	ExcludeType   string `provider:"exclude-type,omitempty"`
-	DialerProxy   string `provider:"dialer-proxy,omitempty"`
+type ExternalProviders []ExternalProvider
 
-	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
-	Override    ap.OverrideSchema   `provider:"override,omitempty"`
-	Header      map[string][]string `provider:"header,omitempty"`
-}
+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] }
 
-type ruleProviderSchema struct {
-	Type     string `provider:"type"`
-	Behavior string `provider:"behavior"`
-	Path     string `provider:"path,omitempty"`
-	URL      string `provider:"url,omitempty"`
-	Proxy    string `provider:"proxy,omitempty"`
-	Format   string `provider:"format,omitempty"`
-	Interval int    `provider:"interval,omitempty"`
-}
-
-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"`
-}
-
-type GenerateConfigParams struct {
-	ProfilePath *string              `json:"profile-path"`
-	Config      config.RawConfig     `json:"config" `
-	Params      ConfigExtendedParams `json:"params"`
-}
-
-type ChangeProxyParams struct {
-	GroupName *string `json:"group-name"`
-	ProxyName *string `json:"proxy-name"`
-}
-
-type TestDelayParams struct {
-	ProxyName string `json:"proxy-name"`
-	Timeout   int64  `json:"timeout"`
-}
-
-type ProcessMapItem struct {
-	Id    int64  `json:"id"`
-	Value string `json:"value"`
-}
-
-type ExternalProvider struct {
-	Name        string    `json:"name"`
-	Type        string    `json:"type"`
-	VehicleType string    `json:"vehicle-type"`
-	UpdateAt    time.Time `json:"update-at"`
-}
-
-func restartExecutable(execPath string) {
-	var err error
-	executor.Shutdown()
-	if runtime.GOOS == "windows" {
-		cmd := exec.Command(execPath, os.Args[1:]...)
-		log.Infoln("restarting: %q %q", execPath, os.Args[1:])
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		err = cmd.Start()
-		if err != nil {
-			log.Fatalln("restarting: %s", err)
-		}
-
-		os.Exit(0)
-	}
-
-	log.Infoln("restarting: %q %q", execPath, os.Args[1:])
-	err = syscall.Exec(execPath, os.Args, os.Environ())
-	if err != nil {
-		log.Fatalln("restarting: %s", err)
-	}
+func (message *Message) Json() (string, error) {
+	data, err := json.Marshal(message)
+	return string(data), err
 }
 
 func readFile(path string) ([]byte, error) {
@@ -132,187 +60,156 @@ func readFile(path string) ([]byte, error) {
 	return data, err
 }
 
-func removeFile(path string) error {
-	absPath, err := filepath.Abs(path)
-	if err != nil {
-		return err
-	}
-	err = os.Remove(absPath)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func getProfilePath(id string) string {
+	return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
 }
 
-func getRawConfigWithPath(path *string) *config.RawConfig {
-	if path == nil {
+func getProfileProvidersPath(id string) string {
+	return filepath.Join(constant.Path.HomeDir(), "providers", id)
+}
+
+func getRawConfigWithId(id string) *config.RawConfig {
+	path := getProfilePath(id)
+	bytes, err := readFile(path)
+	if err != nil {
+		log.Errorln("profile is not exist")
 		return config.DefaultRawConfig()
-	} else {
-		bytes, err := readFile(*path)
-		if err != nil {
-			log.Errorln("getProfile readFile error %v", err)
-			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
 		}
-		prof, err := config.UnmarshalRawConfig(bytes)
-		if err != nil {
-			log.Errorln("getProfile UnmarshalRawConfig error %v", err)
-			return config.DefaultRawConfig()
+		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
+		if configParams.TestURL != nil {
+			if mapping["health-check"] != nil {
+				hc := mapping["health-check"].(map[string]any)
+				if hc != nil {
+					if hc["url"] != nil {
+						hc["url"] = *configParams.TestURL
+					}
+				}
+			}
 		}
-		return prof
+	}
+	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() {
+		if p.VehicleType() != cp.Compatible {
+			eps[n] = p
+		}
+	}
+	for n, p := range tunnel.RuleProviders() {
+		if p.VehicleType() != cp.Compatible {
+			eps[n] = p
+		}
+	}
+	return eps
+}
+
+func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
+	switch p.(type) {
+	case *provider.ProxySetProvider:
+		psp := p.(*provider.ProxySetProvider)
+		return &ExternalProvider{
+			Name:             psp.Name(),
+			Type:             psp.Type().String(),
+			VehicleType:      psp.VehicleType().String(),
+			Count:            psp.Count(),
+			UpdateAt:         psp.UpdatedAt(),
+			Path:             psp.Vehicle().Path(),
+			SubscriptionInfo: psp.GetSubscriptionInfo(),
+		}, nil
+	case *rp.RuleSetProvider:
+		rsp := p.(*rp.RuleSetProvider)
+		return &ExternalProvider{
+			Name:        rsp.Name(),
+			Type:        rsp.Type().String(),
+			VehicleType: rsp.VehicleType().String(),
+			Count:       rsp.Count(),
+			UpdateAt:    rsp.UpdatedAt(),
+			Path:        rsp.Vehicle().Path(),
+		}, nil
+	default:
+		return nil, errors.New("not external provider")
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
-	prof := getRawConfigWithPath(profilePath)
+func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
+	switch p.(type) {
+	case *provider.ProxySetProvider:
+		psp := p.(*provider.ProxySetProvider)
+		_, _, err := psp.SideUpdate(bytes)
+		if err == nil {
+			return err
+		}
+		return nil
+	case rp.RuleSetProvider:
+		rsp := p.(*rp.RuleSetProvider)
+		_, _, err := rsp.SideUpdate(bytes)
+		if err == nil {
+			return err
+		}
+		return nil
+	default:
+		return errors.New("not external provider")
+	}
+}
+
+func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig {
+	prof := getRawConfigWithId(profileId)
 	overwriteConfig(prof, cfg)
 	return prof
 }
 
-func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
-	for _, v := range s {
-		initVal = f(initVal, v)
+func genHosts(hosts, patchHosts map[string]any) {
+	for k, v := range patchHosts {
+		hosts[k] = v
 	}
-	return initVal
 }
 
-func Map[T, U any](slice []T, fn func(T) U) []U {
-	result := make([]U, len(slice))
-	for i, v := range slice {
-		result[i] = fn(v)
+func trimArr(arr []string) (r []string) {
+	for _, e := range arr {
+		r = append(r, strings.Trim(e, " "))
 	}
-	return result
+	return
 }
 
-func replaceFromMap(s string, m map[string]string) string {
-	for k, v := range m {
-		s = strings.ReplaceAll(s, k, v)
-	}
-	return s
-}
-
-func removeDuplicateFromSlice[T any](slice []T) []T {
-	result := make([]T, 0)
-	seen := make(map[any]struct{})
-	for _, value := range slice {
-		if _, ok := seen[value]; !ok {
-			result = append(result, value)
-			seen[value] = struct{}{}
+func overrideRules(rules *[]string) {
+	var target = ""
+	for _, line := range *rules {
+		rule := trimArr(strings.Split(line, ","))
+		l := len(rule)
+		if l != 2 {
+			return
 		}
-	}
-	return result
-}
-
-func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
-	var replacements = map[string]string{}
-	var selectArr []map[string]any
-	var urlTestArr []map[string]any
-	var fallbackArr []map[string]any
-	for _, group := range *proxyGroup {
-		switch group["type"] {
-		case "select":
-			selectArr = append(selectArr, group)
-			replacements[group["name"].(string)] = "Proxy"
-			break
-		case "url-test":
-			urlTestArr = append(urlTestArr, group)
-			replacements[group["name"].(string)] = "Auto"
-			break
-		case "fallback":
-			fallbackArr = append(fallbackArr, group)
-			replacements[group["name"].(string)] = "Fallback"
-			break
-		default:
+		if strings.ToUpper(rule[0]) == "MATCH" {
+			target = rule[1]
 			break
 		}
 	}
-
-	ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Proxy" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
-
-	AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Auto" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	AutoProxies = removeDuplicateFromSlice(AutoProxies)
-
-	FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Fallback" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
-
-	var computedProxyGroup []map[string]any
-
-	if len(ProxyProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Proxy",
-				"type":    "select",
-				"proxies": ProxyProxies,
-			})
+	if target == "" {
+		return
 	}
-
-	if len(AutoProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Auto",
-				"type":    "url-test",
-				"proxies": AutoProxies,
-			})
-	}
-
-	if len(FallbackProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Fallback",
-				"type":    "fallback",
-				"proxies": FallbackProxies,
-			})
-	}
-
-	computedRule := Map(*rule, func(value string) string {
-		return replaceFromMap(value, replacements)
+	var rulesExt = lo.Map(ips, func(ip string, index int) string {
+		return fmt.Sprintf("DOMAIN %s %s", ip, target)
 	})
-
-	*proxyGroup = computedProxyGroup
-	*rule = computedRule
+	*rules = append(rulesExt, *rules...)
 }
 
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
@@ -322,11 +219,11 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUIURL = ""
 	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
 	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
-	//targetConfig.GeodataMode = false
 	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
@@ -339,48 +236,84 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
 	targetConfig.GlobalUA = patchConfig.GlobalUA
-	if targetConfig.DNS.Enable == false {
+	if configParams.TestURL != nil {
+		constant.DefaultTestURL = *configParams.TestURL
+	}
+	for idx := range targetConfig.ProxyGroup {
+		targetConfig.ProxyGroup[idx]["url"] = ""
+	}
+	genHosts(targetConfig.Hosts, patchConfig.Hosts)
+	if configParams.OverrideDns {
 		targetConfig.DNS = patchConfig.DNS
+	} else {
+		if targetConfig.DNS.Enable == false {
+			targetConfig.DNS.Enable = true
+		}
 	}
-	//if runtime.GOOS == "android" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	//} else if runtime.GOOS == "windows" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-	//}
-	if configParams.IsCompatible == false {
-		targetConfig.ProxyProvider = make(map[string]map[string]any)
-		targetConfig.RuleProvider = make(map[string]map[string]any)
-		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
-	}
+	overrideRules(&targetConfig.Rule)
 }
 
-func patchConfig(general *config.General) {
+func patchConfig() {
 	log.Infoln("[Apply] patch")
-	route.ReStartServer(general.ExternalController)
-	listener.SetAllowLan(general.AllowLan)
-	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
-	inbound.SetAllowedIPs(general.LanAllowedIPs)
-	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
-	listener.SetBindAddress(general.BindAddress)
+	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) {
+	if !isRunning {
+		return
+	}
+	general := currentConfig.General
+	listeners := currentConfig.Listeners
+	if force == true {
+		stopListeners()
+	}
+	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
+	listener.SetAllowLan(general.AllowLan)
+	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
+	inbound.SetAllowedIPs(general.LanAllowedIPs)
+	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
+	listener.SetBindAddress(general.BindAddress)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
-	listener.ReCreateAutoRedir(general.EBpf.AutoRedir, tunnel.Tunnel)
 	listener.ReCreateTProxy(general.TProxyPort, tunnel.Tunnel)
-	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
 	listener.ReCreateMixed(general.MixedPort, tunnel.Tunnel)
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
 	listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
-	tunnel.SetMode(general.Mode)
-	log.SetLevel(general.LogLevel)
+	if !features.Android {
+		listener.ReCreateTun(general.Tun, tunnel.Tunnel)
+	}
+}
 
-	resolver.DisableIPv6 = !general.IPv6
+func stopListeners() {
+	listener.StopListener()
 }
 
 func patchSelectGroup() {
@@ -408,25 +341,22 @@ func patchSelectGroup() {
 	}
 }
 
-var applyLock sync.Mutex
-
-func applyConfig() error {
-	applyLock.Lock()
-	defer applyLock.Unlock()
-	cfg, err := config.ParseRawConfig(currentConfig)
+func applyConfig(rawConfig *config.RawConfig) error {
+	runLock.Lock()
+	defer runLock.Unlock()
+	var err error
+	currentConfig, err = config.ParseRawConfig(rawConfig)
 	if err != nil {
-		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
-	}
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
+		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
 	if configParams.IsPatch {
-		patchConfig(cfg.General)
+		patchConfig()
 	} else {
-		closeConnections()
+		handleCloseConnectionsUnLock()
 		runtime.GC()
-		hub.UltraApplyConfig(cfg, true)
+		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
 	}
+	updateListeners(false)
 	return err
 }

core/constant.go

@@ -0,0 +1,112 @@
+package main
+
+import (
+	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/config"
+	"github.com/metacubex/mihomo/constant"
+	"time"
+)
+
+type ConfigExtendedParams struct {
+	IsPatch      bool              `json:"is-patch"`
+	IsCompatible bool              `json:"is-compatible"`
+	SelectedMap  map[string]string `json:"selected-map"`
+	TestURL      *string           `json:"test-url"`
+	OverrideDns  bool              `json:"override-dns"`
+}
+
+type GenerateConfigParams struct {
+	ProfileId string               `json:"profile-id"`
+	Config    config.RawConfig     `json:"config" `
+	Params    ConfigExtendedParams `json:"params"`
+}
+
+type ChangeProxyParams struct {
+	GroupName *string `json:"group-name"`
+	ProxyName *string `json:"proxy-name"`
+}
+
+type TestDelayParams struct {
+	ProxyName string `json:"proxy-name"`
+	Timeout   int64  `json:"timeout"`
+}
+
+type ProcessMapItem struct {
+	Id    int64  `json:"id"`
+	Value string `json:"value"`
+}
+
+type ExternalProvider struct {
+	Name             string                     `json:"name"`
+	Type             string                     `json:"type"`
+	VehicleType      string                     `json:"vehicle-type"`
+	Count            int                        `json:"count"`
+	Path             string                     `json:"path"`
+	UpdateAt         time.Time                  `json:"update-at"`
+	SubscriptionInfo *provider.SubscriptionInfo `json:"subscription-info"`
+}
+
+const (
+	messageMethod                  Method = "message"
+	initClashMethod                Method = "initClash"
+	getIsInitMethod                Method = "getIsInit"
+	forceGcMethod                  Method = "forceGc"
+	shutdownMethod                 Method = "shutdown"
+	validateConfigMethod           Method = "validateConfig"
+	updateConfigMethod             Method = "updateConfig"
+	getProxiesMethod               Method = "getProxies"
+	changeProxyMethod              Method = "changeProxy"
+	getTrafficMethod               Method = "getTraffic"
+	getTotalTrafficMethod          Method = "getTotalTraffic"
+	resetTrafficMethod             Method = "resetTraffic"
+	asyncTestDelayMethod           Method = "asyncTestDelay"
+	getConnectionsMethod           Method = "getConnections"
+	closeConnectionsMethod         Method = "closeConnections"
+	closeConnectionMethod          Method = "closeConnection"
+	getExternalProvidersMethod     Method = "getExternalProviders"
+	getExternalProviderMethod      Method = "getExternalProvider"
+	getCountryCodeMethod           Method = "getCountryCode"
+	getMemoryMethod                Method = "getMemory"
+	updateGeoDataMethod            Method = "updateGeoData"
+	updateExternalProviderMethod   Method = "updateExternalProvider"
+	sideLoadExternalProviderMethod Method = "sideLoadExternalProvider"
+	startLogMethod                 Method = "startLog"
+	stopLogMethod                  Method = "stopLog"
+	startListenerMethod            Method = "startListener"
+	stopListenerMethod             Method = "stopListener"
+)
+
+type Method string
+
+type Action struct {
+	Id     string      `json:"id"`
+	Method Method      `json:"method"`
+	Data   interface{} `json:"data"`
+}
+
+type MessageType string
+
+type Delay struct {
+	Name  string `json:"name"`
+	Value int32  `json:"value"`
+}
+
+type Message struct {
+	Type MessageType `json:"type"`
+	Data interface{} `json:"data"`
+}
+
+type Process struct {
+	Id       int64              `json:"id"`
+	Metadata *constant.Metadata `json:"metadata"`
+}
+
+const (
+	LogMessage     MessageType = "log"
+	ProtectMessage MessageType = "protect"
+	DelayMessage   MessageType = "delay"
+	ProcessMessage MessageType = "process"
+	RequestMessage MessageType = "request"
+	StartedMessage MessageType = "started"
+	LoadedMessage  MessageType = "loaded"
+)

core/dart-bridge/lib.go

@@ -1,3 +1,5 @@
+//go:build cgo
+
 package dart_bridge
 
 /*

core/dart-bridge/lib_common.go

@@ -0,0 +1,7 @@
+//go:build !cgo
+
+package dart_bridge
+
+func SendToPort(port int64, msg string) bool {
+	return false
+}

core/go.mod

@@ -1,17 +1,21 @@
 module core
 
-go 1.21.0
+go 1.21
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 
+require github.com/metacubex/mihomo v1.17.1
+
 require (
-	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
-	github.com/metacubex/mihomo v1.17.1
-	github.com/miekg/dns v1.1.61
-	golang.org/x/net v0.26.0
-	golang.org/x/sync v0.7.0
+	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
+	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
+	github.com/sagernet/cors v1.2.1 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 )
 
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297
+
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
@@ -20,30 +24,28 @@ require (
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cilium/ebpf v0.12.3 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/coreos/go-iptables v0.7.0 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/coreos/go-iptables v0.8.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.14 // indirect
-	github.com/go-chi/cors v1.2.1 // indirect
+	github.com/go-chi/chi/v5 v5.1.0 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.2.0 // indirect
+	github.com/gofrs/uuid/v5 v5.3.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
@@ -52,19 +54,21 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
 	github.com/metacubex/chacha v0.1.0 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
+	github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.7 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.1 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d // indirect
+	github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
-	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
+	github.com/miekg/dns v1.1.62 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
@@ -72,10 +76,9 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
-	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // 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
@@ -83,8 +86,7 @@ require (
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
-	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
-	github.com/samber/lo v1.39.0 // indirect
+	github.com/samber/lo v1.47.0
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
@@ -101,14 +103,16 @@ require (
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect; indirect`
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -1,7 +1,5 @@
 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/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 h1:USCTqih5d1bUXUxWNS9ZD5Tx/lb0jXHEtRIIx/F9dMc=
-github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34/go.mod h1:YR9wK13TgI5ww8iKWm91MHiSoHC7Oz0U4beCCmtXqLw=
 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=
@@ -19,17 +17,15 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
-github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
-github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
+github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=
+github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -40,16 +36,12 @@ 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/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
-github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 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/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.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
-github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
+github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -65,8 +57,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.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
-github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
+github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -82,8 +74,8 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 h1:hxST5pwMBEOWmxpkX20w9oZG+hXdhKmAIPQ3NGGAxas=
+github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
@@ -92,10 +84,6 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -106,34 +94,42 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI=
+github.com/metacubex/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.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
 github.com/metacubex/chacha v0.1.0/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
-github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4 h1:CgdUBRxmNlxEGkp35HwvgQ10jwOOUJKWdOxpi8yWi8o=
+github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4/go.mod h1:Y7yRGqFE6UQL/3aKPYmiYdjfVkeujJaStP4+jiZMcN8=
 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-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
-github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
-github.com/metacubex/sing-shadowsocks v0.2.7 h1:9f3Dt2+71TNp0e202llA2ug5h/rkWs2EZxQ5IMpf+9g=
-github.com/metacubex/sing-shadowsocks v0.2.7/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
-github.com/metacubex/sing-shadowsocks2 v0.2.1 h1:XIZBXlazp8EEoPp1S0DViAhLkJakjQ2f+AOwwdKKNYg=
-github.com/metacubex/sing-shadowsocks2 v0.2.1/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d h1:iYlepjRCYlPXtELupDL+pQjGqkCnQz4KQOfKImP9sog=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
+github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297 h1:YG/JkwGPbca5rUtEMHIu8ZuqzR7BSVm1iqY8hNoMeMA=
+github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 h1:HobpULaPK6OoxrHMmgcwLkwwIduXVmwdcznwUfH1GQM=
+github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
+github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
+github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
+github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
+github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
+github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 h1:ypfofGDZbP8p3Y4P/m74JYu7sQViesi3c8nbmT6cS0Y=
+github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
-github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
-github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
-github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
+github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 h1:xg71VmzLS6ByAzi/57phwDvjE+dLLs+ozH00k4DnOns=
+github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3/go.mod h1:6nitcmzPDL3MXnLdhu6Hm126Zk4S1fBbX3P7jxUxSFw=
+github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa h1:9mcjV+RGZVC3reJBNDjjNPyS8PmFG97zq56X7WNaFO4=
+github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa/go.mod h1:4tLB5c8U0CxpkFM+AJJB77jEaVDbLH5XQvy42vAGsWw=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
+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.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -156,35 +152,28 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
-github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
+github.com/puzpuzpuz/xsync/v3 v3.4.0/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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
-github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
+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.0-alpha.13 h1:fpR4TFZfu/9V3LbHSAnnnwcaXGMF8ijmAAPoY2WHSKw=
-github.com/sagernet/sing v0.5.0-alpha.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
 github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
 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/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
-github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
-github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
-github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
+github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -200,9 +189,15 @@ 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 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -216,6 +211,10 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -230,21 +229,21 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
-golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -260,19 +259,19 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=

core/hub.go

@@ -1,199 +1,156 @@
 package main
 
-/*
-#include <stdlib.h>
-*/
-import "C"
 import (
-	bridge "core/dart-bridge"
+	"context"
 	"encoding/json"
 	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	"github.com/metacubex/mihomo/adapter/provider"
-	"github.com/metacubex/mihomo/common/structure"
+	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
+	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
-	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
-	"golang.org/x/net/context"
-	"os"
+	"net"
 	"runtime"
+	"sort"
+	"strconv"
 	"time"
-	"unsafe"
 )
 
-var currentConfig = config.DefaultRawConfig()
+var (
+	isInit            = false
+	configParams      = ConfigExtendedParams{}
+	externalProviders = map[string]cp.Provider{}
+	logSubscriber     observable.Subscription[log.Event]
+	currentConfig     *config.Config
+)
 
-var configParams = ConfigExtendedParams{}
-
-var isInit = false
-
-var currentProfileName = ""
-
-//export initClash
-func initClash(homeDirStr *C.char) bool {
+func handleInitClash(homeDirStr string) bool {
 	if !isInit {
-		constant.SetHomeDir(C.GoString(homeDirStr))
+		constant.SetHomeDir(homeDirStr)
 		isInit = true
 	}
 	return isInit
 }
 
-//export getIsInit
-func getIsInit() bool {
+func handleStartListener() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	isRunning = true
+	updateListeners(true)
+	return true
+}
+
+func handleStopListener() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	isRunning = false
+	listener.StopListener()
+	return true
+}
+
+func handleGetIsInit() bool {
 	return isInit
 }
 
-//export restartClash
-func restartClash() bool {
-	execPath, _ := os.Executable()
-	go restartExecutable(execPath)
-	return true
-}
-
-//export shutdownClash
-func shutdownClash() bool {
-	executor.Shutdown()
-	runtime.GC()
-	isInit = false
-	currentConfig = nil
-	return true
-}
-
-//export forceGc
-func forceGc() {
+func handleForceGc() {
 	go func() {
 		log.Infoln("[APP] request force GC")
 		runtime.GC()
 	}()
 }
 
-//export setCurrentProfileName
-func setCurrentProfileName(s *C.char) {
-	currentProfileName = C.GoString(s)
+func handleShutdown() bool {
+	stopListeners()
+	executor.Shutdown()
+	runtime.GC()
+	isInit = false
+	return true
 }
 
-//export getCurrentProfileName
-func getCurrentProfileName() *C.char {
-	return C.CString(currentProfileName)
+func handleValidateConfig(bytes []byte) string {
+	_, err := config.UnmarshalRawConfig(bytes)
+	if err != nil {
+		return err.Error()
+	}
+	return ""
 }
 
-//export validateConfig
-func validateConfig(s *C.char, port C.longlong) {
-	i := int64(port)
-	bytes := []byte(C.GoString(s))
-	go func() {
-		_, err := config.UnmarshalRawConfig(bytes)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
+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 ""
 }
 
-//export updateConfig
-func updateConfig(s *C.char, port C.longlong) {
-	i := int64(port)
-	paramsString := C.GoString(s)
-	go func() {
-		var params = &GenerateConfigParams{}
-		err := json.Unmarshal([]byte(paramsString), params)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		configParams = params.Params
-		prof := decorationConfig(params.ProfilePath, params.Config)
-		currentConfig = prof
-		err = applyConfig()
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
-}
-
-//export clearEffect
-func clearEffect(s *C.char) {
-	path := C.GoString(s)
-	go func() {
-		rawCfg := getRawConfigWithPath(&path)
-		for _, mapping := range rawCfg.RuleProvider {
-			schema := &ruleProviderSchema{}
-			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
-			if err := decoder.Decode(mapping, schema); err != nil {
-				return
-			}
-			if schema.Type == "http" {
-				_ = removeFile(constant.Path.Resolve(schema.Path))
-			}
-		}
-		for _, mapping := range rawCfg.ProxyProvider {
-			schema := &proxyProviderSchema{
-				HealthCheck: healthCheckSchema{
-					Lazy: true,
-				},
-			}
-			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
-			if err := decoder.Decode(mapping, schema); err != nil {
-				return
-			}
-			if schema.Type == "http" {
-				_ = removeFile(constant.Path.Resolve(schema.Path))
-			}
-		}
-		_ = removeFile(path)
-	}()
-}
-
-//export getProxies
-func getProxies() *C.char {
+func handleGetProxies() string {
+	runLock.Lock()
+	defer runLock.Unlock()
 	data, err := json.Marshal(tunnel.ProxiesWithProviders())
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export changeProxy
-func changeProxy(s *C.char) {
-	paramsString := C.GoString(s)
-	var params = &ChangeProxyParams{}
-	err := json.Unmarshal([]byte(paramsString), params)
-	if err != nil {
-		log.Infoln("Unmarshal ChangeProxyParams %v", err)
-	}
-	groupName := *params.GroupName
-	proxyName := *params.ProxyName
-	proxies := tunnel.ProxiesWithProviders()
-	group, ok := proxies[groupName]
-	if !ok {
-		return
-	}
-	adapterProxy := group.(*adapter.Proxy)
-	selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
-	if !ok {
-		return
-	}
+func handleChangeProxy(data string, fn func(string string)) {
+	runLock.Lock()
+	go func() {
+		defer runLock.Unlock()
+		var params = &ChangeProxyParams{}
+		err := json.Unmarshal([]byte(data), params)
+		if err != nil {
+			fn(err.Error())
+			return
+		}
+		groupName := *params.GroupName
+		proxyName := *params.ProxyName
+		proxies := tunnel.ProxiesWithProviders()
+		group, ok := proxies[groupName]
+		if !ok {
+			fn("Not found group")
+			return
+		}
+		adapterProxy := group.(*adapter.Proxy)
+		selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
+		if !ok {
+			fn("Group is not selectable")
+			return
+		}
+		if proxyName == "" {
+			selector.ForceSet(proxyName)
+		} else {
+			err = selector.Set(proxyName)
+		}
+		if err != nil {
+			fn(err.Error())
+			return
+		}
 
-	err = selector.Set(proxyName)
-	if err == nil {
-		log.Infoln("[Selector] %s selected %s", groupName, proxyName)
-	}
+		fn("")
+		return
+	}()
 }
 
-//export getTraffic
-func getTraffic() *C.char {
-	up, down := statistic.DefaultManager.Current(state.OnlyProxy)
+func handleGetTraffic(onlyProxy bool) string {
+	up, down := statistic.DefaultManager.Current(onlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -201,14 +158,13 @@ func getTraffic() *C.char {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total(state.OnlyProxy)
+func handleGetTotalTraffic(onlyProxy bool) string {
+	up, down := statistic.DefaultManager.Total(onlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -216,30 +172,28 @@ func getTotalTraffic() *C.char {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export resetTraffic
-func resetTraffic() {
+func handleResetTraffic() {
 	statistic.DefaultManager.ResetStatistic()
 }
 
-//export asyncTestDelay
-func asyncTestDelay(s *C.char, port C.longlong) {
-	i := int64(port)
-	paramsString := C.GoString(s)
-	go func() {
+func handleAsyncTestDelay(paramsString string, fn func(string)) {
+	b.Go(paramsString, func() (bool, error) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-			return
+			fn("")
+			return false, nil
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
-			return
+			fn("")
+			return false, nil
 		}
 
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
@@ -255,52 +209,38 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 		if proxy == nil {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
-			return
+			fn(string(data))
+			return false, nil
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
 		if err != nil || delay == 0 {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
-			return
+			fn(string(data))
+			return false, nil
 		}
 
 		delayData.Value = int32(delay)
 		data, _ := json.Marshal(delayData)
-		bridge.SendToPort(i, string(data))
-		return
-	}()
+		fn(string(data))
+		return false, nil
+	})
 }
 
-//export getVersionInfo
-func getVersionInfo() *C.char {
-	versionInfo := map[string]string{
-		"clashName": constant.Name,
-		"version":   "1.18.5",
-	}
-	data, err := json.Marshal(versionInfo)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export getConnections
-func getConnections() *C.char {
+func handleGetConnections() string {
+	runLock.Lock()
+	defer runLock.Unlock()
 	snapshot := statistic.DefaultManager.Snapshot()
 	data, err := json.Marshal(snapshot)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export closeConnections
-func closeConnections() {
+func handleCloseConnectionsUnLock() bool {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -308,142 +248,186 @@ func closeConnections() {
 		}
 		return true
 	})
+	return true
 }
 
-//export closeConnection
-func closeConnection(id *C.char) {
-	connectionId := C.GoString(id)
+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
+	})
+	return true
+}
+
+func handleCloseConnection(connectionId string) bool {
+	runLock.Lock()
+	defer runLock.Unlock()
 	c := statistic.DefaultManager.Get(connectionId)
 	if c == nil {
-		return
+		return false
 	}
 	_ = c.Close()
+	return true
 }
 
-//export getProviders
-func getProviders() *C.char {
-	data, err := json.Marshal(tunnel.Providers())
-	var msg *C.char
-	if err != nil {
-		msg = C.CString("")
-		return msg
-	}
-	msg = C.CString(string(data))
-	return msg
-}
-
-//export getProvider
-func getProvider(name *C.char) *C.char {
-	providerName := C.GoString(name)
-	providers := tunnel.Providers()
-	data, err := json.Marshal(providers[providerName])
-	if err != nil {
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export getExternalProviders
-func getExternalProviders() *C.char {
-	externalProviders := make([]ExternalProvider, 0)
-	providers := tunnel.Providers()
-	for n, p := range providers {
-		if p.VehicleType() != cp.Compatible {
-			p := p.(*provider.ProxySetProvider)
-			externalProviders = append(externalProviders, ExternalProvider{
-				Name:        n,
-				Type:        p.Type().String(),
-				VehicleType: p.VehicleType().String(),
-				UpdateAt:    p.UpdatedAt,
-			})
+func handleGetExternalProviders() string {
+	runLock.Lock()
+	defer runLock.Unlock()
+	externalProviders = getExternalProvidersRaw()
+	eps := make([]ExternalProvider, 0)
+	for _, p := range externalProviders {
+		externalProvider, err := toExternalProvider(p)
+		if err != nil {
+			continue
 		}
+		eps = append(eps, *externalProvider)
 	}
-	for n, p := range tunnel.RuleProviders() {
-		if p.VehicleType() != cp.Compatible {
-			p := p.(*rp.RuleSetProvider)
-			externalProviders = append(externalProviders, ExternalProvider{
-				Name:        n,
-				Type:        p.Type().String(),
-				VehicleType: p.VehicleType().String(),
-				UpdateAt:    p.UpdatedAt,
-			})
-		}
-	}
-	data, err := json.Marshal(externalProviders)
+	sort.Sort(ExternalProviders(eps))
+	data, err := json.Marshal(eps)
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export updateExternalProvider
-func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
-	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	providerTypeString := C.GoString(providerType)
+func handleGetExternalProvider(externalProviderName string) string {
+	runLock.Lock()
+	defer runLock.Unlock()
+	externalProvider, exist := externalProviders[externalProviderName]
+	if !exist {
+		return ""
+	}
+	e, err := toExternalProvider(externalProvider)
+	if err != nil {
+		return ""
+	}
+	data, err := json.Marshal(e)
+	if err != nil {
+		return ""
+	}
+	return string(data)
+}
+
+func handleUpdateGeoData(geoType string, geoName string, fn func(value string)) {
 	go func() {
-		switch providerTypeString {
-		case "Proxy":
-			providers := tunnel.Providers()
-			err := providers[providerNameString].Update()
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
-		case "Rule":
-			providers := tunnel.RuleProviders()
-			err := providers[providerNameString].Update()
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
+		path := constant.Path.Resolve(geoName)
+		switch geoType {
 		case "MMDB":
-			err := updater.UpdateMMDB(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateMMDBWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "ASN":
-			err := updater.UpdateASN(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateASNWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "GeoIp":
-			err := updater.UpdateGeoIp(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateGeoIpWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "GeoSite":
-			err := updater.UpdateGeoSite(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateGeoSiteWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		}
-		bridge.SendToPort(i, "")
+		fn("")
 	}()
 }
 
-//export initNativeApiBridge
-func initNativeApiBridge(api unsafe.Pointer) {
-	bridge.InitDartApi(api)
+func handleUpdateExternalProvider(providerName string, fn func(value string)) {
+	go func() {
+		externalProvider, exist := externalProviders[providerName]
+		if !exist {
+			fn("external provider is not exist")
+			return
+		}
+		err := externalProvider.Update()
+		if err != nil {
+			fn(err.Error())
+			return
+		}
+		fn("")
+	}()
 }
 
-//export initMessage
-func initMessage(port C.longlong) {
-	i := int64(port)
-	Port = i
+func handleSideLoadExternalProvider(providerName string, data []byte, fn func(value string)) {
+	go func() {
+		runLock.Lock()
+		defer runLock.Unlock()
+		externalProvider, exist := externalProviders[providerName]
+		if !exist {
+			fn("external provider is not exist")
+			return
+		}
+		err := sideUpdateExternalProvider(externalProvider, data)
+		if err != nil {
+			fn(err.Error())
+			return
+		}
+		fn("")
+	}()
 }
 
-//export freeCString
-func freeCString(s *C.char) {
-	C.free(unsafe.Pointer(s))
+func handleStartLog() {
+	if logSubscriber != nil {
+		log.UnSubscribe(logSubscriber)
+		logSubscriber = nil
+	}
+	logSubscriber = log.Subscribe()
+	go func() {
+		for logData := range logSubscriber {
+			if logData.LogLevel < log.Level() {
+				continue
+			}
+			message := &Message{
+				Type: LogMessage,
+				Data: logData,
+			}
+			SendMessage(*message)
+		}
+	}()
+}
+
+func handleStopLog() {
+	if logSubscriber != nil {
+		log.UnSubscribe(logSubscriber)
+		logSubscriber = nil
+	}
+}
+
+func handleGetCountryCode(ip string, fn func(value string)) {
+	go func() {
+		runLock.Lock()
+		defer runLock.Unlock()
+		codes := mmdb.IPInstance().LookupCode(net.ParseIP(ip))
+		if len(codes) == 0 {
+			fn("")
+			return
+		}
+		fn(codes[0])
+	}()
+}
+
+func handleGetMemory(fn func(value string)) {
+	go func() {
+		fn(strconv.FormatUint(statistic.DefaultManager.Memory(), 10))
+	}()
 }
 
 func init() {
-	provider.HealthcheckHook = func(name string, delay uint16) {
+	adapter.UrlTestHook = func(name string, delay uint16) {
 		delayData := &Delay{
 			Name: name,
 		}
@@ -463,7 +447,7 @@ func init() {
 			Data: c,
 		})
 	}
-	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
+	executor.DefaultProviderLoadedHook = func(providerName string) {
 		SendMessage(Message{
 			Type: LoadedMessage,
 			Data: providerName,

core/lib.go

@@ -0,0 +1,199 @@
+//go:build cgo
+
+package main
+
+/*
+#include <stdlib.h>
+*/
+import "C"
+import (
+	bridge "core/dart-bridge"
+	"unsafe"
+)
+
+//export initNativeApiBridge
+func initNativeApiBridge(api unsafe.Pointer) {
+	bridge.InitDartApi(api)
+}
+
+//export initMessage
+func initMessage(port C.longlong) {
+	i := int64(port)
+	Port = i
+}
+
+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
+}
+
+//export initClash
+func initClash(homeDirStr *C.char) bool {
+	return handleInitClash(C.GoString(homeDirStr))
+}
+
+//export startListener
+func startListener() {
+	handleStartListener()
+}
+
+//export stopListener
+func stopListener() {
+	handleStopListener()
+}
+
+//export getIsInit
+func getIsInit() bool {
+	return handleGetIsInit()
+}
+
+//export shutdownClash
+func shutdownClash() bool {
+	return handleShutdown()
+}
+
+//export forceGc
+func forceGc() {
+	handleForceGc()
+}
+
+//export validateConfig
+func validateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	bytes := []byte(C.GoString(s))
+	go func() {
+		bridge.SendToPort(i, handleValidateConfig(bytes))
+	}()
+}
+
+//export updateConfig
+func updateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	bytes := []byte(C.GoString(s))
+	go func() {
+		bridge.SendToPort(i, handleUpdateConfig(bytes))
+	}()
+}
+
+//export getProxies
+func getProxies() *C.char {
+	return C.CString(handleGetProxies())
+}
+
+//export changeProxy
+func changeProxy(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
+	handleChangeProxy(paramsString, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export getTraffic
+func getTraffic(port C.int) *C.char {
+	onlyProxy := int(port) == 1
+	return C.CString(handleGetTraffic(onlyProxy))
+}
+
+//export getTotalTraffic
+func getTotalTraffic(port C.int) *C.char {
+	onlyProxy := int(port) == 1
+	return C.CString(handleGetTotalTraffic(onlyProxy))
+}
+
+//export resetTraffic
+func resetTraffic() {
+	handleResetTraffic()
+}
+
+//export asyncTestDelay
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
+	handleAsyncTestDelay(paramsString, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export getConnections
+func getConnections() *C.char {
+	return C.CString(handleGetConnections())
+}
+
+//export getMemory
+func getMemory(port C.longlong) {
+	i := int64(port)
+	handleGetMemory(func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export closeConnections
+func closeConnections() {
+	handleCloseConnections()
+}
+
+//export closeConnection
+func closeConnection(id *C.char) {
+	connectionId := C.GoString(id)
+	handleCloseConnection(connectionId)
+}
+
+//export getExternalProviders
+func getExternalProviders() *C.char {
+	return C.CString(handleGetExternalProviders())
+}
+
+//export getExternalProvider
+func getExternalProvider(externalProviderNameChar *C.char) *C.char {
+	externalProviderName := C.GoString(externalProviderNameChar)
+	return C.CString(handleGetExternalProvider(externalProviderName))
+}
+
+//export updateGeoData
+func updateGeoData(geoTypeChar *C.char, geoNameChar *C.char, port C.longlong) {
+	i := int64(port)
+	geoType := C.GoString(geoTypeChar)
+	geoName := C.GoString(geoNameChar)
+	handleUpdateGeoData(geoType, geoName, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export updateExternalProvider
+func updateExternalProvider(providerNameChar *C.char, port C.longlong) {
+	i := int64(port)
+	providerName := C.GoString(providerNameChar)
+	handleUpdateExternalProvider(providerName, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export getCountryCode
+func getCountryCode(ipChar *C.char, port C.longlong) {
+	ip := C.GoString(ipChar)
+	i := int64(port)
+	handleGetCountryCode(ip, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export sideLoadExternalProvider
+func sideLoadExternalProvider(providerNameChar *C.char, dataChar *C.char, port C.longlong) {
+	i := int64(port)
+	providerName := C.GoString(providerNameChar)
+	data := []byte(C.GoString(dataChar))
+	handleSideLoadExternalProvider(providerName, data, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export startLog
+func startLog() {
+	handleStartLog()
+}
+
+//export stopLog
+func stopLog() {
+	handleStopLog()
+}

core/lib_android.go

@@ -0,0 +1,270 @@
+//go:build android && cgo
+
+package main
+
+import "C"
+import (
+	"core/platform"
+	"core/state"
+	t "core/tun"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/process"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/dns"
+	"github.com/metacubex/mihomo/listener/sing_tun"
+	"github.com/metacubex/mihomo/log"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"syscall"
+	"time"
+)
+
+type ProcessMap struct {
+	m sync.Map
+}
+
+type FdMap struct {
+	m sync.Map
+}
+
+type Fd struct {
+	Id    int64 `json:"id"`
+	Value int64 `json:"value"`
+}
+
+var (
+	tunListener *sing_tun.Listener
+	fdMap       FdMap
+	fdCounter   int64 = 0
+	counter     int64 = 0
+	processMap  ProcessMap
+	tunLock     sync.Mutex
+	runTime     *time.Time
+	errBlocked  = errors.New("blocked")
+)
+
+func (cm *ProcessMap) Store(key int64, value string) {
+	cm.m.Store(key, value)
+}
+
+func (cm *ProcessMap) Load(key int64) (string, bool) {
+	value, ok := cm.m.Load(key)
+	if !ok || value == nil {
+		return "", false
+	}
+	return value.(string), true
+}
+
+func (cm *FdMap) Store(key int64) {
+	cm.m.Store(key, struct{}{})
+}
+
+func (cm *FdMap) Load(key int64) bool {
+	_, ok := cm.m.Load(key)
+	return ok
+}
+
+//export startTUN
+func startTUN(fd C.int, port C.longlong) {
+	i := int64(port)
+	ServicePort = i
+	if fd == 0 {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+		now := time.Now()
+		runTime = &now
+		SendMessage(Message{
+			Type: StartedMessage,
+			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
+		})
+		return
+	}
+	initSocketHook()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+		f := int(fd)
+		tunListener, _ = t.Start(f, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
+		if tunListener != nil {
+			log.Infoln("TUN address: %v", tunListener.Address())
+		}
+		now := time.Now()
+		runTime = &now
+	}()
+}
+
+//export getRunTime
+func getRunTime() *C.char {
+	if runTime == nil {
+		return C.CString("")
+	}
+	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
+}
+
+//export stopTun
+func stopTun() {
+	removeSocketHook()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+
+		runTime = nil
+
+		if tunListener != nil {
+			_ = tunListener.Close()
+		}
+	}()
+}
+
+//export setFdMap
+func setFdMap(fd C.long) {
+	fdInt := int64(fd)
+	go func() {
+		fdMap.Store(fdInt)
+	}()
+}
+
+func markSocket(fd Fd) {
+	SendMessage(Message{
+		Type: ProtectMessage,
+		Data: fd,
+	})
+}
+
+func initSocketHook() {
+	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
+		if platform.ShouldBlockConnection() {
+			return errBlocked
+		}
+		return conn.Control(func(fd uintptr) {
+			fdInt := int64(fd)
+			timeout := time.After(500 * time.Millisecond)
+			id := atomic.AddInt64(&fdCounter, 1)
+
+			markSocket(Fd{
+				Id:    id,
+				Value: fdInt,
+			})
+
+			for {
+				select {
+				case <-timeout:
+					return
+				default:
+					exists := fdMap.Load(id)
+					if exists {
+						return
+					}
+					time.Sleep(20 * time.Millisecond)
+				}
+			}
+		})
+	}
+}
+
+func removeSocketHook() {
+	dialer.DefaultSocketHook = nil
+}
+
+func init() {
+	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
+		if metadata == nil {
+			return "", process.ErrInvalidNetwork
+		}
+		id := atomic.AddInt64(&counter, 1)
+
+		timeout := time.After(200 * time.Millisecond)
+
+		SendMessage(Message{
+			Type: ProcessMessage,
+			Data: Process{
+				Id:       id,
+				Metadata: metadata,
+			},
+		})
+
+		for {
+			select {
+			case <-timeout:
+				return "", errors.New("package resolver timeout")
+			default:
+				value, exists := processMap.Load(id)
+				if exists {
+					return value, nil
+				}
+				time.Sleep(20 * time.Millisecond)
+			}
+		}
+	}
+}
+
+//export setProcessMap
+func setProcessMap(s *C.char) {
+	if s == nil {
+		return
+	}
+	paramsString := C.GoString(s)
+	go func() {
+		var processMapItem = &ProcessMapItem{}
+		err := json.Unmarshal([]byte(paramsString), processMapItem)
+		if err == nil {
+			processMap.Store(processMapItem.Id, processMapItem.Value)
+		}
+	}()
+}
+
+//export getCurrentProfileName
+func getCurrentProfileName() *C.char {
+	if state.CurrentState == nil {
+		return C.CString("")
+	}
+	return C.CString(state.CurrentState.CurrentProfileName)
+}
+
+//export getAndroidVpnOptions
+func getAndroidVpnOptions() *C.char {
+	tunLock.Lock()
+	defer tunLock.Unlock()
+	options := state.AndroidVpnOptions{
+		Enable:           state.CurrentState.Enable,
+		Port:             currentConfig.General.MixedPort,
+		Ipv4Address:      state.DefaultIpv4Address,
+		Ipv6Address:      state.GetIpv6Address(),
+		AccessControl:    state.CurrentState.AccessControl,
+		SystemProxy:      state.CurrentState.SystemProxy,
+		AllowBypass:      state.CurrentState.AllowBypass,
+		RouteAddress:     state.CurrentState.RouteAddress,
+		BypassDomain:     state.CurrentState.BypassDomain,
+		DnsServerAddress: state.GetDnsServerAddress(),
+	}
+	data, err := json.Marshal(options)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export setState
+func setState(s *C.char) {
+	paramsString := C.GoString(s)
+	err := json.Unmarshal([]byte(paramsString), state.CurrentState)
+	if err != nil {
+		return
+	}
+}
+
+//export updateDns
+func updateDns(s *C.char) {
+	dnsList := C.GoString(s)
+	go func() {
+		log.Infoln("[DNS] updateDns %s", dnsList)
+		dns.UpdateSystemDNS(strings.Split(dnsList, ","))
+		dns.FlushCacheWithDefaultResolver()
+	}()
+}

core/log.go

@@ -1,38 +0,0 @@
-package main
-
-import "C"
-import (
-	"github.com/metacubex/mihomo/common/observable"
-	"github.com/metacubex/mihomo/log"
-)
-
-var logSubscriber observable.Subscription[log.Event]
-
-//export startLog
-func startLog() {
-	if logSubscriber != nil {
-		log.UnSubscribe(logSubscriber)
-		logSubscriber = nil
-	}
-	logSubscriber = log.Subscribe()
-	go func() {
-		for logData := range logSubscriber {
-			if logData.LogLevel < log.Level() {
-				continue
-			}
-			message := &Message{
-				Type: LogMessage,
-				Data: logData,
-			}
-			SendMessage(*message)
-		}
-	}()
-}
-
-//export stopLog
-func stopLog() {
-	if logSubscriber != nil {
-		log.UnSubscribe(logSubscriber)
-		logSubscriber = nil
-	}
-}

core/main.go

@@ -1,10 +1,17 @@
+//go:build !cgo
+
 package main
 
-import "C"
 import (
 	"fmt"
+	"os"
 )
 
 func main() {
-	fmt.Println("init clash")
+	args := os.Args
+	if len(args) <= 1 {
+		fmt.Println("Arguments error")
+		os.Exit(1)
+	}
+	startServer(args[1])
 }

core/main_cgo.go

@@ -0,0 +1,8 @@
+//go:build cgo
+
+package main
+
+import "C"
+
+func main() {
+}

core/message.go

@@ -1,77 +1,13 @@
+//go:build !cgo
+
 package main
 
-import (
-	bridge "core/dart-bridge"
-	"encoding/json"
-	"github.com/metacubex/mihomo/constant"
-)
-
-var Port int64
-var ServicePort int64
-
-type MessageType string
-
-const (
-	LogMessage     MessageType = "log"
-	ProtectMessage MessageType = "protect"
-	DelayMessage   MessageType = "delay"
-	ProcessMessage MessageType = "process"
-	RequestMessage MessageType = "request"
-	StartedMessage MessageType = "started"
-	LoadedMessage  MessageType = "loaded"
-)
-
-type Delay struct {
-	Name  string `json:"name"`
-	Value int32  `json:"value"`
-}
-
-type Process struct {
-	Id       int64              `json:"id"`
-	Metadata *constant.Metadata `json:"metadata"`
-}
-
-type Message struct {
-	Type MessageType `json:"type"`
-	Data interface{} `json:"data"`
-}
-
-func (message *Message) Json() (string, error) {
-	data, err := json.Marshal(message)
-	return string(data), err
-}
-
 func SendMessage(message Message) {
 	s, err := message.Json()
 	if err != nil {
 		return
 	}
-	if handler, ok := messageHandlers[message.Type]; ok {
-		handler(s)
-	} else {
-		sendToPort(s)
-	}
-}
-
-var messageHandlers = map[MessageType]func(string) bool{
-	ProtectMessage: sendToServicePort,
-	ProcessMessage: sendToServicePort,
-	StartedMessage: conditionalSend,
-	LoadedMessage:  conditionalSend,
-}
-
-func sendToPort(s string) bool {
-	return bridge.SendToPort(Port, s)
-}
-
-func sendToServicePort(s string) bool {
-	return bridge.SendToPort(ServicePort, s)
-}
-
-func conditionalSend(s string) bool {
-	isSuccess := sendToPort(s)
-	if !isSuccess {
-		return sendToServicePort(s)
-	}
-	return isSuccess
+	Action{
+		Method: messageMethod,
+	}.callback(s)
 }

core/message_cgo.go

@@ -0,0 +1,47 @@
+//go:build cgo
+
+package main
+
+import (
+	bridge "core/dart-bridge"
+)
+
+var (
+	Port        int64 = -1
+	ServicePort int64 = -1
+)
+
+func SendMessage(message Message) {
+	s, err := message.Json()
+	if err != nil {
+		return
+	}
+	if handler, ok := messageHandlers[message.Type]; ok {
+		handler(s)
+	} else {
+		sendToPort(s)
+	}
+}
+
+var messageHandlers = map[MessageType]func(string) bool{
+	ProtectMessage: sendToServicePort,
+	ProcessMessage: sendToServicePort,
+	StartedMessage: conditionalSend,
+	LoadedMessage:  conditionalSend,
+}
+
+func sendToPort(s string) bool {
+	return bridge.SendToPort(Port, s)
+}
+
+func sendToServicePort(s string) bool {
+	return bridge.SendToPort(ServicePort, s)
+}
+
+func conditionalSend(s string) bool {
+	isSuccess := sendToPort(s)
+	if !isSuccess {
+		return sendToServicePort(s)
+	}
+	return isSuccess
+}

core/platform/limit.go

@@ -1,4 +1,4 @@
-//go:build android
+//go:build android && cgo
 
 package platform
 

core/process.go

@@ -1,81 +0,0 @@
-//go:build android
-
-package main
-
-import "C"
-import (
-	"encoding/json"
-	"errors"
-	"github.com/metacubex/mihomo/component/process"
-	"github.com/metacubex/mihomo/constant"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-type ProcessMap struct {
-	m sync.Map
-}
-
-func (cm *ProcessMap) Store(key int64, value string) {
-	cm.m.Store(key, value)
-}
-
-func (cm *ProcessMap) Load(key int64) (string, bool) {
-	value, ok := cm.m.Load(key)
-	if !ok || value == nil {
-		return "", false
-	}
-	return value.(string), true
-}
-
-var counter int64 = 0
-
-var processMap ProcessMap
-
-func init() {
-	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
-		if metadata == nil {
-			return "", process.ErrInvalidNetwork
-		}
-		id := atomic.AddInt64(&counter, 1)
-
-		timeout := time.After(200 * time.Millisecond)
-
-		SendMessage(Message{
-			Type: ProcessMessage,
-			Data: Process{
-				Id:       id,
-				Metadata: metadata,
-			},
-		})
-
-		for {
-			select {
-			case <-timeout:
-				return "", errors.New("package resolver timeout")
-			default:
-				value, exists := processMap.Load(id)
-				if exists {
-					return value, nil
-				}
-				time.Sleep(20 * time.Millisecond)
-			}
-		}
-	}
-}
-
-//export setProcessMap
-func setProcessMap(s *C.char) {
-	if s == nil {
-		return
-	}
-	paramsString := C.GoString(s)
-	go func() {
-		var processMapItem = &ProcessMapItem{}
-		err := json.Unmarshal([]byte(paramsString), processMapItem)
-		if err == nil {
-			processMap.Store(processMapItem.Id, processMapItem.Value)
-		}
-	}()
-}

core/server.go

@@ -0,0 +1,173 @@
+//go:build !cgo
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"net"
+	"strconv"
+)
+
+var conn net.Conn = nil
+
+func startServer(arg string) {
+	_, err := strconv.Atoi(arg)
+	if err != nil {
+		conn, err = net.Dial("unix", arg)
+	} else {
+		conn, err = net.Dial("tcp", fmt.Sprintf("127.0.0.1:%s", arg))
+	}
+	if err != nil {
+		panic(err.Error())
+	}
+
+	defer func(conn net.Conn) {
+		_ = conn.Close()
+	}(conn)
+
+	reader := bufio.NewReader(conn)
+
+	for {
+		data, err := reader.ReadString('\n')
+		if err != nil {
+			return
+		}
+		var action = &Action{}
+
+		err = json.Unmarshal([]byte(data), action)
+
+		if err != nil {
+			return
+		}
+
+		go handleAction(action)
+	}
+}
+
+func handleAction(action *Action) {
+	switch action.Method {
+	case initClashMethod:
+		data := action.Data.(string)
+		action.callback(handleInitClash(data))
+		return
+	case getIsInitMethod:
+		action.callback(handleGetIsInit())
+		return
+	case forceGcMethod:
+		handleForceGc()
+		return
+	case shutdownMethod:
+		action.callback(handleShutdown())
+		return
+	case validateConfigMethod:
+		data := []byte(action.Data.(string))
+		action.callback(handleValidateConfig(data))
+		return
+	case updateConfigMethod:
+		data := []byte(action.Data.(string))
+		action.callback(handleUpdateConfig(data))
+		return
+	case getProxiesMethod:
+		action.callback(handleGetProxies())
+		return
+	case changeProxyMethod:
+		data := action.Data.(string)
+		handleChangeProxy(data, func(value string) {
+			action.callback(value)
+		})
+		return
+	case getTrafficMethod:
+		data := action.Data.(bool)
+		action.callback(handleGetTraffic(data))
+		return
+	case getTotalTrafficMethod:
+		data := action.Data.(bool)
+		action.callback(handleGetTotalTraffic(data))
+		return
+	case resetTrafficMethod:
+		handleResetTraffic()
+		return
+	case asyncTestDelayMethod:
+		data := action.Data.(string)
+		handleAsyncTestDelay(data, func(value string) {
+			action.callback(value)
+		})
+		return
+	case getConnectionsMethod:
+		action.callback(handleGetConnections())
+		return
+	case closeConnectionsMethod:
+		action.callback(handleCloseConnections())
+		return
+	case closeConnectionMethod:
+		id := action.Data.(string)
+		action.callback(handleCloseConnection(id))
+		return
+	case getExternalProvidersMethod:
+		action.callback(handleGetExternalProviders())
+		return
+	case getExternalProviderMethod:
+		externalProviderName := action.Data.(string)
+		action.callback(handleGetExternalProvider(externalProviderName))
+	case updateGeoDataMethod:
+		paramsString := action.Data.(string)
+		var params = map[string]string{}
+		err := json.Unmarshal([]byte(paramsString), &params)
+		if err != nil {
+			action.callback(err.Error())
+			return
+		}
+		geoType := params["geoType"]
+		geoName := params["geoName"]
+		handleUpdateGeoData(geoType, geoName, func(value string) {
+			action.callback(value)
+		})
+		return
+	case updateExternalProviderMethod:
+		providerName := action.Data.(string)
+		handleUpdateExternalProvider(providerName, func(value string) {
+			action.callback(value)
+		})
+		return
+	case sideLoadExternalProviderMethod:
+		paramsString := action.Data.(string)
+		var params = map[string]string{}
+		err := json.Unmarshal([]byte(paramsString), &params)
+		if err != nil {
+			action.callback(err.Error())
+			return
+		}
+		providerName := params["providerName"]
+		data := params["data"]
+		handleSideLoadExternalProvider(providerName, []byte(data), func(value string) {
+			action.callback(value)
+		})
+		return
+	case startLogMethod:
+		handleStartLog()
+		return
+	case stopLogMethod:
+		handleStopLog()
+		return
+	case startListenerMethod:
+		action.callback(handleStartListener())
+		return
+	case stopListenerMethod:
+		action.callback(handleStopListener())
+		return
+	case getCountryCodeMethod:
+		ip := action.Data.(string)
+		handleGetCountryCode(ip, func(value string) {
+			action.callback(value)
+		})
+		return
+	case getMemoryMethod:
+		handleGetMemory(func(value string) {
+			action.callback(value)
+		})
+		return
+	}
+
+}

core/state.go

@@ -1,47 +0,0 @@
-package main
-
-import "C"
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type AccessControl struct {
-	Mode              string   `json:"mode"`
-	AcceptList        []string `json:"acceptList"`
-	RejectList        []string `json:"rejectList"`
-	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
-}
-
-type AndroidProps struct {
-	AccessControl *AccessControl `json:"accessControl"`
-	AllowBypass   bool           `json:"allowBypass"`
-	SystemProxy   bool           `json:"systemProxy"`
-}
-
-type State struct {
-	AndroidProps
-	MixedPort int  `json:"mixedPort"`
-	OnlyProxy bool `json:"onlyProxy"`
-}
-
-var state State
-
-//export getState
-func getState() *C.char {
-	data, err := json.Marshal(state)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export setState
-func setState(s *C.char) {
-	paramsString := C.GoString(s)
-	err := json.Unmarshal([]byte(paramsString), &state)
-	if err != nil {
-		return
-	}
-}

core/state/state.go

@@ -0,0 +1,56 @@
+//go:build android && cgo
+
+package state
+
+var DefaultIpv4Address = "172.19.0.1/30"
+var DefaultDnsAddress = "172.19.0.2"
+var DefaultIpv6Address = "fdfe:dcba:9876::1/126"
+
+type AndroidVpnOptions struct {
+	Enable           bool           `json:"enable"`
+	Port             int            `json:"port"`
+	AccessControl    *AccessControl `json:"accessControl"`
+	AllowBypass      bool           `json:"allowBypass"`
+	SystemProxy      bool           `json:"systemProxy"`
+	BypassDomain     []string       `json:"bypassDomain"`
+	RouteAddress     []string       `json:"routeAddress"`
+	Ipv4Address      string         `json:"ipv4Address"`
+	Ipv6Address      string         `json:"ipv6Address"`
+	DnsServerAddress string         `json:"dnsServerAddress"`
+}
+
+type AccessControl struct {
+	Mode              string   `json:"mode"`
+	AcceptList        []string `json:"acceptList"`
+	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+}
+
+type AndroidVpnRawOptions struct {
+	Enable        bool           `json:"enable"`
+	AccessControl *AccessControl `json:"accessControl"`
+	AllowBypass   bool           `json:"allowBypass"`
+	SystemProxy   bool           `json:"systemProxy"`
+	RouteAddress  []string       `json:"routeAddress"`
+	Ipv6          bool           `json:"ipv6"`
+	BypassDomain  []string       `json:"bypassDomain"`
+}
+
+type State struct {
+	AndroidVpnRawOptions
+	CurrentProfileName string `json:"currentProfileName"`
+}
+
+var CurrentState = &State{}
+
+func GetIpv6Address() string {
+	if CurrentState.Ipv6 {
+		return DefaultIpv6Address
+	} else {
+		return ""
+	}
+}
+
+func GetDnsServerAddress() string {
+	return DefaultDnsAddress
+}

core/tun.go

@@ -1,161 +0,0 @@
-//go:build android
-
-package main
-
-import "C"
-import (
-	"core/platform"
-	t "core/tun"
-	"errors"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/log"
-	"golang.org/x/sync/semaphore"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"time"
-)
-
-var tunLock sync.Mutex
-var tun *t.Tun
-var runTime *time.Time
-
-type FdMap struct {
-	m sync.Map
-}
-
-func (cm *FdMap) Store(key int64) {
-	cm.m.Store(key, struct{}{})
-}
-
-func (cm *FdMap) Load(key int64) bool {
-	_, ok := cm.m.Load(key)
-	return ok
-}
-
-var fdMap FdMap
-
-//export startTUN
-func startTUN(fd C.int, port C.longlong) {
-	i := int64(port)
-	ServicePort = i
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-
-		if tun != nil {
-			tun.Close()
-			tun = nil
-		}
-
-		f := int(fd)
-		gateway := "172.16.0.1/30"
-		portal := "172.16.0.2"
-		dns := "0.0.0.0"
-
-		tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
-
-		closer, err := t.Start(f, gateway, portal, dns)
-
-		if err != nil {
-			log.Errorln("startTUN error: %v", err)
-			tempTun.Close()
-		}
-
-		tempTun.Closer = closer
-
-		tun = tempTun
-
-		now := time.Now()
-
-		runTime = &now
-
-		SendMessage(Message{
-			Type: StartedMessage,
-			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
-		})
-	}()
-}
-
-//export getRunTime
-func getRunTime() *C.char {
-	if runTime == nil {
-		return C.CString("")
-	}
-	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
-}
-
-//export stopTun
-func stopTun() {
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-
-		runTime = nil
-
-		if tun != nil {
-			tun.Close()
-			tun = nil
-		}
-	}()
-}
-
-var errBlocked = errors.New("blocked")
-
-//export setFdMap
-func setFdMap(fd C.long) {
-	fdInt := int64(fd)
-	go func() {
-		fdMap.Store(fdInt)
-	}()
-}
-
-type Fd struct {
-	Id    int64 `json:"id"`
-	Value int64 `json:"value"`
-}
-
-func markSocket(fd Fd) {
-	SendMessage(Message{
-		Type: ProtectMessage,
-		Data: fd,
-	})
-}
-
-var fdCounter int64 = 0
-
-func init() {
-	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
-		return conn.Control(func(fd uintptr) {
-			if tun == nil {
-				return
-			}
-
-			fdInt := int64(fd)
-			timeout := time.After(100 * time.Millisecond)
-			id := atomic.AddInt64(&fdCounter, 1)
-
-			markSocket(Fd{
-				Id:    id,
-				Value: fdInt,
-			})
-
-			for {
-				select {
-				case <-timeout:
-					return
-				default:
-					exists := fdMap.Load(id)
-					if exists {
-						return
-					}
-					time.Sleep(10 * time.Millisecond)
-				}
-			}
-		})
-	}
-}

core/tun/dns.go

@@ -1,33 +0,0 @@
-//go:build android
-
-package tun
-
-import (
-	"github.com/metacubex/mihomo/dns"
-	D "github.com/miekg/dns"
-	"net"
-)
-
-func shouldHijackDns(dns net.IP, target net.IP, targetPort int) bool {
-	if targetPort != 53 {
-		return false
-	}
-
-	return net.IPv4zero.Equal(dns) || target.Equal(dns)
-}
-
-func relayDns(payload []byte) ([]byte, error) {
-	msg := &D.Msg{}
-	if err := msg.Unpack(payload); err != nil {
-		return nil, err
-	}
-
-	r, err := dns.ServeDNSWithDefaultServer(msg)
-	if err != nil {
-		return nil, err
-	}
-
-	r.SetRcode(msg, r.Rcode)
-
-	return r.Pack()
-}

core/tun/tcp.go

@@ -1,20 +0,0 @@
-//go:build android
-
-package tun
-
-import (
-	"github.com/metacubex/mihomo/constant"
-	"net"
-)
-
-func createMetadata(lAddr, rAddr *net.TCPAddr) *constant.Metadata {
-	return &constant.Metadata{
-		NetWork: constant.TCP,
-		Type:    constant.SOCKS5,
-		SrcIP:   lAddr.AddrPort().Addr(),
-		DstIP:   rAddr.AddrPort().Addr(),
-		SrcPort: uint16(lAddr.Port),
-		DstPort: uint16(rAddr.Port),
-		Host:    "",
-	}
-}

core/tun/tun.go

@@ -1,186 +1,69 @@
-//go:build android
+//go:build android && cgo
 
 package tun
 
 import "C"
 import (
-	"context"
-	"encoding/binary"
-	"github.com/Kr328/tun2socket"
-	"github.com/Kr328/tun2socket/nat"
-	"github.com/metacubex/mihomo/adapter/inbound"
-	"github.com/metacubex/mihomo/common/pool"
+	"core/state"
 	"github.com/metacubex/mihomo/constant"
+	LC "github.com/metacubex/mihomo/listener/config"
+	"github.com/metacubex/mihomo/listener/sing_tun"
 	"github.com/metacubex/mihomo/log"
-	"github.com/metacubex/mihomo/transport/socks5"
 	"github.com/metacubex/mihomo/tunnel"
-	"golang.org/x/sync/semaphore"
-	"io"
 	"net"
-	"os"
-	"time"
+	"net/netip"
 )
 
-type Tun struct {
-	Closer io.Closer
-
-	Closed bool
-	Limit  *semaphore.Weighted
+type Props struct {
+	Fd       int    `json:"fd"`
+	Gateway  string `json:"gateway"`
+	Gateway6 string `json:"gateway6"`
+	Portal   string `json:"portal"`
+	Portal6  string `json:"portal6"`
+	Dns      string `json:"dns"`
+	Dns6     string `json:"dns6"`
 }
 
-func (t *Tun) Close() {
-	_ = t.Limit.Acquire(context.TODO(), 4)
-	defer t.Limit.Release(4)
-
-	t.Closed = true
-
-	if t.Closer != nil {
-		_ = t.Closer.Close()
-	}
-}
-
-var _, ipv4LoopBack, _ = net.ParseCIDR("127.0.0.0/8")
-
-func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
-	device := os.NewFile(uintptr(fd), "/dev/tun")
-	ip, network, err := net.ParseCIDR(gateway)
+func Start(fd int, device string, stack constant.TUNStack) (*sing_tun.Listener, error) {
+	var prefix4 []netip.Prefix
+	tempPrefix4, err := netip.ParsePrefix(state.DefaultIpv4Address)
 	if err != nil {
-		panic(err.Error())
-	} else {
-		network.IP = ip
+		log.Errorln("startTUN error:", err)
+		return nil, err
 	}
-	stack, err := tun2socket.StartTun2Socket(device, network, net.ParseIP(portal))
+	prefix4 = append(prefix4, tempPrefix4)
+	var prefix6 []netip.Prefix
+	if state.CurrentState.Ipv6 {
+		tempPrefix6, err := netip.ParsePrefix(state.DefaultIpv6Address)
+		if err != nil {
+			log.Errorln("startTUN error:", err)
+			return nil, err
+		}
+		prefix6 = append(prefix6, tempPrefix6)
+	}
+
+	var dnsHijack []string
+	dnsHijack = append(dnsHijack, net.JoinHostPort(state.GetDnsServerAddress(), "53"))
+
+	options := LC.Tun{
+		Enable:              true,
+		Device:              device,
+		Stack:               stack,
+		DNSHijack:           dnsHijack,
+		AutoRoute:           false,
+		AutoDetectInterface: false,
+		Inet4Address:        prefix4,
+		Inet6Address:        prefix6,
+		MTU:                 9000,
+		FileDescriptor:      fd,
+	}
+
+	listener, err := sing_tun.New(options, tunnel.Tunnel)
 
 	if err != nil {
-		_ = device.Close()
+		log.Errorln("startTUN error:", err)
 		return nil, err
 	}
 
-	dnsAddr := net.ParseIP(dns)
-
-	tcp := func() {
-		defer func(tcp *nat.TCP) {
-			_ = tcp.Close()
-		}(stack.TCP())
-		defer log.Debugln("TCP: closed")
-
-		for stack.TCP().SetDeadline(time.Time{}) == nil {
-			conn, err := stack.TCP().Accept()
-			if err != nil {
-				log.Errorln("Accept connection: %v", err)
-				continue
-			}
-			lAddr := conn.LocalAddr().(*net.TCPAddr)
-			rAddr := conn.RemoteAddr().(*net.TCPAddr)
-
-			if ipv4LoopBack.Contains(rAddr.IP) {
-				_ = conn.Close()
-
-				continue
-			}
-
-			if shouldHijackDns(dnsAddr, rAddr.IP, rAddr.Port) {
-				go func() {
-					defer func(conn net.Conn) {
-						_ = conn.Close()
-					}(conn)
-
-					buf := pool.Get(pool.UDPBufferSize)
-					defer func(buf []byte) {
-						_ = pool.Put(buf)
-					}(buf)
-
-					for {
-						_ = conn.SetReadDeadline(time.Now().Add(constant.DefaultTCPTimeout))
-
-						length := uint16(0)
-						if err := binary.Read(conn, binary.BigEndian, &length); err != nil {
-							return
-						}
-
-						if int(length) > len(buf) {
-							return
-						}
-
-						n, err := conn.Read(buf[:length])
-						if err != nil {
-							return
-						}
-
-						msg, err := relayDns(buf[:n])
-						if err != nil {
-							return
-						}
-
-						_, _ = conn.Write(msg)
-					}
-				}()
-
-				continue
-			}
-
-			go tunnel.Tunnel.HandleTCPConn(conn, createMetadata(lAddr, rAddr))
-		}
-	}
-
-	udp := func() {
-		defer func(udp *nat.UDP) {
-			_ = udp.Close()
-		}(stack.UDP())
-		defer log.Debugln("UDP: closed")
-
-		for {
-			buf := pool.Get(pool.UDPBufferSize)
-
-			n, lRAddr, rRAddr, err := stack.UDP().ReadFrom(buf)
-			if err != nil {
-				return
-			}
-
-			raw := buf[:n]
-			lAddr := lRAddr.(*net.UDPAddr)
-			rAddr := rRAddr.(*net.UDPAddr)
-
-			if ipv4LoopBack.Contains(rAddr.IP) {
-				_ = pool.Put(buf)
-
-				continue
-			}
-
-			if shouldHijackDns(dnsAddr, rAddr.IP, rAddr.Port) {
-				go func() {
-					defer func(buf []byte) {
-						_ = pool.Put(buf)
-					}(buf)
-
-					msg, err := relayDns(raw)
-					if err != nil {
-						return
-					}
-
-					_, _ = stack.UDP().WriteTo(msg, rAddr, lAddr)
-				}()
-
-				continue
-			}
-
-			pkt := &packet{
-				local: lAddr,
-				data:  raw,
-				writeBack: func(b []byte, addr net.Addr) (int, error) {
-					return stack.UDP().WriteTo(b, addr, lAddr)
-				},
-				drop: func() {
-					_ = pool.Put(buf)
-				},
-			}
-
-			tunnel.Tunnel.HandleUDPPacket(inbound.NewPacket(socks5.ParseAddrToSocksAddr(rAddr), pkt, constant.SOCKS5))
-		}
-	}
-
-	go tcp()
-	go udp()
-
-	return stack, nil
+	return listener, nil
 }

core/tun/udp.go

@@ -1,28 +0,0 @@
-//go:build android
-
-package tun
-
-import "net"
-
-type packet struct {
-	local     *net.UDPAddr
-	data      []byte
-	writeBack func(b []byte, addr net.Addr) (int, error)
-	drop      func()
-}
-
-func (pkt *packet) Data() []byte {
-	return pkt.data
-}
-
-func (pkt *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) {
-	return pkt.writeBack(b, addr)
-}
-
-func (pkt *packet) Drop() {
-	pkt.drop()
-}
-
-func (pkt *packet) LocalAddr() net.Addr {
-	return pkt.local
-}

lib/application.dart

@@ -1,10 +1,13 @@
 import 'dart:async';
 
 import 'package:dynamic_color/dynamic_color.dart';
-import 'package:fl_clash/l10n/l10n.dart';
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/l10n/l10n.dart';
+import 'package:fl_clash/manager/hotkey_manager.dart';
+import 'package:fl_clash/manager/manager.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
@@ -17,6 +20,7 @@ runAppWithPreferences(
   Widget child, {
   required AppState appState,
   required Config config,
+  required AppFlowingState appFlowingState,
   required ClashConfig clashConfig,
 }) {
   runApp(MultiProvider(
@@ -27,11 +31,13 @@ runAppWithPreferences(
       ChangeNotifierProvider<Config>(
         create: (_) => config,
       ),
+      ChangeNotifierProvider<AppFlowingState>(
+        create: (_) => appFlowingState,
+      ),
       ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
         create: (_) => appState,
         update: (_, config, clashConfig, appState) {
           appState?.mode = clashConfig.mode;
-          appState?.isCompatible = config.isCompatible;
           appState?.selectedMap = config.currentSelectedMap;
           return appState!;
         },
@@ -52,13 +58,15 @@ class Application extends StatefulWidget {
 
 class ApplicationState extends State<Application> {
   late SystemColorSchemes systemColorSchemes;
+  Timer? _autoUpdateGroupTaskTimer;
+  Timer? _autoUpdateProfilesTaskTimer;
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.android: CommonPageTransitionsBuilder(),
+      TargetPlatform.windows: CommonPageTransitionsBuilder(),
+      TargetPlatform.linux: CommonPageTransitionsBuilder(),
+      TargetPlatform.macOS: CommonPageTransitionsBuilder(),
     },
   );
 
@@ -80,7 +88,10 @@ class ApplicationState extends State<Application> {
   @override
   void initState() {
     super.initState();
+    _autoUpdateGroupTask();
+    _autoUpdateProfilesTask();
     globalState.appController = AppController(context);
+    globalState.measure = Measure.of(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
       final currentContext = globalState.navigatorKey.currentContext;
       if (currentContext != null) {
@@ -88,21 +99,63 @@ class ApplicationState extends State<Application> {
       }
       await globalState.appController.init();
       globalState.appController.initLink();
-      _updateGroups();
+      app?.initShortcuts();
     });
   }
 
-  _buildApp(Widget app) {
+  _autoUpdateGroupTask() {
+    _autoUpdateGroupTaskTimer = Timer(const Duration(milliseconds: 20000), () {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        globalState.appController.updateGroupsDebounce();
+        _autoUpdateGroupTask();
+      });
+    });
+  }
+
+  _autoUpdateProfilesTask() {
+    _autoUpdateProfilesTaskTimer = Timer(const Duration(seconds: 5), () async {
+      await globalState.appController.autoUpdateProfiles();
+      _autoUpdateProfilesTask();
+    });
+  }
+
+  _buildPlatformWrap(Widget child) {
     if (system.isDesktop) {
-      return WindowContainer(
-        child: TrayContainer(
-          child: app,
+      return WindowManager(
+        child: TrayManager(
+          child: HotKeyManager(
+            child: ProxyManager(
+              child: child,
+            ),
+          ),
         ),
       );
     }
-    return AndroidContainer(
-      child: TileContainer(
-        child: app,
+    return AndroidManager(
+      child: TileManager(
+        child: child,
+      ),
+    );
+  }
+
+  _buildPage(Widget page) {
+    if (system.isDesktop) {
+      return WindowHeaderContainer(
+        child: page,
+      );
+    }
+    return VpnManager(
+      child: page,
+    );
+  }
+
+  _buildWrap(Widget child) {
+    return AppStateManager(
+      child: ClashManager(
+        child: ConnectivityManager(
+          onConnectivityChanged: globalState.appController.updateLocalIp,
+          child: child,
+        ),
       ),
     );
   }
@@ -120,36 +173,23 @@ class ApplicationState extends State<Application> {
     });
   }
 
-  _updateGroups() {
-    if (globalState.groupsUpdateTimer != null) {
-      globalState.groupsUpdateTimer?.cancel();
-      globalState.groupsUpdateTimer = null;
-    }
-    globalState.groupsUpdateTimer ??= Timer.periodic(
-      httpTimeoutDuration,
-      (timer) async {
-        await globalState.appController.updateGroupDebounce();
-      },
-    );
-  }
-
   @override
   Widget build(context) {
-    return AppStateContainer(
-      child: ClashContainer(
-        child: Selector2<AppState, Config, ApplicationSelectorState>(
+    return _buildWrap(
+      _buildPlatformWrap(
+        Selector2<AppState, Config, ApplicationSelectorState>(
           selector: (_, appState, config) => ApplicationSelectorState(
-            locale: config.locale,
-            themeMode: config.themeMode,
-            primaryColor: config.primaryColor,
-            prueBlack: config.prueBlack,
+            locale: config.appSetting.locale,
+            themeMode: config.themeProps.themeMode,
+            primaryColor: config.themeProps.primaryColor,
+            prueBlack: config.themeProps.prueBlack,
+            fontFamily: config.themeProps.fontFamily,
           ),
           builder: (_, state, child) {
             return DynamicColorBuilder(
               builder: (lightDynamic, darkDynamic) {
                 _updateSystemColorSchemes(lightDynamic, darkDynamic);
                 return MaterialApp(
-                  debugShowCheckedModeBanner: false,
                   navigatorKey: globalState.navigatorKey,
                   localizationsDelegates: const [
                     AppLocalizations.delegate,
@@ -158,7 +198,18 @@ class ApplicationState extends State<Application> {
                     GlobalWidgetsLocalizations.delegate
                   ],
                   builder: (_, child) {
-                    return _buildApp(child!);
+                    return MessageManager(
+                      child: LayoutBuilder(
+                        builder: (_, container) {
+                          final appController = globalState.appController;
+                          final maxWidth = container.maxWidth;
+                          if (appController.appState.viewWidth != maxWidth) {
+                            globalState.appController.updateViewWidth(maxWidth);
+                          }
+                          return _buildPage(child!);
+                        },
+                      ),
+                    );
                   },
                   scrollBehavior: BaseScrollBehavior(),
                   title: appName,
@@ -167,6 +218,7 @@ class ApplicationState extends State<Application> {
                   themeMode: state.themeMode,
                   theme: ThemeData(
                     useMaterial3: true,
+                    fontFamily: state.fontFamily.value,
                     pageTransitionsTheme: _pageTransitionsTheme,
                     colorScheme: _getAppColorScheme(
                       brightness: Brightness.light,
@@ -176,6 +228,7 @@ class ApplicationState extends State<Application> {
                   ),
                   darkTheme: ThemeData(
                     useMaterial3: true,
+                    fontFamily: state.fontFamily.value,
                     pageTransitionsTheme: _pageTransitionsTheme,
                     colorScheme: _getAppColorScheme(
                       brightness: Brightness.dark,
@@ -197,7 +250,11 @@ class ApplicationState extends State<Application> {
   @override
   Future<void> dispose() async {
     linkManager.destroy();
+    _autoUpdateGroupTaskTimer?.cancel();
+    _autoUpdateProfilesTaskTimer?.cancel();
+    await clashService?.destroy();
     await globalState.appController.savePreferences();
+    await globalState.appController.handleExit();
     super.dispose();
   }
 }

lib/clash/clash.dart

@@ -1,3 +1,4 @@
 export 'core.dart';
+export 'lib.dart';
+export 'message.dart';
 export 'service.dart';
-export 'message.dart';

lib/clash/core.dart

@@ -1,41 +1,26 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:ffi/ffi.dart';
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'generated/clash_ffi.dart';
+import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
 class ClashCore {
   static ClashCore? _instance;
-  static final receiver = ReceivePort();
-
-  late final ClashFFI clashFFI;
-  late final DynamicLibrary lib;
-
-  DynamicLibrary _getClashLib() {
-    if (Platform.isWindows) {
-      return DynamicLibrary.open("libclash.dll");
-    }
-    if (Platform.isMacOS) {
-      return DynamicLibrary.open("libclash.dylib");
-    }
-    if (Platform.isAndroid || Platform.isLinux) {
-      return DynamicLibrary.open("libclash.so");
-    }
-    throw "Platform is not supported";
-  }
+  late ClashInterface clashInterface;
 
   ClashCore._internal() {
-    lib = _getClashLib();
-    clashFFI = ClashFFI(lib);
-    clashFFI.initNativeApiBridge(
-      NativeApi.initializeApiDLData,
-    );
+    if (Platform.isAndroid) {
+      clashInterface = clashLib!;
+    } else {
+      clashInterface = clashService!;
+    }
   }
 
   factory ClashCore() {
@@ -43,83 +28,62 @@ class ClashCore {
     return _instance!;
   }
 
-  bool init(String homeDir) {
-    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
-    final isInit = clashFFI.initClash(homeDirChar) == 1;
-    malloc.free(homeDirChar);
-    return isInit;
-  }
-
-  shutdown() {
-    clashFFI.shutdownClash();
-    lib.close();
-  }
-
-  bool get isInit => clashFFI.getIsInit() == 1;
-
-  Future<String> validateConfig(String data) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
+  Future<void> _initGeo() async {
+    final homePath = await appPath.getHomeDirPath();
+    final homeDir = Directory(homePath);
+    final isExists = await homeDir.exists();
+    if (!isExists) {
+      await homeDir.create(recursive: true);
+    }
+    const geoFileNameList = [
+      mmdbFileName,
+      geoIpFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
+    try {
+      for (final geoFileName in geoFileNameList) {
+        final geoFile = File(
+          join(homePath, geoFileName),
+        );
+        final isExists = await geoFile.exists();
+        if (isExists) {
+          continue;
+        }
+        final data = await rootBundle.load('assets/data/$geoFileName');
+        List<int> bytes = data.buffer.asUint8List();
+        await geoFile.writeAsBytes(bytes, flush: true);
       }
-    });
-    final dataChar = data.toNativeUtf8().cast<Char>();
-    clashFFI.validateConfig(
-      dataChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(dataChar);
-    return completer.future;
+    } catch (e) {
+      exit(0);
+    }
   }
 
-  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final params = json.encode(updateConfigParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    clashFFI.updateConfig(
-      paramsChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(paramsChar);
-    return completer.future;
+  Future<bool> init({
+    required ClashConfig clashConfig,
+    required Config config,
+  }) async {
+    await _initGeo();
+    final homeDirPath = await appPath.getHomeDirPath();
+    return await clashInterface.init(homeDirPath);
   }
 
-  initMessage() {
-    clashFFI.initMessage(
-      receiver.sendPort.nativePort,
-    );
+  shutdown() async {
+    await clashInterface.shutdown();
   }
 
-  setProfileName(String profileName) {
-    final profileNameChar = profileName.toNativeUtf8().cast<Char>();
-    clashFFI.setCurrentProfileName(
-      profileNameChar,
-    );
-    malloc.free(profileNameChar);
+  FutureOr<bool> get isInit => clashInterface.isInit;
+
+  FutureOr<String> validateConfig(String data) {
+    return clashInterface.validateConfig(data);
   }
 
-  getProfileName() {
-    final currentProfileNameRaw = clashFFI.getCurrentProfileName();
-    final currentProfileName =
-        currentProfileNameRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(currentProfileNameRaw);
-    return currentProfileName;
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
+    return await clashInterface.updateConfig(updateConfigParams);
   }
 
-  Future<List<Group>> getProxiesGroups() {
-    final proxiesRaw = clashFFI.getProxies();
-    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(proxiesRaw);
+  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;
@@ -149,187 +113,128 @@ class ClashCore {
     });
   }
 
-  Future<List<ExternalProvider>> getExternalProviders() {
-    final externalProvidersRaw = clashFFI.getExternalProviders();
-    final externalProvidersRawString =
-        externalProvidersRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProvidersRaw);
-    return Isolate.run<List<ExternalProvider>>(() {
-      final externalProviders =
-          (json.decode(externalProvidersRawString) as List<dynamic>)
-              .map(
-                (item) => ExternalProvider.fromJson(item),
-              )
-              .toList();
-      return externalProviders;
-    });
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) async {
+    return await clashInterface.changeProxy(changeProxyParams);
   }
 
-  Future<String> updateExternalProvider({
-    required String providerName,
-    required String providerType,
-  }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
-    clashFFI.updateExternalProvider(
-      providerNameChar,
-      providerTypeChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(providerNameChar);
-    malloc.free(providerTypeChar);
-    return completer.future;
-  }
-
-  changeProxy(ChangeProxyParams changeProxyParams) {
-    final params = json.encode(changeProxyParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    clashFFI.changeProxy(paramsChar);
-    malloc.free(paramsChar);
-  }
-
-  Future<Delay> getDelay(String proxyName) {
-    final delayParams = {
-      "proxy-name": proxyName,
-      "timeout": httpTimeoutDuration.inMilliseconds,
-    };
-    final completer = Completer<Delay>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(Delay.fromJson(json.decode(message)));
-        receiver.close();
-      }
-    });
-    final delayParamsChar =
-        json.encode(delayParams).toNativeUtf8().cast<Char>();
-    clashFFI.asyncTestDelay(
-      delayParamsChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(delayParamsChar);
-    Future.delayed(httpTimeoutDuration + moreDuration, () {
-      receiver.close();
-      if (!completer.isCompleted) {
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
-    });
-    return completer.future;
-  }
-
-  clearEffect(String path) {
-    final pathChar = path.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(pathChar);
-    malloc.free(pathChar);
-  }
-
-  VersionInfo getVersionInfo() {
-    final versionInfoRaw = clashFFI.getVersionInfo();
-    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(versionInfoRaw);
-    return VersionInfo.fromJson(versionInfo);
-  }
-
-  setState(CoreState state) {
-    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
-    clashFFI.setState(stateChar);
-    malloc.free(stateChar);
-  }
-
-  CoreState getState() {
-    final stateRaw = clashFFI.getState();
-    final state = json.decode(
-      stateRaw.cast<Utf8>().toDartString(),
-    );
-    clashFFI.freeCString(stateRaw);
-    return CoreState.fromJson(state);
-  }
-
-  Traffic getTraffic() {
-    final trafficRaw = clashFFI.getTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  Traffic getTotalTraffic() {
-    final trafficRaw = clashFFI.getTotalTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  void resetTraffic() {
-    clashFFI.resetTraffic();
-  }
-
-  void startLog() {
-    clashFFI.startLog();
-  }
-
-  stopLog() {
-    clashFFI.stopLog();
-  }
-
-  startTun(int fd, int port) {
-    if (!Platform.isAndroid) return;
-    clashFFI.startTUN(fd, port);
-  }
-
-  requestGc() {
-    clashFFI.forceGc();
-  }
-
-  void stopTun() {
-    clashFFI.stopTun();
-  }
-
-  void setProcessMap(ProcessMapItem processMapItem) {
-    final processMapItemChar =
-        json.encode(processMapItem).toNativeUtf8().cast<Char>();
-    clashFFI.setProcessMap(processMapItemChar);
-    malloc.free(processMapItemChar);
-  }
-
-  void setFdMap(int fd) {
-    clashFFI.setFdMap(fd);
-  }
-
-  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));
-  }
-
-  List<Connection> getConnections() {
-    final connectionsDataRaw = clashFFI.getConnections();
-    final connectionsData =
-        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
-    clashFFI.freeCString(connectionsDataRaw);
+  Future<List<Connection>> 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();
   }
 
   closeConnection(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.closeConnection(idChar);
-    malloc.free(idChar);
+    clashInterface.closeConnection(id);
   }
 
   closeConnections() {
-    clashFFI.closeConnections();
+    clashInterface.closeConnections();
+  }
+
+  Future<List<ExternalProvider>> getExternalProviders() async {
+    final externalProvidersRawString =
+        await clashInterface.getExternalProviders();
+    return Isolate.run<List<ExternalProvider>>(
+      () {
+        final externalProviders =
+            (json.decode(externalProvidersRawString) as List<dynamic>)
+                .map(
+                  (item) => ExternalProvider.fromJson(item),
+                )
+                .toList();
+        return externalProviders;
+      },
+    );
+  }
+
+  Future<ExternalProvider?> getExternalProvider(
+      String externalProviderName) async {
+    final externalProvidersRawString =
+        await clashInterface.getExternalProvider(externalProviderName);
+    if (externalProvidersRawString == null) {
+      return null;
+    }
+    if (externalProvidersRawString.isEmpty) {
+      return null;
+    }
+    return ExternalProvider.fromJson(json.decode(externalProvidersRawString));
+  }
+
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    return clashInterface.updateGeoData(geoType: geoType, geoName: geoName);
+  }
+
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  }) {
+    return clashInterface.sideLoadExternalProvider(
+        providerName: providerName, data: data);
+  }
+
+  Future<String> updateExternalProvider({
+    required String providerName,
+  }) async {
+    return clashInterface.updateExternalProvider(providerName);
+  }
+
+  startListener() async {
+    await clashInterface.startListener();
+  }
+
+  stopListener() async {
+    await clashInterface.stopListener();
+  }
+
+  Future<Delay> getDelay(String proxyName) async {
+    final data = await clashInterface.asyncTestDelay(proxyName);
+    return Delay.fromJson(json.decode(data));
+  }
+
+  Future<Traffic> getTraffic(bool value) async {
+    final trafficString = await clashInterface.getTraffic(value);
+    return Traffic.fromMap(json.decode(trafficString));
+  }
+
+  Future<IpInfo?> getCountryCode(String ip) async {
+    final countryCode = await clashInterface.getCountryCode(ip);
+    if (countryCode.isEmpty) {
+      return null;
+    }
+    return IpInfo(
+      ip: ip,
+      countryCode: countryCode,
+    );
+  }
+
+  Future<Traffic> getTotalTraffic(bool value) async {
+    final totalTrafficString = await clashInterface.getTotalTraffic(value);
+    return Traffic.fromMap(json.decode(totalTrafficString));
+  }
+
+  Future<int> getMemory() async {
+    final value = await clashInterface.getMemory();
+    return int.parse(value);
+  }
+
+  resetTraffic() {
+    clashInterface.resetTraffic();
+  }
+
+  startLog() {
+    clashInterface.startLog();
+  }
+
+  stopLog() {
+    clashInterface.stopLog();
+  }
+
+  requestGc() {
+    clashInterface.forceGc();
   }
 }
 

lib/clash/interface.dart

@@ -0,0 +1,63 @@
+import 'dart:async';
+
+import 'package:fl_clash/models/models.dart';
+
+mixin ClashInterface {
+  FutureOr<bool> init(String homeDir);
+
+  FutureOr<void> shutdown();
+
+  FutureOr<bool> get isInit;
+
+  forceGc();
+
+  FutureOr<String> validateConfig(String data);
+
+  Future<String> asyncTestDelay(String proxyName);
+
+  FutureOr<String> updateConfig(UpdateConfigParams updateConfigParams);
+
+  FutureOr<String> getProxies();
+
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams);
+
+  Future<bool> startListener();
+
+  Future<bool> stopListener();
+
+  FutureOr<String> getExternalProviders();
+
+  FutureOr<String>? getExternalProvider(String externalProviderName);
+
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  });
+
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  });
+
+  Future<String> updateExternalProvider(String providerName);
+
+  FutureOr<String> getTraffic(bool value);
+
+  FutureOr<String> getTotalTraffic(bool value);
+
+  FutureOr<String> getCountryCode(String ip);
+
+  FutureOr<String> getMemory();
+
+  resetTraffic();
+
+  startLog();
+
+  stopLog();
+
+  FutureOr<String> getConnections();
+
+  FutureOr<bool> closeConnection(String id);
+
+  FutureOr<bool> closeConnections();
+}

lib/clash/lib.dart

@@ -0,0 +1,400 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:io';
+import 'dart:isolate';
+
+import 'package:ffi/ffi.dart';
+import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/models/models.dart';
+
+import 'generated/clash_ffi.dart';
+import 'interface.dart';
+
+class ClashLib with ClashInterface {
+  static ClashLib? _instance;
+  final receiver = ReceivePort();
+
+  late final ClashFFI clashFFI;
+
+  late final DynamicLibrary lib;
+
+  ClashLib._internal() {
+    lib = DynamicLibrary.open("libclash.so");
+    clashFFI = ClashFFI(lib);
+    clashFFI.initNativeApiBridge(
+      NativeApi.initializeApiDLData,
+    );
+  }
+
+  factory ClashLib() {
+    _instance ??= ClashLib._internal();
+    return _instance!;
+  }
+
+  initMessage() {
+    clashFFI.initMessage(
+      receiver.sendPort.nativePort,
+    );
+  }
+
+  @override
+  bool init(String homeDir) {
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    return isInit;
+  }
+
+  @override
+  shutdown() async {
+    clashFFI.shutdownClash();
+    lib.close();
+  }
+
+  @override
+  bool get isInit => clashFFI.getIsInit() == 1;
+
+  @override
+  Future<String> validateConfig(String data) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.validateConfig(
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(dataChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.updateConfig(
+      paramsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(paramsChar);
+    return completer.future;
+  }
+
+  @override
+  String getProxies() {
+    final proxiesRaw = clashFFI.getProxies();
+    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
+    return proxiesRawString;
+  }
+
+  @override
+  String getExternalProviders() {
+    final externalProvidersRaw = clashFFI.getExternalProviders();
+    final externalProvidersRawString =
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
+    return externalProvidersRawString;
+  }
+
+  @override
+  String getExternalProvider(String externalProviderName) {
+    final externalProviderNameChar =
+        externalProviderName.toNativeUtf8().cast<Char>();
+    final externalProviderRaw =
+        clashFFI.getExternalProvider(externalProviderNameChar);
+    malloc.free(externalProviderNameChar);
+    final externalProviderRawString =
+        externalProviderRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProviderRaw);
+    return externalProviderRawString;
+  }
+
+  @override
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final geoTypeChar = geoType.toNativeUtf8().cast<Char>();
+    final geoNameChar = geoName.toNativeUtf8().cast<Char>();
+    clashFFI.updateGeoData(
+      geoTypeChar,
+      geoNameChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(geoTypeChar);
+    malloc.free(geoNameChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.sideLoadExternalProvider(
+      providerNameChar,
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    malloc.free(dataChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> updateExternalProvider(String providerName) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    clashFFI.updateExternalProvider(
+      providerNameChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> changeProxy(ChangeProxyParams changeProxyParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final params = json.encode(changeProxyParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.changeProxy(
+      paramsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(paramsChar);
+    return completer.future;
+  }
+
+  @override
+  String getConnections() {
+    final connectionsDataRaw = clashFFI.getConnections();
+    final connectionsString = connectionsDataRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(connectionsDataRaw);
+    return connectionsString;
+  }
+
+  @override
+  closeConnection(String id) {
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
+    return true;
+  }
+
+  @override
+  closeConnections() {
+    clashFFI.closeConnections();
+    return true;
+  }
+
+  @override
+  startListener() async {
+    clashFFI.startListener();
+    return true;
+  }
+
+  @override
+  stopListener() async {
+    clashFFI.stopListener();
+    return true;
+  }
+
+  @override
+  Future<String> asyncTestDelay(String proxyName) {
+    final delayParams = {
+      "proxy-name": proxyName,
+      "timeout": httpTimeoutDuration.inMilliseconds,
+    };
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final delayParamsChar =
+        json.encode(delayParams).toNativeUtf8().cast<Char>();
+    clashFFI.asyncTestDelay(
+      delayParamsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(delayParamsChar);
+    return completer.future;
+  }
+
+  @override
+  String getTraffic(bool value) {
+    final trafficRaw = clashFFI.getTraffic(value ? 1 : 0);
+    final trafficString = trafficRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(trafficRaw);
+    return trafficString;
+  }
+
+  @override
+  String getTotalTraffic(bool value) {
+    final trafficRaw = clashFFI.getTotalTraffic(value ? 1 : 0);
+    clashFFI.freeCString(trafficRaw);
+    return trafficRaw.cast<Utf8>().toDartString();
+  }
+
+  @override
+  void resetTraffic() {
+    clashFFI.resetTraffic();
+  }
+
+  @override
+  void startLog() {
+    clashFFI.startLog();
+  }
+
+  @override
+  stopLog() {
+    clashFFI.stopLog();
+  }
+
+  @override
+  forceGc() {
+    clashFFI.forceGc();
+  }
+
+  @override
+  FutureOr<String> getCountryCode(String ip) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final ipChar = ip.toNativeUtf8().cast<Char>();
+    clashFFI.getCountryCode(
+      ipChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(ipChar);
+    return completer.future;
+  }
+
+  @override
+  FutureOr<String> getMemory() {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    clashFFI.getMemory(receiver.sendPort.nativePort);
+    return completer.future;
+  }
+
+  /// Android
+
+  startTun(int fd, int port) {
+    if (!Platform.isAndroid) return;
+    clashFFI.startTUN(fd, port);
+  }
+
+  stopTun() {
+    clashFFI.stopTun();
+  }
+
+  updateDns(String dns) {
+    if (!Platform.isAndroid) return;
+    final dnsChar = dns.toNativeUtf8().cast<Char>();
+    clashFFI.updateDns(dnsChar);
+    malloc.free(dnsChar);
+  }
+
+  setProcessMap(ProcessMapItem processMapItem) {
+    final processMapItemChar =
+        json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
+  }
+
+  setState(CoreState state) {
+    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
+    clashFFI.setState(stateChar);
+    malloc.free(stateChar);
+  }
+
+  String getCurrentProfileName() {
+    final currentProfileRaw = clashFFI.getCurrentProfileName();
+    final currentProfile = currentProfileRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(currentProfileRaw);
+    return currentProfile;
+  }
+
+  AndroidVpnOptions getAndroidVpnOptions() {
+    final vpnOptionsRaw = clashFFI.getAndroidVpnOptions();
+    final vpnOptions = json.decode(vpnOptionsRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(vpnOptionsRaw);
+    return AndroidVpnOptions.fromJson(vpnOptions);
+  }
+
+  setFdMap(int fd) {
+    clashFFI.setFdMap(fd);
+  }
+
+  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));
+  }
+}
+
+final clashLib = Platform.isAndroid ? ClashLib() : null;

lib/clash/message.dart

@@ -1,42 +1,40 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/foundation.dart';
 
-import 'core.dart';
-
 class ClashMessage {
-  StreamSubscription? subscription;
+  final controller = StreamController();
 
   ClashMessage._() {
-    if (subscription != null) {
-      subscription!.cancel();
-      subscription = null;
-    }
-    subscription = ClashCore.receiver.listen((message) {
-      final m = AppMessage.fromJson(json.decode(message));
-      for (final AppMessageListener listener in _listeners) {
-        switch (m.type) {
-          case AppMessageType.log:
-            listener.onLog(Log.fromJson(m.data));
-            break;
-          case AppMessageType.delay:
-            listener.onDelay(Delay.fromJson(m.data));
-            break;
-          case AppMessageType.request:
-            listener.onRequest(Connection.fromJson(m.data));
-            break;
-          case AppMessageType.started:
-            listener.onStarted(m.data);
-            break;
-          case AppMessageType.loaded:
-            listener.onLoaded(m.data);
-            break;
+    clashLib?.receiver.listen(controller.add);
+    controller.stream.listen(
+      (message) {
+        final m = AppMessage.fromJson(json.decode(message));
+        for (final AppMessageListener listener in _listeners) {
+          switch (m.type) {
+            case AppMessageType.log:
+              listener.onLog(Log.fromJson(m.data));
+              break;
+            case AppMessageType.delay:
+              listener.onDelay(Delay.fromJson(m.data));
+              break;
+            case AppMessageType.request:
+              listener.onRequest(Connection.fromJson(m.data));
+              break;
+            case AppMessageType.started:
+              listener.onStarted(m.data);
+              break;
+            case AppMessageType.loaded:
+              listener.onLoaded(m.data);
+              break;
+          }
         }
-      }
-    });
+      },
+    );
   }
 
   static final ClashMessage instance = ClashMessage._();

lib/clash/service.dart

@@ -1,54 +1,439 @@
+import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/services.dart';
-import 'package:path/path.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/core.dart';
 
-import 'core.dart';
+class ClashService with ClashInterface {
+  static ClashService? _instance;
 
-class ClashService {
-  Future<void> initGeo() async {
-    final homePath = await appPath.getHomeDirPath();
-    final homeDir = Directory(homePath);
-    final isExists = await homeDir.exists();
-    if (!isExists) {
-      await homeDir.create(recursive: true);
-    }
-    const geoFileNameList = [
-      mmdbFileName,
-      geoIpFileName,
-      geoSiteFileName,
-      asnFileName,
-    ];
-    try {
-      for (final geoFileName in geoFileNameList) {
-        final geoFile = File(
-          join(homePath, geoFileName),
-        );
-        final isExists = await geoFile.exists();
-        if (isExists) {
-          continue;
-        }
-        final data = await rootBundle.load('assets/data/$geoFileName');
-        List<int> bytes = data.buffer.asUint8List();
-        await geoFile.writeAsBytes(bytes, flush: true);
-      }
-    } catch (e) {
-      debugPrint("$e");
-      exit(0);
+  Completer<ServerSocket> serverCompleter = Completer();
+
+  Completer<Socket> socketCompleter = Completer();
+
+  Map<String, Completer> callbackCompleterMap = {};
+
+  Process? process;
+
+  factory ClashService() {
+    _instance ??= ClashService._internal();
+    return _instance!;
+  }
+
+  ClashService._internal() {
+    _createServer();
+    startCore();
+  }
+
+  _createServer() async {
+    final address = !Platform.isWindows
+        ? InternetAddress(
+            unixSocketPath,
+            type: InternetAddressType.unix,
+          )
+        : InternetAddress(
+            localhost,
+            type: InternetAddressType.IPv4,
+          );
+    await _deleteSocketFile();
+    final server = await ServerSocket.bind(
+      address,
+      0,
+      shared: true,
+    );
+    serverCompleter.complete(server);
+    await for (final socket in server) {
+      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(LineSplitter())
+          .listen(
+            (data) {
+              _handleAction(
+                Action.fromJson(
+                  json.decode(data.trim()),
+                ),
+              );
+            },
+          );
     }
   }
 
-  Future<bool> init({
-    required ClashConfig clashConfig,
-    required Config config,
+  startCore() async {
+    if (process != null) {
+      await shutdown();
+    }
+    final serverSocket = await serverCompleter.future;
+    final arg = Platform.isWindows
+        ? "${serverSocket.port}"
+        : serverSocket.address.address;
+    bool isSuccess = false;
+    if (Platform.isWindows && await system.checkIsAdmin()) {
+      isSuccess = await request.startCoreByHelper(arg);
+    }
+    if (isSuccess) {
+      return;
+    }
+    process = await Process.start(
+      appPath.corePath,
+      [
+        arg,
+      ],
+    );
+    process!.stdout.listen((_) {});
+  }
+
+  _deleteSocketFile() async {
+    if (!Platform.isWindows) {
+      final file = File(unixSocketPath);
+      if (await file.exists()) {
+        await file.delete();
+      }
+    }
+  }
+
+  _destroySocket() async {
+    if (socketCompleter.isCompleted) {
+      final lastSocket = await socketCompleter.future;
+      await lastSocket.close();
+      socketCompleter = Completer();
+    }
+  }
+
+  _handleAction(Action action) {
+    final completer = callbackCompleterMap[action.id];
+    switch (action.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:
+        completer?.complete(action.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(action.data as String);
+        return;
+      case ActionMethod.message:
+        clashMessage.controller.add(action.data as String);
+        return;
+      case ActionMethod.forceGc:
+      case ActionMethod.startLog:
+      case ActionMethod.stopLog:
+        return;
+    }
+  }
+
+  Future<T> _invoke<T>({
+    required ActionMethod method,
+    dynamic data,
+    Duration? timeout,
+    FutureOr<T> Function()? onTimeout,
   }) async {
-    await initGeo();
-    final homeDirPath = await appPath.getHomeDirPath();
-    final isInit = clashCore.init(homeDirPath);
-    return isInit;
+    final id = "${method.name}#${other.id}";
+    final socket = await socketCompleter.future;
+    callbackCompleterMap[id] = Completer<T>();
+    socket.writeln(
+      json.encode(
+        Action(
+          id: id,
+          method: method,
+          data: data,
+        ),
+      ),
+    );
+    return (callbackCompleterMap[id] as Completer<T>).safeFuture(
+      timeout: timeout,
+      onLast: () {
+        callbackCompleterMap.remove(id);
+      },
+      onTimeout: onTimeout ??
+          () {
+            if (T is String) {
+              return "" as T;
+            }
+            if (T is bool) {
+              return false as T;
+            }
+            return null as T;
+          },
+      functionName: id,
+    );
+  }
+
+  _prueInvoke({
+    required ActionMethod method,
+    dynamic data,
+  }) async {
+    final id = "${method.name}#${other.id}";
+    final socket = await socketCompleter.future;
+    socket.writeln(
+      json.encode(
+        Action(
+          id: id,
+          method: method,
+          data: data,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Future<bool> init(String homeDir) {
+    return _invoke<bool>(
+      method: ActionMethod.initClash,
+      data: homeDir,
+    );
+  }
+
+  @override
+  shutdown() async {
+    await _invoke<bool>(
+      method: ActionMethod.shutdown,
+    );
+    if (Platform.isWindows) {
+      await request.stopCoreByHelper();
+    }
+    await _destroySocket();
+    process?.kill();
+    process = null;
+  }
+
+  @override
+  Future<bool> get isInit {
+    return _invoke<bool>(
+      method: ActionMethod.getIsInit,
+    );
+  }
+
+  @override
+  forceGc() {
+    _prueInvoke(method: ActionMethod.forceGc);
+  }
+
+  @override
+  FutureOr<String> validateConfig(String data) {
+    return _invoke<String>(
+      method: ActionMethod.validateConfig,
+      data: data,
+    );
+  }
+
+  @override
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
+    return await _invoke<String>(
+      method: ActionMethod.updateConfig,
+      data: json.encode(updateConfigParams),
+      timeout: const Duration(seconds: 20),
+    );
+  }
+
+  @override
+  Future<String> getProxies() {
+    return _invoke<String>(
+      method: ActionMethod.getProxies,
+    );
+  }
+
+  @override
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) {
+    return _invoke<String>(
+      method: ActionMethod.changeProxy,
+      data: json.encode(changeProxyParams),
+    );
+  }
+
+  @override
+  FutureOr<String> getExternalProviders() {
+    return _invoke<String>(
+      method: ActionMethod.getExternalProviders,
+    );
+  }
+
+  @override
+  FutureOr<String> getExternalProvider(String externalProviderName) {
+    return _invoke<String>(
+      method: ActionMethod.getExternalProvider,
+      data: externalProviderName,
+    );
+  }
+
+  @override
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    return _invoke<String>(
+      method: ActionMethod.updateGeoData,
+      data: json.encode(
+        {
+          "geoType": geoType,
+          "geoName": geoName,
+        },
+      ),
+    );
+  }
+
+  @override
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  }) {
+    return _invoke<String>(
+      method: ActionMethod.sideLoadExternalProvider,
+      data: json.encode({
+        "providerName": providerName,
+        "data": data,
+      }),
+    );
+  }
+
+  @override
+  Future<String> updateExternalProvider(String providerName) {
+    return _invoke<String>(
+      method: ActionMethod.updateExternalProvider,
+      data: providerName,
+    );
+  }
+
+  @override
+  FutureOr<String> getConnections() {
+    return _invoke<String>(
+      method: ActionMethod.getConnections,
+    );
+  }
+
+  @override
+  Future<bool> closeConnections() {
+    return _invoke<bool>(
+      method: ActionMethod.closeConnections,
+    );
+  }
+
+  @override
+  Future<bool> closeConnection(String id) {
+    return _invoke<bool>(
+      method: ActionMethod.closeConnection,
+      data: id,
+    );
+  }
+
+  @override
+  FutureOr<String> getTotalTraffic(bool value) {
+    return _invoke<String>(
+      method: ActionMethod.getTotalTraffic,
+      data: value,
+    );
+  }
+
+  @override
+  FutureOr<String> getTraffic(bool value) {
+    return _invoke<String>(
+      method: ActionMethod.getTraffic,
+      data: value,
+    );
+  }
+
+  @override
+  resetTraffic() {
+    _prueInvoke(method: ActionMethod.resetTraffic);
+  }
+
+  @override
+  startLog() {
+    _prueInvoke(method: ActionMethod.startLog);
+  }
+
+  @override
+  stopLog() {
+    _prueInvoke(method: ActionMethod.stopLog);
+  }
+
+  @override
+  Future<bool> startListener() {
+    return _invoke<bool>(
+      method: ActionMethod.startListener,
+    );
+  }
+
+  @override
+  stopListener() {
+    return _invoke<bool>(
+      method: ActionMethod.stopListener,
+    );
+  }
+
+  @override
+  Future<String> asyncTestDelay(String proxyName) {
+    final delayParams = {
+      "proxy-name": proxyName,
+      "timeout": httpTimeoutDuration.inMilliseconds,
+    };
+    return _invoke<String>(
+      method: ActionMethod.asyncTestDelay,
+      data: json.encode(delayParams),
+      timeout: Duration(
+        milliseconds: 6000,
+      ),
+      onTimeout: () {
+        return json.encode(
+          Delay(
+            name: proxyName,
+            value: -1,
+          ),
+        );
+      },
+    );
+  }
+
+  destroy() async {
+    final server = await serverCompleter.future;
+    await server.close();
+    await _deleteSocketFile();
+  }
+
+  @override
+  FutureOr<String> getCountryCode(String ip) {
+    return _invoke<String>(
+      method: ActionMethod.getCountryCode,
+      data: ip,
+    );
+  }
+
+  @override
+  FutureOr<String> getMemory() {
+    return _invoke<String>(
+      method: ActionMethod.getMemory,
+    );
   }
 }
 
-final clashService = ClashService();
+final clashService = system.isDesktop ? ClashService() : null;

lib/common/android.dart

@@ -1,10 +1,13 @@
 import 'dart:io';
 
 import 'package:fl_clash/plugins/app.dart';
+import 'package:fl_clash/state.dart';
 
 class Android {
   init() async {
-    app?.onExit = () {};
+    app?.onExit = () async {
+      await globalState.appController.savePreferences();
+    };
   }
 }
 

lib/common/archive.dart

@@ -0,0 +1,28 @@
+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) {
+    final dir = Directory(dirPath);
+    final entities = dir.listSync(recursive: false);
+    for (final entity in entities) {
+      final relativePath = relative(entity.path, from: parentPath);
+      if (entity is File) {
+        final data = entity.readAsBytesSync();
+        final archiveFile = ArchiveFile(relativePath, data.length, data);
+        addFile(archiveFile);
+      } else if (entity is Directory) {
+        addDirectoryToArchive(entity.path, parentPath);
+      }
+    }
+  }
+
+  add<T>(String name, T raw) {
+    final data = json.encode(raw);
+    addFile(
+      ArchiveFile(name, data.length, data),
+    );
+  }
+}

lib/common/color.dart

@@ -1,28 +1,62 @@
 import 'package:flutter/material.dart';
 
 extension ColorExtension on Color {
-  toLight() {
+
+  Color get toLight {
+    return withOpacity(0.8);
+  }
+
+  Color get toLighter {
     return withOpacity(0.6);
   }
 
-  toLighter() {
-    return withOpacity(0.4);
-  }
-
-  toSoft() {
+  Color get toSoft {
     return withOpacity(0.12);
   }
 
-  toLittle() {
+  Color get toLittle {
     return withOpacity(0.03);
   }
+
+  Color darken([double amount = .1]) {
+    assert(amount >= 0 && amount <= 1);
+    final hsl = HSLColor.fromColor(this);
+    final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
+    return hslDark.toColor();
+  }
+
+  Color blendDarken(
+    BuildContext context, {
+    double factor = 0.1,
+  }) {
+    final brightness = Theme.of(context).brightness;
+    return Color.lerp(
+      this,
+      brightness == Brightness.dark ? Colors.white : Colors.black,
+      factor,
+    )!;
+  }
+
+  Color blendLighten(
+    BuildContext context, {
+    double factor = 0.1,
+  }) {
+    final brightness = Theme.of(context).brightness;
+    return Color.lerp(
+      this,
+      brightness == Brightness.dark ? Colors.black : Colors.white,
+      factor,
+    )!;
+  }
 }
 
 extension ColorSchemeExtension on ColorScheme {
   ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
       ? copyWith(
           surface: Colors.black,
-          background: Colors.black,
+          surfaceContainer: surfaceContainer.darken(
+            0.05,
+          ),
         )
       : this;
 }

lib/common/common.dart

@@ -1,28 +1,36 @@
-export 'path.dart';
-export 'request.dart';
-export 'preferences.dart';
-export 'constant.dart';
-export 'proxy.dart';
-export 'other.dart';
-export 'num.dart';
-export 'navigation.dart';
-export 'window.dart';
-export 'system.dart';
-export 'picker.dart';
 export 'android.dart';
-export 'launch.dart';
-export 'protocol.dart';
-export 'datetime.dart';
-export 'context.dart';
-export 'link.dart';
-export 'text.dart';
-export 'color.dart';
-export 'list.dart';
-export 'string.dart';
 export 'app_localizations.dart';
+export 'color.dart';
+export 'constant.dart';
+export 'context.dart';
+export 'datetime.dart';
 export 'function.dart';
-export 'package.dart';
-export 'measure.dart';
-export 'service.dart';
+export 'future.dart';
+export 'http.dart';
+export 'icons.dart';
 export 'iterable.dart';
-export 'scroll.dart';
+export 'keyboard.dart';
+export 'launch.dart';
+export 'link.dart';
+export 'list.dart';
+export 'lock.dart';
+export 'measure.dart';
+export 'navigation.dart';
+export 'navigator.dart';
+export 'network.dart';
+export 'num.dart';
+export 'other.dart';
+export 'package.dart';
+export 'path.dart';
+export 'picker.dart';
+export 'preferences.dart';
+export 'protocol.dart';
+export 'proxy.dart';
+export 'request.dart';
+export 'scroll.dart';
+export 'string.dart';
+export 'system.dart';
+export 'text.dart';
+export 'tray.dart';
+export 'window.dart';
+export 'windows.dart';

lib/common/constant.dart

@@ -1,30 +1,45 @@
 import 'dart:io';
+import 'dart:math';
 import 'dart:ui';
 
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/clash_config.dart';
+import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
-import 'system.dart';
 
 const appName = "FlClash";
+const appHelperService = "FlClashHelperService";
 const coreName = "clash.meta";
 const packageName = "com.follow.clash";
+final unixSocketPath = "/tmp/FlClashSocket_${Random().nextInt(10000)}.sock";
+const helperPort = 47890;
+const helperTag = "2024125";
+const baseInfoEdgeInsets = EdgeInsets.symmetric(
+  vertical: 16,
+  horizontal: 16,
+);
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
+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";
-final double kHeaderHeight = system.isDesktop ? (Platform.isMacOS ? 28 : 40) : 0;
+final double kHeaderHeight = system.isDesktop
+    ? !Platform.isMacOS
+        ? 40
+        : 28
+    : 0;
 const GeoXMap defaultGeoXMap = {
   "mmdb":
       "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
   "asn":
-      "https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb",
   "geoip":
-      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat",
   "geosite":
       "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
 };
@@ -47,6 +62,21 @@ final filter = ImageFilter.blur(
   tileMode: TileMode.mirror,
 );
 
+const navigationItemListEquality = ListEquality<NavigationItem>();
+const connectionListEquality = ListEquality<Connection>();
+const stringListEquality = ListEquality<String>();
+const logListEquality = ListEquality<Log>();
+const groupListEquality = ListEquality<Group>();
+const externalProviderListEquality = ListEquality<ExternalProvider>();
+const packageListEquality = ListEquality<Package>();
+const hotKeyActionListEquality = ListEquality<HotKeyAction>();
+const stringAndStringMapEquality = MapEquality<String, String>();
+const stringAndStringMapEntryIterableEquality =
+    IterableEquality<MapEntry<String, String>>();
+const stringAndIntQMapEquality = MapEquality<String, int?>();
+const stringSetEquality = SetEquality<String>();
+const keyboardModifierListEquality = SetEquality<KeyboardModifier>();
+
 const viewModeColumnsMap = {
   ViewMode.mobile: [2, 1],
   ViewMode.laptop: [3, 2],
@@ -54,3 +84,7 @@ const viewModeColumnsMap = {
 };
 
 const defaultPrimaryColor = Colors.brown;
+
+double getWidgetHeight(num lines) {
+  return max(lines * 84 + (lines - 1) * 16, 0);
+}

lib/common/context.dart

@@ -1,17 +1,21 @@
+import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
 extension BuildContextExtension on BuildContext {
-
   CommonScaffoldState? get commonScaffoldState {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  Size get appSize{
+  showNotifier(String text) {
+    return findAncestorStateOfType<MessageManagerState>()?.message(text);
+  }
+
+  Size get appSize {
     return MediaQuery.of(this).size;
   }
 
-  double get width {
+  double get viewWidth {
     return appSize.width;
   }
 

lib/common/dav_client.dart

@@ -1,16 +1,14 @@
 import 'dart:async';
-import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:path/path.dart';
 import 'package:webdav_client/webdav_client.dart';
 
 class DAVClient {
   late Client client;
   Completer<bool> pingCompleter = Completer();
+  late String fileName;
 
   DAVClient(DAV dav) {
     client = newClient(
@@ -18,6 +16,7 @@ class DAVClient {
       user: dav.user,
       password: dav.password,
     );
+    fileName = dav.fileName;
     client.setHeaders(
       {
         'accept-charset': 'utf-8',
@@ -25,16 +24,14 @@ class DAVClient {
       },
     );
     client.setConnectTimeout(8000);
-    client.setSendTimeout(8000);
-    client.setReceiveTimeout(8000);
+    client.setSendTimeout(60000);
+    client.setReceiveTimeout(60000);
     pingCompleter.complete(_ping());
   }
 
   Future<bool> _ping() async {
     try {
       await client.ping();
-      await client.mkdir("/$appName");
-      await client.mkdir("/$appName/$profilesDirectoryName");
       return true;
     } catch (_) {
       return false;
@@ -43,65 +40,17 @@ class DAVClient {
 
   get root => "/$appName";
 
-  get remoteConfig => "$root/$configKey.json";
+  get backupFile => "$root/$fileName";
 
-  get remoteClashConfig => "$root/$clashConfigKey.json";
-
-  get remoteProfiles => "$root/$profilesDirectoryName";
-
-  backup() async {
-    final appController = globalState.appController;
-    final config = appController.config;
-    final clashConfig = appController.clashConfig;
+  backup(Uint8List data) async {
     await client.mkdir("$root");
-    client.write(
-      remoteConfig,
-      utf8.encode(
-        json.encode(config.toJson()),
-      ),
-    );
-    client.write(
-      remoteClashConfig,
-      utf8.encode(
-        json.encode(clashConfig.toJson()),
-      ),
-    );
-    await client.remove(remoteProfiles);
-    for (final profile in config.profiles) {
-      final path = await appPath.getProfilePath(profile.id);
-      if (path == null) continue;
-      await client.writeFromFile(
-        path,
-        "$remoteProfiles/${basename(path)}",
-      );
-    }
+    await client.write("$backupFile", data);
     return true;
   }
 
-  recovery({required RecoveryOption recoveryOption}) async {
-    final profiles = await client.readDir(remoteProfiles);
-    final profilesPath = await appPath.getProfilesPath();
-    for (final file in profiles) {
-      await client.read2File(
-        "$remoteProfiles/${file.name}",
-        join(
-          profilesPath,
-          file.name,
-        ),
-      );
-    }
-    final configRaw = utf8.decode((await client.read(remoteConfig)));
-    final clashConfigRaw = utf8.decode(await client.read(remoteClashConfig));
-    final config = Config.fromJson(json.decode(configRaw));
-    final clashConfig = ClashConfig.fromJson(json.decode(clashConfigRaw));
-    if(recoveryOption == RecoveryOption.onlyProfiles){
-      globalState.appController.config.update(config, RecoveryOption.onlyProfiles);
-    }else{
-      globalState.appController.config.update(config, RecoveryOption.all);
-      globalState.appController.clashConfig.update(clashConfig);
-    }
-    await globalState.appController.applyProfile();
-    globalState.appController.savePreferences();
-    return true;
+  Future<List<int>> recovery() async {
+    await client.mkdir("$root");
+    final data = await client.read(backupFile);
+    return data;
   }
 }

lib/common/function.dart

@@ -1,26 +1,33 @@
 import 'dart:async';
 
 class Debouncer {
-  final Duration delay;
-  Timer? _timer;
+  Map<dynamic, Timer> operators = {};
 
-  Debouncer({required this.delay});
+  call(
+    dynamic tag,
+    Function func, {
+    List<dynamic>? args,
+    Duration duration = const Duration(milliseconds: 600),
+  }) {
+    final timer = operators[tag];
+    if (timer != null) {
+      timer.cancel();
+    }
+    operators[tag] = Timer(
+      duration,
+      () {
+        operators.remove(tag);
+        Function.apply(
+          func,
+          args,
+        );
+      },
+    );
+  }
 
-  void call(Function action, List<dynamic> positionalArguments, [Map<Symbol, dynamic>? namedArguments]) {
-    _timer?.cancel();
-    _timer = Timer(delay, () => Function.apply(action, positionalArguments, namedArguments));
+  cancel(dynamic tag) {
+    operators[tag]?.cancel();
   }
 }
 
-Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
-  Timer? timer;
-
-  return ([List<dynamic>? args, Map<Symbol, dynamic>? namedArgs]) {
-    if (timer != null) {
-      timer!.cancel();
-    }
-    timer = Timer(Duration(milliseconds: milliseconds), () async {
-      await Function.apply(func, args ?? [], namedArgs);
-    });
-  };
-}
+final debouncer = Debouncer();

lib/common/future.dart

@@ -0,0 +1,42 @@
+import 'dart:async';
+import 'dart:ui';
+
+extension CompleterExt<T> on Completer<T> {
+  safeFuture({
+    Duration? timeout,
+    VoidCallback? onLast,
+    FutureOr<T> Function()? onTimeout,
+    required String functionName,
+  }) {
+    final realTimeout = timeout ?? const Duration(seconds: 6);
+    Timer(realTimeout + Duration(milliseconds: 1000), () {
+      if (onLast != null) {
+        onLast();
+      }
+    });
+    return future.withTimeout(
+      timeout: realTimeout,
+      functionName: functionName,
+      onTimeout: onTimeout,
+    );
+  }
+}
+
+extension FutureExt<T> on Future<T> {
+  Future<T> withTimeout({
+    required Duration timeout,
+    required String functionName,
+    FutureOr<T> Function()? onTimeout,
+  }) {
+    return this.timeout(
+      timeout,
+      onTimeout: () async {
+        if (onTimeout != null) {
+          return onTimeout();
+        } else {
+          throw TimeoutException('$functionName timeout');
+        }
+      },
+    );
+  }
+}

lib/common/http.dart

@@ -0,0 +1,26 @@
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+
+import '../state.dart';
+import 'constant.dart';
+
+class FlClashHttpOverrides extends HttpOverrides {
+  @override
+  HttpClient createHttpClient(SecurityContext? context) {
+    final client = super.createHttpClient(context);
+    client.badCertificateCallback = (_, __, ___) => true;
+    client.findProxy = (url) {
+      if ([localhost].contains(url.host)) {
+        return "DIRECT";
+      }
+      final appController = globalState.appController;
+      final port = appController.clashConfig.mixedPort;
+      final isStart = appController.appFlowingState.isStart;
+      debugPrint("find $url proxy:$isStart");
+      if (!isStart) return "DIRECT";
+      return "PROXY localhost:$port";
+    };
+    return client;
+  }
+}

lib/common/icons.dart

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

lib/common/iterable.dart

@@ -62,6 +62,6 @@ extension DoubleListExt on List<double> {
       }
     }
 
-    return -1; // 这行理论上不会执行到，但为了完整性保留
+    return -1;
   }
 }

lib/common/keyboard.dart

@@ -0,0 +1,106 @@
+import 'dart:io';
+
+import 'package:flutter/services.dart';
+import 'package:uni_platform/uni_platform.dart';
+
+final Map<PhysicalKeyboardKey, String> _knownKeyLabels =
+    <PhysicalKeyboardKey, String>{
+  PhysicalKeyboardKey.keyA: 'A',
+  PhysicalKeyboardKey.keyB: 'B',
+  PhysicalKeyboardKey.keyC: 'C',
+  PhysicalKeyboardKey.keyD: 'D',
+  PhysicalKeyboardKey.keyE: 'E',
+  PhysicalKeyboardKey.keyF: 'F',
+  PhysicalKeyboardKey.keyG: 'G',
+  PhysicalKeyboardKey.keyH: 'H',
+  PhysicalKeyboardKey.keyI: 'I',
+  PhysicalKeyboardKey.keyJ: 'J',
+  PhysicalKeyboardKey.keyK: 'K',
+  PhysicalKeyboardKey.keyL: 'L',
+  PhysicalKeyboardKey.keyM: 'M',
+  PhysicalKeyboardKey.keyN: 'N',
+  PhysicalKeyboardKey.keyO: 'O',
+  PhysicalKeyboardKey.keyP: 'P',
+  PhysicalKeyboardKey.keyQ: 'Q',
+  PhysicalKeyboardKey.keyR: 'R',
+  PhysicalKeyboardKey.keyS: 'S',
+  PhysicalKeyboardKey.keyT: 'T',
+  PhysicalKeyboardKey.keyU: 'U',
+  PhysicalKeyboardKey.keyV: 'V',
+  PhysicalKeyboardKey.keyW: 'W',
+  PhysicalKeyboardKey.keyX: 'X',
+  PhysicalKeyboardKey.keyY: 'Y',
+  PhysicalKeyboardKey.keyZ: 'Z',
+  PhysicalKeyboardKey.digit1: '1',
+  PhysicalKeyboardKey.digit2: '2',
+  PhysicalKeyboardKey.digit3: '3',
+  PhysicalKeyboardKey.digit4: '4',
+  PhysicalKeyboardKey.digit5: '5',
+  PhysicalKeyboardKey.digit6: '6',
+  PhysicalKeyboardKey.digit7: '7',
+  PhysicalKeyboardKey.digit8: '8',
+  PhysicalKeyboardKey.digit9: '9',
+  PhysicalKeyboardKey.digit0: '0',
+  PhysicalKeyboardKey.enter: 'ENTER',
+  PhysicalKeyboardKey.escape: 'ESCAPE',
+  PhysicalKeyboardKey.backspace: 'BACKSPACE',
+  PhysicalKeyboardKey.tab: 'TAB',
+  PhysicalKeyboardKey.space: 'SPACE',
+  PhysicalKeyboardKey.minus: '-',
+  PhysicalKeyboardKey.equal: '=',
+  PhysicalKeyboardKey.bracketLeft: '[',
+  PhysicalKeyboardKey.bracketRight: ']',
+  PhysicalKeyboardKey.backslash: '\\',
+  PhysicalKeyboardKey.semicolon: ';',
+  PhysicalKeyboardKey.quote: '"',
+  PhysicalKeyboardKey.backquote: '`',
+  PhysicalKeyboardKey.comma: ',',
+  PhysicalKeyboardKey.period: '.',
+  PhysicalKeyboardKey.slash: '/',
+  PhysicalKeyboardKey.capsLock: 'CAPSLOCK',
+  PhysicalKeyboardKey.f1: 'F1',
+  PhysicalKeyboardKey.f2: 'F2',
+  PhysicalKeyboardKey.f3: 'F3',
+  PhysicalKeyboardKey.f4: 'F4',
+  PhysicalKeyboardKey.f5: 'F5',
+  PhysicalKeyboardKey.f6: 'F6',
+  PhysicalKeyboardKey.f7: 'F7',
+  PhysicalKeyboardKey.f8: 'F8',
+  PhysicalKeyboardKey.f9: 'F9',
+  PhysicalKeyboardKey.f10: 'F10',
+  PhysicalKeyboardKey.f11: 'F11',
+  PhysicalKeyboardKey.f12: 'F12',
+  PhysicalKeyboardKey.home: 'HOME',
+  PhysicalKeyboardKey.pageUp: 'PAGEUP',
+  PhysicalKeyboardKey.delete: 'DELETE',
+  PhysicalKeyboardKey.end: 'END',
+  PhysicalKeyboardKey.pageDown: 'PAGEDOWN',
+  PhysicalKeyboardKey.arrowRight: '→',
+  PhysicalKeyboardKey.arrowLeft: '←',
+  PhysicalKeyboardKey.arrowDown: '↓',
+  PhysicalKeyboardKey.arrowUp: '↑',
+  PhysicalKeyboardKey.controlLeft: "CTRL",
+  PhysicalKeyboardKey.shiftLeft: 'SHIFT',
+  PhysicalKeyboardKey.altLeft: "ALT",
+  PhysicalKeyboardKey.metaLeft: Platform.isMacOS ? '⌘' : 'WIN',
+  PhysicalKeyboardKey.controlRight: "CTRL",
+  PhysicalKeyboardKey.shiftRight: 'SHIFT',
+  PhysicalKeyboardKey.altRight: "ALT",
+  PhysicalKeyboardKey.metaRight: Platform.isMacOS ? '⌘' : 'WIN',
+  PhysicalKeyboardKey.fn: 'FN',
+};
+
+extension KeyboardKeyExt on KeyboardKey {
+  String get label {
+    PhysicalKeyboardKey? physicalKey;
+    if (this is LogicalKeyboardKey) {
+      physicalKey = (this as LogicalKeyboardKey).physicalKey;
+    } else if (this is PhysicalKeyboardKey) {
+      physicalKey = this as PhysicalKeyboardKey;
+    }
+    return _knownKeyLabels[physicalKey] ?? physicalKey?.debugName ?? 'Unknown';
+  }
+}
+
+
+

lib/common/launch.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:launch_at_startup/launch_at_startup.dart';
 
 import 'constant.dart';
@@ -32,10 +33,9 @@ class AutoLaunch {
     return await launchAtStartup.disable();
   }
 
-  updateStatus(bool value) async {
-    final isEnable = await this.isEnable;
-    if (isEnable == value) return;
-    if (value == true) {
+  updateStatus(bool isAutoLaunch) async {
+    if (await isEnable == isAutoLaunch) return;
+    if (isAutoLaunch == true) {
       enable();
     } else {
       disable();

lib/common/link.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:app_links/app_links.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 typedef InstallConfigCallBack = void Function(String url);
 
@@ -17,7 +17,7 @@ class LinkManager {
   initAppLinksListen(installConfigCallBack) async {
     debugPrint("initAppLinksListen");
     destroy();
-    subscription = _appLinks.allUriLinkStream.listen(
+    subscription = _appLinks.uriLinkStream.listen(
       (uri) {
         debugPrint('onAppLink: $uri');
         if (uri.host == 'install-config') {
@@ -31,8 +31,7 @@ class LinkManager {
     );
   }
 
-
-  destroy(){
+  destroy() {
     if (subscription != null) {
       subscription?.cancel();
       subscription = null;

lib/common/list.dart

@@ -2,4 +2,23 @@ extension ListExtension<T> on List<T> {
   List<T> intersection(List<T> list) {
     return where((item) => list.contains(item)).toList();
   }
-}
+
+  List<List<T>> batch(int maxConcurrent) {
+    final batches = (length / maxConcurrent).ceil();
+    final List<List<T>> res = [];
+    for (int i = 0; i < batches; i++) {
+      if (i != batches - 1) {
+        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
+      } else {
+        res.add(sublist(i * maxConcurrent, length));
+      }
+    }
+    return res;
+  }
+
+  List<T> safeSublist(int start) {
+    if(start <= 0) return this;
+    if(start > length) return [];
+    return sublist(start);
+  }
+}

lib/common/lock.dart

@@ -0,0 +1,30 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+
+class SingleInstanceLock {
+  static SingleInstanceLock? _instance;
+  RandomAccessFile? _accessFile;
+
+  SingleInstanceLock._internal();
+
+  factory SingleInstanceLock() {
+    _instance ??= SingleInstanceLock._internal();
+    return _instance!;
+  }
+
+  Future<bool> acquire() async {
+    try {
+      final lockFilePath = await appPath.getLockFilePath();
+      final lockFile = File(lockFilePath);
+      await lockFile.create();
+      _accessFile = await lockFile.open(mode: FileMode.write);
+      await _accessFile?.lock();
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
+}
+
+final singleInstanceLock = SingleInstanceLock();

lib/common/measure.dart

@@ -3,24 +3,26 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class Measure {
-  Measure.of(this.context);
+  final TextScaler _textScale;
+  late BuildContext context;
 
-  final _textScaleFactor =
-      WidgetsBinding.instance.platformDispatcher.textScaleFactor;
+  Measure.of(this.context)
+      : _textScale = TextScaler.linear(
+          WidgetsBinding.instance.platformDispatcher.textScaleFactor,
+        );
 
   Size computeTextSize(Text text) {
     final textPainter = TextPainter(
       text: TextSpan(text: text.data, style: text.style),
       maxLines: text.maxLines,
-      textScaler: TextScaler.linear(_textScaleFactor),
+      textScaler: _textScale,
       textDirection: text.textDirection ?? TextDirection.ltr,
     )..layout();
     return textPainter.size;
   }
 
-  late BuildContext context;
-
   double? _bodyMediumHeight;
+  Size? _bodyLargeSize;
   double? _bodySmallHeight;
   double? _labelSmallHeight;
   double? _labelMediumHeight;
@@ -30,17 +32,27 @@ class Measure {
   double get bodyMediumHeight {
     _bodyMediumHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.bodyMedium,
       ),
     ).height;
     return _bodyMediumHeight!;
   }
 
+  Size get bodyLargeSize {
+    _bodyLargeSize ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.bodyLarge,
+      ),
+    );
+    return _bodyLargeSize!;
+  }
+
   double get bodySmallHeight {
     _bodySmallHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.bodySmall,
       ),
     ).height;
@@ -50,7 +62,7 @@ class Measure {
   double get labelSmallHeight {
     _labelSmallHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.labelSmall,
       ),
     ).height;
@@ -60,7 +72,7 @@ class Measure {
   double get labelMediumHeight {
     _labelMediumHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.labelMedium,
       ),
     ).height;
@@ -70,7 +82,7 @@ class Measure {
   double get titleLargeHeight {
     _titleLargeHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.titleLarge,
       ),
     ).height;
@@ -80,7 +92,7 @@ class Measure {
   double get titleMediumHeight {
     _titleMediumHeight ??= computeTextSize(
       Text(
-        "",
+        "X",
         style: context.textTheme.titleMedium,
       ),
     ).height;

lib/common/navigation.dart

@@ -44,7 +44,7 @@ class Navigation {
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       const NavigationItem(
-        icon: Icon(Icons.swap_vert_circle),
+        icon: Icon(Icons.storage),
         label: "resources",
         description: "resourcesDesc",
         keep: false,

lib/common/navigator.dart

@@ -0,0 +1,251 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:flutter/material.dart';
+
+class BaseNavigator {
+  static Future<T?> push<T>(BuildContext context, Widget child) async {
+    return await Navigator.of(context).push<T>(
+      CommonRoute(
+        builder: (context) => child,
+      ),
+    );
+  }
+}
+
+class CommonRoute<T> extends MaterialPageRoute<T> {
+  CommonRoute({
+    required super.builder,
+  });
+
+  @override
+  Duration get transitionDuration => const Duration(milliseconds: 500);
+
+  @override
+  Duration get reverseTransitionDuration => const Duration(milliseconds: 300);
+}
+
+final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
+  begin: const Offset(1.0, 0.0),
+  end: Offset.zero,
+);
+final Animatable<Offset> _kMiddleLeftTween = Tween<Offset>(
+  begin: Offset.zero,
+  end: const Offset(-1.0 / 3.0, 0.0),
+);
+
+class CommonPageTransitionsBuilder extends PageTransitionsBuilder {
+  const CommonPageTransitionsBuilder();
+
+  @override
+  Widget buildTransitions<T>(
+    PageRoute<T> route,
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+    Widget child,
+  ) {
+    return CommonPageTransition(
+      context: context,
+      primaryRouteAnimation: animation,
+      secondaryRouteAnimation: secondaryAnimation,
+      linearTransition: false,
+      child: child,
+    );
+  }
+}
+
+class CommonPageTransition extends StatefulWidget {
+  const CommonPageTransition({
+    super.key,
+    required this.context,
+    required this.primaryRouteAnimation,
+    required this.secondaryRouteAnimation,
+    required this.child,
+    required this.linearTransition,
+  });
+
+  final Widget child;
+
+  final Animation<double> primaryRouteAnimation;
+
+  final Animation<double> secondaryRouteAnimation;
+
+  final BuildContext context;
+
+  final bool linearTransition;
+
+  static Widget? delegatedTransition(
+      BuildContext context,
+      Animation<double> animation,
+      Animation<double> secondaryAnimation,
+      bool allowSnapshotting,
+      Widget? child) {
+    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
+      parent: secondaryAnimation,
+      curve: Curves.linearToEaseOut,
+      reverseCurve: Curves.easeInToLinear,
+    ).drive(_kMiddleLeftTween);
+
+    assert(debugCheckHasDirectionality(context));
+    final TextDirection textDirection = Directionality.of(context);
+    return SlideTransition(
+      position: delegatedPositionAnimation,
+      textDirection: textDirection,
+      transformHitTests: false,
+      child: child,
+    );
+  }
+
+  @override
+  State<CommonPageTransition> createState() => _CommonPageTransitionState();
+}
+
+class _CommonPageTransitionState extends State<CommonPageTransition> {
+  late Animation<Offset> _primaryPositionAnimation;
+  late Animation<Offset> _secondaryPositionAnimation;
+  late Animation<Decoration> _primaryShadowAnimation;
+  CurvedAnimation? _primaryPositionCurve;
+  CurvedAnimation? _secondaryPositionCurve;
+  CurvedAnimation? _primaryShadowCurve;
+
+  @override
+  void initState() {
+    super.initState();
+    _setupAnimation();
+  }
+
+  @override
+  void didUpdateWidget(covariant CommonPageTransition oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.primaryRouteAnimation != widget.primaryRouteAnimation ||
+        oldWidget.secondaryRouteAnimation != widget.secondaryRouteAnimation ||
+        oldWidget.linearTransition != widget.linearTransition) {
+      _disposeCurve();
+      _setupAnimation();
+    }
+  }
+
+  @override
+  void dispose() {
+    _disposeCurve();
+    super.dispose();
+  }
+
+  void _disposeCurve() {
+    _primaryPositionCurve?.dispose();
+    _secondaryPositionCurve?.dispose();
+    _primaryShadowCurve?.dispose();
+    _primaryPositionCurve = null;
+    _secondaryPositionCurve = null;
+    _primaryShadowCurve = null;
+  }
+
+  void _setupAnimation() {
+    if (!widget.linearTransition) {
+      _primaryPositionCurve = CurvedAnimation(
+        parent: widget.primaryRouteAnimation,
+        curve: Curves.fastEaseInToSlowEaseOut,
+        reverseCurve: Curves.easeInOut,
+      );
+      _secondaryPositionCurve = CurvedAnimation(
+        parent: widget.secondaryRouteAnimation,
+        curve: Curves.linearToEaseOut,
+        reverseCurve: Curves.easeInToLinear,
+      );
+      _primaryShadowCurve = CurvedAnimation(
+        parent: widget.primaryRouteAnimation,
+        curve: Curves.linearToEaseOut,
+      );
+    }
+    _primaryPositionAnimation =
+        (_primaryPositionCurve ?? widget.primaryRouteAnimation)
+            .drive(_kRightMiddleTween);
+    _secondaryPositionAnimation =
+        (_secondaryPositionCurve ?? widget.secondaryRouteAnimation)
+            .drive(_kMiddleLeftTween);
+    _primaryShadowAnimation =
+        (_primaryShadowCurve ?? widget.primaryRouteAnimation).drive(
+      DecorationTween(
+        begin: const _CommonEdgeShadowDecoration(),
+        end: _CommonEdgeShadowDecoration(
+          <Color>[
+            widget.context.colorScheme.inverseSurface.withOpacity(
+              0.06,
+            ),
+            Colors.transparent,
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    assert(debugCheckHasDirectionality(context));
+    final TextDirection textDirection = Directionality.of(context);
+    return SlideTransition(
+      position: _secondaryPositionAnimation,
+      textDirection: textDirection,
+      transformHitTests: false,
+      child: SlideTransition(
+        position: _primaryPositionAnimation,
+        textDirection: textDirection,
+        child: DecoratedBoxTransition(
+          decoration: _primaryShadowAnimation,
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+}
+
+class _CommonEdgeShadowDecoration extends Decoration {
+  final List<Color>? _colors;
+
+  const _CommonEdgeShadowDecoration([this._colors]);
+
+  @override
+  BoxPainter createBoxPainter([VoidCallback? onChanged]) {
+    return _CommonEdgeShadowPainter(this, onChanged);
+  }
+}
+
+class _CommonEdgeShadowPainter extends BoxPainter {
+  _CommonEdgeShadowPainter(
+    this._decoration,
+    super.onChanged,
+  ) : assert(_decoration._colors == null || _decoration._colors!.length > 1);
+
+  final _CommonEdgeShadowDecoration _decoration;
+
+  @override
+  void paint(Canvas canvas, Offset offset, ImageConfiguration configuration) {
+    final List<Color>? colors = _decoration._colors;
+    if (colors == null) {
+      return;
+    }
+
+    final double shadowWidth = 0.05 * configuration.size!.width;
+    final double shadowHeight = configuration.size!.height;
+    final double bandWidth = shadowWidth / (colors.length - 1);
+
+    final TextDirection? textDirection = configuration.textDirection;
+    assert(textDirection != null);
+    final (double shadowDirection, double start) = switch (textDirection!) {
+      TextDirection.rtl => (1, offset.dx + configuration.size!.width),
+      TextDirection.ltr => (-1, offset.dx),
+    };
+
+    int bandColorIndex = 0;
+    for (int dx = 0; dx < shadowWidth; dx += 1) {
+      if (dx ~/ bandWidth != bandColorIndex) {
+        bandColorIndex += 1;
+      }
+      final Paint paint = Paint()
+        ..color = Color.lerp(colors[bandColorIndex], colors[bandColorIndex + 1],
+            (dx % bandWidth) / bandWidth)!;
+      final double x = start + shadowDirection * dx;
+      canvas.drawRect(
+          Rect.fromLTWH(x - 1.0, offset.dy, 1.0, shadowHeight), paint);
+    }
+  }
+}

lib/common/network.dart

@@ -0,0 +1,25 @@
+import 'dart:io';
+
+extension NetworkInterfaceExt on NetworkInterface {
+  bool get isWifi {
+    final nameLowCase = name.toLowerCase();
+    if (nameLowCase.contains('wlan') ||
+        nameLowCase.contains('wi-fi') ||
+        nameLowCase == 'en0' ||
+        nameLowCase == 'eth0') {
+      return true;
+    }
+
+    return false;
+  }
+
+  bool get includesIPv4 {
+    return addresses.any((addr) => addr.isIPv4);
+  }
+}
+
+extension InternetAddressExt on InternetAddress {
+  bool get isIPv4 {
+    return type == InternetAddressType.IPv4;
+  }
+}

lib/common/num.dart

@@ -1,5 +1,43 @@
-extension NumExtension on num {
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+extension NumExt on num {
   String fixed({digit = 2}) {
     return toStringAsFixed(truncateToDouble() == this ? 0 : digit);
   }
 }
+
+extension DoubleExt on double {
+  moreOrEqual(double value) {
+    return this > value || (value - this).abs() < precisionErrorTolerance + 1;
+  }
+}
+
+extension OffsetExt on Offset {
+  double getCrossAxisOffset(Axis direction) {
+    return direction == Axis.vertical ? dx : dy;
+  }
+
+  double getMainAxisOffset(Axis direction) {
+    return direction == Axis.vertical ? dy : dx;
+  }
+
+  bool less(Offset offset) {
+    if (dy < offset.dy) {
+      return true;
+    }
+    if (dy == offset.dy && dx < offset.dx) {
+      return true;
+    }
+    return false;
+  }
+}
+
+extension RectExt on Rect {
+  doRectIntersect(Rect rect) {
+    return left < rect.right &&
+        right > rect.left &&
+        top < rect.bottom &&
+        bottom > rect.top;
+  }
+}

lib/common/other.dart

@@ -1,13 +1,15 @@
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:math';
 import 'dart:typed_data';
+import 'dart:ui';
 
-import 'package:fl_clash/common/app_localizations.dart';
-import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
-import 'package:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
+import 'package:lpinyin/lpinyin.dart';
+import 'package:zxing2/qrcode.dart';
 
 class Other {
   Color? getDelayColor(int? delay) {
@@ -17,6 +19,14 @@ class Other {
     return const Color(0xFFC57F0A);
   }
 
+  String get id {
+    final timestamp = DateTime.now().microsecondsSinceEpoch;
+    final random = Random();
+    final randomStr =
+        String.fromCharCodes(List.generate(8, (_) => random.nextInt(26) + 97));
+    return "$timestamp$randomStr";
+  }
+
   String getDateStringLast2(int value) {
     var valueRaw = "0$value";
     return valueRaw.substring(
@@ -24,6 +34,19 @@ class Other {
     );
   }
 
+  String get uuidV4 {
+    final Random random = Random();
+    final bytes = List.generate(16, (_) => random.nextInt(256));
+
+    bytes[6] = (bytes[6] & 0x0F) | 0x40;
+    bytes[8] = (bytes[8] & 0x3F) | 0x80;
+
+    final hex =
+        bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+
+    return '${hex.substring(0, 8)}-${hex.substring(8, 12)}-${hex.substring(12, 16)}-${hex.substring(16, 20)}-${hex.substring(20, 32)}';
+  }
+
   String getTimeDifference(DateTime dateTime) {
     var currentDateTime = DateTime.now();
     var difference = currentDateTime.difference(dateTime);
@@ -83,7 +106,7 @@ class Other {
     if (charA == charB) {
       return sortByChar(a.substring(1), b.substring(1));
     } else {
-      return charA.compareTo(charB);
+      return charA.compareToLower(charB);
     }
   }
 
@@ -99,12 +122,18 @@ class Other {
     }
   }
 
-  String getTrayIconPath() {
-    if (Platform.isWindows) {
-      return "assets/images/icon.ico";
-    } else {
-      return "assets/images/icon_monochrome.png";
+  String getTrayIconPath({
+    required Brightness brightness,
+  }) {
+    if (Platform.isMacOS) {
+      return "assets/images/icon_white.png";
     }
+    final suffix = Platform.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",
+    // };
   }
 
   int compareVersions(String version1, String version2) {
@@ -130,6 +159,12 @@ class Other {
     return build1.compareTo(build2);
   }
 
+  String getPinyin(String value) {
+    return value.isNotEmpty
+        ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
+        : "";
+  }
+
   Future<String?> parseQRCode(Uint8List? bytes) {
     return Isolate.run<String?>(() {
       if (bytes == null) return null;
@@ -158,25 +193,27 @@ class Other {
     if (disposition == null) return null;
     final parseValue = HeaderValue.parse(disposition);
     final parameters = parseValue.parameters;
-    final key = parameters.keys
-        .firstWhere((key) => key.startsWith("filename"), orElse: () => '');
-    if (key.isEmpty) return null;
-    if (key == "filename*") {
-      return Uri.decodeComponent((parameters[key] ?? "").split("'").last);
-    } else {
-      return parameters[key];
+    final fileNamePointKey = parameters.keys
+        .firstWhere((key) => key == "filename*", orElse: () => "");
+    if (fileNamePointKey.isNotEmpty) {
+      final res = parameters[fileNamePointKey]?.split("''") ?? [];
+      if (res.length >= 2) {
+        return Uri.decodeComponent(res[1]);
+      }
     }
+    final fileNameKey = parameters.keys
+        .firstWhere((key) => key == "filename", orElse: () => "");
+    if (fileNameKey.isEmpty) return null;
+    return parameters[fileNameKey];
   }
 
-  double getViewWidth() {
-    final view = WidgetsBinding.instance.platformDispatcher.views.first;
-    final size = view.physicalSize / view.devicePixelRatio;
-    return size.width;
+  FlutterView getScreen() {
+    return WidgetsBinding.instance.platformDispatcher.views.first;
   }
 
   List<String> parseReleaseBody(String? body) {
     if (body == null) return [];
-    const pattern = r'- (.+?)\. \[.+?\]';
+    const pattern = r'- \s*(.*)';
     final regex = RegExp(pattern);
     return regex
         .allMatches(body)
@@ -191,22 +228,56 @@ class Other {
     return ViewMode.desktop;
   }
 
-  int getColumns(ViewMode viewMode, int currentColumns) {
-    final targetColumnsArray = viewModeColumnsMap[viewMode]!;
-    if (targetColumnsArray.contains(currentColumns)) {
-      return currentColumns;
-    }
-    return targetColumnsArray.first;
+  int getProxiesColumns(double viewWidth, ProxiesLayout proxiesLayout) {
+    final columns = max((viewWidth / 300).ceil(), 2);
+    return switch (proxiesLayout) {
+      ProxiesLayout.tight => columns + 1,
+      ProxiesLayout.standard => columns,
+      ProxiesLayout.loose => columns - 1,
+    };
   }
 
-  String getColumnsTextForInt(int number){
-    return switch(number){
-      1 => appLocalizations.oneColumn,
-      2 => appLocalizations.twoColumns,
-      3 => appLocalizations.threeColumns,
-      4 => appLocalizations.fourColumns,
-      int() => throw UnimplementedError(),
-    };
+  int getProfilesColumns(double viewWidth) {
+    return max((viewWidth / 350).floor(), 1);
+  }
+
+  String getBackupFileName() {
+    return "${appName}_backup_${DateTime.now().show}.zip";
+  }
+
+  String get logFile {
+    return "${appName}_${DateTime.now().show}.log";
+  }
+
+  Size getScreenSize() {
+    final view = WidgetsBinding.instance.platformDispatcher.views.first;
+    return view.physicalSize / view.devicePixelRatio;
+  }
+
+  Future<String?> getLocalIpAddress() async {
+    List<NetworkInterface> interfaces = await NetworkInterface.list(
+      includeLoopback: false,
+    )
+      ..sort((a, b) {
+        if (a.isWifi && !b.isWifi) return -1;
+        if (!a.isWifi && b.isWifi) return 1;
+        if (a.includesIPv4 && !b.includesIPv4) return -1;
+        if (!a.includesIPv4 && b.includesIPv4) return 1;
+        return 0;
+      });
+    for (final interface in interfaces) {
+      final addresses = interface.addresses;
+      if (addresses.isEmpty) {
+        continue;
+      }
+      addresses.sort((a, b) {
+        if (a.isIPv4 && !b.isIPv4) return -1;
+        if (!a.isIPv4 && b.isIPv4) return 1;
+        return 0;
+      });
+      return addresses.first.address;
+    }
+    return "";
   }
 }
 

lib/common/path.dart

@@ -8,30 +8,22 @@ import 'constant.dart';
 
 class AppPath {
   static AppPath? _instance;
-  Completer<Directory> cacheDir = Completer();
-
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
+  Completer<Directory> dataDir = Completer();
+  Completer<Directory> downloadDir = Completer();
+  Completer<Directory> tempDir = Completer();
+  late String appDirPath;
 
   AppPath._internal() {
+    appDirPath = join(dirname(Platform.resolvedExecutable));
     getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
+      dataDir.complete(value);
+    });
+    getTemporaryDirectory().then((value) {
+      tempDir.complete(value);
+    });
+    getDownloadsDirectory().then((value) {
+      downloadDir.complete(value);
     });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
   }
 
   factory AppPath() {
@@ -39,13 +31,40 @@ class AppPath {
     return _instance!;
   }
 
-  Future<String> getHomeDirPath() async {
-    final directory = await cacheDir.future;
+  String get executableExtension {
+    return Platform.isWindows ? ".exe" : "";
+  }
+
+  String get executableDirPath {
+    final currentExecutablePath = Platform.resolvedExecutable;
+    return dirname(currentExecutablePath);
+  }
+
+  String get corePath {
+    return join(executableDirPath, "FlClashCore$executableExtension");
+  }
+
+  String get helperPath {
+    return join(executableDirPath, "$appHelperService$executableExtension");
+  }
+
+  Future<String> getDownloadDirPath() async {
+    final directory = await downloadDir.future;
     return directory.path;
   }
 
+  Future<String> getHomeDirPath() async {
+    final directory = await dataDir.future;
+    return directory.path;
+  }
+
+  Future<String> getLockFilePath() async {
+    final directory = await dataDir.future;
+    return join(directory.path, "FlClash.lock");
+  }
+
   Future<String> getProfilesPath() async {
-    final directory = await cacheDir.future;
+    final directory = await dataDir.future;
     return join(directory.path, profilesDirectoryName);
   }
 
@@ -54,6 +73,17 @@ class AppPath {
     final directory = await getProfilesPath();
     return join(directory, "$id.yaml");
   }
+
+  Future<String?> getProvidersPath(String? id) async {
+    if (id == null) return null;
+    final directory = await getProfilesPath();
+    return join(directory, "providers", id);
+  }
+
+  Future<String> get tempPath async {
+    final directory = await tempDir.future;
+    return directory.path;
+  }
 }
 
 final appPath = AppPath();

lib/common/picker.dart

@@ -1,22 +1,31 @@
+import 'dart:io';
+import 'dart:typed_data';
+
 import 'package:file_picker/file_picker.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:image_picker/image_picker.dart';
 
 class Picker {
-  Future<PlatformFile?> pickerConfigFile() async {
+  Future<PlatformFile?> pickerFile() async {
     final filePickerResult = await FilePicker.platform.pickFiles(
       withData: true,
       allowMultiple: false,
+      initialDirectory: await appPath.getDownloadDirPath(),
     );
     return filePickerResult?.files.first;
   }
 
-  Future<PlatformFile?> pickerGeoDataFile() async {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
+  Future<String?> saveFile(String fileName, Uint8List bytes) async {
+    final path = await FilePicker.platform.saveFile(
+      fileName: fileName,
+      initialDirectory: await appPath.getDownloadDirPath(),
+      bytes: Platform.isAndroid ? bytes : null,
     );
-    return filePickerResult?.files.first;
+    if (!Platform.isAndroid && path != null) {
+      final file = await File(path).create(recursive: true);
+      await file.writeAsBytes(bytes);
+    }
+    return path;
   }
 
   Future<String?> pickerConfigQRCode() async {

lib/common/preferences.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/models.dart';
@@ -28,7 +29,8 @@ class Preferences {
     try {
       return ClashConfig.fromJson(clashConfigMap);
     } catch (e) {
-      throw e.toString();
+      debugPrint(e.toString());
+      return null;
     }
   }
 
@@ -48,7 +50,8 @@ class Preferences {
     try {
       return Config.fromJson(configMap);
     } catch (e) {
-      throw e.toString();
+      debugPrint(e.toString());
+      return null;
     }
   }
 

lib/common/proxy.dart

@@ -1,37 +1,4 @@
-import 'package:fl_clash/common/datetime.dart';
-import 'package:fl_clash/plugins/proxy.dart';
-import 'package:proxy/proxy.dart' as proxy_plugin;
-import 'package:proxy/proxy_platform_interface.dart';
+import 'package:fl_clash/common/system.dart';
+import 'package:proxy/proxy.dart';
 
-class ProxyManager {
-  static ProxyManager? _instance;
-  late ProxyPlatform _proxy;
-
-  ProxyManager._internal() {
-    _proxy = proxy ?? proxy_plugin.Proxy();
-  }
-
-  bool get isStart => startTime != null && startTime!.isBeforeNow;
-
-  DateTime? get startTime => _proxy.startTime;
-
-  Future<bool?> startProxy({required int port}) async {
-    return await _proxy.startProxy(port);
-  }
-
-  Future<bool?> stopProxy() async {
-    return await _proxy.stopProxy();
-  }
-
-  Future<DateTime?> updateStartTime() async {
-    if (_proxy is! Proxy) return null;
-    return await (_proxy as Proxy).updateStartTime();
-  }
-
-  factory ProxyManager() {
-    _instance ??= ProxyManager._internal();
-    return _instance!;
-  }
-}
-
-final proxyManager = ProxyManager();
+final proxy = system.isDesktop ? Proxy() : null;

lib/common/request.dart

@@ -1,66 +1,59 @@
+import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
-import 'package:dio/io.dart';
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/ip.dart';
+import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
+import 'package:flutter/cupertino.dart';
 
 class Request {
   late final Dio _dio;
-  int? _port;
-  bool _isStart = false;
+  String? userAgent;
 
   Request() {
     _dio = Dio();
-    _dio.options = BaseOptions(
-      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
-    );
     _dio.interceptors.add(
       InterceptorsWrapper(
         onRequest: (options, handler) {
-          _updateAdapter();
           return handler.next(options); // 继续请求
         },
       ),
     );
   }
 
-  _updateAdapter() {
-    final port = globalState.appController.clashConfig.mixedPort;
-    final isStart = globalState.appController.appState.isStart;
-    if (_port != port || isStart != _isStart) {
-      _port = port;
-      _isStart = isStart;
-      _dio.httpClientAdapter = IOHttpClientAdapter(
-        createHttpClient: () {
-          final client = HttpClient();
-          if (!_isStart) return client;
-          client.userAgent = globalState.appController.clashConfig.globalUa;
-          client.findProxy = (url) {
-            return "PROXY localhost:$_port;DIRECT";
-          };
-          return client;
-        },
-        validateCertificate: (_, __, ___) => true,
-      );
-    }
-  }
-
   Future<Response> getFileResponseForUrl(String url) async {
     final response = await _dio
         .get(
           url,
           options: Options(
+            headers: {
+              "User-Agent": globalState.appController.clashConfig.globalUa
+            },
             responseType: ResponseType.bytes,
           ),
         )
         .timeout(
-          httpTimeoutDuration * 2,
+          httpTimeoutDuration * 6,
         );
     return response;
   }
 
+  Future<MemoryImage?> getImage(String url) async {
+    if (url.isEmpty) return null;
+    final response = await _dio.get<Uint8List>(
+      url,
+      options: Options(
+        responseType: ResponseType.bytes,
+      ),
+    );
+    final data = response.data;
+    if (data == null) return null;
+    return MemoryImage(data);
+  }
+
   Future<Map<String, dynamic>?> checkForUpdate() async {
     final response = await _dio.get(
       "https://api.github.com/repos/$repository/releases/latest",
@@ -78,30 +71,113 @@ class Request {
     return data;
   }
 
-  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,
-  };
+  final List<String> _ipInfoSources = [
+    "https://ipwho.is/?fields=ip&output=csv",
+    "https://ipinfo.io/ip",
+    "https://ifconfig.me/ip/",
+  ];
 
   Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
-    for (final source in _ipInfoSources.entries) {
+    for (final source in _ipInfoSources) {
       try {
         final response = await _dio
-            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
-            .timeout(
-              httpTimeoutDuration,
-            );
-        if (response.statusCode == 200 && response.data != null) {
-          return source.value(response.data!);
+            .get<String>(
+              source,
+              cancelToken: cancelToken,
+            )
+            .timeout(httpTimeoutDuration);
+        if (response.statusCode != 200 || response.data == null) {
+          continue;
         }
+        final ipInfo = await clashCore.getCountryCode(response.data!);
+        if (ipInfo == null && source != _ipInfoSources.last) {
+          continue;
+        }
+        return ipInfo;
       } catch (e) {
-        continue;
+        debugPrint("checkIp error ===> $e");
+        if (e is DioException && e.type == DioExceptionType.cancel) {
+          throw "cancelled";
+        }
       }
     }
     return null;
   }
+
+  Future<bool> pingHelper() async {
+    try {
+      final response = await _dio
+          .get(
+            "http://$localhost:$helperPort/ping",
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      return (response.data as String) == helperTag;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> startCoreByHelper(String arg) async {
+    try {
+      final response = await _dio
+          .post(
+            "http://$localhost:$helperPort/start",
+            data: json.encode({
+              "path": appPath.corePath,
+              "arg": arg,
+            }),
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      final data = response.data as String;
+      return data.isEmpty;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> stopCoreByHelper() async {
+    try {
+      final response = await _dio
+          .post(
+            "http://$localhost:$helperPort/stop",
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      final data = response.data as String;
+      return data.isEmpty;
+    } catch (_) {
+      return false;
+    }
+  }
 }
 
 final request = Request();

lib/common/scroll.dart

@@ -25,3 +25,18 @@ class HiddenBarScrollBehavior extends BaseScrollBehavior {
     return child;
   }
 }
+
+class ShowBarScrollBehavior extends BaseScrollBehavior {
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) {
+    return Scrollbar(
+      interactive: true,
+      controller: details.controller,
+      child: child,
+    );
+  }
+}

lib/common/service.dart

@@ -1,110 +0,0 @@
-import 'dart:ffi';
-import 'dart:io';
-import 'package:ffi/ffi.dart';
-import 'package:win32/win32.dart';
-
-typedef CreateServiceNative = IntPtr Function(
-  IntPtr hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  Uint32 dwDesiredAccess,
-  Uint32 dwServiceType,
-  Uint32 dwStartType,
-  Uint32 dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-typedef CreateServiceDart = int Function(
-  int hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  int dwDesiredAccess,
-  int dwServiceType,
-  int dwStartType,
-  int dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-const _SERVICE_ALL_ACCESS = 0xF003F;
-
-const _SERVICE_WIN32_OWN_PROCESS = 0x00000010;
-
-const _SERVICE_AUTO_START = 0x00000002;
-
-const _SERVICE_ERROR_NORMAL = 0x00000001;
-
-typedef GetLastErrorNative = Uint32 Function();
-typedef GetLastErrorDart = int Function();
-
-class Service {
-  static Service? _instance;
-  late DynamicLibrary _advapi32;
-
-  Service._internal() {
-    _advapi32 = DynamicLibrary.open('advapi32.dll');
-  }
-
-  factory Service() {
-    _instance ??= Service._internal();
-    return _instance!;
-  }
-
-  Future<void> createService() async {
-    final int scManager = OpenSCManager(nullptr, nullptr, _SERVICE_ALL_ACCESS);
-    if (scManager == 0) return;
-    final serviceName = 'FlClash Service'.toNativeUtf16();
-    final displayName = 'FlClash Service'.toNativeUtf16();
-    final binaryPathName = "C:\\Application\\Clash.Verge_1.6.6_x64_portable\\resources\\clash-verge-service.exe".toNativeUtf16();
-    final createService =
-        _advapi32.lookupFunction<CreateServiceNative, CreateServiceDart>(
-      'CreateServiceW',
-    );
-    final getLastError = DynamicLibrary.open('kernel32.dll')
-        .lookupFunction<GetLastErrorNative, GetLastErrorDart>('GetLastError');
-
-    final serviceHandle = createService(
-      scManager,
-      serviceName,
-      displayName,
-      _SERVICE_ALL_ACCESS,
-      _SERVICE_WIN32_OWN_PROCESS,
-      _SERVICE_AUTO_START,
-      _SERVICE_ERROR_NORMAL,
-      binaryPathName,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-    );
-
-    print("serviceHandle $serviceHandle");
-
-    final errorCode = GetLastError();
-    print('Error code: $errorCode');
-
-    final result = StartService(serviceHandle, 0, nullptr);
-
-    if (result == 0) {
-      print('Failed to start the service.');
-    } else {
-      print('Service started successfully.');
-    }
-
-    calloc.free(serviceName);
-    calloc.free(displayName);
-    calloc.free(binaryPathName);
-  }
-}
-
-final service = Platform.isWindows ? Service() : null;