diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 394d2862..a814b8e4 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -50,7 +50,7 @@ jobs: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o "$OutputPathArm64" - name: Upload build artifacts - uses: actions/upload-artifact@v6.0.0 + uses: actions/upload-artifact@v7.0.0 with: name: v2rayN-linux path: | @@ -169,7 +169,7 @@ jobs: fetch-depth: '0' - name: Restore build artifacts - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: name: v2rayN-linux path: ${{ github.workspace }}/v2rayN/Release @@ -190,7 +190,7 @@ jobs: ls -R "$GITHUB_WORKSPACE/dist/rpm" || true - name: Upload RPM artifacts - uses: actions/upload-artifact@v6.0.0 + uses: actions/upload-artifact@v7.0.0 with: name: v2rayN-rpm path: dist/rpm/**/*.rpm diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index f36b2b0e..f16f28bf 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -45,7 +45,7 @@ jobs: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o $OutputPathArm64 - name: Upload build artifacts - uses: actions/upload-artifact@v6.0.0 + uses: actions/upload-artifact@v7.0.0 with: name: v2rayN-macos path: | diff --git a/.github/workflows/build-windows-desktop.yml b/.github/workflows/build-windows-desktop.yml index 16f3771f..1a85e546 100644 --- a/.github/workflows/build-windows-desktop.yml +++ b/.github/workflows/build-windows-desktop.yml @@ -45,7 +45,7 @@ jobs: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64 - name: Upload build artifacts - uses: actions/upload-artifact@v6.0.0 + uses: actions/upload-artifact@v7.0.0 with: name: v2rayN-windows-desktop path: | diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d1c2f66a..4c1ce3ea 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -42,7 +42,7 @@ jobs: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64 - name: Upload build artifacts - uses: actions/upload-artifact@v6.0.0 + uses: actions/upload-artifact@v7.0.0 with: name: v2rayN-windows path: | diff --git a/package-debian.sh b/package-debian.sh index 8b15bb06..3b91e7ca 100644 --- a/package-debian.sh +++ b/package-debian.sh @@ -16,7 +16,7 @@ cp -rf $OutputPath "${PackagePath}/opt/v2rayN" echo "When this file exists, app will not store configs under this folder" > "${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt" if [ $Arch = "linux-64" ]; then - Arch2="amd64" + Arch2="amd64" else Arch2="arm64" fi @@ -32,9 +32,8 @@ Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others EOF -cat >"${PackagePath}/DEBIAN/postinst" <<-EOF -if [ ! -s /usr/share/applications/v2rayN.desktop ]; then - cat >/usr/share/applications/v2rayN.desktop<<-END +mkdir -p "${PackagePath}/usr/share/applications" +cat >"${PackagePath}/usr/share/applications/v2rayN.desktop" <<-EOF [Desktop Entry] Name=v2rayN Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others @@ -43,10 +42,12 @@ Icon=/opt/v2rayN/v2rayN.png Terminal=false Type=Application Categories=Network;Application; -END -fi +EOF -update-desktop-database +cat >"${PackagePath}/DEBIAN/postinst" <<-'EOF' +set -e +update-desktop-database || true +exit 0 EOF sudo chmod 0755 "${PackagePath}/DEBIAN/postinst" diff --git a/package-rhel.sh b/package-rhel.sh index 507e2b18..1843c850 100644 --- a/package-rhel.sh +++ b/package-rhel.sh @@ -1,45 +1,36 @@ #!/usr/bin/env bash set -euo pipefail -# ====== Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS ====== -if [[ -r /etc/os-release ]]; then - . /etc/os-release - case "$ID" in - rhel|rocky|almalinux|fedora|centos) - echo "[OK] Detected supported system: $NAME $VERSION_ID" - ;; - *) - echo "[ERROR] Unsupported system: $NAME ($ID)." - echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS." - exit 1 - ;; - esac -else - echo "[ERROR] Cannot detect system (missing /etc/os-release)." - exit 1 +# Require Red Hat base branch +. /etc/os-release + +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 + +# Kernel version +MIN_KERNEL="6.11" +CURRENT_KERNEL="$(uname -r)" + +lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)" + +if [[ "$lowest" != "$MIN_KERNEL" ]]; then + echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL" + exit 1 fi -# ======================== Kernel version check (require >= 6.11) ======================= -MIN_KERNEL_MAJOR=6 -MIN_KERNEL_MINOR=11 -KERNEL_FULL=$(uname -r) -KERNEL_MAJOR=$(echo "$KERNEL_FULL" | cut -d. -f1) -KERNEL_MINOR=$(echo "$KERNEL_FULL" | cut -d. -f2) +echo "[OK] Kernel $CURRENT_KERNEL verified." -echo "[INFO] Detected kernel version: $KERNEL_FULL" - -if (( KERNEL_MAJOR < MIN_KERNEL_MAJOR )) || { (( KERNEL_MAJOR == MIN_KERNEL_MAJOR )) && (( KERNEL_MINOR < MIN_KERNEL_MINOR )); }; then - echo "[ERROR] Kernel $KERNEL_FULL is too old. Requires Linux >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}." - echo "Please upgrade your system or use a newer container (e.g. Fedora 42+, RHEL 10+)." - exit 1 -fi - -echo "[OK] Kernel version >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}." - -# ===== Config & Parse arguments ========================================================= +# 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 -AUTOSTART=0 # 1 = enable system-wide autostart (/etc/xdg/autostart) 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 @@ -55,7 +46,6 @@ if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi while [[ $# -gt 0 ]]; do case "$1" in --with-core) WITH_CORE="${2:-both}"; shift 2;; - --autostart) AUTOSTART=1; shift;; --xray-ver) XRAY_VER="${2:-}"; shift 2;; --singbox-ver) SING_VER="${2:-}"; shift 2;; --netcore) FORCE_NETCORE=1; shift;; @@ -69,38 +59,26 @@ done # Conflict: version number AND --buildfrom cannot be used together if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then - echo "[ERROR] You cannot specify both an explicit version and --buildfrom at the same time." + 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." exit 1 fi -# ===== Environment check + Dependencies ======================================== +# Check and install dependencies host_arch="$(uname -m)" [[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; } install_ok=0 -case "$ID" in - rhel|rocky|almalinux|centos) - if command -v dnf >/dev/null 2>&1; then - sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \ - sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync - install_ok=1 - elif command -v yum >/dev/null 2>&1; then - sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \ - sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync - install_ok=1 - fi - ;; - *) - ;; -esac -if [[ "$install_ok" -ne 1 ]]; then - echo "[WARN] 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 RPM-based distros)" +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 -command -v curl >/dev/null +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)" @@ -119,9 +97,6 @@ if [[ ! -f "$PROJECT" ]]; then fi [[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; } -# Resolve GUI version & auto checkout -VERSION="" - choose_channel() { # If --buildfrom provided, map it directly and skip interaction. if [[ -n "${BUILD_FROM:-}" ]]; then @@ -135,60 +110,35 @@ choose_channel() { # Print menu to stderr and read from /dev/tty so stdout only carries the token. local ch="latest" sel="" + 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/null 2>&1; then - tag="$(printf '%s' "$json" \ - | jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \ - | sed 's/^v//')" || true - fi - - # 2) Fallback to sed/grep only - if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then - tag="$(printf '%s' "$json" \ - | tr '\n' ' ' \ - | sed 's/},[[:space:]]*{/\n/g' \ - | grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \ - | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \ - | head -n1 \ - | sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true - fi - - [[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1 - printf '%s\n' "$tag" + curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \ + | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \ + | sed 's/^v//' } git_try_checkout() { @@ -196,11 +146,7 @@ git_try_checkout() { local want="$1" 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/v${want}" >/dev/null 2>&1; then - ref="v${want}" - elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then - ref="${want}" - elif git rev-parse --verify "${want}" >/dev/null 2>&1; then + if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then ref="${want}" fi if [[ -n "$ref" ]]; then @@ -216,88 +162,56 @@ git_try_checkout() { return 1 } +apply_channel_or_keep() { + local ch="$1" 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..." + 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; } + echo "[*] Latest tag for '${ch}': ${tag}" + git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; } + VERSION="${tag#v}" +} + if git rev-parse --git-dir >/dev/null 2>&1; then if [[ -n "${VERSION_ARG:-}" ]]; then - echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}" - if git_try_checkout "${VERSION_ARG#v}"; then - VERSION="${VERSION_ARG#v}" + clean_ver="${VERSION_ARG#v}" + if git_try_checkout "$clean_ver"; then + VERSION="$clean_ver" else echo "[WARN] Tag '${VERSION_ARG}' not found." ch="$(choose_channel)" - if [[ "$ch" == "keep" ]]; then - echo "[*] Keep current repository state (no checkout)." - if git describe --tags --abbrev=0 >/dev/null 2>&1; then - VERSION="$(git describe --tags --abbrev=0)" - else - VERSION="0.0.0+git" - fi - VERSION="${VERSION#v}" - else - echo "[*] Resolving ${ch} tag from GitHub releases..." - tag="" - if [[ "$ch" == "prerelease" ]]; then - tag="$(get_latest_tag_prerelease || true)" - if [[ -z "$tag" ]]; then - echo "[WARN] Failed to resolve prerelease tag, falling back to latest." - tag="$(get_latest_tag_latest || true)" - fi - else - tag="$(get_latest_tag_latest || true)" - fi - [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; } - echo "[*] Latest tag for '${ch}': ${tag}" - git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; } - VERSION="${tag#v}" - fi + apply_channel_or_keep "$ch" fi else ch="$(choose_channel)" - if [[ "$ch" == "keep" ]]; then - echo "[*] Keep current repository state (no checkout)." - if git describe --tags --abbrev=0 >/dev/null 2>&1; then - VERSION="$(git describe --tags --abbrev=0)" - else - VERSION="0.0.0+git" - fi - VERSION="${VERSION#v}" - else - echo "[*] Resolving ${ch} tag from GitHub releases..." - tag="" - if [[ "$ch" == "prerelease" ]]; then - tag="$(get_latest_tag_prerelease || true)" - if [[ -z "$tag" ]]; then - echo "[WARN] Failed to resolve prerelease tag, falling back to latest." - tag="$(get_latest_tag_latest || true)" - fi - else - tag="$(get_latest_tag_latest || true)" - fi - [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; } - echo "[*] Latest tag for '${ch}': ${tag}" - git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; } - VERSION="${tag#v}" - fi + apply_channel_or_keep "$ch" fi else - echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree." - VERSION="${VERSION_ARG:-}" - if [[ -z "$VERSION" ]]; then - if git describe --tags --abbrev=0 >/dev/null 2>&1; then - VERSION="$(git describe --tags --abbrev=0)" - else - VERSION="0.0.0+git" - fi - fi - VERSION="${VERSION#v}" + 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}" -# ===== Helpers for core/rules download (use RID_DIR for arch sync) ===================== +# Helpers for core download_xray() { - # Download Xray core and install to outdir/xray + # Download Xray core local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip" mkdir -p "$outdir" - if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi 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 @@ -316,10 +230,9 @@ download_xray() { } download_singbox() { - # Download sing-box core and install to outdir/sing-box + # Download sing-box local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin mkdir -p "$outdir" - if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi 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 @@ -339,7 +252,7 @@ download_singbox() { install -Dm755 "$bin" "$outdir/sing-box" } -# Move geo files to a unified path: outroot/bin +# Move geo files to outroot/bin unify_geo_layout() { local outroot="$1" mkdir -p "$outroot/bin" @@ -351,18 +264,13 @@ unify_geo_layout() { "geoip.metadb" \ ) for n in "${names[@]}"; do - # If file exists under bin/xray/, move it up to bin/ if [[ -f "$outroot/bin/xray/$n" ]]; then mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n" fi - # If file already in bin/, leave it as-is - if [[ -f "$outroot/bin/$n" ]]; then - : - fi done } -# Download geo/rule assets; then unify to bin/ +# Download geo/rule assets download_geo_assets() { local outroot="$1" local bin_dir="$outroot/bin" @@ -396,7 +304,7 @@ download_geo_assets() { "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true done - # Unify to bin/ + # Unify to bin unify_geo_layout "$outroot" } @@ -427,7 +335,7 @@ download_v2rayn_bundle() { 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 + if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then mkdir -p "$outroot/bin" rsync -a "$nested_dir/bin/" "$outroot/bin/" rm -rf "$nested_dir" @@ -451,7 +359,7 @@ build_for_arch() { case "$short" in x64) rid="linux-x64"; rpm_target="x86_64"; archdir="x86_64" ;; arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;; - *) echo "[ERROR] Unknown arch '$short' (use x64|arm64)"; return 1;; + *) echo "Unknown arch '$short' (use x64|arm64)"; return 1;; esac echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)" @@ -464,8 +372,7 @@ build_for_arch() { dotnet publish "$PROJECT" \ -c Release -r "$rid" \ -p:PublishSingleFile=false \ - -p:SelfContained=true \ - -p:IncludeNativeLibrariesForSelfExtract=true + -p:SelfContained=true # Per-arch variables (scoped) local RID_DIR="$rid" @@ -502,28 +409,28 @@ build_for_arch() { 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" || echo "[!] xray download failed (skipped)" + fi + if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then + download_singbox "$outroot/bin/sing_box" || echo "[!] sing-box download failed (skipped)" + fi + download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)" + } + if [[ "$FORCE_NETCORE" -eq 0 ]]; then if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then echo "[*] Using v2rayN bundle archive." else echo "[*] Bundle failed, fallback to separate core + rules." - if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then - download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)" - fi - if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then - download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)" - fi - download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)" + fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT" fi else echo "[*] --netcore specified: use separate core + rules." - if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then - download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)" - fi - if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then - download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)" - fi - download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)" + fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT" fi # Tarball @@ -577,12 +484,6 @@ https://github.com/2dust/v2rayN install -dm0755 %{buildroot}/opt/v2rayN cp -a * %{buildroot}/opt/v2rayN/ -install -dm0755 %{buildroot}%{_sysconfdir}/sudoers.d -cat > %{buildroot}%{_sysconfdir}/sudoers.d/v2rayn-mihomo-deny << 'EOF' -ALL ALL=(ALL) !/home/*/.local/share/v2rayN/bin/mihomo/mihomo -EOF -chmod 0440 %{buildroot}%{_sysconfdir}/sudoers.d/v2rayn-mihomo-deny - # Launcher (prefer native ELF first, then DLL fallback) install -dm0755 %{buildroot}%{_bindir} cat > %{buildroot}%{_bindir}/v2rayn << 'EOF' @@ -636,47 +537,13 @@ fi /opt/v2rayN %{_datadir}/applications/v2rayn.desktop %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png -%config(noreplace) /etc/sudoers.d/v2rayn-mihomo-deny SPEC - # Autostart injection (inside %install) and %files entry - if [[ "$AUTOSTART" -eq 1 ]]; then - awk ' - BEGIN{ins=0} - /^%post$/ && !ins { - print "# --- Autostart (.desktop) ---" - print "install -dm0755 %{buildroot}/etc/xdg/autostart" - print "cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '\''EOF'\''" - print "[Desktop Entry]" - print "Type=Application" - print "Name=v2rayN (Autostart)" - print "Exec=v2rayn" - print "X-GNOME-Autostart-enabled=true" - print "NoDisplay=false" - print "EOF" - ins=1 - } - {print} - ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE" - - awk ' - BEGIN{infiles=0; done=0} - /^%files$/ {infiles=1} - infiles && done==0 && $0 ~ /%{_datadir}\/icons\/hicolor\/256x256\/apps\/v2rayn\.png/ { - print - print "%config(noreplace) /etc/xdg/autostart/v2rayn.desktop" - done=1 - next - } - {print} - ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE" - fi - # Replace placeholders sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE" sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE" - # Build RPM for this arch (force rpm --target to match compile arch) + # Build RPM for this arch rpmbuild -ba "$SPECFILE" --target "$rpm_target" echo "Build done for $short. RPM at:" @@ -690,33 +557,18 @@ SPEC # ===== Arch selection and build orchestration ========================================= case "${ARCH_OVERRIDE:-}" in - "") - # No --arch: use host architecture - if [[ "$host_arch" == "aarch64" ]]; then - build_for_arch arm64 - else - build_for_arch x64 - fi - ;; - x64|amd64) - build_for_arch x64 - ;; - arm64|aarch64) - build_for_arch arm64 - ;; - all) - BUILT_ALL=1 - # Build x64 and arm64 separately; each package contains its own arch-only binaries. - build_for_arch x64 - build_for_arch arm64 - ;; - *) - echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all." - exit 1 - ;; + 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 -# ===== Final summary if building both arches ========================================== +for arch in "${targets[@]}"; do + build_for_arch "$arch" +done + +# Print Both arches information if [[ "$BUILT_ALL" -eq 1 ]]; then echo "" echo "================ Build Summary (both architectures) ================" @@ -725,7 +577,7 @@ if [[ "$BUILT_ALL" -eq 1 ]]; then echo "$rp" done else - echo "[WARN] No RPMs detected in summary (check build logs above)." + echo "No RPMs detected in summary (check build logs above)." fi - echo "===================================================================" + echo "====================================================================" fi diff --git a/v2rayN/Directory.Build.props b/v2rayN/Directory.Build.props index e7e49e2c..9c4b3432 100644 --- a/v2rayN/Directory.Build.props +++ b/v2rayN/Directory.Build.props @@ -1,7 +1,7 @@ - 7.18.0 + 7.19.0 diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props index 57dedb74..14b16776 100644 --- a/v2rayN/Directory.Packages.props +++ b/v2rayN/Directory.Packages.props @@ -11,7 +11,7 @@ - + @@ -29,4 +29,4 @@ - + \ No newline at end of file diff --git a/v2rayN/ServiceLib/Helper/DownloaderHelper.cs b/v2rayN/ServiceLib/Helper/DownloaderHelper.cs index f4a7ae7f..71c3edbe 100644 --- a/v2rayN/ServiceLib/Helper/DownloaderHelper.cs +++ b/v2rayN/ServiceLib/Helper/DownloaderHelper.cs @@ -24,13 +24,13 @@ public class DownloaderHelper var downloadOpt = new DownloadConfiguration() { - Timeout = timeout * 1000, + BlockTimeout = timeout * 1000, MaxTryAgainOnFailure = 2, RequestConfiguration = { Headers = headers, UserAgent = userAgent, - Timeout = timeout * 1000, + ConnectTimeout = timeout * 1000, Proxy = webProxy } }; @@ -62,11 +62,11 @@ public class DownloaderHelper var downloadOpt = new DownloadConfiguration() { - Timeout = timeout * 1000, + BlockTimeout = timeout * 1000, MaxTryAgainOnFailure = 2, RequestConfiguration = { - Timeout= timeout * 1000, + ConnectTimeout= timeout * 1000, Proxy = webProxy } }; @@ -139,11 +139,11 @@ public class DownloaderHelper var downloadOpt = new DownloadConfiguration() { - Timeout = timeout * 1000, + BlockTimeout = timeout * 1000, MaxTryAgainOnFailure = 2, RequestConfiguration = { - Timeout= timeout * 1000, + ConnectTimeout= timeout * 1000, Proxy = webProxy } }; diff --git a/v2rayN/ServiceLib/Resx/ResUI.fr.resx b/v2rayN/ServiceLib/Resx/ResUI.fr.resx index 459e3b26..6c882112 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.fr.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.fr.resx @@ -1615,34 +1615,34 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if EchForceQuery - Full certificate (chain), PEM format + Certificat complet (chaîne), format PEM - Certificate fingerprint (SHA-256) + Empreinte du certificat (SHA-256) - Serve Stale + Cache optimiste - Parallel Query + Requête parallèle - By default, invoked only during routing for resolution + Par défaut, utilisé uniquement lors du routage pour la résolution. - By default, invoked only during routing for resolution; ensure the remote server can reach this DNS + Par défaut, invoqué uniquement au routage pour la résolution. Vérifiez que le serveur distant peut joindre ce DNS. - If unset or "AsIs", DNS resolution uses the system DNS; otherwise, the internal DNS module is used. + Si non défini ou « AsIs », le DNS système est utilisé ; sinon, le module DNS interne est utilisé. - If unset or "AsIs", DNS resolution is performed by the remote server's DNS; otherwise, the internal DNS module is used. + Si non défini ou « AsIs », la résolution DNS est assurée par le serveur distant ; sinon, le module DNS interne est utilisé. - Port hopping interval + Intervalle de saut de port - Configuration item preview + Aperçu des sous-config Finalmask @@ -1683,4 +1683,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if Subscription next proxy {0} not found. Skipping. - \ No newline at end of file + diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs index b4ddaf7f..03f4e80c 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs @@ -26,11 +26,15 @@ public partial class CoreConfigSingboxService { var rules = JsonUtils.Deserialize>(routing.RuleSet) ?? []; - useDirectDns = rules?.LastOrDefault() is { } lastRule && - lastRule.OutboundTag == Global.DirectTag && - (lastRule.Port == "0-65535" || - lastRule.Network == "tcp,udp" || - lastRule.Ip?.Contains("0.0.0.0/0") == true); + if (rules?.LastOrDefault() is { } lastRule && lastRule.OutboundTag == Global.DirectTag) + { + var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0; + var noProcess = lastRule.Process == null || lastRule.Process.Count == 0; + var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0"); + var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535"; + var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp"; + useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork; + } } _coreConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag; var simpleDnsItem = context.SimpleDnsItem; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index 40f8951d..b30c9c48 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -20,10 +20,13 @@ public partial class CoreConfigSingboxService { proxyOutboundList.AddRange(BuildGroupProxyOutbounds(baseTagName)); } - var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(Global.ProxyTag)).Select(n => n.tag).ToList(); - if (proxyTags.Count > 1) + if (withSelector) { - proxyOutboundList.InsertRange(0, BuildSelectorOutbounds(proxyTags, baseTagName)); + var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(Global.ProxyTag)).Select(n => n.tag).ToList(); + if (proxyTags.Count > 1) + { + proxyOutboundList.InsertRange(0, BuildSelectorOutbounds(proxyTags, baseTagName)); + } } return proxyOutboundList; } diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs index f4c9c852..e34dceb6 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs @@ -60,6 +60,12 @@ public partial class CoreConfigV2rayService(CoreConfigContext context) GenStatistic(); + var finalRule = BuildFinalRule(); + if (!string.IsNullOrEmpty(finalRule?.balancerTag)) + { + _coreConfig.routing.rules.Add(finalRule); + } + ret.Msg = string.Format(ResUI.SuccessfulConfiguration, ""); ret.Success = true; ret.Data = ApplyFullConfigTemplate(); @@ -234,6 +240,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context) GenLog(); GenOutbounds(); + _coreConfig.routing.domainStrategy = Global.AsIs; _coreConfig.routing.rules.Clear(); _coreConfig.inbounds.Clear(); _coreConfig.inbounds.Add(new() @@ -244,6 +251,8 @@ public partial class CoreConfigV2rayService(CoreConfigContext context) protocol = EInboundProtocol.mixed.ToString(), }); + _coreConfig.routing.rules.Add(BuildFinalRule()); + ret.Msg = string.Format(ResUI.SuccessfulConfiguration, ""); ret.Success = true; ret.Data = JsonUtils.Serialize(_coreConfig); diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs index 10cd905b..1d31f7b2 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs @@ -70,17 +70,16 @@ public partial class CoreConfigV2rayService dnsItem.serveStale = simpleDnsItem?.ServeStale is true ? true : null; dnsItem.enableParallelQuery = simpleDnsItem?.ParallelQuery is true ? true : null; - if (_coreConfig.routing.domainStrategy == Global.IPIfNonMatch) + // DNS routing + var finalRule = BuildFinalRule(); + dnsItem.tag = Global.DnsTag; + _coreConfig.routing.rules.Add(new() { - // DNS routing - dnsItem.tag = Global.DnsTag; - _coreConfig.routing.rules.Add(new RulesItem4Ray - { - type = "field", - inboundTag = new List { Global.DnsTag }, - outboundTag = Global.ProxyTag, - }); - } + type = "field", + inboundTag = [Global.DnsTag], + outboundTag = finalRule.outboundTag, + balancerTag = finalRule.balancerTag + }); _coreConfig.dns = dnsItem; } @@ -93,45 +92,6 @@ public partial class CoreConfigV2rayService private void FillDnsServers(Dns4Ray dnsItem) { var simpleDNSItem = context.SimpleDnsItem; - static List ParseDnsAddresses(string? dnsInput, string defaultAddress) - { - var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';') - .Select(addr => addr.Trim()) - .Where(addr => !string.IsNullOrEmpty(addr)) - .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr) - .Distinct() - .ToList() ?? new List { defaultAddress }; - return addresses.Count > 0 ? addresses : new List { defaultAddress }; - } - - static object? CreateDnsServer(string dnsAddress, List domains, List? expectedIPs = null) - { - var (domain, scheme, port, path) = Utils.ParseUrl(dnsAddress); - var domainFinal = dnsAddress; - int? portFinal = null; - if (scheme.IsNullOrEmpty() || scheme.StartsWith("udp", StringComparison.OrdinalIgnoreCase)) - { - domainFinal = domain; - portFinal = port > 0 ? port : null; - } - else if (scheme.StartsWith("tcp", StringComparison.OrdinalIgnoreCase)) - { - domainFinal = scheme + "://" + domain; - portFinal = port > 0 ? port : null; - } - var dnsServer = new DnsServer4Ray - { - address = domainFinal, - port = portFinal, - skipFallback = true, - domains = domains.Count > 0 ? domains : null, - expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null - }; - return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions - { - DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull - }); - } var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.First()); var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.First()); @@ -252,17 +212,6 @@ public partial class CoreConfigV2rayService dnsItem.servers ??= []; - void AddDnsServers(List dnsAddresses, List domains, List? expectedIPs = null) - { - if (domains.Count > 0) - { - foreach (var dnsAddress in dnsAddresses) - { - dnsItem.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs)); - } - } - } - AddDnsServers(remoteDNSAddress, proxyDomainList); AddDnsServers(directDNSAddress, directDomainList); AddDnsServers(remoteDNSAddress, proxyGeositeList); @@ -273,14 +222,73 @@ public partial class CoreConfigV2rayService AddDnsServers(bootstrapDNSAddress, dnsServerDomains); } - var useDirectDns = rules?.LastOrDefault() is { } lastRule - && lastRule.OutboundTag == Global.DirectTag - && (lastRule.Port == "0-65535" - || lastRule.Network == "tcp,udp" - || lastRule.Ip?.Contains("0.0.0.0/0") == true); + var useDirectDns = false; + + if (rules?.LastOrDefault() is { } lastRule && lastRule.OutboundTag == Global.DirectTag) + { + var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0; + var noProcess = lastRule.Process == null || lastRule.Process.Count == 0; + var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0"); + var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535"; + var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp"; + useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork; + } var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress; dnsItem.servers.AddRange(defaultDnsServers); + return; + + static List ParseDnsAddresses(string? dnsInput, string defaultAddress) + { + var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';') + .Select(addr => addr.Trim()) + .Where(addr => !string.IsNullOrEmpty(addr)) + .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr) + .Distinct() + .ToList() ?? [defaultAddress]; + return addresses.Count > 0 ? addresses : new List { defaultAddress }; + } + + static object? CreateDnsServer(string dnsAddress, List domains, List? expectedIPs = null) + { + var (domain, scheme, port, path) = Utils.ParseUrl(dnsAddress); + var domainFinal = dnsAddress; + int? portFinal = null; + if (scheme.IsNullOrEmpty() || scheme.StartsWith("udp", StringComparison.OrdinalIgnoreCase)) + { + domainFinal = domain; + portFinal = port > 0 ? port : null; + } + else if (scheme.StartsWith("tcp", StringComparison.OrdinalIgnoreCase)) + { + domainFinal = scheme + "://" + domain; + portFinal = port > 0 ? port : null; + } + var dnsServer = new DnsServer4Ray + { + address = domainFinal, + port = portFinal, + skipFallback = true, + domains = domains.Count > 0 ? domains : null, + expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null + }; + return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions + { + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }); + } + + void AddDnsServers(List dnsAddresses, List domains, List? expectedIPs = null) + { + if (domains.Count <= 0) + { + return; + } + foreach (var dnsAddress in dnsAddresses) + { + dnsItem.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs)); + } + } } private void FillDnsHosts(Dns4Ray dnsItem) diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs index 1d3d1a37..76969297 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs @@ -181,4 +181,28 @@ public partial class CoreConfigV2rayService return tag; } + + private RulesItem4Ray BuildFinalRule() + { + var finalRule = new RulesItem4Ray() + { + type = "field", + network = "tcp,udp", + outboundTag = Global.ProxyTag, + }; + var balancer = + _coreConfig?.routing?.balancers?.FirstOrDefault(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix, null); + var domainStrategy = _coreConfig.routing?.domainStrategy ?? Global.AsIs; + if (balancer is not null) + { + finalRule.outboundTag = null; + finalRule.balancerTag = balancer.tag; + } + if (domainStrategy == Global.IPIfNonMatch) + { + finalRule.network = null; + finalRule.ip = ["0.0.0.0/0", "::/0"]; + } + return finalRule; + } }