Chore: bump version

Feature: enable sniff & disable tun for premium
Chore: update clash core
2026-05-09 18:11:26 +08:00 · 2022-07-01 13:51:13 +08:00 · 2022-07-01 13:50:32 +08:00 · 2022-07-01 13:49:29 +08:00 · 2022-07-01 12:07:45 +08:00 · 2022-07-01 11:15:28 +08:00
160 changed files with 2523 additions and 2622 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary
--- a/.github/ISSUE_TEMPLATE/01-bug-report-en.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-report-en.md
@@ -1,57 +0,0 @@
---
-name: "[English] Bug report"
-about: Create a report to help us improve
-title: "[BUG] "
-labels: ''
-assignees: ''
-
---
-
-<!-- Be sure to put a clear title after [BUG] in the text box above -->
-<!-- Be sure to put a clear title after [BUG] in the text box above -->
-<!-- Be sure to put a clear title after [BUG] in the text box above -->
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Device Info (please complete the following information):**
-
- - Device: [e.g. Pixel 4]
- - ROM: [e.g: AOSP]
- - ROM Version:
- - Android Version [e.g. 10]
-
-**Application Info (please complete the following information):**
-
- - Version: [e.g. 1.1.10]
- - Apk File Name: [e.g. app-release-arm64-v8a.apk]
- - Distribution Channel: [e.g. Google Play]
-
-**Additional context**
-Add any other context about the problem here.
-
-**Configure**
-Paste configure file which **removed server info** 
-```yaml
-# paste here
-```
-
-**Logs**
-Paste logs to help detect problem
-
-```
-<paste here>
-```
--- a/.github/ISSUE_TEMPLATE/01-bug-report-en.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report-en.yml
@@ -0,0 +1,106 @@
+name: "[English] Bug Report"
+description: "Create a report to help us debug bugs"
+title: "[BUG] "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        NOTE: Be sure to put a clear and concise title **AFTER** `[BUG]` in the text box above.
+
+        NOTE: We do not provide any services such as proxies, DO NOT feedback any problems not caused by this application here.
+
+        <!-- template -->
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the bug"
+      description: "A clear and concise description of what the bug is."
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: "To Reproduce"
+      description: "Steps to reproduce the behavior:"
+      value: |
+        Step 1: ...
+        Step 2: ...
+        Step 3: ...
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: device-info
+    attributes:
+      label: "Device Info"
+      description: |
+        Input your device information.
+
+        Example:
+        - Device: Pixel 4
+        - ROM: AOSP
+        - Android Version: 10
+      value: |
+        - Device:
+        - ROM:
+        - Android Version:
+    validations:
+      required: true
+  - type: textarea
+    id: app-info
+    attributes:
+      label: "Application Info"
+      description: |
+        Input application you are using information.
+
+        Example:
+        ```
+        - Version: 2.5.4-premium
+        - APK filename: cfa-2.5.4-premium-arm64-v8a-release.apk
+        - Distribution Channel: Google Play
+        ```
+      value: |
+        - Version:
+        - APK filename:
+        - Distribution Channel:
+    validations:
+      required: true
+  - type: textarea
+    id: configure
+    attributes:
+      render: yml
+      label: "Configure File"
+      description: |
+        Please paste or upload the configuration file here.
+
+        TIPS: If you only have a subscription link, please use your browser to download it.
+
+        **NOTE: Please remove proxies from the configuration file before uploading it.**
+        **NOTE: Please remove proxies from the configuration file before uploading it.**
+        **NOTE: Please remove proxies from the configuration file before uploading it.**
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      render: raw
+      label: "Logs"
+      description: |
+        Please paste or upload the log file here.
+
+        TIPS: Please use the `Logcat` in application or `adb logcat`. `adb logcat` would be better.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: "Screenshot"
+      description: "If applicable, add screenshots to help explain your problem."
+      placeholder: "Optional"
+  - type: textarea
+    id: additional
+    attributes:
+      label: "Additional"
+      description: "Add any other context about the problem here."
--- a/.github/ISSUE_TEMPLATE/02-feature-request-en.md
+++ b/.github/ISSUE_TEMPLATE/02-feature-request-en.md
@@ -1,24 +0,0 @@
---
-name: "[English] Feature request"
-about: Suggest an idea for this app
-title: "[Feature Request] "
-labels: ''
-assignees: ''
-
---
-
-<!-- Be sure to put a clear title after [Feature Request] in the text box above -->
-<!-- Be sure to put a clear title after [Feature Request] in the text box above -->
-<!-- Be sure to put a clear title after [Feature Request] in the text box above -->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/02-feature-request-en.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature-request-en.yml
@@ -0,0 +1,26 @@
+name: "[English] Feature Request"
+description: "Create a report to help us improve"
+title: "[Feature Request] "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+        NOTE: Be sure to put a clear and concise title **AFTER** `[Feature Request]` in the text box above.
+
+        <!-- template -->
+  - type: textarea
+    id: "description"
+    attributes:
+      label: "Feature Description"
+      description: |
+        A clear and concise description of the feature.
+    validations:
+      required: true
+  - type: textarea
+    id: "additional"
+    attributes:
+      label: "Additional"
+      description: |
+        Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
+++ b/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
@@ -1,55 +0,0 @@
---
-name: "[简体中文] 创建错误报告"
-about: 创建错误报告以帮助我们改进应用
-title: "[BUG] "
-labels: ''
-assignees: ''
-
---
-
-<!-- 请务必在上方文本框处 [BUG] 后填入清晰明了的标题 -->
-<!-- 请务必在上方文本框处 [BUG] 后填入清晰明了的标题 -->
-<!-- 请务必在上方文本框处 [BUG] 后填入清晰明了的标题 -->
-
-**描述出现的错误**
-请简洁的描述你遇到的错误
-
-**如何复现该错误**
-复现步骤:
-1. ...
-2. ...
-3. ...
-4. ...
-
-**预期行为**
-清晰简单的描述你预期的应用应该表现的行为
-
-**屏幕截图**
-如果适用, 上传屏幕截图以帮助描述错误
-
-**设备信息 (请完成以下信息):**
- - 机型: [例如: Pixel 4]
- - 系统/ROM: [例如: MIUI 11]
- - Android 版本 [例如: 10]
- - ROM版本 [例如: 20.3.19]
-
-**应用信息**
- - 版本: [例如: 1.1.10]
- - 安装包文件名: [例如: app-release-arm64-v8a.apk]
- - 应用来源: [例如: Google Play]
-
-**附加信息**
-其他的可能与改错误相关的信息
-
-**配置文件**
-在此粘贴 **去除服务器信息的** 的 **配置文件**
-```yaml
-# 在此粘贴
-```
-
-**日志**
-粘贴日志以帮助侦测错误
-```
-<在此粘贴>
-```
-
--- a/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.yml
+++ b/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.yml
@@ -0,0 +1,107 @@
+name: "[简体中文] 错误报告"
+description: "创建错误报告以帮助我们修正应用"
+title: "[BUG] "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您在百忙之中填写此错误报告。
+
+        注意: 请务必在上方文本框的 `[BUG]` **之后**填写清晰明了的标题。
+
+        注意：这里不提供像是代理服务器之类的服务，请不要反馈非应用自身引起的问题。
+
+        <!-- template -->
+  - type: textarea
+    id: description
+    attributes:
+      label: "描述此错误"
+      description: "请清晰简洁的描述你遇到的错误。"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: "如何复现该错误"
+      description: "复现步骤:"
+      value: |
+        步骤 1: ...
+        步骤 2: ...
+        步骤 3: ...
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: device-info
+    attributes:
+      label: "设备信息"
+      description: |
+        输入您正在使用的设备信息。
+
+        例子:
+        - 机型: Pixel 4
+        - 系统类型: MIUI/AOSP
+        - Android 版本: 10
+      value: |
+        - 机型:
+        - 系统类型:
+        - Android 版本:
+    validations:
+      required: true
+  - type: textarea
+    id: app-info
+    attributes:
+      label: "应用信息"
+      description: |
+        输入您正在使用的应用信息。
+
+        例子:
+        ```
+        - 版本: 2.5.4-premium
+        - 安装包文件名: cfa-2.5.4-premium-arm64-v8a-release.apk
+        - 应用来源: Google Play
+        ```
+      value: |
+        - 版本:
+        - 安装包文件名:
+        - 应用来源:
+    validations:
+      required: true
+  - type: textarea
+    id: configure
+    attributes:
+      render: yml
+      label: "配置文件"
+      description: |
+        请在此粘贴和上传配置文件。
+
+        提示：如果您仅有一个订阅链接，请使用浏览器打开此链接以下载配置文件。
+
+        **注意: 请在上传配置文件前，移除其中的代理服务器信息。**
+        **注意: 请在上传配置文件前，移除其中的代理服务器信息。**
+        **注意: 请在上传配置文件前，移除其中的代理服务器信息。**
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      render: raw
+      label: "日志"
+      description: |
+        请在此粘贴或上传日志。
+
+        提示: 请使用应用内的 `Logcat` 或 `adb logcat` 捕获日志. `adb logcat` 能更好地帮助侦测问题.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: "屏幕截图"
+      description: "如果适用，请在此粘贴或上传屏幕截图。"
+      placeholder: "可选"
+  - type: textarea
+    id: additional
+    attributes:
+      label: "附加信息"
+      description: "其他的可能与改错误相关的信息。"
+      placeholder: "可选"
--- a/.github/ISSUE_TEMPLATE/04-feature-request-zh-cn.md
+++ b/.github/ISSUE_TEMPLATE/04-feature-request-zh-cn.md
@@ -1,21 +0,0 @@
---
-name: "[简体中文] 功能请求"
-about: 你希望的能够在应用中增加的功能
-title: "[Feature Request] "
-labels: ''
-assignees: ''
-
---
-
-<!-- 请务必在上方文本框处 [Feature Request] 后填入清晰明了的标题 -->
-<!-- 请务必在上方文本框处 [Feature Request] 后填入清晰明了的标题 -->
-<!-- 请务必在上方文本框处 [Feature Request] 后填入清晰明了的标题 -->
-
-**功能描述**
-请清晰的描述你想要的功能
-
-**描述你希望的实现方式**
-清晰的描述应用应该如何实现该功能
-
-**附加信息**
-其他的与改功能相关的附加信息
--- a/.github/ISSUE_TEMPLATE/04-feature-request-zh-cn.yml
+++ b/.github/ISSUE_TEMPLATE/04-feature-request-zh-cn.yml
@@ -0,0 +1,26 @@
+name: "[简体中文] 功能请求"
+description: "您希望的能够在应用中增加功能"
+title: "[Feature Request] "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您在百忙之中填写此功能请求报告。
+
+        注意: 请务必在上方文本框的 `[Feature Request]` **之后**填写清晰明了的标题。
+
+        <!-- template -->
+  - type: textarea
+    id: "description"
+    attributes:
+      label: "功能描述"
+      description: |
+        简介明了的描述此功能。
+    validations:
+      required: true
+  - type: textarea
+    id: "additional"
+    attributes:
+      label: "附加信息"
+      description: |
+        与此功能相关的其他附加信息。
--- a/.github/workflows/build-unsigned.yaml
+++ b/.github/workflows/build-unsigned.yaml
@@ -1,47 +1,54 @@
 name: Build Unsigned
 on:
-  workflow_dispatch:
  push:
    branches:
      - main
    paths-ignore:
      - '.github/**'
      - '.idea/**'
+      - '.gitattributes'
      - '.gitignore'
      - '.gitmodules'
      - '**.md'
      - 'LICENSE'
      - 'NOTICE'
  pull_request:
-    branches:
-      - main
    paths-ignore:
      - '.github/**'
      - '.idea/**'
+      - '.gitattributes'
      - '.gitignore'
      - '.gitmodules'
      - '**.md'
      - 'LICENSE'
      - 'NOTICE'
+
 jobs:
  BuildUnsigned:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: recursive
      - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
        with:
-          java-version: 11
+          distribution: 'zulu'
+          java-version: 17
      - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
        with:
-          go-version: 1.16
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Setup Cmake & Ninja
-        uses: lukka/get-cmake@latest
+          go-version: 1.18
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
      - name: Build
