mirror of
https://github.com/2dust/v2rayN.git
synced 2026-07-26 18:02:05 +03:00
Compare commits
112 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a236fab27c | ||
|
|
f8e1186095 | ||
|
|
ca186e2636 | ||
|
|
1e8ba9ad9b | ||
|
|
31e32f174e | ||
|
|
bf376a8fac | ||
|
|
5a9a9b7ab1 | ||
|
|
e7a9aa66dc | ||
|
|
709b9a0958 | ||
|
|
191fe48257 | ||
|
|
48d58d482a | ||
|
|
7100b3f0a5 | ||
|
|
8d94997ba0 | ||
|
|
c97dc1d894 | ||
|
|
b198fd8be7 | ||
|
|
e0c1ff24be | ||
|
|
3cebf492d1 | ||
|
|
ef46f4e7e6 | ||
|
|
81c118c9b2 | ||
|
|
f1b88ccf2a | ||
|
|
ce380b861c | ||
|
|
46e9e4fead | ||
|
|
00903d3531 | ||
|
|
616eea39f9 | ||
|
|
ff456a9389 | ||
|
|
0d225cd29d | ||
|
|
67426cff12 | ||
|
|
a8c27027b4 | ||
|
|
1a681695a2 | ||
|
|
2126ea5a87 | ||
|
|
be005abf9e | ||
|
|
da7dfde706 | ||
|
|
7491e86d80 | ||
|
|
af037ed087 | ||
|
|
c9298db607 | ||
|
|
da81101cfd | ||
|
|
3d4f202cd7 | ||
|
|
35fbb137e8 | ||
|
|
1869a95700 | ||
|
|
34359885ab | ||
|
|
93832656dd | ||
|
|
b1a400b393 | ||
|
|
879c736924 | ||
|
|
8147b39723 | ||
|
|
5fed566a32 | ||
|
|
f0ee792778 | ||
|
|
cd4aa5531c | ||
|
|
e6d08c2db1 | ||
|
|
4dc9c60b85 | ||
|
|
eb9c974436 | ||
|
|
27b8f889fe | ||
|
|
0d5169e4cd | ||
|
|
abcdd9497c | ||
|
|
da65faa49f | ||
|
|
b6cfce069a | ||
|
|
39ec9239d2 | ||
|
|
a2a5940d91 | ||
|
|
ce8caa89a4 | ||
|
|
af3d579890 | ||
|
|
b2bbc865af | ||
|
|
2eb325643a | ||
|
|
8609e2b8d1 | ||
|
|
fcf6c1e3ae | ||
|
|
ab907e371b | ||
|
|
ef4dda0996 | ||
|
|
f2e0bd4eba | ||
|
|
bca07f801d | ||
|
|
54a3388c99 | ||
|
|
5140954b37 | ||
|
|
c7efe39e1c | ||
|
|
a74ca3f9d0 | ||
|
|
ed61f5c420 | ||
|
|
bf98c4007f | ||
|
|
78dcf51c3c | ||
|
|
1e59344074 | ||
|
|
1d2442d58a | ||
|
|
3448782925 | ||
|
|
e6f4a57913 | ||
|
|
4ae5c021fd | ||
|
|
0a357fd1a7 | ||
|
|
5ba5a805ce | ||
|
|
807f0aba06 | ||
|
|
f4a2086dfb | ||
|
|
ccb0ffb3b6 | ||
|
|
1fa1246c0b | ||
|
|
14cc37d07a | ||
|
|
c7519f8ea7 | ||
|
|
0c796a157b | ||
|
|
a9824fe6ec | ||
|
|
f18758d4bf | ||
|
|
c1a009a409 | ||
|
|
0f3fc8e053 | ||
|
|
f7206f3405 | ||
|
|
460a674ebc | ||
|
|
e2428f2500 | ||
|
|
bc3cbb4277 | ||
|
|
ac9d0a0193 | ||
|
|
2291214b6f | ||
|
|
5b47d8ba05 | ||
|
|
b193c39ad7 | ||
|
|
e68842bb78 | ||
|
|
6c06c8a00a | ||
|
|
58d2641559 | ||
|
|
780777068d | ||
|
|
8446b4df8b | ||
|
|
3778d2058e | ||
|
|
5c85598cfa | ||
|
|
51b384e119 | ||
|
|
d1c9c0b536 | ||
|
|
cc57f952db | ||
|
|
8090799ccc | ||
|
|
700f98193a |
@@ -100,7 +100,6 @@ csharp_style_prefer_tuple_swap = true:warning
|
||||
csharp_style_prefer_utf8_string_literals = true:warning
|
||||
csharp_style_throw_expression = true:warning
|
||||
csharp_style_unused_value_assignment_preference = discard_variable:warning
|
||||
csharp_style_unused_value_expression_statement_preference = discard_variable:warning
|
||||
csharp_using_directive_placement = outside_namespace:warning
|
||||
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:warning
|
||||
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:warning
|
||||
|
||||
4
.github/ISSUE_TEMPLATE/01_bug_report.yml
vendored
4
.github/ISSUE_TEMPLATE/01_bug_report.yml
vendored
@@ -18,8 +18,8 @@ body:
|
||||
- type: input
|
||||
id: "os-version"
|
||||
attributes:
|
||||
label: "操作系统和版本"
|
||||
description: "操作系统和版本"
|
||||
label: "操作系统 / v2rayN / Core 版本"
|
||||
description: "操作系统 / v2rayN / Core 版本"
|
||||
validations:
|
||||
required: true
|
||||
|
||||
|
||||
23
.github/workflows/build-all.yml
vendored
23
.github/workflows/build-all.yml
vendored
@@ -9,8 +9,17 @@ on:
|
||||
|
||||
permissions:
|
||||
actions: write
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
public-key:
|
||||
if: inputs.release_tag != ''
|
||||
uses: ./.github/workflows/pub-key.yml
|
||||
with:
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
|
||||
update:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@@ -70,3 +79,17 @@ jobs:
|
||||
\"release_tag\": \"${{ inputs.release_tag }}\"
|
||||
}
|
||||
}"
|
||||
|
||||
- name: Trigger build windows x86
|
||||
if: inputs.release_tag != ''
|
||||
run: |
|
||||
curl -X POST \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
||||
https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows-x86.yml/dispatches \
|
||||
-d "{
|
||||
\"ref\": \"master\",
|
||||
\"inputs\": {
|
||||
\"release_tag\": \"${{ inputs.release_tag }}\"
|
||||
}
|
||||
}"
|
||||
|
||||
540
.github/workflows/build-linux.yml
vendored
540
.github/workflows/build-linux.yml
vendored
@@ -12,6 +12,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -26,17 +27,14 @@ jobs:
|
||||
with:
|
||||
target: linux
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
secrets: inherit
|
||||
|
||||
deb:
|
||||
name: build and release deb x64 & arm64
|
||||
if: |
|
||||
(github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
|
||||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-24.04
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-26.04
|
||||
container: debian:13
|
||||
env:
|
||||
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||
|
||||
env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" }
|
||||
steps:
|
||||
- name: Prepare tools (Debian)
|
||||
shell: bash
|
||||
@@ -44,124 +42,73 @@ jobs:
|
||||
set -euo pipefail
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get update
|
||||
apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \
|
||||
ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \
|
||||
libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev
|
||||
|
||||
apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev
|
||||
- name: Checkout repo (for scripts)
|
||||
uses: actions/checkout@v6.0.2
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
fetch-depth: '0'
|
||||
|
||||
uses: actions/checkout@v7
|
||||
with: { submodules: 'recursive', fetch-depth: '0' }
|
||||
- name: Ensure script permissions
|
||||
run: chmod 755 package-debian.sh
|
||||
|
||||
- name: Package DEB (Debian-family)
|
||||
run: ./package-debian.sh "${RELEASE_TAG}" --arch all
|
||||
|
||||
- name: Collect DEBs into workspace
|
||||
run: |
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/deb"
|
||||
rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb/" || true
|
||||
find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" \
|
||||
-exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true
|
||||
find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" \
|
||||
-exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true
|
||||
find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true
|
||||
find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/deb" || true
|
||||
|
||||
- name: Upload DEBs to release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
file: dist/deb/**/*.deb
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
- name: Upload DEB artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-deb, path: "dist/deb/**/*.deb", if-no-files-found: error }
|
||||
|
||||
rpm:
|
||||
name: build and release rpm x64 & arm64
|
||||
if: |
|
||||
(github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
|
||||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-24.04
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-26.04
|
||||
container: registry.access.redhat.com/ubi10/ubi
|
||||
env:
|
||||
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||
|
||||
env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" }
|
||||
steps:
|
||||
- name: Prepare tools (Red Hat)
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
. /etc/os-release
|
||||
EL_MAJOR="${VERSION_ID%%.*}"
|
||||
echo "EL_MAJOR=${EL_MAJOR}"
|
||||
|
||||
dnf -y makecache || true
|
||||
command -v curl >/dev/null || dnf -y install curl ca-certificates
|
||||
|
||||
ARCH="$(uname -m)"
|
||||
case "$ARCH" in x86_64|aarch64) ;; *) echo "Unsupported arch: $ARCH"; exit 1 ;; esac
|
||||
|
||||
install_epel_from_dir() {
|
||||
local base="$1" rpm
|
||||
echo "Try: $base"
|
||||
|
||||
rpm="$(
|
||||
{
|
||||
curl -fsSL "$base/Packages/" 2>/dev/null
|
||||
curl -fsSL "$base/Packages/e/" 2>/dev/null | sed 's|href="|href="e/|'
|
||||
} |
|
||||
sed -n 's/.*href="\([^"]*epel-release-[^"]*\.noarch\.rpm\)".*/\1/p' |
|
||||
sort -V | tail -n1
|
||||
)" || true
|
||||
|
||||
if [[ -n "$rpm" ]]; then
|
||||
dnf -y install "$base/Packages/$rpm"
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
rpm="$({ curl -fsSL "$base/Packages/" 2>/dev/null; curl -fsSL "$base/Packages/e/" 2>/dev/null | sed 's|href="|href="e/|'; } |
|
||||
sed -n 's/.*href="\([^"]*epel-release-[^"]*\.noarch\.rpm\)".*/\1/p' | sort -V | tail -n1)" || true
|
||||
[[ -n "$rpm" ]] || return 1
|
||||
dnf -y install "$base/Packages/$rpm"
|
||||
}
|
||||
|
||||
FEDORA="https://dl.fedoraproject.org/pub/epel/epel-release-latest-${EL_MAJOR}.noarch.rpm"
|
||||
ROCKY="https://dl.rockylinux.org/pub/rocky/${EL_MAJOR}/extras/${ARCH}/os"
|
||||
ALMA="https://repo.almalinux.org/almalinux/${EL_MAJOR}/extras/${ARCH}/os"
|
||||
|
||||
echo "Try Fedora: $FEDORA"
|
||||
curl -fsSLI "$FEDORA" >/dev/null && dnf -y install "$FEDORA" ||
|
||||
install_epel_from_dir "$ROCKY" ||
|
||||
install_epel_from_dir "$ALMA" ||
|
||||
{ echo "EPEL bootstrap failed (Fedora/Rocky/Alma)"; exit 1; }
|
||||
|
||||
if curl -fsSLI "$FEDORA" >/dev/null; then
|
||||
dnf -y install "$FEDORA"
|
||||
else
|
||||
ROCKY="https://dl.rockylinux.org/pub/rocky/${EL_MAJOR}/extras/${ARCH}/os"
|
||||
if install_epel_from_dir "$ROCKY"; then
|
||||
:
|
||||
else
|
||||
ALMA="https://repo.almalinux.org/almalinux/${EL_MAJOR}/extras/${ARCH}/os"
|
||||
if install_epel_from_dir "$ALMA"; then
|
||||
:
|
||||
else
|
||||
echo "EPEL bootstrap failed (Fedora/Rocky/Alma)"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core \
|
||||
rsync findutils tar gzip unzip which
|
||||
|
||||
dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which
|
||||
dnf repolist | grep -i epel || true
|
||||
|
||||
- name: Checkout repo (for scripts)
|
||||
uses: actions/checkout@v6.0.2
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
fetch-depth: '0'
|
||||
|
||||
uses: actions/checkout@v7
|
||||
with: { submodules: 'recursive', fetch-depth: '0' }
|
||||
- name: Ensure script permissions
|
||||
run: chmod 755 package-rhel.sh
|
||||
|
||||
- name: Package RPM (RHEL-family)
|
||||
run: ./package-rhel.sh "${RELEASE_TAG}" --arch all
|
||||
|
||||
- name: Collect RPMs into workspace
|
||||
run: |
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/rpm"
|
||||
@@ -170,39 +117,26 @@ jobs:
|
||||
find "$GITHUB_WORKSPACE/dist/rpm" -name "v2rayN-*-1*.aarch64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm/v2rayN-linux-rhel-arm64.rpm" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/rpm" || true
|
||||
|
||||
- name: Upload RPMs to release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
file: dist/rpm/**/*.rpm
|
||||
tag: ${{ env.RELEASE_TAG }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
- name: Upload RPM artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-rpm, path: "dist/rpm/**/*.rpm", if-no-files-found: error }
|
||||
|
||||
rpm-riscv64:
|
||||
name: build and release rpm riscv64
|
||||
if: |
|
||||
(github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
|
||||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-24.04-riscv
|
||||
container: rockylinux/rockylinux:10
|
||||
env:
|
||||
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||
|
||||
env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" }
|
||||
steps:
|
||||
- name: Prepare tools (Red Hat)
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
dnf -y makecache
|
||||
dnf -y install \
|
||||
sudo git rpm-build rpmdevtools dnf-plugins-core \
|
||||
rsync findutils tar gzip unzip which jq
|
||||
|
||||
dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which jq
|
||||
- name: Checkout repo (for scripts)
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
env: { GITHUB_TOKEN: "${{ github.token }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf ./*
|
||||
@@ -212,42 +146,400 @@ jobs:
|
||||
git fetch --depth=1 origin "${GITHUB_SHA}"
|
||||
git checkout FETCH_HEAD
|
||||
git submodule update --init --recursive
|
||||
|
||||
- name: Ensure script permissions
|
||||
run: chmod 755 package-rhel-riscv.sh
|
||||
|
||||
- name: Package RPM (RHEL-family)
|
||||
run: ./package-rhel-riscv.sh "${RELEASE_TAG}"
|
||||
|
||||
- name: Collect RPMs into workspace
|
||||
run: |
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/rpm-riscv64"
|
||||
rsync -av "$HOME/rpmbuild/RPMS/" "$GITHUB_WORKSPACE/dist/rpm-riscv64/" || true
|
||||
find "$GITHUB_WORKSPACE/dist/rpm-riscv64" -name "*.riscv64.rpm" \
|
||||
-exec mv {} "$GITHUB_WORKSPACE/dist/rpm-riscv64/v2rayN-linux-rhel-riscv64.rpm" \; || true
|
||||
find "$GITHUB_WORKSPACE/dist/rpm-riscv64" -name "*.riscv64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-riscv64/v2rayN-linux-rhel-riscv64.rpm" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/rpm-riscv64" || true
|
||||
- name: Upload RPM artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-rpm-riscv64, path: "dist/rpm-riscv64/**/*.rpm", if-no-files-found: error }
|
||||
|
||||
- name: Upload RPMs to release
|
||||
deb-riscv64:
|
||||
name: build and release deb riscv64
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-24.04-riscv
|
||||
container: debian:13
|
||||
env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" }
|
||||
steps:
|
||||
- name: Prepare tools (Debian)
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
shopt -s globstar nullglob
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get update
|
||||
apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1
|
||||
- name: Checkout repo (for scripts)
|
||||
shell: bash
|
||||
env: { GITHUB_TOKEN: "${{ github.token }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf ./*
|
||||
git init .
|
||||
git config --global --add safe.directory "$PWD"
|
||||
git remote add origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
|
||||
git fetch --depth=1 origin "${GITHUB_SHA}"
|
||||
git checkout FETCH_HEAD
|
||||
git submodule update --init --recursive
|
||||
- name: Ensure script permissions
|
||||
run: chmod 755 package-debian-riscv.sh
|
||||
- name: Package DEB (Debian-family)
|
||||
run: ./package-debian-riscv.sh "${RELEASE_TAG}"
|
||||
- name: Collect DEBs into workspace
|
||||
run: |
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/deb-riscv64"
|
||||
rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb-riscv64/" || true
|
||||
find "$GITHUB_WORKSPACE/dist/deb-riscv64" -name "*.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb-riscv64/v2rayN-linux-riscv64.deb" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/deb-riscv64" || true
|
||||
- name: Upload DEB artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-deb-riscv64, path: "dist/deb-riscv64/**/*.deb", if-no-files-found: error }
|
||||
|
||||
files=(dist/rpm-riscv64/**/*.rpm)
|
||||
(( ${#files[@]} )) || { echo "No RPMs found."; exit 1; }
|
||||
deb-loong64:
|
||||
name: build and release deb loong64
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-26.04
|
||||
env:
|
||||
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||
QCOW2_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/debian13-loong64.qcow2
|
||||
EFI_CODE_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/edk2-loongarch64-code.fd
|
||||
EFI_VARS_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/edk2-loongarch64-vars.fd
|
||||
QCOW2_IMAGE: debian13-loong64.qcow2
|
||||
EFI_CODE: edk2-loongarch64-code.fd
|
||||
EFI_VARS: edk2-loongarch64-vars.fd
|
||||
QEMU_VERSION: 10.2.4
|
||||
steps:
|
||||
- name: Prepare host tools
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y git rsync qemu-utils qemu-system-common expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0 virtiofsd
|
||||
sudo ln -sf /usr/libexec/virtiofsd /usr/local/bin/virtiofsd
|
||||
virtiofsd --version || virtiofsd --help | head
|
||||
- name: Host clone repo
|
||||
shell: bash
|
||||
env: { GITHUB_TOKEN: "${{ github.token }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf repo
|
||||
git clone --no-single-branch --tags "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" repo
|
||||
- name: Download QEMU prebuild
|
||||
run: |
|
||||
set -euo pipefail
|
||||
wget -O qemu-linux-x64-v3.tar.gz "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64-v3.tar.gz"
|
||||
tar -xzf qemu-linux-x64-v3.tar.gz
|
||||
mkdir -p "$HOME/qemu-install"
|
||||
rsync -a qemu-linux-x64-v3/ "$HOME/qemu-install/"
|
||||
"$HOME/qemu-install/bin/qemu-system-loongarch64" --version
|
||||
- name: Download loong64 qcow2 and EFI firmware
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
wget -O "$QCOW2_IMAGE" "$QCOW2_URL"
|
||||
wget -O "$EFI_CODE" "$EFI_CODE_URL"
|
||||
wget -O "$EFI_VARS" "$EFI_VARS_URL"
|
||||
qemu-img info "$QCOW2_IMAGE"
|
||||
- name: Build loong64 DEB in VM through serial console
|
||||
shell: bash
|
||||
timeout-minutes: 180
|
||||
env: { RELEASE_TAG: "${{ env.RELEASE_TAG }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64"
|
||||
|
||||
api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}"
|
||||
upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')"
|
||||
[[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; }
|
||||
export VIRTIOFSD_SOCKET="$RUNNER_TEMP/virtiofs-deb-loong64.sock"
|
||||
rm -f "$VIRTIOFSD_SOCKET"
|
||||
|
||||
for f in "${files[@]}"; do
|
||||
echo "Uploading ${f##*/}"
|
||||
curl -fsSL -X POST \
|
||||
-H "Authorization: Bearer ${GITHUB_TOKEN}" \
|
||||
-H "Content-Type: application/x-rpm" \
|
||||
--data-binary @"$f" \
|
||||
"${upload_url}?name=${f##*/}"
|
||||
sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" -o source="$GITHUB_WORKSPACE" -o cache=auto &
|
||||
|
||||
VIRTIOFSD_PID=$!
|
||||
trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT
|
||||
|
||||
for i in {1..100}; do
|
||||
[[ -S "$VIRTIOFSD_SOCKET" ]] && break
|
||||
sleep 0.1
|
||||
done
|
||||
|
||||
[[ -S "$VIRTIOFSD_SOCKET" ]] || { echo "virtiofsd socket not created"; exit 1; }
|
||||
sudo chown "$USER:$(id -gn)" "$VIRTIOFSD_SOCKET" || true
|
||||
sudo chmod 660 "$VIRTIOFSD_SOCKET" || true
|
||||
expect <<'EOF'
|
||||
log_user 1
|
||||
set timeout -1
|
||||
set release_tag $env(RELEASE_TAG)
|
||||
set qemu_bin "$env(HOME)/qemu-install/bin/qemu-system-loongarch64"
|
||||
set qemu_rom_dir "$env(HOME)/qemu-install/share/qemu"
|
||||
set virtiofs_socket $env(VIRTIOFSD_SOCKET)
|
||||
set qcow2 $env(QCOW2_IMAGE)
|
||||
set efi_code $env(EFI_CODE)
|
||||
set efi_vars $env(EFI_VARS)
|
||||
proc wait_prompt {} {
|
||||
expect {
|
||||
-re "__CI_PROMPT__# " {}
|
||||
timeout { exit 1 }
|
||||
eof { exit 1 }
|
||||
}
|
||||
}
|
||||
proc run_cmd {cmd} {
|
||||
send -- "$cmd\r"
|
||||
wait_prompt
|
||||
}
|
||||
spawn $qemu_bin \
|
||||
-L $qemu_rom_dir \
|
||||
-machine virt \
|
||||
-accel tcg,thread=multi,tb-size=2048 \
|
||||
-cpu la464 \
|
||||
-m 9216 \
|
||||
-object memory-backend-memfd,id=mem0,size=9216M,share=on \
|
||||
-numa node,memdev=mem0 \
|
||||
-smp 4 \
|
||||
-drive if=pflash,format=raw,unit=0,file=$efi_code,readonly=on \
|
||||
-drive if=pflash,format=raw,unit=1,file=$efi_vars \
|
||||
-device virtio-blk-pci,drive=hd0,bootindex=1 \
|
||||
-drive if=none,media=disk,id=hd0,file=$qcow2,format=qcow2 \
|
||||
-netdev user,id=net0 \
|
||||
-device virtio-net-pci-non-transitional,netdev=net0 \
|
||||
-chardev socket,id=charfs0,path=$virtiofs_socket \
|
||||
-device vhost-user-fs-pci,chardev=charfs0,tag=workspace \
|
||||
-display none \
|
||||
-serial stdio \
|
||||
-monitor none
|
||||
expect -re "login:|debian login:"
|
||||
send -- "root\r"
|
||||
expect -re "Password:|密码:|密码:"
|
||||
send -- "password\r"
|
||||
expect {
|
||||
-re "# " {}
|
||||
timeout { exit 1 }
|
||||
eof { exit 1 }
|
||||
}
|
||||
send -- "export TERM=dumb; export PS1='__CI_PROMPT__# '\r"
|
||||
wait_prompt
|
||||
run_cmd "mkdir -p /workspace"
|
||||
run_cmd "mount -t virtiofs workspace /workspace"
|
||||
run_cmd "IFACE=\$(ip -o link show | awk -F': ' '\$2 != \"lo\" {print \$2; exit}') ; ip link set \$IFACE up || true"
|
||||
run_cmd "dhclient \$IFACE || true"
|
||||
run_cmd "printf 'nameserver 10.0.2.3\nnameserver 1.1.1.1\n' >/etc/resolv.conf"
|
||||
run_cmd "apt-get update || apt-get update || apt-get update"
|
||||
run_cmd "DEBIAN_FRONTEND=noninteractive apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1 fuse3"
|
||||
run_cmd "rm -rf /root/v2rayN-src"
|
||||
run_cmd "rsync -a --info=progress2 /workspace/repo/ /root/v2rayN-src/"
|
||||
run_cmd "cd /root/v2rayN-src && git config --global --add safe.directory /root/v2rayN-src"
|
||||
run_cmd "cd /root/v2rayN-src && chmod 755 package-debian-loong.sh"
|
||||
send -- "cd /root/v2rayN-src; cat >/tmp/run-loong-build.sh <<'SCRIPT'\nset +e\nset -o pipefail\nbash -x ./package-debian-loong.sh \"\$RELEASE_TAG\" 2>&1 | tee /tmp/build.log\nrc=\$?\nmkdir -p /workspace/dist/deb-loong64\ncp -av /root/debbuild/*.deb /workspace/dist/deb-loong64/ 2>/dev/null || true\necho __BUILD_DONE__\$rc\nSCRIPT\nRELEASE_TAG=\"$release_tag\" bash /tmp/run-loong-build.sh\r"
|
||||
expect {
|
||||
-re "__BUILD_DONE__0" { send -- "poweroff\r" }
|
||||
default { exit 1 }
|
||||
}
|
||||
EOF
|
||||
- name: Collect DEBs
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64"
|
||||
find "$GITHUB_WORKSPACE/dist/deb-loong64" -name "*.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb-loong64/v2rayN-linux-loong64.deb" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/deb-loong64"
|
||||
- name: Upload DEB artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-deb-loong64, path: "dist/deb-loong64/**/*.deb", if-no-files-found: error }
|
||||
|
||||
rpm-loong64:
|
||||
name: build and release rpm loong64
|
||||
if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||
runs-on: ubuntu-26.04
|
||||
env:
|
||||
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
|
||||
QCOW2_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/fedora43-loong64.qcow2
|
||||
EFI_CODE_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/edk2-loongarch64-code.fd
|
||||
EFI_VARS_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/edk2-loongarch64-vars.fd
|
||||
QCOW2_IMAGE: fedora43-loong64.qcow2
|
||||
EFI_CODE: edk2-loongarch64-code.fd
|
||||
EFI_VARS: edk2-loongarch64-vars.fd
|
||||
QEMU_VERSION: 10.2.4
|
||||
steps:
|
||||
- name: Prepare host tools
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y git rsync qemu-utils qemu-system-common expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0 virtiofsd
|
||||
sudo ln -sf /usr/libexec/virtiofsd /usr/local/bin/virtiofsd
|
||||
virtiofsd --version || virtiofsd --help | head
|
||||
- name: Host clone repo
|
||||
shell: bash
|
||||
env: { GITHUB_TOKEN: "${{ github.token }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf repo
|
||||
git clone --no-single-branch --tags "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" repo
|
||||
- name: Download QEMU prebuild
|
||||
run: |
|
||||
set -euo pipefail
|
||||
wget -O qemu-linux-x64-v3.tar.gz "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64-v3.tar.gz"
|
||||
tar -xzf qemu-linux-x64-v3.tar.gz
|
||||
mkdir -p "$HOME/qemu-install"
|
||||
rsync -a qemu-linux-x64-v3/ "$HOME/qemu-install/"
|
||||
"$HOME/qemu-install/bin/qemu-system-loongarch64" --version
|
||||
- name: Download loong64 qcow2 and EFI firmware
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
wget -O "$QCOW2_IMAGE" "$QCOW2_URL"
|
||||
wget -O "$EFI_CODE" "$EFI_CODE_URL"
|
||||
wget -O "$EFI_VARS" "$EFI_VARS_URL"
|
||||
qemu-img info "$QCOW2_IMAGE"
|
||||
- name: Build loong64 RPM in VM through serial console
|
||||
shell: bash
|
||||
timeout-minutes: 180
|
||||
env: { RELEASE_TAG: "${{ env.RELEASE_TAG }}" }
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/rpm-loong64"
|
||||
|
||||
export VIRTIOFSD_SOCKET="$RUNNER_TEMP/virtiofs-rpm-loong64.sock"
|
||||
rm -f "$VIRTIOFSD_SOCKET"
|
||||
|
||||
sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" -o source="$GITHUB_WORKSPACE" -o cache=auto &
|
||||
|
||||
VIRTIOFSD_PID=$!
|
||||
trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT
|
||||
|
||||
for i in {1..100}; do
|
||||
[[ -S "$VIRTIOFSD_SOCKET" ]] && break
|
||||
sleep 0.1
|
||||
done
|
||||
|
||||
[[ -S "$VIRTIOFSD_SOCKET" ]] || { echo "virtiofsd socket not created"; exit 1; }
|
||||
sudo chown "$USER:$(id -gn)" "$VIRTIOFSD_SOCKET" || true
|
||||
sudo chmod 660 "$VIRTIOFSD_SOCKET" || true
|
||||
expect <<'EOF'
|
||||
log_user 1
|
||||
set timeout -1
|
||||
set release_tag $env(RELEASE_TAG)
|
||||
set qemu_bin "$env(HOME)/qemu-install/bin/qemu-system-loongarch64"
|
||||
set qemu_rom_dir "$env(HOME)/qemu-install/share/qemu"
|
||||
set virtiofs_socket $env(VIRTIOFSD_SOCKET)
|
||||
set qcow2 $env(QCOW2_IMAGE)
|
||||
set efi_code $env(EFI_CODE)
|
||||
set efi_vars $env(EFI_VARS)
|
||||
proc wait_prompt {} {
|
||||
expect {
|
||||
-re "__CI_PROMPT__# " {}
|
||||
timeout { exit 1 }
|
||||
eof { exit 1 }
|
||||
}
|
||||
}
|
||||
proc run_cmd {cmd} {
|
||||
send -- "$cmd\r"
|
||||
wait_prompt
|
||||
}
|
||||
spawn $qemu_bin \
|
||||
-L $qemu_rom_dir \
|
||||
-machine virt \
|
||||
-accel tcg,thread=multi,tb-size=2048 \
|
||||
-cpu la464 \
|
||||
-m 9216 \
|
||||
-object memory-backend-memfd,id=mem0,size=9216M,share=on \
|
||||
-numa node,memdev=mem0 \
|
||||
-smp 4 \
|
||||
-drive if=pflash,format=raw,unit=0,file=$efi_code,readonly=on \
|
||||
-drive if=pflash,format=raw,unit=1,file=$efi_vars \
|
||||
-device virtio-blk-pci,drive=hd0,bootindex=1 \
|
||||
-drive if=none,media=disk,id=hd0,file=$qcow2,format=qcow2 \
|
||||
-netdev user,id=net0 \
|
||||
-device virtio-net-pci-non-transitional,netdev=net0 \
|
||||
-chardev socket,id=charfs0,path=$virtiofs_socket \
|
||||
-device vhost-user-fs-pci,chardev=charfs0,tag=workspace \
|
||||
-display none \
|
||||
-serial stdio \
|
||||
-monitor none
|
||||
expect -re "login:|fedora login:"
|
||||
send -- "root\r"
|
||||
expect -re "Password:|密码:|密码:"
|
||||
send -- "password\r"
|
||||
expect {
|
||||
-re "# " {}
|
||||
timeout { exit 1 }
|
||||
eof { exit 1 }
|
||||
}
|
||||
send -- "export TERM=dumb; export PS1='__CI_PROMPT__# '\r"
|
||||
wait_prompt
|
||||
run_cmd "mkdir -p /workspace"
|
||||
run_cmd "mount -t virtiofs workspace /workspace"
|
||||
run_cmd "IFACE=\$(ip -o link show | awk -F': ' '\$2 != \"lo\" {print \$2; exit}') ; ip link set \$IFACE up || true"
|
||||
run_cmd "dhclient \$IFACE || true"
|
||||
run_cmd "printf 'nameserver 10.0.2.3\nnameserver 1.1.1.1\n' >/etc/resolv.conf"
|
||||
run_cmd "dnf -y makecache || dnf -y makecache || dnf -y makecache"
|
||||
run_cmd "dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which curl jq file ca-certificates fuse3 --nogpgcheck"
|
||||
run_cmd "rm -rf /root/v2rayN-src"
|
||||
run_cmd "rsync -a --info=progress2 /workspace/repo/ /root/v2rayN-src/"
|
||||
run_cmd "cd /root/v2rayN-src && git config --global --add safe.directory /root/v2rayN-src"
|
||||
run_cmd "cd /root/v2rayN-src && chmod 755 package-rhel-loong.sh"
|
||||
send -- "cd /root/v2rayN-src; cat >/tmp/run-loong-rpm-build.sh <<'SCRIPT'\nset +e\nset -o pipefail\nbash -x ./package-rhel-loong.sh \"\$RELEASE_TAG\" 2>&1 | tee /tmp/build.log\nrc=\$?\nmkdir -p /workspace/dist/rpm-loong64\nfind /root/rpmbuild/RPMS -name '*.rpm' -exec cp -av {} /workspace/dist/rpm-loong64/ \\; 2>/dev/null || true\necho __BUILD_DONE__\$rc\nSCRIPT\nRELEASE_TAG=\"$release_tag\" bash /tmp/run-loong-rpm-build.sh\r"
|
||||
expect {
|
||||
-re "__BUILD_DONE__0" { send -- "poweroff\r" }
|
||||
default { exit 1 }
|
||||
}
|
||||
EOF
|
||||
- name: Collect RPMs
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p "$GITHUB_WORKSPACE/dist/rpm-loong64"
|
||||
find "$GITHUB_WORKSPACE/dist/rpm-loong64" -name "*.loongarch64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-loong64/v2rayN-linux-rhel-loong64.rpm" \; || true
|
||||
echo "==== Dist tree ===="
|
||||
ls -R "$GITHUB_WORKSPACE/dist/rpm-loong64"
|
||||
- name: Upload RPM artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with: { name: release-rpm-loong64, path: "dist/rpm-loong64/**/*.rpm", if-no-files-found: error }
|
||||
|
||||
release-deb:
|
||||
name: sign and upload deb x64 arm64
|
||||
needs: deb
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-deb, file_pattern: "*.deb" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
release-rpm:
|
||||
name: sign and upload rpm x64 arm64
|
||||
needs: rpm
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-rpm, file_pattern: "*.rpm" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
release-rpm-riscv64:
|
||||
name: sign and upload rpm riscv64
|
||||
needs: rpm-riscv64
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-rpm-riscv64, file_pattern: "*.rpm" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
release-deb-riscv64:
|
||||
name: sign and upload deb riscv64
|
||||
needs: deb-riscv64
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-deb-riscv64, file_pattern: "*.deb" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
release-deb-loong64:
|
||||
name: sign and upload deb loong64
|
||||
needs: deb-loong64
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-deb-loong64, file_pattern: "*.deb" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
release-rpm-loong64:
|
||||
name: sign and upload rpm loong64
|
||||
needs: rpm-loong64
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with: { release_tag: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}", artifact_name: release-rpm-loong64, file_pattern: "*.rpm" }
|
||||
secrets: { GPG_PRIVATE_KEY: "${{ secrets.GPG_PRIVATE_KEY }}" }
|
||||
|
||||
33
.github/workflows/build-osx.yml
vendored
33
.github/workflows/build-osx.yml
vendored
@@ -12,6 +12,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -26,6 +27,7 @@ jobs:
|
||||
with:
|
||||
target: macos
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
secrets: inherit
|
||||
|
||||
dmg:
|
||||
name: package and release macOS dmg
|
||||
@@ -45,7 +47,7 @@ jobs:
|
||||
}}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.2
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Restore build artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
@@ -62,13 +64,24 @@ jobs:
|
||||
- name: Package dmg
|
||||
run: ./package-osx.sh macos-$Arch v2rayN-macos-$Arch ${{ inputs.release_tag }}
|
||||
|
||||
- name: Sleep for race condition between matrix jobs
|
||||
run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
|
||||
|
||||
- name: Upload dmg to release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
- name: Upload dmg artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
file: ${{ github.workspace }}/v2rayN*.dmg
|
||||
tag: ${{ inputs.release_tag }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
name: release-dmg-${{ matrix.arch }}
|
||||
path: v2rayN*.dmg
|
||||
if-no-files-found: error
|
||||
|
||||
release-dmg:
|
||||
name: sign and upload macOS dmg
|
||||
if: inputs.release_tag != ''
|
||||
needs: dmg
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [ x64, arm64 ]
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with:
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
artifact_name: release-dmg-${{ matrix.arch }}
|
||||
file_pattern: '*.dmg'
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
|
||||
2
.github/workflows/build-windows-desktop.yml
vendored
2
.github/workflows/build-windows-desktop.yml
vendored
@@ -12,6 +12,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -26,3 +27,4 @@ jobs:
|
||||
with:
|
||||
target: windows-desktop
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
secrets: inherit
|
||||
|
||||
247
.github/workflows/build-windows-x86.yml
vendored
Normal file
247
.github/workflows/build-windows-x86.yml
vendored
Normal file
@@ -0,0 +1,247 @@
|
||||
name: release Windows x86
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
release_tag:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
package-x86:
|
||||
name: build and release windows x86 WPF & Avalonia
|
||||
if: inputs.release_tag != ''
|
||||
runs-on: windows-latest
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- flavor: wpf
|
||||
project: ./v2rayN/v2rayN/v2rayN.csproj
|
||||
zip_name: v2rayN-windows-86.zip
|
||||
- flavor: desktop
|
||||
project: ./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
|
||||
zip_name: v2rayN-windows-86-desktop.zip
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Purge SDKs
|
||||
shell: pwsh
|
||||
run: |
|
||||
echo "Before:"
|
||||
dotnet --list-sdks
|
||||
|
||||
dotnet --list-sdks | % {
|
||||
$_ -match '^\S+\s+\[(.+)\]$' > $null
|
||||
$d = Join-Path $Matches[1] $_.Split()[0]
|
||||
Write-Host "Removing $d"
|
||||
if ($IsWindows) { rm $d -r -fo } else { sudo rm -rf "$d" }
|
||||
}
|
||||
|
||||
echo "After:"
|
||||
dotnet --list-sdks 2>$null; $LASTEXITCODE=0
|
||||
|
||||
- name: Setup .NET 10.0.1xx
|
||||
uses: actions/setup-dotnet@v5.4.0
|
||||
with:
|
||||
dotnet-version: 10.0.1xx
|
||||
|
||||
- name: Publish ${{ matrix.flavor }} win-x86
|
||||
shell: pwsh
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
dotnet restore "${{ matrix.project }}" -r win-x86
|
||||
|
||||
dotnet publish "${{ matrix.project }}" `
|
||||
-c Release `
|
||||
-r win-x86 `
|
||||
-p:SelfContained=true `
|
||||
-p:EnableWindowsTargeting=true `
|
||||
-o "publish/${{ matrix.flavor }}"
|
||||
|
||||
- name: Publish AmazTool win-x86
|
||||
shell: pwsh
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
dotnet publish "./v2rayN/AmazTool/AmazTool.csproj" `
|
||||
-c Release `
|
||||
-r win-x86 `
|
||||
-p:SelfContained=true `
|
||||
-p:PublishTrimmed=true `
|
||||
-p:EnableWindowsTargeting=true `
|
||||
-o "publish/${{ matrix.flavor }}"
|
||||
|
||||
- name: Detect bundled core versions
|
||||
id: detect-core
|
||||
shell: pwsh
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
New-Item -ItemType Directory -Force -Path "tmp/probe" | Out-Null
|
||||
|
||||
Invoke-WebRequest -Uri "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/v2rayN-windows-64/bin/xray/xray.exe" -OutFile "tmp/probe/xray.exe"
|
||||
$xrayOutput = (& "tmp/probe/xray.exe" version) -join "`n"
|
||||
Write-Host $xrayOutput
|
||||
|
||||
$xrayMatch = [regex]::Match($xrayOutput, 'Xray\s+([0-9.]+)')
|
||||
if ($xrayMatch.Success) {
|
||||
$xrayVer = $xrayMatch.Groups[1].Value
|
||||
} else {
|
||||
throw "Failed to detect Xray version"
|
||||
}
|
||||
|
||||
Invoke-WebRequest -Uri "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/v2rayN-windows-64/bin/sing_box/sing-box.exe" -OutFile "tmp/probe/sing-box.exe"
|
||||
$singOutput = (& "tmp/probe/sing-box.exe" version) -join "`n"
|
||||
Write-Host $singOutput
|
||||
|
||||
$singMatch = [regex]::Match($singOutput, 'sing-box version\s+([0-9.]+)')
|
||||
if ($singMatch.Success) {
|
||||
$singVer = $singMatch.Groups[1].Value
|
||||
} else {
|
||||
throw "Failed to detect sing-box version"
|
||||
}
|
||||
|
||||
Write-Host "Bundled Xray version: $xrayVer"
|
||||
Write-Host "Bundled sing-box version: $singVer"
|
||||
|
||||
"xray_version=$xrayVer" >> $env:GITHUB_OUTPUT
|
||||
"sing_version=$singVer" >> $env:GITHUB_OUTPUT
|
||||
|
||||
- name: Download x86 cores and rule assets
|
||||
shell: pwsh
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$headers = @{
|
||||
Authorization = "Bearer $env:GH_TOKEN"
|
||||
Accept = "application/vnd.github+json"
|
||||
"X-GitHub-Api-Version" = "2022-11-28"
|
||||
}
|
||||
|
||||
$root = "publish/${{ matrix.flavor }}"
|
||||
$bin = Join-Path $root "bin"
|
||||
$xrayDir = Join-Path $bin "xray"
|
||||
$singDir = Join-Path $bin "sing_box"
|
||||
$srssDir = Join-Path $bin "srss"
|
||||
|
||||
New-Item -ItemType Directory -Force -Path $xrayDir, $singDir, $srssDir | Out-Null
|
||||
|
||||
$xrayVer = "${{ steps.detect-core.outputs.xray_version }}"
|
||||
$singVer = "${{ steps.detect-core.outputs.sing_version }}"
|
||||
|
||||
$xrayTag = "v$xrayVer"
|
||||
$singTag = "v$singVer"
|
||||
|
||||
$xrayUrl = "https://github.com/autorepobot/Xray-core/releases/download/$xrayTag/Xray-windows-32.zip"
|
||||
$singUrl = "https://github.com/SagerNet/sing-box/releases/download/$singTag/sing-box-$singVer-windows-386.zip"
|
||||
|
||||
Write-Host "Bundled Xray version: $xrayVer"
|
||||
Write-Host "Bundled sing-box version: $singVer"
|
||||
Write-Host "Xray: $xrayUrl"
|
||||
Write-Host "sing-box: $singUrl"
|
||||
|
||||
New-Item -ItemType Directory -Force -Path "tmp" | Out-Null
|
||||
|
||||
Invoke-WebRequest -Uri $xrayUrl -OutFile "tmp/xray.zip"
|
||||
Expand-Archive -Force "tmp/xray.zip" "tmp/xray"
|
||||
|
||||
Get-ChildItem "tmp/xray" -Recurse -Include "*.exe","*.dll" | ForEach-Object {
|
||||
Copy-Item $_.FullName (Join-Path $xrayDir $_.Name) -Force
|
||||
}
|
||||
|
||||
Invoke-WebRequest -Uri $singUrl -OutFile "tmp/sing-box.zip"
|
||||
Expand-Archive -Force "tmp/sing-box.zip" "tmp/sing-box"
|
||||
|
||||
$singExe = Get-ChildItem "tmp/sing-box" -Recurse -Filter "sing-box.exe" | Select-Object -First 1
|
||||
if (-not $singExe) {
|
||||
throw "sing-box.exe not found"
|
||||
}
|
||||
|
||||
Copy-Item $singExe.FullName "$singDir/sing-box.exe" -Force
|
||||
|
||||
$cronet = Get-ChildItem "tmp/sing-box" -Recurse -Filter "libcronet*.dll" | Select-Object -First 1
|
||||
if ($cronet) {
|
||||
Copy-Item $cronet.FullName "$singDir/libcronet.dll" -Force
|
||||
}
|
||||
|
||||
Invoke-WebRequest -Uri "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat" -OutFile "$bin/geosite.dat"
|
||||
Invoke-WebRequest -Uri "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat" -OutFile "$bin/geoip.dat"
|
||||
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat" -OutFile "$bin/geoip-only-cn-private.dat"
|
||||
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb" -OutFile "$bin/Country.mmdb"
|
||||
Invoke-WebRequest -Uri "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" -OutFile "$bin/geoip.metadb"
|
||||
|
||||
$geoipRules = @(
|
||||
"geoip-private.srs",
|
||||
"geoip-cn.srs",
|
||||
"geoip-facebook.srs",
|
||||
"geoip-fastly.srs",
|
||||
"geoip-google.srs",
|
||||
"geoip-netflix.srs",
|
||||
"geoip-telegram.srs",
|
||||
"geoip-twitter.srs"
|
||||
)
|
||||
|
||||
foreach ($f in $geoipRules) {
|
||||
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f" -OutFile "$srssDir/$f"
|
||||
}
|
||||
|
||||
$geositeRules = @(
|
||||
"geosite-cn.srs",
|
||||
"geosite-gfw.srs",
|
||||
"geosite-google.srs",
|
||||
"geosite-greatfire.srs",
|
||||
"geosite-geolocation-cn.srs",
|
||||
"geosite-category-ads-all.srs",
|
||||
"geosite-private.srs"
|
||||
)
|
||||
|
||||
foreach ($f in $geositeRules) {
|
||||
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f" -OutFile "$srssDir/$f"
|
||||
}
|
||||
|
||||
- name: Package zip
|
||||
shell: pwsh
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Compress-Archive `
|
||||
-Path "publish/${{ matrix.flavor }}/*" `
|
||||
-DestinationPath "${{ matrix.zip_name }}" `
|
||||
-Force
|
||||
|
||||
- name: Upload zip artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: release-windows-x86-${{ matrix.flavor }}
|
||||
path: ${{ matrix.zip_name }}
|
||||
if-no-files-found: error
|
||||
|
||||
release-x86:
|
||||
name: sign and upload windows x86
|
||||
if: inputs.release_tag != ''
|
||||
needs: package-x86
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
flavor: [ wpf, desktop ]
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with:
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
artifact_name: release-windows-x86-${{ matrix.flavor }}
|
||||
file_pattern: '*.zip'
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
2
.github/workflows/build-windows.yml
vendored
2
.github/workflows/build-windows.yml
vendored
@@ -12,6 +12,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -27,3 +28,4 @@ jobs:
|
||||
with:
|
||||
target: windows
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
secrets: inherit
|
||||
|
||||
25
.github/workflows/build.yml
vendored
25
.github/workflows/build.yml
vendored
@@ -22,6 +22,7 @@ jobs:
|
||||
case(
|
||||
inputs.target == 'macos', 'macos-latest',
|
||||
inputs.target == 'linux', 'ubuntu-24.04',
|
||||
inputs.target == 'windows', 'windows-latest',
|
||||
'ubuntu-latest'
|
||||
)
|
||||
}}
|
||||
@@ -46,21 +47,39 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.2
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
fetch-depth: '0'
|
||||
|
||||
- name: Purge SDKs
|
||||
shell: pwsh
|
||||
run: |
|
||||
echo "Before:"
|
||||
dotnet --list-sdks
|
||||
|
||||
dotnet --list-sdks | % {
|
||||
$_ -match '^\S+\s+\[(.+)\]$' > $null
|
||||
$d = Join-Path $Matches[1] $_.Split()[0]
|
||||
Write-Host "Removing $d"
|
||||
if ($IsWindows) { rm $d -r -fo } else { sudo rm -rf "$d" }
|
||||
}
|
||||
|
||||
echo "After:"
|
||||
dotnet --list-sdks 2>$null; $LASTEXITCODE=0
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v5.2.0
|
||||
uses: actions/setup-dotnet@v5.4.0
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '10.0.1xx'
|
||||
|
||||
- name: Build v2rayN
|
||||
shell: bash
|
||||
working-directory: ./v2rayN
|
||||
run: dotnet publish $Project -c Release -r $RID -p:SelfContained=true $ExtOpt -o $Output
|
||||
|
||||
- name: Build AmazTool
|
||||
shell: bash
|
||||
working-directory: ./v2rayN
|
||||
run: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r $RID -p:SelfContained=true -p:PublishTrimmed=true $ExtOpt -o $Output
|
||||
|
||||
|
||||
34
.github/workflows/package-zip.yml
vendored
34
.github/workflows/package-zip.yml
vendored
@@ -9,9 +9,13 @@ on:
|
||||
target: # windows linux macos windows-desktop
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY:
|
||||
required: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
package:
|
||||
@@ -37,7 +41,7 @@ jobs:
|
||||
}}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.2
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Restore build artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
@@ -55,13 +59,23 @@ jobs:
|
||||
if: inputs.target == 'windows-desktop'
|
||||
run: mv "v2rayN-$Target-$Arch.zip" "v2rayN-$Target-$Arch-desktop.zip"
|
||||
|
||||
- name: Sleep for race condition between matrix jobs
|
||||
run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
|
||||
|
||||
- name: Upload zip archive to release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
- name: Upload zip artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
file: ${{ github.workspace }}/v2rayN*.zip
|
||||
tag: ${{ inputs.release_tag }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
name: release-${{ inputs.target }}-${{ matrix.arch }}
|
||||
path: v2rayN*.zip
|
||||
if-no-files-found: error
|
||||
|
||||
release:
|
||||
name: sign and upload zip x64 arm64
|
||||
needs: package
|
||||
strategy:
|
||||
matrix:
|
||||
arch: [ x64, arm64 ]
|
||||
uses: ./.github/workflows/upload-sign.yml
|
||||
with:
|
||||
release_tag: ${{ inputs.release_tag }}
|
||||
artifact_name: release-${{ inputs.target }}-${{ matrix.arch }}
|
||||
file_pattern: '*.zip'
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
|
||||
48
.github/workflows/pub-key.yml
vendored
Normal file
48
.github/workflows/pub-key.yml
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
name: publish GPG public key
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
release_tag:
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY:
|
||||
required: true
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
release_tag:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-26.04
|
||||
steps:
|
||||
- name: Import GPG private key
|
||||
shell: bash
|
||||
env:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
install -m 700 -d ~/.gnupg
|
||||
printf '%s' "$GPG_PRIVATE_KEY" | gpg --batch --import
|
||||
|
||||
- name: Export GPG public key
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
fingerprint="$(gpg --batch --list-secret-keys --with-colons | awk -F: '$1 == "fpr" { print $10; exit }')"
|
||||
[[ -n "$fingerprint" ]] || { echo "No GPG secret key found."; exit 1; }
|
||||
gpg --batch --armor --export "$fingerprint" > v2rayN-public-key.asc
|
||||
|
||||
- name: Upload GPG public key to release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
file: v2rayN-public-key.asc
|
||||
tag: ${{ inputs.release_tag }}
|
||||
prerelease: true
|
||||
overwrite: true
|
||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -14,13 +14,13 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.2
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
fetch-depth: '0'
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v5.2.0
|
||||
uses: actions/setup-dotnet@v5.4.0
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
|
||||
76
.github/workflows/upload-sign.yml
vendored
Normal file
76
.github/workflows/upload-sign.yml
vendored
Normal file
@@ -0,0 +1,76 @@
|
||||
name: sign and upload release files
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
release_tag:
|
||||
required: true
|
||||
type: string
|
||||
artifact_name:
|
||||
required: true
|
||||
type: string
|
||||
file_pattern:
|
||||
required: false
|
||||
type: string
|
||||
default: '**/*'
|
||||
content_type:
|
||||
required: false
|
||||
type: string
|
||||
default: application/octet-stream
|
||||
secrets:
|
||||
GPG_PRIVATE_KEY:
|
||||
required: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
upload:
|
||||
runs-on: ubuntu-26.04
|
||||
steps:
|
||||
- name: Download release artifact
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: ${{ inputs.artifact_name }}
|
||||
path: dist
|
||||
|
||||
- name: Import GPG private key
|
||||
shell: bash
|
||||
env:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
install -m 700 -d ~/.gnupg
|
||||
printf '%s' "$GPG_PRIVATE_KEY" | gpg --batch --import
|
||||
|
||||
- name: Sign release files
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cd dist
|
||||
shopt -s globstar nullglob
|
||||
files=( ${{ inputs.file_pattern }} )
|
||||
(( ${#files[@]} )) || { echo "No files matched: ${{ inputs.file_pattern }}"; exit 1; }
|
||||
for f in "${files[@]}"; do
|
||||
[[ -f "$f" ]] || continue
|
||||
gpg --batch --yes --armor --detach-sign --output "$f.sig" "$f"
|
||||
done
|
||||
|
||||
- name: Upload release files
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
file: dist/${{ inputs.file_pattern }}
|
||||
tag: ${{ inputs.release_tag }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
overwrite: true
|
||||
|
||||
- name: Upload release signatures
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
file: dist/${{ inputs.file_pattern }}.sig
|
||||
tag: ${{ inputs.release_tag }}
|
||||
file_glob: true
|
||||
prerelease: true
|
||||
overwrite: true
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -84,6 +84,9 @@ StyleCopReport.xml
|
||||
*.rsp
|
||||
# but not Directory.Build.rsp, as it configures directory-level build defaults
|
||||
!Directory.Build.rsp
|
||||
bin/
|
||||
obj/
|
||||
build/
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
|
||||
80
README.md
80
README.md
@@ -1,18 +1,78 @@
|
||||
# v2rayN
|
||||
|
||||
A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core)
|
||||
and [sing-box](https://github.com/SagerNet/sing-box)
|
||||
and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
|
||||
### A GUI client for Windows, Linux and macOS. Support [Xray](https://github.com/XTLS/Xray-core) and [sing-box](https://github.com/SagerNet/sing-box) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
|
||||
|
||||
[](https://github.com/2dust/v2rayN/commits/master)
|
||||
[](https://www.codefactor.io/repository/github/2dust/v2rayn)
|
||||
[](https://github.com/2dust/v2rayN/releases)
|
||||
[](https://t.me/v2rayn)
|
||||
[](https://github.com/2dust/v2rayN/releases)
|
||||
[](https://github.com/2dust/v2rayN/releases)
|
||||
[](https://t.me/v2rayn)
|
||||
|
||||
[](https://github.com/2dust/v2rayN)
|
||||
[](https://github.com/2dust/v2rayN)
|
||||
[](https://github.com/2dust/v2rayN)
|
||||
[](https://github.com/2dust/v2rayN)
|
||||
|
||||
## How to use
|
||||
|
||||
Read the [Wiki](https://github.com/2dust/v2rayN/wiki) for details.
|
||||
---
|
||||
|
||||
## Telegram Channel
|
||||
## Download / 下载
|
||||
|
||||
[github_2dust](https://t.me/github_2dust)
|
||||
Download the latest release here:
|
||||
|
||||
在这里下载最新版本:
|
||||
|
||||
[https://github.com/2dust/v2rayN/releases](https://github.com/2dust/v2rayN/releases)
|
||||
|
||||
|
||||
> [!TIP]
|
||||
> v2rayN is the desktop version. For the mobile version, please visit the v2rayNG \
|
||||
> v2rayN 是电脑版,手机版请访问 v2rayNG
|
||||
>
|
||||
> https://github.com/2dust/v2rayNG
|
||||
|
||||
---
|
||||
|
||||
## Documentation / 使用文档
|
||||
|
||||
Read the Wiki for usage guides and configuration details.
|
||||
|
||||
请阅读 Wiki 获取使用说明和配置教程。
|
||||
|
||||
[https://github.com/2dust/v2rayN/wiki](https://github.com/2dust/v2rayN/wiki)
|
||||
|
||||
---
|
||||
|
||||
## Supported Platforms / 支持平台
|
||||
|
||||
| Platform / 平台 | x64 | x86 | arm64 | riscv64 | loong64 |
|
||||
| --- | --- | --- | --- | --- | --- |
|
||||
| Windows | ✅ | ✅ | ✅ | - | - |
|
||||
| Linux | ✅ | - | ✅ | ✅ | ✅ |
|
||||
| macOS | ✅ | - | ✅ | - | - |
|
||||
|
||||
---
|
||||
|
||||
## GPG Verification / GPG 签名校验
|
||||
|
||||
Release files are signed with GPG to verify authenticity and integrity, helping prevent mirror, ISP, or CDN hijacking.
|
||||
|
||||
发布文件已使用 GPG 签名,可用于校验文件真实性与完整性,预防镜像站、运营商或 CDN 劫持。
|
||||
|
||||
### Fingerprint / 公钥指纹
|
||||
|
||||
```text
|
||||
7694 5E9F 3E9A 168F 8070 F195 805D 661C
|
||||
134D FAF6 8903 C199 463C 31E5 AE90 3AE0
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Community / 社区
|
||||
|
||||
Telegram Group / Telegram 群组:
|
||||
|
||||
[https://t.me/v2rayN](https://t.me/v2rayN)
|
||||
|
||||
Telegram Channel / Telegram 频道:
|
||||
|
||||
[https://t.me/github_2dust](https://t.me/github_2dust)
|
||||
|
||||
742
package-debian-loong.sh
Normal file
742
package-debian-loong.sh
Normal file
@@ -0,0 +1,742 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
BUILD_FROM=""
|
||||
XRAY_VER="${XRAY_VER:-}"
|
||||
SING_VER="${SING_VER:-}"
|
||||
|
||||
MIN_KERNEL="5.10"
|
||||
PKGROOT="v2rayN-publish"
|
||||
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||
OUTPUT_DIR="${HOME}/debbuild"
|
||||
DOTNET_TFM="net10.0"
|
||||
DOTNET_LOONGARCH_VERSION="10.0.109"
|
||||
DOTNET_LOONGARCH_TAG="v10.0.109-loongarch64"
|
||||
DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download"
|
||||
DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz"
|
||||
DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"
|
||||
|
||||
OS_ID=""
|
||||
OS_NAME=""
|
||||
OS_VERSION_ID=""
|
||||
HOST_ARCH=""
|
||||
SCRIPT_DIR=""
|
||||
PROJECT=""
|
||||
VERSION=""
|
||||
|
||||
declare -a BUILT_DEBS=()
|
||||
|
||||
die() {
|
||||
echo "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
parse_args() {
|
||||
local first_arg="${1:-}"
|
||||
|
||||
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||
VERSION_ARG="$first_arg"
|
||||
shift || true
|
||||
fi
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||
--netcore) FORCE_NETCORE=1; shift ;;
|
||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||
*)
|
||||
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||
fi
|
||||
}
|
||||
|
||||
detect_environment() {
|
||||
local current_kernel=""
|
||||
local lowest=""
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
OS_ID="${ID:-}"
|
||||
OS_NAME="${NAME:-$OS_ID}"
|
||||
OS_VERSION_ID="${VERSION_ID:-}"
|
||||
HOST_ARCH="$(uname -m)"
|
||||
|
||||
case "$OS_ID" in
|
||||
debian)
|
||||
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||
;;
|
||||
*)
|
||||
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||
This script only supports: Debian."
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$HOST_ARCH" in
|
||||
loongarch64) ;;
|
||||
*) die "Only supports loongarch64" ;;
|
||||
esac
|
||||
|
||||
current_kernel="$(uname -r)"
|
||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||
|
||||
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||
echo "[OK] Kernel $current_kernel verified."
|
||||
}
|
||||
|
||||
install_dependencies() {
|
||||
local install_ok=0
|
||||
local tmp_dotnet=""
|
||||
|
||||
mkdir -p "$OUTPUT_DIR"
|
||||
|
||||
if command -v apt-get >/dev/null 2>&1; then
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install \
|
||||
curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
|
||||
desktop-file-utils xdg-utils wget gcc make pkg-config \
|
||||
libicu-dev libssl-dev libfontconfig1 libfreetype6 zlib1g
|
||||
|
||||
mkdir -p "$HOME/.dotnet"
|
||||
tmp_dotnet="$(mktemp -d)"
|
||||
curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
|
||||
tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
|
||||
rm -rf "$tmp_dotnet"
|
||||
|
||||
export PATH="$HOME/.dotnet:$PATH"
|
||||
export DOTNET_ROOT="$HOME/.dotnet"
|
||||
|
||||
mkdir -p "$HOME/.nuget/NuGet"
|
||||
|
||||
cat > "$HOME/.nuget/NuGet/NuGet.Config" <<EOF
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="loongnix" value="https://lnuget.loongnix.cn/v3/index.json" allowInsecureConnections="true" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
EOF
|
||||
|
||||
dotnet --info >/dev/null 2>&1 && install_ok=1
|
||||
fi
|
||||
|
||||
if [[ "$install_ok" -ne 1 ]]; then
|
||||
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||
echo "dotnet-loongarch SDK, curl, unzip, tar, rsync, git, gcc, make, dpkg-deb, fakeroot, libicu-dev, libssl-dev"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
prepare_workspace() {
|
||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
|
||||
PROJECT="$PROJECT_HINT"
|
||||
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||
}
|
||||
|
||||
choose_channel() {
|
||||
local ch="latest"
|
||||
local sel=""
|
||||
|
||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||
case "$BUILD_FROM" in
|
||||
1) echo "latest"; return 0 ;;
|
||||
2) echo "prerelease"; return 0 ;;
|
||||
3) echo "keep"; return 0 ;;
|
||||
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ -t 0 ]]; then
|
||||
echo "[?] Choose v2rayN release channel:" >&2
|
||||
echo " 1) Latest (stable) [default]" >&2
|
||||
echo " 2) Pre-release (preview)" >&2
|
||||
echo " 3) Keep current (do nothing)" >&2
|
||||
printf "Enter 1, 2 or 3 [default 1]: " >&2
|
||||
|
||||
if read -r sel </dev/tty; then
|
||||
case "${sel:-}" in
|
||||
2) ch="prerelease" ;;
|
||||
3) ch="keep" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$ch"
|
||||
}
|
||||
|
||||
get_latest_tag_latest() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
|
||||
| jq -re '.tag_name' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
get_latest_tag_prerelease() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
|
||||
| jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
sync_submodules() {
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
}
|
||||
|
||||
git_try_checkout() {
|
||||
local want="$1"
|
||||
local ref=""
|
||||
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
git fetch --tags --force --prune --depth=1 || true
|
||||
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||
|
||||
if [[ -n "$ref" ]]; then
|
||||
echo "[OK] Found ref '${ref}', checking out..."
|
||||
git checkout -f "$ref"
|
||||
sync_submodules
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
apply_channel_or_keep() {
|
||||
local ch="$1"
|
||||
local tag=""
|
||||
|
||||
if [[ "$ch" == "keep" ]]; then
|
||||
echo "[*] Keep current repository state (no checkout)."
|
||||
VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
|
||||
VERSION="${VERSION#v}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||
|
||||
case "$ch" in
|
||||
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||
esac
|
||||
|
||||
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||
|
||||
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||
VERSION="${tag#v}"
|
||||
}
|
||||
|
||||
resolve_version() {
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||
local clean_ver="${VERSION_ARG#v}"
|
||||
|
||||
if git_try_checkout "$clean_ver"; then
|
||||
VERSION="$clean_ver"
|
||||
else
|
||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
echo "Current directory is not a git repo; proceeding on current tree."
|
||||
VERSION="${VERSION_ARG:-0.0.0}"
|
||||
fi
|
||||
|
||||
VERSION="${VERSION#v}"
|
||||
echo "[*] GUI version resolved as: ${VERSION}"
|
||||
}
|
||||
|
||||
xray_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-loong64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
singbox_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-loong64.tar.gz" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
bundle_url_for_rid() {
|
||||
local rid="$1"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-loong64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
download_xray() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${XRAY_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download xray: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
download_singbox() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${SING_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local bin=""
|
||||
local cronet=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download sing-box: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
unify_geo_layout() {
|
||||
local outroot="$1"
|
||||
local n
|
||||
local names=(
|
||||
geosite.dat
|
||||
geoip.dat
|
||||
geoip-only-cn-private.dat
|
||||
Country.mmdb
|
||||
geoip.metadb
|
||||
)
|
||||
|
||||
mkdir -p "$outroot/bin"
|
||||
|
||||
for n in "${names[@]}"; do
|
||||
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
download_geo_assets() {
|
||||
local outroot="$1"
|
||||
local bin_dir="$outroot/bin"
|
||||
local srss_dir="$bin_dir/srss"
|
||||
local f=""
|
||||
|
||||
mkdir -p "$bin_dir" "$srss_dir"
|
||||
|
||||
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||
|
||||
echo "[+] Download sing-box rule DB & rule-sets"
|
||||
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||
|
||||
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||
done
|
||||
|
||||
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||
done
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
}
|
||||
|
||||
populate_assets_zip_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local nested_dir=""
|
||||
|
||||
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Try v2rayN bundle archive: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
if [[ -d "$tmp/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$tmp/bin/" "$outroot/bin/"
|
||||
else
|
||||
rsync -a "$tmp/" "$outroot/"
|
||||
fi
|
||||
|
||||
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||
|
||||
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$nested_dir/bin/" "$outroot/bin/"
|
||||
rm -rf "$nested_dir"
|
||||
fi
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
rm -rf "$tmp"
|
||||
|
||||
echo "[+] Bundle extracted to $outroot"
|
||||
}
|
||||
|
||||
populate_assets_netcore_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||
fi
|
||||
|
||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||
fi
|
||||
|
||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||
}
|
||||
|
||||
stage_runtime_assets() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||
echo "[*] Using v2rayN bundle archive."
|
||||
else
|
||||
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
else
|
||||
echo "[*] --netcore specified: use separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
}
|
||||
|
||||
describe_target() {
|
||||
local short="$1"
|
||||
|
||||
case "$short" in
|
||||
loongarch64) printf '%s\n%s\n' "linux-loongarch64" "loong64" ;;
|
||||
*) echo "Unknown arch '$short' (use loongarch64)" >&2; return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
publish_binary() {
|
||||
local rid="$1"
|
||||
|
||||
dotnet clean "$PROJECT" -c Release
|
||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
||||
dotnet restore "$PROJECT"
|
||||
dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
|
||||
}
|
||||
|
||||
write_launcher_file() {
|
||||
local stage="$1"
|
||||
|
||||
install -m 755 /dev/stdin "$stage/usr/bin/v2rayn" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
DIR="/opt/v2rayN"
|
||||
cd "$DIR"
|
||||
|
||||
if [[ -x "$DIR/v2rayN" ]]; then
|
||||
exec "$DIR/v2rayN" "$@"
|
||||
fi
|
||||
|
||||
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||
if [[ -f "$DIR/$dll" ]]; then
|
||||
exec /usr/bin/dotnet "$DIR/$dll" "$@"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "v2rayN launcher: no executable found in $DIR" >&2
|
||||
ls -l "$DIR" >&2 || true
|
||||
exit 1
|
||||
EOF
|
||||
}
|
||||
|
||||
write_desktop_file() {
|
||||
local stage="$1"
|
||||
|
||||
install -m 644 /dev/stdin "$stage/usr/share/applications/v2rayn.desktop" <<'EOF'
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=v2rayN
|
||||
Comment=v2rayN for Debian GNU Linux
|
||||
Exec=v2rayn
|
||||
Icon=v2rayn
|
||||
Terminal=false
|
||||
Categories=Network;
|
||||
EOF
|
||||
}
|
||||
|
||||
write_maintainer_scripts() {
|
||||
local debian_dir="$1"
|
||||
|
||||
install -m 755 /dev/stdin "$debian_dir/postinst" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||
fi
|
||||
exit 0
|
||||
EOF
|
||||
|
||||
install -m 755 /dev/stdin "$debian_dir/postrm" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||
fi
|
||||
exit 0
|
||||
EOF
|
||||
}
|
||||
|
||||
package_binary() {
|
||||
local short="$1"
|
||||
local rid="$2"
|
||||
local deb_arch="$3"
|
||||
local pubdir=""
|
||||
local workdir=""
|
||||
local stage=""
|
||||
local debian_dir=""
|
||||
local project_dir=""
|
||||
local icon_candidate=""
|
||||
local shlibs_depends=""
|
||||
local extra_depends=""
|
||||
local final_depends=""
|
||||
local multiarch=""
|
||||
local sys_libdir=""
|
||||
local sys_usrlibdir=""
|
||||
local deb_out=""
|
||||
|
||||
pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
|
||||
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||
|
||||
workdir="$(mktemp -d)"
|
||||
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||
|
||||
stage="$workdir/${PKGROOT}_${VERSION}_${deb_arch}"
|
||||
debian_dir="$stage/DEBIAN"
|
||||
|
||||
mkdir -p "$stage/opt/v2rayN" "$stage/usr/bin" "$stage/usr/share/applications" "$stage/usr/share/icons/hicolor/256x256/apps" "$debian_dir"
|
||||
cp -a "$pubdir/." "$stage/opt/v2rayN/"
|
||||
|
||||
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||
icon_candidate="$project_dir/v2rayN.png"
|
||||
[[ -f "$icon_candidate" ]] && cp "$icon_candidate" "$stage/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
|
||||
|
||||
stage_runtime_assets "$stage/opt/v2rayN" "$rid"
|
||||
write_launcher_file "$stage"
|
||||
write_desktop_file "$stage"
|
||||
write_maintainer_scripts "$debian_dir"
|
||||
|
||||
extra_depends="libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)"
|
||||
|
||||
mkdir -p "$workdir/debian"
|
||||
cat > "$workdir/debian/control" <<EOF
|
||||
Source: v2rayn
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: 2dust <noreply@github.com>
|
||||
Standards-Version: 4.7.0
|
||||
|
||||
Package: v2rayn
|
||||
Architecture: ${deb_arch}
|
||||
Description: v2rayN
|
||||
EOF
|
||||
|
||||
multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
|
||||
sys_libdir="/lib/$multiarch"
|
||||
sys_usrlibdir="/usr/lib/$multiarch"
|
||||
|
||||
: > "$debian_dir/substvars"
|
||||
|
||||
mapfile -t ELF_FILES < <(
|
||||
find "$stage/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
|
||||
)
|
||||
|
||||
if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
|
||||
(
|
||||
cd "$workdir"
|
||||
dpkg-shlibdeps \
|
||||
-l"$stage/opt/v2rayN" \
|
||||
-l"$sys_libdir" \
|
||||
-l"$sys_usrlibdir" \
|
||||
-T"$debian_dir/substvars" \
|
||||
"${ELF_FILES[@]}"
|
||||
) >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
shlibs_depends="$(sed -n 's/^shlibs:Depends=//p' "$debian_dir/substvars" | head -n1 || true)"
|
||||
|
||||
if [[ -n "$shlibs_depends" ]]; then
|
||||
shlibs_depends="$(echo "$shlibs_depends" \
|
||||
| sed -E 's/ *\([^)]*\)//g' \
|
||||
| sed -E 's/ *, */, /g' \
|
||||
| sed -E 's/^, *//; s/, *$//')"
|
||||
final_depends="${shlibs_depends}, ${extra_depends}"
|
||||
else
|
||||
final_depends="${extra_depends}"
|
||||
fi
|
||||
|
||||
cat > "$debian_dir/control" <<EOF
|
||||
Package: v2rayn
|
||||
Version: ${VERSION}
|
||||
Architecture: ${deb_arch}
|
||||
Maintainer: 2dust <noreply@github.com>
|
||||
Homepage: https://github.com/2dust/v2rayN
|
||||
Section: net
|
||||
Priority: optional
|
||||
Depends: ${final_depends}
|
||||
Description: v2rayN (Avalonia) GUI client for Linux
|
||||
Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
|
||||
Shadowsocks / tuic / WireGuard.
|
||||
EOF
|
||||
|
||||
find "$stage/opt/v2rayN" -type d -exec chmod 0755 {} +
|
||||
find "$stage/opt/v2rayN" -type f -exec chmod 0644 {} +
|
||||
[[ -f "$stage/opt/v2rayN/v2rayN" ]] && chmod 0755 "$stage/opt/v2rayN/v2rayN" || true
|
||||
|
||||
deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
|
||||
dpkg-deb --root-owner-group --build "$stage" "$deb_out"
|
||||
|
||||
echo "Build done for $short. DEB at:"
|
||||
echo " $deb_out"
|
||||
BUILT_DEBS+=("$deb_out")
|
||||
}
|
||||
|
||||
select_targets() {
|
||||
printf '%s\n' loongarch64
|
||||
}
|
||||
|
||||
build_one_target() {
|
||||
local short="$1"
|
||||
local meta=()
|
||||
local rid=""
|
||||
local deb_arch=""
|
||||
|
||||
mapfile -t meta < <(describe_target "$short") || return 1
|
||||
rid="${meta[0]}"
|
||||
deb_arch="${meta[1]}"
|
||||
|
||||
echo "[*] Building for target: $short (RID=$rid, DEB arch=$deb_arch)"
|
||||
publish_binary "$rid"
|
||||
package_binary "$short" "$rid" "$deb_arch"
|
||||
}
|
||||
|
||||
print_summary() {
|
||||
local pkg=""
|
||||
|
||||
echo ""
|
||||
echo "================ Build Summary ================="
|
||||
if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
|
||||
echo "Output directory: $OUTPUT_DIR"
|
||||
for pkg in "${BUILT_DEBS[@]}"; do
|
||||
echo "$pkg"
|
||||
done
|
||||
else
|
||||
echo "No DEBs detected in summary (check build logs above)."
|
||||
fi
|
||||
echo "==============================================="
|
||||
}
|
||||
|
||||
main() {
|
||||
local targets=()
|
||||
local arch=""
|
||||
|
||||
parse_args "$@"
|
||||
detect_environment
|
||||
install_dependencies
|
||||
prepare_workspace
|
||||
resolve_version
|
||||
|
||||
mapfile -t targets < <(select_targets)
|
||||
|
||||
for arch in "${targets[@]}"; do
|
||||
build_one_target "$arch"
|
||||
done
|
||||
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
727
package-debian-riscv.sh
Normal file
727
package-debian-riscv.sh
Normal file
@@ -0,0 +1,727 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
BUILD_FROM=""
|
||||
XRAY_VER="${XRAY_VER:-}"
|
||||
SING_VER="${SING_VER:-}"
|
||||
|
||||
MIN_KERNEL="5.10"
|
||||
PKGROOT="v2rayN-publish"
|
||||
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||
OUTPUT_DIR="${HOME}/debbuild"
|
||||
DOTNET_RISCV_VERSION="10.0.109"
|
||||
DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download"
|
||||
DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
|
||||
DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"
|
||||
|
||||
OS_ID=""
|
||||
OS_NAME=""
|
||||
OS_VERSION_ID=""
|
||||
HOST_ARCH=""
|
||||
SCRIPT_DIR=""
|
||||
PROJECT=""
|
||||
VERSION=""
|
||||
|
||||
declare -a BUILT_DEBS=()
|
||||
|
||||
die() {
|
||||
echo "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
parse_args() {
|
||||
local first_arg="${1:-}"
|
||||
|
||||
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||
VERSION_ARG="$first_arg"
|
||||
shift || true
|
||||
fi
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||
--netcore) FORCE_NETCORE=1; shift ;;
|
||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||
*)
|
||||
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||
fi
|
||||
}
|
||||
|
||||
detect_environment() {
|
||||
local current_kernel=""
|
||||
local lowest=""
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
OS_ID="${ID:-}"
|
||||
OS_NAME="${NAME:-$OS_ID}"
|
||||
OS_VERSION_ID="${VERSION_ID:-}"
|
||||
HOST_ARCH="$(uname -m)"
|
||||
|
||||
case "$OS_ID" in
|
||||
debian)
|
||||
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||
;;
|
||||
*)
|
||||
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||
This script only supports: Debian."
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$HOST_ARCH" in
|
||||
riscv64) ;;
|
||||
*) die "Only supports riscv64" ;;
|
||||
esac
|
||||
|
||||
current_kernel="$(uname -r)"
|
||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||
|
||||
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||
echo "[OK] Kernel $current_kernel verified."
|
||||
}
|
||||
|
||||
install_dependencies() {
|
||||
local install_ok=0
|
||||
local tmp_dotnet=""
|
||||
|
||||
mkdir -p "$OUTPUT_DIR"
|
||||
|
||||
if command -v apt-get >/dev/null 2>&1; then
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install \
|
||||
curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
|
||||
desktop-file-utils xdg-utils wget gcc make pkg-config \
|
||||
libicu-dev libssl-dev libfontconfig1 libfreetype6 zlib1g
|
||||
|
||||
mkdir -p "$HOME/.dotnet"
|
||||
tmp_dotnet="$(mktemp -d)"
|
||||
curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_RISCV_FILE"
|
||||
tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_RISCV_FILE"
|
||||
rm -rf "$tmp_dotnet"
|
||||
|
||||
export PATH="$HOME/.dotnet:$PATH"
|
||||
export DOTNET_ROOT="$HOME/.dotnet"
|
||||
|
||||
dotnet --info >/dev/null 2>&1 && install_ok=1
|
||||
fi
|
||||
|
||||
if [[ "$install_ok" -ne 1 ]]; then
|
||||
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||
echo "dotnet-riscv SDK, curl, unzip, tar, rsync, git, gcc, make, dpkg-deb, fakeroot, libicu-dev, libssl-dev"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
prepare_workspace() {
|
||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
|
||||
PROJECT="$PROJECT_HINT"
|
||||
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||
}
|
||||
|
||||
choose_channel() {
|
||||
local ch="latest"
|
||||
local sel=""
|
||||
|
||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||
case "$BUILD_FROM" in
|
||||
1) echo "latest"; return 0 ;;
|
||||
2) echo "prerelease"; return 0 ;;
|
||||
3) echo "keep"; return 0 ;;
|
||||
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ -t 0 ]]; then
|
||||
echo "[?] Choose v2rayN release channel:" >&2
|
||||
echo " 1) Latest (stable) [default]" >&2
|
||||
echo " 2) Pre-release (preview)" >&2
|
||||
echo " 3) Keep current (do nothing)" >&2
|
||||
printf "Enter 1, 2 or 3 [default 1]: " >&2
|
||||
|
||||
if read -r sel </dev/tty; then
|
||||
case "${sel:-}" in
|
||||
2) ch="prerelease" ;;
|
||||
3) ch="keep" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$ch"
|
||||
}
|
||||
|
||||
get_latest_tag_latest() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
|
||||
| jq -re '.tag_name' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
get_latest_tag_prerelease() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
|
||||
| jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
sync_submodules() {
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
}
|
||||
|
||||
git_try_checkout() {
|
||||
local want="$1"
|
||||
local ref=""
|
||||
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
git fetch --tags --force --prune --depth=1 || true
|
||||
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||
|
||||
if [[ -n "$ref" ]]; then
|
||||
echo "[OK] Found ref '${ref}', checking out..."
|
||||
git checkout -f "$ref"
|
||||
sync_submodules
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
apply_channel_or_keep() {
|
||||
local ch="$1"
|
||||
local tag=""
|
||||
|
||||
if [[ "$ch" == "keep" ]]; then
|
||||
echo "[*] Keep current repository state (no checkout)."
|
||||
VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
|
||||
VERSION="${VERSION#v}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||
|
||||
case "$ch" in
|
||||
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||
esac
|
||||
|
||||
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||
|
||||
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||
VERSION="${tag#v}"
|
||||
}
|
||||
|
||||
resolve_version() {
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||
local clean_ver="${VERSION_ARG#v}"
|
||||
|
||||
if git_try_checkout "$clean_ver"; then
|
||||
VERSION="$clean_ver"
|
||||
else
|
||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
echo "Current directory is not a git repo; proceeding on current tree."
|
||||
VERSION="${VERSION_ARG:-0.0.0}"
|
||||
fi
|
||||
|
||||
VERSION="${VERSION#v}"
|
||||
echo "[*] GUI version resolved as: ${VERSION}"
|
||||
}
|
||||
|
||||
xray_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-riscv64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-riscv64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
singbox_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-riscv64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-riscv64.tar.gz" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
bundle_url_for_rid() {
|
||||
local rid="$1"
|
||||
|
||||
case "$rid" in
|
||||
linux-riscv64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-riscv64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
download_xray() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${XRAY_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download xray: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
download_singbox() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${SING_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local bin=""
|
||||
local cronet=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download sing-box: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
unify_geo_layout() {
|
||||
local outroot="$1"
|
||||
local n
|
||||
local names=(
|
||||
geosite.dat
|
||||
geoip.dat
|
||||
geoip-only-cn-private.dat
|
||||
Country.mmdb
|
||||
geoip.metadb
|
||||
)
|
||||
|
||||
mkdir -p "$outroot/bin"
|
||||
|
||||
for n in "${names[@]}"; do
|
||||
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
download_geo_assets() {
|
||||
local outroot="$1"
|
||||
local bin_dir="$outroot/bin"
|
||||
local srss_dir="$bin_dir/srss"
|
||||
local f=""
|
||||
|
||||
mkdir -p "$bin_dir" "$srss_dir"
|
||||
|
||||
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||
|
||||
echo "[+] Download sing-box rule DB & rule-sets"
|
||||
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||
|
||||
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||
done
|
||||
|
||||
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||
done
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
}
|
||||
|
||||
populate_assets_zip_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local nested_dir=""
|
||||
|
||||
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Try v2rayN bundle archive: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
if [[ -d "$tmp/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$tmp/bin/" "$outroot/bin/"
|
||||
else
|
||||
rsync -a "$tmp/" "$outroot/"
|
||||
fi
|
||||
|
||||
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||
|
||||
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$nested_dir/bin/" "$outroot/bin/"
|
||||
rm -rf "$nested_dir"
|
||||
fi
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
rm -rf "$tmp"
|
||||
|
||||
echo "[+] Bundle extracted to $outroot"
|
||||
}
|
||||
|
||||
populate_assets_netcore_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||
fi
|
||||
|
||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||
fi
|
||||
|
||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||
}
|
||||
|
||||
stage_runtime_assets() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||
echo "[*] Using v2rayN bundle archive."
|
||||
else
|
||||
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
else
|
||||
echo "[*] --netcore specified: use separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
}
|
||||
|
||||
describe_target() {
|
||||
local short="$1"
|
||||
|
||||
case "$short" in
|
||||
riscv64) printf '%s\n%s\n' "linux-riscv64" "riscv64" ;;
|
||||
*) echo "Unknown arch '$short' (use riscv64)" >&2; return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
publish_binary() {
|
||||
local rid="$1"
|
||||
|
||||
dotnet clean "$PROJECT" -c Release
|
||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
||||
dotnet restore "$PROJECT"
|
||||
dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
|
||||
}
|
||||
|
||||
write_launcher_file() {
|
||||
local stage="$1"
|
||||
|
||||
install -m 755 /dev/stdin "$stage/usr/bin/v2rayn" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
DIR="/opt/v2rayN"
|
||||
cd "$DIR"
|
||||
|
||||
if [[ -x "$DIR/v2rayN" ]]; then
|
||||
exec "$DIR/v2rayN" "$@"
|
||||
fi
|
||||
|
||||
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||
if [[ -f "$DIR/$dll" ]]; then
|
||||
exec /usr/bin/dotnet "$DIR/$dll" "$@"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "v2rayN launcher: no executable found in $DIR" >&2
|
||||
ls -l "$DIR" >&2 || true
|
||||
exit 1
|
||||
EOF
|
||||
}
|
||||
|
||||
write_desktop_file() {
|
||||
local stage="$1"
|
||||
|
||||
install -m 644 /dev/stdin "$stage/usr/share/applications/v2rayn.desktop" <<'EOF'
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=v2rayN
|
||||
Comment=v2rayN for Debian GNU Linux
|
||||
Exec=v2rayn
|
||||
Icon=v2rayn
|
||||
Terminal=false
|
||||
Categories=Network;
|
||||
EOF
|
||||
}
|
||||
|
||||
write_maintainer_scripts() {
|
||||
local debian_dir="$1"
|
||||
|
||||
install -m 755 /dev/stdin "$debian_dir/postinst" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||
fi
|
||||
exit 0
|
||||
EOF
|
||||
|
||||
install -m 755 /dev/stdin "$debian_dir/postrm" <<'EOF'
|
||||
#!/bin/sh
|
||||
set -e
|
||||
update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
|
||||
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
|
||||
gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
|
||||
fi
|
||||
exit 0
|
||||
EOF
|
||||
}
|
||||
|
||||
package_binary() {
|
||||
local short="$1"
|
||||
local rid="$2"
|
||||
local deb_arch="$3"
|
||||
local pubdir=""
|
||||
local workdir=""
|
||||
local stage=""
|
||||
local debian_dir=""
|
||||
local project_dir=""
|
||||
local icon_candidate=""
|
||||
local shlibs_depends=""
|
||||
local extra_depends=""
|
||||
local final_depends=""
|
||||
local multiarch=""
|
||||
local sys_libdir=""
|
||||
local sys_usrlibdir=""
|
||||
local deb_out=""
|
||||
|
||||
pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
|
||||
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||
|
||||
workdir="$(mktemp -d)"
|
||||
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||
|
||||
stage="$workdir/${PKGROOT}_${VERSION}_${deb_arch}"
|
||||
debian_dir="$stage/DEBIAN"
|
||||
|
||||
mkdir -p "$stage/opt/v2rayN" "$stage/usr/bin" "$stage/usr/share/applications" "$stage/usr/share/icons/hicolor/256x256/apps" "$debian_dir"
|
||||
cp -a "$pubdir/." "$stage/opt/v2rayN/"
|
||||
|
||||
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||
icon_candidate="$project_dir/v2rayN.png"
|
||||
[[ -f "$icon_candidate" ]] && cp "$icon_candidate" "$stage/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
|
||||
|
||||
stage_runtime_assets "$stage/opt/v2rayN" "$rid"
|
||||
write_launcher_file "$stage"
|
||||
write_desktop_file "$stage"
|
||||
write_maintainer_scripts "$debian_dir"
|
||||
|
||||
extra_depends="libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)"
|
||||
|
||||
mkdir -p "$workdir/debian"
|
||||
cat > "$workdir/debian/control" <<EOF
|
||||
Source: v2rayn
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: 2dust <noreply@github.com>
|
||||
Standards-Version: 4.7.0
|
||||
|
||||
Package: v2rayn
|
||||
Architecture: ${deb_arch}
|
||||
Description: v2rayN
|
||||
EOF
|
||||
|
||||
multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
|
||||
sys_libdir="/lib/$multiarch"
|
||||
sys_usrlibdir="/usr/lib/$multiarch"
|
||||
|
||||
: > "$debian_dir/substvars"
|
||||
|
||||
mapfile -t ELF_FILES < <(
|
||||
find "$stage/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
|
||||
)
|
||||
|
||||
if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
|
||||
(
|
||||
cd "$workdir"
|
||||
dpkg-shlibdeps \
|
||||
-l"$stage/opt/v2rayN" \
|
||||
-l"$sys_libdir" \
|
||||
-l"$sys_usrlibdir" \
|
||||
-T"$debian_dir/substvars" \
|
||||
"${ELF_FILES[@]}"
|
||||
) >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
shlibs_depends="$(sed -n 's/^shlibs:Depends=//p' "$debian_dir/substvars" | head -n1 || true)"
|
||||
|
||||
if [[ -n "$shlibs_depends" ]]; then
|
||||
shlibs_depends="$(echo "$shlibs_depends" \
|
||||
| sed -E 's/ *\([^)]*\)//g' \
|
||||
| sed -E 's/ *, */, /g' \
|
||||
| sed -E 's/^, *//; s/, *$//')"
|
||||
final_depends="${shlibs_depends}, ${extra_depends}"
|
||||
else
|
||||
final_depends="${extra_depends}"
|
||||
fi
|
||||
|
||||
cat > "$debian_dir/control" <<EOF
|
||||
Package: v2rayn
|
||||
Version: ${VERSION}
|
||||
Architecture: ${deb_arch}
|
||||
Maintainer: 2dust <noreply@github.com>
|
||||
Homepage: https://github.com/2dust/v2rayN
|
||||
Section: net
|
||||
Priority: optional
|
||||
Depends: ${final_depends}
|
||||
Description: v2rayN (Avalonia) GUI client for Linux
|
||||
Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
|
||||
Shadowsocks / tuic / WireGuard.
|
||||
EOF
|
||||
|
||||
find "$stage/opt/v2rayN" -type d -exec chmod 0755 {} +
|
||||
find "$stage/opt/v2rayN" -type f -exec chmod 0644 {} +
|
||||
[[ -f "$stage/opt/v2rayN/v2rayN" ]] && chmod 0755 "$stage/opt/v2rayN/v2rayN" || true
|
||||
|
||||
deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
|
||||
dpkg-deb --root-owner-group --build "$stage" "$deb_out"
|
||||
|
||||
echo "Build done for $short. DEB at:"
|
||||
echo " $deb_out"
|
||||
BUILT_DEBS+=("$deb_out")
|
||||
}
|
||||
|
||||
select_targets() {
|
||||
printf '%s\n' riscv64
|
||||
}
|
||||
|
||||
build_one_target() {
|
||||
local short="$1"
|
||||
local meta=()
|
||||
local rid=""
|
||||
local deb_arch=""
|
||||
|
||||
mapfile -t meta < <(describe_target "$short") || return 1
|
||||
rid="${meta[0]}"
|
||||
deb_arch="${meta[1]}"
|
||||
|
||||
echo "[*] Building for target: $short (RID=$rid, DEB arch=$deb_arch)"
|
||||
publish_binary "$rid"
|
||||
package_binary "$short" "$rid" "$deb_arch"
|
||||
}
|
||||
|
||||
print_summary() {
|
||||
local pkg=""
|
||||
|
||||
echo ""
|
||||
echo "================ Build Summary ================="
|
||||
if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
|
||||
echo "Output directory: $OUTPUT_DIR"
|
||||
for pkg in "${BUILT_DEBS[@]}"; do
|
||||
echo "$pkg"
|
||||
done
|
||||
else
|
||||
echo "No DEBs detected in summary (check build logs above)."
|
||||
fi
|
||||
echo "==============================================="
|
||||
}
|
||||
|
||||
main() {
|
||||
local targets=()
|
||||
local arch=""
|
||||
|
||||
parse_args "$@"
|
||||
detect_environment
|
||||
install_dependencies
|
||||
prepare_workspace
|
||||
resolve_version
|
||||
|
||||
mapfile -t targets < <(select_targets)
|
||||
|
||||
for arch in "${targets[@]}"; do
|
||||
build_one_target "$arch"
|
||||
done
|
||||
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -22,7 +22,17 @@ cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<string>en</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>zh-Hans</string>
|
||||
<string>zh-Hant</string>
|
||||
<string>en</string>
|
||||
<string>fa</string>
|
||||
<string>fr</string>
|
||||
<string>ru</string>
|
||||
<string>hu</string>
|
||||
</array>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>v2rayN</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
|
||||
709
package-rhel-loong.sh
Normal file
709
package-rhel-loong.sh
Normal file
@@ -0,0 +1,709 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
BUILD_FROM=""
|
||||
XRAY_VER="${XRAY_VER:-}"
|
||||
SING_VER="${SING_VER:-}"
|
||||
|
||||
MIN_KERNEL="5.10"
|
||||
PKGROOT="v2rayN-publish"
|
||||
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||
RPM_TOPDIR="${HOME}/rpmbuild"
|
||||
DOTNET_LOONGARCH_VERSION="10.0.109"
|
||||
DOTNET_LOONGARCH_TAG="v10.0.109-loongarch64"
|
||||
DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download"
|
||||
DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz"
|
||||
DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"
|
||||
|
||||
OS_ID=""
|
||||
OS_NAME=""
|
||||
OS_VERSION_ID=""
|
||||
HOST_ARCH=""
|
||||
SCRIPT_DIR=""
|
||||
PROJECT=""
|
||||
VERSION=""
|
||||
|
||||
declare -a BUILT_RPMS=()
|
||||
|
||||
die() {
|
||||
echo "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
parse_args() {
|
||||
local first_arg="${1:-}"
|
||||
|
||||
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||
VERSION_ARG="$first_arg"
|
||||
shift || true
|
||||
fi
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||
--netcore) FORCE_NETCORE=1; shift ;;
|
||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||
*)
|
||||
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||
fi
|
||||
}
|
||||
|
||||
detect_environment() {
|
||||
local current_kernel=""
|
||||
local lowest=""
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
OS_ID="${ID:-}"
|
||||
OS_NAME="${NAME:-$OS_ID}"
|
||||
OS_VERSION_ID="${VERSION_ID:-}"
|
||||
HOST_ARCH="$(uname -m)"
|
||||
|
||||
case "$OS_ID" in
|
||||
rhel|rocky|almalinux|fedora|centos)
|
||||
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||
;;
|
||||
*)
|
||||
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||
This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$HOST_ARCH" in
|
||||
loongarch64) ;;
|
||||
*) die "Only supports loongarch64" ;;
|
||||
esac
|
||||
|
||||
current_kernel="$(uname -r)"
|
||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||
|
||||
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||
echo "[OK] Kernel $current_kernel verified."
|
||||
}
|
||||
|
||||
install_dependencies() {
|
||||
local install_ok=0
|
||||
local tmp_dotnet=""
|
||||
|
||||
if command -v dnf >/dev/null 2>&1; then
|
||||
sudo dnf -y --nogpgcheck install \
|
||||
rpm-build rpmdevtools curl unzip tar jq rsync git python3 \
|
||||
glibc-devel kernel-headers libatomic file ca-certificates libicu \
|
||||
&& install_ok=1
|
||||
|
||||
mkdir -p "$HOME/.dotnet"
|
||||
tmp_dotnet="$(mktemp -d)"
|
||||
curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
|
||||
tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
|
||||
rm -rf "$tmp_dotnet"
|
||||
|
||||
export PATH="$HOME/.dotnet:$PATH"
|
||||
export DOTNET_ROOT="$HOME/.dotnet"
|
||||
|
||||
mkdir -p "$HOME/.nuget/NuGet"
|
||||
|
||||
cat > "$HOME/.nuget/NuGet/NuGet.Config" <<EOF
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="loongnix" value="https://lnuget.loongnix.cn/v3/index.json" allowInsecureConnections="true" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
EOF
|
||||
|
||||
dotnet --info >/dev/null 2>&1 || install_ok=0
|
||||
fi
|
||||
|
||||
if [[ "$install_ok" -ne 1 ]]; then
|
||||
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||
echo "dotnet-loongarch SDK, curl, unzip, tar, rsync, git, python3, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
prepare_workspace() {
|
||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
|
||||
PROJECT="$PROJECT_HINT"
|
||||
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||
}
|
||||
|
||||
choose_channel() {
|
||||
local ch="latest"
|
||||
local sel=""
|
||||
|
||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||
case "$BUILD_FROM" in
|
||||
1) echo "latest"; return 0 ;;
|
||||
2) echo "prerelease"; return 0 ;;
|
||||
3) echo "keep"; return 0 ;;
|
||||
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ -t 0 ]]; then
|
||||
echo "[?] Choose v2rayN release channel:" >&2
|
||||
echo " 1) Latest (stable) [default]" >&2
|
||||
echo " 2) Pre-release (preview)" >&2
|
||||
echo " 3) Keep current (do nothing)" >&2
|
||||
printf "Enter 1, 2 or 3 [default 1]: " >&2
|
||||
|
||||
if read -r sel </dev/tty; then
|
||||
case "${sel:-}" in
|
||||
2) ch="prerelease" ;;
|
||||
3) ch="keep" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$ch"
|
||||
}
|
||||
|
||||
get_latest_tag_latest() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
|
||||
| jq -re '.tag_name' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
get_latest_tag_prerelease() {
|
||||
curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
|
||||
| jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
sync_submodules() {
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
}
|
||||
|
||||
git_try_checkout() {
|
||||
local want="$1"
|
||||
local ref=""
|
||||
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
git fetch --tags --force --prune --depth=1 || true
|
||||
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||
|
||||
if [[ -n "$ref" ]]; then
|
||||
echo "[OK] Found ref '${ref}', checking out..."
|
||||
git checkout -f "$ref"
|
||||
sync_submodules
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
apply_channel_or_keep() {
|
||||
local ch="$1"
|
||||
local tag=""
|
||||
|
||||
if [[ "$ch" == "keep" ]]; then
|
||||
echo "[*] Keep current repository state (no checkout)."
|
||||
VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
|
||||
VERSION="${VERSION#v}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||
|
||||
case "$ch" in
|
||||
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||
esac
|
||||
|
||||
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||
|
||||
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||
VERSION="${tag#v}"
|
||||
}
|
||||
|
||||
resolve_version() {
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||
local clean_ver="${VERSION_ARG#v}"
|
||||
|
||||
if git_try_checkout "$clean_ver"; then
|
||||
VERSION="$clean_ver"
|
||||
else
|
||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
echo "Current directory is not a git repo; proceeding on current tree."
|
||||
VERSION="${VERSION_ARG:-0.0.0}"
|
||||
fi
|
||||
|
||||
VERSION="${VERSION#v}"
|
||||
echo "[*] GUI version resolved as: ${VERSION}"
|
||||
}
|
||||
|
||||
xray_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-loong64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
singbox_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-loong64.tar.gz" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
bundle_url_for_rid() {
|
||||
local rid="$1"
|
||||
|
||||
case "$rid" in
|
||||
linux-loongarch64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-loong64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
download_xray() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${XRAY_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download xray: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
download_singbox() {
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${SING_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local bin=""
|
||||
local cronet=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download sing-box: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
unify_geo_layout() {
|
||||
local outroot="$1"
|
||||
local n
|
||||
local names=(
|
||||
geosite.dat
|
||||
geoip.dat
|
||||
geoip-only-cn-private.dat
|
||||
Country.mmdb
|
||||
geoip.metadb
|
||||
)
|
||||
|
||||
mkdir -p "$outroot/bin"
|
||||
|
||||
for n in "${names[@]}"; do
|
||||
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
download_geo_assets() {
|
||||
local outroot="$1"
|
||||
local bin_dir="$outroot/bin"
|
||||
local srss_dir="$bin_dir/srss"
|
||||
local f=""
|
||||
|
||||
mkdir -p "$bin_dir" "$srss_dir"
|
||||
|
||||
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||
|
||||
echo "[+] Download sing-box rule DB & rule-sets"
|
||||
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||
|
||||
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||
done
|
||||
|
||||
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||
done
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
}
|
||||
|
||||
populate_assets_zip_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local nested_dir=""
|
||||
|
||||
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Try v2rayN bundle archive: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
if [[ -d "$tmp/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$tmp/bin/" "$outroot/bin/"
|
||||
else
|
||||
rsync -a "$tmp/" "$outroot/"
|
||||
fi
|
||||
|
||||
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||
|
||||
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
rsync -a "$nested_dir/bin/" "$outroot/bin/"
|
||||
rm -rf "$nested_dir"
|
||||
fi
|
||||
|
||||
unify_geo_layout "$outroot"
|
||||
rm -rf "$tmp"
|
||||
|
||||
echo "[+] Bundle extracted to $outroot"
|
||||
}
|
||||
|
||||
populate_assets_netcore_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||
fi
|
||||
|
||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||
fi
|
||||
|
||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||
}
|
||||
|
||||
stage_runtime_assets() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||
echo "[*] Using v2rayN bundle archive."
|
||||
else
|
||||
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
else
|
||||
echo "[*] --netcore specified: use separate core + rules."
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
}
|
||||
|
||||
describe_target() {
|
||||
local short="$1"
|
||||
|
||||
case "$short" in
|
||||
loongarch64) printf '%s\n%s\n%s\n' "linux-loongarch64" "loongarch64" "loongarch64" ;;
|
||||
*) echo "Unknown arch '$short' (use loongarch64)" >&2; return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
publish_binary() {
|
||||
local rid="$1"
|
||||
|
||||
dotnet clean "$PROJECT" -c Release
|
||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
||||
dotnet restore "$PROJECT"
|
||||
dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
|
||||
}
|
||||
|
||||
write_spec_file() {
|
||||
local specfile="$1"
|
||||
|
||||
cat > "$specfile" <<'SPEC'
|
||||
%global debug_package %{nil}
|
||||
%undefine _debuginfo_subpackages
|
||||
%undefine _debugsource_packages
|
||||
%global __requires_exclude ^liblttng-ust\.so\..*$
|
||||
|
||||
Name: v2rayN
|
||||
Version: __VERSION__
|
||||
Release: 1%{?dist}
|
||||
Summary: v2rayN (Avalonia) GUI client for Linux
|
||||
License: GPL-3.0-only
|
||||
URL: https://github.com/2dust/v2rayN
|
||||
BugURL: https://github.com/2dust/v2rayN/issues
|
||||
ExclusiveArch: loongarch64
|
||||
Source0: __PKGROOT__.tar.gz
|
||||
|
||||
Requires: cairo, pango, openssl, mesa-libEGL, mesa-libGL
|
||||
Requires: glibc >= 2.34
|
||||
Requires: fontconfig >= 2.13.1
|
||||
Requires: desktop-file-utils >= 0.26
|
||||
Requires: xdg-utils >= 1.1.3
|
||||
Requires: coreutils >= 8.32
|
||||
Requires: bash >= 5.1
|
||||
Requires: freetype >= 2.10
|
||||
|
||||
%description
|
||||
v2rayN Linux for Red Hat Enterprise Linux
|
||||
Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard
|
||||
Support Red Hat Enterprise Linux / Fedora Linux / Rocky Linux / AlmaLinux / CentOS
|
||||
For more information, Please visit our website
|
||||
https://github.com/2dust/v2rayN
|
||||
|
||||
%prep
|
||||
%setup -q -n __PKGROOT__
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
install -dm0755 %{buildroot}/opt/v2rayN
|
||||
cp -a * %{buildroot}/opt/v2rayN/
|
||||
|
||||
find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
|
||||
find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
|
||||
[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
|
||||
|
||||
install -dm0755 %{buildroot}%{_bindir}
|
||||
install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
|
||||
#!/usr/bin/bash
|
||||
set -euo pipefail
|
||||
DIR="/opt/v2rayN"
|
||||
|
||||
if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
|
||||
|
||||
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||
if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
|
||||
done
|
||||
|
||||
echo "v2rayN launcher: no executable found in $DIR" >&2
|
||||
ls -l "$DIR" >&2 || true
|
||||
exit 1
|
||||
EOF
|
||||
|
||||
install -dm0755 %{buildroot}%{_datadir}/applications
|
||||
install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=v2rayN
|
||||
Comment=v2rayN for Red Hat Enterprise Linux
|
||||
Exec=v2rayn
|
||||
Icon=v2rayn
|
||||
Terminal=false
|
||||
Categories=Network;
|
||||
EOF
|
||||
|
||||
install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
|
||||
install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||
|
||||
%post
|
||||
/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
|
||||
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
|
||||
|
||||
%postun
|
||||
/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
|
||||
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
|
||||
|
||||
%files
|
||||
%{_bindir}/v2rayn
|
||||
/opt/v2rayN
|
||||
%{_datadir}/applications/v2rayn.desktop
|
||||
%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||
SPEC
|
||||
|
||||
sed -i "s/__VERSION__/${VERSION}/g" "$specfile"
|
||||
sed -i "s/__PKGROOT__/${PKGROOT}/g" "$specfile"
|
||||
}
|
||||
|
||||
package_binary() {
|
||||
local short="$1"
|
||||
local rid="$2"
|
||||
local rpm_target="$3"
|
||||
local archdir="$4"
|
||||
local pubdir=""
|
||||
local workdir=""
|
||||
local specfile=""
|
||||
local sourcedir=""
|
||||
local specdir=""
|
||||
local project_dir=""
|
||||
local icon_candidate=""
|
||||
local f=""
|
||||
|
||||
pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
|
||||
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||
|
||||
workdir="$(mktemp -d)"
|
||||
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||
|
||||
mkdir -p "$workdir/$PKGROOT"
|
||||
cp -a "$pubdir/." "$workdir/$PKGROOT/"
|
||||
|
||||
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||
icon_candidate="$project_dir/v2rayN.png"
|
||||
[[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; }
|
||||
cp "$icon_candidate" "$workdir/$PKGROOT/v2rayn.png"
|
||||
|
||||
stage_runtime_assets "$workdir/$PKGROOT" "$rid"
|
||||
|
||||
rpmdev-setuptree
|
||||
sourcedir="${RPM_TOPDIR}/SOURCES"
|
||||
specdir="${RPM_TOPDIR}/SPECS"
|
||||
specfile="${specdir}/v2rayN.spec"
|
||||
|
||||
mkdir -p "$sourcedir" "$specdir"
|
||||
tar -C "$workdir" -czf "$sourcedir/$PKGROOT.tar.gz" "$PKGROOT"
|
||||
|
||||
write_spec_file "$specfile"
|
||||
rpmbuild -ba "$specfile" --target "$rpm_target"
|
||||
|
||||
echo "Build done for $short. RPM at:"
|
||||
for f in "${RPM_TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
|
||||
[[ -e "$f" ]] || continue
|
||||
echo " $f"
|
||||
BUILT_RPMS+=("$f")
|
||||
done
|
||||
}
|
||||
|
||||
select_targets() {
|
||||
printf '%s\n' loongarch64
|
||||
}
|
||||
|
||||
build_one_target() {
|
||||
local short="$1"
|
||||
local meta=()
|
||||
local rid=""
|
||||
local rpm_target=""
|
||||
local archdir=""
|
||||
|
||||
mapfile -t meta < <(describe_target "$short") || return 1
|
||||
rid="${meta[0]}"
|
||||
rpm_target="${meta[1]}"
|
||||
archdir="${meta[2]}"
|
||||
|
||||
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
|
||||
publish_binary "$rid"
|
||||
package_binary "$short" "$rid" "$rpm_target" "$archdir"
|
||||
}
|
||||
|
||||
print_summary() {
|
||||
local rp=""
|
||||
|
||||
echo ""
|
||||
echo "================ Build Summary ================"
|
||||
if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
|
||||
for rp in "${BUILT_RPMS[@]}"; do
|
||||
echo "$rp"
|
||||
done
|
||||
else
|
||||
echo "No RPMs detected in summary (check build logs above)."
|
||||
fi
|
||||
echo "=============================================="
|
||||
}
|
||||
|
||||
main() {
|
||||
local targets=()
|
||||
local arch=""
|
||||
|
||||
parse_args "$@"
|
||||
detect_environment
|
||||
install_dependencies
|
||||
prepare_workspace
|
||||
resolve_version
|
||||
|
||||
mapfile -t targets < <(select_targets)
|
||||
|
||||
for arch in "${targets[@]}"; do
|
||||
build_one_target "$arch"
|
||||
done
|
||||
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
File diff suppressed because it is too large
Load Diff
745
package-rhel.sh
745
package-rhel.sh
@@ -1,115 +1,138 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Require Red Hat base branch
|
||||
. /etc/os-release
|
||||
VERSION_ARG=""
|
||||
WITH_CORE="both"
|
||||
FORCE_NETCORE=0
|
||||
ARCH_OVERRIDE=""
|
||||
BUILD_FROM=""
|
||||
XRAY_VER="${XRAY_VER:-}"
|
||||
SING_VER="${SING_VER:-}"
|
||||
|
||||
case "${ID:-}" in
|
||||
rhel|rocky|almalinux|fedora|centos)
|
||||
echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
|
||||
echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
MIN_KERNEL="6.12"
|
||||
PKGROOT="v2rayN-publish"
|
||||
PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||
RPM_TOPDIR="${HOME}/rpmbuild"
|
||||
|
||||
# Kernel version
|
||||
MIN_KERNEL="6.11"
|
||||
CURRENT_KERNEL="$(uname -r)"
|
||||
OS_ID=""
|
||||
OS_NAME=""
|
||||
OS_VERSION_ID=""
|
||||
HOST_ARCH=""
|
||||
SCRIPT_DIR=""
|
||||
PROJECT=""
|
||||
VERSION=""
|
||||
BUILT_ALL=0
|
||||
|
||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
|
||||
declare -a BUILT_RPMS=()
|
||||
|
||||
if [[ "$lowest" != "$MIN_KERNEL" ]]; then
|
||||
echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[OK] Kernel $CURRENT_KERNEL verified."
|
||||
|
||||
# Config & Parse arguments
|
||||
VERSION_ARG="${1:-}" # Pass version number like 7.13.8, or leave empty
|
||||
WITH_CORE="both" # Default: bundle both xray+sing-box
|
||||
FORCE_NETCORE=0 # --netcore => skip archive bundle, use separate downloads
|
||||
ARCH_OVERRIDE="" # --arch x64|arm64|all (optional compile target)
|
||||
BUILD_FROM="" # --buildfrom 1|2|3 to select channel non-interactively
|
||||
|
||||
# If the first argument starts with --, do not treat it as a version number
|
||||
if [[ "${VERSION_ARG:-}" == --* ]]; then
|
||||
VERSION_ARG=""
|
||||
fi
|
||||
# Take the first non --* argument as version, discard it
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
|
||||
|
||||
# Parse remaining optional arguments
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--with-core) WITH_CORE="${2:-both}"; shift 2;;
|
||||
--xray-ver) XRAY_VER="${2:-}"; shift 2;;
|
||||
--singbox-ver) SING_VER="${2:-}"; shift 2;;
|
||||
--netcore) FORCE_NETCORE=1; shift;;
|
||||
--arch) ARCH_OVERRIDE="${2:-}"; shift 2;;
|
||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2;;
|
||||
*)
|
||||
if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
|
||||
shift;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Conflict: version number AND --buildfrom cannot be used together
|
||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||
echo "You cannot specify both an explicit version and --buildfrom at the same time."
|
||||
echo " Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||
die() {
|
||||
echo "$*" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Check and install dependencies
|
||||
host_arch="$(uname -m)"
|
||||
[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
|
||||
parse_args() {
|
||||
local first_arg="${1:-}"
|
||||
|
||||
install_ok=0
|
||||
|
||||
if command -v dnf >/dev/null 2>&1; then
|
||||
sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-8.0 \
|
||||
&& install_ok=1
|
||||
fi
|
||||
|
||||
if [[ "$install_ok" -ne 1 ]]; then
|
||||
echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
|
||||
echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
|
||||
fi
|
||||
|
||||
# Root directory
|
||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
# Git submodules (best effort)
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
|
||||
# Locate project
|
||||
PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
|
||||
if [[ ! -f "$PROJECT" ]]; then
|
||||
PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||
fi
|
||||
[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
|
||||
|
||||
choose_channel() {
|
||||
# If --buildfrom provided, map it directly and skip interaction.
|
||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||
case "$BUILD_FROM" in
|
||||
1) echo "latest"; return 0;;
|
||||
2) echo "prerelease"; return 0;;
|
||||
3) echo "keep"; return 0;;
|
||||
*) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
|
||||
esac
|
||||
if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
|
||||
VERSION_ARG="$first_arg"
|
||||
shift || true
|
||||
fi
|
||||
|
||||
# Print menu to stderr and read from /dev/tty so stdout only carries the token.
|
||||
local ch="latest" sel=""
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--with-core) WITH_CORE="${2:-both}"; shift 2 ;;
|
||||
--xray-ver) XRAY_VER="${2:-}"; shift 2 ;;
|
||||
--singbox-ver) SING_VER="${2:-}"; shift 2 ;;
|
||||
--netcore) FORCE_NETCORE=1; shift ;;
|
||||
--arch) ARCH_OVERRIDE="${2:-}"; shift 2 ;;
|
||||
--buildfrom) BUILD_FROM="${2:-}"; shift 2 ;;
|
||||
*)
|
||||
[[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
|
||||
die "You cannot specify both an explicit version and --buildfrom at the same time.
|
||||
Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
|
||||
fi
|
||||
}
|
||||
|
||||
detect_environment() {
|
||||
local current_kernel=""
|
||||
local lowest=""
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
OS_ID="${ID:-}"
|
||||
OS_NAME="${NAME:-$OS_ID}"
|
||||
OS_VERSION_ID="${VERSION_ID:-}"
|
||||
HOST_ARCH="$(uname -m)"
|
||||
|
||||
case "$OS_ID" in
|
||||
rhel|rocky|almalinux|fedora|centos)
|
||||
echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
|
||||
;;
|
||||
*)
|
||||
die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
|
||||
This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$HOST_ARCH" in
|
||||
x86_64|aarch64) ;;
|
||||
*) die "Only supports aarch64 / x86_64" ;;
|
||||
esac
|
||||
|
||||
current_kernel="$(uname -r)"
|
||||
lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
|
||||
|
||||
[[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
|
||||
echo "[OK] Kernel $current_kernel verified."
|
||||
}
|
||||
|
||||
install_dependencies() {
|
||||
local install_ok=0
|
||||
|
||||
if command -v dnf >/dev/null 2>&1; then
|
||||
sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-10.0 \
|
||||
&& install_ok=1
|
||||
fi
|
||||
|
||||
if [[ "$install_ok" -ne 1 ]]; then
|
||||
echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
|
||||
echo "dotnet-sdk 10.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
prepare_workspace() {
|
||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
|
||||
PROJECT="$PROJECT_HINT"
|
||||
[[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
|
||||
[[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
|
||||
}
|
||||
|
||||
choose_channel() {
|
||||
local ch="latest"
|
||||
local sel=""
|
||||
|
||||
if [[ -n "${BUILD_FROM:-}" ]]; then
|
||||
case "$BUILD_FROM" in
|
||||
1) echo "latest"; return 0 ;;
|
||||
2) echo "prerelease"; return 0 ;;
|
||||
3) echo "keep"; return 0 ;;
|
||||
*) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ -t 0 ]]; then
|
||||
echo "[?] Choose v2rayN release channel:" >&2
|
||||
@@ -141,29 +164,35 @@ get_latest_tag_prerelease() {
|
||||
| sed 's/^v//'
|
||||
}
|
||||
|
||||
sync_submodules() {
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
}
|
||||
|
||||
git_try_checkout() {
|
||||
# Try a series of refs and checkout when found.
|
||||
local want="$1" ref=""
|
||||
local want="$1"
|
||||
local ref=""
|
||||
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
git fetch --tags --force --prune --depth=1 || true
|
||||
if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
|
||||
ref="${want}"
|
||||
fi
|
||||
git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
|
||||
|
||||
if [[ -n "$ref" ]]; then
|
||||
echo "[OK] Found ref '${ref}', checking out..."
|
||||
git checkout -f "${ref}"
|
||||
if [[ -f .gitmodules ]]; then
|
||||
git submodule sync --recursive || true
|
||||
git submodule update --init --recursive || true
|
||||
fi
|
||||
git checkout -f "$ref"
|
||||
sync_submodules
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
apply_channel_or_keep() {
|
||||
local ch="$1" tag
|
||||
local ch="$1"
|
||||
local tag=""
|
||||
|
||||
if [[ "$ch" == "keep" ]]; then
|
||||
echo "[*] Keep current repository state (no checkout)."
|
||||
@@ -173,102 +202,154 @@ apply_channel_or_keep() {
|
||||
fi
|
||||
|
||||
echo "[*] Resolving ${ch} tag from GitHub releases..."
|
||||
if [[ "$ch" == "prerelease" ]]; then
|
||||
tag="$(get_latest_tag_prerelease || true)"
|
||||
else
|
||||
tag="$(get_latest_tag_latest || true)"
|
||||
fi
|
||||
|
||||
[[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
|
||||
case "$ch" in
|
||||
latest) tag="$(get_latest_tag_latest || true)" ;;
|
||||
prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
|
||||
*) die "Failed to resolve latest tag for channel '${ch}'." ;;
|
||||
esac
|
||||
|
||||
[[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
|
||||
|
||||
echo "[*] Latest tag for '${ch}': ${tag}"
|
||||
git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
|
||||
git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
|
||||
VERSION="${tag#v}"
|
||||
}
|
||||
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||
clean_ver="${VERSION_ARG#v}"
|
||||
if git_try_checkout "$clean_ver"; then
|
||||
VERSION="$clean_ver"
|
||||
resolve_version() {
|
||||
if git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
if [[ -n "${VERSION_ARG:-}" ]]; then
|
||||
local clean_ver="${VERSION_ARG#v}"
|
||||
|
||||
if git_try_checkout "$clean_ver"; then
|
||||
VERSION="$clean_ver"
|
||||
else
|
||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
echo "[WARN] Tag '${VERSION_ARG}' not found."
|
||||
ch="$(choose_channel)"
|
||||
apply_channel_or_keep "$ch"
|
||||
apply_channel_or_keep "$(choose_channel)"
|
||||
fi
|
||||
else
|
||||
ch="$(choose_channel)"
|
||||
apply_channel_or_keep "$ch"
|
||||
echo "Current directory is not a git repo; proceeding on current tree."
|
||||
VERSION="${VERSION_ARG:-0.0.0}"
|
||||
fi
|
||||
else
|
||||
echo "Current directory is not a git repo; proceeding on current tree."
|
||||
VERSION="${VERSION_ARG:-0.0.0}"
|
||||
fi
|
||||
|
||||
VERSION="${VERSION#v}"
|
||||
echo "[*] GUI version resolved as: ${VERSION}"
|
||||
VERSION="${VERSION#v}"
|
||||
echo "[*] GUI version resolved as: ${VERSION}"
|
||||
}
|
||||
|
||||
xray_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-x64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip" ;;
|
||||
linux-arm64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
singbox_url_for_rid() {
|
||||
local rid="$1"
|
||||
local ver="$2"
|
||||
|
||||
case "$rid" in
|
||||
linux-x64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz" ;;
|
||||
linux-arm64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
bundle_url_for_rid() {
|
||||
local rid="$1"
|
||||
|
||||
case "$rid" in
|
||||
linux-x64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip" ;;
|
||||
linux-arm64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Helpers for core
|
||||
download_xray() {
|
||||
# Download Xray core
|
||||
local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${XRAY_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
|
||||
if [[ "$rid" == "linux-arm64" ]]; then
|
||||
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
|
||||
else
|
||||
url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
|
||||
fi
|
||||
url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download xray: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/$zipname"
|
||||
unzip -q "$tmp/$zipname" -d "$tmp"
|
||||
install -m 755 "$tmp/xray" "$outdir/xray"
|
||||
curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
|
||||
install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
download_singbox() {
|
||||
# Download sing-box
|
||||
local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
|
||||
local outdir="$1"
|
||||
local rid="$2"
|
||||
local ver="${SING_VER:-}"
|
||||
local url=""
|
||||
local tmp=""
|
||||
local bin=""
|
||||
local cronet=""
|
||||
|
||||
mkdir -p "$outdir"
|
||||
|
||||
if [[ -z "$ver" ]]; then
|
||||
ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
|
||||
| grep -Eo '"tag_name":\s*"v[^"]+"' \
|
||||
| sed -E 's/.*"v([^"]+)".*/\1/' \
|
||||
| head -n1)" || true
|
||||
fi
|
||||
|
||||
[[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
|
||||
if [[ "$rid" == "linux-arm64" ]]; then
|
||||
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
|
||||
else
|
||||
url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
|
||||
fi
|
||||
url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Download sing-box: $url"
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/$tarname"
|
||||
tar -C "$tmp" -xzf "$tmp/$tarname"
|
||||
curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
|
||||
[[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
|
||||
install -m 755 "$bin" "$outdir/sing-box"
|
||||
|
||||
install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
|
||||
|
||||
cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
|
||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
|
||||
[[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
|
||||
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
# Move geo files to outroot/bin
|
||||
unify_geo_layout() {
|
||||
local outroot="$1"
|
||||
mkdir -p "$outroot/bin"
|
||||
local names=( \
|
||||
"geosite.dat" \
|
||||
"geoip.dat" \
|
||||
"geoip-only-cn-private.dat" \
|
||||
"Country.mmdb" \
|
||||
"geoip.metadb" \
|
||||
local n
|
||||
local names=(
|
||||
geosite.dat
|
||||
geoip.dat
|
||||
geoip-only-cn-private.dat
|
||||
Country.mmdb
|
||||
geoip.metadb
|
||||
)
|
||||
|
||||
mkdir -p "$outroot/bin"
|
||||
|
||||
for n in "${names[@]}"; do
|
||||
if [[ -f "$outroot/bin/xray/$n" ]]; then
|
||||
mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
|
||||
@@ -276,58 +357,48 @@ unify_geo_layout() {
|
||||
done
|
||||
}
|
||||
|
||||
# Download geo/rule assets
|
||||
download_geo_assets() {
|
||||
local outroot="$1"
|
||||
local bin_dir="$outroot/bin"
|
||||
local srss_dir="$bin_dir/srss"
|
||||
local f=""
|
||||
|
||||
mkdir -p "$bin_dir" "$srss_dir"
|
||||
|
||||
echo "[+] Download Xray Geo to ${bin_dir}"
|
||||
curl -fsSL -o "$bin_dir/geosite.dat" \
|
||||
"https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip.dat" \
|
||||
"https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
|
||||
"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||
curl -fsSL -o "$bin_dir/Country.mmdb" \
|
||||
"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||
curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
|
||||
curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
|
||||
curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
|
||||
|
||||
echo "[+] Download sing-box rule DB & rule-sets"
|
||||
curl -fsSL -o "$bin_dir/geoip.metadb" \
|
||||
"https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
|
||||
curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb"
|
||||
|
||||
for f in \
|
||||
geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
|
||||
geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" \
|
||||
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
|
||||
for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
|
||||
done
|
||||
for f in \
|
||||
geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
|
||||
geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" \
|
||||
"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
|
||||
|
||||
for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
|
||||
curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
|
||||
done
|
||||
|
||||
# Unify to bin
|
||||
unify_geo_layout "$outroot"
|
||||
}
|
||||
|
||||
# Prefer the prebuilt v2rayN core bundle; then unify geo layout
|
||||
download_v2rayn_bundle() {
|
||||
local outroot="$1" rid="$2"
|
||||
populate_assets_zip_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
local url=""
|
||||
if [[ "$rid" == "linux-arm64" ]]; then
|
||||
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
|
||||
else
|
||||
url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
|
||||
fi
|
||||
local tmp=""
|
||||
local nested_dir=""
|
||||
|
||||
url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
|
||||
|
||||
echo "[+] Try v2rayN bundle archive: $url"
|
||||
local tmp zipname
|
||||
tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
|
||||
curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
|
||||
unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
|
||||
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
|
||||
unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
|
||||
|
||||
if [[ -d "$tmp/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
@@ -339,7 +410,6 @@ download_v2rayn_bundle() {
|
||||
rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
|
||||
find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
|
||||
|
||||
local nested_dir
|
||||
nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
|
||||
if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
|
||||
mkdir -p "$outroot/bin"
|
||||
@@ -347,122 +417,86 @@ download_v2rayn_bundle() {
|
||||
rm -rf "$nested_dir"
|
||||
fi
|
||||
|
||||
# Unify to bin/
|
||||
unify_geo_layout "$outroot"
|
||||
rm -rf "$tmp"
|
||||
|
||||
echo "[+] Bundle extracted to $outroot"
|
||||
}
|
||||
|
||||
# ===== Build results collection for --arch all ========================================
|
||||
BUILT_RPMS=() # Will collect absolute paths of built RPMs
|
||||
BUILT_ALL=0 # Flag to know if we should print the final summary
|
||||
populate_assets_netcore_mode() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
# ===== Build (single-arch) function ====================================================
|
||||
build_for_arch() {
|
||||
# $1: target short arch: x64 | arm64
|
||||
local short="$1"
|
||||
local rid rpm_target archdir
|
||||
case "$short" in
|
||||
x64) rid="linux-x64"; rpm_target="x86_64"; archdir="x86_64" ;;
|
||||
arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
|
||||
*) echo "Unknown arch '$short' (use x64|arm64)"; return 1;;
|
||||
esac
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
|
||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||
download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
|
||||
fi
|
||||
|
||||
# .NET publish (self-contained) for this RID
|
||||
dotnet clean "$PROJECT" -c Release
|
||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
|
||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||
download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
|
||||
fi
|
||||
|
||||
dotnet restore "$PROJECT"
|
||||
dotnet publish "$PROJECT" \
|
||||
-c Release -r "$rid" \
|
||||
-p:PublishSingleFile=false \
|
||||
-p:SelfContained=true
|
||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||
}
|
||||
|
||||
# Per-arch variables (scoped)
|
||||
local RID_DIR="$rid"
|
||||
local PUBDIR
|
||||
PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
|
||||
[[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
|
||||
stage_runtime_assets() {
|
||||
local outroot="$1"
|
||||
local rid="$2"
|
||||
|
||||
# Per-arch working area
|
||||
local PKGROOT="v2rayN-publish"
|
||||
local WORKDIR
|
||||
WORKDIR="$(mktemp -d)"
|
||||
trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
|
||||
|
||||
# rpmbuild topdir selection
|
||||
local TOPDIR SPECDIR SOURCEDIR
|
||||
rpmdev-setuptree
|
||||
TOPDIR="${HOME}/rpmbuild"
|
||||
SPECDIR="${TOPDIR}/SPECS"
|
||||
SOURCEDIR="${TOPDIR}/SOURCES"
|
||||
|
||||
# Stage publish content
|
||||
mkdir -p "$WORKDIR/$PKGROOT"
|
||||
cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
|
||||
|
||||
# Required icon
|
||||
local ICON_CANDIDATE
|
||||
PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||
ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
|
||||
[[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
|
||||
cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
|
||||
|
||||
# Prepare bin structure
|
||||
mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
|
||||
|
||||
# Bundle / cores per-arch
|
||||
fetch_separate_cores_and_rules() {
|
||||
local outroot="$1"
|
||||
|
||||
if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
|
||||
download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
|
||||
fi
|
||||
if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
|
||||
download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
|
||||
fi
|
||||
download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
|
||||
}
|
||||
mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
|
||||
|
||||
if [[ "$FORCE_NETCORE" -eq 0 ]]; then
|
||||
if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
|
||||
if populate_assets_zip_mode "$outroot" "$rid"; then
|
||||
echo "[*] Using v2rayN bundle archive."
|
||||
else
|
||||
echo "[*] Bundle failed, fallback to separate core + rules."
|
||||
fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
else
|
||||
echo "[*] --netcore specified: use separate core + rules."
|
||||
fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
|
||||
populate_assets_netcore_mode "$outroot" "$rid"
|
||||
fi
|
||||
}
|
||||
|
||||
# Tarball
|
||||
mkdir -p "$SOURCEDIR"
|
||||
tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
|
||||
describe_target() {
|
||||
local short="$1"
|
||||
|
||||
# SPEC
|
||||
local SPECFILE="$SPECDIR/v2rayN.spec"
|
||||
mkdir -p "$SPECDIR"
|
||||
cat > "$SPECFILE" <<'SPEC'
|
||||
case "$short" in
|
||||
x64) printf '%s\n%s\n%s\n' "linux-x64" "x86_64" "x86_64" ;;
|
||||
arm64) printf '%s\n%s\n%s\n' "linux-arm64" "aarch64" "aarch64" ;;
|
||||
*) echo "Unknown arch '$short' (use x64|arm64)" >&2; return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
publish_binary() {
|
||||
local rid="$1"
|
||||
|
||||
dotnet clean "$PROJECT" -c Release
|
||||
rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
|
||||
dotnet restore "$PROJECT"
|
||||
dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
|
||||
}
|
||||
|
||||
write_spec_file() {
|
||||
local specfile="$1"
|
||||
|
||||
cat > "$specfile" <<'SPEC'
|
||||
%global debug_package %{nil}
|
||||
%undefine _debuginfo_subpackages
|
||||
%undefine _debugsource_packages
|
||||
# Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
|
||||
%global __requires_exclude ^liblttng-ust\.so\..*$
|
||||
|
||||
Name: v2rayN
|
||||
Version: __VERSION__
|
||||
Release: 1%{?dist}
|
||||
Summary: v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
|
||||
Summary: v2rayN (Avalonia) GUI client for Linux
|
||||
License: GPL-3.0-only
|
||||
URL: https://github.com/2dust/v2rayN
|
||||
BugURL: https://github.com/2dust/v2rayN/issues
|
||||
ExclusiveArch: aarch64 x86_64
|
||||
Source0: __PKGROOT__.tar.gz
|
||||
|
||||
# Runtime dependencies (Avalonia / X11 / Fonts / GL)
|
||||
Requires: cairo, pango, openssl, mesa-libEGL, mesa-libGL
|
||||
Requires: glibc >= 2.34
|
||||
Requires: fontconfig >= 2.13.1
|
||||
@@ -483,28 +517,23 @@ https://github.com/2dust/v2rayN
|
||||
%setup -q -n __PKGROOT__
|
||||
|
||||
%build
|
||||
# no build
|
||||
|
||||
%install
|
||||
install -dm0755 %{buildroot}/opt/v2rayN
|
||||
cp -a * %{buildroot}/opt/v2rayN/
|
||||
|
||||
# Normalize permissions
|
||||
find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
|
||||
find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
|
||||
[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
|
||||
|
||||
# Launcher (prefer native ELF first, then DLL fallback)
|
||||
install -dm0755 %{buildroot}%{_bindir}
|
||||
install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
|
||||
#!/usr/bin/bash
|
||||
set -euo pipefail
|
||||
DIR="/opt/v2rayN"
|
||||
|
||||
# Prefer native apphost
|
||||
if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
|
||||
|
||||
# DLL fallback
|
||||
for dll in v2rayN.Desktop.dll v2rayN.dll; do
|
||||
if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
|
||||
done
|
||||
@@ -514,7 +543,6 @@ ls -l "$DIR" >&2 || true
|
||||
exit 1
|
||||
EOF
|
||||
|
||||
# Desktop file
|
||||
install -dm0755 %{buildroot}%{_datadir}/applications
|
||||
install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
|
||||
[Desktop Entry]
|
||||
@@ -527,7 +555,6 @@ Terminal=false
|
||||
Categories=Network;
|
||||
EOF
|
||||
|
||||
# Icon
|
||||
install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
|
||||
install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||
|
||||
@@ -546,45 +573,129 @@ install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons
|
||||
%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
|
||||
SPEC
|
||||
|
||||
# Replace placeholders
|
||||
sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
|
||||
sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
|
||||
sed -i "s/__VERSION__/${VERSION}/g" "$specfile"
|
||||
sed -i "s/__PKGROOT__/${PKGROOT}/g" "$specfile"
|
||||
}
|
||||
|
||||
# Build RPM for this arch
|
||||
rpmbuild -ba "$SPECFILE" --target "$rpm_target"
|
||||
package_binary() {
|
||||
local short="$1"
|
||||
local rid="$2"
|
||||
local rpm_target="$3"
|
||||
local archdir="$4"
|
||||
local pubdir=""
|
||||
local workdir=""
|
||||
local specfile=""
|
||||
local sourcedir=""
|
||||
local specdir=""
|
||||
local project_dir=""
|
||||
local icon_candidate=""
|
||||
local f=""
|
||||
|
||||
pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
|
||||
[[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
|
||||
|
||||
workdir="$(mktemp -d)"
|
||||
trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
|
||||
|
||||
mkdir -p "$workdir/$PKGROOT"
|
||||
cp -a "$pubdir/." "$workdir/$PKGROOT/"
|
||||
|
||||
project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
|
||||
icon_candidate="$project_dir/v2rayN.png"
|
||||
[[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; }
|
||||
cp "$icon_candidate" "$workdir/$PKGROOT/v2rayn.png"
|
||||
|
||||
stage_runtime_assets "$workdir/$PKGROOT" "$rid"
|
||||
|
||||
rpmdev-setuptree
|
||||
sourcedir="${RPM_TOPDIR}/SOURCES"
|
||||
specdir="${RPM_TOPDIR}/SPECS"
|
||||
specfile="${specdir}/v2rayN.spec"
|
||||
|
||||
mkdir -p "$sourcedir" "$specdir"
|
||||
tar -C "$workdir" -czf "$sourcedir/$PKGROOT.tar.gz" "$PKGROOT"
|
||||
|
||||
write_spec_file "$specfile"
|
||||
rpmbuild -ba "$specfile" --target "$rpm_target"
|
||||
|
||||
echo "Build done for $short. RPM at:"
|
||||
local f
|
||||
for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
|
||||
for f in "${RPM_TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
|
||||
[[ -e "$f" ]] || continue
|
||||
echo " $f"
|
||||
BUILT_RPMS+=("$f")
|
||||
done
|
||||
}
|
||||
|
||||
# ===== Arch selection and build orchestration =========================================
|
||||
case "${ARCH_OVERRIDE:-}" in
|
||||
all) targets=(x64 arm64); BUILT_ALL=1 ;;
|
||||
x64|amd64) targets=(x64) ;;
|
||||
arm64|aarch64) targets=(arm64) ;;
|
||||
"") targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
|
||||
*) echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
|
||||
esac
|
||||
select_targets() {
|
||||
case "${ARCH_OVERRIDE:-}" in
|
||||
all) printf '%s\n' x64 arm64 ;;
|
||||
x64|amd64) printf '%s\n' x64 ;;
|
||||
arm64|aarch64) printf '%s\n' arm64 ;;
|
||||
"")
|
||||
case "$HOST_ARCH" in
|
||||
x86_64) printf '%s\n' x64 ;;
|
||||
aarch64) printf '%s\n' arm64 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all." >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
for arch in "${targets[@]}"; do
|
||||
build_for_arch "$arch"
|
||||
done
|
||||
build_one_target() {
|
||||
local short="$1"
|
||||
local meta=()
|
||||
local rid=""
|
||||
local rpm_target=""
|
||||
local archdir=""
|
||||
|
||||
# Print Both arches information
|
||||
if [[ "$BUILT_ALL" -eq 1 ]]; then
|
||||
echo ""
|
||||
echo "================ Build Summary (both architectures) ================"
|
||||
if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
|
||||
for rp in "${BUILT_RPMS[@]}"; do
|
||||
echo "$rp"
|
||||
done
|
||||
else
|
||||
echo "No RPMs detected in summary (check build logs above)."
|
||||
mapfile -t meta < <(describe_target "$short") || return 1
|
||||
rid="${meta[0]}"
|
||||
rpm_target="${meta[1]}"
|
||||
archdir="${meta[2]}"
|
||||
|
||||
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
|
||||
publish_binary "$rid"
|
||||
package_binary "$short" "$rid" "$rpm_target" "$archdir"
|
||||
}
|
||||
|
||||
print_summary() {
|
||||
if [[ "$BUILT_ALL" -eq 1 ]]; then
|
||||
local rp=""
|
||||
echo ""
|
||||
echo "================ Build Summary (both architectures) ================"
|
||||
if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
|
||||
for rp in "${BUILT_RPMS[@]}"; do
|
||||
echo "$rp"
|
||||
done
|
||||
else
|
||||
echo "No RPMs detected in summary (check build logs above)."
|
||||
fi
|
||||
echo "===================================================================="
|
||||
fi
|
||||
echo "===================================================================="
|
||||
fi
|
||||
}
|
||||
|
||||
main() {
|
||||
local targets=()
|
||||
local arch=""
|
||||
|
||||
parse_args "$@"
|
||||
detect_environment
|
||||
install_dependencies
|
||||
prepare_workspace
|
||||
resolve_version
|
||||
|
||||
mapfile -t targets < <(select_targets)
|
||||
[[ "${ARCH_OVERRIDE:-}" == "all" ]] && BUILT_ALL=1 || BUILT_ALL=0
|
||||
|
||||
for arch in "${targets[@]}"; do
|
||||
build_one_target "$arch"
|
||||
done
|
||||
|
||||
print_summary
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<Version>7.21.3</Version>
|
||||
<Version>7.23.2</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
|
||||
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
|
||||
<NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058;IDE0053;IDE0200</NoWarn>
|
||||
<Nullable>annotations</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Authors>2dust</Authors>
|
||||
|
||||
@@ -7,30 +7,33 @@
|
||||
<ItemGroup>
|
||||
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
|
||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
|
||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.18" />
|
||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.18" />
|
||||
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
|
||||
<PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
|
||||
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
|
||||
<PackageVersion Include="CliWrap" Version="3.10.1" />
|
||||
<PackageVersion Include="Downloader" Version="5.2.0" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
|
||||
<PackageVersion Include="IPNetwork2" Version="4.3.0" />
|
||||
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.13" />
|
||||
<PackageVersion Include="CliWrap" Version="3.10.2" />
|
||||
<PackageVersion Include="Downloader" Version="5.9.0" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
|
||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
|
||||
<PackageVersion Include="MaterialDesignThemes" Version="5.3.1" />
|
||||
<PackageVersion Include="MaterialDesignThemes" Version="5.3.2" />
|
||||
<PackageVersion Include="QRCoder" Version="1.8.0" />
|
||||
<PackageVersion Include="ReactiveUI" Version="23.2.1" />
|
||||
<PackageVersion Include="ReactiveUI" Version="23.2.28" />
|
||||
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
|
||||
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.1" />
|
||||
<PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
|
||||
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" />
|
||||
<PackageVersion Include="Semi.Avalonia" Version="11.3.14" />
|
||||
<PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
|
||||
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
|
||||
<PackageVersion Include="NLog" Version="6.1.2" />
|
||||
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
||||
<PackageVersion Include="NLog" Version="6.1.3" />
|
||||
<PackageVersion Include="sqlite-net-e" Version="1.11.0" />
|
||||
<PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.3" />
|
||||
<PackageVersion Include="TaskScheduler" Version="2.12.2" />
|
||||
<PackageVersion Include="WebDav.Client" Version="2.9.0" />
|
||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
||||
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
||||
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
|
||||
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
|
||||
<PackageVersion Include="YamlDotNet" Version="18.0.0" />
|
||||
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.22" />
|
||||
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
Submodule v2rayN/GlobalHotKeys updated: 488f1e69ea...569a95bb0f
@@ -99,7 +99,8 @@ public class CoreConfigContextBuilderTests
|
||||
{
|
||||
return message.Contains("cycle dependency", StringComparison.OrdinalIgnoreCase)
|
||||
|| message.Contains("循环依赖", StringComparison.Ordinal)
|
||||
|| message.Contains("循環依賴", StringComparison.Ordinal);
|
||||
|| message.Contains("循環依賴", StringComparison.Ordinal)
|
||||
|| message.Contains("циклическую зависимость", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private static async Task UpsertProfilesAsync(params ProfileItem[] profiles)
|
||||
|
||||
@@ -17,7 +17,7 @@ internal static class CoreConfigTestFactory
|
||||
{
|
||||
return new Config
|
||||
{
|
||||
CoreBasicItem = new CoreBasicItem { Loglevel = "warning", MuxEnabled = false },
|
||||
CoreBasicItem = new CoreBasicItem { Loglevel = "warning" },
|
||||
TunModeItem = new TunModeItem { EnableTun = false, IcmpRouting = "default" },
|
||||
KcpItem = new KcpItem(),
|
||||
GrpcItem = new GrpcItem(),
|
||||
@@ -187,7 +187,7 @@ internal static class CoreConfigTestFactory
|
||||
SimpleDnsItem = config.SimpleDNSItem,
|
||||
AllProxiesMap = new Dictionary<string, ProfileItem> { [node.IndexId] = node },
|
||||
FullConfigTemplate = null,
|
||||
IsTunEnabled = false,
|
||||
IsTunEnabled = config.TunModeItem.EnableTun,
|
||||
ProtectDomainList = [],
|
||||
};
|
||||
}
|
||||
@@ -206,4 +206,12 @@ internal static class CoreConfigTestFactory
|
||||
config.SimpleDNSItem.BootstrapDNS = bootstrapDns;
|
||||
return config;
|
||||
}
|
||||
|
||||
public static Config CreateConfigWithTunRouteExcludeAddress(ECoreType coreType)
|
||||
{
|
||||
var config = CreateConfig(coreType);
|
||||
config.TunModeItem.EnableTun = true;
|
||||
config.TunModeItem.RouteExcludeAddress = ["10.0.0.1/32", "192.168.1.0/24", "fc00::/7"];
|
||||
return config;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
using AwesomeAssertions;
|
||||
using ServiceLib.Common;
|
||||
using ServiceLib.Enums;
|
||||
using ServiceLib.Handler.Fmt;
|
||||
using ServiceLib.Manager;
|
||||
using ServiceLib.Models;
|
||||
using ServiceLib.Models.Dto;
|
||||
using ServiceLib.Services.CoreConfig;
|
||||
using Xunit;
|
||||
|
||||
@@ -554,7 +556,40 @@ public class CoreConfigSingboxServiceTests
|
||||
|
||||
cfg.dns.servers.Should().Contain(s => s.tag == "remote" && s.type == "udp" && s.server == "8.8.8.8");
|
||||
cfg.dns.servers.Should().Contain(s => s.tag == Global.SingboxLocalDNSTag);
|
||||
cfg.dns.rules.Should().Contain(r => r.clash_mode == ERuleMode.Global.ToString());
|
||||
cfg.dns.rules.Should().Contain(r => r.clash_mode == ERuleMode.Direct.ToString());
|
||||
cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Global));
|
||||
cfg.dns.rules.Should().Contain(r => r.clash_mode == nameof(ERuleMode.Direct));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GenerateClientConfigContent_Hysteria2Realm_ShouldEmitHttpsServerUrl()
|
||||
{
|
||||
var shareLink =
|
||||
"hysteria2+realm://public@realm.hy2.io/my-realm-id?auth=uuid&stun=turn.cloudflare.com%3A3478&sni=cloudflare.com&pinSHA256=xxx#Realm-Test";
|
||||
var node = Hysteria2Fmt.ResolveRealm(shareLink, out _);
|
||||
node.Should().NotBeNull();
|
||||
node!.CoreType = ECoreType.sing_box;
|
||||
|
||||
var config = CoreConfigTestFactory.CreateConfig(ECoreType.sing_box);
|
||||
config.CoreTypeItem =
|
||||
[
|
||||
new CoreTypeItem { ConfigType = EConfigType.Hysteria2, CoreType = ECoreType.sing_box }
|
||||
];
|
||||
CoreConfigTestFactory.BindAppManagerConfig(config);
|
||||
var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.sing_box);
|
||||
|
||||
var result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
|
||||
|
||||
result.Success.Should().BeTrue($"ret msg: {result.Msg}");
|
||||
var cfg = JsonUtils.Deserialize<SingboxConfig>(result.Data!.ToString())!;
|
||||
var proxy = cfg.outbounds.First(o => o.tag == Global.ProxyTag);
|
||||
|
||||
proxy.type.Should().Be("hysteria2");
|
||||
proxy.realm.Should().NotBeNull();
|
||||
proxy.realm!.server_url.Should().StartWith("https://");
|
||||
proxy.realm.server_url.Should().Contain("realm.hy2.io");
|
||||
proxy.realm.token.Should().Be("public");
|
||||
proxy.realm.realm_id.Should().Be("my-realm-id");
|
||||
proxy.realm.stun_servers.Should().Contain("turn.cloudflare.com:3478");
|
||||
proxy.server.Should().BeNull();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -536,4 +536,27 @@ public class CoreConfigV2rayServiceTests
|
||||
directOutbound.Should().NotBeNull();
|
||||
directOutbound!.settings.domainStrategy.Should().Be("UseIPv4");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GenerateClientConfigContent_TunRouteExcludeAddress()
|
||||
{
|
||||
var config = CoreConfigTestFactory.CreateConfigWithTunRouteExcludeAddress(ECoreType.Xray);
|
||||
CoreConfigTestFactory.BindAppManagerConfig(config);
|
||||
|
||||
var node = CoreConfigTestFactory.CreateVmessNode(ECoreType.Xray, "n-main", "main");
|
||||
var context = CoreConfigTestFactory.CreateContext(config, node, ECoreType.Xray);
|
||||
|
||||
var result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
|
||||
|
||||
result.Success.Should().BeTrue();
|
||||
|
||||
var cfg = JsonUtils.Deserialize<V2rayConfig>(result.Data!.ToString())!;
|
||||
var tunInbound = cfg.inbounds.FirstOrDefault(i => i.protocol == "tun");
|
||||
|
||||
tunInbound.Should().NotBeNull();
|
||||
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().NotContain("0.0.0.0/0");
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.0/32");
|
||||
tunInbound!.settings.autoSystemRoutingTable.Should().Contain("10.0.0.2/31");
|
||||
}
|
||||
}
|
||||
|
||||
91
v2rayN/ServiceLib.Tests/Fmt/HyRealmTests.cs
Normal file
91
v2rayN/ServiceLib.Tests/Fmt/HyRealmTests.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using AwesomeAssertions;
|
||||
using ServiceLib.Handler.Fmt;
|
||||
using ServiceLib.Models.Dto;
|
||||
using Xunit;
|
||||
|
||||
namespace ServiceLib.Tests.Fmt;
|
||||
|
||||
public class HyRealmTests
|
||||
{
|
||||
[Fact]
|
||||
public void TryParse_ShouldParseValidRealm()
|
||||
{
|
||||
var str = "realm://public@realm.hy2.io/57f9be7c-2810-4f5b-8cb9-260bc84d6c90?stun=example.stun:3478&stun=example2.stun:3478";
|
||||
var result = HyRealm.TryParse(str, out var realm);
|
||||
result.Should().BeTrue();
|
||||
realm.Should().NotBeNull();
|
||||
|
||||
realm.IsHttp.Should().BeFalse();
|
||||
realm.Token.Should().Be("public");
|
||||
realm.RendezvousHost.Should().Be("realm.hy2.io");
|
||||
realm.RendezvousPort.Should().Be(443);
|
||||
realm.RealmName.Should().Be("57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
|
||||
realm.StunList.Should().HaveCount(2);
|
||||
realm.StunList.Should().Contain("example.stun:3478");
|
||||
realm.StunList.Should().Contain("example2.stun:3478");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ToUri_ShouldGenerateValidUri()
|
||||
{
|
||||
var realm = new HyRealm(
|
||||
IsHttp: false,
|
||||
Token: "public",
|
||||
RendezvousHost: "realm.hy2.io",
|
||||
RendezvousPort: 443,
|
||||
RealmName: "57f9be7c-2810-4f5b-8cb9-260bc84d6c90",
|
||||
StunList: ["example.stun:3478", "example2.stun:3478"]
|
||||
);
|
||||
var uri = realm.ToUri();
|
||||
uri.Should().Contain("realm://public@realm.hy2.io");
|
||||
uri.Should().Contain("/57f9be7c-2810-4f5b-8cb9-260bc84d6c90");
|
||||
uri.Should().Contain("stun=example.stun:3478");
|
||||
uri.Should().Contain("stun=example2.stun:3478");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetShareUriAndResolveConfig_Hy2Realm_ShouldRoundTripBasicFields()
|
||||
{
|
||||
var str = "hysteria2+realm://mytoken@rendezvous.example.com/my-cabin-1f3a8c2e9b?auth=your_password&insecure=1&pinSHA256=deadbeef#remark";
|
||||
var resolved = Hysteria2Fmt.ResolveRealm(str, out var msg);
|
||||
resolved.Should().NotBeNull();
|
||||
resolved.Password.Should().Be("your_password");
|
||||
var result = HyRealm.TryParse(resolved.GetProtocolExtra().Hy2RealmUrl, out var realm);
|
||||
result.Should().BeTrue();
|
||||
realm.Should().NotBeNull();
|
||||
realm.Token.Should().Be("mytoken");
|
||||
|
||||
// To uri
|
||||
var uri = Hysteria2Fmt.ToUri(resolved);
|
||||
uri.Should().Contain("hysteria2+realm://mytoken@rendezvous.example.com");
|
||||
uri.Should().EndWith("#remark");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ToServerUrl_ShouldIncludeSchemeForSingbox()
|
||||
{
|
||||
var realm = new HyRealm(
|
||||
IsHttp: false,
|
||||
Token: "public",
|
||||
RendezvousHost: "realm.hy2.io",
|
||||
RendezvousPort: 443,
|
||||
RealmName: "my-realm-id",
|
||||
StunList: ["turn.cloudflare.com:3478"]
|
||||
);
|
||||
|
||||
realm.ToServerUrl().Should().Be("https://realm.hy2.io:443");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ResolveRealm_Issue9635_ShouldProduceHttpsServerUrl()
|
||||
{
|
||||
var str = "hysteria2+realm://public@realm.hy2.io/my-realm-id?auth=uuid&stun=turn.cloudflare.com%3A3478&sni=cloudflare.com&pinSHA256=xxx#Realm-Test";
|
||||
var resolved = Hysteria2Fmt.ResolveRealm(str, out _);
|
||||
resolved.Should().NotBeNull();
|
||||
|
||||
HyRealm.TryParse(resolved!.GetProtocolExtra().Hy2RealmUrl, out var realm).Should().BeTrue();
|
||||
realm!.ToServerUrl().Should().StartWith("https://");
|
||||
realm.ToServerUrl().Should().Contain("realm.hy2.io");
|
||||
realm.StunList.Should().Contain("turn.cloudflare.com:3478");
|
||||
}
|
||||
}
|
||||
40
v2rayN/ServiceLib.Tests/GlobalUsings.cs
Normal file
40
v2rayN/ServiceLib.Tests/GlobalUsings.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
global using System.Collections.Concurrent;
|
||||
global using System.Diagnostics;
|
||||
global using System.Net;
|
||||
global using System.Net.NetworkInformation;
|
||||
global using System.Net.Sockets;
|
||||
global using System.Reactive;
|
||||
global using System.Reactive.Disposables;
|
||||
global using System.Reactive.Linq;
|
||||
global using System.Reflection;
|
||||
global using System.Runtime.InteropServices;
|
||||
global using System.Security.Cryptography;
|
||||
global using System.Text;
|
||||
global using System.Text.Encodings.Web;
|
||||
global using System.Text.Json;
|
||||
global using System.Text.Json.Nodes;
|
||||
global using System.Text.Json.Serialization;
|
||||
global using System.Text.RegularExpressions;
|
||||
global using DynamicData;
|
||||
global using DynamicData.Binding;
|
||||
global using ReactiveUI;
|
||||
global using ReactiveUI.Fody.Helpers;
|
||||
global using ServiceLib.Base;
|
||||
global using ServiceLib.Common;
|
||||
global using ServiceLib.Enums;
|
||||
global using ServiceLib.Events;
|
||||
global using ServiceLib.Handler;
|
||||
global using ServiceLib.Handler.Builder;
|
||||
global using ServiceLib.Handler.Fmt;
|
||||
global using ServiceLib.Handler.SysProxy;
|
||||
global using ServiceLib.Helper;
|
||||
global using ServiceLib.Manager;
|
||||
global using ServiceLib.Models.CoreConfigs;
|
||||
global using ServiceLib.Models.Configs;
|
||||
global using ServiceLib.Models.Dto;
|
||||
global using ServiceLib.Models.Entities;
|
||||
global using ServiceLib.Resx;
|
||||
global using ServiceLib.Services;
|
||||
global using ServiceLib.Services.CoreConfig;
|
||||
global using ServiceLib.Services.Statistics;
|
||||
global using SQLite;
|
||||
92
v2rayN/ServiceLib/Common/CountryExtension.cs
Normal file
92
v2rayN/ServiceLib/Common/CountryExtension.cs
Normal file
@@ -0,0 +1,92 @@
|
||||
namespace ServiceLib.Common;
|
||||
|
||||
/// <summary>
|
||||
/// Extension methods for country code utilities
|
||||
/// </summary>
|
||||
public static class CountryExtension
|
||||
{
|
||||
/// <summary>
|
||||
/// Country code to emoji flag mapping for common countries
|
||||
/// </summary>
|
||||
private static readonly Dictionary<string, string> CountryEmojiMap = new(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
// Asia
|
||||
{ "CN", "🇨🇳" }, // China
|
||||
{ "HK", "🇭🇰" }, // Hong Kong
|
||||
{ "TW", "🇹🇼" }, // Taiwan
|
||||
{ "JP", "🇯🇵" }, // Japan
|
||||
{ "SG", "🇸🇬" }, // Singapore
|
||||
{ "KR", "🇰🇷" }, // South Korea
|
||||
{ "TH", "🇹🇭" }, // Thailand
|
||||
{ "VN", "🇻🇳" }, // Vietnam
|
||||
{ "ID", "🇮🇩" }, // Indonesia
|
||||
{ "PH", "🇵🇭" }, // Philippines
|
||||
{ "MY", "🇲🇾" }, // Malaysia
|
||||
{ "IN", "🇮🇳" }, // India
|
||||
{ "PK", "🇵🇰" }, // Pakistan
|
||||
{ "BD", "🇧🇩" }, // Bangladesh
|
||||
{ "LK", "🇱🇰" }, // Sri Lanka
|
||||
{ "KH", "🇰🇭" }, // Cambodia
|
||||
{ "LA", "🇱🇦" }, // Laos
|
||||
{ "MM", "🇲🇲" }, // Myanmar
|
||||
|
||||
// Americas
|
||||
{ "US", "🇺🇸" }, // United States
|
||||
{ "CA", "🇨🇦" }, // Canada
|
||||
{ "MX", "🇲🇽" }, // Mexico
|
||||
{ "BR", "🇧🇷" }, // Brazil
|
||||
{ "AR", "🇦🇷" }, // Argentina
|
||||
{ "CL", "🇨🇱" }, // Chile
|
||||
{ "CO", "🇨🇴" }, // Colombia
|
||||
|
||||
// Europe
|
||||
{ "GB", "🇬🇧" }, // United Kingdom
|
||||
{ "DE", "🇩🇪" }, // Germany
|
||||
{ "FR", "🇫🇷" }, // France
|
||||
{ "IT", "🇮🇹" }, // Italy
|
||||
{ "ES", "🇪🇸" }, // Spain
|
||||
{ "RU", "🇷🇺" }, // Russia
|
||||
{ "NL", "🇳🇱" }, // Netherlands
|
||||
{ "CH", "🇨🇭" }, // Switzerland
|
||||
{ "SE", "🇸🇪" }, // Sweden
|
||||
{ "NO", "🇳🇴" }, // Norway
|
||||
{ "DK", "🇩🇰" }, // Denmark
|
||||
{ "FI", "🇫🇮" }, // Finland
|
||||
{ "PL", "🇵🇱" }, // Poland
|
||||
{ "CZ", "🇨🇿" }, // Czech Republic
|
||||
{ "AT", "🇦🇹" }, // Austria
|
||||
{ "GR", "🇬🇷" }, // Greece
|
||||
{ "PT", "🇵🇹" }, // Portugal
|
||||
{ "TR", "🇹🇷" }, // Turkey
|
||||
{ "UA", "🇺🇦" }, // Ukraine
|
||||
{ "RO", "🇷🇴" }, // Romania
|
||||
|
||||
// Middle East & Central Asia
|
||||
{ "AE", "🇦🇪" }, // United Arab Emirates
|
||||
{ "SA", "🇸🇦" }, // Saudi Arabia
|
||||
{ "IL", "🇮🇱" }, // Israel
|
||||
{ "KZ", "🇰🇿" }, // Kazakhstan
|
||||
|
||||
// Oceania
|
||||
{ "AU", "🇦🇺" }, // Australia
|
||||
{ "NZ", "🇳🇿" }, // New Zealand
|
||||
|
||||
// Africa
|
||||
{ "ZA", "🇿🇦" }, // South Africa
|
||||
{ "EG", "🇪🇬" }, // Egypt
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Converts country code to flag emoji using predefined mapping
|
||||
/// Example: "US" -> "🇺🇸", "CN" -> "🇨🇳"
|
||||
/// </summary>
|
||||
public static string? CountryToEmoji(this string? countryCode)
|
||||
{
|
||||
if (countryCode.IsNullOrEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return CountryEmojiMap.GetValueOrDefault(countryCode);
|
||||
}
|
||||
}
|
||||
@@ -47,7 +47,7 @@ public static class Extension
|
||||
|
||||
public static string TrimEx(this string? value)
|
||||
{
|
||||
return value == null ? string.Empty : value.Trim();
|
||||
return value?.Trim() ?? string.Empty;
|
||||
}
|
||||
|
||||
public static string RemovePrefix(this string value, char prefix)
|
||||
@@ -118,4 +118,20 @@ public static class Extension
|
||||
destination.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Replace all cross-platform newline characters with the specified string
|
||||
/// </summary>
|
||||
public static string ReplaceLineBreaks(this string input, string replacement)
|
||||
{
|
||||
if (string.IsNullOrEmpty(input))
|
||||
{
|
||||
return input;
|
||||
}
|
||||
|
||||
// You must replace \r\n first, and then replace the single characters \r and \n.
|
||||
return input.Replace("\r\n", replacement)
|
||||
.Replace("\r", replacement)
|
||||
.Replace("\n", replacement);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +202,7 @@ public static class FileUtils
|
||||
}
|
||||
}
|
||||
|
||||
public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
|
||||
public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine, string? contains = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -214,6 +214,10 @@ public static class FileUtils
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (contains.IsNotEmpty() && !file.Name.Contains(contains))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
file.Delete();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class Utils
|
||||
|
||||
try
|
||||
{
|
||||
str = str.Replace(Environment.NewLine, string.Empty);
|
||||
str = str.ReplaceLineBreaks(string.Empty);
|
||||
return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -114,9 +114,7 @@ public class Utils
|
||||
}
|
||||
|
||||
plainText = plainText.Trim()
|
||||
.Replace(Environment.NewLine, "")
|
||||
.Replace("\n", "")
|
||||
.Replace("\r", "")
|
||||
.ReplaceLineBreaks("")
|
||||
.Replace('_', '/')
|
||||
.Replace('-', '+')
|
||||
.Replace(" ", "");
|
||||
@@ -321,7 +319,32 @@ public class Utils
|
||||
return text;
|
||||
}
|
||||
|
||||
return text.Replace(",", ",").Replace(Environment.NewLine, ",");
|
||||
return text.Replace(",", ",")
|
||||
.Replace(" ", "")
|
||||
.ReplaceLineBreaks(",");
|
||||
}
|
||||
|
||||
public static string ParseProcess(string text)
|
||||
{
|
||||
if (text.IsNullOrEmpty())
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
if (text.StartsWith('"'))
|
||||
{
|
||||
text = text[1..];
|
||||
}
|
||||
if (text.EndsWith('"'))
|
||||
{
|
||||
text = text[..^1];
|
||||
}
|
||||
return List2String(text.Replace(",", ",")
|
||||
.Replace("\\", "/")
|
||||
.ReplaceLineBreaks(",")
|
||||
.Split(',', StringSplitOptions.RemoveEmptyEntries)
|
||||
.Select(x => x.TrimEx())
|
||||
.Where(x => x.IsNotEmpty())
|
||||
.ToList());
|
||||
}
|
||||
|
||||
public static List<string> GetEnumNames<TEnum>() where TEnum : Enum
|
||||
@@ -576,6 +599,58 @@ public class Utils
|
||||
}
|
||||
}
|
||||
|
||||
public static bool TryParseRange(string? input, int min, int max, out int from, out int to)
|
||||
{
|
||||
from = to = 0;
|
||||
if (string.IsNullOrWhiteSpace(input))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
var parts = input.Split('-');
|
||||
if (parts.Length == 1)
|
||||
{
|
||||
if (!int.TryParse(parts[0], out from))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
to = from;
|
||||
return from >= min && to <= max;
|
||||
}
|
||||
if (parts.Length != 2
|
||||
|| !int.TryParse(parts[0], out from)
|
||||
|| !int.TryParse(parts[1], out to))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return from >= min && to <= max && from <= to;
|
||||
}
|
||||
|
||||
public static bool TryParseMaxSplit(string? input, int min, int max, out int from, out int to)
|
||||
{
|
||||
from = to = 0;
|
||||
if (string.IsNullOrWhiteSpace(input))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
var parts = input.Split('-');
|
||||
if (parts.Length == 1)
|
||||
{
|
||||
if (!int.TryParse(parts[0], out from))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
to = from;
|
||||
return from >= min && to <= max;
|
||||
}
|
||||
if (parts.Length != 2
|
||||
|| !int.TryParse(parts[0], out from)
|
||||
|| !int.TryParse(parts[1], out to))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return from >= min && to <= max && from <= to;
|
||||
}
|
||||
|
||||
public static bool IsPrivateNetwork(string ip)
|
||||
{
|
||||
if (IPAddress.TryParse(ip, out var address))
|
||||
@@ -716,6 +791,24 @@ public class Utils
|
||||
return (endpoints, connections);
|
||||
}
|
||||
|
||||
public static bool IsLocalIP(string ipAddress)
|
||||
{
|
||||
if (!IPAddress.TryParse(ipAddress, out var targetAddress))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return NetworkInterface.GetAllNetworkInterfaces()
|
||||
.SelectMany(ni => ni.GetIPProperties().UnicastAddresses)
|
||||
.Any(ua => ua.Address.Equals(targetAddress));
|
||||
}
|
||||
|
||||
public static bool ContainsInterfaceName(string inInterfaceName)
|
||||
{
|
||||
return NetworkInterface.GetAllNetworkInterfaces()
|
||||
.Any(ni => ni.Name.Equals(inInterfaceName, StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
|
||||
#endregion Speed Test
|
||||
|
||||
#region Miscellaneous
|
||||
@@ -864,15 +957,25 @@ public class Utils
|
||||
|
||||
public static Dictionary<string, string> GetSystemHosts()
|
||||
{
|
||||
var hosts = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts");
|
||||
var hostsIcs = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts.ics");
|
||||
|
||||
foreach (var (key, value) in hostsIcs)
|
||||
if (IsWindows())
|
||||
{
|
||||
hosts[key] = value;
|
||||
var hosts = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts");
|
||||
var hostsIcs = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts.ics");
|
||||
|
||||
foreach (var (key, value) in hostsIcs)
|
||||
{
|
||||
hosts[key] = value;
|
||||
}
|
||||
|
||||
return hosts;
|
||||
}
|
||||
|
||||
return hosts;
|
||||
if (IsLinux() || IsMacOS())
|
||||
{
|
||||
return GetSystemHosts("/etc/hosts");
|
||||
}
|
||||
|
||||
return new Dictionary<string, string>();
|
||||
}
|
||||
|
||||
public static async Task<string?> GetCliWrapOutput(string filePath, string? arg)
|
||||
@@ -1114,12 +1217,16 @@ public class Utils
|
||||
|
||||
#region Platform
|
||||
|
||||
[SupportedOSPlatformGuard("windows")]
|
||||
public static bool IsWindows() => OperatingSystem.IsWindows();
|
||||
|
||||
[SupportedOSPlatformGuard("linux")]
|
||||
public static bool IsLinux() => OperatingSystem.IsLinux();
|
||||
|
||||
[SupportedOSPlatformGuard("macos")]
|
||||
public static bool IsMacOS() => OperatingSystem.IsMacOS();
|
||||
|
||||
[UnsupportedOSPlatformGuard("windows")]
|
||||
public static bool IsNonWindows() => !OperatingSystem.IsWindows();
|
||||
|
||||
public static string GetExeName(string name)
|
||||
@@ -1214,6 +1321,16 @@ public class Utils
|
||||
}
|
||||
|
||||
public static bool SetUnixFileMode(string? fileName)
|
||||
{
|
||||
if (IsWindows())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return SetUnixFileModeInternal(fileName);
|
||||
}
|
||||
|
||||
[UnsupportedOSPlatform("windows")]
|
||||
private static bool SetUnixFileModeInternal(string? fileName)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@ using Microsoft.Win32;
|
||||
|
||||
namespace ServiceLib.Common;
|
||||
|
||||
[SupportedOSPlatform("windows")]
|
||||
internal static class WindowsUtils
|
||||
{
|
||||
private static readonly string _tag = "WindowsUtils";
|
||||
|
||||
@@ -12,6 +12,7 @@ public enum EServerColName
|
||||
SubRemarks,
|
||||
DelayVal,
|
||||
SpeedVal,
|
||||
IpInfo,
|
||||
|
||||
TodayDown,
|
||||
TodayUp,
|
||||
|
||||
@@ -7,6 +7,7 @@ public static class AppEvents
|
||||
public static readonly EventChannel<Unit> AddServerViaScanRequested = new();
|
||||
public static readonly EventChannel<Unit> AddServerViaClipboardRequested = new();
|
||||
public static readonly EventChannel<bool> SubscriptionsUpdateRequested = new();
|
||||
public static readonly EventChannel<bool> HasUpdateNotified = new();
|
||||
|
||||
public static readonly EventChannel<Unit> ProfilesRefreshRequested = new();
|
||||
public static readonly EventChannel<Unit> SubscriptionsRefreshRequested = new();
|
||||
|
||||
@@ -55,7 +55,7 @@ public class Global
|
||||
public const string DnsOutboundTag = "dns";
|
||||
public const string DnsTag = "dns-module";
|
||||
public const string DirectDnsTag = "direct-dns";
|
||||
public const string BalancerTagSuffix = "-round";
|
||||
public const string BalancerTagSuffix = "-balancer";
|
||||
public const string StreamSecurity = "tls";
|
||||
public const string StreamSecurityReality = "reality";
|
||||
public const string Loopback = "127.0.0.1";
|
||||
@@ -90,6 +90,9 @@ public class Global
|
||||
public const string XrayLocalCert = "XRAY_LOCATION_CERT";
|
||||
public const int SpeedTestPageSize = 1000;
|
||||
public const string LinuxBash = "/bin/bash";
|
||||
public const string StringTrue = "true";
|
||||
public const string StringFalse = "false";
|
||||
public const int SqliteMaxBatchSize = 10000;
|
||||
|
||||
public const string SingboxDirectDNSTag = "direct_dns";
|
||||
public const string SingboxRemoteDNSTag = "remote_dns";
|
||||
@@ -149,6 +152,9 @@ public class Global
|
||||
public static readonly List<string> SpeedTestUrls =
|
||||
[
|
||||
@"https://cachefly.cachefly.net/50mb.test",
|
||||
@"https://cachefly.cachefly.net/100mb.test",
|
||||
@"https://cachefly.cachefly.net/1mb.test",
|
||||
@"https://cachefly.cachefly.net/10mb.test",
|
||||
@"https://speed.cloudflare.com/__down?bytes=10000000",
|
||||
@"https://speed.cloudflare.com/__down?bytes=50000000",
|
||||
@"https://speed.cloudflare.com/__down?bytes=99999999",
|
||||
@@ -157,6 +163,8 @@ public class Global
|
||||
public static readonly List<string> SpeedPingTestUrls =
|
||||
[
|
||||
@"https://www.google.com/generate_204",
|
||||
@"https://www.youtube.com/generate_204",
|
||||
@"https://www.googlevideo.com/generate_204",
|
||||
@"https://www.gstatic.com/generate_204",
|
||||
@"https://www.apple.com/library/test/success.html",
|
||||
@"http://www.msftconnecttest.com/connecttest.txt"
|
||||
@@ -203,10 +211,18 @@ public class Global
|
||||
|
||||
public const string Hysteria2ProtocolShare = "hy2://";
|
||||
|
||||
public const string Hysteria2RealmProtocolShare = "hysteria2+realm://";
|
||||
|
||||
public const string Hysteria2HttpRealmProtocolShare = "hysteria2+realm+http://";
|
||||
|
||||
public const string NaiveHttpsProtocolShare = "naive+https://";
|
||||
|
||||
public const string NaiveQuicProtocolShare = "naive+quic://";
|
||||
|
||||
public const string SOCKS5Protocol = "socks5://";
|
||||
|
||||
public const string SOCKS4Protocol = "socks4://";
|
||||
|
||||
public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
|
||||
{
|
||||
{ EConfigType.VMess, "vmess://" },
|
||||
@@ -321,12 +337,12 @@ public class Global
|
||||
|
||||
public static readonly Dictionary<string, string> KcpHeaderMaskMap = new()
|
||||
{
|
||||
{ "srtp", "header-srtp" },
|
||||
{ "utp", "header-utp" },
|
||||
{ "wechat-video", "header-wechat" },
|
||||
{ "dtls", "header-dtls" },
|
||||
{ "wireguard", "header-wireguard" },
|
||||
{ "dns", "header-dns" }
|
||||
{ "srtp", "srtp" },
|
||||
{ "utp", "utp" },
|
||||
{ "wechat-video", "wechat" },
|
||||
{ "dtls", "dtls" },
|
||||
{ "wireguard", "wireguard" },
|
||||
{ "dns", "dns" }
|
||||
};
|
||||
|
||||
public static readonly List<string> CoreTypes =
|
||||
@@ -395,6 +411,16 @@ public class Global
|
||||
""
|
||||
];
|
||||
|
||||
public static readonly List<string> FragmentPacketsOptions =
|
||||
[
|
||||
"tlshello",
|
||||
"1-1",
|
||||
"1-2",
|
||||
"1-3",
|
||||
"1-4",
|
||||
"1-5"
|
||||
];
|
||||
|
||||
public static readonly List<string> UserAgent =
|
||||
[
|
||||
"chrome",
|
||||
@@ -412,13 +438,6 @@ public class Global
|
||||
"stream-one"
|
||||
];
|
||||
|
||||
public static readonly List<string> AllowInsecure =
|
||||
[
|
||||
"true",
|
||||
"false",
|
||||
""
|
||||
];
|
||||
|
||||
public static readonly List<string> DomainStrategy =
|
||||
[
|
||||
"AsIs",
|
||||
@@ -469,10 +488,11 @@ public class Global
|
||||
"zh-Hans",
|
||||
"zh-Hant",
|
||||
"en",
|
||||
"fa-Ir",
|
||||
"fa",
|
||||
"fr",
|
||||
"ru",
|
||||
"hu"
|
||||
"hu",
|
||||
"id"
|
||||
];
|
||||
|
||||
public static readonly List<string> Alpns =
|
||||
@@ -505,6 +525,7 @@ public class Global
|
||||
|
||||
public static readonly List<string> InboundTags =
|
||||
[
|
||||
"tun",
|
||||
"socks",
|
||||
"socks2",
|
||||
"socks3"
|
||||
@@ -661,6 +682,14 @@ public class Global
|
||||
"mcbe:bedrock.talonmc.net",
|
||||
];
|
||||
|
||||
public static readonly List<string> DefaultRealmStunList =
|
||||
[
|
||||
"turn.cloudflare.com:3478",
|
||||
"stun.nextcloud.com:3478",
|
||||
"stun.sip.us:3478",
|
||||
"global.stun.twilio.com:3478",
|
||||
];
|
||||
|
||||
public static readonly List<string> OutboundTags =
|
||||
[
|
||||
ProxyTag,
|
||||
@@ -675,15 +704,15 @@ public class Global
|
||||
{ "one.one.one.one", ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"] },
|
||||
{ "1dot1dot1dot1.cloudflare-dns.com", ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"] },
|
||||
{ "cloudflare-dns.com", ["104.16.249.249", "104.16.248.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9"] },
|
||||
{ "dns.cloudflare.com", ["104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5"] },
|
||||
{ "dns.cloudflare.com", ["162.159.61.8", "172.64.41.8", "2a06:98c1:52::8", "2803:f800:53::8"] },
|
||||
{ "dot.pub", ["1.12.12.12", "120.53.53.53"] },
|
||||
{ "doh.pub", ["1.12.12.12", "120.53.53.53"] },
|
||||
{ "dns.quad9.net", ["9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"] },
|
||||
{ "dns.yandex.net", ["77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff"] },
|
||||
{ "dns.sb", ["185.222.222.222", "2a09::"] },
|
||||
{ "dns.sb", ["45.11.45.11", "185.222.222.222", "2a09::", "2a11::"] },
|
||||
{ "dns.umbrella.com", ["208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53"] },
|
||||
{ "dns.sse.cisco.com", ["208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53"] },
|
||||
{ "engage.cloudflareclient.com", ["162.159.192.1"] }
|
||||
{ "engage.cloudflareclient.com", ["162.159.192.1", "2606:4700:d0::a29f:c001"] }
|
||||
};
|
||||
|
||||
public static readonly List<string> ExpectedIPs =
|
||||
|
||||
@@ -8,6 +8,7 @@ global using System.Reactive.Disposables;
|
||||
global using System.Reactive.Linq;
|
||||
global using System.Reflection;
|
||||
global using System.Runtime.InteropServices;
|
||||
global using System.Runtime.Versioning;
|
||||
global using System.Security.Cryptography;
|
||||
global using System.Text;
|
||||
global using System.Text.Encodings.Web;
|
||||
@@ -29,7 +30,10 @@ global using ServiceLib.Handler.Fmt;
|
||||
global using ServiceLib.Handler.SysProxy;
|
||||
global using ServiceLib.Helper;
|
||||
global using ServiceLib.Manager;
|
||||
global using ServiceLib.Models;
|
||||
global using ServiceLib.Models.CoreConfigs;
|
||||
global using ServiceLib.Models.Configs;
|
||||
global using ServiceLib.Models.Dto;
|
||||
global using ServiceLib.Models.Entities;
|
||||
global using ServiceLib.Resx;
|
||||
global using ServiceLib.Services;
|
||||
global using ServiceLib.Services.CoreConfig;
|
||||
|
||||
@@ -41,6 +41,7 @@ public static class AutoStartupHandler
|
||||
|
||||
#region Windows
|
||||
|
||||
[SupportedOSPlatform("windows")]
|
||||
private static async Task ClearTaskWindows()
|
||||
{
|
||||
var autoRunName = GetAutoRunNameWindows();
|
||||
@@ -53,6 +54,7 @@ public static class AutoStartupHandler
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("windows")]
|
||||
private static async Task SetTaskWindows()
|
||||
{
|
||||
try
|
||||
@@ -82,6 +84,7 @@ public static class AutoStartupHandler
|
||||
/// <param name="fileName"></param>
|
||||
/// <param name="description"></param>
|
||||
/// <exception cref="ArgumentNullException"></exception>
|
||||
[SupportedOSPlatform("windows")]
|
||||
public static void AutoStartTaskService(string taskName, string fileName, string description)
|
||||
{
|
||||
if (taskName.IsNullOrEmpty())
|
||||
@@ -108,7 +111,8 @@ public static class AutoStartupHandler
|
||||
task.Settings.RunOnlyIfIdle = false;
|
||||
task.Settings.IdleSettings.StopOnIdleEnd = false;
|
||||
task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
|
||||
task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
|
||||
task.Settings.Priority = ProcessPriorityClass.Normal;
|
||||
task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser });
|
||||
task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
|
||||
task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
|
||||
|
||||
@@ -124,6 +128,7 @@ public static class AutoStartupHandler
|
||||
|
||||
#region Linux
|
||||
|
||||
[SupportedOSPlatform("linux")]
|
||||
private static async Task ClearTaskLinux()
|
||||
{
|
||||
try
|
||||
@@ -137,6 +142,7 @@ public static class AutoStartupHandler
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("linux")]
|
||||
private static async Task SetTaskLinux()
|
||||
{
|
||||
try
|
||||
@@ -157,6 +163,7 @@ public static class AutoStartupHandler
|
||||
}
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("linux")]
|
||||
private static string GetHomePathLinux()
|
||||
{
|
||||
var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
|
||||
@@ -168,6 +175,7 @@ public static class AutoStartupHandler
|
||||
|
||||
#region macOS
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
private static async Task ClearTaskOSX()
|
||||
{
|
||||
try
|
||||
@@ -187,6 +195,7 @@ public static class AutoStartupHandler
|
||||
}
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
private static async Task SetTaskOSX()
|
||||
{
|
||||
try
|
||||
@@ -204,6 +213,7 @@ public static class AutoStartupHandler
|
||||
}
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
private static string GetLaunchAgentPathMacOS()
|
||||
{
|
||||
var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
|
||||
@@ -212,6 +222,7 @@ public static class AutoStartupHandler
|
||||
return launchAgentPath;
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
private static string GenerateLaunchAgentPlist()
|
||||
{
|
||||
var exePath = Utils.GetExePath();
|
||||
|
||||
@@ -6,8 +6,8 @@ public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeVali
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Holds the results of a full context build, including the main context and an optional
|
||||
/// pre-socks context (e.g. for TUN protection or pre-socks chaining).
|
||||
/// Holds the results of a full context build, including the main context and an optional
|
||||
/// pre-socks context (e.g. for TUN protection or pre-socks chaining).
|
||||
/// </summary>
|
||||
public record CoreConfigContextBuilderAllResult(
|
||||
CoreConfigContextBuilderResult MainResult,
|
||||
@@ -17,8 +17,8 @@ public record CoreConfigContextBuilderAllResult(
|
||||
public bool Success => MainResult.Success && (PreSocksResult?.Success ?? true);
|
||||
|
||||
/// <summary>
|
||||
/// Merges all errors and warnings from the main result and the optional pre-socks result
|
||||
/// into a single <see cref="NodeValidatorResult"/> for unified notification.
|
||||
/// Merges all errors and warnings from the main result and the optional pre-socks result
|
||||
/// into a single <see cref="NodeValidatorResult" /> for unified notification.
|
||||
/// </summary>
|
||||
public NodeValidatorResult CombinedValidatorResult => new(
|
||||
[.. MainResult.ValidatorResult.Errors, .. PreSocksResult?.ValidatorResult.Errors ?? []],
|
||||
@@ -28,14 +28,14 @@ public record CoreConfigContextBuilderAllResult(
|
||||
public class CoreConfigContextBuilder
|
||||
{
|
||||
/// <summary>
|
||||
/// Builds a <see cref="CoreConfigContext"/> for the given node, resolves its proxy map,
|
||||
/// and processes outbound nodes referenced by routing rules.
|
||||
/// Builds a <see cref="CoreConfigContext" /> for the given node, resolves its proxy map,
|
||||
/// and processes outbound nodes referenced by routing rules.
|
||||
/// </summary>
|
||||
public static async Task<CoreConfigContextBuilderResult> Build(Config config, ProfileItem node)
|
||||
{
|
||||
var runCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
|
||||
var coreType = runCoreType == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray;
|
||||
var context = new CoreConfigContext()
|
||||
var context = new CoreConfigContext
|
||||
{
|
||||
Node = node,
|
||||
RunCoreType = runCoreType,
|
||||
@@ -61,7 +61,8 @@ public class CoreConfigContextBuilder
|
||||
if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true))
|
||||
{
|
||||
var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet) ?? [];
|
||||
foreach (var ruleItem in rules.Where(ruleItem => ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
|
||||
foreach (var ruleItem in rules.Where(ruleItem =>
|
||||
ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
|
||||
{
|
||||
if (ruleItem.OutboundTag.IsNullOrEmpty())
|
||||
{
|
||||
@@ -72,7 +73,8 @@ public class CoreConfigContextBuilder
|
||||
var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
|
||||
if (ruleOutboundNode == null)
|
||||
{
|
||||
validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound, ruleItem.Remarks, ruleItem.OutboundTag));
|
||||
validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound,
|
||||
ruleItem.Remarks, ruleItem.OutboundTag));
|
||||
ruleItem.OutboundTag = Global.ProxyTag;
|
||||
continue;
|
||||
}
|
||||
@@ -83,7 +85,8 @@ public class CoreConfigContextBuilder
|
||||
if (!ruleNodeValidatorResult.Success)
|
||||
{
|
||||
validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Errors.Select(e =>
|
||||
string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag, e)));
|
||||
string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag,
|
||||
e)));
|
||||
ruleItem.OutboundTag = Global.ProxyTag;
|
||||
continue;
|
||||
}
|
||||
@@ -91,14 +94,50 @@ public class CoreConfigContextBuilder
|
||||
context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = actRuleNode;
|
||||
}
|
||||
}
|
||||
if (context.IsTunEnabled && context.AppConfig.TunModeItem.RouteExcludeAddress is { Count: > 0 })
|
||||
{
|
||||
var appConfig = JsonUtils.DeepCopy(config);
|
||||
var routeExcludeAddressList = new List<string>();
|
||||
foreach (var addr in context.AppConfig.TunModeItem.RouteExcludeAddress)
|
||||
{
|
||||
try
|
||||
{
|
||||
IPNetwork2.Parse(addr);
|
||||
routeExcludeAddressList.Add(addr);
|
||||
}
|
||||
catch
|
||||
{
|
||||
validatorResult.Warnings.Add(string.Format(ResUI.MsgTunRouteExcludeInvalidAddress, addr));
|
||||
}
|
||||
}
|
||||
appConfig.TunModeItem.RouteExcludeAddress = routeExcludeAddressList;
|
||||
context = context with { AppConfig = appConfig };
|
||||
}
|
||||
if (!context.AppConfig.CoreBasicItem.SendThrough.IsNullOrEmpty()
|
||||
&& !Utils.IsLocalIP(context.AppConfig.CoreBasicItem.SendThrough))
|
||||
{
|
||||
validatorResult.Warnings.Add(string.Format(ResUI.MsgInvalidProperty, ResUI.TbSettingsSendThrough));
|
||||
var appConfig = JsonUtils.DeepCopy(config);
|
||||
appConfig.CoreBasicItem.SendThrough = string.Empty;
|
||||
context = context with { AppConfig = appConfig };
|
||||
}
|
||||
if (!context.AppConfig.CoreBasicItem.BindInterface.IsNullOrEmpty()
|
||||
&& (!Utils.ContainsInterfaceName(context.AppConfig.CoreBasicItem.BindInterface)
|
||||
|| !(context.IsTunEnabled || context.IsWindows)))
|
||||
{
|
||||
validatorResult.Warnings.Add(string.Format(ResUI.MsgInvalidProperty, ResUI.TbSettingsBindInterface));
|
||||
var appConfig = JsonUtils.DeepCopy(config);
|
||||
appConfig.CoreBasicItem.BindInterface = string.Empty;
|
||||
context = context with { AppConfig = appConfig };
|
||||
}
|
||||
|
||||
return new CoreConfigContextBuilderResult(context, validatorResult);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the main <see cref="CoreConfigContext"/> for <paramref name="node"/> and, when
|
||||
/// the main build succeeds, also builds the optional pre-socks context required for TUN
|
||||
/// protection or pre-socks proxy chaining.
|
||||
/// Builds the main <see cref="CoreConfigContext" /> for <paramref name="node" /> and, when
|
||||
/// the main build succeeds, also builds the optional pre-socks context required for TUN
|
||||
/// protection or pre-socks proxy chaining.
|
||||
/// </summary>
|
||||
public static async Task<CoreConfigContextBuilderAllResult> BuildAll(Config config, ProfileItem node)
|
||||
{
|
||||
@@ -118,16 +157,31 @@ public class CoreConfigContextBuilder
|
||||
{
|
||||
Context = mainResult.Context with
|
||||
{
|
||||
IsTunEnabled = false, // main core doesn't handle tun directly when pre-socks is used
|
||||
IsTunEnabled = false,
|
||||
// main core doesn't handle tun directly when pre-socks is used
|
||||
ProtectDomainList = [.. mainResult.Context.ProtectDomainList, .. preResult.Context.ProtectDomainList],
|
||||
}
|
||||
},
|
||||
};
|
||||
if (mainResult.Context.IsTunEnabled
|
||||
&& mainResult.Context.AppConfig.TunModeItem.StrictRoute)
|
||||
{
|
||||
var appConfig = JsonUtils.DeepCopy(mainResult.Context.AppConfig);
|
||||
appConfig.CoreBasicItem.BindInterface = string.Empty;
|
||||
appConfig.CoreBasicItem.SendThrough = string.Empty;
|
||||
resolvedMainResult = resolvedMainResult with
|
||||
{
|
||||
Context = resolvedMainResult.Context with
|
||||
{
|
||||
AppConfig = appConfig,
|
||||
},
|
||||
};
|
||||
}
|
||||
return new CoreConfigContextBuilderAllResult(resolvedMainResult, preResult);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether a pre-socks context is required for <paramref name="nodeContext"/>
|
||||
/// and, if so, builds and returns it. Returns <c>null</c> when no pre-socks core is needed.
|
||||
/// Determines whether a pre-socks context is required for <paramref name="nodeContext" />
|
||||
/// and, if so, builds and returns it. Returns <c>null</c> when no pre-socks core is needed.
|
||||
/// </summary>
|
||||
private static async Task<CoreConfigContextBuilderResult?> BuildPreSocksIfNeeded(CoreConfigContext nodeContext)
|
||||
{
|
||||
@@ -143,8 +197,9 @@ public class CoreConfigContextBuilder
|
||||
{
|
||||
Context = preSocksResult.Context with
|
||||
{
|
||||
ProtectDomainList = [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
|
||||
}
|
||||
ProtectDomainList =
|
||||
[.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -152,8 +207,8 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Resolves a node into the context, optionally wrapping it in a subscription-level proxy chain.
|
||||
/// Returns the effective (possibly replaced) node and the validation result.
|
||||
/// Resolves a node into the context, optionally wrapping it in a subscription-level proxy chain.
|
||||
/// Returns the effective (possibly replaced) node and the validation result.
|
||||
/// </summary>
|
||||
public static async Task<(ProfileItem, NodeValidatorResult)> ResolveNodeAsync(CoreConfigContext context,
|
||||
ProfileItem node,
|
||||
@@ -188,12 +243,13 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// If the node's subscription defines prev/next profiles, creates a virtual
|
||||
/// <see cref="EConfigType.ProxyChain"/> node that wraps them together.
|
||||
/// Returns <c>null</c> as the chain item when no chain is needed.
|
||||
/// Any warnings (e.g. missing prev/next profile) are returned in the validator result.
|
||||
/// If the node's subscription defines prev/next profiles, creates a virtual
|
||||
/// <see cref="EConfigType.ProxyChain" /> node that wraps them together.
|
||||
/// Returns <c>null</c> as the chain item when no chain is needed.
|
||||
/// Any warnings (e.g. missing prev/next profile) are returned in the validator result.
|
||||
/// </summary>
|
||||
private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)> BuildSubscriptionChainNodeAsync(ProfileItem node)
|
||||
private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)>
|
||||
BuildSubscriptionChainNodeAsync(ProfileItem node)
|
||||
{
|
||||
var result = NodeValidatorResult.Empty();
|
||||
|
||||
@@ -234,7 +290,7 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
// Build new proxy chain node
|
||||
var chainNode = new ProfileItem()
|
||||
var chainNode = new ProfileItem
|
||||
{
|
||||
IndexId = $"inner-{Utils.GetGuid(false)}",
|
||||
ConfigType = EConfigType.ProxyChain,
|
||||
@@ -252,8 +308,8 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Dispatches registration to either <see cref="RegisterGroupNodeAsync"/> or
|
||||
/// <see cref="RegisterSingleNodeAsync"/> based on the node's config type.
|
||||
/// Dispatches registration to either <see cref="RegisterGroupNodeAsync" /> or
|
||||
/// <see cref="RegisterSingleNodeAsync" /> based on the node's config type.
|
||||
/// </summary>
|
||||
private static async Task<NodeValidatorResult> RegisterNodeAsync(CoreConfigContext context, ProfileItem node)
|
||||
{
|
||||
@@ -261,15 +317,12 @@ public class CoreConfigContextBuilder
|
||||
{
|
||||
return await RegisterGroupNodeAsync(context, node);
|
||||
}
|
||||
else
|
||||
{
|
||||
return RegisterSingleNodeAsync(context, node);
|
||||
}
|
||||
return RegisterSingleNodeAsync(context, node);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Validates a single (non-group) node and, on success, adds it to the proxy map
|
||||
/// and records any domain addresses that should bypass the proxy.
|
||||
/// Validates a single (non-group) node and, on success, adds it to the proxy map
|
||||
/// and records any domain addresses that should bypass the proxy.
|
||||
/// </summary>
|
||||
private static NodeValidatorResult RegisterSingleNodeAsync(CoreConfigContext context, ProfileItem node)
|
||||
{
|
||||
@@ -333,8 +386,8 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Entry point for registering a group node. Initialises the visited/ancestor sets
|
||||
/// and delegates to <see cref="TraverseGroupNodeAsync"/>.
|
||||
/// Entry point for registering a group node. Initialises the visited/ancestor sets
|
||||
/// and delegates to <see cref="TraverseGroupNodeAsync" />.
|
||||
/// </summary>
|
||||
private static async Task<NodeValidatorResult> RegisterGroupNodeAsync(CoreConfigContext context,
|
||||
ProfileItem node)
|
||||
@@ -350,9 +403,9 @@ public class CoreConfigContextBuilder
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Recursively walks the children of a group node, registering valid leaf nodes
|
||||
/// and nested groups. Detects cycles via <paramref name="ancestorsGroup"/> and
|
||||
/// deduplicates shared nodes via <paramref name="globalVisitedGroup"/>.
|
||||
/// Recursively walks the children of a group node, registering valid leaf nodes
|
||||
/// and nested groups. Detects cycles via <paramref name="ancestorsGroup" /> and
|
||||
/// deduplicates shared nodes via <paramref name="globalVisitedGroup" />.
|
||||
/// </summary>
|
||||
private static async Task<NodeValidatorResult> TraverseGroupNodeAsync(
|
||||
CoreConfigContext context,
|
||||
@@ -416,13 +469,10 @@ public class CoreConfigContextBuilder
|
||||
childNodeValidatorResult.Errors.Add(string.Format(ResUI.MsgGroupNoValidChildNode, node.Remarks));
|
||||
return childNodeValidatorResult;
|
||||
}
|
||||
else
|
||||
{
|
||||
childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors);
|
||||
childNodeValidatorResult.Errors.Clear();
|
||||
}
|
||||
childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors);
|
||||
childNodeValidatorResult.Errors.Clear();
|
||||
|
||||
node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList), });
|
||||
node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList) });
|
||||
context.AllProxiesMap[node.IndexId] = node;
|
||||
return childNodeValidatorResult;
|
||||
}
|
||||
|
||||
@@ -29,35 +29,6 @@ public class NodeValidator
|
||||
return v.ToResult();
|
||||
}
|
||||
|
||||
private class ValidationContext
|
||||
{
|
||||
public List<string> Errors { get; } = [];
|
||||
public List<string> Warnings { get; } = [];
|
||||
|
||||
public void Error(string message)
|
||||
{
|
||||
Errors.Add(message);
|
||||
}
|
||||
|
||||
public void Warning(string message)
|
||||
{
|
||||
Warnings.Add(message);
|
||||
}
|
||||
|
||||
public void Assert(bool condition, string errorMsg)
|
||||
{
|
||||
if (!condition)
|
||||
{
|
||||
Error(errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
public NodeValidatorResult ToResult()
|
||||
{
|
||||
return new NodeValidatorResult(Errors, Warnings);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ValidateNodeAndCoreSupport(ProfileItem item, ECoreType coreType, ValidationContext v)
|
||||
{
|
||||
if (item.ConfigType is EConfigType.Custom)
|
||||
@@ -72,8 +43,8 @@ public class NodeValidator
|
||||
}
|
||||
|
||||
// Basic Property Validation
|
||||
v.Assert(!item.Address.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Address"));
|
||||
v.Assert(item.Port is > 0 and <= 65535, string.Format(ResUI.MsgInvalidProperty, "Port"));
|
||||
v.Assert(!item.Address.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, ResUI.TbAddress));
|
||||
v.Assert(item.Port is > 0 and <= 65535, string.Format(ResUI.MsgInvalidProperty, ResUI.TbPort));
|
||||
|
||||
// Network & Core Logic
|
||||
var net = item.GetNetwork();
|
||||
@@ -104,41 +75,76 @@ public class NodeValidator
|
||||
{
|
||||
case EConfigType.VMess:
|
||||
v.Assert(!item.Password.IsNullOrEmpty() && Utils.IsGuidByParse(item.Password),
|
||||
string.Format(ResUI.MsgInvalidProperty, "Password"));
|
||||
string.Format(ResUI.MsgInvalidProperty, ResUI.TbId));
|
||||
break;
|
||||
|
||||
case EConfigType.VLESS:
|
||||
v.Assert(
|
||||
!item.Password.IsNullOrEmpty()
|
||||
&& (Utils.IsGuidByParse(item.Password) || item.Password.Length <= 30),
|
||||
string.Format(ResUI.MsgInvalidProperty, "Password")
|
||||
string.Format(ResUI.MsgInvalidProperty, ResUI.TbId5)
|
||||
);
|
||||
v.Assert(Global.Flows.Contains(protocolExtra.Flow ?? string.Empty),
|
||||
string.Format(ResUI.MsgInvalidProperty, "Flow"));
|
||||
string.Format(ResUI.MsgInvalidProperty, ResUI.TbFlow5));
|
||||
break;
|
||||
|
||||
case EConfigType.Shadowsocks:
|
||||
v.Assert(!item.Password.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Password"));
|
||||
v.Assert(!item.Password.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, ResUI.TbId3));
|
||||
v.Assert(
|
||||
!string.IsNullOrEmpty(protocolExtra.SsMethod) &&
|
||||
Global.SsSecuritiesInSingbox.Contains(protocolExtra.SsMethod),
|
||||
string.Format(ResUI.MsgInvalidProperty, "SsMethod"));
|
||||
string.Format(ResUI.MsgInvalidProperty, ResUI.TbSecurity3));
|
||||
break;
|
||||
}
|
||||
|
||||
if (coreType is ECoreType.Xray
|
||||
&& (protocolExtra.Flow ?? string.Empty).StartsWith("xtls", StringComparison.OrdinalIgnoreCase)
|
||||
&& item.MuxEnabled == true)
|
||||
{
|
||||
v.Warning(string.Format(ResUI.MsgOptionsConflict, "XTLS", "Mux.Cool"));
|
||||
}
|
||||
|
||||
if (item.GetNetwork() is nameof(ETransport.ws)
|
||||
&& item.EchConfigList.IsNullOrEmpty()
|
||||
&& item.GetAlpn()?.FirstOrDefault() == "h3")
|
||||
{
|
||||
v.Warning(
|
||||
"WebSocket but ALPN is set to h3, the core may ignore the ALPN setting or cause unexpected issues.");
|
||||
}
|
||||
|
||||
// TLS & Security
|
||||
if (item.StreamSecurity == Global.StreamSecurity)
|
||||
{
|
||||
if (!item.Cert.IsNullOrEmpty() && CertPemManager.ParsePemChain(item.Cert).Count == 0 &&
|
||||
!item.CertSha.IsNullOrEmpty())
|
||||
var isCertProvided = !item.Cert.IsNullOrEmpty();
|
||||
if (!item.Cert.IsNullOrEmpty() && CertPemManager.ParsePemChain(item.Cert).Count == 0)
|
||||
{
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, "TLS Certificate"));
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, ResUI.TbFullCertTips));
|
||||
isCertProvided = false;
|
||||
}
|
||||
|
||||
// Check for deprecated allowInsecure property when TLS is enabled
|
||||
if (item.GetAllowInsecure()
|
||||
&& item.Cert.IsNullOrEmpty()
|
||||
&& item.CertSha.IsNullOrEmpty())
|
||||
{
|
||||
v.Warning(ResUI.MsgAllowInsecureDeprecated);
|
||||
}
|
||||
|
||||
if ((coreType == ECoreType.Xray
|
||||
&& item.GetAllowInsecure()
|
||||
&& !isCertProvided
|
||||
&& item.CertSha.IsNullOrEmpty())
|
||||
|| (coreType == ECoreType.sing_box
|
||||
&& item.GetAllowInsecure()
|
||||
&& !isCertProvided))
|
||||
{
|
||||
v.Warning(ResUI.MsgInsecureConfiguration);
|
||||
}
|
||||
}
|
||||
|
||||
if (item.StreamSecurity == Global.StreamSecurityReality)
|
||||
{
|
||||
v.Assert(!item.PublicKey.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "PublicKey"));
|
||||
v.Assert(!item.PublicKey.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, ResUI.TbPublicKey));
|
||||
}
|
||||
|
||||
var transport = item.GetTransportExtra();
|
||||
@@ -146,7 +152,7 @@ public class NodeValidator
|
||||
{
|
||||
if (JsonUtils.ParseJson(transport.XhttpExtra) is not JsonObject)
|
||||
{
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, "XHTTP Extra"));
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, ResUI.TransportExtra));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,7 +160,7 @@ public class NodeValidator
|
||||
{
|
||||
if (JsonUtils.ParseJson(item.Finalmask) is not JsonObject)
|
||||
{
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, "Finalmask"));
|
||||
v.Error(string.Format(ResUI.MsgInvalidProperty, ResUI.TbFinalmask));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -183,4 +189,33 @@ public class NodeValidator
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private class ValidationContext
|
||||
{
|
||||
public List<string> Errors { get; } = [];
|
||||
public List<string> Warnings { get; } = [];
|
||||
|
||||
public void Error(string message)
|
||||
{
|
||||
Errors.Add(message);
|
||||
}
|
||||
|
||||
public void Warning(string message)
|
||||
{
|
||||
Warnings.Add(message);
|
||||
}
|
||||
|
||||
public void Assert(bool condition, string errorMsg)
|
||||
{
|
||||
if (!condition)
|
||||
{
|
||||
Error(errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
public NodeValidatorResult ToResult()
|
||||
{
|
||||
return new NodeValidatorResult(Errors, Warnings);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,15 +39,14 @@ public static class ConfigHandler
|
||||
{
|
||||
LogEnabled = false,
|
||||
Loglevel = "warning",
|
||||
MuxEnabled = false,
|
||||
};
|
||||
|
||||
if (config.Inbound == null)
|
||||
{
|
||||
config.Inbound = new List<InItem>();
|
||||
config.Inbound = [];
|
||||
InItem inItem = new()
|
||||
{
|
||||
Protocol = EInboundProtocol.socks.ToString(),
|
||||
Protocol = nameof(EInboundProtocol.socks),
|
||||
LocalPort = 10808,
|
||||
UdpEnabled = true,
|
||||
SniffingEnabled = true,
|
||||
@@ -60,7 +59,7 @@ public static class ConfigHandler
|
||||
{
|
||||
if (config.Inbound.Count > 0)
|
||||
{
|
||||
config.Inbound.First().Protocol = EInboundProtocol.socks.ToString();
|
||||
config.Inbound.First().Protocol = nameof(EInboundProtocol.socks);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,8 +98,8 @@ public static class ConfigHandler
|
||||
config.MsgUIItem ??= new();
|
||||
|
||||
config.UiItem ??= new();
|
||||
config.UiItem.MainColumnItem ??= new();
|
||||
config.UiItem.WindowSizeItem ??= new();
|
||||
config.UiItem.MainColumnItem ??= [];
|
||||
config.UiItem.WindowSizeItem ??= [];
|
||||
|
||||
if (config.UiItem.CurrentLanguage.IsNullOrEmpty())
|
||||
{
|
||||
@@ -158,17 +157,18 @@ public static class ConfigHandler
|
||||
DownMbps = 100
|
||||
};
|
||||
config.ClashUIItem ??= new();
|
||||
config.ClashUIItem.ConnectionsColumnItem ??= new();
|
||||
config.ClashUIItem.ConnectionsColumnItem ??= [];
|
||||
config.SystemProxyItem ??= new();
|
||||
config.WebDavItem ??= new();
|
||||
config.CheckUpdateItem ??= new();
|
||||
config.CheckUpdateItem ??= new();
|
||||
config.Fragment4RayItem ??= new()
|
||||
{
|
||||
Packets = "tlshello",
|
||||
Length = "50-100",
|
||||
Interval = "10-20"
|
||||
Interval = "10-20",
|
||||
MaxSplit = "0"
|
||||
};
|
||||
config.GlobalHotkeys ??= new();
|
||||
config.GlobalHotkeys ??= [];
|
||||
|
||||
if (config.SystemProxyItem.SystemProxyExceptions.IsNullOrEmpty())
|
||||
{
|
||||
@@ -255,6 +255,7 @@ public static class ConfigHandler
|
||||
item.Cert = profileItem.Cert;
|
||||
item.CertSha = profileItem.CertSha;
|
||||
item.EchConfigList = profileItem.EchConfigList;
|
||||
item.VerifyPeerCertByName = profileItem.VerifyPeerCertByName;
|
||||
item.Finalmask = profileItem.Finalmask;
|
||||
item.ProtoExtra = profileItem.ProtoExtra;
|
||||
item.TransportExtra = profileItem.TransportExtra;
|
||||
@@ -720,12 +721,51 @@ public static class ConfigHandler
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
|
||||
var protocolExtra = profileItem.GetProtocolExtra();
|
||||
profileItem.SetProtocolExtra(protocolExtra with
|
||||
{
|
||||
SalamanderPass = profileItem.GetProtocolExtra().SalamanderPass?.TrimEx(),
|
||||
HopInterval = profileItem.GetProtocolExtra().HopInterval?.TrimEx(),
|
||||
SalamanderPass = protocolExtra.SalamanderPass?.TrimEx(),
|
||||
HopInterval = protocolExtra.HopInterval?.TrimEx(),
|
||||
});
|
||||
|
||||
if (!protocolExtra.Hy2RealmUrl.IsNullOrEmpty())
|
||||
{
|
||||
var realmResult = HyRealm.TryParse(protocolExtra.Hy2RealmUrl, out var realm);
|
||||
if (!realmResult || realm is null)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
if (realm.StunList.Count == 0)
|
||||
{
|
||||
realm = realm with
|
||||
{
|
||||
StunList = Global.DefaultRealmStunList,
|
||||
};
|
||||
}
|
||||
profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
|
||||
{
|
||||
Hy2RealmUrl = realm.ToUri(),
|
||||
});
|
||||
}
|
||||
var isGecko = !protocolExtra.GeckoMinPacketSize.IsNullOrEmpty() || !protocolExtra.GeckoMaxPacketSize.IsNullOrEmpty();
|
||||
if (isGecko)
|
||||
{
|
||||
var minPacketSize = protocolExtra.GeckoMinPacketSize.ToInt();
|
||||
var maxPacketSize = protocolExtra.GeckoMaxPacketSize.ToInt();
|
||||
if (minPacketSize <= 0
|
||||
|| minPacketSize > maxPacketSize
|
||||
|| maxPacketSize > 2048)
|
||||
{
|
||||
minPacketSize = 512;
|
||||
maxPacketSize = 1200;
|
||||
}
|
||||
profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
|
||||
{
|
||||
GeckoMinPacketSize = minPacketSize.ToString(),
|
||||
GeckoMaxPacketSize = maxPacketSize.ToString(),
|
||||
});
|
||||
}
|
||||
|
||||
await AddServerCommon(config, profileItem, toFile);
|
||||
|
||||
return 0;
|
||||
@@ -874,7 +914,7 @@ public static class ConfigHandler
|
||||
profileItem.Fingerprint = string.Empty;
|
||||
profileItem.Alpn = string.Empty;
|
||||
profileItem.Network = string.Empty;
|
||||
profileItem.AllowInsecure = "false";
|
||||
profileItem.AllowInsecure = string.Empty;
|
||||
if (profileItem.StreamSecurity.IsNullOrEmpty())
|
||||
{
|
||||
profileItem.StreamSecurity = Global.StreamSecurity;
|
||||
@@ -923,6 +963,7 @@ public static class ConfigHandler
|
||||
Delay = t33?.Delay ?? 0,
|
||||
Speed = t33?.Speed ?? 0,
|
||||
Sort = t33?.Sort ?? 0,
|
||||
IpInfo = t33?.IpInfo ?? string.Empty,
|
||||
TodayDown = (t22?.TodayDown ?? 0).ToString("D16"),
|
||||
TodayUp = (t22?.TodayUp ?? 0).ToString("D16"),
|
||||
TotalDown = (t22?.TotalDown ?? 0).ToString("D16"),
|
||||
@@ -943,6 +984,7 @@ public static class ConfigHandler
|
||||
EServerColName.StreamSecurity => lstProfile.OrderBy(t => t.StreamSecurity).ToList(),
|
||||
EServerColName.DelayVal => lstProfile.OrderBy(t => t.Delay).ToList(),
|
||||
EServerColName.SpeedVal => lstProfile.OrderBy(t => t.Speed).ToList(),
|
||||
EServerColName.IpInfo => lstProfile.OrderBy(t => t.IpInfo).ToList(),
|
||||
EServerColName.SubRemarks => lstProfile.OrderBy(t => t.Subid).ToList(),
|
||||
EServerColName.TodayDown => lstProfile.OrderBy(t => t.TodayDown).ToList(),
|
||||
EServerColName.TodayUp => lstProfile.OrderBy(t => t.TodayUp).ToList(),
|
||||
@@ -963,6 +1005,7 @@ public static class ConfigHandler
|
||||
EServerColName.StreamSecurity => lstProfile.OrderByDescending(t => t.StreamSecurity).ToList(),
|
||||
EServerColName.DelayVal => lstProfile.OrderByDescending(t => t.Delay).ToList(),
|
||||
EServerColName.SpeedVal => lstProfile.OrderByDescending(t => t.Speed).ToList(),
|
||||
EServerColName.IpInfo => lstProfile.OrderByDescending(t => t.IpInfo).ToList(),
|
||||
EServerColName.SubRemarks => lstProfile.OrderByDescending(t => t.Subid).ToList(),
|
||||
EServerColName.TodayDown => lstProfile.OrderByDescending(t => t.TodayDown).ToList(),
|
||||
EServerColName.TodayUp => lstProfile.OrderByDescending(t => t.TodayUp).ToList(),
|
||||
@@ -1053,8 +1096,8 @@ public static class ConfigHandler
|
||||
return new Tuple<int, int>(0, 0);
|
||||
}
|
||||
|
||||
List<ProfileItem> lstKeep = new();
|
||||
List<ProfileItem> lstRemove = new();
|
||||
List<ProfileItem> lstKeep = [];
|
||||
List<ProfileItem> lstRemove = [];
|
||||
if (!config.GuiItem.KeepOlderDedupl)
|
||||
{
|
||||
lstProfile.Reverse();
|
||||
@@ -1103,10 +1146,6 @@ public static class ConfigHandler
|
||||
}
|
||||
else
|
||||
{
|
||||
if (profileItem.AllowInsecure.IsNullOrEmpty())
|
||||
{
|
||||
profileItem.AllowInsecure = config.CoreBasicItem.DefAllowInsecure.ToString().ToLower();
|
||||
}
|
||||
if (profileItem.Fingerprint.IsNullOrEmpty() && profileItem.StreamSecurity == Global.StreamSecurityReality)
|
||||
{
|
||||
profileItem.Fingerprint = config.CoreBasicItem.DefFingerprint;
|
||||
@@ -1451,8 +1490,7 @@ public static class ConfigHandler
|
||||
public static ProfileItem? GetPreSocksItem(Config config, ProfileItem node, ECoreType coreType)
|
||||
{
|
||||
ProfileItem? itemSocks = null;
|
||||
var enableLegacyProtect = config.TunModeItem.EnableLegacyProtect
|
||||
|| Utils.IsNonWindows();
|
||||
var enableLegacyProtect = config.TunModeItem.EnableLegacyProtect;
|
||||
if (node.ConfigType != EConfigType.Custom
|
||||
&& coreType != ECoreType.sing_box
|
||||
&& config.TunModeItem.EnableTun
|
||||
@@ -1534,7 +1572,7 @@ public static class ConfigHandler
|
||||
}
|
||||
|
||||
var countServers = 0;
|
||||
List<ProfileItem> lstAdd = new();
|
||||
List<ProfileItem> lstAdd = [];
|
||||
var arrData = strData.Split(Environment.NewLine.ToCharArray()).Where(t => !t.IsNullOrEmpty());
|
||||
if (isSub)
|
||||
{
|
||||
@@ -1630,7 +1668,7 @@ public static class ConfigHandler
|
||||
{
|
||||
lstProfiles = V2rayFmt.ResolveFullArray(strData, subRemarks);
|
||||
}
|
||||
if (lstProfiles != null && lstProfiles.Count > 0)
|
||||
if (lstProfiles is { Count: > 0 })
|
||||
{
|
||||
var count = 0;
|
||||
foreach (var it in lstProfiles)
|
||||
@@ -1847,7 +1885,19 @@ public static class ConfigHandler
|
||||
}
|
||||
|
||||
//May be standard uri mixed with internal uri
|
||||
var innerUriCount = await AddBatchServers4InnerUri(config, strData, subid, isSub);
|
||||
var innerUriCount = 0;
|
||||
if (Utils.IsBase64String(strData))
|
||||
{
|
||||
innerUriCount = await AddBatchServers4InnerUri(config, Utils.Base64Decode(strData), subid, isSub);
|
||||
}
|
||||
if (innerUriCount < 1)
|
||||
{
|
||||
innerUriCount = await AddBatchServers4InnerUri(config, strData, subid, isSub);
|
||||
}
|
||||
if (innerUriCount < 1)
|
||||
{
|
||||
innerUriCount = await AddBatchServers4InnerUri(config, Utils.Base64Decode(strData), subid, isSub);
|
||||
}
|
||||
if (innerUriCount > 0)
|
||||
{
|
||||
if (counter > 0)
|
||||
|
||||
@@ -4,53 +4,41 @@ public static class ConnectionHandler
|
||||
{
|
||||
private static readonly string _tag = "ConnectionHandler";
|
||||
|
||||
/// <summary>
|
||||
/// Runs ping and IP checks and returns a formatted result string.
|
||||
/// </summary>
|
||||
public static async Task<string> RunAvailabilityCheck()
|
||||
{
|
||||
var time = await GetRealPingTimeInfo();
|
||||
var ip = time > 0 ? await GetIPInfo() ?? Global.None : Global.None;
|
||||
var ip = time > 0 ? await GetIPInfo() : Global.None;
|
||||
|
||||
return string.Format(ResUI.TestMeOutput, time, ip);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets IP information using the default local proxy.
|
||||
/// </summary>
|
||||
private static async Task<string?> GetIPInfo()
|
||||
{
|
||||
var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
|
||||
if (url.IsNullOrEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
var webProxy = await GetWebProxy();
|
||||
|
||||
var downloadHandle = new DownloadService();
|
||||
var result = await downloadHandle.TryDownloadString(url, true, "");
|
||||
if (result == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
|
||||
if (ipInfo == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
|
||||
var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
|
||||
|
||||
return $"({country ?? "unknown"}) {ip}";
|
||||
var ipInfo = await GetIPInfo(webProxy);
|
||||
return ipInfo?.ToString() ?? Global.None;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Measures real ping time using configured test URL.
|
||||
/// </summary>
|
||||
private static async Task<int> GetRealPingTimeInfo()
|
||||
{
|
||||
var responseTime = -1;
|
||||
try
|
||||
{
|
||||
var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
|
||||
var webProxy = new WebProxy($"socks5://{Global.Loopback}:{port}");
|
||||
var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
|
||||
var webProxy = await GetWebProxy();
|
||||
|
||||
for (var i = 0; i < 2; i++)
|
||||
{
|
||||
responseTime = await GetRealPingTime(url, webProxy, 10);
|
||||
responseTime = await GetRealPingTime(webProxy, 10);
|
||||
if (responseTime > 0)
|
||||
{
|
||||
break;
|
||||
@@ -66,8 +54,21 @@ public static class ConnectionHandler
|
||||
return responseTime;
|
||||
}
|
||||
|
||||
public static async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
|
||||
/// <summary>
|
||||
/// Creates local SOCKS proxy instance.
|
||||
/// </summary>
|
||||
private static async Task<WebProxy?> GetWebProxy()
|
||||
{
|
||||
var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
|
||||
return new WebProxy($"socks5://{Global.Loopback}:{port}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Measures response time by sending HTTP requests through proxy.
|
||||
/// </summary>
|
||||
public static async Task<int> GetRealPingTime(IWebProxy? webProxy, int downloadTimeout)
|
||||
{
|
||||
var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
|
||||
var responseTime = -1;
|
||||
try
|
||||
{
|
||||
@@ -79,14 +80,14 @@ public static class ConnectionHandler
|
||||
UseProxy = webProxy != null
|
||||
});
|
||||
|
||||
List<int> oneTime = new();
|
||||
List<int> oneTime = [];
|
||||
for (var i = 0; i < 2; i++)
|
||||
{
|
||||
var timer = Stopwatch.StartNew();
|
||||
await client.GetAsync(url, cts.Token).ConfigureAwait(false);
|
||||
timer.Stop();
|
||||
oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
|
||||
await Task.Delay(100);
|
||||
await Task.Delay(100, cts.Token);
|
||||
}
|
||||
responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
|
||||
}
|
||||
@@ -95,4 +96,41 @@ public static class ConnectionHandler
|
||||
}
|
||||
return responseTime;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets IP and country information through specified proxy.
|
||||
/// </summary>
|
||||
public static async Task<IpInfoResult?> GetIPInfo(IWebProxy? webProxy)
|
||||
{
|
||||
try
|
||||
{
|
||||
var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
|
||||
if (url.IsNullOrEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var downloadHandle = new DownloadService();
|
||||
var result = await downloadHandle.TryDownloadString(url, webProxy, "");
|
||||
if (result == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
|
||||
if (ipInfo == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
|
||||
var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code ?? "unknown";
|
||||
|
||||
return new IpInfoResult(country, ip);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,6 +73,10 @@ public class BaseFmt
|
||||
{
|
||||
dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));
|
||||
}
|
||||
if (item.VerifyPeerCertByName.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("vcn", Utils.UrlEncode(item.VerifyPeerCertByName));
|
||||
}
|
||||
if (item.CertSha.IsNotEmpty())
|
||||
{
|
||||
dicQuery.Add("pcs", Utils.UrlEncode(item.CertSha));
|
||||
@@ -199,7 +203,7 @@ public class BaseFmt
|
||||
|
||||
private static int ToUriQueryAllowInsecure(ProfileItem item, ref Dictionary<string, string> dicQuery)
|
||||
{
|
||||
if (item.AllowInsecure.Equals(Global.AllowInsecure.First()))
|
||||
if (item.GetAllowInsecure())
|
||||
{
|
||||
// Add two for compatibility
|
||||
dicQuery.Add("insecure", "1");
|
||||
@@ -227,6 +231,7 @@ public class BaseFmt
|
||||
item.SpiderX = GetQueryDecoded(query, "spx");
|
||||
item.Mldsa65Verify = GetQueryDecoded(query, "pqv");
|
||||
item.EchConfigList = GetQueryDecoded(query, "ech");
|
||||
item.VerifyPeerCertByName = GetQueryDecoded(query, "vcn");
|
||||
item.CertSha = GetQueryDecoded(query, "pcs");
|
||||
|
||||
var finalmaskDecoded = GetQueryDecoded(query, "fm");
|
||||
@@ -249,11 +254,11 @@ public class BaseFmt
|
||||
|
||||
if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "1"))
|
||||
{
|
||||
item.AllowInsecure = Global.AllowInsecure.First();
|
||||
item.AllowInsecure = Global.StringTrue;
|
||||
}
|
||||
else if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "0"))
|
||||
{
|
||||
item.AllowInsecure = Global.AllowInsecure.Skip(1).First();
|
||||
item.AllowInsecure = Global.StringFalse;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -53,7 +53,9 @@ public class FmtHandler
|
||||
{
|
||||
return ShadowsocksFmt.Resolve(str, out msg);
|
||||
}
|
||||
else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
|
||||
else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS])
|
||||
|| str.StartsWith(Global.SOCKS5Protocol)
|
||||
|| str.StartsWith(Global.SOCKS4Protocol))
|
||||
{
|
||||
return SocksFmt.Resolve(str, out msg);
|
||||
}
|
||||
@@ -65,10 +67,16 @@ public class FmtHandler
|
||||
{
|
||||
return VLESSFmt.Resolve(str, out msg);
|
||||
}
|
||||
else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
|
||||
else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2])
|
||||
|| str.StartsWith(Global.Hysteria2ProtocolShare))
|
||||
{
|
||||
return Hysteria2Fmt.Resolve(str, out msg);
|
||||
}
|
||||
else if (str.StartsWith(Global.Hysteria2RealmProtocolShare)
|
||||
|| str.StartsWith(Global.Hysteria2HttpRealmProtocolShare))
|
||||
{
|
||||
return Hysteria2Fmt.ResolveRealm(str, out msg);
|
||||
}
|
||||
else if (str.StartsWith(Global.ProtocolShares[EConfigType.TUIC]))
|
||||
{
|
||||
return TuicFmt.Resolve(str, out msg);
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using System.Collections.Specialized;
|
||||
|
||||
namespace ServiceLib.Handler.Fmt;
|
||||
|
||||
public class Hysteria2Fmt : BaseFmt
|
||||
@@ -23,15 +25,7 @@ public class Hysteria2Fmt : BaseFmt
|
||||
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
ResolveUriQuery(query, ref item);
|
||||
if (item.CertSha.IsNullOrEmpty())
|
||||
{
|
||||
item.CertSha = GetQueryDecoded(query, "pinSHA256");
|
||||
}
|
||||
item.SetProtocolExtra(item.GetProtocolExtra() with
|
||||
{
|
||||
Ports = GetQueryDecoded(query, "mport"),
|
||||
SalamanderPass = GetQueryDecoded(query, "obfs-password"),
|
||||
});
|
||||
ResolveHy2UriQuery(query, ref item);
|
||||
|
||||
return item;
|
||||
}
|
||||
@@ -42,8 +36,11 @@ public class Hysteria2Fmt : BaseFmt
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var url = string.Empty;
|
||||
var protocolExtraItem = item.GetProtocolExtra();
|
||||
if (!protocolExtraItem.Hy2RealmUrl.TrimEx().IsNullOrEmpty())
|
||||
{
|
||||
return ToUriForRealm(item);
|
||||
}
|
||||
|
||||
var remark = string.Empty;
|
||||
if (item.Remarks.IsNotEmpty())
|
||||
@@ -52,27 +49,7 @@ public class Hysteria2Fmt : BaseFmt
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
ToUriQueryLite(item, ref dicQuery);
|
||||
var protocolExtraItem = item.GetProtocolExtra();
|
||||
|
||||
if (!protocolExtraItem.SalamanderPass.IsNullOrEmpty())
|
||||
{
|
||||
dicQuery.Add("obfs", "salamander");
|
||||
dicQuery.Add("obfs-password", Utils.UrlEncode(protocolExtraItem.SalamanderPass));
|
||||
}
|
||||
if (!protocolExtraItem.Ports.IsNullOrEmpty())
|
||||
{
|
||||
dicQuery.Add("mport", Utils.UrlEncode(protocolExtraItem.Ports.Replace(':', '-')));
|
||||
}
|
||||
if (!item.CertSha.IsNullOrEmpty())
|
||||
{
|
||||
var sha = item.CertSha;
|
||||
var idx = sha.IndexOf(',');
|
||||
if (idx > 0)
|
||||
{
|
||||
sha = sha[..idx];
|
||||
}
|
||||
dicQuery.Add("pinSHA256", Utils.UrlEncode(sha));
|
||||
}
|
||||
ToHy2UriQuery(item, ref dicQuery);
|
||||
|
||||
return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Password, dicQuery, remark);
|
||||
}
|
||||
@@ -94,4 +71,155 @@ public class Hysteria2Fmt : BaseFmt
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static ProfileItem? ResolveRealm(string str, out string msg)
|
||||
{
|
||||
msg = ResUI.ConfigurationFormatIncorrect;
|
||||
ProfileItem item = new()
|
||||
{
|
||||
ConfigType = EConfigType.Hysteria2
|
||||
};
|
||||
var realmStr = str["hysteria2+".Length..];
|
||||
var result = HyRealm.TryParse(realmStr, out var realm);
|
||||
if (!result || realm == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var url = Utils.TryUri(str);
|
||||
if (url == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
item.Address = realm.RendezvousHost;
|
||||
item.Port = realm.RendezvousPort;
|
||||
item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
ResolveUriQuery(query, ref item);
|
||||
var authPassword = GetQueryDecoded(query, "auth");
|
||||
if (authPassword.IsNullOrEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
item.Password = authPassword;
|
||||
ResolveHy2UriQuery(query, ref item);
|
||||
item.SetProtocolExtra(item.GetProtocolExtra() with
|
||||
{
|
||||
Hy2RealmUrl = realm.ToUri(),
|
||||
});
|
||||
|
||||
msg = string.Empty;
|
||||
return item;
|
||||
}
|
||||
|
||||
public static string? ToUriForRealm(ProfileItem? item)
|
||||
{
|
||||
if (item == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
var protocolExtraItem = item.GetProtocolExtra();
|
||||
var result = HyRealm.TryParse(protocolExtraItem.Hy2RealmUrl, out var realm);
|
||||
if (!result || realm == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var remark = string.Empty;
|
||||
if (item.Remarks.IsNotEmpty())
|
||||
{
|
||||
remark = "#" + Utils.UrlEncode(item.Remarks);
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
ToUriQueryLite(item, ref dicQuery);
|
||||
ToHy2UriQuery(item, ref dicQuery);
|
||||
|
||||
dicQuery.Add("auth", Utils.UrlEncode(item.Password));
|
||||
|
||||
var queryBuilder = new StringBuilder();
|
||||
queryBuilder.Append('?');
|
||||
foreach (var kv in dicQuery)
|
||||
{
|
||||
queryBuilder.Append(kv.Key);
|
||||
queryBuilder.Append('=');
|
||||
queryBuilder.Append(kv.Value);
|
||||
queryBuilder.Append('&');
|
||||
}
|
||||
foreach (var stun in realm.StunList)
|
||||
{
|
||||
queryBuilder.Append("stun=");
|
||||
queryBuilder.Append(Utils.UrlEncode(stun));
|
||||
queryBuilder.Append('&');
|
||||
}
|
||||
var query = queryBuilder.ToString().TrimEnd('&');
|
||||
|
||||
var url = $"{Utils.UrlEncode(realm.Token)}@{GetIpv6(realm.RendezvousHost)}:{realm.RendezvousPort}";
|
||||
var scheme = realm.IsHttp ? Global.Hysteria2HttpRealmProtocolShare : Global.Hysteria2RealmProtocolShare;
|
||||
return $"{scheme}{url}/{realm.RealmName}{query}{remark}";
|
||||
}
|
||||
|
||||
private static void ResolveHy2UriQuery(NameValueCollection query, ref ProfileItem item)
|
||||
{
|
||||
if (item.CertSha.IsNullOrEmpty())
|
||||
{
|
||||
item.CertSha = GetQueryDecoded(query, "pinSHA256");
|
||||
}
|
||||
item.SetProtocolExtra(item.GetProtocolExtra() with
|
||||
{
|
||||
Ports = GetQueryDecoded(query, "mport"),
|
||||
SalamanderPass = GetQueryDecoded(query, "obfs-password"),
|
||||
// NOTE: The "PacketSize" parameter is not defined by the official URI Scheme, may remove or rename it in the future.
|
||||
GeckoMinPacketSize = GetQueryDecoded(query, "minPacketSize"),
|
||||
GeckoMaxPacketSize = GetQueryDecoded(query, "maxPacketSize"),
|
||||
});
|
||||
if (GetQueryDecoded(query, "obfs") == "gecko")
|
||||
{
|
||||
// Ensure the "PacketSize" parameters are present for gecko obfs.
|
||||
var protocolExtraItem = item.GetProtocolExtra();
|
||||
if (protocolExtraItem.GeckoMinPacketSize.IsNullOrEmpty())
|
||||
{
|
||||
protocolExtraItem = protocolExtraItem with
|
||||
{
|
||||
GeckoMinPacketSize = "512",
|
||||
};
|
||||
}
|
||||
if (protocolExtraItem.GeckoMaxPacketSize.IsNullOrEmpty())
|
||||
{
|
||||
protocolExtraItem = protocolExtraItem with
|
||||
{
|
||||
GeckoMaxPacketSize = "1200",
|
||||
};
|
||||
}
|
||||
item.SetProtocolExtra(protocolExtraItem);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ToHy2UriQuery(ProfileItem item, ref Dictionary<string, string> dicQuery)
|
||||
{
|
||||
if (!item.CertSha.IsNullOrEmpty()
|
||||
&& !item.CertSha.Contains(','))
|
||||
{
|
||||
var sha = item.CertSha;
|
||||
dicQuery.Add("pinSHA256", Utils.UrlEncode(sha));
|
||||
}
|
||||
var protocolExtraItem = item.GetProtocolExtra();
|
||||
var isGecko = !protocolExtraItem.GeckoMinPacketSize.IsNullOrEmpty() || !protocolExtraItem.GeckoMaxPacketSize.IsNullOrEmpty();
|
||||
if (!protocolExtraItem.SalamanderPass.IsNullOrEmpty())
|
||||
{
|
||||
dicQuery.Add("obfs", isGecko ? "gecko" : "salamander");
|
||||
dicQuery.Add("obfs-password", Utils.UrlEncode(protocolExtraItem.SalamanderPass));
|
||||
if (isGecko)
|
||||
{
|
||||
// NOTE: The "PacketSize" parameter is not defined by the official URI Scheme, may remove or rename it in the future.
|
||||
dicQuery.Add("minPacketSize", protocolExtraItem.GeckoMinPacketSize);
|
||||
dicQuery.Add("maxPacketSize", protocolExtraItem.GeckoMaxPacketSize);
|
||||
}
|
||||
}
|
||||
if (!protocolExtraItem.Ports.IsNullOrEmpty())
|
||||
{
|
||||
dicQuery.Add("mport", Utils.UrlEncode(protocolExtraItem.Ports.Replace(':', '-')));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ public class InnerFmt
|
||||
return null;
|
||||
}
|
||||
// Check Enum.IsDefined
|
||||
if (!Enum.IsDefined(typeof(EConfigType), profileItem.ConfigType))
|
||||
if (!Enum.IsDefined(profileItem.ConfigType))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class SocksFmt : BaseFmt
|
||||
return null;
|
||||
}
|
||||
var arr21 = arr1.First().Split(':');
|
||||
var indexPort = arr1.Last().LastIndexOf(":");
|
||||
var indexPort = arr1.Last().LastIndexOf(':');
|
||||
if (arr21.Length != 2 || indexPort < 0)
|
||||
{
|
||||
return null;
|
||||
@@ -99,12 +99,17 @@ public class SocksFmt : BaseFmt
|
||||
};
|
||||
// parse base64 UserInfo
|
||||
var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
|
||||
var userInfo = Utils.Base64Decode(rawUserInfo);
|
||||
var userInfoParts = userInfo.Split([':'], 2);
|
||||
if (userInfoParts.Length == 2)
|
||||
if (rawUserInfo.IsNotEmpty())
|
||||
{
|
||||
item.Username = userInfoParts.First();
|
||||
item.Password = userInfoParts[1];
|
||||
var userInfoParts = rawUserInfo.Contains(':')
|
||||
? rawUserInfo.Split(":", 2)
|
||||
: Utils.Base64Decode(rawUserInfo).Split(":", 2);
|
||||
|
||||
if (userInfoParts.Length == 2)
|
||||
{
|
||||
item.Username = userInfoParts.First();
|
||||
item.Password = userInfoParts.Last();
|
||||
}
|
||||
}
|
||||
|
||||
return item;
|
||||
|
||||
@@ -66,7 +66,9 @@ public class VmessFmt : BaseFmt
|
||||
sni = item.Sni,
|
||||
alpn = item.Alpn,
|
||||
fp = item.Fingerprint,
|
||||
insecure = item.AllowInsecure.Equals(Global.AllowInsecure.First()) ? "1" : "0"
|
||||
insecure = item.GetAllowInsecure() ? "1" : "0",
|
||||
vcn = item.VerifyPeerCertByName,
|
||||
pcs = item.CertSha
|
||||
};
|
||||
|
||||
var url = JsonUtils.Serialize(vmessQRCode);
|
||||
@@ -140,7 +142,9 @@ public class VmessFmt : BaseFmt
|
||||
item.Sni = Utils.ToString(vmessQRCode.sni);
|
||||
item.Alpn = Utils.ToString(vmessQRCode.alpn);
|
||||
item.Fingerprint = Utils.ToString(vmessQRCode.fp);
|
||||
item.AllowInsecure = vmessQRCode.insecure == "1" ? Global.AllowInsecure.First() : string.Empty;
|
||||
item.AllowInsecure = vmessQRCode.insecure == "1" ? Global.StringTrue : string.Empty;
|
||||
item.VerifyPeerCertByName = Utils.ToString(vmessQRCode.vcn);
|
||||
item.CertSha = Utils.ToString(vmessQRCode.pcs);
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
@@ -133,12 +133,12 @@ public static class SubscriptionHandler
|
||||
|
||||
if (!url.Contains("target="))
|
||||
{
|
||||
url += string.Format("&target={0}", item.ConvertTarget);
|
||||
url += $"&target={item.ConvertTarget}";
|
||||
}
|
||||
|
||||
if (!url.Contains("config="))
|
||||
{
|
||||
url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
|
||||
url += $"&config={Global.SubConvertConfig.FirstOrDefault()}";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
namespace ServiceLib.Handler.SysProxy;
|
||||
|
||||
[SupportedOSPlatform("linux")]
|
||||
public static class ProxySettingLinux
|
||||
{
|
||||
private static readonly string _proxySetFileName = $"{Global.ProxySetLinuxShellFileName.Replace(Global.NamespaceSample, "")}.sh";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
namespace ServiceLib.Handler.SysProxy;
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
public static class ProxySettingOSX
|
||||
{
|
||||
private static readonly string _proxySetFileName = $"{Global.ProxySetOSXShellFileName.Replace(Global.NamespaceSample, "")}.sh";
|
||||
|
||||
@@ -2,6 +2,7 @@ using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionO
|
||||
|
||||
namespace ServiceLib.Handler.SysProxy;
|
||||
|
||||
[SupportedOSPlatform("windows")]
|
||||
public static class ProxySettingWindows
|
||||
{
|
||||
private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
|
||||
|
||||
@@ -88,6 +88,7 @@ public static class SysProxyHandler
|
||||
}
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("windows")]
|
||||
private static async Task SetWindowsProxyPac(int port)
|
||||
{
|
||||
var portPac = AppManager.Instance.GetLocalPort(EInboundProtocol.pac);
|
||||
|
||||
@@ -48,6 +48,13 @@ public sealed class AppManager
|
||||
}
|
||||
}
|
||||
|
||||
public Dictionary<ECoreType, string> LastCheckUpdateResults { get; set; } = new();
|
||||
|
||||
public void SetLastCheckUpdateResult(ECoreType coreType, string result)
|
||||
{
|
||||
LastCheckUpdateResults[coreType] = result;
|
||||
}
|
||||
|
||||
#endregion Property
|
||||
|
||||
#region App
|
||||
@@ -237,9 +244,26 @@ public sealed class AppManager
|
||||
{
|
||||
return [];
|
||||
}
|
||||
return await SQLiteHelper.Instance.TableAsync<ProfileItem>()
|
||||
.Where(it => ids.Contains(it.IndexId))
|
||||
.ToListAsync();
|
||||
|
||||
if (ids.Count <= Global.SqliteMaxBatchSize)
|
||||
{
|
||||
return await SQLiteHelper.Instance.TableAsync<ProfileItem>()
|
||||
.Where(it => ids.Contains(it.IndexId))
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
var items = new List<ProfileItem>();
|
||||
for (var size = 0; size < ids.Count; size += Global.SqliteMaxBatchSize)
|
||||
{
|
||||
var chunk = ids.Skip(size).Take(Global.SqliteMaxBatchSize).ToList();
|
||||
var chunkItems = await SQLiteHelper.Instance.TableAsync<ProfileItem>()
|
||||
.Where(it => chunk.Contains(it.IndexId))
|
||||
.ToListAsync();
|
||||
|
||||
items.AddRange(chunkItems);
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, ProfileItem>> GetProfileItemsByIndexIdsAsMap(IEnumerable<string> indexIds)
|
||||
@@ -250,18 +274,11 @@ public sealed class AppManager
|
||||
|
||||
public async Task<List<ProfileItem>> GetProfileItemsOrderedByIndexIds(IEnumerable<string> indexIds)
|
||||
{
|
||||
var idList = indexIds.Where(id => !id.IsNullOrEmpty()).Distinct().ToList();
|
||||
if (idList.Count == 0)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
var items = await SQLiteHelper.Instance.TableAsync<ProfileItem>()
|
||||
.Where(it => idList.Contains(it.IndexId))
|
||||
.ToListAsync();
|
||||
var ids = indexIds.Where(id => !id.IsNullOrEmpty()).Distinct().ToList();
|
||||
var items = await GetProfileItemsByIndexIds(ids);
|
||||
var itemMap = items.ToDictionary(it => it.IndexId);
|
||||
|
||||
return idList.Select(id => itemMap.GetValueOrDefault(id))
|
||||
return ids.Select(itemMap.GetValueOrDefault)
|
||||
.Where(item => item != null)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
@@ -4,16 +4,15 @@ using System.Security.Cryptography.X509Certificates;
|
||||
namespace ServiceLib.Manager;
|
||||
|
||||
/// <summary>
|
||||
/// Manager for certificate operations with CA pinning to prevent MITM attacks
|
||||
/// Manager for certificate operations with CA pinning to prevent MITM attacks
|
||||
/// </summary>
|
||||
public class CertPemManager
|
||||
{
|
||||
private static readonly string _tag = "CertPemManager";
|
||||
private static readonly Lazy<CertPemManager> _instance = new(() => new());
|
||||
public static CertPemManager Instance => _instance.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Trusted CA certificate thumbprints (SHA256) to prevent MITM attacks
|
||||
/// Trusted CA certificate thumbprints (SHA256) to prevent MITM attacks
|
||||
/// </summary>
|
||||
private static readonly HashSet<string> TrustedCaThumbprints = new(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
@@ -24,21 +23,17 @@ public class CertPemManager
|
||||
"D7A7A0FB5D7E2731D771E9484EBCDEF71D5F0C3E0A2948782BC83EE0EA699EF4", // Comodo AAA Services root
|
||||
"85A0DD7DD720ADB7FF05F83D542B209DC7FF4528F7D677B18389FEA5E5C49E86", // QuoVadis Root CA 2
|
||||
"18F1FC7F205DF8ADDDEB7FE007DD57E3AF375A9C4D8D73546BF4F1FED1E18D35", // QuoVadis Root CA 3
|
||||
"CECDDC905099D8DADFC5B1D209B737CBE2C18CFB2C10C0FF0BCF0D3286FC1AA2", // XRamp Global CA Root
|
||||
"C3846BF24B9E93CA64274C0EC67C1ECC5E024FFCACD2D74019350E81FE546AE4", // Go Daddy Class 2 CA
|
||||
"1465FA205397B876FAA6F0A9958E5590E40FCC7FAA4FB7C2C8677521FB5FB658", // Starfield Class 2 CA
|
||||
"3E9099B5015E8F486C00BCEA9D111EE721FABA355A89BCF1DF69561E3DC6325C", // DigiCert Assured ID Root CA
|
||||
"4348A0E9444C78CB265E058D5E8944B4D84F9662BD26DB257F8934A443C70161", // DigiCert Global Root CA
|
||||
"7431E5F4C3C1CE4690774F0B61E05440883BA9A01ED00BA6ABD7806ED3B118CF", // DigiCert High Assurance EV Root CA
|
||||
"62DD0BE9B9F50A163EA0F8E75C053B1ECA57EA55C8688F647C6881F2C8357B95", // SwissSign Gold CA - G2
|
||||
"F1C1B50AE5A20DD8030EC9F6BC24823DD367B5255759B4E71B61FCE9F7375D73", // SecureTrust CA
|
||||
"4200F5043AC8590EBB527D209ED1503029FBCBD41CA1B506EC27F15ADE7DAC69", // Secure Global CA
|
||||
"0C2CD63DF7806FA399EDE809116B575BF87989F06518F9808C860503178BAF66", // COMODO Certification Authority
|
||||
"1793927A0614549789ADCE2F8F34F7F0B66D0F3AE3A3B84D21EC15DBBA4FADC7", // COMODO ECC Certification Authority
|
||||
"41C923866AB4CAD6B7AD578081582E020797A6CBDF4FFF78CE8396B38937D7F5", // OISTE WISeKey Global Root GA CA
|
||||
"E3B6A2DB2ED7CE48842F7AC53241C7B71D54144BFB40C11F3F1D0B42F5EEA12D", // Certigna
|
||||
"C0A6F4DC63A24BFDCF54EF2A6A082A0A72DE35803E2FF5FF527AE5D87206DFD5", // ePKI Root Certification Authority
|
||||
"EAA962C4FA4A6BAFEBE415196D351CCD888D4F53F3FA8AE6D7C466A94E6042BB", // certSIGN ROOT CA
|
||||
"6C61DAC3A2DEF031506BE036D2A6FE401994FBD13DF9C8D466599274C446EC98", // NetLock Arany (Class Gold) Főtanúsítvány
|
||||
"3C5F81FEA5FAB82C64BFA2EAECAFCDE8E077FC8620A7CAE537163DF36EDBF378", // Microsec e-Szigno Root CA 2009
|
||||
"CBB522D7B7F127AD6A0113865BDF1CD4102E7D0759AF635A7CF4720DC963C53B", // GlobalSign Root CA - R3
|
||||
@@ -46,10 +41,6 @@ public class CertPemManager
|
||||
"45140B3247EB9CC8C5B4F0D7B53091F73292089E6E5A63E2749DD3ACA9198EDA", // Go Daddy Root Certificate Authority - G2
|
||||
"2CE1CB0BF9D2F9E102993FBE215152C3B2DD0CABDE1C68E5319B839154DBB7F5", // Starfield Root Certificate Authority - G2
|
||||
"568D6905A2C88708A4B3025190EDCFEDB1974A606A13C6E5290FCB2AE63EDAB5", // Starfield Services Root Certificate Authority - G2
|
||||
"0376AB1D54C5F9803CE4B2E201A0EE7EEF7B57B636E8A93C9B8D4860C96F5FA7", // AffirmTrust Commercial
|
||||
"0A81EC5A929777F145904AF38D5D509F66B5E2C58FCDB531058B0E17F3F0B41B", // AffirmTrust Networking
|
||||
"70A73F7F376B60074248904534B11482D5BF0E698ECC498DF52577EBF2E93B9A", // AffirmTrust Premium
|
||||
"BD71FDF6DA97E4CF62D1647ADD2581B07D79ADF8397EB4ECBA9C5E8488821423", // AffirmTrust Premium ECC
|
||||
"5C58468D55F58E497E743982D2B50010B6D165374ACF83A7D4A32DB768C4408E", // Certum Trusted Network CA
|
||||
"BFD88FE1101C41AE3E801BF8BE56350EE9BAD1A6B9BD515EDC5C6D5B8711AC44", // TWCA Root Certification Authority
|
||||
"513B2CECB810D4CDE5DD85391ADFC6C2DD60D87BB736D2B521484AA47A0EBEF6", // Security Communication RootCA2
|
||||
@@ -62,7 +53,6 @@ public class CertPemManager
|
||||
"E23D4A036D7B70E9F595B1422079D2B91EDFBB1FB651A0633EAA8A9DC5F80703", // CA Disig Root R2
|
||||
"9A6EC012E1A7DA9DBE34194D478AD7C0DB1822FB071DF12981496ED104384113", // ACCVRAIZ1
|
||||
"59769007F7685D0FCD50872F9F95D5755A5B2B457D81F3692B610A98672F0E1B", // TWCA Global Root CA
|
||||
"DD6936FE21F8F077C123A1A521C12224F72255B73E03A7260693E8A24B0FA389", // TeliaSonera Root CA v1
|
||||
"91E2F5788D5810EBA7BA58737DE1548A8ECACD014598BC0B143E041B17052552", // T-TeleSec GlobalRoot Class 2
|
||||
"F356BEA244B7A91EB35D53CA9AD7864ACE018E2D35D5F8F96DDF68A6F41AA474", // Atos TrustedRoot 2011
|
||||
"8A866FD1B276B57E578E921C65828A2BED58E9F2F288054134B7F1F4BFC9CC74", // QuoVadis Root CA 1 G3
|
||||
@@ -116,16 +106,12 @@ public class CertPemManager
|
||||
"C741F70F4B2A8D88BF2E71C14122EF53EF10EBA0CFA5E64CFA20F418853073E0", // Microsoft RSA Root Certificate Authority 2017
|
||||
"BEB00B30839B9BC32C32E4447905950641F26421B15ED089198B518AE2EA1B99", // e-Szigno Root CA 2017
|
||||
"657CFE2FA73FAA38462571F332A2363A46FCE7020951710702CDFBB6EEDA3305", // certSIGN Root CA G2
|
||||
"97552015F5DDFC3C8788C006944555408894450084F100867086BC1A2BB58DC8", // Trustwave Global Certification Authority
|
||||
"945BBC825EA554F489D1FD51A73DDF2EA624AC7019A05205225C22A78CCFA8B4", // Trustwave Global ECC P256 Certification Authority
|
||||
"55903859C8C0C3EBB8759ECE4E2557225FF5758BBD38EBD48276601E1BD58097", // Trustwave Global ECC P384 Certification Authority
|
||||
"88F438DCF8FFD1FA8F429115FFE5F82AE1E06E0C70C375FAAD717B34A49E7265", // NAVER Global Root Certification Authority
|
||||
"554153B13D2CF9DDB753BFBE1A4E0AE08D0AA4187058FE60A2B862B2E4B87BCB", // AC RAIZ FNMT-RCM SERVIDORES SEGUROS
|
||||
"319AF0A7729E6F89269C131EA6A3A16FCD86389FDCAB3C47A4A675C161A3F974", // GlobalSign Secure Mail Root R45
|
||||
"5CBF6FB81FD417EA4128CD6F8172A3C9402094F74AB2ED3A06B4405D04F30B19", // GlobalSign Secure Mail Root E45
|
||||
"4FA3126D8D3A11D1C4855A4F807CBAD6CF919D3A5A88B03BEA2C6372D93C40C9", // GlobalSign Root R46
|
||||
"CBB9C44D84B8043E1050EA31A69F514955D7BFD2E2C6B49301019AD61D9F5058", // GlobalSign Root E46
|
||||
"9A296A5182D1D451A2E37F439B74DAAFA267523329F90F9A0D2007C334E23C9A", // GLOBALTRUST 2020
|
||||
"FB8FEC759169B9106B1E511644C618C51304373F6C0643088D8BEFFD1B997599", // ANF Secure Server Root CA
|
||||
"6B328085625318AA50D173C98D8BDA09D57E27413D114CF787A0F5D06C030CF6", // Certum EC-384 CA
|
||||
"FE7696573855773E37A95E7AD4D9CC96C30157C15D31765BA9B15704E1AE78FD", // Certum Trusted Root CA
|
||||
@@ -179,7 +165,6 @@ public class CertPemManager
|
||||
"578AF4DED0853F4E5998DB4AEAF9CBEA8D945F60B620A38D1A3C13B2BC7BA8E1", // Telekom Security TLS ECC Root 2020
|
||||
"78A656344F947E9CC0F734D9053D32F6742086B6B9CD2CAE4FAE1A2E4EFDE048", // Telekom Security SMIME RSA Root 2023
|
||||
"EFC65CADBB59ADB6EFE84DA22311B35624B71B3B1EA0DA8B6655174EC8978646", // Telekom Security TLS RSA Root 2023
|
||||
"BEF256DAF26E9C69BDEC1602359798F3CAF71821A03E018257C53C65617F3D4A", // FIRMAPROFESIONAL CA ROOT-A WEB
|
||||
"3F63BB2814BE174EC8B6439CF08D6D56F0B7C405883A5648A334424D6B3EC558", // TWCA CYBER Root CA
|
||||
"3A0072D49FFC04E996C59AEB75991D3C340F3615D6FD4DCE90AC0B3D88EAD4F4", // TWCA Global Root CA G2
|
||||
"3F034BB5704D44B2D08545A02057DE93EBF3905FCE721ACBC730C06DDAEE904E", // SecureSign Root CA12
|
||||
@@ -200,10 +185,13 @@ public class CertPemManager
|
||||
"B49141502D00663D740F2E7EC340C52800962666121A36D09CF7DD2B90384FB4", // e-Szigno TLS Root CA 2023
|
||||
};
|
||||
|
||||
public static CertPemManager Instance => _instance.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Get certificate in PEM format from a server with CA pinning validation
|
||||
/// Get certificate in PEM format from a server with CA pinning validation
|
||||
/// </summary>
|
||||
public async Task<(string?, string?)> GetCertPemAsync(string target, string serverName, int timeout = 4, bool allowInsecure = false)
|
||||
public async Task<(string?, string?)> GetCertPemAsync(string target, string serverName,
|
||||
List<string>? verifyPeerCertByName = null, int timeout = 4)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -216,13 +204,13 @@ public class CertPemManager
|
||||
await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
|
||||
|
||||
var callback = new RemoteCertificateValidationCallback((sender, certificate, chain, sslPolicyErrors) =>
|
||||
ValidateServerCertificate(sender, certificate, chain, sslPolicyErrors, allowInsecure));
|
||||
ValidateServerCertificate(sender, certificate, chain, sslPolicyErrors, verifyPeerCertByName ?? []));
|
||||
await using var ssl = new SslStream(client.GetStream(), false, callback);
|
||||
|
||||
var sslOptions = new SslClientAuthenticationOptions
|
||||
{
|
||||
TargetHost = serverName,
|
||||
RemoteCertificateValidationCallback = callback
|
||||
RemoteCertificateValidationCallback = callback,
|
||||
};
|
||||
|
||||
await ssl.AuthenticateAsClientAsync(sslOptions, cts.Token);
|
||||
@@ -249,9 +237,10 @@ public class CertPemManager
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get certificate chain in PEM format from a server with CA pinning validation
|
||||
/// Get certificate chain in PEM format from a server with CA pinning validation
|
||||
/// </summary>
|
||||
public async Task<(List<string>, string?)> GetCertChainPemAsync(string target, string serverName, int timeout = 4, bool allowInsecure = false)
|
||||
public async Task<(List<string>, string?)> GetCertChainPemAsync(string target, string serverName,
|
||||
List<string>? verifyPeerCertByName = null, int timeout = 4)
|
||||
{
|
||||
var pemList = new List<string>();
|
||||
try
|
||||
@@ -265,13 +254,13 @@ public class CertPemManager
|
||||
await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
|
||||
|
||||
var callback = new RemoteCertificateValidationCallback((sender, certificate, chain, sslPolicyErrors) =>
|
||||
ValidateServerCertificate(sender, certificate, chain, sslPolicyErrors, allowInsecure));
|
||||
ValidateServerCertificate(sender, certificate, chain, sslPolicyErrors, verifyPeerCertByName ?? []));
|
||||
await using var ssl = new SslStream(client.GetStream(), false, callback);
|
||||
|
||||
var sslOptions = new SslClientAuthenticationOptions
|
||||
{
|
||||
TargetHost = serverName,
|
||||
RemoteCertificateValidationCallback = callback
|
||||
RemoteCertificateValidationCallback = callback,
|
||||
};
|
||||
|
||||
await ssl.AuthenticateAsClientAsync(sslOptions, cts.Token);
|
||||
@@ -301,42 +290,35 @@ public class CertPemManager
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Validate server certificate with CA pinning
|
||||
/// Validate server certificate with CA pinning
|
||||
/// </summary>
|
||||
private bool ValidateServerCertificate(
|
||||
private static bool ValidateServerCertificate(
|
||||
object _,
|
||||
X509Certificate? certificate,
|
||||
X509Chain? chain,
|
||||
SslPolicyErrors sslPolicyErrors,
|
||||
bool allowInsecure)
|
||||
List<string> verifyPeerCertByName)
|
||||
{
|
||||
if (certificate == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// In insecure mode, accept any certificate so self-signed certs can be fetched.
|
||||
if (allowInsecure)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check certificate name mismatch
|
||||
if (sslPolicyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Build certificate chain
|
||||
var cert2 = certificate as X509Certificate2 ?? new X509Certificate2(certificate);
|
||||
var certChain = chain ?? new X509Chain();
|
||||
|
||||
certChain.ChainPolicy.RevocationMode = X509RevocationMode.Online;
|
||||
certChain.ChainPolicy.RevocationFlag = X509RevocationFlag.ExcludeRoot;
|
||||
certChain.ChainPolicy.VerificationFlags = X509VerificationFlags.NoFlag;
|
||||
certChain.ChainPolicy.VerificationTime = DateTime.Now;
|
||||
if (chain == null)
|
||||
{
|
||||
certChain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
|
||||
certChain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
|
||||
certChain.ChainPolicy.VerificationTime = DateTime.UtcNow;
|
||||
|
||||
certChain.Build(cert2);
|
||||
if (!certChain.Build(cert2))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Find root CA
|
||||
if (certChain.ChainElements.Count == 0)
|
||||
@@ -344,10 +326,37 @@ public class CertPemManager
|
||||
return false;
|
||||
}
|
||||
|
||||
var rootCert = certChain.ChainElements[certChain.ChainElements.Count - 1].Certificate;
|
||||
var rootCert = certChain.ChainElements[^1].Certificate;
|
||||
var rootThumbprint = rootCert.GetCertHashString(HashAlgorithmName.SHA256);
|
||||
|
||||
return TrustedCaThumbprints.Contains(rootThumbprint);
|
||||
if (!TrustedCaThumbprints.Contains(rootThumbprint))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!sslPolicyErrors.HasFlag(
|
||||
SslPolicyErrors.RemoteCertificateNameMismatch))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (verifyPeerCertByName.Count == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (var ext in cert2.Extensions)
|
||||
{
|
||||
if (ext is not X509SubjectAlternativeNameExtension san)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
return san.EnumerateDnsNames().Any(dnsName =>
|
||||
verifyPeerCertByName.Contains(dnsName, StringComparer.OrdinalIgnoreCase));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static string ExportCertToPem(X509Certificate2 cert)
|
||||
@@ -358,8 +367,8 @@ public class CertPemManager
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Parse concatenated PEM certificates string into a list of individual certificates
|
||||
/// Normalizes format: removes line breaks from base64 content for better compatibility
|
||||
/// Parse concatenated PEM certificates string into a list of individual certificates
|
||||
/// Normalizes format: removes line breaks from base64 content for better compatibility
|
||||
/// </summary>
|
||||
/// <param name="pemChain">Concatenated PEM certificates string (supports both \r\n and \n line endings)</param>
|
||||
/// <returns>List of individual PEM certificate strings with normalized format</returns>
|
||||
@@ -411,18 +420,13 @@ public class CertPemManager
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Concatenate a list of PEM certificates into a single string
|
||||
/// Concatenate a list of PEM certificates into a single string
|
||||
/// </summary>
|
||||
/// <param name="pemList">List of individual PEM certificate strings</param>
|
||||
/// <returns>Concatenated PEM certificates string</returns>
|
||||
public static string ConcatenatePemChain(IEnumerable<string> pemList)
|
||||
public static string ConcatenatePemChain(IEnumerable<string>? pemList)
|
||||
{
|
||||
if (pemList == null)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
return string.Concat(pemList);
|
||||
return pemList == null ? string.Empty : string.Concat(pemList);
|
||||
}
|
||||
|
||||
public static string GetCertSha256Thumbprint(string pemCert, bool includeColon = false)
|
||||
@@ -431,11 +435,7 @@ public class CertPemManager
|
||||
{
|
||||
var cert = X509Certificate2.CreateFromPem(pemCert);
|
||||
var thumbprint = cert.GetCertHashString(HashAlgorithmName.SHA256);
|
||||
if (includeColon)
|
||||
{
|
||||
return string.Join(":", thumbprint.Chunk(2).Select(c => new string(c)));
|
||||
}
|
||||
return thumbprint;
|
||||
return includeColon ? string.Join(":", thumbprint.Chunk(2).Select(c => new string(c))) : thumbprint;
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using static ServiceLib.Models.ClashProxies;
|
||||
using static ServiceLib.Models.Dto.ClashProxies;
|
||||
|
||||
namespace ServiceLib.Manager;
|
||||
|
||||
@@ -45,19 +45,14 @@ public sealed class ClashApiManager
|
||||
{
|
||||
await GetClashProxiesAsync();
|
||||
}
|
||||
lstProxy = new List<ClashProxyModel>();
|
||||
foreach (var kv in _proxies ?? [])
|
||||
{
|
||||
if (Global.notAllowTestType.Contains(kv.Value.type?.ToLower()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
lstProxy.Add(new ClashProxyModel()
|
||||
{
|
||||
Name = kv.Value.name,
|
||||
Type = kv.Value.type?.ToLower(),
|
||||
});
|
||||
}
|
||||
lstProxy = [];
|
||||
lstProxy.AddRange(from kv in _proxies ?? []
|
||||
where !Global.notAllowTestType.Contains(kv.Value.type?.ToLower())
|
||||
select new ClashProxyModel()
|
||||
{
|
||||
Name = kv.Value.name,
|
||||
Type = kv.Value.type?.ToLower(),
|
||||
});
|
||||
}
|
||||
|
||||
if (lstProxy is not { Count: > 0 })
|
||||
|
||||
@@ -50,6 +50,50 @@ public sealed class CoreInfoManager
|
||||
return fileName;
|
||||
}
|
||||
|
||||
public List<ECoreType> GetCheckUpdateCoreTypes()
|
||||
{
|
||||
var lst = new List<ECoreType>();
|
||||
|
||||
if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
|
||||
{
|
||||
if (IsCheckUpdateSupported(ECoreType.v2rayN))
|
||||
{
|
||||
lst.Add(ECoreType.v2rayN);
|
||||
}
|
||||
|
||||
if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
|
||||
{
|
||||
lst.Add(ECoreType.Xray);
|
||||
lst.Add(ECoreType.mihomo);
|
||||
lst.Add(ECoreType.sing_box);
|
||||
}
|
||||
}
|
||||
|
||||
return lst;
|
||||
}
|
||||
|
||||
public bool IsCheckUpdateSupported(ECoreType type)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
ECoreType.v2rayN => !Utils.IsPackagedInstall(),
|
||||
ECoreType.Xray => true,
|
||||
ECoreType.mihomo => true,
|
||||
ECoreType.sing_box => true,
|
||||
_ => false,
|
||||
};
|
||||
}
|
||||
|
||||
public bool GetCheckPreRelease(ECoreType type, bool preRelease)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
ECoreType.v2rayN => preRelease,
|
||||
ECoreType.Xray => preRelease,
|
||||
_ => false,
|
||||
};
|
||||
}
|
||||
|
||||
private void InitCoreInfo()
|
||||
{
|
||||
var urlN = GetCoreUrl(ECoreType.v2rayN);
|
||||
@@ -69,6 +113,7 @@ public sealed class CoreInfoManager
|
||||
DownloadUrlLinux64 = urlN + "/download/{0}/v2rayN-linux-64.zip",
|
||||
DownloadUrlLinuxArm64 = urlN + "/download/{0}/v2rayN-linux-arm64.zip",
|
||||
DownloadUrlLinuxRiscV64 = urlN + "/download/{0}/v2rayN-linux-riscv64.zip",
|
||||
DownloadUrlLinuxLoong64 = urlN + "/download/{0}/v2rayN-linux-loong64.zip",
|
||||
DownloadUrlOSX64 = urlN + "/download/{0}/v2rayN-macos-64.zip",
|
||||
DownloadUrlOSXArm64 = urlN + "/download/{0}/v2rayN-macos-arm64.zip",
|
||||
},
|
||||
@@ -113,6 +158,7 @@ public sealed class CoreInfoManager
|
||||
DownloadUrlLinux64 = urlXray + "/download/{0}/Xray-linux-64.zip",
|
||||
DownloadUrlLinuxArm64 = urlXray + "/download/{0}/Xray-linux-arm64-v8a.zip",
|
||||
DownloadUrlLinuxRiscV64 = urlXray + "/download/{0}/Xray-linux-riscv64.zip",
|
||||
DownloadUrlLinuxLoong64 = urlXray + "/download/{0}/Xray-linux-loong64.zip",
|
||||
DownloadUrlOSX64 = urlXray + "/download/{0}/Xray-macos-64.zip",
|
||||
DownloadUrlOSXArm64 = urlXray + "/download/{0}/Xray-macos-arm64-v8a.zip",
|
||||
Match = "Xray",
|
||||
@@ -136,6 +182,7 @@ public sealed class CoreInfoManager
|
||||
DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-v1-{0}.gz",
|
||||
DownloadUrlLinuxArm64 = urlMihomo + "/download/{0}/mihomo-linux-arm64-{0}.gz",
|
||||
DownloadUrlLinuxRiscV64 = urlMihomo + "/download/{0}/mihomo-linux-riscv64-{0}.gz",
|
||||
DownloadUrlLinuxLoong64 = urlMihomo + "/download/{0}/mihomo-linux-loong64-abi2-{0}.gz",
|
||||
DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-v1-{0}.gz",
|
||||
DownloadUrlOSXArm64 = urlMihomo + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
|
||||
Match = "Mihomo",
|
||||
@@ -179,6 +226,7 @@ public sealed class CoreInfoManager
|
||||
DownloadUrlLinux64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
|
||||
DownloadUrlLinuxArm64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
|
||||
DownloadUrlLinuxRiscV64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-riscv64.tar.gz",
|
||||
DownloadUrlLinuxLoong64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-loong64.tar.gz",
|
||||
DownloadUrlOSX64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
|
||||
DownloadUrlOSXArm64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
|
||||
Match = "sing-box",
|
||||
@@ -270,6 +318,7 @@ public sealed class CoreInfoManager
|
||||
names.Add("mihomo-linux-amd64");
|
||||
names.Add("mihomo-linux-arm64");
|
||||
names.Add("mihomo-linux-riscv64");
|
||||
names.Add("mihomo-linux-loong64-abi2");
|
||||
}
|
||||
else if (Utils.IsMacOS())
|
||||
{
|
||||
|
||||
@@ -8,6 +8,7 @@ public class CoreManager
|
||||
private static readonly Lazy<CoreManager> _instance = new(() => new());
|
||||
public static CoreManager Instance => _instance.Value;
|
||||
private Config _config;
|
||||
[SupportedOSPlatform("windows")]
|
||||
private WindowsJobService? _processJob;
|
||||
private ProcessService? _processService;
|
||||
private ProcessService? _processPreService;
|
||||
@@ -89,6 +90,7 @@ public class CoreManager
|
||||
}
|
||||
|
||||
await CoreStart(mainContext);
|
||||
await WaitForProxyPort(preContext);
|
||||
await CoreStartPreService(preContext);
|
||||
|
||||
AppManager.Instance.RunningCoreType = preContext?.RunCoreType ?? mainContext.RunCoreType;
|
||||
@@ -212,6 +214,75 @@ public class CoreManager
|
||||
await _updateFunc?.Invoke(notify, msg);
|
||||
}
|
||||
|
||||
private static async Task WaitForProxyPort(CoreConfigContext? preContext, int timeoutMs = 5000)
|
||||
{
|
||||
if (preContext is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!preContext.AppConfig.TunModeItem.EnableTun)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
using var rootCts = new CancellationTokenSource(TimeSpan.FromMilliseconds(timeoutMs));
|
||||
var rootToken = rootCts.Token;
|
||||
|
||||
var port = preContext.Node.Port;
|
||||
// SOCKS5 client greeting: VER=5, NMETHODS=1, METHOD=0x00 (no auth)
|
||||
ReadOnlyMemory<byte> greeting = new byte[] { 0x05, 0x01, 0x00 };
|
||||
var buf = new byte[2];
|
||||
|
||||
while (!rootToken.IsCancellationRequested)
|
||||
{
|
||||
using var tcp = new TcpClient();
|
||||
using var attemptCts = new CancellationTokenSource(TimeSpan.FromMilliseconds(50));
|
||||
using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(rootToken, attemptCts.Token);
|
||||
var linkedToken = linkedCts.Token;
|
||||
try
|
||||
{
|
||||
await tcp.ConnectAsync(Global.Loopback, port, linkedToken);
|
||||
var stream = tcp.GetStream();
|
||||
|
||||
await stream.WriteAsync(greeting, linkedToken);
|
||||
|
||||
var read = await stream.ReadAsync(buf.AsMemory(0, 2), linkedToken);
|
||||
|
||||
// Server selection: VER=5, METHOD=0x00 — proxy is fully ready
|
||||
if (read == 2 && buf[0] == 0x05)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
if (!rootToken.IsCancellationRequested)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
Logging.SaveLog($"WaitForProxyPort Timeout waiting for proxy port {port} to be ready.");
|
||||
return;
|
||||
}
|
||||
catch (SocketException ex) when (ex.SocketErrorCode == SocketError.ConnectionRefused)
|
||||
{
|
||||
// Connection refused, proxy not ready yet, wait 50ms before retrying
|
||||
try
|
||||
{
|
||||
await Task.Delay(50, rootToken);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
Logging.SaveLog($"WaitForProxyPort Timeout waiting for proxy port {port} to be ready.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Ignore other exceptions and continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Private
|
||||
|
||||
#region Process
|
||||
@@ -229,7 +300,7 @@ public class CoreManager
|
||||
{
|
||||
if (mayNeedSudo
|
||||
&& _config.TunModeItem.EnableTun
|
||||
&& (coreInfo.CoreType is ECoreType.sing_box or ECoreType.mihomo)
|
||||
&& (coreInfo.CoreType is ECoreType.sing_box or ECoreType.mihomo or ECoreType.Xray)
|
||||
&& Utils.IsNonWindows())
|
||||
{
|
||||
_linuxSudo = true;
|
||||
|
||||
@@ -9,7 +9,7 @@ public class GroupProfileManager
|
||||
|
||||
public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo)
|
||||
{
|
||||
return await HasCycle(indexId, extraInfo, new HashSet<string>(), new HashSet<string>());
|
||||
return await HasCycle(indexId, extraInfo, [], []);
|
||||
}
|
||||
|
||||
private static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo, HashSet<string> visited, HashSet<string> stack)
|
||||
@@ -55,7 +55,7 @@ public class GroupProfileManager
|
||||
var childItems = await AppManager.Instance.GetProfileItemsByIndexIds(childIds);
|
||||
foreach (var childItem in childItems)
|
||||
{
|
||||
if (await HasCycle(childItem.IndexId, childItem?.GetProtocolExtra(), visited, stack))
|
||||
if (await HasCycle(childItem.IndexId, childItem.GetProtocolExtra(), visited, stack))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -71,7 +71,7 @@ public class GroupProfileManager
|
||||
|
||||
public static async Task<(List<ProfileItem> Items, ProtocolExtraItem? Extra)> GetChildProfileItems(ProfileItem profileItem)
|
||||
{
|
||||
var protocolExtra = profileItem?.GetProtocolExtra();
|
||||
var protocolExtra = profileItem.GetProtocolExtra();
|
||||
return (await GetChildProfileItemsByProtocolExtra(protocolExtra), protocolExtra);
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ public class ProfileExManager
|
||||
public async Task ClearAll()
|
||||
{
|
||||
await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem ");
|
||||
_lstProfileEx = new();
|
||||
_lstProfileEx = [];
|
||||
}
|
||||
|
||||
public async Task SaveTo()
|
||||
@@ -150,6 +150,14 @@ public class ProfileExManager
|
||||
IndexIdEnqueue(indexId);
|
||||
}
|
||||
|
||||
public void SetTestIpInfo(string indexId, string ipInfo)
|
||||
{
|
||||
var profileEx = GetProfileExItem(indexId);
|
||||
|
||||
profileEx.IpInfo = ipInfo;
|
||||
IndexIdEnqueue(indexId);
|
||||
}
|
||||
|
||||
public void SetSort(string indexId, int sort)
|
||||
{
|
||||
var profileEx = GetProfileExItem(indexId);
|
||||
@@ -174,6 +182,6 @@ public class ProfileExManager
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return _lstProfileEx.Max(t => t == null ? 0 : t.Sort);
|
||||
return _lstProfileEx.Max(t => t?.Sort ?? 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ public class StatisticsManager
|
||||
{
|
||||
await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem ");
|
||||
_serverStatItem = null;
|
||||
_lstServerStat = new();
|
||||
_lstServerStat = [];
|
||||
}
|
||||
|
||||
public async Task SaveTo()
|
||||
|
||||
@@ -56,7 +56,7 @@ public class TaskManager
|
||||
{
|
||||
//Logging.SaveLog("Execute delete expired files");
|
||||
|
||||
FileUtils.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
|
||||
FileUtils.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1), "Test");
|
||||
FileUtils.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
|
||||
FileUtils.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
|
||||
|
||||
@@ -70,6 +70,18 @@ public class TaskManager
|
||||
}
|
||||
}
|
||||
|
||||
//Execute once 24 hour
|
||||
if (numOfExecuted % 1440 == 1)
|
||||
{
|
||||
try
|
||||
{
|
||||
await UpdateTaskRunCheckUpdate();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logging.SaveLog("ScheduledTasks - UpdateTaskRunCheckUpdate", ex);
|
||||
}
|
||||
}
|
||||
numOfExecuted++;
|
||||
}
|
||||
}
|
||||
@@ -117,4 +129,23 @@ public class TaskManager
|
||||
}).UpdateGeoFileAll();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task UpdateTaskRunCheckUpdate()
|
||||
{
|
||||
Logging.SaveLog("Execute check update");
|
||||
|
||||
var updateService = new UpdateService(_config, async (success, msg) => await Task.CompletedTask);
|
||||
|
||||
var msgs = await updateService.CheckHasUpdateOnlyAll(_config.CheckUpdateItem.CheckPreReleaseUpdate);
|
||||
foreach (var msg in msgs)
|
||||
{
|
||||
await _updateFunc?.Invoke(false, msg);
|
||||
}
|
||||
NoticeManager.Instance.Enqueue(string.Join("\n", msgs));
|
||||
|
||||
if (msgs.Count > 0)
|
||||
{
|
||||
AppEvents.HasUpdateNotified.Publish(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Configs;
|
||||
|
||||
[Serializable]
|
||||
public class Config
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Configs;
|
||||
|
||||
[Serializable]
|
||||
public class CoreBasicItem
|
||||
@@ -7,10 +7,6 @@ public class CoreBasicItem
|
||||
|
||||
public string Loglevel { get; set; }
|
||||
|
||||
public bool MuxEnabled { get; set; }
|
||||
|
||||
public bool DefAllowInsecure { get; set; }
|
||||
|
||||
public string DefFingerprint { get; set; }
|
||||
|
||||
public string DefUserAgent { get; set; }
|
||||
@@ -21,6 +17,8 @@ public class CoreBasicItem
|
||||
|
||||
public bool EnableFragment { get; set; }
|
||||
|
||||
public bool EnableFinalFragment { get; set; }
|
||||
|
||||
public bool EnableCacheFile4Sbox { get; set; } = true;
|
||||
}
|
||||
|
||||
@@ -148,6 +146,7 @@ public class TunModeItem
|
||||
public bool EnableIPv6Address { get; set; }
|
||||
public string IcmpRouting { get; set; }
|
||||
public bool EnableLegacyProtect { get; set; }
|
||||
public List<string>? RouteExcludeAddress { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
@@ -159,6 +158,8 @@ public class SpeedTestItem
|
||||
public int MixedConcurrencyCount { get; set; }
|
||||
public string IPAPIUrl { get; set; }
|
||||
public string UdpTestTarget { get; set; }
|
||||
public int? SpeedTestPageSize { get; set; }
|
||||
public int? SpeedTestDelayInterval { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
@@ -248,6 +249,7 @@ public class Fragment4RayItem
|
||||
public string? Packets { get; set; }
|
||||
public string? Length { get; set; }
|
||||
public string? Interval { get; set; }
|
||||
public string? MaxSplit { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
public record CoreConfigContext
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
[Serializable]
|
||||
public class CoreInfo
|
||||
@@ -13,6 +13,7 @@ public class CoreInfo
|
||||
public string? DownloadUrlLinux64 { get; set; }
|
||||
public string? DownloadUrlLinuxArm64 { get; set; }
|
||||
public string? DownloadUrlLinuxRiscV64 { get; set; }
|
||||
public string? DownloadUrlLinuxLoong64 { get; set; }
|
||||
public string? DownloadUrlOSX64 { get; set; }
|
||||
public string? DownloadUrlOSXArm64 { get; set; }
|
||||
public string? Match { get; set; }
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
public class SingboxConfig
|
||||
{
|
||||
@@ -93,6 +93,7 @@ public class Rule4Sbox
|
||||
public List<string>? wifi_bssid { get; set; }
|
||||
public bool? rule_set_ip_cidr_match_source { get; set; }
|
||||
public bool? rule_set_ip_cidr_accept_empty { get; set; }
|
||||
public bool? tls_record_fragment { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
@@ -110,6 +111,7 @@ public class Inbound4Sbox
|
||||
public bool? endpoint_independent_nat { get; set; }
|
||||
public string? stack { get; set; }
|
||||
public List<User4Sbox> users { get; set; }
|
||||
public List<string>? route_exclude_address { get; set; }
|
||||
}
|
||||
|
||||
public class User4Sbox
|
||||
@@ -246,6 +248,16 @@ public class HyObfs4Sbox
|
||||
{
|
||||
public string? type { get; set; }
|
||||
public string? password { get; set; }
|
||||
public int? min_packet_size { get; set; }
|
||||
public int? max_packet_size { get; set; }
|
||||
}
|
||||
|
||||
public class HyRealm4Sbox
|
||||
{
|
||||
public string? server_url { get; set; }
|
||||
public string? token { get; set; }
|
||||
public string? realm_id { get; set; }
|
||||
public List<string>? stun_servers { get; set; }
|
||||
}
|
||||
|
||||
public class Server4Sbox : BaseServer4Sbox
|
||||
@@ -332,6 +344,7 @@ public abstract class DialFields4Sbox
|
||||
public Multiplex4Sbox? multiplex { get; set; }
|
||||
public Transport4Sbox? transport { get; set; }
|
||||
public HyObfs4Sbox? obfs { get; set; }
|
||||
public HyRealm4Sbox? realm { get; set; }
|
||||
}
|
||||
|
||||
public abstract class BaseServer4Sbox : DialFields4Sbox
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
public class V2rayConfig
|
||||
{
|
||||
@@ -20,7 +20,7 @@ public class Stats4Ray
|
||||
|
||||
public class Metrics4Ray
|
||||
{
|
||||
public string tag { get; set; }
|
||||
public string listen { get; set; }
|
||||
}
|
||||
|
||||
public class Policy4Ray
|
||||
@@ -86,7 +86,7 @@ public class Inboundsettings4Ray
|
||||
|
||||
public string? autoOutboundsInterface { get; set; }
|
||||
|
||||
// public List<string>? dns { get; set; }
|
||||
public List<string>? dns { get; set; }
|
||||
}
|
||||
|
||||
public class UsersItem4Ray
|
||||
@@ -136,7 +136,7 @@ public class Outboundsettings4Ray
|
||||
|
||||
public Response4Ray? response { get; set; }
|
||||
|
||||
public string domainStrategy { get; set; }
|
||||
public string? domainStrategy { get; set; }
|
||||
|
||||
public int? userLevel { get; set; }
|
||||
|
||||
@@ -276,6 +276,7 @@ public class BalancersItem4Ray
|
||||
public List<string>? selector { get; set; }
|
||||
public BalancersStrategy4Ray? strategy { get; set; }
|
||||
public string? tag { get; set; }
|
||||
public string? fallbackTag { get; set; }
|
||||
}
|
||||
|
||||
public class BalancersStrategy4Ray
|
||||
@@ -288,16 +289,7 @@ public class BalancersStrategySettings4Ray
|
||||
{
|
||||
public int? expected { get; set; }
|
||||
public string? maxRTT { get; set; }
|
||||
public float? tolerance { get; set; }
|
||||
public List<string>? baselines { get; set; }
|
||||
public List<BalancersStrategySettingsCosts4Ray>? costs { get; set; }
|
||||
}
|
||||
|
||||
public class BalancersStrategySettingsCosts4Ray
|
||||
{
|
||||
public bool? regexp { get; set; }
|
||||
public string? match { get; set; }
|
||||
public float? value { get; set; }
|
||||
public double? tolerance { get; set; }
|
||||
}
|
||||
|
||||
public class Observatory4Ray
|
||||
@@ -372,6 +364,7 @@ public class TlsSettings4Ray
|
||||
public string? spiderX { get; set; }
|
||||
public string? mldsa65Verify { get; set; }
|
||||
public List<CertificateSettings4Ray>? certificates { get; set; }
|
||||
public string? verifyPeerCertByName { get; set; }
|
||||
public string? pinnedPeerCertSha256 { get; set; }
|
||||
public bool? disableSystemRoot { get; set; }
|
||||
public string? echConfigList { get; set; }
|
||||
@@ -487,6 +480,7 @@ public class UdpHop4Ray
|
||||
|
||||
public class Finalmask4Ray
|
||||
{
|
||||
public List<Mask4Ray>? tcp { get; set; }
|
||||
public List<Mask4Ray>? udp { get; set; }
|
||||
public QuicParams4Ray? quicParams { get; set; }
|
||||
}
|
||||
@@ -499,14 +493,21 @@ public class Mask4Ray
|
||||
|
||||
public class MaskSettings4Ray
|
||||
{
|
||||
public string? header { get; set; }
|
||||
public string? value { get; set; }
|
||||
|
||||
public string? password { get; set; }
|
||||
public string? domain { get; set; }
|
||||
|
||||
public string? url { get; set; }
|
||||
public List<string>? stunServers { get; set; }
|
||||
public string? packetSize { get; set; }
|
||||
|
||||
// fragment
|
||||
public string? packets { get; set; }
|
||||
|
||||
public string? length { get; set; }
|
||||
public string? delay { get; set; }
|
||||
public int? maxSplit { get; set; }
|
||||
|
||||
// noise
|
||||
public int? reset { get; set; }
|
||||
@@ -1,6 +1,6 @@
|
||||
using System.Collections;
|
||||
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
internal class V2rayMetricsVars
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.CoreConfigs;
|
||||
|
||||
public class V2rayTcpRequest
|
||||
{
|
||||
@@ -1,10 +1,12 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class CheckUpdateModel : ReactiveObject
|
||||
{
|
||||
public bool? IsSelected { get; set; }
|
||||
public string? CoreType { get; set; }
|
||||
public ECoreType? CoreType { get; set; }
|
||||
[Reactive] public string? Remarks { get; set; }
|
||||
public string? FileName { get; set; }
|
||||
public bool? IsFinished { get; set; }
|
||||
public bool IsGeoFile { get; set; }
|
||||
public string CoreTypeForStorage => IsGeoFile ? "GeoFiles" : (CoreType?.ToString() ?? "");
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class ClashConnectionModel
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class ClashConnections
|
||||
{
|
||||
@@ -1,6 +1,6 @@
|
||||
using static ServiceLib.Models.ClashProxies;
|
||||
using static ServiceLib.Models.Dto.ClashProxies;
|
||||
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class ClashProviders
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class ClashProxies
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class ClashProxyModel : ReactiveObject
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class CmdItem
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class ComboItem
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class GitHubReleaseAsset
|
||||
{
|
||||
115
v2rayN/ServiceLib/Models/Dto/HyRealm.cs
Normal file
115
v2rayN/ServiceLib/Models/Dto/HyRealm.cs
Normal file
@@ -0,0 +1,115 @@
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
// realm://<token>@<rendezvous-host>[:port]/<realm-name>?stun=<stun-host>[:port]&stun=<stun-host>[:port]...
|
||||
// realm+http://<token>@<rendezvous-host>[:port]/<realm-name>?stun=<stun-host>[:port]&stun=<stun-host>[:port]...
|
||||
// example:
|
||||
// realm://public@realm.hy2.io/57f9be7c-2810-4f5b-8cb9-260bc84d6c90?stun=example.stun:3478&stun=example2.stun:3478
|
||||
public record HyRealm(
|
||||
bool IsHttp,
|
||||
string Token,
|
||||
string RendezvousHost,
|
||||
int RendezvousPort,
|
||||
string RealmName,
|
||||
List<string> StunList
|
||||
)
|
||||
{
|
||||
public string RendezvousHostPort => RendezvousPort > 0 ? $"{RendezvousHost}:{RendezvousPort}" : RendezvousHost;
|
||||
|
||||
/// <summary>
|
||||
/// sing-box realm.server_url requires a scheme (https:// or http://).
|
||||
/// </summary>
|
||||
public string ToServerUrl()
|
||||
{
|
||||
var scheme = IsHttp ? "http" : "https";
|
||||
return $"{scheme}://{RendezvousHostPort}";
|
||||
}
|
||||
|
||||
public static bool TryParse(string? str, out HyRealm? realm)
|
||||
{
|
||||
realm = null;
|
||||
if (str == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
try
|
||||
{
|
||||
var isHttp = str.StartsWith("realm+http://");
|
||||
var prefix = isHttp ? "realm+http://" : "realm://";
|
||||
if (!str.StartsWith(prefix))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
var uri = new Uri(str);
|
||||
var token = Utils.UrlDecode(uri.UserInfo);
|
||||
var rendezvousHost = uri.Host;
|
||||
var rendezvousPort = uri.IsDefaultPort ? (isHttp ? 80 : 443) : uri.Port;
|
||||
var realmName = uri.AbsolutePath.TrimStart('/');
|
||||
var stunList = new List<string>();
|
||||
var query = uri.Query;
|
||||
if (!query.IsNullOrEmpty())
|
||||
{
|
||||
if (query.StartsWith('?'))
|
||||
{
|
||||
query = query.Substring(1);
|
||||
}
|
||||
var pairs = query.Split('&', StringSplitOptions.RemoveEmptyEntries);
|
||||
foreach (var pair in pairs)
|
||||
{
|
||||
var idx = pair.IndexOf('=');
|
||||
if (idx <= 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var key = pair.Substring(0, idx);
|
||||
if (!key.Equals("stun", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var val = pair.Substring(idx + 1);
|
||||
stunList.Add(Utils.UrlDecode(val));
|
||||
}
|
||||
}
|
||||
realm = new HyRealm(isHttp, token, rendezvousHost, rendezvousPort, realmName, stunList);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public string ToUri()
|
||||
{
|
||||
var prefix = IsHttp ? "realm+http://" : "realm://";
|
||||
var uriBuilder = new UriBuilder
|
||||
{
|
||||
Scheme = IsHttp ? "http" : "realm",
|
||||
Host = RendezvousHost,
|
||||
Port = RendezvousPort,
|
||||
Path = "/" + RealmName,
|
||||
UserName = Utils.UrlEncode(Token),
|
||||
};
|
||||
if (StunList is { Count: > 0 })
|
||||
{
|
||||
// var query = string.Join('&', StunList.Select(s => "stun=" + Utils.UrlEncode(s)));
|
||||
// NOTE: maybe we don't need to encode the stun host:port, since it should be a valid URI component already, and encoding will make it unreadable
|
||||
var query = string.Join('&', StunList.Select(s => "stun=" + s));
|
||||
uriBuilder.Query = query;
|
||||
}
|
||||
return prefix + uriBuilder.Uri.GetComponents(
|
||||
UriComponents.UserInfo | UriComponents.HostAndPort | UriComponents.PathAndQuery, UriFormat.UriEscaped);
|
||||
}
|
||||
|
||||
public string ToUriForFinalmask()
|
||||
{
|
||||
var prefix = IsHttp ? "realm+http://" : "realm://";
|
||||
var uriBuilder = new StringBuilder();
|
||||
uriBuilder.Append(prefix);
|
||||
uriBuilder.Append(Utils.UrlEncode(Token));
|
||||
uriBuilder.Append('@');
|
||||
uriBuilder.Append(RendezvousHostPort);
|
||||
uriBuilder.Append('/');
|
||||
uriBuilder.Append(Utils.UrlEncode(RealmName));
|
||||
return uriBuilder.ToString();
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
internal class IPAPIInfo
|
||||
{
|
||||
@@ -17,3 +17,12 @@ public class LocationInfo
|
||||
{
|
||||
public string? country_code { get; set; }
|
||||
}
|
||||
|
||||
public readonly record struct IpInfoResult(string Country, string? Ip)
|
||||
{
|
||||
public override string ToString()
|
||||
{
|
||||
var emoji = Utils.IsWindows() ? null : Country.CountryToEmoji();
|
||||
return $"{emoji}({Country}) {Ip}";
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class ProfileItemModel : ReactiveObject
|
||||
@@ -26,6 +26,9 @@ public class ProfileItemModel : ReactiveObject
|
||||
[Reactive]
|
||||
public string SpeedVal { get; set; }
|
||||
|
||||
[Reactive]
|
||||
public string IpInfo { get; set; }
|
||||
|
||||
[Reactive]
|
||||
public string TodayUp { get; set; }
|
||||
|
||||
16
v2rayN/ServiceLib/Models/Dto/RetResult.cs
Normal file
16
v2rayN/ServiceLib/Models/Dto/RetResult.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class RetResult(bool success, string? msg, object? data)
|
||||
{
|
||||
public RetResult(bool success = false) : this(success, null, null)
|
||||
{
|
||||
}
|
||||
|
||||
public RetResult(bool success, string? msg) : this(success, msg, null)
|
||||
{
|
||||
}
|
||||
|
||||
public bool Success { get; set; } = success;
|
||||
public string? Msg { get; set; } = msg;
|
||||
public object? Data { get; set; } = data;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class RoutingItemModel : RoutingItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class RoutingTemplate
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class RulesItemModel : RulesItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class SemanticVersion
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class ServerSpeedItem : ServerStatItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class ServerTestItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
[Serializable]
|
||||
public class SpeedTestResult
|
||||
@@ -8,4 +8,6 @@ public class SpeedTestResult
|
||||
public string? Delay { get; set; }
|
||||
|
||||
public string? Speed { get; set; }
|
||||
|
||||
public string? IpInfo { get; set; }
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class SsSIP008
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
public class UpdateResult
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Dto;
|
||||
|
||||
/// <summary>
|
||||
/// https://github.com/2dust/v2rayN/wiki/
|
||||
@@ -40,4 +40,8 @@ public class VmessQRCode
|
||||
public string fp { get; set; } = string.Empty;
|
||||
|
||||
public string insecure { get; set; } = string.Empty;
|
||||
|
||||
public string vcn { get; set; } = string.Empty;
|
||||
|
||||
public string pcs { get; set; } = string.Empty;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Entities;
|
||||
|
||||
[Serializable]
|
||||
public class DNSItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Entities;
|
||||
|
||||
[Serializable]
|
||||
public class FullConfigTemplateItem
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Entities;
|
||||
|
||||
[Serializable]
|
||||
public class ProfileExItem
|
||||
@@ -10,4 +10,5 @@ public class ProfileExItem
|
||||
public decimal Speed { get; set; }
|
||||
public int Sort { get; set; }
|
||||
public string? Message { get; set; }
|
||||
public string? IpInfo { get; set; }
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace ServiceLib.Models;
|
||||
namespace ServiceLib.Models.Entities;
|
||||
|
||||
[Obsolete("Use ProtocolExtraItem instead.")]
|
||||
[Serializable]
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user