Compare commits
101 Commits
v0.8.17-de
...
v0.8.75
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6266b7917 | ||
|
|
6c27f2e2f1 | ||
|
|
e04a0094b1 | ||
|
|
683e6a58ea | ||
|
|
b340feeb49 | ||
|
|
6a39b7ef5a | ||
|
|
35f89fea90 | ||
|
|
58acd9c1ab | ||
|
|
ef97ef40a1 | ||
|
|
9cb75f4814 | ||
|
|
375c4e0884 | ||
|
|
ece8a48181 | ||
|
|
4b32a096dd | ||
|
|
04d6a928eb | ||
|
|
22e71ec6e1 | ||
|
|
6f1b07e26b | ||
|
|
1e3ab1c717 | ||
|
|
3a43dc2fe9 | ||
|
|
c94f64cf78 | ||
|
|
25764fc4d3 | ||
|
|
649dbb9886 | ||
|
|
e1dd616d74 | ||
|
|
c91d78b63f | ||
|
|
82767325e5 | ||
|
|
3f0f7f051b | ||
|
|
15c64327db | ||
|
|
09e35eb5dd | ||
|
|
77c4935106 | ||
|
|
e6da643186 | ||
|
|
61bd4e4549 | ||
|
|
a5f4d12748 | ||
|
|
9dc67f31a3 | ||
|
|
846ec9728f | ||
|
|
6e5f1b8e5f | ||
|
|
aca4a3e979 | ||
|
|
3783c3c650 | ||
|
|
01aed99002 | ||
|
|
9aec1e75e4 | ||
|
|
5dfb95a22d | ||
|
|
0f8cfa20b2 | ||
|
|
3933fd9d9e | ||
|
|
b7400f2ce8 | ||
|
|
d0ec580932 | ||
|
|
6bc0be9876 | ||
|
|
38221bcd10 | ||
|
|
bee2f8aa4f | ||
|
|
6cfcaa4edc | ||
|
|
3fdc69edd5 | ||
|
|
ed7ade0d72 | ||
|
|
621ddefc65 | ||
|
|
6de89d7de4 | ||
|
|
c36df8cb4a | ||
|
|
530817b268 | ||
|
|
721dd20251 | ||
|
|
f2aa8851ae | ||
|
|
ec2890cab2 | ||
|
|
ca946c1b06 | ||
|
|
3bc3172723 | ||
|
|
82be4cc45f | ||
|
|
2c3f4ae8a8 | ||
|
|
891977408e | ||
|
|
5292f34e8d | ||
|
|
1c54db6bf3 | ||
|
|
a4b5f4abdb | ||
|
|
aa4ffbe4fb | ||
|
|
3d25298639 | ||
|
|
1765576d09 | ||
|
|
2dd45062f1 | ||
|
|
c6407984ac | ||
|
|
53af86238e | ||
|
|
b20d9edec2 | ||
|
|
5c3a0c576d | ||
|
|
6dcb466fd3 | ||
|
|
acbcec358b | ||
|
|
a923549ddf | ||
|
|
07bd21580b | ||
|
|
57ceb64a5e | ||
|
|
713e83d9d8 | ||
|
|
5e3b0e4929 | ||
|
|
0389b6eb29 | ||
|
|
8f22cbf746 | ||
|
|
1fcc412770 | ||
|
|
afa1b4f424 | ||
|
|
fa67940ec9 | ||
|
|
90bb670442 | ||
|
|
05abf2d56d | ||
|
|
658727dd79 | ||
|
|
f7abf6446c | ||
|
|
5ab4dd0cbd | ||
|
|
35f7279fcb | ||
|
|
86572cc960 | ||
|
|
ee22709d49 | ||
|
|
0a2ad63f38 | ||
|
|
2ec12c9363 | ||
|
|
a3c2dc786c | ||
|
|
7acf9c6db3 | ||
|
|
8074547fb4 | ||
|
|
8a01e04871 | ||
|
|
7ddcdd9828 | ||
|
|
d89ed076fd | ||
|
|
f4c3b06cd5 |
58
.github/release_template.md
vendored
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
<div align=center>
|
||||||
|
|
||||||
|
[](https://img.shields.io/github/downloads/chen08209/FlClash/vVERSION/)
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
**Download based on your OS:**
|
||||||
|
|
||||||
|
<div align=left>
|
||||||
|
<table>
|
||||||
|
<thead align=left>
|
||||||
|
<tr>
|
||||||
|
<th>OS</th>
|
||||||
|
<th>Download</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody align=left>
|
||||||
|
<tr>
|
||||||
|
<td>Android</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-arm64-v8a.apk"><img src="https://img.shields.io/badge/APK-ARMv8-168039.svg?logo=android"></a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-armeabi-v7a.apk"><img src="https://img.shields.io/badge/APK-ARMv7-45bf55.svg?logo=android"></a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-x86_64.apk"><img src="https://img.shields.io/badge/APK-x64-96ed89.svg?logo=android"></a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Windows</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64-setup.exe"><img src="https://img.shields.io/badge/Setup-x64-2d7d9a.svg?logo=windows"></a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64.zip"><img src="https://img.shields.io/badge/Portable-x64-67b7d1.svg?logo=windows"></a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>macOS</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-arm64.dmg"><img src="https://img.shields.io/badge/DMG-Apple%20Silicon-%23000000.svg?logo=apple"></a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Intel%20X64-%2300A9E0.svg?logo=apple"></a><br>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Linux</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.AppImage"><img src="https://img.shields.io/badge/AppImage-x64-f84e29.svg?logo=linux"> </a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/DebPackage-x64-FF9966.svg?logo=debian"> </a><br>
|
||||||
|
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/RpmPackage-x64-F1B42F.svg?logo=redhat"> </a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div dir="ltr">
|
||||||
|
|
||||||
|
**List of all changes:** [ChangeLog](https://github.com/chen08209/FlClash/blob/main/CHANGELOG.md)
|
||||||
|
|
||||||
|
</div>
|
||||||
245
.github/workflows/build.yaml
vendored
Normal file
@@ -0,0 +1,245 @@
|
|||||||
|
name: build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- platform: android
|
||||||
|
os: ubuntu-latest
|
||||||
|
- platform: windows
|
||||||
|
os: windows-latest
|
||||||
|
arch: amd64
|
||||||
|
- platform: linux
|
||||||
|
os: ubuntu-latest
|
||||||
|
arch: amd64
|
||||||
|
- platform: macos
|
||||||
|
os: macos-13
|
||||||
|
arch: amd64
|
||||||
|
- platform: macos
|
||||||
|
os: macos-latest
|
||||||
|
arch: arm64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Setup JAVA
|
||||||
|
if: startsWith(matrix.platform,'android')
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: 'zulu'
|
||||||
|
java-version: 17
|
||||||
|
|
||||||
|
- name: Setup NDK
|
||||||
|
if: startsWith(matrix.platform,'android')
|
||||||
|
uses: nttld/setup-ndk@v1
|
||||||
|
id: setup-ndk
|
||||||
|
with:
|
||||||
|
ndk-version: r26b
|
||||||
|
add-to-path: true
|
||||||
|
link-to-sdk: true
|
||||||
|
|
||||||
|
- name: Setup Android Signing
|
||||||
|
if: startsWith(matrix.platform,'android')
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
|
||||||
|
echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
|
||||||
|
echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
|
||||||
|
echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
|
||||||
|
|
||||||
|
|
||||||
|
- name: Setup Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: 'stable'
|
||||||
|
cache-dependency-path: |
|
||||||
|
core/go.sum
|
||||||
|
|
||||||
|
- name: Setup Flutter
|
||||||
|
uses: subosito/flutter-action@v2
|
||||||
|
with:
|
||||||
|
flutter-version: 3.24.5
|
||||||
|
channel: stable
|
||||||
|
cache: true
|
||||||
|
|
||||||
|
- name: Get Flutter Dependency
|
||||||
|
run: flutter pub get
|
||||||
|
|
||||||
|
- name: Setup
|
||||||
|
run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
|
||||||
|
|
||||||
|
- name: Upload
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
|
||||||
|
path: ./dist
|
||||||
|
overwrite: true
|
||||||
|
|
||||||
|
changelog:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [ build ]
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
ref: refs/heads/main
|
||||||
|
|
||||||
|
- name: Generate
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
run: |
|
||||||
|
tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
|
||||||
|
preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
|
||||||
|
currentTag=""
|
||||||
|
for ((i = 0; i <= ${#tags[@]}; i++)); do
|
||||||
|
if (( i < ${#tags[@]} )); then
|
||||||
|
tag=${tags[$i]}
|
||||||
|
else
|
||||||
|
tag=""
|
||||||
|
fi
|
||||||
|
if [ -n "$currentTag" ]; then
|
||||||
|
if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [ -n "$currentTag" ]; then
|
||||||
|
echo "## $currentTag" >> NEW_CHANGELOG.md
|
||||||
|
echo "" >> NEW_CHANGELOG.md
|
||||||
|
if [ -n "$tag" ]; then
|
||||||
|
git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
|
||||||
|
else
|
||||||
|
git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
|
||||||
|
fi
|
||||||
|
echo "" >> NEW_CHANGELOG.md
|
||||||
|
fi
|
||||||
|
currentTag=$tag
|
||||||
|
done
|
||||||
|
cat CHANGELOG.md >> NEW_CHANGELOG.md
|
||||||
|
cat NEW_CHANGELOG.md > CHANGELOG.md
|
||||||
|
|
||||||
|
- name: Commit
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
run: |
|
||||||
|
git add CHANGELOG.md
|
||||||
|
if ! git diff --cached --quiet; then
|
||||||
|
echo "Commit pushing"
|
||||||
|
git config --local user.email "chen08209@gmail.com"
|
||||||
|
git config --local user.name "chen08209"
|
||||||
|
git commit -m "Update changelog"
|
||||||
|
git push
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Push succeeded"
|
||||||
|
else
|
||||||
|
echo "Push failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
upload:
|
||||||
|
permissions: write-all
|
||||||
|
needs: [ build ]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
services:
|
||||||
|
telegram-bot-api:
|
||||||
|
image: aiogram/telegram-bot-api:latest
|
||||||
|
env:
|
||||||
|
TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID }}
|
||||||
|
TELEGRAM_API_HASH: ${{ secrets.TELEGRAM_API_HASH }}
|
||||||
|
ports:
|
||||||
|
- 8081:8081
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Download
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
path: ./dist/
|
||||||
|
pattern: artifact-*
|
||||||
|
merge-multiple: true
|
||||||
|
|
||||||
|
- name: Generate release.md
|
||||||
|
run: |
|
||||||
|
tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
|
||||||
|
preTag=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
|
||||||
|
currentTag=""
|
||||||
|
for ((i = 0; i <= ${#tags[@]}; i++)); do
|
||||||
|
if (( i < ${#tags[@]} )); then
|
||||||
|
tag=${tags[$i]}
|
||||||
|
else
|
||||||
|
tag=""
|
||||||
|
fi
|
||||||
|
if [ -n "$currentTag" ]; then
|
||||||
|
if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [ -n "$currentTag" ]; then
|
||||||
|
if [ -n "$tag" ]; then
|
||||||
|
git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
|
||||||
|
else
|
||||||
|
git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
|
||||||
|
fi
|
||||||
|
echo "" >> release.md
|
||||||
|
fi
|
||||||
|
currentTag=$tag
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: Push to telegram
|
||||||
|
env:
|
||||||
|
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
||||||
|
TAG: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install requests
|
||||||
|
python release.py
|
||||||
|
|
||||||
|
- name: Patch release.md
|
||||||
|
run: |
|
||||||
|
version=$(echo "${{ github.ref_name }}" | sed 's/^v//')
|
||||||
|
sed "s|VERSION|$version|g" ./.github/release_template.md >> release.md
|
||||||
|
|
||||||
|
- name: Release
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
files: ./dist/*
|
||||||
|
body_path: './release.md'
|
||||||
|
|
||||||
|
- name: Create Fdroid Source Dir
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
run: |
|
||||||
|
mkdir -p ./tmp
|
||||||
|
cp ./dist/*android-arm64-v8a* ./tmp/ || true
|
||||||
|
echo "Files copied successfully"
|
||||||
|
|
||||||
|
- name: Push to fdroid repo
|
||||||
|
if: ${{ !contains(github.ref, '+') }}
|
||||||
|
uses: cpina/github-action-push-to-another-repository@v1.7.2
|
||||||
|
env:
|
||||||
|
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||||
|
with:
|
||||||
|
source-directory: ./tmp/
|
||||||
|
destination-github-username: chen08209
|
||||||
|
destination-repository-name: FlClash-fdroid-repo
|
||||||
|
user-name: 'github-actions[bot]'
|
||||||
|
user-email: 'github-actions[bot]@users.noreply.github.com'
|
||||||
|
target-branch: action-pr
|
||||||
|
commit-message: Update from ${{ github.ref_name }}
|
||||||
|
target-directory: /tmp/
|
||||||
|
|
||||||
118
.github/workflows/build.yml
vendored
@@ -1,118 +0,0 @@
|
|||||||
name: build
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- platform: android
|
|
||||||
os: ubuntu-latest
|
|
||||||
- platform: windows
|
|
||||||
os: windows-latest
|
|
||||||
- platform: linux
|
|
||||||
os: ubuntu-latest
|
|
||||||
# - platform: macos
|
|
||||||
# os: macos-13
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Setup JAVA
|
|
||||||
if: startsWith(matrix.platform,'android')
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: 'zulu'
|
|
||||||
java-version: 17
|
|
||||||
|
|
||||||
- name: Setup NDK
|
|
||||||
if: startsWith(matrix.platform,'android')
|
|
||||||
uses: nttld/setup-ndk@v1
|
|
||||||
id: setup-ndk
|
|
||||||
with:
|
|
||||||
ndk-version: r26b
|
|
||||||
add-to-path: true
|
|
||||||
link-to-sdk: true
|
|
||||||
|
|
||||||
- name: Setup Android Signing
|
|
||||||
if: startsWith(matrix.platform,'android')
|
|
||||||
run: |
|
|
||||||
echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
|
|
||||||
echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
|
|
||||||
echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
|
|
||||||
echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
|
|
||||||
|
|
||||||
|
|
||||||
- name: Setup Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version-file: 'core/go.mod'
|
|
||||||
cache-dependency-path: |
|
|
||||||
core/go.sum
|
|
||||||
|
|
||||||
- name: Setup Flutter
|
|
||||||
uses: subosito/flutter-action@v2
|
|
||||||
with:
|
|
||||||
flutter-version: '3.x'
|
|
||||||
channel: 'stable'
|
|
||||||
cache: true
|
|
||||||
|
|
||||||
- name: Get Flutter Dependency
|
|
||||||
run: flutter pub get
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
run: |
|
|
||||||
dart setup.dart ${{ matrix.platform }}
|
|
||||||
|
|
||||||
- name: Upload
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: artifact-${{ matrix.platform }}
|
|
||||||
path: ./dist
|
|
||||||
retention-days: 1
|
|
||||||
overwrite: true
|
|
||||||
|
|
||||||
|
|
||||||
upload-release:
|
|
||||||
if: ${{ !endsWith(github.ref, '-debug') }}
|
|
||||||
permissions: write-all
|
|
||||||
needs: [ build ]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Download
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
path: ./dist/
|
|
||||||
pattern: artifact-*
|
|
||||||
merge-multiple: true
|
|
||||||
|
|
||||||
- name: Pre Release
|
|
||||||
run: |
|
|
||||||
pip install gitchangelog pystache mustache markdown
|
|
||||||
pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
|
|
||||||
if [ -z "pre" ]; then
|
|
||||||
echo "init" > release.md
|
|
||||||
else
|
|
||||||
current="${{ github.ref_name }}"
|
|
||||||
echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
|
|
||||||
gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
|
|
||||||
echo -e "\n\n</details>" >> release.md
|
|
||||||
fi
|
|
||||||
- name: Release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
files: ./dist/*
|
|
||||||
body_path: './release.md'
|
|
||||||
2
.gitignore
vendored
@@ -5,9 +5,11 @@
|
|||||||
*.swp
|
*.swp
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.atom/
|
.atom/
|
||||||
|
.build/
|
||||||
.buildlog/
|
.buildlog/
|
||||||
.history
|
.history
|
||||||
.svn/
|
.svn/
|
||||||
|
.swiftpm/
|
||||||
migrate_working_dir/
|
migrate_working_dir/
|
||||||
|
|
||||||
# IntelliJ related
|
# IntelliJ related
|
||||||
|
|||||||
4
.gitmodules
vendored
@@ -1,8 +1,8 @@
|
|||||||
[submodule "core/Clash.Meta"]
|
[submodule "core/Clash.Meta"]
|
||||||
path = core/Clash.Meta
|
path = core/Clash.Meta
|
||||||
url = git@github.com:chen08209/Clash.Meta.git
|
url = git@github.com:chen08209/Clash.Meta.git
|
||||||
branch = FlClash
|
branch = FlClash-Alpha
|
||||||
[submodule "plugins/flutter_distributor"]
|
[submodule "plugins/flutter_distributor"]
|
||||||
path = plugins/flutter_distributor
|
path = plugins/flutter_distributor
|
||||||
url = git@github.com:chen08209/flutter_distributor.git
|
url = git@github.com:chen08209/flutter_distributor.git
|
||||||
branch = main
|
branch = FlClash
|
||||||
|
|||||||
750
CHANGELOG.md
Normal file
@@ -0,0 +1,750 @@
|
|||||||
|
## v0.8.74
|
||||||
|
|
||||||
|
- Fix some issues
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
## v0.8.73
|
||||||
|
|
||||||
|
- Update popup menu
|
||||||
|
|
||||||
|
- Add file editor
|
||||||
|
|
||||||
|
- Fix android service issues
|
||||||
|
|
||||||
|
- Optimize desktop background performance
|
||||||
|
|
||||||
|
- Optimize android main process performance
|
||||||
|
|
||||||
|
- Optimize delay test
|
||||||
|
|
||||||
|
- Optimize vpn protect
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
## v0.8.72
|
||||||
|
|
||||||
|
- Update core
|
||||||
|
|
||||||
|
- Fix some issues
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
## v0.8.71
|
||||||
|
|
||||||
|
- Remake dashboard
|
||||||
|
|
||||||
|
- Optimize theme
|
||||||
|
|
||||||
|
- Optimize more details
|
||||||
|
|
||||||
|
- Update flutter version
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
## v0.8.70
|
||||||
|
|
||||||
|
- Support better window position memory
|
||||||
|
|
||||||
|
- Add windows arm64 and linux arm64 build script
|
||||||
|
|
||||||
|
- Optimize some details
|
||||||
|
|
||||||
|
## v0.8.69
|
||||||
|
|
||||||
|
- Remake desktop
|
||||||
|
|
||||||
|
- Optimize change proxy
|
||||||
|
|
||||||
|
- Optimize network check
|
||||||
|
|
||||||
|
- Fix fallback issues
|
||||||
|
|
||||||
|
- Optimize lots of details
|
||||||
|
|
||||||
|
- Update change.yaml
|
||||||
|
|
||||||
|
- Fix android tile issues
|
||||||
|
|
||||||
|
- Fix windows tray issues
|
||||||
|
|
||||||
|
- Support setting bypassDomain
|
||||||
|
|
||||||
|
- Update flutter version
|
||||||
|
|
||||||
|
- Fix android service issues
|
||||||
|
|
||||||
|
- Fix macos dock exit button issues
|
||||||
|
|
||||||
|
- Add route address setting
|
||||||
|
|
||||||
|
- Optimize provider view
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
- Update CHANGELOG.md
|
||||||
|
|
||||||
|
## v0.8.67
|
||||||
|
|
||||||
|
- Add android shortcuts
|
||||||
|
|
||||||
|
- Fix init params issues
|
||||||
|
|
||||||
|
- Fix dynamic color issues
|
||||||
|
|
||||||
|
- Optimize navigator animate
|
||||||
|
|
||||||
|
- Optimize window init
|
||||||
|
|
||||||
|
- Optimize fab
|
||||||
|
|
||||||
|
- Optimize save
|
||||||
|
|
||||||
|
## v0.8.66
|
||||||
|
|
||||||
|
- Fix the collapse issues
|
||||||
|
|
||||||
|
- Add fontFamily options
|
||||||
|
|
||||||
|
## v0.8.65
|
||||||
|
|
||||||
|
- Update core version
|
||||||
|
|
||||||
|
- Update flutter version
|
||||||
|
|
||||||
|
- Optimize ip check
|
||||||
|
|
||||||
|
- Optimize url-test
|
||||||
|
|
||||||
|
## v0.8.64
|
||||||
|
|
||||||
|
- Update release message
|
||||||
|
|
||||||
|
- Init auto gen changelog
|
||||||
|
|
||||||
|
- Fix windows tray issues
|
||||||
|
|
||||||
|
- Fix urltest issues
|
||||||
|
|
||||||
|
- Add auto changelog
|
||||||
|
|
||||||
|
- Fix windows admin auto launch issues
|
||||||
|
|
||||||
|
- Add android vpn options
|
||||||
|
|
||||||
|
- Support proxies icon configuration
|
||||||
|
|
||||||
|
- Optimize android immersion display
|
||||||
|
|
||||||
|
- Fix some issues
|
||||||
|
|
||||||
|
- Optimize ip detection
|
||||||
|
|
||||||
|
- Support android vpn ipv6 inbound switch
|
||||||
|
|
||||||
|
- Support log export
|
||||||
|
|
||||||
|
- Optimize more details
|
||||||
|
|
||||||
|
- Fix android system dns issues
|
||||||
|
|
||||||
|
- Optimize dns default option
|
||||||
|
|
||||||
|
- Fix some issues
|
||||||
|
|
||||||
|
- Update readme
|
||||||
|
|
||||||
|
## v0.8.60
|
||||||
|
|
||||||
|
- Fix build error2
|
||||||
|
|
||||||
|
- Fix build error
|
||||||
|
|
||||||
|
- Support desktop hotkey
|
||||||
|
|
||||||
|
- Support android ipv6 inbound
|
||||||
|
|
||||||
|
- Support android system dns
|
||||||
|
|
||||||
|
- fix some bugs
|
||||||
|
|
||||||
|
## v0.8.59
|
||||||
|
|
||||||
|
- Fix delete profile error
|
||||||
|
|
||||||
|
## v0.8.58
|
||||||
|
|
||||||
|
- Fix submit error 2
|
||||||
|
|
||||||
|
- Fix submit error
|
||||||
|
|
||||||
|
- Optimize DNS strategy
|
||||||
|
|
||||||
|
- Fix the problem that the tray is not displayed in some cases
|
||||||
|
|
||||||
|
- Optimize tray
|
||||||
|
|
||||||
|
- Update core
|
||||||
|
|
||||||
|
- Fix some error
|
||||||
|
|
||||||
|
## v0.8.57
|
||||||
|
|
||||||
|
- Fix tun update issues
|
||||||
|
|
||||||
|
- Add DNS override
|
||||||
|
- Fixed some bugs
|
||||||
|
- Optimize more detail
|
||||||
|
|
||||||
|
- Add Hosts override
|
||||||
|
|
||||||
|
## v0.8.56
|
||||||
|
|
||||||
|
- fix android tip error
|
||||||
|
- fix windows auto launch error
|
||||||
|
|
||||||
|
## v0.8.55
|
||||||
|
|
||||||
|
- Fix windows tray issues
|
||||||
|
|
||||||
|
- Optimize windows logic
|
||||||
|
|
||||||
|
- Optimize app logic
|
||||||
|
|
||||||
|
- Support windows administrator auto launch
|
||||||
|
|
||||||
|
- Support android close vpn
|
||||||
|
|
||||||
|
## v0.8.53
|
||||||
|
|
||||||
|
- Change flutter version
|
||||||
|
|
||||||
|
- Support profiles sort
|
||||||
|
|
||||||
|
- Support windows country flags display
|
||||||
|
|
||||||
|
- Optimize proxies page and profiles page columns
|
||||||
|
|
||||||
|
## v0.8.52
|
||||||
|
|
||||||
|
- Update flutter version
|
||||||
|
|
||||||
|
- Update version
|
||||||
|
|
||||||
|
- Update timeout time
|
||||||
|
|
||||||
|
- Update access control page
|
||||||
|
|
||||||
|
- Fix bug
|
||||||
|
|
||||||
|
## v0.8.51
|
||||||
|
|
||||||
|
- Optimize provider page
|
||||||
|
|
||||||
|
- Optimize delay test
|
||||||
|
|
||||||
|
- Support local backup and recovery
|
||||||
|
|
||||||
|
- Fix android tile service issues
|
||||||
|
|
||||||
|
## v0.8.49
|
||||||
|
|
||||||
|
- Fix linux core build error
|
||||||
|
|
||||||
|
- Add proxy-only traffic statistics
|
||||||
|
|
||||||
|
- Update core
|
||||||
|
|
||||||
|
- Optimize more details
|
||||||
|
|
||||||
|
- Merge pull request #140 from txyyh/main
|
||||||
|
|
||||||
|
- 添加自建 F-Droid 仓库相关 workflow
|
||||||
|
- Rename readme fingerprint
|
||||||
|
|
||||||
|
- Rename workflow deploy repo name
|
||||||
|
|
||||||
|
- Add download guide to README
|
||||||
|
|
||||||
|
- Add push release files to fdroid-repo
|
||||||
|
|
||||||
|
## v0.8.48
|
||||||
|
|
||||||
|
- Optimize proxies page
|
||||||
|
|
||||||
|
- Fix ua issues
|
||||||
|
|
||||||
|
- Optimize more details
|
||||||
|
|
||||||
|
## v0.8.47
|
||||||
|
|
||||||
|
- Fix windows build error
|
||||||
|
|
||||||
|
## v0.8.46
|
||||||
|
|
||||||
|
- Update app icon
|
||||||
|
|
||||||
|
- Fix desktop backup error
|
||||||
|
|
||||||
|
- Optimize request ua
|
||||||
|
|
||||||
|
- Change android icon
|
||||||
|
|
||||||
|
- Optimize dashboard
|
||||||
|
|
||||||
|
## v0.8.44
|
||||||
|
|
||||||
|
- Remove request validate certificate
|
||||||
|
|
||||||
|
- Sync core
|
||||||
|
|
||||||
|
## v0.8.43
|
||||||
|
|
||||||
|
- Fix windows error
|
||||||
|
|
||||||
|
## v0.8.42
|
||||||
|
|
||||||
|
- Fix setup.dart error
|
||||||
|
|
||||||
|
- Fix android system proxy not effective
|
||||||
|
|
||||||
|
- Add macos arm64
|
||||||
|
|
||||||
|
## v0.8.41
|
||||||
|
|
||||||
|
- Optimize proxies page
|
||||||
|
|
||||||
|
- Support mouse drag scroll
|
||||||
|
|
||||||
|
- Adjust desktop ui
|
||||||
|
|
||||||
|
- Revert "Fix android vpn issues"
|
||||||
|
|
||||||
|
- This reverts commit 891977408e6938e2acd74e9b9adb959c48c79988.
|
||||||
|
|
||||||
|
## v0.8.40
|
||||||
|
|
||||||
|
- Fix android vpn issues
|
||||||
|
|
||||||
|
- Fix android vpn issues
|
||||||
|
|
||||||
|
- Rollback partial modification
|
||||||
|
|
||||||
|
## v0.8.39
|
||||||
|
|
||||||
|
- Fix the problem that ui can't be synchronized when android vpn is occupied by an external
|
||||||
|
|
||||||
|
- Override default socksPort,port
|
||||||
|
|
||||||
|
## v0.8.38
|
||||||
|
|
||||||
|
- Fix fab issues
|
||||||
|
|
||||||
|
## v0.8.37
|
||||||
|
|
||||||
|
- Update version
|
||||||
|
|
||||||
|
- Fix the problem that vpn cannot be started in some cases
|
||||||
|
|
||||||
|
- Fix the problem that geodata url does not take effect
|
||||||
|
|
||||||
|
## v0.8.36
|
||||||
|
|
||||||
|
- Update ua
|
||||||
|
|
||||||
|
- Fix change outbound mode without check ip issues
|
||||||
|
|
||||||
|
- Separate android ui and vpn
|
||||||
|
|
||||||
|
- Fix url validate issues 2
|
||||||
|
|
||||||
|
- Add android hidden from the recent task
|
||||||
|
|
||||||
|
- Add geoip file
|
||||||
|
|
||||||
|
- Support modify geoData URL
|
||||||
|
|
||||||
|
## v0.8.35
|
||||||
|
|
||||||
|
- Fix url validate issues
|
||||||
|
|
||||||
|
- Fix check ip performance problem
|
||||||
|
|
||||||
|
- Optimize resources page
|
||||||
|
|
||||||
|
## v0.8.34
|
||||||
|
|
||||||
|
- Add ua selector
|
||||||
|
|
||||||
|
- Support modify test url
|
||||||
|
|
||||||
|
- Optimize android proxy
|
||||||
|
|
||||||
|
- Fix the error that async proxy provider could not selected the proxy
|
||||||
|
|
||||||
|
## v0.8.33
|
||||||
|
|
||||||
|
- Fix android proxy error
|
||||||
|
|
||||||
|
- Fix submit error
|
||||||
|
|
||||||
|
- Add windows tun
|
||||||
|
|
||||||
|
- Optimize android proxy
|
||||||
|
|
||||||
|
- Optimize change profile
|
||||||
|
|
||||||
|
- Update application ua
|
||||||
|
|
||||||
|
- Optimize delay test
|
||||||
|
|
||||||
|
## v0.8.32
|
||||||
|
|
||||||
|
- Fix android repeated request notification issues
|
||||||
|
|
||||||
|
## v0.8.31
|
||||||
|
|
||||||
|
- Fix memory overflow issues
|
||||||
|
|
||||||
|
## v0.8.30
|
||||||
|
|
||||||
|
- Optimize proxies expansion panel 2
|
||||||
|
|
||||||
|
- Fix android scan qrcode error
|
||||||
|
|
||||||
|
## v0.8.29
|
||||||
|
|
||||||
|
- Optimize proxies expansion panel
|
||||||
|
|
||||||
|
- Fix text error
|
||||||
|
|
||||||
|
## v0.8.28
|
||||||
|
|
||||||
|
- Optimize proxy
|
||||||
|
|
||||||
|
- Optimize delayed sorting performance
|
||||||
|
|
||||||
|
- Add expansion panel proxies page
|
||||||
|
|
||||||
|
- Support to adjust the proxy card size
|
||||||
|
|
||||||
|
- Support to adjust proxies columns number
|
||||||
|
|
||||||
|
- Fix autoRun show issues
|
||||||
|
|
||||||
|
- Fix Android 10 issues
|
||||||
|
|
||||||
|
- Optimize ip show
|
||||||
|
|
||||||
|
## v0.8.26
|
||||||
|
|
||||||
|
- Add intranet IP display
|
||||||
|
|
||||||
|
- Add connections page
|
||||||
|
|
||||||
|
- Add search in connections, requests
|
||||||
|
|
||||||
|
- Add keyword search in connections, requests, logs
|
||||||
|
|
||||||
|
- Add basic viewing editing capabilities
|
||||||
|
|
||||||
|
- Optimize update profile
|
||||||
|
|
||||||
|
## v0.8.25
|
||||||
|
|
||||||
|
- Update version
|
||||||
|
|
||||||
|
- Fix the problem of excessive memory usage in traffic usage.
|
||||||
|
|
||||||
|
- Add lightBlue theme color
|
||||||
|
|
||||||
|
- Fix start unable to update profile issues
|
||||||
|
|
||||||
|
- Fix flashback caused by process
|
||||||
|
|
||||||
|
## v0.8.23
|
||||||
|
|
||||||
|
- Add build version
|
||||||
|
|
||||||
|
- Optimize quick start
|
||||||
|
|
||||||
|
- Update system default option
|
||||||
|
|
||||||
|
## v0.8.22
|
||||||
|
|
||||||
|
- Update build.yml
|
||||||
|
|
||||||
|
- Fix android vpn close issues
|
||||||
|
|
||||||
|
- Add requests page
|
||||||
|
|
||||||
|
- Fix checkUpdate dark mode style error
|
||||||
|
|
||||||
|
- Fix quickStart error open app
|
||||||
|
|
||||||
|
- Add memory proxies tab index
|
||||||
|
|
||||||
|
- Support hidden group
|
||||||
|
|
||||||
|
- Optimize logs
|
||||||
|
|
||||||
|
- Fix externalController hot load error
|
||||||
|
|
||||||
|
## v0.8.21
|
||||||
|
|
||||||
|
- Add tcp concurrent switch
|
||||||
|
|
||||||
|
- Add system proxy switch
|
||||||
|
|
||||||
|
- Add geodata loader switch
|
||||||
|
|
||||||
|
- Add external controller switch
|
||||||
|
|
||||||
|
- Add auto gc on trim memory
|
||||||
|
|
||||||
|
- Fix android notification error
|
||||||
|
|
||||||
|
## v0.8.20
|
||||||
|
|
||||||
|
- Fix ipv6 error
|
||||||
|
|
||||||
|
- Fix android udp direct error
|
||||||
|
|
||||||
|
- Add ipv6 switch
|
||||||
|
|
||||||
|
- Add access all selected button
|
||||||
|
|
||||||
|
- Remove android low version splash
|
||||||
|
|
||||||
|
## v0.8.19
|
||||||
|
|
||||||
|
- Update version
|
||||||
|
|
||||||
|
- Add allowBypass
|
||||||
|
|
||||||
|
- Fix Android only pick .text file issues
|
||||||
|
|
||||||
|
## v0.8.18
|
||||||
|
|
||||||
|
- Fix search issues
|
||||||
|
|
||||||
|
## v0.8.17
|
||||||
|
|
||||||
|
- Fix LoadBalance, Relay load error
|
||||||
|
|
||||||
|
- Fix build.yml4
|
||||||
|
|
||||||
|
- Fix build.yml3
|
||||||
|
|
||||||
|
- Fix build.yml2
|
||||||
|
|
||||||
|
- Fix build.yml
|
||||||
|
|
||||||
|
- Add search function at access control
|
||||||
|
|
||||||
|
- Fix the issues with the profile add button to cover the edit button
|
||||||
|
|
||||||
|
- Adapt LoadBalance and Relay
|
||||||
|
|
||||||
|
- Add arm
|
||||||
|
|
||||||
|
- Fix android notification icon error
|
||||||
|
|
||||||
|
## v0.8.16
|
||||||
|
|
||||||
|
- Add one-click update all profiles
|
||||||
|
- Add expire show
|
||||||
|
|
||||||
|
## v0.8.15
|
||||||
|
|
||||||
|
- Temp remove tun mode
|
||||||
|
|
||||||
|
- Remove macos in workflow
|
||||||
|
|
||||||
|
- Change go version
|
||||||
|
|
||||||
|
## v0.8.14
|
||||||
|
|
||||||
|
- Update Version
|
||||||
|
|
||||||
|
- Fix tun unable to open
|
||||||
|
|
||||||
|
## v0.8.13
|
||||||
|
|
||||||
|
- Optimize delay test2
|
||||||
|
|
||||||
|
- Optimize delay test
|
||||||
|
|
||||||
|
- Add check ip
|
||||||
|
|
||||||
|
- add check ip request
|
||||||
|
|
||||||
|
## v0.8.12
|
||||||
|
|
||||||
|
- Fix the problem that the download of remote resources failed after GeodataMode was turned on, which caused the
|
||||||
|
application to flash back.
|
||||||
|
|
||||||
|
- Fix edit profile error
|
||||||
|
|
||||||
|
- Fix quickStart change proxy error
|
||||||
|
|
||||||
|
- Fix core version
|
||||||
|
|
||||||
|
## v0.8.10
|
||||||
|
|
||||||
|
- Fix core version
|
||||||
|
|
||||||
|
## v0.8.9
|
||||||
|
|
||||||
|
- Update file_picker
|
||||||
|
|
||||||
|
- Add resources page
|
||||||
|
|
||||||
|
- Optimize more detail
|
||||||
|
|
||||||
|
- Add access selected sorted
|
||||||
|
|
||||||
|
- Fix notification duplicate creation issue
|
||||||
|
|
||||||
|
- Fix AccessControl click issue
|
||||||
|
|
||||||
|
## v0.8.7
|
||||||
|
|
||||||
|
- Fix Workflow
|
||||||
|
|
||||||
|
- Fix Linux unable to open
|
||||||
|
|
||||||
|
- Update README.md 3
|
||||||
|
|
||||||
|
- Create LICENSE
|
||||||
|
- Update README.md 2
|
||||||
|
|
||||||
|
- Update README.md
|
||||||
|
|
||||||
|
- Optimize workFlow
|
||||||
|
|
||||||
|
## v0.8.6
|
||||||
|
|
||||||
|
- optimize checkUpdate
|
||||||
|
|
||||||
|
## v0.8.5
|
||||||
|
|
||||||
|
- Fix submit error
|
||||||
|
|
||||||
|
## v0.8.4
|
||||||
|
|
||||||
|
- add WebDAV
|
||||||
|
|
||||||
|
- add Auto check updates
|
||||||
|
|
||||||
|
- Optimize more details
|
||||||
|
|
||||||
|
- optimize delayTest
|
||||||
|
|
||||||
|
## v0.8.2
|
||||||
|
|
||||||
|
- upgrade flutter version
|
||||||
|
|
||||||
|
## v0.8.1
|
||||||
|
|
||||||
|
- Update kernel
|
||||||
|
- Add import profile via QR code image
|
||||||
|
|
||||||
|
## v0.8.0
|
||||||
|
|
||||||
|
- Add compatibility mode and adapt clash scheme.
|
||||||
|
|
||||||
|
## v0.7.14
|
||||||
|
|
||||||
|
- update Version
|
||||||
|
|
||||||
|
- Reconstruction application proxy logic
|
||||||
|
|
||||||
|
## v0.7.13
|
||||||
|
|
||||||
|
- Fix Tab destroy error
|
||||||
|
|
||||||
|
## v0.7.12
|
||||||
|
|
||||||
|
- Optimize repeat healthcheck
|
||||||
|
|
||||||
|
## v0.7.11
|
||||||
|
|
||||||
|
- Optimize Direct mode ui
|
||||||
|
|
||||||
|
## v0.7.10
|
||||||
|
|
||||||
|
- Optimize Healthcheck
|
||||||
|
|
||||||
|
- Remove proxies position animation, improve performance
|
||||||
|
- Add Telegram Link
|
||||||
|
|
||||||
|
- Update healthcheck policy
|
||||||
|
|
||||||
|
- New Check URLTest
|
||||||
|
|
||||||
|
- Fix the problem of invalid auto-selection
|
||||||
|
|
||||||
|
## v0.7.8
|
||||||
|
|
||||||
|
- New Async UpdateConfig
|
||||||
|
|
||||||
|
- add changeProfileDebounce
|
||||||
|
|
||||||
|
- Update Workflow
|
||||||
|
|
||||||
|
- Fix ChangeProfile block
|
||||||
|
|
||||||
|
- Fix Release Message Error
|
||||||
|
|
||||||
|
## v0.7.7
|
||||||
|
|
||||||
|
- Update Selector 2
|
||||||
|
|
||||||
|
## v0.7.6
|
||||||
|
|
||||||
|
- Update Version
|
||||||
|
|
||||||
|
- Fix Proxies Select Error
|
||||||
|
|
||||||
|
## v0.7.5
|
||||||
|
|
||||||
|
- Fix the problem that the proxy group is empty in global mode.
|
||||||
|
|
||||||
|
- Fix the problem that the proxy group is empty in global mode.
|
||||||
|
|
||||||
|
## v0.7.4
|
||||||
|
|
||||||
|
- Add ProxyProvider2
|
||||||
|
|
||||||
|
## v0.7.3
|
||||||
|
|
||||||
|
- Add ProxyProvider
|
||||||
|
|
||||||
|
- Update Version
|
||||||
|
|
||||||
|
- Update ProxyGroup Sort
|
||||||
|
|
||||||
|
- Fix Android quickStart VpnService some problems
|
||||||
|
|
||||||
|
## v0.7.1
|
||||||
|
|
||||||
|
- Update version
|
||||||
|
|
||||||
|
- Set Android notification low importance
|
||||||
|
|
||||||
|
- Fix the issue that VpnService can't be closed correctly in special cases
|
||||||
|
|
||||||
|
- Fix the problem that TileService is not destroyed correctly in some cases
|
||||||
|
|
||||||
|
- Adjust tab animation defaults
|
||||||
|
|
||||||
|
- Add Telegram in README_zh_CN.md
|
||||||
|
|
||||||
|
- Add Telegram
|
||||||
|
|
||||||
|
## v0.7.0
|
||||||
|
|
||||||
|
- update mobile_scanner
|
||||||
|
|
||||||
|
- Initial commit
|
||||||
46
README.md
@@ -6,13 +6,9 @@
|
|||||||
|
|
||||||
## FlClash
|
## FlClash
|
||||||
|
|
||||||
<p style="text-align: left;">
|
[](https://github.com/chen08209/FlClash/releases/)[](https://github.com/chen08209/FlClash/releases/)[](LICENSE)
|
||||||
<img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
|
|
||||||
<img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
|
[](https://t.me/FlClash)
|
||||||
<a href="LICENSE">
|
|
||||||
<img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
|
A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
|
||||||
|
|
||||||
@@ -38,9 +34,32 @@ on Mobile:
|
|||||||
|
|
||||||
✨ Support subscription link, Dark mode
|
✨ Support subscription link, Dark mode
|
||||||
|
|
||||||
## Contact
|
## Use
|
||||||
|
|
||||||
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
|
### Linux
|
||||||
|
|
||||||
|
⚠️ Make sure to install the following dependencies before using them
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo apt-get install appindicator3-0.1 libappindicator3-dev
|
||||||
|
sudo apt-get install keybinder-3.0
|
||||||
|
```
|
||||||
|
|
||||||
|
### Android
|
||||||
|
|
||||||
|
Support the following actions
|
||||||
|
|
||||||
|
```bash
|
||||||
|
com.follow.clash.action.START
|
||||||
|
|
||||||
|
com.follow.clash.action.STOP
|
||||||
|
|
||||||
|
com.follow.clash.action.CHANGE
|
||||||
|
```
|
||||||
|
|
||||||
|
## Download
|
||||||
|
|
||||||
|
<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
@@ -74,7 +93,7 @@ on Mobile:
|
|||||||
3. Run build script
|
3. Run build script
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart windows --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
- linux
|
- linux
|
||||||
@@ -84,7 +103,7 @@ on Mobile:
|
|||||||
2. Run build script
|
2. Run build script
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart linux --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
- macOS
|
- macOS
|
||||||
@@ -94,11 +113,8 @@ on Mobile:
|
|||||||
2. Run build script
|
2. Run build script
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart macos --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Star
|
## Star
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,9 @@
|
|||||||
|
|
||||||
## FlClash
|
## FlClash
|
||||||
|
|
||||||
<p style="text-align: left;">
|
[](https://github.com/chen08209/FlClash/releases/)[](https://github.com/chen08209/FlClash/releases/)[](LICENSE)
|
||||||
<img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
|
|
||||||
<img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
|
[](https://t.me/FlClash)
|
||||||
<a href="LICENSE">
|
|
||||||
<img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
基于ClashMeta的多平台代理客户端,简单易用,开源无广告。
|
基于ClashMeta的多平台代理客户端,简单易用,开源无广告。
|
||||||
|
|
||||||
@@ -38,9 +34,32 @@ on Mobile:
|
|||||||
|
|
||||||
✨ 支持一键导入订阅, 深色模式
|
✨ 支持一键导入订阅, 深色模式
|
||||||
|
|
||||||
## Contact
|
## Use
|
||||||
|
|
||||||
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
|
### Linux
|
||||||
|
|
||||||
|
⚠️ 使用前请确保安装以下依赖
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo apt-get install appindicator3-0.1 libappindicator3-dev
|
||||||
|
sudo apt-get install keybinder-3.0
|
||||||
|
```
|
||||||
|
|
||||||
|
### Android
|
||||||
|
|
||||||
|
支持下列操作
|
||||||
|
|
||||||
|
```bash
|
||||||
|
com.follow.clash.action.START
|
||||||
|
|
||||||
|
com.follow.clash.action.STOP
|
||||||
|
|
||||||
|
com.follow.clash.action.CHANGE
|
||||||
|
```
|
||||||
|
|
||||||
|
## Download
|
||||||
|
|
||||||
|
<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
@@ -74,7 +93,7 @@ on Mobile:
|
|||||||
3. 运行构建脚本
|
3. 运行构建脚本
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart windows --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
- linux
|
- linux
|
||||||
@@ -84,7 +103,7 @@ on Mobile:
|
|||||||
2. 运行构建脚本
|
2. 运行构建脚本
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart linux --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
- macOS
|
- macOS
|
||||||
@@ -94,7 +113,7 @@ on Mobile:
|
|||||||
2. 运行构建脚本
|
2. 运行构建脚本
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
dart .\setup.dart
|
dart .\setup.dart macos --arch <arm64 | amd64>
|
||||||
```
|
```
|
||||||
|
|
||||||
## Star History
|
## Star History
|
||||||
|
|||||||
@@ -34,22 +34,22 @@ def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias
|
|||||||
android {
|
android {
|
||||||
namespace "com.follow.clash"
|
namespace "com.follow.clash"
|
||||||
compileSdkVersion 34
|
compileSdkVersion 34
|
||||||
ndkVersion "25.1.8937393"
|
ndkVersion "27.1.12297006"
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = '1.8'
|
jvmTarget = '17'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
if (isRelease){
|
if (isRelease) {
|
||||||
release {
|
release {
|
||||||
storeFile defStoreFile
|
storeFile defStoreFile
|
||||||
storePassword defStorePassword
|
storePassword defStorePassword
|
||||||
@@ -74,10 +74,9 @@ android {
|
|||||||
applicationIdSuffix '.debug'
|
applicationIdSuffix '.debug'
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
minifyEnabled true
|
if (isRelease) {
|
||||||
if(isRelease){
|
|
||||||
signingConfig signingConfigs.release
|
signingConfig signingConfigs.release
|
||||||
}else{
|
} else {
|
||||||
signingConfig signingConfigs.debug
|
signingConfig signingConfigs.debug
|
||||||
}
|
}
|
||||||
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
|
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
|
||||||
@@ -102,6 +101,9 @@ flutter {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation 'androidx.core:core-splashscreen:1.0.1'
|
implementation 'androidx.core:core-splashscreen:1.0.1'
|
||||||
implementation 'com.google.code.gson:gson:2.10'
|
implementation 'com.google.code.gson:gson:2.10'
|
||||||
|
implementation("com.android.tools.smali:smali-dexlib2:3.0.7") {
|
||||||
|
exclude group: "com.google.guava", module: "guava"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,28 +2,30 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
<uses-feature
|
<uses-feature
|
||||||
android:name="android.software.leanback"
|
android:name="android.hardware.touchscreen"
|
||||||
android:required="false" />
|
android:required="false" />
|
||||||
<uses-feature
|
<uses-feature
|
||||||
android:name="android.hardware.touchscreen"
|
android:name="android.hardware.camera"
|
||||||
android:required="false" />
|
android:required="false" />
|
||||||
<uses-feature
|
|
||||||
android:name="android.hardware.camera"
|
|
||||||
android:required="false" />
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
|
||||||
|
tools:ignore="SystemPermissionTypo" />
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
|
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||||
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
|
<uses-permission
|
||||||
|
android:name="android.permission.QUERY_ALL_PACKAGES"
|
||||||
|
tools:ignore="QueryAllPackagesPermission" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name="${applicationName}"
|
android:name=".FlClashApplication"
|
||||||
|
android:hardwareAccelerated="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
|
||||||
android:label="FlClash">
|
android:label="FlClash">
|
||||||
<activity
|
<activity
|
||||||
android:name="com.follow.clash.MainActivity"
|
android:name="com.follow.clash.MainActivity"
|
||||||
@@ -54,28 +56,42 @@
|
|||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
|
||||||
<data android:scheme="clash"/>
|
<data android:scheme="clash" />
|
||||||
<data android:scheme="clashmeta"/>
|
<data android:scheme="clashmeta" />
|
||||||
<data android:scheme="flclash"/>
|
<data android:scheme="flclash" />
|
||||||
|
|
||||||
<data android:host="install-config"/>
|
<data android:host="install-config" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<!-- <meta-data-->
|
<meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />
|
||||||
<!-- android:name="io.flutter.embedding.android.EnableImpeller"-->
|
|
||||||
<!-- android:value="true" />-->
|
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".TempActivity"
|
android:name=".TempActivity"
|
||||||
android:theme="@style/TransparentTheme" />
|
android:exported="true"
|
||||||
|
android:theme="@style/TransparentTheme">
|
||||||
|
<intent-filter>
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<action android:name="${applicationId}.action.START" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<action android:name="${applicationId}.action.STOP" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<action android:name="${applicationId}.action.CHANGE" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".services.FlClashTileService"
|
android:name=".services.FlClashTileService"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:icon="@drawable/tile_icon"
|
android:foregroundServiceType="specialUse"
|
||||||
|
android:icon="@drawable/ic_stat_name"
|
||||||
android:label="FlClash"
|
android:label="FlClash"
|
||||||
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
|
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
|
||||||
|
tools:targetApi="n">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.service.quicksettings.action.QS_TILE" />
|
<action android:name="android.service.quicksettings.action.QS_TILE" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
@@ -83,6 +99,29 @@
|
|||||||
android:name="android.service.quicksettings.TOGGLEABLE_TILE"
|
android:name="android.service.quicksettings.TOGGLEABLE_TILE"
|
||||||
android:value="true" />
|
android:value="true" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name=".FilesProvider"
|
||||||
|
android:authorities="${applicationId}.files"
|
||||||
|
android:exported="true"
|
||||||
|
android:grantUriPermissions="true"
|
||||||
|
android:permission="android.permission.MANAGE_DOCUMENTS"
|
||||||
|
android:process=":background">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.content.action.DOCUMENTS_PROVIDER" />
|
||||||
|
</intent-filter>
|
||||||
|
</provider>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name="androidx.core.content.FileProvider"
|
||||||
|
android:authorities="${applicationId}.fileProvider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/file_paths" />
|
||||||
|
</provider>
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".services.FlClashVpnService"
|
android:name=".services.FlClashVpnService"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
@@ -91,6 +130,18 @@
|
|||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.net.VpnService" />
|
<action android:name="android.net.VpnService" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
<property
|
||||||
|
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
|
||||||
|
android:value="vpn" />
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<service
|
||||||
|
android:name=".services.FlClashService"
|
||||||
|
android:exported="false"
|
||||||
|
android:foregroundServiceType="specialUse">
|
||||||
|
<property
|
||||||
|
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
|
||||||
|
android:value="service" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 12 KiB |
112
android/app/src/main/kotlin/com/follow/clash/FilesProvider.kt
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
package com.follow.clash
|
||||||
|
|
||||||
|
import android.database.Cursor
|
||||||
|
import android.database.MatrixCursor
|
||||||
|
import android.os.CancellationSignal
|
||||||
|
import android.os.ParcelFileDescriptor
|
||||||
|
import android.provider.DocumentsContract.Document
|
||||||
|
import android.provider.DocumentsContract.Root
|
||||||
|
import android.provider.DocumentsProvider
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileNotFoundException
|
||||||
|
|
||||||
|
|
||||||
|
class FilesProvider : DocumentsProvider() {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val DEFAULT_ROOT_ID = "0"
|
||||||
|
|
||||||
|
private val DEFAULT_DOCUMENT_COLUMNS = arrayOf(
|
||||||
|
Document.COLUMN_DOCUMENT_ID,
|
||||||
|
Document.COLUMN_DISPLAY_NAME,
|
||||||
|
Document.COLUMN_MIME_TYPE,
|
||||||
|
Document.COLUMN_FLAGS,
|
||||||
|
Document.COLUMN_SIZE,
|
||||||
|
)
|
||||||
|
private val DEFAULT_ROOT_COLUMNS = arrayOf(
|
||||||
|
Root.COLUMN_ROOT_ID,
|
||||||
|
Root.COLUMN_FLAGS,
|
||||||
|
Root.COLUMN_ICON,
|
||||||
|
Root.COLUMN_TITLE,
|
||||||
|
Root.COLUMN_SUMMARY,
|
||||||
|
Root.COLUMN_DOCUMENT_ID
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreate(): Boolean {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun queryRoots(projection: Array<String>?): Cursor {
|
||||||
|
return MatrixCursor(projection ?: DEFAULT_ROOT_COLUMNS).apply {
|
||||||
|
newRow().apply {
|
||||||
|
add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
|
||||||
|
add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY)
|
||||||
|
add(Root.COLUMN_ICON, R.mipmap.ic_launcher)
|
||||||
|
add(Root.COLUMN_TITLE, context!!.getString(R.string.fl_clash))
|
||||||
|
add(Root.COLUMN_SUMMARY, "Data")
|
||||||
|
add(Root.COLUMN_DOCUMENT_ID, "/")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun queryChildDocuments(
|
||||||
|
parentDocumentId: String,
|
||||||
|
projection: Array<String>?,
|
||||||
|
sortOrder: String?
|
||||||
|
): Cursor {
|
||||||
|
val result = MatrixCursor(resolveDocumentProjection(projection))
|
||||||
|
val parentFile = if (parentDocumentId == "/") {
|
||||||
|
context?.filesDir
|
||||||
|
} else {
|
||||||
|
File(parentDocumentId)
|
||||||
|
} ?: throw FileNotFoundException("Parent directory not found")
|
||||||
|
parentFile.listFiles()?.forEach { file ->
|
||||||
|
includeFile(result, file)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun queryDocument(documentId: String, projection: Array<String>?): Cursor {
|
||||||
|
val result = MatrixCursor(resolveDocumentProjection(projection))
|
||||||
|
val file = File(documentId)
|
||||||
|
includeFile(result, file)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun openDocument(
|
||||||
|
documentId: String,
|
||||||
|
mode: String,
|
||||||
|
signal: CancellationSignal?
|
||||||
|
): ParcelFileDescriptor {
|
||||||
|
val file = File(documentId)
|
||||||
|
val accessMode = ParcelFileDescriptor.parseMode(mode)
|
||||||
|
return ParcelFileDescriptor.open(file, accessMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun includeFile(result: MatrixCursor, file: File) {
|
||||||
|
result.newRow().apply {
|
||||||
|
add(Document.COLUMN_DOCUMENT_ID, file.absolutePath)
|
||||||
|
add(Document.COLUMN_DISPLAY_NAME, file.name)
|
||||||
|
add(Document.COLUMN_SIZE, file.length())
|
||||||
|
add(
|
||||||
|
Document.COLUMN_FLAGS,
|
||||||
|
Document.FLAG_SUPPORTS_WRITE or Document.FLAG_SUPPORTS_DELETE
|
||||||
|
)
|
||||||
|
add(Document.COLUMN_MIME_TYPE, getDocumentType(file))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getDocumentType(file: File): String {
|
||||||
|
return if (file.isDirectory) {
|
||||||
|
Document.MIME_TYPE_DIR
|
||||||
|
} else {
|
||||||
|
"application/octet-stream"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resolveDocumentProjection(projection: Array<String>?): Array<String> {
|
||||||
|
return projection ?: DEFAULT_DOCUMENT_COLUMNS
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.follow.clash;
|
||||||
|
|
||||||
|
import android.app.Application
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
class FlClashApplication : Application() {
|
||||||
|
companion object {
|
||||||
|
private lateinit var instance: FlClashApplication
|
||||||
|
fun getAppContext(): Context {
|
||||||
|
return instance.applicationContext
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreate() {
|
||||||
|
super.onCreate()
|
||||||
|
instance = this
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
package com.follow.clash
|
package com.follow.clash
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
|
import com.follow.clash.plugins.AppPlugin
|
||||||
|
import com.follow.clash.plugins.ServicePlugin
|
||||||
import com.follow.clash.plugins.TilePlugin
|
import com.follow.clash.plugins.TilePlugin
|
||||||
|
import com.follow.clash.plugins.VpnPlugin
|
||||||
|
import io.flutter.FlutterInjector
|
||||||
import io.flutter.embedding.engine.FlutterEngine
|
import io.flutter.embedding.engine.FlutterEngine
|
||||||
import java.util.Date
|
import io.flutter.embedding.engine.dart.DartExecutor
|
||||||
|
import java.util.concurrent.locks.ReentrantLock
|
||||||
|
import kotlin.concurrent.withLock
|
||||||
|
|
||||||
enum class RunState {
|
enum class RunState {
|
||||||
START,
|
START,
|
||||||
@@ -11,13 +18,92 @@ enum class RunState {
|
|||||||
STOP
|
STOP
|
||||||
}
|
}
|
||||||
|
|
||||||
class GlobalState {
|
|
||||||
companion object {
|
object GlobalState {
|
||||||
val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
|
val runLock = ReentrantLock()
|
||||||
var runTime: Date? = null
|
|
||||||
var flutterEngine: FlutterEngine? = null
|
val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
|
||||||
fun getCurrentTilePlugin(): TilePlugin? =
|
var flutterEngine: FlutterEngine? = null
|
||||||
flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
|
private var serviceEngine: FlutterEngine? = null
|
||||||
|
|
||||||
|
fun getCurrentAppPlugin(): AppPlugin? {
|
||||||
|
val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
|
||||||
|
return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getText(text: String): String {
|
||||||
|
return getCurrentAppPlugin()?.getText(text) ?: ""
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getCurrentTilePlugin(): TilePlugin? {
|
||||||
|
val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
|
||||||
|
return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getCurrentVPNPlugin(): VpnPlugin? {
|
||||||
|
return serviceEngine?.plugins?.get(VpnPlugin::class.java) as VpnPlugin?
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleToggle() {
|
||||||
|
val starting = handleStart()
|
||||||
|
if (!starting) {
|
||||||
|
handleStop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleStart(): Boolean {
|
||||||
|
if (runState.value == RunState.STOP) {
|
||||||
|
runState.value = RunState.PENDING
|
||||||
|
runLock.lock()
|
||||||
|
val tilePlugin = getCurrentTilePlugin()
|
||||||
|
if (tilePlugin != null) {
|
||||||
|
tilePlugin.handleStart()
|
||||||
|
} else {
|
||||||
|
initServiceEngine()
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleStop() {
|
||||||
|
if (runState.value == RunState.START) {
|
||||||
|
runState.value = RunState.PENDING
|
||||||
|
runLock.lock()
|
||||||
|
getCurrentTilePlugin()?.handleStop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleTryDestroy() {
|
||||||
|
if (flutterEngine == null) {
|
||||||
|
destroyServiceEngine()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun destroyServiceEngine() {
|
||||||
|
runLock.withLock {
|
||||||
|
serviceEngine?.destroy()
|
||||||
|
serviceEngine = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun initServiceEngine() {
|
||||||
|
if (serviceEngine != null) return
|
||||||
|
destroyServiceEngine()
|
||||||
|
runLock.withLock {
|
||||||
|
serviceEngine = FlutterEngine(FlClashApplication.getAppContext())
|
||||||
|
serviceEngine?.plugins?.add(VpnPlugin)
|
||||||
|
serviceEngine?.plugins?.add(AppPlugin())
|
||||||
|
serviceEngine?.plugins?.add(TilePlugin())
|
||||||
|
val vpnService = DartExecutor.DartEntrypoint(
|
||||||
|
FlutterInjector.instance().flutterLoader().findAppBundlePath(),
|
||||||
|
"_service"
|
||||||
|
)
|
||||||
|
serviceEngine?.dartExecutor?.executeDartEntrypoint(
|
||||||
|
vpnService,
|
||||||
|
if (flutterEngine == null) listOf("quick") else null
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
package com.follow.clash
|
package com.follow.clash
|
||||||
|
|
||||||
|
|
||||||
import com.follow.clash.plugins.AppPlugin
|
import com.follow.clash.plugins.AppPlugin
|
||||||
import com.follow.clash.plugins.ProxyPlugin
|
import com.follow.clash.plugins.ServicePlugin
|
||||||
import com.follow.clash.plugins.TilePlugin
|
import com.follow.clash.plugins.TilePlugin
|
||||||
import io.flutter.embedding.android.FlutterActivity
|
import io.flutter.embedding.android.FlutterActivity
|
||||||
import io.flutter.embedding.engine.FlutterEngine
|
import io.flutter.embedding.engine.FlutterEngine
|
||||||
|
|
||||||
class MainActivity : FlutterActivity() {
|
class MainActivity : FlutterActivity() {
|
||||||
|
|
||||||
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
||||||
GlobalState.flutterEngine?.destroy()
|
|
||||||
super.configureFlutterEngine(flutterEngine)
|
super.configureFlutterEngine(flutterEngine)
|
||||||
flutterEngine.plugins.add(AppPlugin())
|
flutterEngine.plugins.add(AppPlugin())
|
||||||
flutterEngine.plugins.add(ProxyPlugin())
|
flutterEngine.plugins.add(ServicePlugin)
|
||||||
flutterEngine.plugins.add(TilePlugin())
|
flutterEngine.plugins.add(TilePlugin())
|
||||||
GlobalState.flutterEngine = flutterEngine
|
GlobalState.flutterEngine = flutterEngine
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,24 @@ package com.follow.clash
|
|||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import com.follow.clash.extensions.wrapAction
|
||||||
|
|
||||||
class TempActivity : Activity() {
|
class TempActivity : Activity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
when (intent.action) {
|
||||||
|
wrapAction("START") -> {
|
||||||
|
GlobalState.handleStart()
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapAction("STOP") -> {
|
||||||
|
GlobalState.handleStop()
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapAction("CHANGE") -> {
|
||||||
|
GlobalState.handleToggle()
|
||||||
|
}
|
||||||
|
}
|
||||||
finishAndRemoveTask()
|
finishAndRemoveTask()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package com.follow.clash.extensions
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress
|
|
||||||
|
|
||||||
import android.graphics.Bitmap
|
|
||||||
import android.graphics.drawable.Drawable
|
|
||||||
import android.system.OsConstants.IPPROTO_TCP
|
|
||||||
import android.system.OsConstants.IPPROTO_UDP
|
|
||||||
import android.util.Base64
|
|
||||||
import androidx.core.graphics.drawable.toBitmap
|
|
||||||
import com.follow.clash.models.Metadata
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import java.io.ByteArrayOutputStream
|
|
||||||
|
|
||||||
|
|
||||||
suspend fun Drawable.getBase64(): String {
|
|
||||||
val drawable = this
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
val bitmap = drawable.toBitmap()
|
|
||||||
val byteArrayOutputStream = ByteArrayOutputStream()
|
|
||||||
bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
|
|
||||||
Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Metadata.getProtocol(): Int? {
|
|
||||||
if (network.startsWith("tcp")) return IPPROTO_TCP
|
|
||||||
if (network.startsWith("udp")) return IPPROTO_UDP
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
196
android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt
Normal file
@@ -0,0 +1,196 @@
|
|||||||
|
package com.follow.clash.extensions
|
||||||
|
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.graphics.Bitmap
|
||||||
|
import android.graphics.drawable.Drawable
|
||||||
|
import android.net.ConnectivityManager
|
||||||
|
import android.net.Network
|
||||||
|
import android.os.Build
|
||||||
|
import android.system.OsConstants.IPPROTO_TCP
|
||||||
|
import android.system.OsConstants.IPPROTO_UDP
|
||||||
|
import android.util.Base64
|
||||||
|
import androidx.core.graphics.drawable.toBitmap
|
||||||
|
import com.follow.clash.TempActivity
|
||||||
|
import com.follow.clash.models.CIDR
|
||||||
|
import com.follow.clash.models.Metadata
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
import io.flutter.plugin.common.MethodChannel
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import java.io.ByteArrayOutputStream
|
||||||
|
import java.net.Inet4Address
|
||||||
|
import java.net.Inet6Address
|
||||||
|
import java.net.InetAddress
|
||||||
|
import java.util.concurrent.locks.ReentrantLock
|
||||||
|
import kotlin.coroutines.resume
|
||||||
|
import kotlin.coroutines.suspendCoroutine
|
||||||
|
|
||||||
|
|
||||||
|
suspend fun Drawable.getBase64(): String {
|
||||||
|
val drawable = this
|
||||||
|
return withContext(Dispatchers.IO) {
|
||||||
|
val bitmap = drawable.toBitmap()
|
||||||
|
val byteArrayOutputStream = ByteArrayOutputStream()
|
||||||
|
bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
|
||||||
|
Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Metadata.getProtocol(): Int? {
|
||||||
|
if (network.startsWith("tcp")) return IPPROTO_TCP
|
||||||
|
if (network.startsWith("udp")) return IPPROTO_UDP
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
fun VpnOptions.getIpv4RouteAddress(): List<CIDR> {
|
||||||
|
return routeAddress.filter {
|
||||||
|
it.isIpv4()
|
||||||
|
}.map {
|
||||||
|
it.toCIDR()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun VpnOptions.getIpv6RouteAddress(): List<CIDR> {
|
||||||
|
return routeAddress.filter {
|
||||||
|
it.isIpv6()
|
||||||
|
}.map {
|
||||||
|
it.toCIDR()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun String.isIpv4(): Boolean {
|
||||||
|
val parts = split("/")
|
||||||
|
if (parts.size != 2) {
|
||||||
|
throw IllegalArgumentException("Invalid CIDR format")
|
||||||
|
}
|
||||||
|
val address = InetAddress.getByName(parts[0])
|
||||||
|
return address.address.size == 4
|
||||||
|
}
|
||||||
|
|
||||||
|
fun String.isIpv6(): Boolean {
|
||||||
|
val parts = split("/")
|
||||||
|
if (parts.size != 2) {
|
||||||
|
throw IllegalArgumentException("Invalid CIDR format")
|
||||||
|
}
|
||||||
|
val address = InetAddress.getByName(parts[0])
|
||||||
|
return address.address.size == 16
|
||||||
|
}
|
||||||
|
|
||||||
|
fun String.toCIDR(): CIDR {
|
||||||
|
val parts = split("/")
|
||||||
|
if (parts.size != 2) {
|
||||||
|
throw IllegalArgumentException("Invalid CIDR format")
|
||||||
|
}
|
||||||
|
val ipAddress = parts[0]
|
||||||
|
val prefixLength = parts[1].toIntOrNull()
|
||||||
|
?: throw IllegalArgumentException("Invalid prefix length")
|
||||||
|
|
||||||
|
val address = InetAddress.getByName(ipAddress)
|
||||||
|
|
||||||
|
val maxPrefix = if (address.address.size == 4) 32 else 128
|
||||||
|
if (prefixLength < 0 || prefixLength > maxPrefix) {
|
||||||
|
throw IllegalArgumentException("Invalid prefix length for IP version")
|
||||||
|
}
|
||||||
|
|
||||||
|
return CIDR(address, prefixLength)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ConnectivityManager.resolveDns(network: Network?): List<String> {
|
||||||
|
val properties = getLinkProperties(network) ?: return listOf()
|
||||||
|
return properties.dnsServers.map { it.asSocketAddressText(53) }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun InetAddress.asSocketAddressText(port: Int): String {
|
||||||
|
return when (this) {
|
||||||
|
is Inet6Address ->
|
||||||
|
"[${numericToTextFormat(this.address)}]:$port"
|
||||||
|
|
||||||
|
is Inet4Address ->
|
||||||
|
"${this.hostAddress}:$port"
|
||||||
|
|
||||||
|
else -> throw IllegalArgumentException("Unsupported Inet type ${this.javaClass}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Context.wrapAction(action: String): String {
|
||||||
|
return "${this.packageName}.action.$action"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Context.getActionIntent(action: String): Intent {
|
||||||
|
val actionIntent = Intent(this, TempActivity::class.java)
|
||||||
|
actionIntent.action = wrapAction(action)
|
||||||
|
return actionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Context.getActionPendingIntent(action: String): PendingIntent {
|
||||||
|
return if (Build.VERSION.SDK_INT >= 31) {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this,
|
||||||
|
0,
|
||||||
|
getActionIntent(action),
|
||||||
|
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this,
|
||||||
|
0,
|
||||||
|
getActionIntent(action),
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun numericToTextFormat(src: ByteArray): String {
|
||||||
|
val sb = StringBuilder(39)
|
||||||
|
for (i in 0 until 8) {
|
||||||
|
sb.append(
|
||||||
|
Integer.toHexString(
|
||||||
|
src[i shl 1].toInt() shl 8 and 0xff00
|
||||||
|
or (src[(i shl 1) + 1].toInt() and 0xff)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if (i < 7) {
|
||||||
|
sb.append(":")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun <T> MethodChannel.awaitResult(
|
||||||
|
method: String,
|
||||||
|
arguments: Any? = null
|
||||||
|
): T? = withContext(Dispatchers.Main) { // 切换到主线程
|
||||||
|
suspendCoroutine { continuation ->
|
||||||
|
invokeMethod(method, arguments, object : MethodChannel.Result {
|
||||||
|
override fun success(result: Any?) {
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
continuation.resume(result as T)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun error(code: String, message: String?, details: Any?) {
|
||||||
|
continuation.resume(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun notImplemented() {
|
||||||
|
continuation.resume(null)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ReentrantLock.safeLock() {
|
||||||
|
if (this.isLocked) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.lock()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ReentrantLock.safeUnlock() {
|
||||||
|
if (!this.isLocked) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.unlock()
|
||||||
|
}
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package com.follow.clash.models
|
|
||||||
|
|
||||||
enum class AccessControlMode {
|
|
||||||
acceptSelected,
|
|
||||||
rejectSelected,
|
|
||||||
}
|
|
||||||
|
|
||||||
data class AccessControl(
|
|
||||||
val mode: AccessControlMode,
|
|
||||||
val acceptList: List<String>,
|
|
||||||
val rejectList: List<String>,
|
|
||||||
)
|
|
||||||
@@ -3,5 +3,6 @@ package com.follow.clash.models
|
|||||||
data class Package(
|
data class Package(
|
||||||
val packageName: String,
|
val packageName: String,
|
||||||
val label: String,
|
val label: String,
|
||||||
val isSystem:Boolean
|
val isSystem: Boolean,
|
||||||
|
val lastUpdateTime: Long,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package com.follow.clash.models
|
package com.follow.clash.models
|
||||||
|
|
||||||
|
data class Process(
|
||||||
|
val id: String,
|
||||||
|
val metadata: Metadata,
|
||||||
|
)
|
||||||
|
|
||||||
data class Metadata(
|
data class Metadata(
|
||||||
val network: String,
|
val network: String,
|
||||||
val sourceIP: String,
|
val sourceIP: String,
|
||||||
val sourcePort: Int,
|
val sourcePort: Int,
|
||||||
val destinationIP: String,
|
val destinationIP: String,
|
||||||
val destinationPort: Int,
|
val destinationPort: Int,
|
||||||
val remoteDestination: String,
|
|
||||||
val host: String
|
val host: String
|
||||||
)
|
)
|
||||||
33
android/app/src/main/kotlin/com/follow/clash/models/Props.kt
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
package com.follow.clash.models
|
||||||
|
|
||||||
|
import java.net.InetAddress
|
||||||
|
|
||||||
|
enum class AccessControlMode {
|
||||||
|
acceptSelected, rejectSelected,
|
||||||
|
}
|
||||||
|
|
||||||
|
data class AccessControl(
|
||||||
|
val mode: AccessControlMode,
|
||||||
|
val acceptList: List<String>,
|
||||||
|
val rejectList: List<String>,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class CIDR(val address: InetAddress, val prefixLength: Int)
|
||||||
|
|
||||||
|
data class VpnOptions(
|
||||||
|
val enable: Boolean,
|
||||||
|
val port: Int,
|
||||||
|
val accessControl: AccessControl?,
|
||||||
|
val allowBypass: Boolean,
|
||||||
|
val systemProxy: Boolean,
|
||||||
|
val bypassDomain: List<String>,
|
||||||
|
val routeAddress: List<String>,
|
||||||
|
val ipv4Address: String,
|
||||||
|
val ipv6Address: String,
|
||||||
|
val dnsServerAddress: String,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class StartForegroundParams(
|
||||||
|
val title: String,
|
||||||
|
val content: String,
|
||||||
|
)
|
||||||
@@ -2,121 +2,204 @@ package com.follow.clash.plugins
|
|||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Context
|
import android.app.ActivityManager
|
||||||
|
import android.content.Intent
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
|
import android.content.pm.ComponentInfo
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
import android.net.ConnectivityManager
|
import android.net.VpnService
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.core.content.getSystemService
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.core.content.ContextCompat.getSystemService
|
||||||
|
import androidx.core.content.FileProvider
|
||||||
|
import androidx.core.content.pm.ShortcutInfoCompat
|
||||||
|
import androidx.core.content.pm.ShortcutManagerCompat
|
||||||
|
import androidx.core.graphics.drawable.IconCompat
|
||||||
|
import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
|
||||||
|
import com.follow.clash.FlClashApplication
|
||||||
|
import com.follow.clash.GlobalState
|
||||||
|
import com.follow.clash.R
|
||||||
|
import com.follow.clash.extensions.awaitResult
|
||||||
|
import com.follow.clash.extensions.getActionIntent
|
||||||
import com.follow.clash.extensions.getBase64
|
import com.follow.clash.extensions.getBase64
|
||||||
import com.follow.clash.extensions.getProtocol
|
|
||||||
import com.follow.clash.models.Metadata
|
|
||||||
import com.follow.clash.models.Package
|
import com.follow.clash.models.Package
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
|
import io.flutter.embedding.android.FlutterActivity
|
||||||
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
||||||
import io.flutter.embedding.engine.plugins.activity.ActivityAware
|
import io.flutter.embedding.engine.plugins.activity.ActivityAware
|
||||||
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
|
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
|
||||||
import io.flutter.plugin.common.MethodCall
|
import io.flutter.plugin.common.MethodCall
|
||||||
import io.flutter.plugin.common.MethodChannel
|
import io.flutter.plugin.common.MethodChannel
|
||||||
|
import io.flutter.plugin.common.MethodChannel.Result
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.cancel
|
import kotlinx.coroutines.cancel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import java.net.InetSocketAddress
|
import java.io.File
|
||||||
|
import java.lang.ref.WeakReference
|
||||||
|
import java.util.zip.ZipFile
|
||||||
|
|
||||||
class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
|
class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
|
||||||
|
|
||||||
private var activity: Activity? = null
|
private var activityRef: WeakReference<Activity>? = null
|
||||||
|
|
||||||
private var toast: Toast? = null
|
|
||||||
|
|
||||||
private var context: Context? = null
|
|
||||||
|
|
||||||
private lateinit var channel: MethodChannel
|
private lateinit var channel: MethodChannel
|
||||||
|
|
||||||
private lateinit var scope: CoroutineScope
|
private lateinit var scope: CoroutineScope
|
||||||
|
|
||||||
private var connectivity: ConnectivityManager? = null
|
private var vpnCallBack: (() -> Unit)? = null
|
||||||
|
|
||||||
private val iconMap = mutableMapOf<String, String?>()
|
private val iconMap = mutableMapOf<String, String?>()
|
||||||
|
|
||||||
|
private val packages = mutableListOf<Package>()
|
||||||
|
|
||||||
|
private val skipPrefixList = listOf(
|
||||||
|
"com.google",
|
||||||
|
"com.android.chrome",
|
||||||
|
"com.android.vending",
|
||||||
|
"com.microsoft",
|
||||||
|
"com.apple",
|
||||||
|
"com.zhiliaoapp.musically", // Banned by China
|
||||||
|
)
|
||||||
|
|
||||||
|
private val chinaAppPrefixList = listOf(
|
||||||
|
"com.tencent",
|
||||||
|
"com.alibaba",
|
||||||
|
"com.umeng",
|
||||||
|
"com.qihoo",
|
||||||
|
"com.ali",
|
||||||
|
"com.alipay",
|
||||||
|
"com.amap",
|
||||||
|
"com.sina",
|
||||||
|
"com.weibo",
|
||||||
|
"com.vivo",
|
||||||
|
"com.xiaomi",
|
||||||
|
"com.huawei",
|
||||||
|
"com.taobao",
|
||||||
|
"com.secneo",
|
||||||
|
"s.h.e.l.l",
|
||||||
|
"com.stub",
|
||||||
|
"com.kiwisec",
|
||||||
|
"com.secshell",
|
||||||
|
"com.wrapper",
|
||||||
|
"cn.securitystack",
|
||||||
|
"com.mogosec",
|
||||||
|
"com.secoen",
|
||||||
|
"com.netease",
|
||||||
|
"com.mx",
|
||||||
|
"com.qq.e",
|
||||||
|
"com.baidu",
|
||||||
|
"com.bytedance",
|
||||||
|
"com.bugly",
|
||||||
|
"com.miui",
|
||||||
|
"com.oppo",
|
||||||
|
"com.coloros",
|
||||||
|
"com.iqoo",
|
||||||
|
"com.meizu",
|
||||||
|
"com.gionee",
|
||||||
|
"cn.nubia",
|
||||||
|
"com.oplus",
|
||||||
|
"andes.oplus",
|
||||||
|
"com.unionpay",
|
||||||
|
"cn.wps"
|
||||||
|
)
|
||||||
|
|
||||||
|
private val chinaAppRegex by lazy {
|
||||||
|
("(" + chinaAppPrefixList.joinToString("|").replace(".", "\\.") + ").*").toRegex()
|
||||||
|
}
|
||||||
|
|
||||||
|
val VPN_PERMISSION_REQUEST_CODE = 1001
|
||||||
|
|
||||||
|
val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
|
||||||
|
|
||||||
|
private var isBlockNotification: Boolean = false
|
||||||
|
|
||||||
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
context = flutterPluginBinding.applicationContext;
|
scope = CoroutineScope(Dispatchers.Default)
|
||||||
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
|
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
|
||||||
channel.setMethodCallHandler(this)
|
channel.setMethodCallHandler(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun initShortcuts(label: String) {
|
||||||
|
val shortcut = ShortcutInfoCompat.Builder(FlClashApplication.getAppContext(), "toggle")
|
||||||
|
.setShortLabel(label)
|
||||||
|
.setIcon(
|
||||||
|
IconCompat.createWithResource(
|
||||||
|
FlClashApplication.getAppContext(),
|
||||||
|
R.mipmap.ic_launcher_round
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.setIntent(FlClashApplication.getAppContext().getActionIntent("CHANGE"))
|
||||||
|
.build()
|
||||||
|
ShortcutManagerCompat.setDynamicShortcuts(
|
||||||
|
FlClashApplication.getAppContext(),
|
||||||
|
listOf(shortcut)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
|
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
channel.setMethodCallHandler(null)
|
channel.setMethodCallHandler(null)
|
||||||
|
scope.cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tip(message: String?) {
|
private fun tip(message: String?) {
|
||||||
if (toast != null) {
|
if (GlobalState.flutterEngine == null) {
|
||||||
toast!!.cancel()
|
Toast.makeText(FlClashApplication.getAppContext(), message, Toast.LENGTH_LONG).show()
|
||||||
}
|
}
|
||||||
toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
|
|
||||||
toast!!.show()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.Q)
|
override fun onMethodCall(call: MethodCall, result: Result) {
|
||||||
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
|
|
||||||
when (call.method) {
|
when (call.method) {
|
||||||
"moveTaskToBack" -> {
|
"moveTaskToBack" -> {
|
||||||
activity?.moveTaskToBack(true)
|
activityRef?.get()?.moveTaskToBack(true)
|
||||||
result.success(true);
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"updateExcludeFromRecents" -> {
|
||||||
|
val value = call.argument<Boolean>("value")
|
||||||
|
updateExcludeFromRecents(value)
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"initShortcuts" -> {
|
||||||
|
initShortcuts(call.arguments as String)
|
||||||
|
result.success(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
"getPackages" -> {
|
"getPackages" -> {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
result.success(getPackages())
|
result.success(getPackagesToJson())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
"getChinaPackageNames" -> {
|
||||||
|
scope.launch {
|
||||||
|
result.success(getChinaPackageNames())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
"getPackageIcon" -> {
|
"getPackageIcon" -> {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
val packageName = call.argument<String>("packageName")
|
val packageName = call.argument<String>("packageName")
|
||||||
if (packageName != null) {
|
if (packageName == null) {
|
||||||
result.success(getPackageIcon(packageName))
|
|
||||||
} else {
|
|
||||||
result.success(null)
|
result.success(null)
|
||||||
|
return@launch
|
||||||
}
|
}
|
||||||
}
|
val packageIcon = getPackageIcon(packageName)
|
||||||
}
|
packageIcon.let {
|
||||||
|
if (it != null) {
|
||||||
"getPackageName" -> {
|
result.success(it)
|
||||||
val data = call.argument<String>("data")
|
return@launch
|
||||||
val metadata =
|
|
||||||
if (data != null) Gson().fromJson(
|
|
||||||
data,
|
|
||||||
Metadata::class.java
|
|
||||||
) else null
|
|
||||||
val protocol = metadata?.getProtocol()
|
|
||||||
if (protocol == null) {
|
|
||||||
result.success(null)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
scope.launch {
|
|
||||||
withContext(Dispatchers.Default) {
|
|
||||||
if (context == null) result.success(null)
|
|
||||||
val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
|
|
||||||
val target = InetSocketAddress(
|
|
||||||
metadata.host.ifEmpty { metadata.destinationIP },
|
|
||||||
metadata.destinationPort
|
|
||||||
)
|
|
||||||
if (connectivity == null) {
|
|
||||||
connectivity = context!!.getSystemService<ConnectivityManager>()
|
|
||||||
}
|
}
|
||||||
val uid =
|
if (iconMap["default"] == null) {
|
||||||
connectivity?.getConnectionOwnerUid(protocol, source, target)
|
iconMap["default"] =
|
||||||
if (uid == null || uid == -1) {
|
FlClashApplication.getAppContext().packageManager?.defaultActivityIcon?.getBase64()
|
||||||
result.success(null)
|
|
||||||
return@withContext
|
|
||||||
}
|
}
|
||||||
val packages = context?.packageManager?.getPackagesForUid(uid)
|
result.success(iconMap["default"])
|
||||||
result.success(packages?.first())
|
return@launch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -125,59 +208,260 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
|
|||||||
val message = call.argument<String>("message")
|
val message = call.argument<String>("message")
|
||||||
tip(message)
|
tip(message)
|
||||||
result.success(true)
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"openFile" -> {
|
||||||
|
val path = call.argument<String>("path")!!
|
||||||
|
openFile(path)
|
||||||
|
result.success(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
result.notImplemented();
|
result.notImplemented()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun openFile(path: String) {
|
||||||
|
val file = File(path)
|
||||||
|
val uri = FileProvider.getUriForFile(
|
||||||
|
FlClashApplication.getAppContext(),
|
||||||
|
"${FlClashApplication.getAppContext().packageName}.fileProvider",
|
||||||
|
file
|
||||||
|
)
|
||||||
|
|
||||||
|
val intent = Intent(Intent.ACTION_VIEW).setDataAndType(
|
||||||
|
uri,
|
||||||
|
"text/plain"
|
||||||
|
)
|
||||||
|
|
||||||
|
val flags =
|
||||||
|
Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
|
||||||
|
|
||||||
|
val resInfoList = FlClashApplication.getAppContext().packageManager.queryIntentActivities(
|
||||||
|
intent, PackageManager.MATCH_DEFAULT_ONLY
|
||||||
|
)
|
||||||
|
|
||||||
|
for (resolveInfo in resInfoList) {
|
||||||
|
val packageName = resolveInfo.activityInfo.packageName
|
||||||
|
FlClashApplication.getAppContext().grantUriPermission(
|
||||||
|
packageName,
|
||||||
|
uri,
|
||||||
|
flags
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
activityRef?.get()?.startActivity(intent)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
println(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateExcludeFromRecents(value: Boolean?) {
|
||||||
|
val am = getSystemService(FlClashApplication.getAppContext(), ActivityManager::class.java)
|
||||||
|
val task = am?.appTasks?.firstOrNull {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
it.taskInfo.taskId == activityRef?.get()?.taskId
|
||||||
|
} else {
|
||||||
|
it.taskInfo.id == activityRef?.get()?.taskId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
when (value) {
|
||||||
|
true -> task?.setExcludeFromRecents(value)
|
||||||
|
false -> task?.setExcludeFromRecents(value)
|
||||||
|
null -> task?.setExcludeFromRecents(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private suspend fun getPackageIcon(packageName: String): String? {
|
private suspend fun getPackageIcon(packageName: String): String? {
|
||||||
val packageManager = context?.packageManager
|
val packageManager = FlClashApplication.getAppContext().packageManager
|
||||||
if (iconMap[packageName] == null) {
|
if (iconMap[packageName] == null) {
|
||||||
iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
|
iconMap[packageName] = try {
|
||||||
|
packageManager?.getApplicationIcon(packageName)?.getBase64()
|
||||||
|
} catch (_: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return iconMap[packageName]
|
return iconMap[packageName]
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun getPackages(): String {
|
private fun getPackages(): List<Package> {
|
||||||
return withContext(Dispatchers.Default){
|
val packageManager = FlClashApplication.getAppContext().packageManager
|
||||||
val packageManager = context?.packageManager
|
if (packages.isNotEmpty()) return packages
|
||||||
val packages: List<Package>? =
|
packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
|
||||||
packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
|
it.packageName != FlClashApplication.getAppContext().packageName
|
||||||
it.packageName != context?.packageName
|
|| it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
|
||||||
|| it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
|
|| it.packageName == "android"
|
||||||
|| it.packageName == "android"
|
|
||||||
|
|
||||||
}?.map {
|
}?.map {
|
||||||
Package(
|
Package(
|
||||||
packageName = it.packageName,
|
packageName = it.packageName,
|
||||||
label = it.applicationInfo.loadLabel(packageManager).toString(),
|
label = it.applicationInfo.loadLabel(packageManager).toString(),
|
||||||
isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1
|
isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1,
|
||||||
)
|
lastUpdateTime = it.lastUpdateTime
|
||||||
}
|
)
|
||||||
|
}?.let { packages.addAll(it) }
|
||||||
|
return packages
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun getPackagesToJson(): String {
|
||||||
|
return withContext(Dispatchers.Default) {
|
||||||
|
Gson().toJson(getPackages())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun getChinaPackageNames(): String {
|
||||||
|
return withContext(Dispatchers.Default) {
|
||||||
|
val packages: List<String> =
|
||||||
|
getPackages().map { it.packageName }.filter { isChinaPackage(it) }
|
||||||
Gson().toJson(packages)
|
Gson().toJson(packages)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun requestVpnPermission(callBack: () -> Unit) {
|
||||||
|
vpnCallBack = callBack
|
||||||
|
val intent = VpnService.prepare(FlClashApplication.getAppContext())
|
||||||
|
if (intent != null) {
|
||||||
|
activityRef?.get()?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
vpnCallBack?.invoke()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun requestNotificationsPermission() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
val permission = ContextCompat.checkSelfPermission(
|
||||||
|
FlClashApplication.getAppContext(),
|
||||||
|
Manifest.permission.POST_NOTIFICATIONS
|
||||||
|
)
|
||||||
|
if (permission != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
if (isBlockNotification) return
|
||||||
|
if (activityRef?.get() == null) return
|
||||||
|
activityRef?.get()?.let {
|
||||||
|
ActivityCompat.requestPermissions(
|
||||||
|
it,
|
||||||
|
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
|
||||||
|
NOTIFICATION_PERMISSION_REQUEST_CODE
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getText(text: String): String? {
|
||||||
|
return withContext(Dispatchers.Default){
|
||||||
|
channel.awaitResult<String>("getText", text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isChinaPackage(packageName: String): Boolean {
|
||||||
|
val packageManager = FlClashApplication.getAppContext().packageManager ?: return false
|
||||||
|
skipPrefixList.forEach {
|
||||||
|
if (packageName == it || packageName.startsWith("$it.")) return false
|
||||||
|
}
|
||||||
|
val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||||
|
PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
|
||||||
|
} else {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
|
||||||
|
}
|
||||||
|
if (packageName.matches(chinaAppRegex)) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
packageManager.getPackageInfo(
|
||||||
|
packageName,
|
||||||
|
PackageManager.PackageInfoFlags.of(packageManagerFlags.toLong())
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
packageManager.getPackageInfo(
|
||||||
|
packageName, packageManagerFlags
|
||||||
|
)
|
||||||
|
}
|
||||||
|
mutableListOf<ComponentInfo>().apply {
|
||||||
|
packageInfo.services?.let { addAll(it) }
|
||||||
|
packageInfo.activities?.let { addAll(it) }
|
||||||
|
packageInfo.receivers?.let { addAll(it) }
|
||||||
|
packageInfo.providers?.let { addAll(it) }
|
||||||
|
}.forEach {
|
||||||
|
if (it.name.matches(chinaAppRegex)) return true
|
||||||
|
}
|
||||||
|
ZipFile(File(packageInfo.applicationInfo.publicSourceDir)).use {
|
||||||
|
for (packageEntry in it.entries()) {
|
||||||
|
if (packageEntry.name.startsWith("firebase-")) return false
|
||||||
|
}
|
||||||
|
for (packageEntry in it.entries()) {
|
||||||
|
if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
|
||||||
|
".dex"
|
||||||
|
))
|
||||||
|
) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (packageEntry.size > 15000000) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
val input = it.getInputStream(packageEntry).buffered()
|
||||||
|
val dexFile = try {
|
||||||
|
DexBackedDexFile.fromInputStream(null, input)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for (clazz in dexFile.classes) {
|
||||||
|
val clazzName =
|
||||||
|
clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
|
||||||
|
.replace("$", ".")
|
||||||
|
if (clazzName.matches(chinaAppRegex)) return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (_: Exception) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
override fun onAttachedToActivity(binding: ActivityPluginBinding) {
|
override fun onAttachedToActivity(binding: ActivityPluginBinding) {
|
||||||
activity = binding.activity;
|
activityRef = WeakReference(binding.activity)
|
||||||
scope = CoroutineScope(Dispatchers.Default)
|
binding.addActivityResultListener(::onActivityResult)
|
||||||
|
binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDetachedFromActivityForConfigChanges() {
|
override fun onDetachedFromActivityForConfigChanges() {
|
||||||
activity = null;
|
activityRef = null
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
|
override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
|
||||||
activity = binding.activity;
|
activityRef = WeakReference(binding.activity)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDetachedFromActivity() {
|
override fun onDetachedFromActivity() {
|
||||||
channel.invokeMethod("exit", null)
|
channel.invokeMethod("exit", null)
|
||||||
scope.cancel()
|
activityRef = null
|
||||||
activity = null;
|
}
|
||||||
|
|
||||||
|
private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
|
||||||
|
if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
|
||||||
|
if (resultCode == FlutterActivity.RESULT_OK) {
|
||||||
|
GlobalState.initServiceEngine()
|
||||||
|
vpnCallBack?.invoke()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onRequestPermissionsResultListener(
|
||||||
|
requestCode: Int,
|
||||||
|
permissions: Array<String>,
|
||||||
|
grantResults: IntArray
|
||||||
|
): Boolean {
|
||||||
|
if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
|
||||||
|
isBlockNotification = true
|
||||||
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,227 +0,0 @@
|
|||||||
package com.follow.clash.plugins
|
|
||||||
|
|
||||||
import android.Manifest
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.app.Activity
|
|
||||||
import android.content.ComponentName
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
|
||||||
import android.content.ServiceConnection
|
|
||||||
import android.content.pm.PackageManager
|
|
||||||
import android.net.VpnService
|
|
||||||
import android.os.Build.VERSION
|
|
||||||
import android.os.Build.VERSION_CODES
|
|
||||||
import android.os.IBinder
|
|
||||||
import androidx.core.app.ActivityCompat
|
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import com.follow.clash.GlobalState
|
|
||||||
import com.follow.clash.RunState
|
|
||||||
import com.follow.clash.models.AccessControl
|
|
||||||
import com.follow.clash.services.FlClashVpnService
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import io.flutter.embedding.android.FlutterActivity
|
|
||||||
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
|
||||||
import io.flutter.embedding.engine.plugins.activity.ActivityAware
|
|
||||||
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
|
|
||||||
import io.flutter.plugin.common.MethodCall
|
|
||||||
import io.flutter.plugin.common.MethodChannel
|
|
||||||
import java.util.Date
|
|
||||||
|
|
||||||
|
|
||||||
class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
|
|
||||||
|
|
||||||
|
|
||||||
val VPN_PERMISSION_REQUEST_CODE = 1001
|
|
||||||
val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
|
|
||||||
|
|
||||||
private lateinit var flutterMethodChannel: MethodChannel
|
|
||||||
|
|
||||||
private var activity: Activity? = null
|
|
||||||
private var context: Context? = null
|
|
||||||
private var flClashVpnService: FlClashVpnService? = null
|
|
||||||
private var isBound = false
|
|
||||||
private var port: Int? = null
|
|
||||||
private var accessControl: AccessControl? = null
|
|
||||||
private lateinit var title: String
|
|
||||||
private lateinit var content: String
|
|
||||||
|
|
||||||
private val connection = object : ServiceConnection {
|
|
||||||
override fun onServiceConnected(className: ComponentName, service: IBinder) {
|
|
||||||
val binder = service as FlClashVpnService.LocalBinder
|
|
||||||
flClashVpnService = binder.getService()
|
|
||||||
port?.let { startVpn(it) }
|
|
||||||
isBound = true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onServiceDisconnected(arg0: ComponentName) {
|
|
||||||
flClashVpnService = null
|
|
||||||
isBound = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
|
||||||
context = flutterPluginBinding.applicationContext
|
|
||||||
flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "proxy")
|
|
||||||
flutterMethodChannel.setMethodCallHandler(this)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
|
||||||
flutterMethodChannel.setMethodCallHandler(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
|
|
||||||
"StartProxy" -> {
|
|
||||||
port = call.argument<Int>("port")
|
|
||||||
val args = call.argument<String>("args")
|
|
||||||
accessControl =
|
|
||||||
if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
|
|
||||||
handleStartVpn()
|
|
||||||
result.success(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
"StopProxy" -> {
|
|
||||||
stopVpn()
|
|
||||||
result.success(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
"SetProtect" -> {
|
|
||||||
val fd = call.argument<Int>("fd")
|
|
||||||
if (fd != null) {
|
|
||||||
flClashVpnService?.protect(fd)
|
|
||||||
result.success(true)
|
|
||||||
} else {
|
|
||||||
result.success(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"GetRunTimeStamp" -> {
|
|
||||||
result.success(GlobalState.runTime?.time)
|
|
||||||
}
|
|
||||||
|
|
||||||
"startForeground" -> {
|
|
||||||
title = call.argument<String>("title") as String
|
|
||||||
content = call.argument<String>("content") as String
|
|
||||||
requestNotificationsPermission()
|
|
||||||
result.success(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
|
||||||
result.notImplemented()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun handleStartVpn() {
|
|
||||||
val intent = VpnService.prepare(context)
|
|
||||||
if (intent != null) {
|
|
||||||
activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
|
|
||||||
} else {
|
|
||||||
bindService()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun startVpn(port: Int) {
|
|
||||||
if (GlobalState.runState.value == RunState.START) return;
|
|
||||||
flClashVpnService?.start(port, accessControl)
|
|
||||||
GlobalState.runState.value = RunState.START
|
|
||||||
GlobalState.runTime = Date()
|
|
||||||
startAfter()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun stopVpn() {
|
|
||||||
if (GlobalState.runState.value == RunState.STOP) return
|
|
||||||
flClashVpnService?.stop()
|
|
||||||
unbindService()
|
|
||||||
GlobalState.runState.value = RunState.STOP;
|
|
||||||
GlobalState.runTime = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("ForegroundServiceType")
|
|
||||||
private fun startForeground() {
|
|
||||||
if (GlobalState.runState.value != RunState.START) return
|
|
||||||
flClashVpnService?.startForeground(title, content)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun requestNotificationsPermission() {
|
|
||||||
if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
|
|
||||||
val permission = context?.let {
|
|
||||||
ContextCompat.checkSelfPermission(
|
|
||||||
it,
|
|
||||||
Manifest.permission.POST_NOTIFICATIONS
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (permission == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
startForeground()
|
|
||||||
} else {
|
|
||||||
activity?.let {
|
|
||||||
ActivityCompat.requestPermissions(
|
|
||||||
it,
|
|
||||||
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
|
|
||||||
NOTIFICATION_PERMISSION_REQUEST_CODE
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
startForeground()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun startAfter() {
|
|
||||||
flutterMethodChannel.invokeMethod("startAfter", flClashVpnService?.fd)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAttachedToActivity(binding: ActivityPluginBinding) {
|
|
||||||
activity = binding.activity
|
|
||||||
binding.addActivityResultListener(::onActivityResult)
|
|
||||||
binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
|
|
||||||
if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
|
|
||||||
if (resultCode == FlutterActivity.RESULT_OK) {
|
|
||||||
bindService()
|
|
||||||
} else {
|
|
||||||
stopVpn()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun onRequestPermissionsResultListener(
|
|
||||||
requestCode: Int,
|
|
||||||
permissions: Array<String>,
|
|
||||||
grantResults: IntArray
|
|
||||||
): Boolean {
|
|
||||||
if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
|
|
||||||
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
startForeground()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
override fun onDetachedFromActivityForConfigChanges() {
|
|
||||||
activity = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
|
|
||||||
activity = binding.activity
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDetachedFromActivity() {
|
|
||||||
stopVpn()
|
|
||||||
activity = null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun bindService() {
|
|
||||||
val intent = Intent(context, FlClashVpnService::class.java)
|
|
||||||
context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun unbindService() {
|
|
||||||
if (isBound) {
|
|
||||||
context?.unbindService(connection)
|
|
||||||
isBound = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package com.follow.clash.plugins
|
||||||
|
|
||||||
|
import com.follow.clash.FlClashApplication
|
||||||
|
import com.follow.clash.GlobalState
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
import com.google.gson.Gson
|
||||||
|
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
||||||
|
import io.flutter.plugin.common.MethodCall
|
||||||
|
import io.flutter.plugin.common.MethodChannel
|
||||||
|
|
||||||
|
|
||||||
|
data object ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
|
||||||
|
|
||||||
|
private lateinit var flutterMethodChannel: MethodChannel
|
||||||
|
|
||||||
|
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
|
flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "service")
|
||||||
|
flutterMethodChannel.setMethodCallHandler(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
|
flutterMethodChannel.setMethodCallHandler(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
|
||||||
|
"startVpn" -> {
|
||||||
|
val data = call.argument<String>("data")
|
||||||
|
val options = Gson().fromJson(data, VpnOptions::class.java)
|
||||||
|
GlobalState.getCurrentVPNPlugin()?.handleStart(options)
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"stopVpn" -> {
|
||||||
|
GlobalState.getCurrentVPNPlugin()?.handleStop()
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"init" -> {
|
||||||
|
GlobalState.getCurrentAppPlugin()
|
||||||
|
?.requestNotificationsPermission()
|
||||||
|
GlobalState.initServiceEngine()
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"destroy" -> {
|
||||||
|
handleDestroy()
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
result.notImplemented()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleDestroy() {
|
||||||
|
GlobalState.getCurrentVPNPlugin()?.handleStop()
|
||||||
|
GlobalState.destroyServiceEngine()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,10 +4,10 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin
|
|||||||
import io.flutter.plugin.common.MethodCall
|
import io.flutter.plugin.common.MethodCall
|
||||||
import io.flutter.plugin.common.MethodChannel
|
import io.flutter.plugin.common.MethodChannel
|
||||||
|
|
||||||
class TilePlugin(private val onStart: (() -> Unit)? = null, private val onStop: (() -> Unit)? = null) : FlutterPlugin,
|
class TilePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
|
||||||
MethodChannel.MethodCallHandler {
|
|
||||||
|
|
||||||
private lateinit var channel: MethodChannel
|
private lateinit var channel: MethodChannel
|
||||||
|
|
||||||
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "tile")
|
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "tile")
|
||||||
channel.setMethodCallHandler(this)
|
channel.setMethodCallHandler(this)
|
||||||
@@ -19,13 +19,11 @@ class TilePlugin(private val onStart: (() -> Unit)? = null, private val onStop:
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun handleStart() {
|
fun handleStart() {
|
||||||
onStart?.let { it() }
|
|
||||||
channel.invokeMethod("start", null)
|
channel.invokeMethod("start", null)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun handleStop() {
|
fun handleStop() {
|
||||||
channel.invokeMethod("stop", null)
|
channel.invokeMethod("stop", null)
|
||||||
onStop?.let { it() }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleDetached() {
|
private fun handleDetached() {
|
||||||
|
|||||||
@@ -0,0 +1,282 @@
|
|||||||
|
package com.follow.clash.plugins
|
||||||
|
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.ServiceConnection
|
||||||
|
import android.net.ConnectivityManager
|
||||||
|
import android.net.Network
|
||||||
|
import android.net.NetworkCapabilities
|
||||||
|
import android.net.NetworkRequest
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.IBinder
|
||||||
|
import androidx.core.content.getSystemService
|
||||||
|
import com.follow.clash.FlClashApplication
|
||||||
|
import com.follow.clash.GlobalState
|
||||||
|
import com.follow.clash.RunState
|
||||||
|
import com.follow.clash.extensions.awaitResult
|
||||||
|
import com.follow.clash.extensions.getProtocol
|
||||||
|
import com.follow.clash.extensions.resolveDns
|
||||||
|
import com.follow.clash.models.Process
|
||||||
|
import com.follow.clash.models.StartForegroundParams
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
import com.follow.clash.services.BaseServiceInterface
|
||||||
|
import com.follow.clash.services.FlClashService
|
||||||
|
import com.follow.clash.services.FlClashVpnService
|
||||||
|
import com.google.gson.Gson
|
||||||
|
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
||||||
|
import io.flutter.plugin.common.MethodCall
|
||||||
|
import io.flutter.plugin.common.MethodChannel
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlinx.coroutines.isActive
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import kotlin.concurrent.withLock
|
||||||
|
|
||||||
|
data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
|
||||||
|
private lateinit var flutterMethodChannel: MethodChannel
|
||||||
|
private var flClashService: BaseServiceInterface? = null
|
||||||
|
private lateinit var options: VpnOptions
|
||||||
|
private lateinit var scope: CoroutineScope
|
||||||
|
private var lastStartForegroundParams: StartForegroundParams? = null
|
||||||
|
private var timerJob: Job? = null
|
||||||
|
|
||||||
|
private val connectivity by lazy {
|
||||||
|
FlClashApplication.getAppContext().getSystemService<ConnectivityManager>()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val connection = object : ServiceConnection {
|
||||||
|
override fun onServiceConnected(className: ComponentName, service: IBinder) {
|
||||||
|
flClashService = when (service) {
|
||||||
|
is FlClashVpnService.LocalBinder -> service.getService()
|
||||||
|
is FlClashService.LocalBinder -> service.getService()
|
||||||
|
else -> throw Exception("invalid binder")
|
||||||
|
}
|
||||||
|
handleStartService()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onServiceDisconnected(arg: ComponentName) {
|
||||||
|
flClashService = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
|
scope = CoroutineScope(Dispatchers.Default)
|
||||||
|
scope.launch {
|
||||||
|
registerNetworkCallback()
|
||||||
|
}
|
||||||
|
flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "vpn")
|
||||||
|
flutterMethodChannel.setMethodCallHandler(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
|
||||||
|
unRegisterNetworkCallback()
|
||||||
|
flutterMethodChannel.setMethodCallHandler(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
|
||||||
|
when (call.method) {
|
||||||
|
"start" -> {
|
||||||
|
val data = call.argument<String>("data")
|
||||||
|
result.success(handleStart(Gson().fromJson(data, VpnOptions::class.java)))
|
||||||
|
}
|
||||||
|
|
||||||
|
"stop" -> {
|
||||||
|
handleStop()
|
||||||
|
result.success(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
"setProtect" -> {
|
||||||
|
val fd = call.argument<Int>("fd")
|
||||||
|
if (fd != null) {
|
||||||
|
if (flClashService is FlClashVpnService) {
|
||||||
|
(flClashService as FlClashVpnService).protect(fd)
|
||||||
|
}
|
||||||
|
result.success(true)
|
||||||
|
} else {
|
||||||
|
result.success(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
"resolverProcess" -> {
|
||||||
|
val data = call.argument<String>("data")
|
||||||
|
val process = if (data != null) Gson().fromJson(
|
||||||
|
data, Process::class.java
|
||||||
|
) else null
|
||||||
|
val metadata = process?.metadata
|
||||||
|
if (metadata == null) {
|
||||||
|
result.success(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val protocol = metadata.getProtocol()
|
||||||
|
if (protocol == null) {
|
||||||
|
result.success(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
scope.launch {
|
||||||
|
withContext(Dispatchers.Default) {
|
||||||
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||||
|
result.success(null)
|
||||||
|
return@withContext
|
||||||
|
}
|
||||||
|
val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
|
||||||
|
val dst = InetSocketAddress(
|
||||||
|
metadata.destinationIP.ifEmpty { metadata.host },
|
||||||
|
metadata.destinationPort
|
||||||
|
)
|
||||||
|
val uid = try {
|
||||||
|
connectivity?.getConnectionOwnerUid(protocol, src, dst)
|
||||||
|
} catch (_: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
if (uid == null || uid == -1) {
|
||||||
|
result.success(null)
|
||||||
|
return@withContext
|
||||||
|
}
|
||||||
|
val packages =
|
||||||
|
FlClashApplication.getAppContext().packageManager?.getPackagesForUid(uid)
|
||||||
|
result.success(packages?.first())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
result.notImplemented()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleStart(options: VpnOptions): Boolean {
|
||||||
|
this.options = options
|
||||||
|
when (options.enable) {
|
||||||
|
true -> handleStartVpn()
|
||||||
|
false -> handleStartService()
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleStartVpn() {
|
||||||
|
GlobalState.getCurrentAppPlugin()
|
||||||
|
?.requestVpnPermission {
|
||||||
|
handleStartService()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun requestGc() {
|
||||||
|
flutterMethodChannel.invokeMethod("gc", null)
|
||||||
|
}
|
||||||
|
|
||||||
|
val networks = mutableSetOf<Network>()
|
||||||
|
|
||||||
|
fun onUpdateNetwork() {
|
||||||
|
val dns = networks.flatMap { network ->
|
||||||
|
connectivity?.resolveDns(network) ?: emptyList()
|
||||||
|
}.toSet().joinToString(",")
|
||||||
|
scope.launch {
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
flutterMethodChannel.invokeMethod("dnsChanged", dns)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val callback = object : ConnectivityManager.NetworkCallback() {
|
||||||
|
override fun onAvailable(network: Network) {
|
||||||
|
networks.add(network)
|
||||||
|
onUpdateNetwork()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onLost(network: Network) {
|
||||||
|
networks.remove(network)
|
||||||
|
onUpdateNetwork()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val request = NetworkRequest.Builder().apply {
|
||||||
|
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
|
||||||
|
addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|
||||||
|
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
|
||||||
|
}.build()
|
||||||
|
|
||||||
|
private fun registerNetworkCallback() {
|
||||||
|
networks.clear()
|
||||||
|
connectivity?.registerNetworkCallback(request, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun unRegisterNetworkCallback() {
|
||||||
|
connectivity?.unregisterNetworkCallback(callback)
|
||||||
|
networks.clear()
|
||||||
|
onUpdateNetwork()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun startForeground() {
|
||||||
|
GlobalState.runLock.lock()
|
||||||
|
try {
|
||||||
|
if (GlobalState.runState.value != RunState.START) return
|
||||||
|
val data = flutterMethodChannel.awaitResult<String>("getStartForegroundParams")
|
||||||
|
val startForegroundParams = Gson().fromJson(
|
||||||
|
data, StartForegroundParams::class.java
|
||||||
|
)
|
||||||
|
if (lastStartForegroundParams != startForegroundParams) {
|
||||||
|
lastStartForegroundParams = startForegroundParams
|
||||||
|
flClashService?.startForeground(
|
||||||
|
startForegroundParams.title,
|
||||||
|
startForegroundParams.content,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
GlobalState.runLock.unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun startForegroundJob() {
|
||||||
|
timerJob = CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
while (isActive) {
|
||||||
|
startForeground()
|
||||||
|
delay(1000)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun stopForegroundJob() {
|
||||||
|
timerJob?.cancel()
|
||||||
|
timerJob = null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleStartService() {
|
||||||
|
if (flClashService == null) {
|
||||||
|
bindService()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
GlobalState.runLock.withLock {
|
||||||
|
if (GlobalState.runState.value == RunState.START) return
|
||||||
|
GlobalState.runState.value = RunState.START
|
||||||
|
val fd = flClashService?.start(options)
|
||||||
|
flutterMethodChannel.invokeMethod(
|
||||||
|
"started", fd
|
||||||
|
)
|
||||||
|
startForegroundJob();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleStop() {
|
||||||
|
GlobalState.runLock.withLock {
|
||||||
|
if (GlobalState.runState.value == RunState.STOP) return
|
||||||
|
GlobalState.runState.value = RunState.STOP
|
||||||
|
stopForegroundJob()
|
||||||
|
flClashService?.stop()
|
||||||
|
GlobalState.handleTryDestroy()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun bindService() {
|
||||||
|
val intent = when (options.enable) {
|
||||||
|
true -> Intent(FlClashApplication.getAppContext(), FlClashVpnService::class.java)
|
||||||
|
false -> Intent(FlClashApplication.getAppContext(), FlClashService::class.java)
|
||||||
|
}
|
||||||
|
FlClashApplication.getAppContext().bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.follow.clash.services
|
||||||
|
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
|
||||||
|
interface BaseServiceInterface {
|
||||||
|
|
||||||
|
fun start(options: VpnOptions): Int
|
||||||
|
|
||||||
|
fun stop()
|
||||||
|
|
||||||
|
suspend fun startForeground(title: String, content: String)
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package com.follow.clash.services
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
|
||||||
|
import android.app.NotificationChannel
|
||||||
|
import android.app.NotificationManager
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.app.Service
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
|
||||||
|
import android.os.Binder
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.IBinder
|
||||||
|
import androidx.core.app.NotificationCompat
|
||||||
|
import com.follow.clash.GlobalState
|
||||||
|
import com.follow.clash.MainActivity
|
||||||
|
import com.follow.clash.extensions.getActionPendingIntent
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Deferred
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.async
|
||||||
|
|
||||||
|
|
||||||
|
class FlClashService : Service(), BaseServiceInterface {
|
||||||
|
|
||||||
|
private val binder = LocalBinder()
|
||||||
|
|
||||||
|
inner class LocalBinder : Binder() {
|
||||||
|
fun getService(): FlClashService = this@FlClashService
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBind(intent: Intent): IBinder {
|
||||||
|
return binder
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onUnbind(intent: Intent?): Boolean {
|
||||||
|
return super.onUnbind(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val CHANNEL = "FlClash"
|
||||||
|
|
||||||
|
private val notificationId: Int = 1
|
||||||
|
|
||||||
|
private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
|
||||||
|
CoroutineScope(Dispatchers.Main).async {
|
||||||
|
val stopText = GlobalState.getText("stop")
|
||||||
|
|
||||||
|
val intent = Intent(
|
||||||
|
this@FlClashService, MainActivity::class.java
|
||||||
|
)
|
||||||
|
|
||||||
|
val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this@FlClashService,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this@FlClashService,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
with(NotificationCompat.Builder(this@FlClashService, CHANNEL)) {
|
||||||
|
setSmallIcon(com.follow.clash.R.drawable.ic_stat_name)
|
||||||
|
setContentTitle("FlClash")
|
||||||
|
setContentIntent(pendingIntent)
|
||||||
|
setCategory(NotificationCompat.CATEGORY_SERVICE)
|
||||||
|
priority = NotificationCompat.PRIORITY_MIN
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
|
||||||
|
}
|
||||||
|
addAction(
|
||||||
|
0,
|
||||||
|
stopText, // 使用 suspend 函数获取的文本
|
||||||
|
getActionPendingIntent("STOP")
|
||||||
|
)
|
||||||
|
setOngoing(true)
|
||||||
|
setShowWhen(false)
|
||||||
|
setOnlyAlertOnce(true)
|
||||||
|
setAutoCancel(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
|
||||||
|
return notificationBuilderDeferred.await()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun start(options: VpnOptions) = 0
|
||||||
|
|
||||||
|
override fun stop() {
|
||||||
|
stopSelf()
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
stopForeground(STOP_FOREGROUND_REMOVE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("ForegroundServiceType", "WrongConstant")
|
||||||
|
override suspend fun startForeground(title: String, content: String) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
val manager = getSystemService(NotificationManager::class.java)
|
||||||
|
var channel = manager?.getNotificationChannel(CHANNEL)
|
||||||
|
if (channel == null) {
|
||||||
|
channel =
|
||||||
|
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
|
||||||
|
manager?.createNotificationChannel(channel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val notification =
|
||||||
|
getNotificationBuilder()
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(content).build()
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
|
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||||
|
} else {
|
||||||
|
startForeground(notificationId, notification)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,12 +11,6 @@ import androidx.lifecycle.Observer
|
|||||||
import com.follow.clash.GlobalState
|
import com.follow.clash.GlobalState
|
||||||
import com.follow.clash.RunState
|
import com.follow.clash.RunState
|
||||||
import com.follow.clash.TempActivity
|
import com.follow.clash.TempActivity
|
||||||
import com.follow.clash.plugins.AppPlugin
|
|
||||||
import com.follow.clash.plugins.ProxyPlugin
|
|
||||||
import com.follow.clash.plugins.TilePlugin
|
|
||||||
import io.flutter.FlutterInjector
|
|
||||||
import io.flutter.embedding.engine.FlutterEngine
|
|
||||||
import io.flutter.embedding.engine.dart.DartExecutor
|
|
||||||
|
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.N)
|
@RequiresApi(Build.VERSION_CODES.N)
|
||||||
@@ -46,53 +40,33 @@ class FlClashTileService : TileService() {
|
|||||||
@SuppressLint("StartActivityAndCollapseDeprecated")
|
@SuppressLint("StartActivityAndCollapseDeprecated")
|
||||||
private fun activityTransfer() {
|
private fun activityTransfer() {
|
||||||
val intent = Intent(this, TempActivity::class.java)
|
val intent = Intent(this, TempActivity::class.java)
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
|
||||||
if (Build.VERSION.SDK_INT >= 34) {
|
val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
|
||||||
val pendingIntent = PendingIntent.getActivity(
|
PendingIntent.getActivity(
|
||||||
this,
|
this,
|
||||||
0,
|
0,
|
||||||
intent,
|
intent,
|
||||||
PendingIntent.FLAG_IMMUTABLE
|
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
startActivityAndCollapse(pendingIntent)
|
startActivityAndCollapse(pendingIntent)
|
||||||
} else {
|
} else {
|
||||||
startActivityAndCollapse(intent)
|
startActivityAndCollapse(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var flutterEngine: FlutterEngine? = null;
|
|
||||||
|
|
||||||
private fun initFlutterEngine() {
|
|
||||||
flutterEngine = FlutterEngine(this)
|
|
||||||
flutterEngine?.plugins?.add(ProxyPlugin())
|
|
||||||
flutterEngine?.plugins?.add(TilePlugin())
|
|
||||||
flutterEngine?.plugins?.add(AppPlugin())
|
|
||||||
GlobalState.flutterEngine = flutterEngine
|
|
||||||
if (flutterEngine?.dartExecutor?.isExecutingDart != true) {
|
|
||||||
val vpnService = DartExecutor.DartEntrypoint(
|
|
||||||
FlutterInjector.instance().flutterLoader().findAppBundlePath(),
|
|
||||||
"vpnService"
|
|
||||||
)
|
|
||||||
flutterEngine?.dartExecutor?.executeDartEntrypoint(vpnService)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onClick() {
|
override fun onClick() {
|
||||||
super.onClick()
|
super.onClick()
|
||||||
activityTransfer()
|
activityTransfer()
|
||||||
val currentTilePlugin = GlobalState.getCurrentTilePlugin()
|
GlobalState.handleToggle()
|
||||||
if (GlobalState.runState.value == RunState.STOP) {
|
|
||||||
GlobalState.runState.value = RunState.PENDING
|
|
||||||
if(currentTilePlugin == null){
|
|
||||||
initFlutterEngine()
|
|
||||||
}else{
|
|
||||||
currentTilePlugin.handleStart()
|
|
||||||
}
|
|
||||||
} else if(GlobalState.runState.value == RunState.START){
|
|
||||||
GlobalState.runState.value = RunState.PENDING
|
|
||||||
currentTilePlugin?.handleStop()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package com.follow.clash.services
|
package com.follow.clash.services
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
|
import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
|
||||||
import android.app.NotificationChannel
|
import android.app.NotificationChannel
|
||||||
import android.app.NotificationManager
|
import android.app.NotificationManager
|
||||||
import android.app.PendingIntent
|
import android.app.PendingIntent
|
||||||
import android.app.Service
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
|
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
|
||||||
import android.net.ProxyInfo
|
import android.net.ProxyInfo
|
||||||
@@ -12,54 +12,63 @@ import android.net.VpnService
|
|||||||
import android.os.Binder
|
import android.os.Binder
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.IBinder
|
import android.os.IBinder
|
||||||
|
import android.os.Parcel
|
||||||
|
import android.os.RemoteException
|
||||||
|
import android.util.Log
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
|
|
||||||
import androidx.core.graphics.drawable.IconCompat
|
|
||||||
import com.follow.clash.GlobalState
|
import com.follow.clash.GlobalState
|
||||||
import com.follow.clash.MainActivity
|
import com.follow.clash.MainActivity
|
||||||
import com.follow.clash.models.AccessControl
|
import com.follow.clash.R
|
||||||
|
import com.follow.clash.extensions.getActionPendingIntent
|
||||||
|
import com.follow.clash.extensions.getIpv4RouteAddress
|
||||||
|
import com.follow.clash.extensions.getIpv6RouteAddress
|
||||||
|
import com.follow.clash.extensions.toCIDR
|
||||||
import com.follow.clash.models.AccessControlMode
|
import com.follow.clash.models.AccessControlMode
|
||||||
|
import com.follow.clash.models.VpnOptions
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Deferred
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.async
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
|
|
||||||
@SuppressLint("WrongConstant")
|
class FlClashVpnService : VpnService(), BaseServiceInterface {
|
||||||
class FlClashVpnService : VpnService() {
|
override fun onCreate() {
|
||||||
|
super.onCreate()
|
||||||
|
GlobalState.initServiceEngine()
|
||||||
private val CHANNEL = "FlClash"
|
|
||||||
|
|
||||||
var fd: Int? = null
|
|
||||||
private val notificationId: Int = 1
|
|
||||||
|
|
||||||
private val passList = listOf(
|
|
||||||
"*zhihu.com",
|
|
||||||
"*zhimg.com",
|
|
||||||
"*jd.com",
|
|
||||||
"100ime-iat-api.xfyun.cn",
|
|
||||||
"*360buyimg.com",
|
|
||||||
"localhost",
|
|
||||||
"*.local",
|
|
||||||
"127.*",
|
|
||||||
"10.*",
|
|
||||||
"172.16.*",
|
|
||||||
"172.17.*",
|
|
||||||
"172.18.*",
|
|
||||||
"172.19.*",
|
|
||||||
"172.2*",
|
|
||||||
"172.30.*",
|
|
||||||
"172.31.*",
|
|
||||||
"192.168.*"
|
|
||||||
)
|
|
||||||
|
|
||||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
|
||||||
return START_STICKY
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun start(port: Int, accessControl: AccessControl?) {
|
override fun start(options: VpnOptions): Int {
|
||||||
fd = with(Builder()) {
|
return with(Builder()) {
|
||||||
addAddress("172.16.0.1", 30)
|
if (options.ipv4Address.isNotEmpty()) {
|
||||||
|
val cidr = options.ipv4Address.toCIDR()
|
||||||
|
addAddress(cidr.address, cidr.prefixLength)
|
||||||
|
val routeAddress = options.getIpv4RouteAddress()
|
||||||
|
if (routeAddress.isNotEmpty()) {
|
||||||
|
routeAddress.forEach { i ->
|
||||||
|
Log.d("addRoute4", "address: ${i.address} prefixLength:${i.prefixLength}")
|
||||||
|
addRoute(i.address, i.prefixLength)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
addRoute("0.0.0.0", 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (options.ipv6Address.isNotEmpty()) {
|
||||||
|
val cidr = options.ipv6Address.toCIDR()
|
||||||
|
addAddress(cidr.address, cidr.prefixLength)
|
||||||
|
val routeAddress = options.getIpv6RouteAddress()
|
||||||
|
if (routeAddress.isNotEmpty()) {
|
||||||
|
routeAddress.forEach { i ->
|
||||||
|
Log.d("addRoute6", "address: ${i.address} prefixLength:${i.prefixLength}")
|
||||||
|
addRoute(i.address, i.prefixLength)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
addRoute("::", 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
addDnsServer(options.dnsServerAddress)
|
||||||
setMtu(9000)
|
setMtu(9000)
|
||||||
addRoute("0.0.0.0", 0)
|
options.accessControl?.let { accessControl ->
|
||||||
if (accessControl != null) {
|
|
||||||
when (accessControl.mode) {
|
when (accessControl.mode) {
|
||||||
AccessControlMode.acceptSelected -> {
|
AccessControlMode.acceptSelected -> {
|
||||||
(accessControl.acceptList + packageName).forEach {
|
(accessControl.acceptList + packageName).forEach {
|
||||||
@@ -74,78 +83,102 @@ class FlClashVpnService : VpnService() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
addDnsServer("172.16.0.2")
|
|
||||||
setSession("FlClash")
|
setSession("FlClash")
|
||||||
setBlocking(false)
|
setBlocking(false)
|
||||||
if (Build.VERSION.SDK_INT >= 29) {
|
if (Build.VERSION.SDK_INT >= 29) {
|
||||||
setMetered(false)
|
setMetered(false)
|
||||||
}
|
}
|
||||||
allowBypass()
|
if (options.allowBypass) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
allowBypass()
|
||||||
|
}
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
|
||||||
setHttpProxy(
|
setHttpProxy(
|
||||||
ProxyInfo.buildDirectProxy(
|
ProxyInfo.buildDirectProxy(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
port,
|
options.port,
|
||||||
passList
|
options.bypassDomain
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
establish()?.detachFd()
|
establish()?.detachFd()
|
||||||
|
?: throw NullPointerException("Establish VPN rejected by system")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun stop() {
|
override fun stop() {
|
||||||
stopSelf()
|
stopSelf()
|
||||||
stopForeground()
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
stopForeground(STOP_FOREGROUND_REMOVE)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val CHANNEL = "FlClash"
|
||||||
|
|
||||||
private val notificationBuilder by lazy {
|
private val notificationId: Int = 1
|
||||||
val intent = Intent(this, MainActivity::class.java)
|
|
||||||
|
|
||||||
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
|
||||||
PendingIntent.getActivity(
|
CoroutineScope(Dispatchers.Main).async {
|
||||||
this,
|
val stopText = GlobalState.getText("stop")
|
||||||
0,
|
val intent = Intent(this@FlClashVpnService, MainActivity::class.java)
|
||||||
intent,
|
|
||||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
PendingIntent.getActivity(
|
|
||||||
this,
|
|
||||||
0,
|
|
||||||
intent,
|
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
|
val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
|
||||||
|
PendingIntent.getActivity(
|
||||||
with(NotificationCompat.Builder(this, CHANNEL)) {
|
this@FlClashVpnService,
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
0,
|
||||||
setSmallIcon(icon)
|
intent,
|
||||||
|
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
this@FlClashVpnService,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
with(NotificationCompat.Builder(this@FlClashVpnService, CHANNEL)) {
|
||||||
|
setSmallIcon(R.drawable.ic_stat_name)
|
||||||
|
setContentTitle("FlClash")
|
||||||
|
setContentIntent(pendingIntent)
|
||||||
|
setCategory(NotificationCompat.CATEGORY_SERVICE)
|
||||||
|
priority = NotificationCompat.PRIORITY_MIN
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
|
||||||
|
}
|
||||||
|
setOngoing(true)
|
||||||
|
addAction(
|
||||||
|
0,
|
||||||
|
stopText,
|
||||||
|
getActionPendingIntent("STOP")
|
||||||
|
)
|
||||||
|
setShowWhen(false)
|
||||||
|
setOnlyAlertOnce(true)
|
||||||
|
setAutoCancel(true)
|
||||||
}
|
}
|
||||||
setContentTitle("FlClash")
|
|
||||||
foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
|
|
||||||
setContentIntent(pendingIntent)
|
|
||||||
setCategory(NotificationCompat.CATEGORY_SERVICE)
|
|
||||||
priority = NotificationCompat.PRIORITY_LOW
|
|
||||||
setOngoing(true)
|
|
||||||
setShowWhen(false)
|
|
||||||
setOnlyAlertOnce(true)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
|
||||||
|
return notificationBuilderDeferred.await()
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressLint("ForegroundServiceType", "WrongConstant")
|
@SuppressLint("ForegroundServiceType", "WrongConstant")
|
||||||
fun startForeground(title: String, content: String) {
|
override suspend fun startForeground(title: String, content: String) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
val channel =
|
|
||||||
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
|
|
||||||
val manager = getSystemService(NotificationManager::class.java)
|
val manager = getSystemService(NotificationManager::class.java)
|
||||||
manager.createNotificationChannel(channel)
|
var channel = manager?.getNotificationChannel(CHANNEL)
|
||||||
|
if (channel == null) {
|
||||||
|
channel =
|
||||||
|
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
|
||||||
|
manager?.createNotificationChannel(channel)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val notification =
|
val notification =
|
||||||
notificationBuilder.setContentTitle(title).setContentText(content).build()
|
getNotificationBuilder()
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(content)
|
||||||
|
.build()
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||||
} else {
|
} else {
|
||||||
@@ -153,16 +186,29 @@ class FlClashVpnService : VpnService() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun stopForeground() {
|
override fun onTrimMemory(level: Int) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
super.onTrimMemory(level)
|
||||||
stopForeground(Service.STOP_FOREGROUND_REMOVE)
|
GlobalState.getCurrentVPNPlugin()?.requestGc()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private val binder = LocalBinder()
|
private val binder = LocalBinder()
|
||||||
|
|
||||||
inner class LocalBinder : Binder() {
|
inner class LocalBinder : Binder() {
|
||||||
fun getService(): FlClashVpnService = this@FlClashVpnService
|
fun getService(): FlClashVpnService = this@FlClashVpnService
|
||||||
|
|
||||||
|
override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
|
||||||
|
try {
|
||||||
|
val isSuccess = super.onTransact(code, data, reply, flags)
|
||||||
|
if (!isSuccess) {
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
GlobalState.getCurrentTilePlugin()?.handleStop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return isSuccess
|
||||||
|
} catch (e: RemoteException) {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBind(intent: Intent): IBinder {
|
override fun onBind(intent: Intent): IBinder {
|
||||||
@@ -170,7 +216,6 @@ class FlClashVpnService : VpnService() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onUnbind(intent: Intent?): Boolean {
|
override fun onUnbind(intent: Intent?): Boolean {
|
||||||
GlobalState.getCurrentTilePlugin()?.handleStop();
|
|
||||||
return super.onUnbind(intent)
|
return super.onUnbind(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
android/app/src/main/res/drawable-hdpi/ic_stat_name.png
Normal file
|
After Width: | Height: | Size: 618 B |
BIN
android/app/src/main/res/drawable-mdpi/ic_stat_name.png
Normal file
|
After Width: | Height: | Size: 423 B |
BIN
android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
Normal file
|
After Width: | Height: | Size: 803 B |
BIN
android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
25
android/app/src/main/res/drawable/ic_launcher_foreground.xml
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="240"
|
||||||
|
android:viewportHeight="240">
|
||||||
|
<group android:scaleX="0.924"
|
||||||
|
android:scaleY="0.924"
|
||||||
|
android:translateX="9.12"
|
||||||
|
android:translateY="9.12">
|
||||||
|
<group android:scaleX="0.63461536"
|
||||||
|
android:scaleY="0.63461536"
|
||||||
|
android:translateX="45.96154"
|
||||||
|
android:translateY="43.846153">
|
||||||
|
<path
|
||||||
|
android:pathData="M60.65,89.6L154.18,35.6A18,18 107.59,0 1,178.77 42.19L178.77,42.19A18,18 107.59,0 1,172.18 66.78L78.65,120.78A18,18 106.67,0 1,54.06 114.19L54.06,114.19A18,18 106.67,0 1,60.65 89.6z"
|
||||||
|
android:fillColor="#6666FB"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M84.65,131.17L131.42,104.17A18,18 107.83,0 1,156 110.76L156,110.76A18,18 107.83,0 1,149.42 135.35L102.65,162.35A18,18 106.67,0 1,78.06 155.76L78.06,155.76A18,18 106.67,0 1,84.65 131.17z"
|
||||||
|
android:fillColor="#336AB6"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M108.65,172.74L108.65,172.74A18,18 116.03,0 1,133.24 179.33L133.24,179.33A18,18 116.03,0 1,126.65 203.92L126.65,203.92A18,18 116.03,0 1,102.06 197.33L102.06,197.33A18,18 116.03,0 1,108.65 172.74z"
|
||||||
|
android:fillColor="#5CA8E9"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
|
Before Width: | Height: | Size: 105 KiB |
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/ic_launcher_background"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||||
<monochrome android:drawable="@mipmap/ic_launcher_foreground" />
|
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/ic_launcher_background"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||||
<monochrome android:drawable="@mipmap/ic_launcher_foreground" />
|
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 886 B |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 7.1 KiB |
@@ -6,7 +6,7 @@
|
|||||||
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
|
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
||||||
<item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
|
<item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
|
||||||
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
|
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
|
||||||
<item name="postSplashScreenTheme">@style/NormalTheme</item>
|
<item name="postSplashScreenTheme">@style/NormalTheme</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
||||||
<!-- Show a splash screen on the activity. Automatically removed when
|
<!-- Show a splash screen on the activity. Automatically removed when
|
||||||
the Flutter engine draws its first frame -->
|
the Flutter engine draws its first frame -->
|
||||||
<item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
|
|
||||||
</style>
|
</style>
|
||||||
<!-- Theme applied to the Android Window as soon as the process has started.
|
<!-- Theme applied to the Android Window as soon as the process has started.
|
||||||
This theme determines the color of the Android Window while your
|
This theme determines the color of the Android Window while your
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
|
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
||||||
<item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
|
<item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
|
||||||
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
|
<item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
|
||||||
<item name="postSplashScreenTheme">@style/NormalTheme</item>
|
<item name="postSplashScreenTheme">@style/NormalTheme</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="ic_launcher_background">#EFEFEF</color>
|
<color name="ic_launcher_background">#FAFAFA</color>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
||||||
<!-- Show a splash screen on the activity. Automatically removed when
|
<!-- Show a splash screen on the activity. Automatically removed when
|
||||||
the Flutter engine draws its first frame -->
|
the Flutter engine draws its first frame -->
|
||||||
<item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
|
|
||||||
</style>
|
</style>
|
||||||
<!-- Theme applied to the Android Window as soon as the process has started.
|
<!-- Theme applied to the Android Window as soon as the process has started.
|
||||||
This theme determines the color of the Android Window while your
|
This theme determines the color of the Android Window while your
|
||||||
|
|||||||
6
android/app/src/main/res/xml/file_paths.xml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<paths>
|
||||||
|
<files-path
|
||||||
|
name="files"
|
||||||
|
path="."/>
|
||||||
|
</paths>
|
||||||
|
|
||||||
@@ -7,4 +7,8 @@
|
|||||||
<certificates src="user" />
|
<certificates src="user" />
|
||||||
</trust-anchors>
|
</trust-anchors>
|
||||||
</base-config>
|
</base-config>
|
||||||
|
<domain-config cleartextTrafficPermitted="true">
|
||||||
|
<domain includeSubdomains="true">localhost</domain>
|
||||||
|
<domain includeSubdomains="true">127.0.0.1</domain>
|
||||||
|
</domain-config>
|
||||||
</network-security-config>
|
</network-security-config>
|
||||||
BIN
assets/data/GeoIP.dat
Normal file
64257
assets/data/GeoSite.dat
BIN
assets/fonts/Icons.ttf
Normal file
BIN
assets/fonts/MiSans-Regular.ttf
Normal file
BIN
assets/fonts/Twemoji.Mozilla.ttf
Normal file
|
Before Width: | Height: | Size: 9.4 KiB |
BIN
assets/images/avatars/arue.jpg
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
assets/images/avatars/june2.jpg
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
assets/images/icon.ico
Normal file
|
After Width: | Height: | Size: 9.5 KiB |
BIN
assets/images/icon.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
assets/images/icon_black.ico
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
assets/images/icon_black.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
assets/images/icon_white.ico
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
assets/images/icon_white.png
Normal file
|
After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 118 KiB |
167
core/action.go
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Action struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Method Method `json:"method"`
|
||||||
|
Data interface{} `json:"data"`
|
||||||
|
DefaultValue interface{} `json:"default-value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ActionResult struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Method Method `json:"method"`
|
||||||
|
Data interface{} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (result ActionResult) Json() ([]byte, error) {
|
||||||
|
data, err := json.Marshal(result)
|
||||||
|
return data, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (action Action) wrapMessage(data interface{}) []byte {
|
||||||
|
sendAction := ActionResult{
|
||||||
|
Id: action.Id,
|
||||||
|
Method: action.Method,
|
||||||
|
Data: data,
|
||||||
|
}
|
||||||
|
res, _ := sendAction.Json()
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleAction(action *Action, send func([]byte)) {
|
||||||
|
switch action.Method {
|
||||||
|
case initClashMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
send(action.wrapMessage(handleInitClash(data)))
|
||||||
|
return
|
||||||
|
case getIsInitMethod:
|
||||||
|
send(action.wrapMessage(handleGetIsInit()))
|
||||||
|
return
|
||||||
|
case forceGcMethod:
|
||||||
|
handleForceGc()
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return
|
||||||
|
case shutdownMethod:
|
||||||
|
send(action.wrapMessage(handleShutdown()))
|
||||||
|
return
|
||||||
|
case validateConfigMethod:
|
||||||
|
data := []byte(action.Data.(string))
|
||||||
|
send(action.wrapMessage(handleValidateConfig(data)))
|
||||||
|
return
|
||||||
|
case updateConfigMethod:
|
||||||
|
data := []byte(action.Data.(string))
|
||||||
|
send(action.wrapMessage(handleUpdateConfig(data)))
|
||||||
|
return
|
||||||
|
case getProxiesMethod:
|
||||||
|
send(action.wrapMessage(handleGetProxies()))
|
||||||
|
return
|
||||||
|
case changeProxyMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
handleChangeProxy(data, func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case getTrafficMethod:
|
||||||
|
send(action.wrapMessage(handleGetTraffic()))
|
||||||
|
return
|
||||||
|
case getTotalTrafficMethod:
|
||||||
|
send(action.wrapMessage(handleGetTotalTraffic()))
|
||||||
|
return
|
||||||
|
case resetTrafficMethod:
|
||||||
|
handleResetTraffic()
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return
|
||||||
|
case asyncTestDelayMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
handleAsyncTestDelay(data, func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case getConnectionsMethod:
|
||||||
|
send(action.wrapMessage(handleGetConnections()))
|
||||||
|
return
|
||||||
|
case closeConnectionsMethod:
|
||||||
|
send(action.wrapMessage(handleCloseConnections()))
|
||||||
|
return
|
||||||
|
case closeConnectionMethod:
|
||||||
|
id := action.Data.(string)
|
||||||
|
send(action.wrapMessage(handleCloseConnection(id)))
|
||||||
|
return
|
||||||
|
case getExternalProvidersMethod:
|
||||||
|
send(action.wrapMessage(handleGetExternalProviders()))
|
||||||
|
return
|
||||||
|
case getExternalProviderMethod:
|
||||||
|
externalProviderName := action.Data.(string)
|
||||||
|
send(action.wrapMessage(handleGetExternalProvider(externalProviderName)))
|
||||||
|
case updateGeoDataMethod:
|
||||||
|
paramsString := action.Data.(string)
|
||||||
|
var params = map[string]string{}
|
||||||
|
err := json.Unmarshal([]byte(paramsString), ¶ms)
|
||||||
|
if err != nil {
|
||||||
|
send(action.wrapMessage(err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
geoType := params["geo-type"]
|
||||||
|
geoName := params["geo-name"]
|
||||||
|
handleUpdateGeoData(geoType, geoName, func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case updateExternalProviderMethod:
|
||||||
|
providerName := action.Data.(string)
|
||||||
|
handleUpdateExternalProvider(providerName, func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case sideLoadExternalProviderMethod:
|
||||||
|
paramsString := action.Data.(string)
|
||||||
|
var params = map[string]string{}
|
||||||
|
err := json.Unmarshal([]byte(paramsString), ¶ms)
|
||||||
|
if err != nil {
|
||||||
|
send(action.wrapMessage(err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
providerName := params["providerName"]
|
||||||
|
data := params["data"]
|
||||||
|
handleSideLoadExternalProvider(providerName, []byte(data), func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case startLogMethod:
|
||||||
|
handleStartLog()
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return
|
||||||
|
case stopLogMethod:
|
||||||
|
handleStopLog()
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return
|
||||||
|
case startListenerMethod:
|
||||||
|
send(action.wrapMessage(handleStartListener()))
|
||||||
|
return
|
||||||
|
case stopListenerMethod:
|
||||||
|
send(action.wrapMessage(handleStopListener()))
|
||||||
|
return
|
||||||
|
case getCountryCodeMethod:
|
||||||
|
ip := action.Data.(string)
|
||||||
|
handleGetCountryCode(ip, func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
case getMemoryMethod:
|
||||||
|
handleGetMemory(func(value string) {
|
||||||
|
send(action.wrapMessage(value))
|
||||||
|
})
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
handle := nextHandle(action, send)
|
||||||
|
if handle {
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
send(action.wrapMessage(action.DefaultValue))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
571
core/common.go
@@ -1,129 +1,45 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import "C"
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"github.com/metacubex/mihomo/adapter"
|
||||||
"github.com/metacubex/mihomo/adapter/inbound"
|
"github.com/metacubex/mihomo/adapter/inbound"
|
||||||
ap "github.com/metacubex/mihomo/adapter/provider"
|
"github.com/metacubex/mihomo/adapter/outboundgroup"
|
||||||
|
"github.com/metacubex/mihomo/adapter/provider"
|
||||||
|
"github.com/metacubex/mihomo/common/batch"
|
||||||
"github.com/metacubex/mihomo/component/dialer"
|
"github.com/metacubex/mihomo/component/dialer"
|
||||||
"github.com/metacubex/mihomo/component/process"
|
|
||||||
"github.com/metacubex/mihomo/component/resolver"
|
"github.com/metacubex/mihomo/component/resolver"
|
||||||
"github.com/metacubex/mihomo/config"
|
"github.com/metacubex/mihomo/config"
|
||||||
"github.com/metacubex/mihomo/constant/provider"
|
"github.com/metacubex/mihomo/constant"
|
||||||
"github.com/metacubex/mihomo/dns"
|
"github.com/metacubex/mihomo/constant/features"
|
||||||
"github.com/metacubex/mihomo/hub/executor"
|
cp "github.com/metacubex/mihomo/constant/provider"
|
||||||
|
"github.com/metacubex/mihomo/hub"
|
||||||
|
"github.com/metacubex/mihomo/hub/route"
|
||||||
"github.com/metacubex/mihomo/listener"
|
"github.com/metacubex/mihomo/listener"
|
||||||
"github.com/metacubex/mihomo/log"
|
"github.com/metacubex/mihomo/log"
|
||||||
|
rp "github.com/metacubex/mihomo/rules/provider"
|
||||||
"github.com/metacubex/mihomo/tunnel"
|
"github.com/metacubex/mihomo/tunnel"
|
||||||
"math"
|
"github.com/samber/lo"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type healthCheckSchema struct {
|
var (
|
||||||
Enable bool `provider:"enable"`
|
isRunning = false
|
||||||
URL string `provider:"url"`
|
runLock sync.Mutex
|
||||||
Interval int `provider:"interval"`
|
ips = []string{"ipwho.is", "ifconfig.me", "icanhazip.com", "api.ip.sb", "ipinfo.io"}
|
||||||
TestTimeout int `provider:"timeout,omitempty"`
|
b, _ = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
|
||||||
Lazy bool `provider:"lazy,omitempty"`
|
)
|
||||||
ExpectedStatus string `provider:"expected-status,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type proxyProviderSchema struct {
|
type ExternalProviders []ExternalProvider
|
||||||
Type string `provider:"type"`
|
|
||||||
Path string `provider:"path,omitempty"`
|
|
||||||
URL string `provider:"url,omitempty"`
|
|
||||||
Proxy string `provider:"proxy,omitempty"`
|
|
||||||
Interval int `provider:"interval,omitempty"`
|
|
||||||
Filter string `provider:"filter,omitempty"`
|
|
||||||
ExcludeFilter string `provider:"exclude-filter,omitempty"`
|
|
||||||
ExcludeType string `provider:"exclude-type,omitempty"`
|
|
||||||
DialerProxy string `provider:"dialer-proxy,omitempty"`
|
|
||||||
|
|
||||||
HealthCheck healthCheckSchema `provider:"health-check,omitempty"`
|
func (a ExternalProviders) Len() int { return len(a) }
|
||||||
Override ap.OverrideSchema `provider:"override,omitempty"`
|
func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
|
||||||
Header map[string][]string `provider:"header,omitempty"`
|
func (a ExternalProviders) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||||
}
|
|
||||||
|
|
||||||
type ruleProviderSchema struct {
|
|
||||||
Type string `provider:"type"`
|
|
||||||
Behavior string `provider:"behavior"`
|
|
||||||
Path string `provider:"path,omitempty"`
|
|
||||||
URL string `provider:"url,omitempty"`
|
|
||||||
Proxy string `provider:"proxy,omitempty"`
|
|
||||||
Format string `provider:"format,omitempty"`
|
|
||||||
Interval int `provider:"interval,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type GenerateConfigParams struct {
|
|
||||||
ProfilePath *string `json:"profile-path"`
|
|
||||||
Config *config.RawConfig `json:"config" `
|
|
||||||
IsPatch *bool `json:"is-patch"`
|
|
||||||
IsCompatible *bool `json:"is-compatible"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ChangeProxyParams struct {
|
|
||||||
GroupName *string `json:"group-name"`
|
|
||||||
ProxyName *string `json:"proxy-name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type TestDelayParams struct {
|
|
||||||
ProxyName string `json:"proxy-name"`
|
|
||||||
Timeout int64 `json:"timeout"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type Delay struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
Value int32 `json:"value"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type Process struct {
|
|
||||||
Uid uint32 `json:"uid"`
|
|
||||||
Network string `json:"network"`
|
|
||||||
Source string `json:"source"`
|
|
||||||
Target string `json:"target"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type Now struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
Value string `json:"value"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ExternalProvider struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
Type string `json:"type"`
|
|
||||||
VehicleType string `json:"vehicle-type"`
|
|
||||||
UpdateAt time.Time `json:"update-at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func restartExecutable(execPath string) {
|
|
||||||
var err error
|
|
||||||
executor.Shutdown()
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
cmd := exec.Command(execPath, os.Args[1:]...)
|
|
||||||
log.Infoln("restarting: %q %q", execPath, os.Args[1:])
|
|
||||||
cmd.Stdin = os.Stdin
|
|
||||||
cmd.Stdout = os.Stdout
|
|
||||||
cmd.Stderr = os.Stderr
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalln("restarting: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Infoln("restarting: %q %q", execPath, os.Args[1:])
|
|
||||||
err = syscall.Exec(execPath, os.Args, os.Environ())
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalln("restarting: %s", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func readFile(path string) ([]byte, error) {
|
func readFile(path string) ([]byte, error) {
|
||||||
if _, err := os.Stat(path); os.IsNotExist(err) {
|
if _, err := os.Stat(path); os.IsNotExist(err) {
|
||||||
@@ -137,280 +53,291 @@ func readFile(path string) ([]byte, error) {
|
|||||||
return data, err
|
return data, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func removeFile(path string) error {
|
func getProfilePath(id string) string {
|
||||||
absPath, err := filepath.Abs(path)
|
return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = os.Remove(absPath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getRawConfigWithPath(path *string) *config.RawConfig {
|
func getProfileProvidersPath(id string) string {
|
||||||
if path == nil {
|
return filepath.Join(constant.Path.HomeDir(), "providers", id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getRawConfigWithId(id string) *config.RawConfig {
|
||||||
|
path := getProfilePath(id)
|
||||||
|
bytes, err := readFile(path)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorln("profile is not exist")
|
||||||
return config.DefaultRawConfig()
|
return config.DefaultRawConfig()
|
||||||
} else {
|
|
||||||
bytes, err := readFile(*path)
|
|
||||||
if err != nil {
|
|
||||||
log.Errorln("getProfile readFile error %v", err)
|
|
||||||
return config.DefaultRawConfig()
|
|
||||||
}
|
|
||||||
prof, err := config.UnmarshalRawConfig(bytes)
|
|
||||||
if err != nil {
|
|
||||||
log.Errorln("getProfile UnmarshalRawConfig error %v", err)
|
|
||||||
return config.DefaultRawConfig()
|
|
||||||
}
|
|
||||||
return prof
|
|
||||||
}
|
}
|
||||||
}
|
prof, err := config.UnmarshalRawConfig(bytes)
|
||||||
|
if err != nil {
|
||||||
func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
|
log.Errorln("unmarshalRawConfig error %v", err)
|
||||||
prof := getRawConfigWithPath(profilePath)
|
return config.DefaultRawConfig()
|
||||||
overwriteConfig(prof, cfg, compatible)
|
}
|
||||||
|
for _, mapping := range prof.ProxyProvider {
|
||||||
|
value, exist := mapping["path"].(string)
|
||||||
|
if !exist {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
|
||||||
|
}
|
||||||
|
for _, mapping := range prof.RuleProvider {
|
||||||
|
value, exist := mapping["path"].(string)
|
||||||
|
if !exist {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
|
||||||
|
}
|
||||||
return prof
|
return prof
|
||||||
}
|
}
|
||||||
|
|
||||||
func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
|
func getExternalProvidersRaw() map[string]cp.Provider {
|
||||||
for _, v := range s {
|
eps := make(map[string]cp.Provider)
|
||||||
initVal = f(initVal, v)
|
for n, p := range tunnel.Providers() {
|
||||||
}
|
if p.VehicleType() != cp.Compatible {
|
||||||
return initVal
|
eps[n] = p
|
||||||
}
|
|
||||||
|
|
||||||
func Map[T, U any](slice []T, fn func(T) U) []U {
|
|
||||||
result := make([]U, len(slice))
|
|
||||||
for i, v := range slice {
|
|
||||||
result[i] = fn(v)
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func replaceFromMap(s string, m map[string]string) string {
|
|
||||||
for k, v := range m {
|
|
||||||
s = strings.ReplaceAll(s, k, v)
|
|
||||||
}
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
func removeDuplicateFromSlice[T any](slice []T) []T {
|
|
||||||
result := make([]T, 0)
|
|
||||||
seen := make(map[any]struct{})
|
|
||||||
for _, value := range slice {
|
|
||||||
if _, ok := seen[value]; !ok {
|
|
||||||
result = append(result, value)
|
|
||||||
seen[value] = struct{}{}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result
|
for n, p := range tunnel.RuleProviders() {
|
||||||
|
if p.VehicleType() != cp.Compatible {
|
||||||
|
eps[n] = p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return eps
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
|
func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
|
||||||
var replacements = map[string]string{}
|
switch p.(type) {
|
||||||
var selectArr []map[string]any
|
case *provider.ProxySetProvider:
|
||||||
var urlTestArr []map[string]any
|
psp := p.(*provider.ProxySetProvider)
|
||||||
var fallbackArr []map[string]any
|
return &ExternalProvider{
|
||||||
for _, group := range *proxyGroup {
|
Name: psp.Name(),
|
||||||
switch group["type"] {
|
Type: psp.Type().String(),
|
||||||
case "select":
|
VehicleType: psp.VehicleType().String(),
|
||||||
selectArr = append(selectArr, group)
|
Count: psp.Count(),
|
||||||
replacements[group["name"].(string)] = "Proxy"
|
UpdateAt: psp.UpdatedAt(),
|
||||||
break
|
Path: psp.Vehicle().Path(),
|
||||||
case "url-test":
|
SubscriptionInfo: psp.GetSubscriptionInfo(),
|
||||||
urlTestArr = append(urlTestArr, group)
|
}, nil
|
||||||
replacements[group["name"].(string)] = "Auto"
|
case *rp.RuleSetProvider:
|
||||||
break
|
rsp := p.(*rp.RuleSetProvider)
|
||||||
case "fallback":
|
return &ExternalProvider{
|
||||||
fallbackArr = append(fallbackArr, group)
|
Name: rsp.Name(),
|
||||||
replacements[group["name"].(string)] = "Fallback"
|
Type: rsp.Type().String(),
|
||||||
break
|
VehicleType: rsp.VehicleType().String(),
|
||||||
default:
|
Count: rsp.Count(),
|
||||||
|
UpdateAt: rsp.UpdatedAt(),
|
||||||
|
Path: rsp.Vehicle().Path(),
|
||||||
|
}, nil
|
||||||
|
default:
|
||||||
|
return nil, errors.New("not external provider")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
|
||||||
|
switch p.(type) {
|
||||||
|
case *provider.ProxySetProvider:
|
||||||
|
psp := p.(*provider.ProxySetProvider)
|
||||||
|
_, _, err := psp.SideUpdate(bytes)
|
||||||
|
if err == nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
case rp.RuleSetProvider:
|
||||||
|
rsp := p.(*rp.RuleSetProvider)
|
||||||
|
_, _, err := rsp.SideUpdate(bytes)
|
||||||
|
if err == nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
default:
|
||||||
|
return errors.New("not external provider")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig {
|
||||||
|
prof := getRawConfigWithId(profileId)
|
||||||
|
overwriteConfig(prof, cfg)
|
||||||
|
return prof
|
||||||
|
}
|
||||||
|
|
||||||
|
func genHosts(hosts, patchHosts map[string]any) {
|
||||||
|
for k, v := range patchHosts {
|
||||||
|
hosts[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func trimArr(arr []string) (r []string) {
|
||||||
|
for _, e := range arr {
|
||||||
|
r = append(r, strings.Trim(e, " "))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func overrideRules(rules *[]string) {
|
||||||
|
var target = ""
|
||||||
|
for _, line := range *rules {
|
||||||
|
rule := trimArr(strings.Split(line, ","))
|
||||||
|
l := len(rule)
|
||||||
|
if l != 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.ToUpper(rule[0]) == "MATCH" {
|
||||||
|
target = rule[1]
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if target == "" {
|
||||||
ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
|
return
|
||||||
if cur["proxies"] == nil {
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
for _, proxyName := range cur["proxies"].([]interface{}) {
|
|
||||||
if str, ok := proxyName.(string); ok {
|
|
||||||
str = replaceFromMap(str, replacements)
|
|
||||||
if str != "Proxy" {
|
|
||||||
res = append(res, str)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
})
|
|
||||||
|
|
||||||
ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
|
|
||||||
|
|
||||||
AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
|
|
||||||
if cur["proxies"] == nil {
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
for _, proxyName := range cur["proxies"].([]interface{}) {
|
|
||||||
if str, ok := proxyName.(string); ok {
|
|
||||||
str = replaceFromMap(str, replacements)
|
|
||||||
if str != "Auto" {
|
|
||||||
res = append(res, str)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
})
|
|
||||||
|
|
||||||
AutoProxies = removeDuplicateFromSlice(AutoProxies)
|
|
||||||
|
|
||||||
FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
|
|
||||||
if cur["proxies"] == nil {
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
for _, proxyName := range cur["proxies"].([]interface{}) {
|
|
||||||
if str, ok := proxyName.(string); ok {
|
|
||||||
str = replaceFromMap(str, replacements)
|
|
||||||
if str != "Fallback" {
|
|
||||||
res = append(res, str)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
})
|
|
||||||
|
|
||||||
FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
|
|
||||||
|
|
||||||
var computedProxyGroup []map[string]any
|
|
||||||
|
|
||||||
if len(ProxyProxies) > 0 {
|
|
||||||
computedProxyGroup = append(computedProxyGroup,
|
|
||||||
map[string]any{
|
|
||||||
"name": "Proxy",
|
|
||||||
"type": "select",
|
|
||||||
"proxies": ProxyProxies,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
var rulesExt = lo.Map(ips, func(ip string, index int) string {
|
||||||
if len(AutoProxies) > 0 {
|
return fmt.Sprintf("DOMAIN %s %s", ip, target)
|
||||||
computedProxyGroup = append(computedProxyGroup,
|
|
||||||
map[string]any{
|
|
||||||
"name": "Auto",
|
|
||||||
"type": "url-test",
|
|
||||||
"proxies": AutoProxies,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(FallbackProxies) > 0 {
|
|
||||||
computedProxyGroup = append(computedProxyGroup,
|
|
||||||
map[string]any{
|
|
||||||
"name": "Fallback",
|
|
||||||
"type": "fallback",
|
|
||||||
"proxies": FallbackProxies,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
computedRule := Map(*rule, func(value string) string {
|
|
||||||
return replaceFromMap(value, replacements)
|
|
||||||
})
|
})
|
||||||
|
*rules = append(rulesExt, *rules...)
|
||||||
*proxyGroup = computedProxyGroup
|
|
||||||
*rule = computedRule
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
|
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
|
||||||
targetConfig.ExternalController = ""
|
targetConfig.ExternalController = patchConfig.ExternalController
|
||||||
targetConfig.ExternalUI = ""
|
targetConfig.ExternalUI = ""
|
||||||
targetConfig.Interface = ""
|
targetConfig.Interface = ""
|
||||||
targetConfig.ExternalUIURL = ""
|
targetConfig.ExternalUIURL = ""
|
||||||
targetConfig.GeodataMode = false
|
targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
|
||||||
//targetConfig.IPv6 = patchConfig.IPv6
|
targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
|
||||||
|
targetConfig.IPv6 = patchConfig.IPv6
|
||||||
targetConfig.LogLevel = patchConfig.LogLevel
|
targetConfig.LogLevel = patchConfig.LogLevel
|
||||||
targetConfig.Port = 0
|
targetConfig.Port = 0
|
||||||
targetConfig.SocksPort = 0
|
targetConfig.SocksPort = 0
|
||||||
|
targetConfig.KeepAliveInterval = patchConfig.KeepAliveInterval
|
||||||
targetConfig.MixedPort = patchConfig.MixedPort
|
targetConfig.MixedPort = patchConfig.MixedPort
|
||||||
targetConfig.FindProcessMode = process.FindProcessAlways
|
targetConfig.FindProcessMode = patchConfig.FindProcessMode
|
||||||
targetConfig.AllowLan = patchConfig.AllowLan
|
targetConfig.AllowLan = patchConfig.AllowLan
|
||||||
targetConfig.Mode = patchConfig.Mode
|
targetConfig.Mode = patchConfig.Mode
|
||||||
targetConfig.Tun.Enable = patchConfig.Tun.Enable
|
targetConfig.Tun.Enable = patchConfig.Tun.Enable
|
||||||
targetConfig.Tun.Device = patchConfig.Tun.Device
|
targetConfig.Tun.Device = patchConfig.Tun.Device
|
||||||
targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
|
targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
|
||||||
targetConfig.Tun.Stack = patchConfig.Tun.Stack
|
targetConfig.Tun.Stack = patchConfig.Tun.Stack
|
||||||
targetConfig.GeodataLoader = "standard"
|
targetConfig.GeodataLoader = patchConfig.GeodataLoader
|
||||||
targetConfig.Profile.StoreSelected = false
|
targetConfig.Profile.StoreSelected = false
|
||||||
if targetConfig.DNS.Enable == false {
|
targetConfig.GeoXUrl = patchConfig.GeoXUrl
|
||||||
|
targetConfig.GlobalUA = patchConfig.GlobalUA
|
||||||
|
if configParams.TestURL != nil {
|
||||||
|
constant.DefaultTestURL = *configParams.TestURL
|
||||||
|
}
|
||||||
|
for idx := range targetConfig.ProxyGroup {
|
||||||
|
targetConfig.ProxyGroup[idx]["url"] = ""
|
||||||
|
}
|
||||||
|
genHosts(targetConfig.Hosts, patchConfig.Hosts)
|
||||||
|
if configParams.OverrideDns {
|
||||||
targetConfig.DNS = patchConfig.DNS
|
targetConfig.DNS = patchConfig.DNS
|
||||||
|
} else {
|
||||||
|
if targetConfig.DNS.Enable == false {
|
||||||
|
targetConfig.DNS.Enable = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if runtime.GOOS == "android" {
|
overrideRules(&targetConfig.Rule)
|
||||||
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
|
|
||||||
} else if runtime.GOOS == "windows" {
|
|
||||||
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
|
|
||||||
}
|
|
||||||
if compatible == false {
|
|
||||||
targetConfig.ProxyProvider = make(map[string]map[string]any)
|
|
||||||
targetConfig.RuleProvider = make(map[string]map[string]any)
|
|
||||||
generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func patchConfig(general *config.General) {
|
func patchConfig() {
|
||||||
log.Infoln("[Apply] patch")
|
log.Infoln("[Apply] patch")
|
||||||
|
general := currentConfig.General
|
||||||
|
controller := currentConfig.Controller
|
||||||
|
tls := currentConfig.TLS
|
||||||
|
tunnel.SetSniffing(general.Sniffing)
|
||||||
|
tunnel.SetFindProcessMode(general.FindProcessMode)
|
||||||
|
dialer.SetTcpConcurrent(general.TCPConcurrent)
|
||||||
|
dialer.DefaultInterface.Store(general.Interface)
|
||||||
|
adapter.UnifiedDelay.Store(general.UnifiedDelay)
|
||||||
|
tunnel.SetMode(general.Mode)
|
||||||
|
log.SetLevel(general.LogLevel)
|
||||||
|
resolver.DisableIPv6 = !general.IPv6
|
||||||
|
|
||||||
|
route.ReCreateServer(&route.Config{
|
||||||
|
Addr: controller.ExternalController,
|
||||||
|
TLSAddr: controller.ExternalControllerTLS,
|
||||||
|
UnixAddr: controller.ExternalControllerUnix,
|
||||||
|
PipeAddr: controller.ExternalControllerPipe,
|
||||||
|
Secret: controller.Secret,
|
||||||
|
Certificate: tls.Certificate,
|
||||||
|
PrivateKey: tls.PrivateKey,
|
||||||
|
DohServer: controller.ExternalDohServer,
|
||||||
|
IsDebug: false,
|
||||||
|
Cors: route.Cors{
|
||||||
|
AllowOrigins: controller.Cors.AllowOrigins,
|
||||||
|
AllowPrivateNetwork: controller.Cors.AllowPrivateNetwork,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateListeners(force bool) {
|
||||||
|
if !isRunning {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
general := currentConfig.General
|
||||||
|
listeners := currentConfig.Listeners
|
||||||
|
if force == true {
|
||||||
|
stopListeners()
|
||||||
|
}
|
||||||
|
listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
|
||||||
listener.SetAllowLan(general.AllowLan)
|
listener.SetAllowLan(general.AllowLan)
|
||||||
inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
|
inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
|
||||||
inbound.SetAllowedIPs(general.LanAllowedIPs)
|
inbound.SetAllowedIPs(general.LanAllowedIPs)
|
||||||
inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
|
inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
|
||||||
listener.SetBindAddress(general.BindAddress)
|
listener.SetBindAddress(general.BindAddress)
|
||||||
tunnel.SetSniffing(general.Sniffing)
|
|
||||||
dialer.SetTcpConcurrent(general.TCPConcurrent)
|
|
||||||
dialer.DefaultInterface.Store(general.Interface)
|
|
||||||
listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
|
listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
|
||||||
listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
|
listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
|
||||||
listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
|
listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
|
||||||
listener.ReCreateAutoRedir(general.EBpf.AutoRedir, tunnel.Tunnel)
|
|
||||||
listener.ReCreateTProxy(general.TProxyPort, tunnel.Tunnel)
|
listener.ReCreateTProxy(general.TProxyPort, tunnel.Tunnel)
|
||||||
listener.ReCreateTun(general.Tun, tunnel.Tunnel)
|
|
||||||
listener.ReCreateMixed(general.MixedPort, tunnel.Tunnel)
|
listener.ReCreateMixed(general.MixedPort, tunnel.Tunnel)
|
||||||
listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
|
listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
|
||||||
listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
|
listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
|
||||||
listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
|
listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
|
||||||
tunnel.SetMode(general.Mode)
|
if !features.Android {
|
||||||
log.SetLevel(general.LogLevel)
|
listener.ReCreateTun(general.Tun, tunnel.Tunnel)
|
||||||
resolver.DisableIPv6 = !general.IPv6
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const concurrentCount = math.MaxInt
|
func stopListeners() {
|
||||||
|
listener.StopListener()
|
||||||
|
}
|
||||||
|
|
||||||
func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
|
func patchSelectGroup() {
|
||||||
wg := sync.WaitGroup{}
|
mapping := configParams.SelectedMap
|
||||||
ch := make(chan struct{}, concurrentCount)
|
if mapping == nil {
|
||||||
for _, proxyProvider := range proxyProviders {
|
return
|
||||||
proxyProvider := proxyProvider
|
}
|
||||||
if proxyProvider.VehicleType() == provider.Compatible {
|
for name, proxy := range tunnel.ProxiesWithProviders() {
|
||||||
log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
|
outbound, ok := proxy.(*adapter.Proxy)
|
||||||
wg.Add(1)
|
if !ok {
|
||||||
ch <- struct{}{}
|
continue
|
||||||
go func() {
|
|
||||||
defer func() { <-ch; wg.Done() }()
|
|
||||||
if err := proxyProvider.Initial(); err != nil {
|
|
||||||
log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
selected, exist := mapping[name]
|
||||||
|
if !exist {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
selector.ForceSet(selected)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyConfig(isPatch bool) {
|
func applyConfig(rawConfig *config.RawConfig) error {
|
||||||
cfg, err := config.ParseRawConfig(currentConfig)
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
|
var err error
|
||||||
|
currentConfig, err = config.ParseRawConfig(rawConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
|
currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
|
||||||
}
|
}
|
||||||
if isPatch {
|
if configParams.IsPatch {
|
||||||
patchConfig(cfg.General)
|
patchConfig()
|
||||||
} else {
|
} else {
|
||||||
executor.ApplyConfig(cfg, true)
|
hub.ApplyConfig(currentConfig)
|
||||||
hcCompatibleProvider(tunnel.Providers())
|
patchSelectGroup()
|
||||||
}
|
}
|
||||||
|
updateListeners(false)
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
127
core/constant.go
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"github.com/metacubex/mihomo/adapter/provider"
|
||||||
|
"github.com/metacubex/mihomo/config"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ConfigExtendedParams struct {
|
||||||
|
IsPatch bool `json:"is-patch"`
|
||||||
|
IsCompatible bool `json:"is-compatible"`
|
||||||
|
SelectedMap map[string]string `json:"selected-map"`
|
||||||
|
TestURL *string `json:"test-url"`
|
||||||
|
OverrideDns bool `json:"override-dns"`
|
||||||
|
OnlyStatisticsProxy bool `json:"only-statistics-proxy"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GenerateConfigParams struct {
|
||||||
|
ProfileId string `json:"profile-id"`
|
||||||
|
Config config.RawConfig `json:"config" `
|
||||||
|
Params ConfigExtendedParams `json:"params"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ChangeProxyParams struct {
|
||||||
|
GroupName *string `json:"group-name"`
|
||||||
|
ProxyName *string `json:"proxy-name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type TestDelayParams struct {
|
||||||
|
ProxyName string `json:"proxy-name"`
|
||||||
|
TestUrl string `json:"test-url"`
|
||||||
|
Timeout int64 `json:"timeout"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ExternalProvider struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
VehicleType string `json:"vehicle-type"`
|
||||||
|
Count int `json:"count"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
UpdateAt time.Time `json:"update-at"`
|
||||||
|
SubscriptionInfo *provider.SubscriptionInfo `json:"subscription-info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
messageMethod Method = "message"
|
||||||
|
initClashMethod Method = "initClash"
|
||||||
|
getIsInitMethod Method = "getIsInit"
|
||||||
|
forceGcMethod Method = "forceGc"
|
||||||
|
shutdownMethod Method = "shutdown"
|
||||||
|
validateConfigMethod Method = "validateConfig"
|
||||||
|
updateConfigMethod Method = "updateConfig"
|
||||||
|
getProxiesMethod Method = "getProxies"
|
||||||
|
changeProxyMethod Method = "changeProxy"
|
||||||
|
getTrafficMethod Method = "getTraffic"
|
||||||
|
getTotalTrafficMethod Method = "getTotalTraffic"
|
||||||
|
resetTrafficMethod Method = "resetTraffic"
|
||||||
|
asyncTestDelayMethod Method = "asyncTestDelay"
|
||||||
|
getConnectionsMethod Method = "getConnections"
|
||||||
|
closeConnectionsMethod Method = "closeConnections"
|
||||||
|
closeConnectionMethod Method = "closeConnection"
|
||||||
|
getExternalProvidersMethod Method = "getExternalProviders"
|
||||||
|
getExternalProviderMethod Method = "getExternalProvider"
|
||||||
|
getCountryCodeMethod Method = "getCountryCode"
|
||||||
|
getMemoryMethod Method = "getMemory"
|
||||||
|
updateGeoDataMethod Method = "updateGeoData"
|
||||||
|
updateExternalProviderMethod Method = "updateExternalProvider"
|
||||||
|
sideLoadExternalProviderMethod Method = "sideLoadExternalProvider"
|
||||||
|
startLogMethod Method = "startLog"
|
||||||
|
stopLogMethod Method = "stopLog"
|
||||||
|
startListenerMethod Method = "startListener"
|
||||||
|
stopListenerMethod Method = "stopListener"
|
||||||
|
startTunMethod Method = "startTun"
|
||||||
|
stopTunMethod Method = "stopTun"
|
||||||
|
updateDnsMethod Method = "updateDns"
|
||||||
|
setProcessMapMethod Method = "setProcessMap"
|
||||||
|
setFdMapMethod Method = "setFdMap"
|
||||||
|
setStateMethod Method = "setState"
|
||||||
|
getAndroidVpnOptionsMethod Method = "getAndroidVpnOptions"
|
||||||
|
getRunTimeMethod Method = "getRunTime"
|
||||||
|
getCurrentProfileNameMethod Method = "getCurrentProfileName"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Method string
|
||||||
|
|
||||||
|
type MessageType string
|
||||||
|
|
||||||
|
type Delay struct {
|
||||||
|
Url string `json:"url"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Value int32 `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Message struct {
|
||||||
|
Type MessageType `json:"type"`
|
||||||
|
Data interface{} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
LogMessage MessageType = "log"
|
||||||
|
DelayMessage MessageType = "delay"
|
||||||
|
RequestMessage MessageType = "request"
|
||||||
|
LoadedMessage MessageType = "loaded"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (message *Message) Json() (string, error) {
|
||||||
|
data, err := json.Marshal(message)
|
||||||
|
return string(data), err
|
||||||
|
}
|
||||||
|
|
||||||
|
type InvokeMessage struct {
|
||||||
|
Type InvokeType `json:"type"`
|
||||||
|
Data interface{} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type InvokeType string
|
||||||
|
|
||||||
|
const (
|
||||||
|
ProtectInvoke InvokeType = "protect"
|
||||||
|
ProcessInvoke InvokeType = "process"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (message *InvokeMessage) Json() string {
|
||||||
|
data, _ := json.Marshal(message)
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
|
//go:build cgo
|
||||||
|
|
||||||
package dart_bridge
|
package dart_bridge
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
#include <stdlib.h>
|
||||||
#include "stdint.h"
|
#include "stdint.h"
|
||||||
#include "include/dart_api_dl.h"
|
#include "include/dart_api_dl.h"
|
||||||
#include "include/dart_api_dl.c"
|
#include "include/dart_api_dl.c"
|
||||||
@@ -24,14 +27,16 @@ func InitDartApi(api unsafe.Pointer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func SendToPort(port int64, msg string) {
|
func SendToPort(port int64, msg string) bool {
|
||||||
var obj C.Dart_CObject
|
var obj C.Dart_CObject
|
||||||
obj._type = C.Dart_CObject_kString
|
obj._type = C.Dart_CObject_kString
|
||||||
msgString := C.CString(msg)
|
msgString := C.CString(msg)
|
||||||
|
defer C.free(unsafe.Pointer(msgString))
|
||||||
ptr := unsafe.Pointer(&obj.value[0])
|
ptr := unsafe.Pointer(&obj.value[0])
|
||||||
*(**C.char)(ptr) = msgString
|
*(**C.char)(ptr) = msgString
|
||||||
isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
|
isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
|
||||||
if !isSuccess {
|
if !isSuccess {
|
||||||
fmt.Println("ERROR: post to port ", port, " failed", msg)
|
return false
|
||||||
}
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
7
core/dart-bridge/lib_common.go
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
//go:build !cgo
|
||||||
|
|
||||||
|
package dart_bridge
|
||||||
|
|
||||||
|
func SendToPort(port int64, msg string) bool {
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package dart_bridge
|
|
||||||
|
|
||||||
import "encoding/json"
|
|
||||||
|
|
||||||
var Port *int64
|
|
||||||
|
|
||||||
type MessageType string
|
|
||||||
|
|
||||||
const (
|
|
||||||
Log MessageType = "log"
|
|
||||||
Tun MessageType = "tun"
|
|
||||||
Delay MessageType = "delay"
|
|
||||||
Now MessageType = "now"
|
|
||||||
Process MessageType = "process"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Message struct {
|
|
||||||
Type MessageType `json:"type"`
|
|
||||||
Data interface{} `json:"data"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (message *Message) Json() string {
|
|
||||||
data, _ := json.Marshal(message)
|
|
||||||
return string(data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func SendMessage(message Message) {
|
|
||||||
SendToPort(*Port, message.Json())
|
|
||||||
}
|
|
||||||
97
core/go.mod
@@ -5,61 +5,67 @@ go 1.20
|
|||||||
replace github.com/metacubex/mihomo => ./Clash.Meta
|
replace github.com/metacubex/mihomo => ./Clash.Meta
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
|
github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
|
||||||
github.com/metacubex/mihomo v1.17.1
|
github.com/samber/lo v1.47.0
|
||||||
github.com/miekg/dns v1.1.59
|
|
||||||
golang.org/x/net v0.25.0
|
|
||||||
golang.org/x/sync v0.7.0
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/3andne/restls-client-go v0.1.6 // indirect
|
github.com/3andne/restls-client-go v0.1.6 // indirect
|
||||||
github.com/RyuaNerin/go-krypto v1.2.4 // indirect
|
github.com/RyuaNerin/go-krypto v1.2.4 // indirect
|
||||||
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
|
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
|
||||||
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
|
github.com/ajg/form v1.5.1 // indirect
|
||||||
github.com/andybalholm/brotli v1.0.6 // indirect
|
github.com/andybalholm/brotli v1.0.6 // indirect
|
||||||
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
||||||
github.com/buger/jsonparser v1.1.1 // indirect
|
github.com/buger/jsonparser v1.1.1 // indirect
|
||||||
github.com/cilium/ebpf v0.12.3 // indirect
|
|
||||||
github.com/cloudflare/circl v1.3.7 // indirect
|
github.com/cloudflare/circl v1.3.7 // indirect
|
||||||
github.com/coreos/go-iptables v0.7.0 // indirect
|
github.com/coreos/go-iptables v0.8.0 // indirect
|
||||||
github.com/dlclark/regexp2 v1.11.0 // indirect
|
github.com/dlclark/regexp2 v1.11.4 // indirect
|
||||||
|
github.com/ebitengine/purego v0.8.1 // indirect
|
||||||
|
github.com/enfein/mieru/v3 v3.10.0 // indirect
|
||||||
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
|
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
|
||||||
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
|
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
|
||||||
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
|
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
|
||||||
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
|
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.7.0 // indirect
|
github.com/fsnotify/fsnotify v1.7.0 // indirect
|
||||||
github.com/gaukas/godicttls v0.0.4 // indirect
|
github.com/gaukas/godicttls v0.0.4 // indirect
|
||||||
|
github.com/go-chi/chi/v5 v5.2.0 // indirect
|
||||||
|
github.com/go-chi/render v1.0.3 // indirect
|
||||||
github.com/go-ole/go-ole v1.3.0 // indirect
|
github.com/go-ole/go-ole v1.3.0 // indirect
|
||||||
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
||||||
github.com/gobwas/httphead v0.1.0 // indirect
|
github.com/gobwas/httphead v0.1.0 // indirect
|
||||||
github.com/gobwas/pool v0.2.1 // indirect
|
github.com/gobwas/pool v0.2.1 // indirect
|
||||||
github.com/gobwas/ws v1.4.0 // indirect
|
github.com/gobwas/ws v1.4.0 // indirect
|
||||||
github.com/gofrs/uuid/v5 v5.2.0 // indirect
|
github.com/gofrs/uuid/v5 v5.3.0 // indirect
|
||||||
github.com/google/btree v1.1.2 // indirect
|
github.com/google/btree v1.1.3 // indirect
|
||||||
github.com/google/go-cmp v0.6.0 // indirect
|
github.com/google/go-cmp v0.6.0 // indirect
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
||||||
github.com/hashicorp/yamux v0.1.1 // indirect
|
github.com/hashicorp/yamux v0.1.2 // indirect
|
||||||
github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
|
github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d // indirect
|
||||||
github.com/josharian/native v1.1.0 // indirect
|
github.com/josharian/native v1.1.0 // indirect
|
||||||
github.com/klauspost/compress v1.17.4 // indirect
|
github.com/klauspost/compress v1.17.9 // indirect
|
||||||
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
|
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
|
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
|
||||||
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
|
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
|
||||||
github.com/mailru/easyjson v0.7.7 // indirect
|
github.com/mailru/easyjson v0.7.7 // indirect
|
||||||
github.com/mdlayher/netlink v1.7.2 // indirect
|
github.com/mdlayher/netlink v1.7.2 // indirect
|
||||||
github.com/mdlayher/socket v0.4.1 // indirect
|
github.com/mdlayher/socket v0.4.1 // indirect
|
||||||
|
github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
|
||||||
|
github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
|
||||||
|
github.com/metacubex/chacha v0.1.0 // indirect
|
||||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
|
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
|
github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a // indirect
|
||||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
|
github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da // indirect
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
|
github.com/metacubex/randv2 v0.2.0 // indirect
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
|
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
|
github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
|
||||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
|
github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
|
github.com/metacubex/sing-tun v0.4.5 // indirect
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
|
github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
|
github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
|
||||||
|
github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
|
||||||
github.com/metacubex/utls v1.6.6 // indirect
|
github.com/metacubex/utls v1.6.6 // indirect
|
||||||
|
github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
|
||||||
|
github.com/miekg/dns v1.1.62 // indirect
|
||||||
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
|
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
|
||||||
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
|
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
|
||||||
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
||||||
@@ -67,19 +73,18 @@ require (
|
|||||||
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
|
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
|
||||||
github.com/pierrec/lz4/v4 v4.1.14 // indirect
|
github.com/pierrec/lz4/v4 v4.1.14 // indirect
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
|
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
|
github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect
|
||||||
github.com/quic-go/qpack v0.4.0 // indirect
|
github.com/quic-go/qpack v0.4.0 // indirect
|
||||||
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
|
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
|
||||||
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
|
github.com/sagernet/cors v1.2.1 // indirect
|
||||||
github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
|
github.com/sagernet/fswatch v0.1.1 // indirect
|
||||||
github.com/sagernet/sing v0.3.8 // indirect
|
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
|
||||||
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
|
github.com/sagernet/nftables v0.3.0-beta.4 // indirect
|
||||||
github.com/sagernet/sing-shadowtls v0.1.4 // indirect
|
github.com/sagernet/sing v0.5.1 // indirect
|
||||||
|
github.com/sagernet/sing-mux v0.2.1 // indirect
|
||||||
|
github.com/sagernet/sing-shadowtls v0.1.5 // indirect
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
|
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
|
||||||
github.com/samber/lo v1.39.0 // indirect
|
|
||||||
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
|
||||||
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
|
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
|
||||||
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
|
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
|
||||||
github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
|
github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
|
||||||
@@ -87,21 +92,25 @@ require (
|
|||||||
github.com/tklauser/go-sysconf v0.3.12 // indirect
|
github.com/tklauser/go-sysconf v0.3.12 // indirect
|
||||||
github.com/tklauser/numcpus v0.6.1 // indirect
|
github.com/tklauser/numcpus v0.6.1 // indirect
|
||||||
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
|
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
|
||||||
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
|
github.com/vishvananda/netns v0.0.4 // indirect
|
||||||
|
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
|
||||||
|
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
||||||
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
|
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
|
||||||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||||
github.com/zhangyunhao116/fastrand v0.4.0 // indirect
|
gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
|
||||||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
|
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
|
||||||
go.uber.org/mock v0.4.0 // indirect
|
go.uber.org/mock v0.4.0 // indirect
|
||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||||
golang.org/x/crypto v0.23.0 // indirect
|
golang.org/x/crypto v0.31.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
|
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
|
||||||
golang.org/x/mod v0.17.0 // indirect
|
golang.org/x/mod v0.20.0 // indirect
|
||||||
golang.org/x/sys v0.20.0 // indirect
|
golang.org/x/net v0.33.0 // indirect
|
||||||
golang.org/x/text v0.15.0 // indirect
|
golang.org/x/sync v0.10.0 // indirect
|
||||||
golang.org/x/time v0.5.0 // indirect
|
golang.org/x/sys v0.28.0 // indirect
|
||||||
golang.org/x/tools v0.21.0 // indirect
|
golang.org/x/text v0.21.0 // indirect
|
||||||
google.golang.org/protobuf v1.34.1 // indirect
|
golang.org/x/time v0.7.0 // indirect
|
||||||
|
golang.org/x/tools v0.24.0 // indirect
|
||||||
|
google.golang.org/protobuf v1.34.2 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
lukechampine.com/blake3 v1.3.0 // indirect
|
lukechampine.com/blake3 v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
212
core/go.sum
@@ -1,14 +1,12 @@
|
|||||||
github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
|
github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
|
||||||
github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
|
github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
|
||||||
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 h1:USCTqih5d1bUXUxWNS9ZD5Tx/lb0jXHEtRIIx/F9dMc=
|
|
||||||
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34/go.mod h1:YR9wK13TgI5ww8iKWm91MHiSoHC7Oz0U4beCCmtXqLw=
|
|
||||||
github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A=
|
github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A=
|
||||||
github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go=
|
github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go=
|
||||||
github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
|
github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
|
||||||
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
|
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
|
||||||
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
|
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
|
||||||
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
|
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
|
||||||
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
|
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
|
||||||
github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
|
github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
|
||||||
github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
|
github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
|
||||||
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
|
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
|
||||||
@@ -19,17 +17,19 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
|
|||||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||||
github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
|
|
||||||
github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
|
|
||||||
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
|
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
|
||||||
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
|
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
|
||||||
github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
|
github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=
|
||||||
github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
|
github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
|
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
|
||||||
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
||||||
|
github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
|
||||||
|
github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
||||||
|
github.com/enfein/mieru/v3 v3.10.0 h1:KMnAtY4s8MB74sUg4GbvF9R9v3jkXPQTSkxPxl1emxQ=
|
||||||
|
github.com/enfein/mieru/v3 v3.10.0/go.mod h1:jH2nXzJSNUn6UWuzD8E8AsRVa9Ca0CqcTcr9Z+CJO1o=
|
||||||
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
|
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
|
||||||
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
|
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
|
||||||
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
|
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
|
||||||
@@ -39,11 +39,14 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE
|
|||||||
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
|
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
|
||||||
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
|
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
|
||||||
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
|
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
|
||||||
github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
|
|
||||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||||
github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
|
github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
|
||||||
github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
|
github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
|
||||||
|
github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
|
||||||
|
github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||||
|
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
|
||||||
|
github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
|
||||||
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
|
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
|
||||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||||
@@ -56,34 +59,31 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
|||||||
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
||||||
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
||||||
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
||||||
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
|
github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
|
||||||
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||||
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
|
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
|
||||||
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
|
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
|
||||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
|
github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
|
||||||
github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
|
github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
|
||||||
github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
|
github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
|
github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d h1:VkCNWh6tuQLgDBc6KrUOz/L1mCUQGnR1Ujj8uTgpwwk=
|
||||||
github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
|
github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
|
||||||
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
|
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
|
||||||
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
||||||
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
|
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
|
||||||
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
|
||||||
github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
|
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||||
github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
|
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||||
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
|
github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
|
||||||
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
||||||
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
|
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
|
||||||
@@ -94,30 +94,40 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
|
|||||||
github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
|
github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
|
||||||
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
|
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
|
||||||
github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
|
github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
|
||||||
|
github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4=
|
||||||
|
github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI=
|
||||||
|
github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
|
||||||
|
github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
|
||||||
|
github.com/metacubex/chacha v0.1.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
|
||||||
|
github.com/metacubex/chacha v0.1.0/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
|
||||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
|
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
|
||||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
|
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
|
github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a h1:cZ6oNVrsmsi3SNlnSnRio4zOgtQq+/XidwsaNgKICcg=
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
|
github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a/go.mod h1:xBw/SYJPgUMPQ1tklV/brGn2nxhfr3BnvBzNlyi4Nic=
|
||||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
|
github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da h1:Mq6cbHbPTLLTUfA9scrwBmOGkvl6y99E3WmtMIMqo30=
|
||||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
|
github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da/go.mod h1:AiZ+UPgrkO1DTnmiAX4b+kRoV1Vfc65UkYD7RbFlIZA=
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
|
github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
|
github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
|
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 h1:HobpULaPK6OoxrHMmgcwLkwwIduXVmwdcznwUfH1GQM=
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
|
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
|
github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
|
github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
|
||||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
|
github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
|
||||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
|
github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
|
github.com/metacubex/sing-tun v0.4.5 h1:kWSyQzuzHI40r50OFBczfWIDvMBMy1RIk+JsXeBPRB0=
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
|
github.com/metacubex/sing-tun v0.4.5/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0=
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
|
github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
|
github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
|
github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0HLTjx6BKIkV48sV/yia/GP8Bnyb5JQuGgSGzg=
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
|
github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc=
|
||||||
|
github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY=
|
||||||
|
github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
|
||||||
github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
|
github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
|
||||||
github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
|
github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
|
||||||
github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
|
||||||
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
|
||||||
|
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
|
||||||
|
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
|
||||||
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
|
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
|
||||||
github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
|
github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
|
||||||
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
|
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
|
||||||
@@ -139,36 +149,33 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
|||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
|
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
|
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
|
github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
|
github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
|
||||||
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
|
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
|
||||||
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
|
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
|
||||||
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
|
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
|
||||||
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
|
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
|
||||||
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
|
github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
|
||||||
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
|
github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
|
||||||
github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
|
github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
|
||||||
github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
|
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
|
||||||
|
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
|
||||||
|
github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
|
||||||
|
github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
|
||||||
github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
|
github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
|
||||||
github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
|
github.com/sagernet/sing v0.5.1 h1:mhL/MZVq0TjuvHcpYcFtmSD1BFOxZ/+8ofbNZcg1k1Y=
|
||||||
github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
|
github.com/sagernet/sing v0.5.1/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
||||||
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
|
github.com/sagernet/sing-mux v0.2.1 h1:N/3MHymfnFZRd29tE3TaXwPUVVgKvxhtOkiCMLp9HVo=
|
||||||
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
|
github.com/sagernet/sing-mux v0.2.1/go.mod h1:dm3BWL6NvES9pbib7llpylrq7Gq+LjlzG+0RacdxcyE=
|
||||||
github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
|
github.com/sagernet/sing-shadowtls v0.1.5 h1:uXxmq/HXh8DIiBGLzpMjCbWnzIAFs+lIxiTOjdgG5qo=
|
||||||
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
|
github.com/sagernet/sing-shadowtls v0.1.5/go.mod h1:tvrDPTGLrSM46Wnf7mSr+L8NHvgvF8M4YnJF790rZX4=
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
|
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
|
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
|
||||||
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
|
github.com/shirou/gopsutil/v4 v4.24.11 h1:WaU9xqGFKvFfsUv94SXcUPD7rCkU0vr/asVdQOBZNj8=
|
||||||
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
|
github.com/shirou/gopsutil/v4 v4.24.11/go.mod h1:s4D/wg+ag4rG0WO7AiTj2BeYCRhym0vM7DHbZRxnIT8=
|
||||||
github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
|
|
||||||
github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
|
||||||
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
|
||||||
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
|
|
||||||
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
|
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
|
||||||
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
|
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
|
||||||
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
|
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
|
||||||
@@ -178,17 +185,10 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
|
|||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
|
||||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
|
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
|
||||||
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
|
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
|
||||||
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
|
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
|
||||||
@@ -198,14 +198,18 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
|
|||||||
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
|
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
|
||||||
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
|
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
|
||||||
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
|
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
|
||||||
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
|
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
|
||||||
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
|
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
|
||||||
|
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
|
||||||
|
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
|
||||||
|
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
|
||||||
|
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
|
||||||
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
|
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
|
||||||
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
|
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
|
||||||
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
|
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
|
||||||
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
||||||
github.com/zhangyunhao116/fastrand v0.4.0 h1:86QB6Y+GGgLZRFRDCjMmAS28QULwspK9sgL5d1Bx3H4=
|
gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
|
||||||
github.com/zhangyunhao116/fastrand v0.4.0/go.mod h1:vIyo6EyBhjGKpZv6qVlkPl4JVAklpMM4DSKzbAkMguA=
|
gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
|
||||||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
|
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
|
||||||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
|
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
|
||||||
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
|
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
|
||||||
@@ -214,21 +218,21 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
|
|||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
|
||||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
|
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
|
||||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
|
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
|
||||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
||||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
|
||||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
|
||||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@@ -240,29 +244,27 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
|
||||||
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||||
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
|
||||||
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||||
golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
|
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
|
||||||
golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||||
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||||
|
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/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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
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 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
537
core/hub.go
@@ -1,173 +1,158 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import "C"
|
|
||||||
import (
|
import (
|
||||||
bridge "core/dart-bridge"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/metacubex/mihomo/adapter"
|
"github.com/metacubex/mihomo/adapter"
|
||||||
"github.com/metacubex/mihomo/adapter/outboundgroup"
|
"github.com/metacubex/mihomo/adapter/outboundgroup"
|
||||||
"github.com/metacubex/mihomo/adapter/provider"
|
"github.com/metacubex/mihomo/common/observable"
|
||||||
"github.com/metacubex/mihomo/common/structure"
|
|
||||||
"github.com/metacubex/mihomo/common/utils"
|
"github.com/metacubex/mihomo/common/utils"
|
||||||
"github.com/metacubex/mihomo/component/mmdb"
|
"github.com/metacubex/mihomo/component/mmdb"
|
||||||
|
"github.com/metacubex/mihomo/component/updater"
|
||||||
"github.com/metacubex/mihomo/config"
|
"github.com/metacubex/mihomo/config"
|
||||||
"github.com/metacubex/mihomo/constant"
|
"github.com/metacubex/mihomo/constant"
|
||||||
cp "github.com/metacubex/mihomo/constant/provider"
|
cp "github.com/metacubex/mihomo/constant/provider"
|
||||||
"github.com/metacubex/mihomo/hub/executor"
|
"github.com/metacubex/mihomo/hub/executor"
|
||||||
|
"github.com/metacubex/mihomo/listener"
|
||||||
"github.com/metacubex/mihomo/log"
|
"github.com/metacubex/mihomo/log"
|
||||||
rp "github.com/metacubex/mihomo/rules/provider"
|
|
||||||
"github.com/metacubex/mihomo/tunnel"
|
"github.com/metacubex/mihomo/tunnel"
|
||||||
"github.com/metacubex/mihomo/tunnel/statistic"
|
"github.com/metacubex/mihomo/tunnel/statistic"
|
||||||
"golang.org/x/net/context"
|
"net"
|
||||||
"os"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
"unsafe"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var currentConfig = config.DefaultRawConfig()
|
var (
|
||||||
|
isInit = false
|
||||||
|
configParams = ConfigExtendedParams{
|
||||||
|
OnlyStatisticsProxy: false,
|
||||||
|
}
|
||||||
|
externalProviders = map[string]cp.Provider{}
|
||||||
|
logSubscriber observable.Subscription[log.Event]
|
||||||
|
currentConfig *config.Config
|
||||||
|
)
|
||||||
|
|
||||||
var isInit = false
|
func handleInitClash(homeDirStr string) bool {
|
||||||
|
|
||||||
//export initClash
|
|
||||||
func initClash(homeDirStr *C.char) bool {
|
|
||||||
if !isInit {
|
if !isInit {
|
||||||
constant.SetHomeDir(C.GoString(homeDirStr))
|
constant.SetHomeDir(homeDirStr)
|
||||||
isInit = true
|
isInit = true
|
||||||
}
|
}
|
||||||
return isInit
|
return isInit
|
||||||
}
|
}
|
||||||
|
|
||||||
//export getIsInit
|
func handleStartListener() bool {
|
||||||
func getIsInit() bool {
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
|
isRunning = true
|
||||||
|
updateListeners(true)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleStopListener() bool {
|
||||||
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
|
isRunning = false
|
||||||
|
listener.StopListener()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetIsInit() bool {
|
||||||
return isInit
|
return isInit
|
||||||
}
|
}
|
||||||
|
|
||||||
//export restartClash
|
func handleForceGc() {
|
||||||
func restartClash() bool {
|
go func() {
|
||||||
execPath, _ := os.Executable()
|
log.Infoln("[APP] request force GC")
|
||||||
go restartExecutable(execPath)
|
runtime.GC()
|
||||||
return true
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
//export shutdownClash
|
func handleShutdown() bool {
|
||||||
func shutdownClash() bool {
|
stopListeners()
|
||||||
executor.Shutdown()
|
executor.Shutdown()
|
||||||
runtime.GC()
|
runtime.GC()
|
||||||
isInit = false
|
isInit = false
|
||||||
currentConfig = nil
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
//export validateConfig
|
func handleValidateConfig(bytes []byte) string {
|
||||||
func validateConfig(s *C.char, port C.longlong) {
|
_, err := config.UnmarshalRawConfig(bytes)
|
||||||
i := int64(port)
|
if err != nil {
|
||||||
go func() {
|
return err.Error()
|
||||||
bytes := []byte(C.GoString(s))
|
}
|
||||||
_, err := config.UnmarshalRawConfig(bytes)
|
return ""
|
||||||
if err != nil {
|
|
||||||
bridge.SendToPort(i, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
bridge.SendToPort(i, "")
|
|
||||||
}()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export updateConfig
|
func handleUpdateConfig(bytes []byte) string {
|
||||||
func updateConfig(s *C.char, port C.longlong) {
|
var params = &GenerateConfigParams{}
|
||||||
i := int64(port)
|
err := json.Unmarshal(bytes, params)
|
||||||
go func() {
|
if err != nil {
|
||||||
paramsString := C.GoString(s)
|
return err.Error()
|
||||||
var params = &GenerateConfigParams{}
|
}
|
||||||
err := json.Unmarshal([]byte(paramsString), params)
|
|
||||||
if err != nil {
|
configParams = params.Params
|
||||||
bridge.SendToPort(i, err.Error())
|
prof := decorationConfig(params.ProfileId, params.Config)
|
||||||
return
|
err = applyConfig(prof)
|
||||||
}
|
if err != nil {
|
||||||
prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
|
return err.Error()
|
||||||
currentConfig = prof
|
}
|
||||||
if *params.IsPatch {
|
return ""
|
||||||
applyConfig(true)
|
|
||||||
} else {
|
|
||||||
applyConfig(false)
|
|
||||||
}
|
|
||||||
bridge.SendToPort(i, "")
|
|
||||||
}()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export clearEffect
|
func handleGetProxies() string {
|
||||||
func clearEffect(s *C.char) {
|
runLock.Lock()
|
||||||
path := C.GoString(s)
|
defer runLock.Unlock()
|
||||||
go func() {
|
|
||||||
rawCfg := getRawConfigWithPath(&path)
|
|
||||||
for _, mapping := range rawCfg.RuleProvider {
|
|
||||||
schema := &ruleProviderSchema{}
|
|
||||||
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
|
|
||||||
if err := decoder.Decode(mapping, schema); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if schema.Type == "http" {
|
|
||||||
_ = removeFile(constant.Path.Resolve(schema.Path))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, mapping := range rawCfg.ProxyProvider {
|
|
||||||
schema := &proxyProviderSchema{
|
|
||||||
HealthCheck: healthCheckSchema{
|
|
||||||
Lazy: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
|
|
||||||
if err := decoder.Decode(mapping, schema); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if schema.Type == "http" {
|
|
||||||
_ = removeFile(constant.Path.Resolve(schema.Path))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ = removeFile(path)
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
//export getProxies
|
|
||||||
func getProxies() *C.char {
|
|
||||||
data, err := json.Marshal(tunnel.ProxiesWithProviders())
|
data, err := json.Marshal(tunnel.ProxiesWithProviders())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return C.CString("")
|
return ""
|
||||||
}
|
}
|
||||||
return C.CString(string(data))
|
return string(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//export changeProxy
|
func handleChangeProxy(data string, fn func(string string)) {
|
||||||
func changeProxy(s *C.char) bool {
|
runLock.Lock()
|
||||||
go func() {
|
go func() {
|
||||||
paramsString := C.GoString(s)
|
defer runLock.Unlock()
|
||||||
var params = &ChangeProxyParams{}
|
var params = &ChangeProxyParams{}
|
||||||
err := json.Unmarshal([]byte(paramsString), params)
|
err := json.Unmarshal([]byte(data), params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Infoln("Unmarshal ChangeProxyParams %v", err)
|
fn(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
groupName := *params.GroupName
|
||||||
|
proxyName := *params.ProxyName
|
||||||
proxies := tunnel.ProxiesWithProviders()
|
proxies := tunnel.ProxiesWithProviders()
|
||||||
proxy := proxies[*params.GroupName]
|
group, ok := proxies[groupName]
|
||||||
if proxy == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Infoln("change proxy %s", proxy.Name())
|
|
||||||
adapterProxy := proxy.(*adapter.Proxy)
|
|
||||||
selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
|
|
||||||
if !ok {
|
if !ok {
|
||||||
|
fn("Not found group")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := selector.Set(*params.ProxyName); err != nil {
|
adapterProxy := group.(*adapter.Proxy)
|
||||||
|
selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
|
||||||
|
if !ok {
|
||||||
|
fn("Group is not selectable")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if proxyName == "" {
|
||||||
|
selector.ForceSet(proxyName)
|
||||||
|
} else {
|
||||||
|
err = selector.Set(proxyName)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
fn(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fn("")
|
||||||
|
return
|
||||||
}()
|
}()
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export getTraffic
|
func handleGetTraffic() string {
|
||||||
func getTraffic() *C.char {
|
up, down := statistic.DefaultManager.Current(configParams.OnlyStatisticsProxy)
|
||||||
up, down := statistic.DefaultManager.Now()
|
|
||||||
traffic := map[string]int64{
|
traffic := map[string]int64{
|
||||||
"up": up,
|
"up": up,
|
||||||
"down": down,
|
"down": down,
|
||||||
@@ -175,25 +160,42 @@ func getTraffic() *C.char {
|
|||||||
data, err := json.Marshal(traffic)
|
data, err := json.Marshal(traffic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error:", err)
|
fmt.Println("Error:", err)
|
||||||
return C.CString("")
|
return ""
|
||||||
}
|
}
|
||||||
return C.CString(string(data))
|
return string(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//export asyncTestDelay
|
func handleGetTotalTraffic() string {
|
||||||
func asyncTestDelay(s *C.char, port C.longlong) {
|
up, down := statistic.DefaultManager.Total(configParams.OnlyStatisticsProxy)
|
||||||
i := int64(port)
|
traffic := map[string]int64{
|
||||||
go func() {
|
"up": up,
|
||||||
paramsString := C.GoString(s)
|
"down": down,
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(traffic)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error:", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleResetTraffic() {
|
||||||
|
statistic.DefaultManager.ResetStatistic()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleAsyncTestDelay(paramsString string, fn func(string)) {
|
||||||
|
b.Go(paramsString, func() (bool, error) {
|
||||||
var params = &TestDelayParams{}
|
var params = &TestDelayParams{}
|
||||||
err := json.Unmarshal([]byte(paramsString), params)
|
err := json.Unmarshal([]byte(paramsString), params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
fn("")
|
||||||
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
|
expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
fn("")
|
||||||
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
|
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
|
||||||
@@ -209,52 +211,46 @@ func asyncTestDelay(s *C.char, port C.longlong) {
|
|||||||
if proxy == nil {
|
if proxy == nil {
|
||||||
delayData.Value = -1
|
delayData.Value = -1
|
||||||
data, _ := json.Marshal(delayData)
|
data, _ := json.Marshal(delayData)
|
||||||
bridge.SendToPort(i, string(data))
|
fn(string(data))
|
||||||
return
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
|
testUrl := constant.DefaultTestURL
|
||||||
|
|
||||||
|
if params.TestUrl != "" {
|
||||||
|
testUrl = params.TestUrl
|
||||||
|
}
|
||||||
|
|
||||||
|
delay, err := proxy.URLTest(ctx, testUrl, expectedStatus)
|
||||||
if err != nil || delay == 0 {
|
if err != nil || delay == 0 {
|
||||||
delayData.Value = -1
|
delayData.Value = -1
|
||||||
data, _ := json.Marshal(delayData)
|
data, _ := json.Marshal(delayData)
|
||||||
bridge.SendToPort(i, string(data))
|
fn(string(data))
|
||||||
return
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
delayData.Value = int32(delay)
|
delayData.Value = int32(delay)
|
||||||
data, _ := json.Marshal(delayData)
|
data, _ := json.Marshal(delayData)
|
||||||
bridge.SendToPort(i, string(data))
|
fn(string(data))
|
||||||
return
|
return false, nil
|
||||||
}()
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//export getVersionInfo
|
func handleGetConnections() string {
|
||||||
func getVersionInfo() *C.char {
|
runLock.Lock()
|
||||||
versionInfo := map[string]string{
|
defer runLock.Unlock()
|
||||||
"clashName": constant.Name,
|
|
||||||
"version": "1.18.5",
|
|
||||||
}
|
|
||||||
data, err := json.Marshal(versionInfo)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("Error:", err)
|
|
||||||
return C.CString("")
|
|
||||||
}
|
|
||||||
return C.CString(string(data))
|
|
||||||
}
|
|
||||||
|
|
||||||
//export getConnections
|
|
||||||
func getConnections() *C.char {
|
|
||||||
snapshot := statistic.DefaultManager.Snapshot()
|
snapshot := statistic.DefaultManager.Snapshot()
|
||||||
data, err := json.Marshal(snapshot)
|
data, err := json.Marshal(snapshot)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error:", err)
|
fmt.Println("Error:", err)
|
||||||
return C.CString("")
|
return ""
|
||||||
}
|
}
|
||||||
return C.CString(string(data))
|
return string(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//export closeConnections
|
func handleCloseConnections() bool {
|
||||||
func closeConnections() bool {
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
|
statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
|
||||||
err := c.Close()
|
err := c.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -265,125 +261,172 @@ func closeConnections() bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
//export closeConnection
|
func handleCloseConnection(connectionId string) bool {
|
||||||
func closeConnection(id *C.char) bool {
|
runLock.Lock()
|
||||||
connectionId := C.GoString(id)
|
defer runLock.Unlock()
|
||||||
|
c := statistic.DefaultManager.Get(connectionId)
|
||||||
err := statistic.DefaultManager.Get(connectionId).Close()
|
if c == nil {
|
||||||
if err != nil {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
_ = c.Close()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
//export getProviders
|
func handleGetExternalProviders() string {
|
||||||
func getProviders() *C.char {
|
runLock.Lock()
|
||||||
data, err := json.Marshal(tunnel.Providers())
|
defer runLock.Unlock()
|
||||||
if err != nil {
|
externalProviders = getExternalProvidersRaw()
|
||||||
return C.CString("")
|
eps := make([]ExternalProvider, 0)
|
||||||
}
|
for _, p := range externalProviders {
|
||||||
return C.CString(string(data))
|
externalProvider, err := toExternalProvider(p)
|
||||||
}
|
if err != nil {
|
||||||
|
continue
|
||||||
//export getProvider
|
|
||||||
func getProvider(name *C.char) *C.char {
|
|
||||||
providerName := C.GoString(name)
|
|
||||||
providers := tunnel.Providers()
|
|
||||||
data, err := json.Marshal(providers[providerName])
|
|
||||||
if err != nil {
|
|
||||||
return C.CString("")
|
|
||||||
}
|
|
||||||
return C.CString(string(data))
|
|
||||||
}
|
|
||||||
|
|
||||||
//export getExternalProviders
|
|
||||||
func getExternalProviders() *C.char {
|
|
||||||
externalProviders := make([]ExternalProvider, 0)
|
|
||||||
providers := tunnel.Providers()
|
|
||||||
for n, p := range providers {
|
|
||||||
if p.VehicleType() != cp.Compatible {
|
|
||||||
p := p.(*provider.ProxySetProvider)
|
|
||||||
externalProviders = append(externalProviders, ExternalProvider{
|
|
||||||
Name: n,
|
|
||||||
Type: p.Type().String(),
|
|
||||||
VehicleType: p.VehicleType().String(),
|
|
||||||
UpdateAt: p.UpdatedAt,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
eps = append(eps, *externalProvider)
|
||||||
}
|
}
|
||||||
for n, p := range tunnel.RuleProviders() {
|
sort.Sort(ExternalProviders(eps))
|
||||||
if p.VehicleType() != cp.Compatible {
|
data, err := json.Marshal(eps)
|
||||||
p := p.(*rp.RuleSetProvider)
|
|
||||||
externalProviders = append(externalProviders, ExternalProvider{
|
|
||||||
Name: n,
|
|
||||||
Type: p.Type().String(),
|
|
||||||
VehicleType: p.VehicleType().String(),
|
|
||||||
UpdateAt: p.UpdatedAt,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
data, err := json.Marshal(externalProviders)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return C.CString("")
|
return ""
|
||||||
}
|
}
|
||||||
return C.CString(string(data))
|
return string(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//export updateExternalProvider
|
func handleGetExternalProvider(externalProviderName string) string {
|
||||||
func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
|
runLock.Lock()
|
||||||
i := int64(port)
|
defer runLock.Unlock()
|
||||||
|
externalProvider, exist := externalProviders[externalProviderName]
|
||||||
|
if !exist {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
e, err := toExternalProvider(externalProvider)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(e)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleUpdateGeoData(geoType string, geoName string, fn func(value string)) {
|
||||||
go func() {
|
go func() {
|
||||||
providerNameString := C.GoString(providerName)
|
path := constant.Path.Resolve(geoName)
|
||||||
providerTypeString := C.GoString(providerType)
|
switch geoType {
|
||||||
|
case "MMDB":
|
||||||
switch providerTypeString {
|
err := updater.UpdateMMDBWithPath(path)
|
||||||
case "Proxy":
|
|
||||||
providers := tunnel.Providers()
|
|
||||||
err := providers[providerNameString].Update()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
bridge.SendToPort(i, err.Error())
|
fn(err.Error())
|
||||||
return
|
|
||||||
}
|
|
||||||
case "Rule":
|
|
||||||
providers := tunnel.RuleProviders()
|
|
||||||
err := providers[providerNameString].Update()
|
|
||||||
if err != nil {
|
|
||||||
bridge.SendToPort(i, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
case "GeoIp":
|
|
||||||
err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
|
|
||||||
if err != nil {
|
|
||||||
bridge.SendToPort(i, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
case "GeoSite":
|
|
||||||
err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
|
|
||||||
if err != nil {
|
|
||||||
bridge.SendToPort(i, err.Error())
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
case "ASN":
|
case "ASN":
|
||||||
err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
|
err := updater.UpdateASNWithPath(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
bridge.SendToPort(i, err.Error())
|
fn(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "GeoIp":
|
||||||
|
err := updater.UpdateGeoIpWithPath(path)
|
||||||
|
if err != nil {
|
||||||
|
fn(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "GeoSite":
|
||||||
|
err := updater.UpdateGeoSiteWithPath(path)
|
||||||
|
if err != nil {
|
||||||
|
fn(err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bridge.SendToPort(i, "")
|
fn("")
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
//export initNativeApiBridge
|
func handleUpdateExternalProvider(providerName string, fn func(value string)) {
|
||||||
func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
|
go func() {
|
||||||
bridge.InitDartApi(api)
|
externalProvider, exist := externalProviders[providerName]
|
||||||
i := int64(port)
|
if !exist {
|
||||||
bridge.Port = &i
|
fn("external provider is not exist")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err := externalProvider.Update()
|
||||||
|
if err != nil {
|
||||||
|
fn(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fn("")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSideLoadExternalProvider(providerName string, data []byte, fn func(value string)) {
|
||||||
|
go func() {
|
||||||
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
|
externalProvider, exist := externalProviders[providerName]
|
||||||
|
if !exist {
|
||||||
|
fn("external provider is not exist")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err := sideUpdateExternalProvider(externalProvider, data)
|
||||||
|
if err != nil {
|
||||||
|
fn(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fn("")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleStartLog() {
|
||||||
|
if logSubscriber != nil {
|
||||||
|
log.UnSubscribe(logSubscriber)
|
||||||
|
logSubscriber = nil
|
||||||
|
}
|
||||||
|
logSubscriber = log.Subscribe()
|
||||||
|
go func() {
|
||||||
|
for logData := range logSubscriber {
|
||||||
|
if logData.LogLevel < log.Level() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
message := &Message{
|
||||||
|
Type: LogMessage,
|
||||||
|
Data: logData,
|
||||||
|
}
|
||||||
|
sendMessage(*message)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleStopLog() {
|
||||||
|
if logSubscriber != nil {
|
||||||
|
log.UnSubscribe(logSubscriber)
|
||||||
|
logSubscriber = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetCountryCode(ip string, fn func(value string)) {
|
||||||
|
go func() {
|
||||||
|
runLock.Lock()
|
||||||
|
defer runLock.Unlock()
|
||||||
|
codes := mmdb.IPInstance().LookupCode(net.ParseIP(ip))
|
||||||
|
if len(codes) == 0 {
|
||||||
|
fn("")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fn(codes[0])
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetMemory(fn func(value string)) {
|
||||||
|
go func() {
|
||||||
|
fn(strconv.FormatUint(statistic.DefaultManager.Memory(), 10))
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
provider.HealthcheckHook = func(name string, delay uint16) {
|
adapter.UrlTestHook = func(url string, name string, delay uint16) {
|
||||||
delayData := &Delay{
|
delayData := &Delay{
|
||||||
|
Url: url,
|
||||||
Name: name,
|
Name: name,
|
||||||
}
|
}
|
||||||
if delay == 0 {
|
if delay == 0 {
|
||||||
@@ -391,9 +434,21 @@ func init() {
|
|||||||
} else {
|
} else {
|
||||||
delayData.Value = int32(delay)
|
delayData.Value = int32(delay)
|
||||||
}
|
}
|
||||||
bridge.SendMessage(bridge.Message{
|
sendMessage(Message{
|
||||||
Type: bridge.Delay,
|
Type: DelayMessage,
|
||||||
Data: delayData,
|
Data: delayData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
statistic.DefaultRequestNotify = func(c statistic.Tracker) {
|
||||||
|
sendMessage(Message{
|
||||||
|
Type: RequestMessage,
|
||||||
|
Data: c,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
executor.DefaultProviderLoadedHook = func(providerName string) {
|
||||||
|
sendMessage(Message{
|
||||||
|
Type: LoadedMessage,
|
||||||
|
Data: providerName,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
78
core/lib.go
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
//go:build cgo
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
/*
|
||||||
|
#include <stdlib.h>
|
||||||
|
*/
|
||||||
|
import "C"
|
||||||
|
import (
|
||||||
|
bridge "core/dart-bridge"
|
||||||
|
"encoding/json"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
var messagePort int64 = -1
|
||||||
|
|
||||||
|
//export initNativeApiBridge
|
||||||
|
func initNativeApiBridge(api unsafe.Pointer) {
|
||||||
|
bridge.InitDartApi(api)
|
||||||
|
}
|
||||||
|
|
||||||
|
//export attachMessagePort
|
||||||
|
func attachMessagePort(mPort C.longlong) {
|
||||||
|
messagePort = int64(mPort)
|
||||||
|
}
|
||||||
|
|
||||||
|
//export getTraffic
|
||||||
|
func getTraffic() *C.char {
|
||||||
|
return C.CString(handleGetTraffic())
|
||||||
|
}
|
||||||
|
|
||||||
|
//export getTotalTraffic
|
||||||
|
func getTotalTraffic() *C.char {
|
||||||
|
return C.CString(handleGetTotalTraffic())
|
||||||
|
}
|
||||||
|
|
||||||
|
//export freeCString
|
||||||
|
func freeCString(s *C.char) {
|
||||||
|
C.free(unsafe.Pointer(s))
|
||||||
|
}
|
||||||
|
|
||||||
|
//export invokeAction
|
||||||
|
func invokeAction(paramsChar *C.char, port C.longlong) {
|
||||||
|
params := C.GoString(paramsChar)
|
||||||
|
i := int64(port)
|
||||||
|
var action = &Action{}
|
||||||
|
err := json.Unmarshal([]byte(params), action)
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
go handleAction(action, func(bytes []byte) {
|
||||||
|
bridge.SendToPort(i, string(bytes))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func sendMessage(message Message) {
|
||||||
|
if messagePort == -1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
res, err := message.Json()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bridge.SendToPort(messagePort, string(Action{
|
||||||
|
Method: messageMethod,
|
||||||
|
}.wrapMessage(res)))
|
||||||
|
}
|
||||||
|
|
||||||
|
//export startListener
|
||||||
|
func startListener() {
|
||||||
|
handleStartListener()
|
||||||
|
}
|
||||||
|
|
||||||
|
//export stopListener
|
||||||
|
func stopListener() {
|
||||||
|
handleStopListener()
|
||||||
|
}
|
||||||
378
core/lib_android.go
Normal file
@@ -0,0 +1,378 @@
|
|||||||
|
//go:build android && cgo
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "C"
|
||||||
|
import (
|
||||||
|
bridge "core/dart-bridge"
|
||||||
|
"core/platform"
|
||||||
|
"core/state"
|
||||||
|
t "core/tun"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"github.com/metacubex/mihomo/common/utils"
|
||||||
|
"github.com/metacubex/mihomo/component/dialer"
|
||||||
|
"github.com/metacubex/mihomo/component/process"
|
||||||
|
"github.com/metacubex/mihomo/constant"
|
||||||
|
"github.com/metacubex/mihomo/dns"
|
||||||
|
"github.com/metacubex/mihomo/listener/sing_tun"
|
||||||
|
"github.com/metacubex/mihomo/log"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Fd struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Value int64 `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Process struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Metadata *constant.Metadata `json:"metadata"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ProcessMapItem struct {
|
||||||
|
Id string `json:"id"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type InvokeManager struct {
|
||||||
|
invokeMap sync.Map
|
||||||
|
chanMap map[string]chan struct{}
|
||||||
|
chanLock sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewInvokeManager() *InvokeManager {
|
||||||
|
return &InvokeManager{
|
||||||
|
chanMap: make(map[string]chan struct{}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *InvokeManager) load(id string) string {
|
||||||
|
res, ok := m.invokeMap.Load(id)
|
||||||
|
if ok {
|
||||||
|
return res.(string)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *InvokeManager) delete(id string) {
|
||||||
|
m.invokeMap.Delete(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *InvokeManager) completer(id string, value string) {
|
||||||
|
m.invokeMap.Store(id, value)
|
||||||
|
m.chanLock.Lock()
|
||||||
|
if ch, ok := m.chanMap[id]; ok {
|
||||||
|
close(ch)
|
||||||
|
delete(m.chanMap, id)
|
||||||
|
}
|
||||||
|
m.chanLock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *InvokeManager) await(id string) {
|
||||||
|
m.chanLock.Lock()
|
||||||
|
if _, ok := m.chanMap[id]; !ok {
|
||||||
|
m.chanMap[id] = make(chan struct{})
|
||||||
|
}
|
||||||
|
ch := m.chanMap[id]
|
||||||
|
m.chanLock.Unlock()
|
||||||
|
|
||||||
|
timeout := time.After(500 * time.Millisecond)
|
||||||
|
select {
|
||||||
|
case <-ch:
|
||||||
|
return
|
||||||
|
case <-timeout:
|
||||||
|
m.completer(id, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
invokePort int64 = -1
|
||||||
|
tunListener *sing_tun.Listener
|
||||||
|
fdInvokeMap = NewInvokeManager()
|
||||||
|
processInvokeMap = NewInvokeManager()
|
||||||
|
tunLock sync.Mutex
|
||||||
|
runTime *time.Time
|
||||||
|
errBlocked = errors.New("blocked")
|
||||||
|
)
|
||||||
|
|
||||||
|
func handleStartTun(fd int) string {
|
||||||
|
handleStopTun()
|
||||||
|
tunLock.Lock()
|
||||||
|
defer tunLock.Unlock()
|
||||||
|
if fd == 0 {
|
||||||
|
now := time.Now()
|
||||||
|
runTime = &now
|
||||||
|
} else {
|
||||||
|
initSocketHook()
|
||||||
|
tunListener, _ = t.Start(fd, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
|
||||||
|
if tunListener != nil {
|
||||||
|
log.Infoln("TUN address: %v", tunListener.Address())
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
runTime = &now
|
||||||
|
}
|
||||||
|
return handleGetRunTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleStopTun() {
|
||||||
|
tunLock.Lock()
|
||||||
|
defer tunLock.Unlock()
|
||||||
|
removeSocketHook()
|
||||||
|
runTime = nil
|
||||||
|
if tunListener != nil {
|
||||||
|
log.Infoln("TUN close")
|
||||||
|
_ = tunListener.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetRunTime() string {
|
||||||
|
if runTime == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strconv.FormatInt(runTime.UnixMilli(), 10)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSetProcessMap(params string) {
|
||||||
|
var processMapItem = &ProcessMapItem{}
|
||||||
|
err := json.Unmarshal([]byte(params), processMapItem)
|
||||||
|
if err == nil {
|
||||||
|
processInvokeMap.completer(processMapItem.Id, processMapItem.Value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//export attachInvokePort
|
||||||
|
func attachInvokePort(mPort C.longlong) {
|
||||||
|
invokePort = int64(mPort)
|
||||||
|
}
|
||||||
|
|
||||||
|
func sendInvokeMessage(message InvokeMessage) {
|
||||||
|
if invokePort == -1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bridge.SendToPort(invokePort, message.Json())
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleMarkSocket(fd Fd) {
|
||||||
|
sendInvokeMessage(InvokeMessage{
|
||||||
|
Type: ProtectInvoke,
|
||||||
|
Data: fd,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleParseProcess(process Process) {
|
||||||
|
sendInvokeMessage(InvokeMessage{
|
||||||
|
Type: ProcessInvoke,
|
||||||
|
Data: process,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSetFdMap(id string) {
|
||||||
|
go func() {
|
||||||
|
fdInvokeMap.completer(id, "")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func initSocketHook() {
|
||||||
|
dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
|
||||||
|
if platform.ShouldBlockConnection() {
|
||||||
|
return errBlocked
|
||||||
|
}
|
||||||
|
return conn.Control(func(fd uintptr) {
|
||||||
|
fdInt := int64(fd)
|
||||||
|
id := utils.NewUUIDV1().String()
|
||||||
|
|
||||||
|
handleMarkSocket(Fd{
|
||||||
|
Id: id,
|
||||||
|
Value: fdInt,
|
||||||
|
})
|
||||||
|
|
||||||
|
fdInvokeMap.await(id)
|
||||||
|
fdInvokeMap.delete(id)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func removeSocketHook() {
|
||||||
|
dialer.DefaultSocketHook = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
|
||||||
|
if metadata == nil {
|
||||||
|
return "", process.ErrInvalidNetwork
|
||||||
|
}
|
||||||
|
id := utils.NewUUIDV1().String()
|
||||||
|
handleParseProcess(Process{
|
||||||
|
Id: id,
|
||||||
|
Metadata: metadata,
|
||||||
|
})
|
||||||
|
processInvokeMap.await(id)
|
||||||
|
res := processInvokeMap.load(id)
|
||||||
|
processInvokeMap.delete(id)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetAndroidVpnOptions() string {
|
||||||
|
tunLock.Lock()
|
||||||
|
defer tunLock.Unlock()
|
||||||
|
options := state.AndroidVpnOptions{
|
||||||
|
Enable: state.CurrentState.Enable,
|
||||||
|
Port: currentConfig.General.MixedPort,
|
||||||
|
Ipv4Address: state.DefaultIpv4Address,
|
||||||
|
Ipv6Address: state.GetIpv6Address(),
|
||||||
|
AccessControl: state.CurrentState.AccessControl,
|
||||||
|
SystemProxy: state.CurrentState.SystemProxy,
|
||||||
|
AllowBypass: state.CurrentState.AllowBypass,
|
||||||
|
RouteAddress: state.CurrentState.RouteAddress,
|
||||||
|
BypassDomain: state.CurrentState.BypassDomain,
|
||||||
|
DnsServerAddress: state.GetDnsServerAddress(),
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(options)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error:", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return string(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSetState(params string) {
|
||||||
|
_ = json.Unmarshal([]byte(params), state.CurrentState)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleUpdateDns(value string) {
|
||||||
|
go func() {
|
||||||
|
log.Infoln("[DNS] updateDns %s", value)
|
||||||
|
dns.UpdateSystemDNS(strings.Split(value, ","))
|
||||||
|
dns.FlushCacheWithDefaultResolver()
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleGetCurrentProfileName() string {
|
||||||
|
if state.CurrentState == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return state.CurrentState.CurrentProfileName
|
||||||
|
}
|
||||||
|
|
||||||
|
func nextHandle(action *Action, send func([]byte)) bool {
|
||||||
|
switch action.Method {
|
||||||
|
case startTunMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
var fd int
|
||||||
|
_ = json.Unmarshal([]byte(data), &fd)
|
||||||
|
send(action.wrapMessage(handleStartTun(fd)))
|
||||||
|
return true
|
||||||
|
case stopTunMethod:
|
||||||
|
handleStopTun()
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return true
|
||||||
|
case setStateMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
handleSetState(data)
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return true
|
||||||
|
case getAndroidVpnOptionsMethod:
|
||||||
|
send(action.wrapMessage(handleGetAndroidVpnOptions()))
|
||||||
|
return true
|
||||||
|
case updateDnsMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
handleUpdateDns(data)
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return true
|
||||||
|
case setFdMapMethod:
|
||||||
|
fdId := action.Data.(string)
|
||||||
|
handleSetFdMap(fdId)
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return true
|
||||||
|
case setProcessMapMethod:
|
||||||
|
data := action.Data.(string)
|
||||||
|
handleSetProcessMap(data)
|
||||||
|
send(action.wrapMessage(true))
|
||||||
|
return true
|
||||||
|
case getRunTimeMethod:
|
||||||
|
send(action.wrapMessage(handleGetRunTime()))
|
||||||
|
return true
|
||||||
|
case getCurrentProfileNameMethod:
|
||||||
|
send(action.wrapMessage(handleGetCurrentProfileName()))
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
//export quickStart
|
||||||
|
func quickStart(dirChar *C.char, paramsChar *C.char, stateParamsChar *C.char, port C.longlong) {
|
||||||
|
i := int64(port)
|
||||||
|
dir := C.GoString(dirChar)
|
||||||
|
bytes := []byte(C.GoString(paramsChar))
|
||||||
|
stateParams := C.GoString(stateParamsChar)
|
||||||
|
go func() {
|
||||||
|
res := handleInitClash(dir)
|
||||||
|
if res == false {
|
||||||
|
bridge.SendToPort(i, "init error")
|
||||||
|
}
|
||||||
|
handleSetState(stateParams)
|
||||||
|
bridge.SendToPort(i, handleUpdateConfig(bytes))
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
//export startTUN
|
||||||
|
func startTUN(fd C.int) *C.char {
|
||||||
|
f := int(fd)
|
||||||
|
return C.CString(handleStartTun(f))
|
||||||
|
}
|
||||||
|
|
||||||
|
//export getRunTime
|
||||||
|
func getRunTime() *C.char {
|
||||||
|
return C.CString(handleGetRunTime())
|
||||||
|
}
|
||||||
|
|
||||||
|
//export stopTun
|
||||||
|
func stopTun() {
|
||||||
|
handleStopTun()
|
||||||
|
}
|
||||||
|
|
||||||
|
//export setFdMap
|
||||||
|
func setFdMap(fdIdChar *C.char) {
|
||||||
|
fdId := C.GoString(fdIdChar)
|
||||||
|
handleSetFdMap(fdId)
|
||||||
|
}
|
||||||
|
|
||||||
|
//export getCurrentProfileName
|
||||||
|
func getCurrentProfileName() *C.char {
|
||||||
|
return C.CString(handleGetCurrentProfileName())
|
||||||
|
}
|
||||||
|
|
||||||
|
//export getAndroidVpnOptions
|
||||||
|
func getAndroidVpnOptions() *C.char {
|
||||||
|
return C.CString(handleGetAndroidVpnOptions())
|
||||||
|
}
|
||||||
|
|
||||||
|
//export setState
|
||||||
|
func setState(s *C.char) {
|
||||||
|
paramsString := C.GoString(s)
|
||||||
|
handleSetState(paramsString)
|
||||||
|
}
|
||||||
|
|
||||||
|
//export updateDns
|
||||||
|
func updateDns(s *C.char) {
|
||||||
|
dnsList := C.GoString(s)
|
||||||
|
handleUpdateDns(dnsList)
|
||||||
|
}
|
||||||
|
|
||||||
|
//export setProcessMap
|
||||||
|
func setProcessMap(s *C.char) {
|
||||||
|
if s == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
paramsString := C.GoString(s)
|
||||||
|
handleSetProcessMap(paramsString)
|
||||||
|
}
|
||||||
11
core/lib_no_android.go
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
//go:build !android && cgo
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
func nextHandle(action *Action) {
|
||||||
|
return action
|
||||||
|
}
|
||||||
|
|
||||||
|
func nextHandle(action *Action, send func([]byte)) bool {
|
||||||
|
return false
|
||||||
|
}
|
||||||
36
core/log.go
@@ -1,36 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import "C"
|
|
||||||
import (
|
|
||||||
bridge "core/dart-bridge"
|
|
||||||
"github.com/metacubex/mihomo/common/observable"
|
|
||||||
"github.com/metacubex/mihomo/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
var logSubscriber observable.Subscription[log.Event]
|
|
||||||
|
|
||||||
//export startLog
|
|
||||||
func startLog() {
|
|
||||||
if logSubscriber != nil {
|
|
||||||
log.UnSubscribe(logSubscriber)
|
|
||||||
logSubscriber = nil
|
|
||||||
}
|
|
||||||
logSubscriber = log.Subscribe()
|
|
||||||
go func() {
|
|
||||||
for logData := range logSubscriber {
|
|
||||||
message := &bridge.Message{
|
|
||||||
Type: bridge.Log,
|
|
||||||
Data: logData,
|
|
||||||
}
|
|
||||||
bridge.SendMessage(*message)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
//export stopLog
|
|
||||||
func stopLog() {
|
|
||||||
if logSubscriber != nil {
|
|
||||||
log.UnSubscribe(logSubscriber)
|
|
||||||
logSubscriber = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
11
core/main.go
@@ -1,10 +1,17 @@
|
|||||||
|
//go:build !cgo
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "C"
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
fmt.Println("init clash")
|
args := os.Args
|
||||||
|
if len(args) <= 1 {
|
||||||
|
fmt.Println("Arguments error")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
startServer(args[1])
|
||||||
}
|
}
|
||||||
|
|||||||
8
core/main_cgo.go
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
//go:build cgo
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "C"
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
}
|
||||||
42
core/platform/limit.go
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
//go:build android && cgo
|
||||||
|
|
||||||
|
package platform
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
var nullFd int
|
||||||
|
var maxFdCount int
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
fd, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0644)
|
||||||
|
if err != nil {
|
||||||
|
panic(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
nullFd = fd
|
||||||
|
|
||||||
|
var limit syscall.Rlimit
|
||||||
|
|
||||||
|
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
|
||||||
|
maxFdCount = 1024
|
||||||
|
} else {
|
||||||
|
maxFdCount = int(limit.Cur)
|
||||||
|
}
|
||||||
|
|
||||||
|
maxFdCount = maxFdCount / 4 * 3
|
||||||
|
}
|
||||||
|
|
||||||
|
func ShouldBlockConnection() bool {
|
||||||
|
fd, err := syscall.Dup(nullFd)
|
||||||
|
if err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = syscall.Close(fd)
|
||||||
|
|
||||||
|
if fd > maxFdCount {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
//go:build android
|
|
||||||
|
|
||||||
package main
|
|
||||||
72
core/server.go
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
//go:build !cgo
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
var conn net.Conn
|
||||||
|
|
||||||
|
func sendMessage(message Message) {
|
||||||
|
res, err := message.Json()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
send(Action{
|
||||||
|
Method: messageMethod,
|
||||||
|
}.wrapMessage(res))
|
||||||
|
}
|
||||||
|
|
||||||
|
func send(data []byte) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = conn.Write(append(data, []byte("\n")...))
|
||||||
|
}
|
||||||
|
|
||||||
|
func startServer(arg string) {
|
||||||
|
|
||||||
|
_, err := strconv.Atoi(arg)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
conn, err = net.Dial("unix", arg)
|
||||||
|
} else {
|
||||||
|
conn, err = net.Dial("tcp", fmt.Sprintf("127.0.0.1:%s", arg))
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
panic(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func(conn net.Conn) {
|
||||||
|
_ = conn.Close()
|
||||||
|
}(conn)
|
||||||
|
|
||||||
|
reader := bufio.NewReader(conn)
|
||||||
|
|
||||||
|
for {
|
||||||
|
data, err := reader.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var action = &Action{}
|
||||||
|
|
||||||
|
err = json.Unmarshal([]byte(data), action)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
go handleAction(action, func(bytes []byte) {
|
||||||
|
send(bytes)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func nextHandle(action *Action, send func([]byte)) bool {
|
||||||
|
return false
|
||||||
|
}
|
||||||
56
core/state/state.go
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
//go:build android && cgo
|
||||||
|
|
||||||
|
package state
|
||||||
|
|
||||||
|
var DefaultIpv4Address = "172.19.0.1/30"
|
||||||
|
var DefaultDnsAddress = "172.19.0.2"
|
||||||
|
var DefaultIpv6Address = "fdfe:dcba:9876::1/126"
|
||||||
|
|
||||||
|
type AndroidVpnOptions struct {
|
||||||
|
Enable bool `json:"enable"`
|
||||||
|
Port int `json:"port"`
|
||||||
|
AccessControl *AccessControl `json:"accessControl"`
|
||||||
|
AllowBypass bool `json:"allowBypass"`
|
||||||
|
SystemProxy bool `json:"systemProxy"`
|
||||||
|
BypassDomain []string `json:"bypassDomain"`
|
||||||
|
RouteAddress []string `json:"routeAddress"`
|
||||||
|
Ipv4Address string `json:"ipv4Address"`
|
||||||
|
Ipv6Address string `json:"ipv6Address"`
|
||||||
|
DnsServerAddress string `json:"dnsServerAddress"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AccessControl struct {
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
AcceptList []string `json:"acceptList"`
|
||||||
|
RejectList []string `json:"rejectList"`
|
||||||
|
IsFilterSystemApp bool `json:"isFilterSystemApp"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AndroidVpnRawOptions struct {
|
||||||
|
Enable bool `json:"enable"`
|
||||||
|
AccessControl *AccessControl `json:"accessControl"`
|
||||||
|
AllowBypass bool `json:"allowBypass"`
|
||||||
|
SystemProxy bool `json:"systemProxy"`
|
||||||
|
RouteAddress []string `json:"routeAddress"`
|
||||||
|
Ipv6 bool `json:"ipv6"`
|
||||||
|
BypassDomain []string `json:"bypassDomain"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type State struct {
|
||||||
|
AndroidVpnRawOptions
|
||||||
|
CurrentProfileName string `json:"currentProfileName"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var CurrentState = &State{}
|
||||||
|
|
||||||
|
func GetIpv6Address() string {
|
||||||
|
if CurrentState.Ipv6 {
|
||||||
|
return DefaultIpv6Address
|
||||||
|
} else {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetDnsServerAddress() string {
|
||||||
|
return DefaultDnsAddress
|
||||||
|
}
|
||||||
84
core/tun.go
@@ -1,84 +0,0 @@
|
|||||||
//go:build android
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import "C"
|
|
||||||
import (
|
|
||||||
t "core/tun"
|
|
||||||
"github.com/metacubex/mihomo/component/dialer"
|
|
||||||
"github.com/metacubex/mihomo/log"
|
|
||||||
"golang.org/x/sync/semaphore"
|
|
||||||
"sync"
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
var tunLock sync.Mutex
|
|
||||||
var tun *t.Tun
|
|
||||||
|
|
||||||
//export startTUN
|
|
||||||
func startTUN(fd C.int) {
|
|
||||||
go func() {
|
|
||||||
tunLock.Lock()
|
|
||||||
defer tunLock.Unlock()
|
|
||||||
|
|
||||||
if tun != nil {
|
|
||||||
tun.Close()
|
|
||||||
tun = nil
|
|
||||||
}
|
|
||||||
f := int(fd)
|
|
||||||
gateway := "172.16.0.1/30"
|
|
||||||
portal := "172.16.0.2"
|
|
||||||
dns := "0.0.0.0"
|
|
||||||
|
|
||||||
tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
|
|
||||||
|
|
||||||
closer, err := t.Start(f, gateway, portal, dns)
|
|
||||||
|
|
||||||
applyConfig(true)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
log.Errorln("startTUN error: %v", err)
|
|
||||||
tempTun.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
tempTun.Closer = closer
|
|
||||||
|
|
||||||
tun = tempTun
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
//export updateMarkSocketPort
|
|
||||||
func updateMarkSocketPort(markSocketPort C.longlong) bool {
|
|
||||||
tunLock.Lock()
|
|
||||||
defer tunLock.Unlock()
|
|
||||||
//if tun != nil {
|
|
||||||
// tun.MarkSocketPort = int64(markSocketPort)
|
|
||||||
//}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//export stopTun
|
|
||||||
func stopTun() {
|
|
||||||
go func() {
|
|
||||||
tunLock.Lock()
|
|
||||||
defer tunLock.Unlock()
|
|
||||||
|
|
||||||
if tun != nil {
|
|
||||||
tun.Close()
|
|
||||||
applyConfig(true)
|
|
||||||
tun = nil
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
|
|
||||||
return conn.Control(func(fd uintptr) {
|
|
||||||
if tun != nil {
|
|
||||||
tun.MarkSocket(int(fd))
|
|
||||||
time.Sleep(time.Millisecond * 100)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||