-        run: ./gradlew --no-daemon app:assembleRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: --no-daemon app:assembleFossRelease
--- a/.gitignore
+++ b/.gitignore
@@ -19,11 +19,16 @@ gradle-app.setting
 # Ignore IDEA config
 *.iml
 /.idea/*
-/core/src/main/golang/.idea/*
 !/.idea/codeStyles
+/core/src/main/golang/.idea/*
 !/core/src/main/golang/.idea/codeStyles
+/core/src/foss/golang/.idea/*
+!/core/src/foss/golang/.idea/codeStyles
+/core/src/premium/golang/.idea/*
+!/core/src/premium/golang/.idea/codeStyles

 # KeyStore
+signing.properties
 *.keystore
 *.jks

@@ -33,8 +38,9 @@ cmake-build-*
 # local.properties
 local.properties

-# keystore
-keystore.properties
+
+# tracker
+tracker.properties

 # vscode
 .vscode
@@ -53,5 +59,5 @@ google-services.json
 # logs
 *.log

-# Ignore sum
-/core/src/main/golang/go.sum
+# MacOS
+.DS_Store
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
-[submodule "core/src/main/golang/clash"]
-	path = core/src/main/golang/clash
+[submodule "clash-foss"]
+	path = core/src/foss/golang/clash
+	url = https://github.com/Kr328/clash.git
+[submodule "clash-premium"]
+	path = core/src/premium/golang/clash
 	url = https://github.com/Kr328/clash.git
-[submodule "kaidl"]
-	path = kaidl
-	url = https://github.com/Kr328/kaidl.git
-[submodule "core/src/main/golang/tun2socket"]
-	path = core/src/main/golang/tun2socket
-	url = https://github.com/Kr328/tun2socket-lwip.git
--- a/README.md
+++ b/README.md
@@ -38,13 +38,13 @@ See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
   sdk.dir=/path/to/android-sdk
   ```

-4. Create `keystore.properties` in project root with
+4. Create `signing.properties` in project root with

   ```properties
-   storeFile=/path/to/keystore/file
-   storePassword=<key store password>
-   keyAlias=<key alias>
-   keyPassword=<key password>
+   keystore.path=/path/to/keystore/file
+   keystore.password=<key store password>
+   key.alias=<key alias>
+   key.password=<key password>
   ```

 5. Build
@@ -53,4 +53,4 @@ See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
   ./gradlew app:assembleFossRelease
   ```

-6. Pick `app-foss-<arch>-release-signed.apk` in `app/build/outputs/apk/foss/release/`
+6. Pick `app-<version>-foss-<arch>-release.apk` in `app/build/outputs/apk/foss/release/`
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,144 +1,27 @@
-import java.util.*
-
 plugins {
-    id("com.android.application")
    kotlin("android")
    kotlin("kapt")
-}
-
-android {
-    compileSdk = buildTargetSdkVersion
-
-    flavorDimensions(buildFlavor)
-
-    defaultConfig {
-        applicationId = "com.github.kr328.clash"
-
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        resConfigs("zh-rCN", "zh-rHK", "zh-rTW")
-
-        resValue("string", "release_name", "v$buildVersionName")
-        resValue("integer", "release_code", "$buildVersionCode")
-    }
-
-    packagingOptions {
-        exclude("DebugProbesKt.bin")
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    productFlavors {
-        create("foss") {
-            dimension = "foss"
-            versionNameSuffix = ".foss"
-            applicationIdSuffix = ".foss"
-        }
-        create("premium") {
-            dimension = "premium"
-            versionNameSuffix = ".premium"
-
-            if (buildFlavor == "premium") {
-                val localFile = rootProject.file("local.properties")
-                if (localFile.exists()) {
-                    val appCenterKey = localFile.inputStream()
-                        .use { Properties().apply { load(it) } }
-                        .getProperty("appcenter.key", null)
-
-                    if (appCenterKey != null) {
-                        buildConfigField("String", "APP_CENTER_KEY", "\"$appCenterKey\"")
-                    } else {
-                        buildConfigField("String", "APP_CENTER_KEY", "null")
-                    }
-                } else {
-                    buildConfigField("String", "APP_CENTER_KEY", "null")
-                }
-            }
-        }
-    }
-
-    val signingFile = rootProject.file("keystore.properties")
-    if (signingFile.exists()) {
-        val properties = Properties().apply {
-            signingFile.inputStream().use {
-                load(it)
-            }
-        }
-        signingConfigs {
-            create("release") {
-                storeFile = rootProject.file(properties.getProperty("storeFile")!!)
-                storePassword = properties.getProperty("storePassword")!!
-                keyAlias = properties.getProperty("keyAlias")!!
-                keyPassword = properties.getProperty("keyPassword")!!
-            }
-        }
-        buildTypes {
-            named("release") {
-                signingConfig = signingConfigs["release"]
-            }
-        }
-    }
-
-    buildFeatures {
-        dataBinding = true
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    splits {
-        abi {
-            isEnable = true
-            isUniversalApk = true
-        }
-    }
+    id("com.android.application")
 }

 dependencies {
-    val premiumImplementation by configurations
+    compileOnly(project(":hideapi"))

-    api(project(":core"))
-    api(project(":service"))
-    api(project(":design"))
-    api(project(":common"))
+    implementation(project(":core"))
+    implementation(project(":service"))
+    implementation(project(":design"))
+    implementation(project(":common"))

-    premiumImplementation("com.microsoft.appcenter:appcenter-analytics:$appcenterVersion")
-    premiumImplementation("com.microsoft.appcenter:appcenter-crashes:$appcenterVersion")
-
-    implementation(kotlin("stdlib-jdk7"))
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion")
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("androidx.activity:activity:$activityVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
-    implementation("androidx.coordinatorlayout:coordinatorlayout:$coordinatorlayoutVersion")
-    implementation("androidx.recyclerview:recyclerview:$recyclerviewVersion")
-    implementation("androidx.fragment:fragment:$fragmentVersion")
-    implementation("com.google.android.material:material:$materialVersion")
+    implementation(libs.kotlin.coroutine)
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.fragment)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.coordinator)
+    implementation(libs.androidx.recyclerview)
+    implementation(libs.google.material)
 }

-task("cleanRelease", type = Delete::class) {
+tasks.getByName("clean", type = Delete::class) {
    delete(file("release"))
 }
-
-afterEvaluate {
-    tasks["clean"].dependsOn(tasks["cleanRelease"])
-}
--- a/app/src/foss/java/com/github/kr328/clash/Tracker.kt
+++ b/app/src/foss/java/com/github/kr328/clash/Tracker.kt
@@ -1,14 +0,0 @@
-package com.github.kr328.clash
-
-import android.app.Application
-
-@Suppress("UNUSED_PARAMETER")
-object Tracker {
-    fun initialize(application: Application) {
-        // do nothing
-    }
-
-    fun uploadLogcat(logcat: String) {
-        // do nothing
-    }
-}
--- a/app/src/main/java/com/github/kr328/clash/AccessControlActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/AccessControlActivity.kt
@@ -76,11 +76,8 @@ class AccessControlActivity : BaseActivity<AccessControlDesign>() {
                            val data = clipboard?.primaryClip

                            if (data != null && data.itemCount > 0) {
-                                val all = withContext(Dispatchers.IO) {
                                val packages = data.getItemAt(0).text.split("\n").toSet()
-
-                                    design.apps.map(AppInfo::packageName).intersect(packages)
-                                }
+                                val all = design.apps.map(AppInfo::packageName).intersect(packages)

                                selected.clear()
                                selected.addAll(all)
@@ -91,7 +88,6 @@ class AccessControlActivity : BaseActivity<AccessControlDesign>() {
                        AccessControlDesign.Request.Export -> {
                            val clipboard = getSystemService<ClipboardManager>()

-                            withContext(Dispatchers.IO) {
                            val data = ClipData.newPlainText(
                                "packages",
                                selected.joinToString("\n")
@@ -104,7 +100,6 @@ class AccessControlActivity : BaseActivity<AccessControlDesign>() {
            }
        }
    }
-    }

    private suspend fun loadApps(selected: Set<String>): List<AppInfo> =
        withContext(Dispatchers.IO) {
--- a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
@@ -234,12 +234,12 @@ abstract class BaseActivity<D : Design<*>> :
        window.statusBarColor = resolveThemedColor(android.R.attr.statusBarColor)
        window.navigationBarColor = resolveThemedColor(android.R.attr.navigationBarColor)

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= 23) {
            window.isLightStatusBarsCompat =
                resolveThemedBoolean(android.R.attr.windowLightStatusBar)
        }

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+        if (Build.VERSION.SDK_INT >= 27) {
            window.isLightNavigationBarCompat =
                resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
        }
--- a/app/src/main/java/com/github/kr328/clash/FilesActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/FilesActivity.kt
@@ -116,7 +116,7 @@ class FilesActivity : BaseActivity<FilesDesign>() {
                            }
                            is FilesDesign.Request.ExportFile -> {
                                val uri: Uri? = startActivityForResult(
-                                    ActivityResultContracts.CreateDocument(),
+                                    ActivityResultContracts.CreateDocument("text/plain"),
                                    it.file.name
                                )

--- a/app/src/main/java/com/github/kr328/clash/LogcatActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogcatActivity.kt
@@ -67,7 +67,7 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
                }
                LogcatDesign.Request.Export -> {
                    val output = startActivityForResult(
-                        ActivityResultContracts.CreateDocument(),
+                        ActivityResultContracts.CreateDocument("text/plain"),
                        file.fileName
                    )

--- a/app/src/main/java/com/github/kr328/clash/LogcatService.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogcatService.kt
@@ -1,7 +1,5 @@
 package com.github.kr328.clash

-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.app.Service
 import android.content.ComponentName
@@ -9,12 +7,13 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Binder
-import android.os.Build
 import android.os.IBinder
 import android.os.IInterface
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.github.kr328.clash.common.compat.getColorCompat
+import com.github.kr328.clash.common.compat.pendingIntentFlags
 import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.common.util.intent
 import com.github.kr328.clash.core.model.LogMessage
@@ -126,16 +125,12 @@ class LogcatService : Service(), CoroutineScope by CoroutineScope(Dispatchers.De
    }

    private fun createNotificationChannel() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
-            return
-
        NotificationManagerCompat.from(this)
            .createNotificationChannel(
-                NotificationChannel(
+                NotificationChannelCompat.Builder(
                    CHANNEL_ID,
-                    getString(R.string.clash_logcat),
-                    NotificationManager.IMPORTANCE_DEFAULT
-                )
+                    NotificationManagerCompat.IMPORTANCE_DEFAULT
+                ).setName(getString(R.string.clash_logcat)).build()
            )
    }

@@ -152,7 +147,7 @@ class LogcatService : Service(), CoroutineScope by CoroutineScope(Dispatchers.De
                    R.id.nf_logcat_status,
                    LogcatActivity::class.intent
                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP),
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    pendingIntentFlags(PendingIntent.FLAG_UPDATE_CURRENT)
                )
            )
            .build()
--- a/app/src/main/java/com/github/kr328/clash/MainApplication.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainApplication.kt
@@ -19,9 +19,6 @@ class MainApplication : Application() {
    override fun onCreate() {
        super.onCreate()

-        // Initialize AppCenter
-        Tracker.initialize(this)
-
        val processName = currentProcessName

        Log.d("Process $processName started")
--- a/app/src/main/java/com/github/kr328/clash/remote/Service.kt
+++ b/app/src/main/java/com/github/kr328/clash/remote/Service.kt
@@ -5,10 +5,8 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.ServiceConnection
 import android.os.IBinder
-import com.github.kr328.clash.Tracker
 import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.common.util.intent
-import com.github.kr328.clash.log.SystemLogcat
 import com.github.kr328.clash.service.RemoteService
 import com.github.kr328.clash.service.remote.IRemoteService
 import com.github.kr328.clash.service.remote.unwrap
@@ -28,8 +26,6 @@ class Service(private val context: Application, val crashed: () -> Unit) {
        override fun onServiceDisconnected(name: ComponentName?) {
            remote.set(null)

-            Tracker.uploadLogcat(SystemLogcat.dumpCrash())
-
            if (System.currentTimeMillis() - lastCrashed < TOGGLE_CRASHED_INTERVAL) {
                unbind()

--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -9,7 +9,12 @@
        android:translateY="103.4632">
        <path
            android:fillColor="#1E4376"
-            android:pathData="M47.211,168.128C70.531,-34.962 67.471,13.788 94.071,43.818c13.45,-1.52 27.24,-3.47 40.82,-0.67c2.64,0.13 5.42,1.86 7.71,0.18c4.12,-6.27 7.35,-13.54 11.35,-20c12.19,-24.44 12.85,19.54 15.48,26.52c5.23,32.99 10.89,64.46 14.67,97.59c0.31,10.72 5.74,32.92 1.08,33.56c-49.36,5.23 -147.71,3.91 -160.84,-6.3c-15.85,-10.5 -15.18,-35.33 2.03,-43.72c3.63,-2.03 10.68,-3.72 11.94,0.7c-2.41,4.99 -8.79,5.77 -12.12,11.17C16.621,158.948 33.111,168.888 47.211,168.128zM87.841,74.008c-10.42,0.52 -9.59,14.89 -0.07,15.18C98.191,88.668 97.361,74.298 87.841,74.008zM149.121,89.188c10.46,-0.34 9.85,-14.71 0.38,-15.18C139.031,74.348 139.651,88.718 149.121,89.188zM107.871,99.228c2.16,3.48 5.28,3.29 9.79,0.16c3.81,3.17 8.06,3.28 9.18,-0.19c-3.78,1.17 -7.04,0.79 -9.4,-3.49C115.371,100.108 112.071,100.428 107.871,99.228z"
+            android:pathData="M37.7,168.1C61.1-35,58,13.8,84.6,43.8c13.5-1.5,27.2-3.5,40.8-0.7c2.6,0.1,5.4,1.9,7.7,0.2
+		c4.1-6.3,7.4-13.5,11.4-20c12.2-24.4,12.8,19.5,15.5,26.5c5.2,33,10.9,64.5,14.7,97.6c0.3,10.7,5.7,32.9,1.1,33.6
+		c-49.4,5.2-147.7,3.9-160.8-6.3c-15.8-10.5-15.2-35.3,2-43.7c3.6-2,10.7-3.7,11.9,0.7c-2.4,5-8.8,5.8-12.1,11.2
+		C7.2,158.9,23.6,168.9,37.7,168.1z M78.4,74c-10.4,0.5-9.6,14.9-0.1,15.2C88.7,88.7,87.9,74.3,78.4,74z M139.7,89.2
+		c10.5-0.3,9.8-14.7,0.4-15.2C129.6,74.3,130.2,88.7,139.7,89.2z M98.4,99.2c2.2,3.5,5.3,3.3,9.8,0.2c3.8,3.2,8.1,3.3,9.2-0.2
+		c-3.8,1.2-7,0.8-9.4-3.5C105.9,100.1,102.6,100.4,98.4,99.2z"
            tools:ignore="VectorPath" />
    </group>
 </vector>
--- a/app/src/premium/java/com/github/kr328/clash/Tracker.kt
+++ b/app/src/premium/java/com/github/kr328/clash/Tracker.kt
@@ -1,31 +0,0 @@
-package com.github.kr328.clash
-
-import android.app.Application
-import com.microsoft.appcenter.AppCenter
-import com.microsoft.appcenter.analytics.Analytics
-import com.microsoft.appcenter.crashes.Crashes
-import com.microsoft.appcenter.crashes.ingestion.models.ErrorAttachmentLog
-
-object Tracker {
-    fun initialize(application: Application) {
-        if (BuildConfig.APP_CENTER_KEY != null && !BuildConfig.DEBUG) {
-            AppCenter.start(
-                application,
-                BuildConfig.APP_CENTER_KEY,
-                Analytics::class.java, Crashes::class.java
-            )
-        }
-    }
-
-    fun uploadLogcat(logcat: String) {
-        if (BuildConfig.APP_CENTER_KEY != null && !BuildConfig.DEBUG) {
-            if (logcat.isNotBlank()) {
-                Crashes.trackError(
-                    RuntimeException(),
-                    mapOf("type" to "app_crashed"),
-                    listOf(ErrorAttachmentLog.attachmentWithText(logcat, "logcat.txt"))
-                )
-            }
-        }
-    }
-}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,150 @@
@file:Suppress("UNUSED_VARIABLE")

+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.BaseExtension
 import java.net.URL
+import java.util.*

-allprojects {
+buildscript {
    repositories {
-        google()
        mavenCentral()
+        google()
+        maven("https://maven.kr328.app/releases")
+    }
+    dependencies {
+        classpath(libs.build.android)
+        classpath(libs.build.kotlin.common)
+        classpath(libs.build.kotlin.serialization)
+        classpath(libs.build.ksp)
+        classpath(libs.build.golang)
+    }
+}
+
+subprojects {
+    repositories {
+        mavenCentral()
+        google()
+        maven("https://maven.kr328.app/releases")
+    }
+
+    val isApp = name == "app"
+
+    apply(plugin = if (isApp) "com.android.application" else "com.android.library")
+
+    extensions.configure<BaseExtension> {
+        defaultConfig {
+            if (isApp) {
+                applicationId = "com.github.kr328.clash"
+            }
+
+            minSdk = 21
+            targetSdk = 31
+
+            versionName = "2.5.10"
+            versionCode = 205010
+
+            resValue("string", "release_name", "v$versionName")
+            resValue("integer", "release_code", "$versionCode")
+
+            externalNativeBuild {
+                cmake {
+                    abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
+                }
+            }
+
+            if (!isApp) {
+                consumerProguardFiles("consumer-rules.pro")
+            } else {
+                setProperty("archivesBaseName", "cfa-$versionName")
+            }
+        }
+
+        ndkVersion = "23.0.7599858"
+
+        compileSdkVersion(defaultConfig.targetSdk!!)
+
+        if (isApp) {
+            packagingOptions {
+                resources {
+                    excludes.add("DebugProbesKt.bin")
+                }
+            }
+        }
+
+        productFlavors {
+            flavorDimensions("feature")
+
+            create("foss") {
+                isDefault = true
+                dimension = flavorDimensionList[0]
+                versionNameSuffix = ".foss"
+
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
+
+                if (isApp) {
+                    applicationIdSuffix = ".foss"
+                }
+            }
+            create("premium") {
+                dimension = flavorDimensionList[0]
+                versionNameSuffix = ".premium"
+
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"true\")")
+            }
+        }
+
+        signingConfigs {
+            val keystore = rootProject.file("signing.properties")
+            if (keystore.exists()) {
+                create("release") {
+                    val prop = Properties().apply {
+                        keystore.inputStream().use(this::load)
+                    }
+
+                    storeFile = rootProject.file(prop.getProperty("keystore.path")!!)
+                    storePassword = prop.getProperty("keystore.password")!!
+                    keyAlias = prop.getProperty("key.alias")!!
+                    keyPassword = prop.getProperty("key.password")!!
+                }
+            }
+        }
+
+        buildTypes {
+            named("release") {
+                isMinifyEnabled = isApp
+                isShrinkResources = isApp
+                signingConfig = signingConfigs.findByName("release")
+                proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            }
+            named("debug") {
+                versionNameSuffix = ".debug"
+            }
+        }
+
+        buildFeatures.apply {
+            dataBinding {
+                isEnabled = name != "hideapi"
+            }
+        }
+
+        variantFilter {
+            ignore = name.startsWith("premium") && !project(":core")
+                .file("src/premium/golang/clash/go.mod").exists()
+        }
+
+        if (isApp) {
+            this as AppExtension
+
+            splits {
+                abi {
+                    isEnable = true
+                    isUniversalApk = true
+                }
+            }
+        }
    }
 }

@@ -13,7 +152,7 @@ task("clean", type = Delete::class) {
    delete(rootProject.buildDir)
 }

-tasks.named<Wrapper>("wrapper") {
+tasks.wrapper {
    distributionType = Wrapper.DistributionType.ALL

    doLast {
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,25 +0,0 @@
-plugins {
-    kotlin("jvm") version "1.5.10"
-    `java-gradle-plugin`
-}
-
-repositories {
-    mavenCentral()
-    google()
-}
-
-dependencies {
-    implementation(kotlin("gradle-plugin"))
-    implementation(kotlin("serialization"))
-    implementation("com.android.tools.build:gradle:4.2.1")
-    implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.5.10-1.0.0-beta01")
-}
-
-gradlePlugin {
-    plugins {
-        create("golang") {
-            id = "clash-build"
-            implementationClass = "com.github.kr328.clash.tools.ClashBuildPlugin"
-        }
-    }
-}
--- a/buildSrc/src/main/java/Build.kt
+++ b/buildSrc/src/main/java/Build.kt
@@ -1,17 +0,0 @@
-import org.gradle.api.Project
-
-const val buildVersionCode = 204009
-const val buildVersionName = "2.4.9"
-
-const val buildMinSdkVersion = 21
-const val buildTargetSdkVersion = 30
-
-const val buildNdkVersion = "22.1.7171670"
-
-val Project.buildFlavor: String
-    get() {
-        return if (project(":core").file("src/main/golang/clash/script/script.go").exists())
-            "premium"
-        else
-            "foss"
-    }
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -1,13 +0,0 @@
-const val activityVersion = "1.2.3"
-const val coroutineVersion = "1.5.0"
-const val roomVersion = "2.3.0"
-const val coreVersion = "1.5.0"
-const val appcompatVersion = "1.3.0"
-const val muiltprocessVersion = "1.0.0"
-const val appcenterVersion = "4.2.0"
-const val serializationVersion = "1.2.1"
-const val materialVersion = "1.3.0"
-const val coordinatorlayoutVersion = "1.1.0"
-const val recyclerviewVersion = "1.2.1"
-const val fragmentVersion = "1.3.4"
-const val viewpagerVersion = "1.0.0"
--- a/buildSrc/src/main/java/Files.kt
+++ b/buildSrc/src/main/java/Files.kt
@@ -1,8 +0,0 @@
-import org.gradle.api.Project
-import java.io.File
-
-val Project.golangSource: File
-    get() = file("src/main/golang")
-
-val Project.golangBuild: File
-    get() = buildDir.resolve("intermediates/golang")
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/BuildConfig.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/BuildConfig.kt
@@ -1,23 +0,0 @@
-package com.github.kr328.clash.tools
-
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.api.BaseVariant
-import java.io.Serializable
-
-data class BuildConfig(
-    val debug: Boolean,
-    val premium: Boolean,
-    val abis: List<NativeAbi>,
-    val minSdkVersion: Int,
-) : Serializable {
-    companion object {
-        fun of(abis: List<NativeAbi>, minSdkVersion: Int, variant: BaseVariant): BuildConfig {
-            return BuildConfig(
-                debug = variant.buildType.isDebuggable,
-                premium = variant.flavorName == "premium",
-                abis = abis,
-                minSdkVersion = minSdkVersion
-            )
-        }
-    }
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt
@@ -1,56 +0,0 @@
-package com.github.kr328.clash.tools
-
-import com.android.build.gradle.LibraryExtension
-import golangBuild
-import golangSource
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import java.util.*
-
-class ClashBuildPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        target.afterEvaluate {
-            target.extensions.getByType(LibraryExtension::class.java).apply {
-                val abis = defaultConfig.externalNativeBuild.cmake.abiFilters
-                    .map { NativeAbi.parse(it) }
-                    .distinct()
-                val minSdkVersion = defaultConfig.minSdkVersion!!.apiLevel
-
-                target.tasks.register("cleanGolang", ClashCleanTask::class.java) {
-                    it.applyFrom(target, abis)
-
-                    target.tasks.getByName("clean").dependsOn(it)
-                }
-
-                libraryVariants.forEach { variant ->
-                    val config = BuildConfig.of(abis, minSdkVersion, variant)
-                    val buildDir = target.golangBuild.resolve(variant.name)
-                    val capitalize = variant.name.capitalize(Locale.getDefault())
-
-                    val task = target.tasks.register(
-                        "externalGolangBuild$capitalize",
-                        ClashBuildTask::class.java
-                    ) {
-                        it.config.set(config)
-                        it.ndkDirectory.set(ndkDirectory)
-                        it.inputDirectory.set(target.golangSource)
-                        it.outputDirectory.set(buildDir)
-                    }
-
-                    sourceSets.named(variant.name) {
-                        it.jniLibs {
-                            srcDir(buildDir)
-                        }
-                    }
-
-                    variant.externalNativeBuildProviders.forEach {
-                        it.get().dependsOn(task)
-                    }
-                    target.tasks.filter { it.name.startsWith("buildCMake") }.forEach {
-                        it.mustRunAfter(task)
-                    }
-                }
-            }
-        }
-    }
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt
@@ -1,60 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import java.io.File
-
-abstract class ClashBuildTask : DefaultTask() {
-    abstract val config: Property<BuildConfig>
-        @Input get
-
-    abstract val ndkDirectory: DirectoryProperty
-        @InputDirectory get
-
-    abstract val inputDirectory: DirectoryProperty
-        @InputDirectory get
-
-    abstract val outputDirectory: DirectoryProperty
-        @OutputDirectory get
-
-    @TaskAction
-    fun build() {
-        val input = inputDirectory.file
-        val output = outputDirectory.file
-
-        val config = config.get()
-        val environment = Environment(ndkDirectory.file, config.minSdkVersion)
-
-        val tags = listOf("without_gvisor", "without_system") +
-                (if (config.debug) listOf("debug") else emptyList()) +
-                (if (config.premium) listOf("premium") else emptyList())
-
-        Command.ofGoModuleTidy(input).exec()
-
-        config.abis.forEach {
-            Command.ofGoRun(
-                "make/make.go",
-                listOf("tun2socket", ".", "android", it.goArch),
-                input.resolve("tun2socket"),
-                environment.ofLwipBuild(it)
-            ).exec()
-
-            Command.ofGoBuild(
-                "c-shared",
-                output.resolve("${it.value}/libclash.so"),
-                tags,
-                !config.debug,
-                input,
-                environment.ofCoreBuild(it)
-            ).exec()
-        }
-    }
-
-    private val DirectoryProperty.file: File
-        get() = get().asFile
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashCleanTask.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashCleanTask.kt
@@ -1,17 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.Project
-import org.gradle.api.tasks.Delete
-import golangSource
-
-abstract class ClashCleanTask : Delete() {
-    fun applyFrom(project: Project, abis: List<NativeAbi>) {
-        val bridge = project.golangSource.resolve("tun2socket")
-
-        delete(bridge.resolve("build"))
-
-        abis.forEach {
-            delete(bridge.resolve("build_android_${it.goArch}.go"))
-        }
-    }
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/Command.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/Command.kt
@@ -1,84 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.GradleException
-import java.io.File
-import kotlin.concurrent.thread
-
-class Command(
-    private val command: Array<String>,
-    workingDir: File,
-    environments: Map<String, String>
-) {
-    private val processBuilder: ProcessBuilder = ProcessBuilder(*command)
-        .redirectErrorStream(true)
-        .directory(workingDir)
-        .apply { environment().putAll(environments) }
-
-    fun exec() {
-        val process = processBuilder.start()
-
-        thread {
-            process.inputStream.copyTo(System.out)
-        }
-
-        val result = process.waitFor()
-
-        if (result != 0) {
-            throw GradleException("exec ${command.joinToString(" ")}: exit with $result")
-        }
-    }
-
-    companion object {
-        fun ofGoModuleTidy(workingDir: File): Command {
-            return Command(arrayOf("go", "mod", "tidy"), workingDir, System.getenv())
-        }
-
-        fun ofGoBuild(
-            mode: String,
-            output: File,
-            tags: List<String>,
-            strip: Boolean,
-            workingDir: File,
-            environments: Map<String, String>
-        ): Command {
-            val command = mutableListOf("go", "build")
-
-            // go build mode
-            command += "-buildmode"
-            command += mode
-
-            // output file
-            command += "-o"
-            command += output.absolutePath
-
-            // trim path prefix
-            command += "-trimpath"
-
-            if (tags.isNotEmpty()) {
-                command += "-tags"
-                command += tags.joinToString(",")
-            }
-
-            if (strip) {
-                command += "-ldflags"
-                command += "-s -w"
-            }
-
-            return Command(command.toTypedArray(), workingDir, environments)
-        }
-
-        fun ofGoRun(
-            file: String,
-            args: List<String>,
-            workingDir: File,
-            environments: Map<String, String>
-        ): Command {
-            val command = mutableListOf("go", "run")
-
-            command += file
-            command += args
-
-            return Command(command.toTypedArray(), workingDir, environments)
-        }
-    }
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt
@@ -1,58 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.api.GradleException
-import java.io.File
-
-class Environment(
-    private val ndkDirectory: File,
-    private val minSdkVersion: Int,
-) {
-    fun ofCoreBuild(abi: NativeAbi): Map<String, String> {
-        val host = when {
-            Os.isFamily(Os.FAMILY_WINDOWS) ->
-                "windows"
-            Os.isFamily(Os.FAMILY_MAC) ->
-                "darwin"
-            Os.isFamily(Os.FAMILY_UNIX) ->
-                "linux"
-            else ->
-                throw GradleException("Unsupported host: ${System.getProperty("os.name")}")
-        }
-
-        val compiler = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.compiler}${minSdkVersion}-clang")
-
-        return mapOf(
-            "CC" to compiler.absolutePath,
-            "GOOS" to "android",
-            "GOARCH" to abi.goArch,
-            "GOARM" to abi.goArm,
-            "CGO_ENABLED" to "1",
-            "CFLAGS" to "-O3 -Werror",
-        )
-    }
-
-    fun ofLwipBuild(abi: NativeAbi): Map<String, String> {
-        val host = when {
-            Os.isFamily(Os.FAMILY_WINDOWS) ->
-                "windows"
-            Os.isFamily(Os.FAMILY_MAC) ->
-                "darwin"
-            Os.isFamily(Os.FAMILY_UNIX) ->
-                "linux"
-            else ->
-                throw GradleException("Unsupported host: ${System.getProperty("os.name")}")
-        }
-
-        val compiler = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.compiler}${minSdkVersion}-clang")
-        val ar = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.archiver}-ar")
-
-        return mapOf(
-            "CC" to compiler.absolutePath,
-            "AR" to ar.absolutePath,
-        )
-    }
-}
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/NativeAbi.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/NativeAbi.kt
@@ -1,26 +0,0 @@
-package com.github.kr328.clash.tools
-
-enum class NativeAbi(
-    val value: String,
-    val compiler: String,
-    val archiver: String,
-    val goArch: String,
-    val goArm: String
-) {
-    ArmeabiV7a("armeabi-v7a", "armv7a-linux-androideabi", "arm-linux-androideabi", "arm", "7"),
-    Arm64V8a("arm64-v8a", "aarch64-linux-android", "aarch64-linux-android", "arm64", ""),
-    X86("x86", "i686-linux-android", "i686-linux-android", "386", ""),
-    X64("x86_64", "x86_64-linux-android", "x86_64-linux-android", "amd64", "");
-
-    companion object {
-        fun parse(value: String): NativeAbi {
-            return when (value) {
-                ArmeabiV7a.value -> ArmeabiV7a
-                Arm64V8a.value -> Arm64V8a
-                X86.value -> X86
-                X64.value -> X64
-                else -> throw IllegalArgumentException("unsupported abi $value")
-            }
-        }
-    }
-}
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,50 +1,11 @@
 plugins {
-    id("com.android.library")
    kotlin("android")
-}
-
-android {
-    compileSdk = buildTargetSdkVersion
-
-    defaultConfig {
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+    id("com.android.library")
 }

 dependencies {
    compileOnly(project(":hideapi"))

-    implementation(kotlin("stdlib-jdk7"))
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion")
-}
-
-repositories {
-    mavenCentral()
-    google()
+    implementation(libs.kotlin.coroutine)
+    implementation(libs.androidx.core)
 }
--- a/common/src/main/java/com/github/kr328/clash/common/compat/App.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/App.kt
@@ -2,6 +2,8 @@ package com.github.kr328.clash.common.compat

 import android.app.ActivityThread
 import android.app.Application
+import android.graphics.drawable.AdaptiveIconDrawable
+import android.graphics.drawable.Drawable
 import android.os.Build
 import com.github.kr328.clash.common.log.Log

@@ -18,3 +20,12 @@ val Application.currentProcessName: String
            packageName
        }
    }
+
+fun Drawable.foreground(): Drawable {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+        this is AdaptiveIconDrawable && this.background == null
+    ) {
+        return this.foreground
+    }
+    return this
+}
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Context.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Context.kt
@@ -4,17 +4,12 @@ package com.github.kr328.clash.common.compat

 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.os.Build
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat

 fun Context.getColorCompat(@ColorRes id: Int): Int {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        this.getColor(id)
-    } else {
-        resources.getColor(id)
-    }
+    return ContextCompat.getColor(this, id)
 }

 fun Context.getDrawableCompat(@DrawableRes id: Int): Drawable? {
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Html.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Html.kt
@@ -7,7 +7,7 @@ import android.text.Html
 import android.text.Spanned

 fun fromHtmlCompat(content: String): Spanned {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    return if (Build.VERSION.SDK_INT >= 24) {
        Html.fromHtml(content, Html.FROM_HTML_MODE_COMPACT)
    } else {
        Html.fromHtml(content)
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Intents.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Intents.kt
@@ -3,9 +3,13 @@ package com.github.kr328.clash.common.compat
 import android.app.PendingIntent
 import android.os.Build

-fun pendingIntentFlags(flags: Int, immutable: Boolean = false): Int {
-    return if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M && immutable) {
+fun pendingIntentFlags(flags: Int, mutable: Boolean = false): Int {
+    return if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT > 30 && mutable) {
+            flags or PendingIntent.FLAG_MUTABLE
+        } else {
            flags or PendingIntent.FLAG_IMMUTABLE
+        }
    } else {
        flags
    }
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Package.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Package.kt
@@ -6,7 +6,7 @@ import android.content.pm.PackageInfo

 val PackageInfo.versionCodeCompat: Long
    get() {
-        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+        return if (android.os.Build.VERSION.SDK_INT >= 28) {
            longVersionCode
        } else {
            versionCode.toLong()
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Resource.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Resource.kt
@@ -8,7 +8,7 @@ import java.util.*

 val Configuration.preferredLocale: Locale
    get() {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        return if (Build.VERSION.SDK_INT >= 24) {
            locales[0]
        } else {
            locale
--- a/common/src/main/java/com/github/kr328/clash/common/compat/Services.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/compat/Services.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 import android.os.Build

 fun Context.startForegroundServiceCompat(intent: Intent) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT >= 26) {
        startForegroundService(intent)
    } else {
        startService(intent)
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,73 +1,50 @@
+import com.github.kr328.golang.GolangBuildTask
+import com.github.kr328.golang.GolangPlugin
 import java.io.FileOutputStream
 import java.net.URL
 import java.time.Duration

 plugins {
-    id("com.android.library")
    kotlin("android")
+    id("com.android.library")
    id("kotlinx-serialization")
-    id("clash-build")
+    id("golang-android")
 }

 val geoipDatabaseUrl =
    "https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb"
 val geoipInvalidate = Duration.ofDays(7)!!
 val geoipOutput = buildDir.resolve("intermediates/golang_blob")
+val golangSource = file("src/main/golang/native")

-android {
-    compileSdk = buildTargetSdkVersion
-
-    ndkVersion = buildNdkVersion
-
-    flavorDimensions(buildFlavor)
-
-    defaultConfig {
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        consumerProguardFiles("consumer-rules.pro")
-
-        externalNativeBuild {
-            cmake {
-                abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
-                arguments(
-                    "-DGO_SOURCE:STRING=$golangSource",
-                    "-DGO_OUTPUT:STRING=$golangBuild",
-                    "-DFLAVOR_NAME=$buildFlavor",
-                )
-            }
-        }
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    productFlavors {
+golang {
+    sourceSets {
        create("foss") {
-            dimension = "foss"
+            tags.set(listOf("foss"))
+            srcDir.set(file("src/foss/golang"))
        }
        create("premium") {
-            dimension = "premium"
+            tags.set(listOf("premium", "without_gvisor", "without_system"))
+            srcDir.set(file("src/premium/golang"))
+        }
+        all {
+            fileName.set("libclash.so")
+            packageName.set("cfa/native")
+        }
    }
 }

-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+android {
+    productFlavors {
+        all {
+            externalNativeBuild {
+                cmake {
+                    arguments("-DGO_SOURCE:STRING=${golangSource}")
+                    arguments("-DGO_OUTPUT:STRING=${GolangPlugin.outputDirOf(project, null, null)}")
+                    arguments("-DFLAVOR_NAME:STRING=$name")
+                }
+            }
        }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
    }

    externalNativeBuild {
@@ -78,16 +55,17 @@ android {
 }

 dependencies {
-    api(project(":common"))
+    implementation(project(":common"))

-    implementation(kotlin("stdlib-jdk7"))
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
+    implementation(libs.androidx.core)
+    implementation(libs.kotlin.coroutine)
+    implementation(libs.kotlin.serialization.json)
 }

-repositories {
-    mavenCentral()
+afterEvaluate {
+    tasks.withType(GolangBuildTask::class.java).forEach {
+        it.inputs.dir(golangSource)
+    }
 }

 task("downloadGeoipDatabase") {
@@ -108,6 +86,8 @@ task("downloadGeoipDatabase") {
        var GeoipDatabase []byte
    """.trimIndent()

+    outputs.dir(geoipOutput)
+
    onlyIf {
        System.currentTimeMillis() - databaseFile.lastModified() > geoipInvalidate.toMillis()
    }
--- a/core/src/foss/golang/clash
+++ b/core/src/foss/golang/clash
--- a/core/src/foss/golang/go.mod
+++ b/core/src/foss/golang/go.mod
@@ -0,0 +1,40 @@
+module foss
+
+go 1.18
+
+require cfa v0.0.0
+
+require (
+	cfa/blob v0.0.0 // indirect
+	github.com/Dreamacro/clash v1.7.1 // indirect
+	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 // indirect
+	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/gofrs/uuid v4.2.0+incompatible // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/miekg/dns v1.1.49 // indirect
+	github.com/oschwald/geoip2-golang v1.7.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
+	go.etcd.io/bbolt v1.3.6 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+replace cfa => ../../main/golang
+
+replace github.com/Dreamacro/clash => ./clash
+
+replace cfa/blob => ../../../build/intermediates/golang_blob
--- a/core/src/foss/golang/go.sum
+++ b/core/src/foss/golang/go.sum
@@ -0,0 +1,134 @@
+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/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.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
+github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
+github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
+github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f h1:l1QCwn715k8nYkj4Ql50rzEog3WnMdrd4YYMMwemxEo=
+github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
+github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/miekg/dns v1.1.49 h1:qe0mQU3Z/XpFeE+AEBo2rqaS1IPBJ3anmqZ4XiZJVG8=
+github.com/miekg/dns v1.1.49/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/oschwald/geoip2-golang v1.7.0 h1:JW1r5AKi+vv2ujSxjKthySK3jo8w8oKWPyXsw+Qs/S8=
+github.com/oschwald/geoip2-golang v1.7.0/go.mod h1:mdI/C7iK7NVMcIDDtf4bCKMJ7r0o7UwGeCo9eiitCMQ=
+github.com/oschwald/maxminddb-golang v1.9.0 h1:tIk4nv6VT9OiPyrnDAfJS1s1xKDQMZOsGojab6EjC1Y=
+github.com/oschwald/maxminddb-golang v1.9.0/go.mod h1:TK+s/Z2oZq0rSl4PSeAEoP0bgm82Cp5HyvYbt8K3zLY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+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.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
+github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+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.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 h1:BonxutuHCTL0rBDnZlKjpGIQFTjyUVTexFOdWkB6Fg0=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+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=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/core/src/foss/golang/main.go
+++ b/core/src/foss/golang/main.go
@@ -0,0 +1,5 @@
+package golang
+
+import (
+	_ "cfa/native/all"
+)
--- a/core/src/main/cpp/CMakeLists.txt
+++ b/core/src/main/cpp/CMakeLists.txt
@@ -19,7 +19,6 @@ endif ()

 include_directories("${GO_OUTPUT_BASE}/${CMAKE_ANDROID_ARCH_ABI}")
 include_directories("${GO_SOURCE}")
-include_directories("${GO_SOURCE}/tun2socket/bridge/native")

 link_directories("${GO_OUTPUT_BASE}/${CMAKE_ANDROID_ARCH_ABI}")

--- a/core/src/main/cpp/jni_helper.c
+++ b/core/src/main/cpp/jni_helper.c
@@ -54,21 +54,28 @@ int jni_catch_exception(JNIEnv *env) {
    return result;
 }

-void jni_attach_thread(JNIEnv **penv) {
+void jni_attach_thread(struct _scoped_jni *jni) {
    JavaVM *vm = global_java_vm();

-    if ((*vm)->AttachCurrentThread(vm, penv, NULL) != JNI_OK) {
+    if ((*vm)->GetEnv(vm, (void **) &jni->env, JNI_VERSION_1_6) == JNI_OK) {
+        jni->require_release = 0;
+        return;
+    }
+
+    if ((*vm)->AttachCurrentThread(vm, &jni->env, NULL) != JNI_OK) {
        abort();
    }
+
+    jni->require_release = 1;
 }

-void jni_detach_thread(JNIEnv **env) {
-    (void) env;
-
+void jni_detach_thread(struct _scoped_jni *jni) {
    JavaVM *vm = global_java_vm();

+    if (jni->require_release) {
        (*vm)->DetachCurrentThread(vm);
    }
+}

 void release_string(char **str) {
    free(*str);
--- a/core/src/main/cpp/jni_helper.h
+++ b/core/src/main/cpp/jni_helper.h
@@ -6,21 +6,23 @@
 #include <malloc.h>
 #include <android/log.h>

+struct _scoped_jni {
+    JNIEnv *env;
+    int require_release;
+};
+
 extern void initialize_jni(JavaVM *vm, JNIEnv *env);
-
 extern jstring jni_new_string(JNIEnv *env, const char *str);
-
 extern char *jni_get_string(JNIEnv *env, jstring str);
-
 extern int jni_catch_exception(JNIEnv *env);
-
-extern void jni_attach_thread(JNIEnv **penv);
-
-extern void jni_detach_thread(JNIEnv **env);
-
+extern void jni_attach_thread(struct _scoped_jni *jni);
+extern void jni_detach_thread(struct _scoped_jni *env);
 extern void release_string(char **str);

-#define ATTACH_JNI() __attribute__((unused, cleanup(jni_detach_thread))) JNIEnv *env = NULL; jni_attach_thread(&env)
+#define ATTACH_JNI() __attribute__((unused, cleanup(jni_detach_thread))) \
+                    struct _scoped_jni _jni; \
+                    jni_attach_thread(&_jni); \
+                    JNIEnv *env = _jni.env

 #define scoped_string __attribute__((cleanup(release_string))) char*

--- a/core/src/main/cpp/main.c
+++ b/core/src/main/cpp/main.c
@@ -84,6 +84,16 @@ Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyDnsChanged(JNIEnv *en
    notifyDnsChanged(_dns_list);
 }

+JNIEXPORT void JNICALL
+Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyTimeZoneChanged(JNIEnv *env, jobject thiz,
+                                                                           jstring name, jint offset) {
+    TRACE_METHOD();
+
+    scoped_string _name = get_string(name);
+
+    notifyTimeZoneChanged(_name, offset);
+}
+
 JNIEXPORT void JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyInstalledAppChanged(JNIEnv *env,
                                                                               jobject thiz,
@@ -97,16 +107,19 @@ Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyInstalledAppChanged(J

 JNIEXPORT void JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_nativeStartTun(JNIEnv *env, jobject thiz,
-                                                              jint fd, jint mtu,
-                                                              jstring dns, jstring blocking,
+                                                              jint fd,
+                                                              jstring gateway,
+                                                              jstring portal,
+                                                              jstring dns,
                                                              jobject cb) {
    TRACE_METHOD();

-    scoped_string _blocking = get_string(blocking);
+    scoped_string _gateway = get_string(gateway);
+    scoped_string _portal = get_string(portal);
    scoped_string _dns = get_string(dns);
    jobject _interface = new_global(cb);

-    startTun(fd, mtu, _dns, _blocking, _interface);
+    startTun(fd, _gateway, _portal, _dns, _interface);
 }

 JNIEXPORT void JNICALL
--- a/core/src/main/golang/app/dns.go
+++ b/core/src/main/golang/app/dns.go
@@ -1,15 +0,0 @@
-package app
-
-import "strings"
-
-var systemDns []string
-
-func NotifyDnsChanged(dnsList string) {
-	dns := strings.Split(dnsList, ",")
-
-	systemDns = dns
-}
-
-func SystemDns() []string {
-	return systemDns
-}
--- a/core/src/main/golang/clash
+++ b/core/src/main/golang/clash
--- a/core/src/main/golang/config/defaults.go
+++ b/core/src/main/golang/config/defaults.go
@@ -1,31 +0,0 @@
-package config
-
-var (
-	defaultNameServers = []string{
-		"223.5.5.5",
-		"119.29.29.29",
-		"8.8.8.8",
-		"1.1.1.1",
-	}
-	defaultFallback = []string{
-		"https://1.1.1.1/dns-query",
-		"https://doh.pub/dns-query",
-	}
-	defaultFakeIPFilter = []string{
-		// stun services
-		"+.stun.*.*",
-		"+.stun.*.*.*",
-		"+.stun.*.*.*.*",
-
-		// Google Voices
-		"lens.l.google.com",
-		"stun.l.google.com",
-
-		// Nintendo Switch
-		"*.n.n.srv.nintendo.net",
-	}
-	localNetwork = []string{
-		"0.0.0.0/8",
-		"127.0.0.0/8",
-	}
-)
--- a/core/src/main/golang/go.mod
+++ b/core/src/main/golang/go.mod
@@ -1,20 +1,28 @@
 module cfa

-go 1.16
+go 1.18

 require (
-	cfa/blob v0.0.0 // local generated
-	github.com/Dreamacro/clash v0.0.0 // local
+	github.com/Dreamacro/clash v1.7.1
+	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/dlclark/regexp2 v1.4.0
-	github.com/kr328/tun2socket v0.0.0 // local
-	github.com/miekg/dns v1.1.42
+	github.com/miekg/dns v1.1.43
 	github.com/oschwald/geoip2-golang v1.5.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/yaml.v2 v2.4.0
 )

-replace github.com/Dreamacro/clash => ./clash
-
-replace github.com/kr328/tun2socket => ./tun2socket
-
-replace cfa/blob => ../../../build/intermediates/golang_blob
+require (
+	github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
+	github.com/oschwald/maxminddb-golang v1.8.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+	golang.org/x/text v0.3.6 // indirect
+)
--- a/core/src/main/golang/go.sum
+++ b/core/src/main/golang/go.sum
@@ -0,0 +1,111 @@
+github.com/Dreamacro/clash v1.7.1 h1:8iYYiyVf7ZAztwoFeTFihs5rI9Jjic0ZKmf05vQxzFU=
+github.com/Dreamacro/clash v1.7.1/go.mod h1:C9eLMAlDZSLrkdzGQdOHyeldwRjDbcGR2kaL80KdzGw=
+github.com/Dreamacro/go-shadowsocks2 v0.1.7 h1:8CtbE1HoPPMfrQZGXmlluq6dO2lL31W6WRRE8fabc4Q=
+github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
+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/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.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
+github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
+github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw=
+github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s=
+github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk=
+github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+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 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/core/src/main/golang/native/all/imports.go
+++ b/core/src/main/golang/native/all/imports.go
@@ -0,0 +1,16 @@
+package all
+
+import (
+	_ "cfa/native/app"
+	_ "cfa/native/common"
+	_ "cfa/native/config"
+	_ "cfa/native/delegate"
+	_ "cfa/native/platform"
+	_ "cfa/native/proxy"
+	_ "cfa/native/tun"
+	_ "cfa/native/tunnel"
+
+	_ "golang.org/x/sync/semaphore"
+
+	_ "github.com/Dreamacro/clash/log"
+)
--- a/core/src/main/golang/native/app.go
+++ b/core/src/main/golang/native/app.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"unsafe"

-	"cfa/app"
+	"cfa/native/app"

 	"github.com/Dreamacro/clash/log"
 )
@@ -43,6 +43,12 @@ func notifyInstalledAppsChanged(uids C.c_string) {
 	app.NotifyInstallAppsChanged(u)
 }

+//export notifyTimeZoneChanged
+func notifyTimeZoneChanged(name C.c_string, offset C.int) {
+	app.NotifyTimeZoneChanged(C.GoString(name), int(offset))
+}
+
+
 //export queryConfiguration
 func queryConfiguration() *C.char {
 	response := &struct{}{}
--- a/core/src/main/golang/native/app/app.go
+++ b/core/src/main/golang/native/app/app.go
@@ -3,6 +3,7 @@ package app
 import (
 	"strconv"
 	"strings"
+	"time"
 )

 var appVersionName string
@@ -46,3 +47,7 @@ func NotifyInstallAppsChanged(uidList string) {
 func QueryAppByUid(uid int) string {
 	return installedAppsUid[uid]
 }
+
+func NotifyTimeZoneChanged(name string, offset int) {
+	time.Local = time.FixedZone(name, offset)
+}
--- a/core/src/main/golang/native/app/content.go
+++ b/core/src/main/golang/native/app/content.go
--- a/core/src/main/golang/native/app/dns.go
+++ b/core/src/main/golang/native/app/dns.go
@@ -0,0 +1,20 @@
+package app
+
+import (
+	"strings"
+
+	"github.com/Dreamacro/clash/dns"
+)
+
+func NotifyDnsChanged(dnsList string) {
+	dL := strings.Split(dnsList, ",")
+
+	ns := make([]dns.NameServer, 0, len(dnsList))
+	for _, d := range dL {
+		ns = append(ns, dns.NameServer{Addr: d})
+	}
+
+	dns.UpdateSystemDNS(dL)
+	dns.FlushCacheWithDefaultResolver()
+}
+
--- a/core/src/main/golang/native/app/tun.go
+++ b/core/src/main/golang/native/app/tun.go
@@ -1,10 +1,10 @@
 package app

 import (
-	"cfa/platform"
 	"net"
-	"strings"
 	"syscall"
+
+	"cfa/native/platform"
 )

 var markSocketImpl func(fd int)
@@ -15,10 +15,15 @@ func MarkSocket(fd int) {
 }

 func QuerySocketUid(source, target net.Addr) int {
-	protocol := syscall.IPPROTO_TCP
+	var protocol int

-	if strings.HasPrefix(source.String(), "udp") {
+	switch source.Network() {
+	case "udp", "udp4", "udp6":
 		protocol = syscall.IPPROTO_UDP
+	case "tcp", "tcp4", "tcp6":
+		protocol = syscall.IPPROTO_TCP
+	default:
+		return -1
 	}

 	if PlatformVersion() < 29 {
--- a/core/src/main/golang/native/app/ui.go
+++ b/core/src/main/golang/native/app/ui.go
--- a/core/src/main/golang/native/bridge.c
+++ b/core/src/main/golang/native/bridge.c
--- a/core/src/main/golang/native/bridge.h
+++ b/core/src/main/golang/native/bridge.h
--- a/core/src/main/golang/native/common/path.go
+++ b/core/src/main/golang/native/common/path.go
--- a/core/src/main/golang/native/config.go
+++ b/core/src/main/golang/native/config.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"unsafe"

-	"cfa/config"
+	"cfa/native/config"
 )

 type remoteValidCallback struct {
--- a/core/src/main/golang/native/config/defaults.go
+++ b/core/src/main/golang/native/config/defaults.go
@@ -0,0 +1,41 @@
+package config
+
+var (
+	defaultNameServers = []string{
+		"223.5.5.5",
+		"119.29.29.29",
+		"8.8.4.4",
+		"1.0.0.1",
+	}
+	defaultFakeIPFilter = []string{
+		// Stun Services
+		"+.stun.*.*",
+		"+.stun.*.*.*",
+		"+.stun.*.*.*.*",
+		"+.stun.*.*.*.*.*",
+
+		// Google Voices
+		"lens.l.google.com",
+
+		// Nintendo Switch STUN
+		"*.n.n.srv.nintendo.net",
+
+		// PlayStation STUN
+		"+.stun.playstation.net",
+
+		// XBox
+		"xbox.*.*.microsoft.com",
+		"*.*.xboxlive.com",
+
+		// Microsoft Captive Portal
+		"*.msftncsi.com",
+		"*.msftconnecttest.com",
+
+		// Bilibili CDN
+		"*.mcdn.bilivideo.cn",
+
+		// Windows Default LAN WorkGroup
+		"WORKGROUP",
+	}
+	defaultFakeIPRange = "28.0.0.0/8"
+)
--- a/core/src/main/golang/native/config/fetch.go
+++ b/core/src/main/golang/native/config/fetch.go
@@ -11,8 +11,7 @@ import (
 	"runtime"
 	"time"

-	"cfa/app"
-
+	"cfa/native/app"
 	"github.com/Dreamacro/clash/component/dialer"
 )

@@ -28,7 +27,7 @@ var client = &http.Client{
 		DisableKeepAlives:     true,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
-		DialContext:           dialer.DefaultTunnelDialer,
+		DialContext:           dialer.DialTunnelContext,
 	},
 	Timeout: 60 * time.Second,
 }
@@ -125,7 +124,7 @@ func FetchAndValid(
 		return err
 	}

-	forEachProviders(rawCfg, func(index int, total int, name string, provider map[string]interface{}) {
+	forEachProviders(rawCfg, func(index int, total int, name string, provider map[string]any) {
 		bytes, _ := json.Marshal(&Status{
 			Action:      "FetchProviders",
 			Args:        []string{name},
--- a/core/src/main/golang/native/config/load.go
+++ b/core/src/main/golang/native/config/load.go
@@ -3,13 +3,12 @@ package config
 import (
 	"io/ioutil"
 	P "path"
+	"runtime"
 	"strings"

 	"gopkg.in/yaml.v2"

-	"cfa/app"
-
-	"github.com/Dreamacro/clash/constant"
+	"cfa/native/app"
 	"github.com/Dreamacro/clash/log"

 	"github.com/Dreamacro/clash/config"
@@ -81,22 +80,16 @@ func Load(path string) error {

 	app.ApplySubtitlePattern(rawCfg.ClashForAndroid.UiSubtitlePattern)

+	runtime.GC()
+
 	return nil
 }

 func LoadDefault() {
-	rawConfig, _ := config.UnmarshalRawConfig([]byte{})
-
-	_ = patchDns(rawConfig, constant.Path.HomeDir())
-
-	cfg, err := config.ParseRawConfig(rawConfig)
+	cfg, err := config.Parse([]byte{})
 	if err != nil {
 		panic(err.Error())
 	}

 	executor.ApplyConfig(cfg, true)
 }
-
-func init() {
-	LoadDefault()
-}
--- a/core/src/main/golang/native/config/override.go
+++ b/core/src/main/golang/native/config/override.go
@@ -14,7 +14,7 @@ const (
 	OverrideSlotSession
 )

-const defaultPersistOverride = `{"dns":{"enable": false}}`
+const defaultPersistOverride = `{"dns":{"enable": false}, "redir-port": 0, "tproxy-port": 0}`
 const defaultSessionOverride = `{}`

 var sessionOverride = defaultSessionOverride
--- a/core/src/main/golang/native/config/process.go
+++ b/core/src/main/golang/native/config/process.go
@@ -5,30 +5,25 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"

-	"github.com/Dreamacro/clash/log"
 	"github.com/dlclark/regexp2"

-	"cfa/app"
-	"cfa/common"
+	"cfa/native/common"
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/log"

 	"github.com/Dreamacro/clash/config"
 	"github.com/Dreamacro/clash/dns"
 )

-const (
-	defaultHealthCheckUrl      = "https://www.gstatic.com/generate_204"
-	defaultHealthCheckInterval = time.Hour
-)
-
 var processors = []processor{
 	patchOverride,
 	patchGeneral,
 	patchProfile,
 	patchDns,
 	patchProviders,
-	patchProxyGroup,
+	patchTun,
+	patchSniff,
 	validConfig,
 }

@@ -55,35 +50,35 @@ func patchGeneral(cfg *config.RawConfig, _ string) error {

 func patchProfile(cfg *config.RawConfig, _ string) error {
 	cfg.Profile.StoreSelected = false
+	cfg.Profile.StoreFakeIP = true

 	return nil
 }

 func patchDns(cfg *config.RawConfig, _ string) error {
 	if !cfg.DNS.Enable {
-		cfg.DNS.Enable = true
-		cfg.DNS.IPv6 = false
-		cfg.DNS.NameServer = defaultNameServers
-		cfg.DNS.Fallback = defaultFallback
-		cfg.DNS.FallbackFilter.GeoIP = false
-		cfg.DNS.FallbackFilter.IPCIDR = localNetwork
-		cfg.DNS.EnhancedMode = dns.MAPPING
-		cfg.DNS.FakeIPRange = "198.18.0.0/16"
-		cfg.DNS.DefaultNameserver = defaultNameServers
-		cfg.DNS.FakeIPFilter = defaultFakeIPFilter
+		cfg.DNS = config.RawDNS{
+			Enable:            true,
+			UseHosts:          true,
+			DefaultNameserver: defaultNameServers,
+			NameServer:        defaultNameServers,
+			EnhancedMode:      C.DNSFakeIP,
+			FakeIPRange:       defaultFakeIPRange,
+			FakeIPFilter:      defaultFakeIPFilter,
+		}

 		cfg.ClashForAndroid.AppendSystemDNS = true
 	}

 	if cfg.ClashForAndroid.AppendSystemDNS {
-		cfg.DNS.NameServer = append(cfg.DNS.NameServer, app.SystemDns()...)
+		cfg.DNS.NameServer = append(cfg.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
 	}

 	return nil
 }

 func patchProviders(cfg *config.RawConfig, profileDir string) error {
-	forEachProviders(cfg, func(index int, total int, key string, provider map[string]interface{}) {
+	forEachProviders(cfg, func(index int, total int, key string, provider map[string]any) {
 		if path, ok := provider["path"].(string); ok {
 			provider["path"] = profileDir + "/providers/" + common.ResolveAsRoot(path)
 		}
@@ -92,20 +87,6 @@ func patchProviders(cfg *config.RawConfig, profileDir string) error {
 	return nil
 }

-func patchProxyGroup(cfg *config.RawConfig, _ string) error {
-	for _, g := range cfg.ProxyGroup {
-		if _, exist := g["url"]; !exist {
-			g["url"] = defaultHealthCheckUrl
-		}
-
-		if _, exist := g["interval"]; !exist {
-			g["interval"] = int(defaultHealthCheckInterval.Seconds())
-		}
-	}
-
-	return nil
-}
-
 func validConfig(cfg *config.RawConfig, _ string) error {
 	if len(cfg.Proxy) == 0 && len(cfg.ProxyProvider) == 0 {
 		return errors.New("profile does not contain `proxies` or `proxy-providers`")
--- a/core/src/main/golang/native/config/process_open.go
+++ b/core/src/main/golang/native/config/process_open.go
@@ -0,0 +1,13 @@
+//go:build !premium
+
+package config
+
+import "github.com/Dreamacro/clash/config"
+
+func patchTun(cfg *config.RawConfig, _ string) error {
+	return nil
+}
+
+func patchSniff(cfg *config.RawConfig, _ string) error {
+	return nil
+}
--- a/core/src/main/golang/native/config/process_premium.go
+++ b/core/src/main/golang/native/config/process_premium.go
@@ -0,0 +1,17 @@
+//go:build premium
+
+package config
+
+import "github.com/Dreamacro/clash/config"
+
+func patchTun(cfg *config.RawConfig, _ string) error {
+	cfg.Tun.Enable = false
+
+	return nil
+}
+
+func patchSniff(cfg *config.RawConfig, _ string) error {
+	cfg.Experimental.SniffTLSSNI = true
+
+	return nil
+}
--- a/core/src/main/golang/native/config/provider_open.go
+++ b/core/src/main/golang/native/config/provider_open.go
@@ -1,10 +1,14 @@
-// +build !premium
+//go:build !premium

 package config

-import "github.com/Dreamacro/clash/config"
+import (
+	"io"

-func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]interface{})) {
+	"github.com/Dreamacro/clash/config"
+)
+
+func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]any)) {
 	total := len(rawCfg.ProxyProvider)
 	index := 0

@@ -17,6 +21,6 @@ func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, k

 func destroyProviders(cfg *config.Config) {
 	for _, p := range cfg.Providers {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}
 }
--- a/core/src/main/golang/native/config/provider_premium.go
+++ b/core/src/main/golang/native/config/provider_premium.go
@@ -1,10 +1,14 @@
-// +build premium
+//go:build premium

 package config

-import "github.com/Dreamacro/clash/config"
+import (
+	"io"

-func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]interface{})) {
+	"github.com/Dreamacro/clash/config"
+)
+
+func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]any)) {
 	total := len(rawCfg.ProxyProvider) + len(rawCfg.RuleProvider)
 	index := 0

@@ -23,10 +27,10 @@ func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, k

 func destroyProviders(cfg *config.Config) {
 	for _, p := range cfg.ProxyProviders {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}

 	for _, p := range cfg.RuleProviders {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}
 }
--- a/core/src/main/golang/native/debug.go
+++ b/core/src/main/golang/native/debug.go
--- a/core/src/main/golang/native/delegate/init.go
+++ b/core/src/main/golang/native/delegate/init.go
@@ -1,18 +1,17 @@
-package core
+package delegate

 import (
 	"errors"
-	"net"
 	"syscall"

 	"cfa/blob"

-	"cfa/app"
-	"cfa/platform"
-
 	"github.com/Dreamacro/clash/component/process"
 	"github.com/Dreamacro/clash/log"

+	"cfa/native/app"
+	"cfa/native/platform"
+
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/mmdb"
 	"github.com/Dreamacro/clash/constant"
@@ -41,34 +40,13 @@ func Init(home, versionName string, platformVersion int) {
 		return pkg, nil
 	}

-	dialer.DialerHook = func(dialer *net.Dialer) error {
-		dialer.Control = func(network, address string, c syscall.RawConn) error {
-			return c.Control(func(fd uintptr) {
-				app.MarkSocket(int(fd))
-			})
-		}
-
-		return nil
-	}
-	dialer.ListenPacketHook = func(lc *net.ListenConfig, address string) (string, error) {
-		lc.Control = func(network, address string, c syscall.RawConn) error {
-			return c.Control(func(fd uintptr) {
-				app.MarkSocket(int(fd))
-			})
-		}
-
-		if platform.ShouldBlockConnection() {
-			return "", errBlocked
-		}
-
-		return address, nil
-	}
-
-	dialer.DialHook = func(dialer *net.Dialer, network string, ip net.IP) error {
+	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
 		if platform.ShouldBlockConnection() {
 			return errBlocked
 		}

-		return nil
+		return conn.Control(func(fd uintptr) {
+			app.MarkSocket(int(fd))
+		})
 	}
 }
--- a/core/src/main/golang/native/log_open.go
+++ b/core/src/main/golang/native/log_open.go
@@ -1,3 +1,5 @@
+//go:build !premium
+
 package main

 //#include "bridge.h"
@@ -23,7 +25,7 @@ func init() {
 		defer log.UnSubscribe(sub)

 		for item := range sub {
-			msg := item.(*log.Event)
+			msg := item.(log.Event)

 			cPayload := C.CString(msg.Payload)

@@ -50,7 +52,7 @@ func subscribeLogcat(remote unsafe.Pointer) {
 		defer log.UnSubscribe(sub)

 		for i := range sub {
-			msg, ok := i.(*log.Event)
+			msg, ok := i.(log.Event)
 			if !ok {
 				continue
 			}
--- a/core/src/main/golang/native/log_premium.go
+++ b/core/src/main/golang/native/log_premium.go
@@ -0,0 +1,75 @@
+//go:build premium
+
+package main
+
+//#include "bridge.h"
+import "C"
+
+import (
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/Dreamacro/clash/log"
+)
+
+type message struct {
+	Level   string `json:"level"`
+	Message string `json:"message"`
+	Time    int64  `json:"time"`
+}
+
+func init() {
+	go func() {
+		sub := log.Subscribe()
+		defer log.UnSubscribe(sub)
+
+		for msg := range sub {
+
+			cPayload := C.CString(msg.Payload)
+
+			switch msg.LogLevel {
+			case log.INFO:
+				C.log_info(cPayload)
+			case log.ERROR:
+				C.log_error(cPayload)
+			case log.WARNING:
+				C.log_warn(cPayload)
+			case log.DEBUG:
+				C.log_debug(cPayload)
+			case log.SILENT:
+				C.log_verbose(cPayload)
+			}
+		}
+	}()
+}
+
+//export subscribeLogcat
+func subscribeLogcat(remote unsafe.Pointer) {
+	go func(remote unsafe.Pointer) {
+		sub := log.Subscribe()
+		defer log.UnSubscribe(sub)
+
+		for msg := range sub {
+			if msg.LogLevel < log.Level() && !strings.HasPrefix(msg.Payload, "[APP]") {
+				continue
+			}
+
+			rMsg := &message{
+				Level:   msg.LogLevel.String(),
+				Message: msg.Payload,
+				Time:    time.Now().UnixNano() / 1000 / 1000,
+			}
+
+			if C.logcat_received(remote, marshalJson(rMsg)) != 0 {
+				C.release_object(remote)
+
+				log.Debugln("Logcat subscriber closed")
+
+				break
+			}
+		}
+	}(remote)
+
+	log.Infoln("[APP] Logcat level: %s", log.Level().String())
+}
--- a/core/src/main/golang/native/main.go
+++ b/core/src/main/golang/native/main.go
@@ -10,9 +10,9 @@ import "C"
 import (
 	"runtime"

-	"cfa/config"
-	"cfa/core"
-	"cfa/tunnel"
+	"cfa/native/config"
+	"cfa/native/delegate"
+	"cfa/native/tunnel"

 	"github.com/Dreamacro/clash/log"
 )
@@ -27,7 +27,7 @@ func coreInit(home, versionName C.c_string, sdkVersion C.int) {
 	v := C.GoString(versionName)
 	s := int(sdkVersion)

-	core.Init(h, v, s)
+	delegate.Init(h, v, s)

 	reset()
 }
@@ -36,6 +36,7 @@ func coreInit(home, versionName C.c_string, sdkVersion C.int) {
 func reset() {
 	config.LoadDefault()
 	tunnel.ResetStatistic()
+	tunnel.CloseAllConnections()

 	runtime.GC()
 }
--- a/core/src/main/golang/native/platform/limit.go
+++ b/core/src/main/golang/native/platform/limit.go
--- a/core/src/main/golang/native/platform/procfs.go
+++ b/core/src/main/golang/native/platform/procfs.go
@@ -26,7 +26,7 @@ func QuerySocketUidFromProcFs(source, _ net.Addr) int {

 	network := source.Network()

-	if strings.HasSuffix(network, "4") {
+	if strings.HasSuffix(network, "4") || strings.HasSuffix(network, "6") {
 		network = network[:len(network)-1]
 	}

@@ -46,16 +46,24 @@ func QuerySocketUidFromProcFs(source, _ net.Addr) int {
 		return -1
 	}

-	if strings.HasSuffix(source.Network(), "6") {
 	sIP = sIP.To16()
-	} else {
-		sIP = sIP.To4()
-	}
-
 	if sIP == nil {
 		return -1
 	}

+	uid := doQuery(path+"6", sIP, sPort)
+	if uid == -1 {
+		sIP = sIP.To4()
+		if sIP == nil {
+			return -1
+		}
+		uid = doQuery(path, sIP, sPort)
+	}
+
+	return uid
+}
+
+func doQuery(path string, sIP net.IP, sPort int) int {
 	file, err := os.Open(path)
 	if err != nil {
 		return -1
--- a/core/src/main/golang/native/proxy.go
+++ b/core/src/main/golang/native/proxy.go
@@ -3,7 +3,9 @@ package main
 //#include "bridge.h"
 import "C"

-import "cfa/proxy"
+import (
+	"cfa/native/proxy"
+)

 //export startHttp
 func startHttp(listenAt C.c_string) *C.char {
--- a/core/src/main/golang/native/proxy/http.go
+++ b/core/src/main/golang/native/proxy/http.go
--- a/core/src/main/golang/native/trace.c
+++ b/core/src/main/golang/native/trace.c
--- a/core/src/main/golang/native/trace.h
+++ b/core/src/main/golang/native/trace.h
--- a/core/src/main/golang/native/tun.go
+++ b/core/src/main/golang/native/tun.go
@@ -5,15 +5,21 @@ import "C"

 import (
 	"context"
+	"io"
+	"sync"
 	"unsafe"

-	"cfa/app"
-	"cfa/tun"
-
 	"golang.org/x/sync/semaphore"
+
+	"cfa/native/app"
+	"cfa/native/tun"
 )

+var rTunLock sync.Mutex
+var rTun *remoteTun
+
 type remoteTun struct {
+	closer   io.Closer
 	callback unsafe.Pointer

 	closed bool
@@ -21,7 +27,7 @@ type remoteTun struct {
 }

 func (t *remoteTun) markSocket(fd int) {
-	_ = t.limit.Acquire(context.TODO(), 1)
+	_ = t.limit.Acquire(context.Background(), 1)
 	defer t.limit.Release(1)

 	if t.closed {
@@ -32,7 +38,7 @@ func (t *remoteTun) markSocket(fd int) {
 }

 func (t *remoteTun) querySocketUid(protocol int, source, target string) int {
-	_ = t.limit.Acquire(context.TODO(), 1)
+	_ = t.limit.Acquire(context.Background(), 1)
 	defer t.limit.Release(1)

 	if t.closed {
@@ -42,38 +48,61 @@ func (t *remoteTun) querySocketUid(protocol int, source, target string) int {
 	return int(C.query_socket_uid(t.callback, C.int(protocol), C.CString(source), C.CString(target)))
 }

-func (t *remoteTun) stop() {
-	_ = t.limit.Acquire(context.Background(), 4)
+func (t *remoteTun) close() {
+	_ = t.limit.Acquire(context.TODO(), 4)
 	defer t.limit.Release(4)

 	t.closed = true

+	if t.closer != nil {
+		_ = t.closer.Close()
+	}
+
 	app.ApplyTunContext(nil, nil)

 	C.release_object(t.callback)
 }

 //export startTun
-func startTun(fd, mtu C.int, gateway, dns C.c_string, callback unsafe.Pointer) C.int {
+func startTun(fd C.int, gateway, portal, dns C.c_string, callback unsafe.Pointer) C.int {
+	rTunLock.Lock()
+	defer rTunLock.Unlock()
+
+	if rTun != nil {
+		rTun.close()
+		rTun = nil
+	}
+
 	f := int(fd)
-	m := int(mtu)
 	g := C.GoString(gateway)
+	p := C.GoString(portal)
 	d := C.GoString(dns)

 	remote := &remoteTun{callback: callback, closed: false, limit: semaphore.NewWeighted(4)}

 	app.ApplyTunContext(remote.markSocket, remote.querySocketUid)

-	if tun.Start(f, m, g, d, remote.stop) != nil {
-		app.ApplyTunContext(nil, nil)
+	closer, err := tun.Start(f, g, p, d)
+	if err != nil {
+		remote.close()

 		return 1
 	}

+	remote.closer = closer
+
+	rTun = remote
+
 	return 0
 }

 //export stopTun
 func stopTun() {
-	tun.Stop()
+	rTunLock.Lock()
+	defer rTunLock.Unlock()
+
+	if rTun != nil {
+		rTun.close()
+		rTun = nil
+	}
 }
--- a/core/src/main/golang/native/tun/dns.go
+++ b/core/src/main/golang/native/tun/dns.go
@@ -3,7 +3,8 @@ package tun
 import (
 	"net"

-	"github.com/Dreamacro/clash/component/resolver"
+	"github.com/Dreamacro/clash/dns"
+
 	D "github.com/miekg/dns"
 )

@@ -21,7 +22,7 @@ func relayDns(payload []byte) ([]byte, error) {
 		return nil, err
 	}

-	r, err := resolver.ServeMsg(msg)
+	r, err := dns.ServeDNSWithDefaultServer(msg)
 	if err != nil {
 		return nil, err
 	}
--- a/core/src/main/golang/native/tun/metadata_open.go
+++ b/core/src/main/golang/native/tun/metadata_open.go
@@ -0,0 +1,25 @@
+//go:build !premium
+
+package tun
+
+import (
+	"net"
+	"strconv"
+
+	C "github.com/Dreamacro/clash/constant"
+)
+
+func createMetadata(lAddr, rAddr *net.TCPAddr) *C.Metadata {
+	return &C.Metadata{
+		NetWork:    C.TCP,
+		Type:       C.SOCKS5,
+		SrcIP:      lAddr.IP,
+		DstIP:      rAddr.IP,
+		SrcPort:    strconv.Itoa(lAddr.Port),
+		DstPort:    strconv.Itoa(rAddr.Port),
+		AddrType:   C.AtypIPv4,
+		Host:       "",
+		RawSrcAddr: lAddr,
+		RawDstAddr: rAddr,
+	}
+}
--- a/core/src/main/golang/native/tun/metadata_premium.go
+++ b/core/src/main/golang/native/tun/metadata_premium.go
@@ -0,0 +1,29 @@
+//go:build premium
+
+package tun
+
+import (
+	"net"
+	"net/netip"
+	"strconv"
+
+	C "github.com/Dreamacro/clash/constant"
+)
+
+func createMetadata(lAddr, rAddr *net.TCPAddr) *C.Metadata {
+	srcAddr, _ := netip.AddrFromSlice(lAddr.IP)
+	dstAddr, _ := netip.AddrFromSlice(rAddr.IP)
+
+	return &C.Metadata{
+		NetWork:    C.TCP,
+		Type:       C.SOCKS5,
+		SrcIP:      srcAddr,
+		DstIP:      dstAddr,
+		SrcPort:    strconv.Itoa(lAddr.Port),
+		DstPort:    strconv.Itoa(rAddr.Port),
+		AddrType:   C.AtypIPv4,
+		Host:       "",
+		RawSrcAddr: lAddr,
+		RawDstAddr: rAddr,
+	}
+}
--- a/core/src/main/golang/native/tun/tun.go
+++ b/core/src/main/golang/native/tun/tun.go
@@ -0,0 +1,162 @@
+package tun
+
+import (
+	"encoding/binary"
+	"io"
+	"net"
+	"os"
+	"time"
+
+	"github.com/Kr328/tun2socket"
+
+	"github.com/Dreamacro/clash/adapter/inbound"
+	"github.com/Dreamacro/clash/common/pool"
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/context"
+	"github.com/Dreamacro/clash/log"
+	"github.com/Dreamacro/clash/transport/socks5"
+	"github.com/Dreamacro/clash/tunnel"
+)
+
+var _, ipv4LoopBack, _ = net.ParseCIDR("127.0.0.0/8")
+
+func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
+	log.Debugln("TUN: fd = %d, gateway = %s, portal = %s, dns = %s", fd, gateway, portal, dns)
+
+	device := os.NewFile(uintptr(fd), "/dev/tun")
+
+	ip, network, err := net.ParseCIDR(gateway)
+	if err != nil {
+		panic(err.Error())
+	} else {
+		network.IP = ip
+	}
+
+	stack, err := tun2socket.StartTun2Socket(device, network, net.ParseIP(portal))
+	if err != nil {
+		_ = device.Close()
+
+		return nil, err
+	}
+
+	dnsAddr := net.ParseIP(dns)
+
+	tcp := func() {
+		defer stack.TCP().Close()
+		defer log.Debugln("TCP: closed")
+
+		for stack.TCP().SetDeadline(time.Time{}) == nil {
+			conn, err := stack.TCP().Accept()
+			if err != nil {
+				log.Debugln("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 conn.Close()
+
+					buf := pool.Get(pool.UDPBufferSize)
+					defer pool.Put(buf)
+
+					for {
+						conn.SetReadDeadline(time.Now().Add(C.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
+			}
+
+			tunnel.TCPIn() <- context.NewConnContext(conn, createMetadata(lAddr, rAddr))
+		}
+	}
+
+	udp := func() {
+		defer stack.UDP().Close()
+		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 pool.Put(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.UDPIn() <- inbound.NewPacket(socks5.ParseAddrToSocksAddr(rAddr), pkt, C.SOCKS5)
+		}
+	}
+
+	go tcp()
+	go udp()
+	go udp()
+
+	return stack, nil
+}
--- a/core/src/main/golang/native/tun/udp.go
+++ b/core/src/main/golang/native/tun/udp.go
@@ -0,0 +1,28 @@
+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
+}
--- a/core/src/main/golang/native/tunnel.go
+++ b/core/src/main/golang/native/tunnel.go
@@ -6,8 +6,8 @@ import "C"
 import (
 	"unsafe"

-	"cfa/app"
-	"cfa/tunnel"
+	"cfa/native/app"
+	"cfa/native/tunnel"
 )

 //export queryTunnelState
--- a/core/src/main/golang/native/tunnel/conn.go
+++ b/core/src/main/golang/native/tunnel/conn.go
@@ -5,6 +5,12 @@ import (
 	"github.com/Dreamacro/clash/tunnel/statistic"
 )

+func CloseAllConnections() {
+	for _, c := range statistic.DefaultManager.Snapshot().Connections {
+		_ = c.Close()
+	}
+}
+
 func closeMatch(filter func(conn C.Conn) bool) {
 	for _, c := range statistic.DefaultManager.Snapshot().Connections {
 		if cc, ok := c.(C.Conn); ok {
--- a/core/src/main/golang/native/tunnel/connectivity.go
+++ b/core/src/main/golang/native/tunnel/connectivity.go
@@ -5,7 +5,7 @@ import (

 	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/adapter/outboundgroup"
-	"github.com/Dreamacro/clash/adapter/provider"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 )
--- a/core/src/main/golang/native/tunnel/geoip.go
+++ b/core/src/main/golang/native/tunnel/geoip.go
--- a/core/src/main/golang/native/tunnel/init.go
+++ b/core/src/main/golang/native/tunnel/init.go
@@ -0,0 +1,43 @@
+package tunnel
+
+import (
+	"context"
+	"net"
+	"strings"
+
+	"github.com/Dreamacro/clash/component/dialer"
+	C "github.com/Dreamacro/clash/constant"
+	CTX "github.com/Dreamacro/clash/context"
+	"github.com/Dreamacro/clash/tunnel"
+)
+
+func init() {
+	dialer.DefaultTunnelDialer = func(context context.Context, network, address string) (net.Conn, error) {
+		if !strings.HasPrefix(network, "tcp") {
+			return nil, net.UnknownNetworkError("unsupported network")
+		}
+
+		host, port, err := net.SplitHostPort(address)
+		if err != nil {
+			return nil, err
+		}
+
+		left, right := net.Pipe()
+
+		metadata := &C.Metadata{
+			NetWork:    C.TCP,
+			Type:       C.HTTPCONNECT,
+			SrcIP:      loopback,
+			SrcPort:    "65535",
+			DstPort:    port,
+			AddrType:   C.AtypDomainName,
+			Host:       host,
+			RawSrcAddr: left.RemoteAddr(),
+			RawDstAddr: left.LocalAddr(),
+		}
+
+		tunnel.TCPIn() <- CTX.NewConnContext(right, metadata)
+
+		return left, nil
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kr328	eb7cd8923f	Chore: bump version	2022-07-01 13:51:13 +08:00
Kr328	c2c09f52cc	Feature: enable sniff & disable tun for premium	2022-07-01 13:50:32 +08:00
Kr328	a56b372a39	Chore: update clash core	2022-07-01 13:49:29 +08:00
Kr328	c3bab32b83	Chore: update dependencies & remove appcenter tracker	2022-07-01 12:07:45 +08:00
GrilledPear	c18d78db85	Chore: Add <version> to match output apks (#1509 )	2022-07-01 11:15:28 +08:00
apevogoci	178e6dcb07	Improve: Try tcp6&udp6 files first when search UID for connection (#1514 )	2022-07-01 11:14:50 +08:00
kr328	a405372f6a	Fix: operate clipboard on main thread	2022-05-16 20:00:48 +08:00
kr328	b472580ca6	Improve: add label to tun service	2022-05-16 19:53:32 +08:00
kr328	5a587167ae	Improve: add workgroup to default fake-ip-filter	2022-05-16 19:47:55 +08:00
kr328	5149caf2b6	Improve: add ifly ime api to http proxy black list	2022-05-16 19:45:13 +08:00
kr328	ffa559a571	Chore: bump version	2022-05-13 13:50:39 +08:00
kr328	5c3ab5470a	Chore: update dependencies	2022-05-12 20:15:21 +08:00
kr328	e6859ff56d	Fix: use package if only single app in sharedUid group	2022-05-12 20:15:00 +08:00
kr328	f16b0048f3	Chore: update dependencies	2022-04-25 23:13:05 +08:00
kr328	17b3a0d0ed	Chore: update clash core	2022-04-25 23:12:54 +08:00
kr328	1e9f38f2bb	Chore: bump version	2022-04-25 12:25:50 +08:00
Kr328	ef8f9e5738	Chore: create FUNDING.yml	2022-04-25 12:12:59 +08:00
kr328	bf59ead3b2	Feature: close all connections on reset	2022-04-20 00:39:46 +08:00
kr328	5dbd94e42c	Chore: update issue template	2022-04-15 14:31:10 +08:00
kr328	b92fc860eb	Chore: bump version	2022-04-14 14:13:56 +08:00
kr328	20bdf171ee	Feature: add zero-copy support	2022-04-14 14:13:38 +08:00
kr328	5a6ca2ce12	Chore: bump version	2022-04-11 20:59:27 +08:00
kr328	636941da70	Fix: add *.jd.com to system proxy blacklist	2022-04-11 20:49:00 +08:00
kr328	5bc3975591	Fix: fix traffic format	2022-04-11 20:49:00 +08:00
kr328	5e54e4561c	Chore: minor default dns config changes	2022-04-11 20:49:00 +08:00
kr328	a7b560b576	Fix: LoadDefault should not apply dns patch	2022-04-11 20:49:00 +08:00
kr328	5f9d4c1572	Chore: minor default dns changes	2022-04-11 20:49:00 +08:00
kr328	a83ecb8b22	Chore: update clash core	2022-04-11 20:49:00 +08:00
Goooler	1cc88cc04f	Chore: cache go on CI (#1440 )	2022-03-22 20:36:31 +08:00
Goooler	92bce6c2c6	Chore: optimize CI (#1414 ) * Bump checkout action to v3 * Bump setup-java action to v3 & Java 17 * Bump setup-go action to v3 * Use gradle-build-action * Go 1.18 * Insert a new line	2022-03-22 18:41:06 +08:00
kr328	ab96790c73	Chore: update dependencies	2022-03-22 13:48:02 +08:00
kr328	d5618321e9	Chore: update clash core	2022-03-22 13:47:11 +08:00
Kr328	4b8fc6ae9a	Chore: update dependencies	2022-02-21 19:48:35 +08:00
人工知能	152e24748b	Chore: update zh-rTW translate (#1386 ) * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml	2022-02-21 19:40:06 +08:00
Kr328	2efdf21130	Chore: update clash core	2022-02-21 19:24:48 +08:00
Kr328	e99c2b64b0	Fix: add mark for issues template	2022-02-21 11:22:16 +08:00
Kr328	3915d9549e	Chore: ignore .github on build	2022-02-21 11:21:00 +08:00
Kr328	23077537f9	Fix: fix issue template	2022-02-21 11:19:43 +08:00
Kr328	de0cbd6b29	Chore: refactor issue template	2022-02-21 11:15:41 +08:00
Kr328	d0efa0690a	Chore: fix bug report form	2022-02-21 01:50:30 +08:00
Kr328	5b6d04d558	Chore: replace bug report with issues forms	2022-02-21 01:46:07 +08:00
Kr328	791794f59d	Chore: bump version	2022-01-15 00:15:02 +08:00
Kr328	6a6465ae5b	Chore: update dependencies	2022-01-15 00:13:05 +08:00
Kr328	056a78c7c4	Improve: update default fake filter list	2022-01-15 00:07:52 +08:00
YeyeBBC	11b0025faf	Slightly adjust QuickSettings Tile icon and App icon, making the cat more visually centred rather than geometrically centred. (#1341 )	2022-01-15 00:02:25 +08:00
Kr328	3009b29e0c	Chore: update dependencies	2022-01-14 23:59:14 +08:00
Kr328	5d52d970a3	Chore: clean code	2022-01-14 23:59:00 +08:00
Kr328	aef0b84275	Fix: disable tproxy & redir by default	2022-01-14 23:58:46 +08:00
Kr328	12c704d89c	Chore: reformat build.gradle.kts	2022-01-14 23:40:41 +08:00
Kr328	38e070a565	Chore: update clash core	2022-01-14 23:39:33 +08:00
Kr328	c7d33c684b	Chore: clean build gradle	2022-01-14 23:20:01 +08:00
Kr328	b2661d31fd	Chore: update dependencies	2022-01-14 23:10:16 +08:00
kr328	53aa718674	Improve: patch all dns to core	2021-11-21 19:56:06 +08:00
okhowang	c173114368	Fix: crash with app icon (#1260 )	2021-11-21 17:41:21 +08:00
kr328	7006cb516c	Chore: update clash core	2021-11-21 17:17:33 +08:00
kr328	7809c30052	Refactor: refactor network observer	2021-11-21 16:55:55 +08:00
kr328	7e46d75159	Chore: update default fake-ip-filter	2021-11-21 13:54:31 +08:00
kr328	87f96b9ec7	Chore: bump version	2021-11-21 13:38:09 +08:00
kr328	3920f338f6	Chore: filter out premium build if unavailable	2021-11-21 13:38:01 +08:00
kr328	2565231867	Chore: remove unused ErrInvalidType	2021-11-21 13:31:34 +08:00
kr328	b7af3f7341	Fix: fix update profile dial	2021-11-21 13:31:25 +08:00
kr328	d93a7af534	Fix: fix network observe	2021-11-21 13:01:56 +08:00
kr328	1dcc8307ee	Chore: remove unused patch proxy group	2021-11-21 13:01:44 +08:00
kr328	9936a9469d	Fix: fix tun local addr	2021-11-21 13:01:27 +08:00
kr328	0e245b8936	Fix: downgrade kotlin version	2021-11-16 21:04:18 +08:00
kr328	226c11dda3	Chore: bump version	2021-11-16 20:29:46 +08:00
kr328	8330054a81	Chore: update dependencies	2021-11-16 20:29:36 +08:00
kr328	c7cb1dab38	Improve: disable network observer on screen off	2021-11-16 20:23:54 +08:00
kr328	a3686c16d4	Chore: update dependencies	2021-11-16 20:03:54 +08:00
kr328	b2a6a6a1ac	Chore: update tun2socket	2021-11-16 19:59:34 +08:00
kr328	e3e9a8ccc3	Fix: fix tunnel dialer	2021-11-16 19:59:22 +08:00
kr328	7058c7a4cd	Chore: update dependencies	2021-11-16 19:58:50 +08:00
kr328	2591de1c1d	Chore: bump version	2021-11-14 21:09:02 +08:00
kr328	d20f19c08f	Fix: fix network observer	2021-11-14 20:56:57 +08:00
kr328	a5ba4b4d23	Chore: update clash core	2021-11-14 20:55:35 +08:00
kr328	094815a098	Improve: remove loopback block & add allow bypass	2021-11-14 20:42:52 +08:00
kr328	5224fa656c	Chore: clean compat code	2021-11-14 20:33:37 +08:00
kr328	73550164a8	Refactor: refactor network observer	2021-11-14 20:33:25 +08:00
kr328	48a9ab313e	Chore: mark foss is default	2021-11-14 19:45:33 +08:00
kr328	25936c8361	Fix: fix dns fake-ip patch	2021-11-14 19:40:02 +08:00
kr328	3397cdd95f	Chore: update dependencies	2021-11-14 19:17:06 +08:00
kr328	69f8ff2688	Chore: update clash core	2021-11-14 15:45:31 +08:00
kr328	41ab062103	Refactor: migrate to tun2socket	2021-11-14 14:50:11 +08:00
Kr328	c78431a0fb	Chore: bump version	2021-10-15 11:07:10 +08:00
Kr328	3b33216961	Chore: update dependencies	2021-10-15 11:07:00 +08:00
Kr328	6373636d57	Chore: update clash core	2021-10-15 10:42:00 +08:00
Kr328	04a1f9987e	Chore: update tun2socket	2021-10-15 10:41:54 +08:00
Kr328	90d286cd5a	Chore: update gitignore	2021-09-26 10:04:35 +08:00
Kr328	1826d108a5	Chore: bump version	2021-09-24 11:24:05 +08:00
Goooler	a5619bb0ee	Chore: add cache action in CI (#1201 )	2021-09-24 11:15:07 +08:00
Goooler	5c1fadaba2	Chore: update dependencies (#1198 )	2021-09-24 11:13:10 +08:00
Kr328	7928f4321a	Chore: update clash core	2021-09-24 11:11:47 +08:00
Kr328	3b62367003	Chore: bump version	2021-09-17 11:21:21 +08:00
Kr328	c8994d8488	Chore: add version to output apks name	2021-09-17 11:19:03 +08:00
kr328	4033994111	Chore: bump version	2021-09-14 01:50:06 +08:00
kr328	2050fb56d0	Chore: update clash core	2021-09-14 01:49:45 +08:00
kr328	eeea9d0fce	Fix: add zhihu to http proxy black list	2021-09-14 01:07:55 +08:00
kr328	4b1f7a76c7	Chore: update dependencies	2021-09-13 22:44:01 +08:00
kr328	db2a7feb34	Chore: remove dependencies update detect plugin	2021-09-13 22:41:19 +08:00
Goooler	8b91b2eeb1	Chore: add .gitattributes (#1191 ) * Add .editorconfig * Add .gitattributes * Remove indent_style * Remove .editorconfig	2021-09-13 18:34:34 +08:00
Goooler	899803739b	Chore: remove unused dependencies & improve gradle properties & code style (#1189 ) * Inline version strings * Optimize gradle * Remove kotlin-stdlib-jdk7 * Add jvmargs in gradle.properties * Revert "Inline version strings" This reverts commit ad2ab2bb * Revert asserts	2021-09-13 17:49:23 +08:00
Goooler	1ea3a5b682	Chore: bump setup-java action & Remove setup-android action (#1188 ) * Bump setup-java action to v2 * Remove setup-android action * Remove ignore rules under github folder	2021-09-13 17:45:46 +08:00
kr328	f21cf86cc4	Chore: allow run workflow only main branch	2021-09-12 18:31:16 +08:00
kr328	bb1052bbc7	Chore: update README.md	2021-09-12 18:25:09 +08:00
kr328	7dad08346c	Chore: update dependencies	2021-09-12 18:02:30 +08:00
kr328	b7c56e58ae	Chore: add hideapi to app module to avoid r8 class missing	2021-09-12 17:50:48 +08:00
kr328	a6f6da5bc5	Chore: remove unused check	2021-09-12 17:39:04 +08:00
kr328	f271ba3d97	Feature: add dns.geoip-code support	2021-09-12 17:38:52 +08:00
kr328	66d02c7e2d	Chore: bump version	2021-09-12 13:19:55 +08:00
kr328	0406573317	Refactor: refactor properties	2021-09-12 13:19:40 +08:00
kr328	4a8b6b2704	Refactor: refactor design structure	2021-09-12 13:01:08 +08:00
kr328	603cec113c	Chore: update clash patch	2021-09-12 12:40:15 +08:00
kr328	a579c7bb86	Fix: should not delay before patch system dns	2021-09-12 12:24:09 +08:00
kr328	654c488ed8	Fix: fix time zone	2021-09-12 11:46:20 +08:00
kr328	ecfb339680	Chore: fix code style	2021-09-12 11:26:27 +08:00
kr328	ecbe222a50	Chore: update dependencies	2021-09-12 11:14:45 +08:00
kr328	aacf62c259	Chore: update dependencies	2021-09-12 11:04:26 +08:00
kr328	3973fb2706	Fix: fix premium build	2021-09-12 01:33:52 +08:00
kr328	07ff81f4db	Fix: should add main golang source as input	2021-09-12 00:43:32 +08:00
kr328	c0e1e45b72	Refactor: refactor clash core building	2021-09-12 00:39:59 +08:00
Kr328	b07f70ab0b	Improve: should not reload profile on network changed	2021-09-11 23:37:54 +08:00
Kr328	e1a35f8b2d	Chore: bump go version to 1.17	2021-09-11 19:49:26 +08:00
kr328	e364af393a	Refactor: refactor golang flavor	2021-09-11 18:29:05 +08:00
Kr328	11c4e19e0c	Refactor: refactor project structure & update clash core (#1174 ) * Refactor: refactor project structure * Chore: remove apply * Chore: update clash core * Fix: fix versionName & versionCode patch * Chore: update golang plugin * Fix: fix workflow build	2021-09-11 14:53:09 +08:00
Kr328	fa23be76ed	Chore: update tun2socket	2021-06-20 13:22:48 +08:00
kr328	8e50d35eba	Fix: fix GLOBAL url testing	2021-06-19 19:37:19 +08:00