Merge bc1c42a2a2 into 06636d04ac

package-rhel.sh

@@ -0,0 +1,330 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ===== 配置 & 解析参数 =========================================================
+VERSION_ARG="${1:-}"     # 传 7.13.8 或不传
+WITH_CORE="both"         # 默认：同时捆绑 xray+sing-box（你之前要的默认）
+AUTOSTART=0              # 1=系统级自启（/etc/xdg/autostart）
+
+# 如果第一个参数是以 -- 开头，就不当版本号
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# 把第一个非 --* 的参数作为版本号，用过就丢弃
+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;;        # 指定 xray 版本（可选）
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;        # 指定 sing-box 版本（可选）
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# ===== 环境检测 ===============================================================
+arch="$(uname -m)"
+[[ "$arch" == "aarch64" || "$arch" == "x86_64" ]] || { echo "只支持 aarch64 / x86_64"; exit 1; }
+
+# 依赖（打包不要用 root 执行，但这行需要 sudo）
+sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar || sudo dnf -y install dotnet-sdk
+command -v curl >/dev/null
+
+# 根目录=脚本所在
+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="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"; exit 1; }
+
+# 版本
+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}"   # 去掉前缀 v
+
+# ===== .NET 发布（非单文件，自包含） ===========================================
+dotnet clean "$PROJECT" -c Release
+rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
+
+dotnet restore "$PROJECT"
+dotnet publish "$PROJECT" \
+  -c Release -r "$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )" \
+  -p:PublishSingleFile=false \
+  -p:SelfContained=true \
+  -p:IncludeNativeLibrariesForSelfExtract=true
+
+RID_DIR="$( [[ "$arch" == "aarch64" ]] && echo linux-arm64 || echo linux-x64 )"
+PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+[[ -d "$PUBDIR" ]]
+
+# ===== 下载核心（可选） ========================================================
+download_xray() {
+  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  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] 未获取到版本"; return 1; }
+
+  if [[ "$arch" == "aarch64" ]]; 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
+  echo "[+] 下载 xray: $url"
+  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -Dm755 "$tmp/xray" "$outdir/xray"
+}
+
+download_singbox() {
+  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
+  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] 未获取到版本"; return 1; }
+
+  if [[ "$arch" == "aarch64" ]]; 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
+  echo "[+] 下载 sing-box: $url"
+  tmp="$(mktemp -d)"; trap 'rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box 解包后未找到可执行"; return 1; }
+  install -Dm755 "$bin" "$outdir/sing-box"
+}
+
+# === Geo 规则下载（新增，仅此处为新增逻辑） ===================================
+download_geo_assets() {
+  local outroot="$1"
+  local xray_dir="$outroot/bin/xray"
+  local sbox_dir="$outroot/bin/sing_box"
+  mkdir -p "$xray_dir" "$sbox_dir/rule-sets"
+
+  echo "[+] 下载 Xray Geo（geosite/geoip/...）"
+  curl -fsSL -o "$xray_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$xray_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$xray_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$xray_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] 下载 sing-box 规则 & DB"
+  # 数据库（最新版 meta rules 可选）
+  curl -fsSL -o "$sbox_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  # 官方 2dust srs rule-sets（常用子集）
+  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 "$sbox_dir/rule-sets/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs; do
+    curl -fsSL -o "$sbox_dir/rule-sets/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+}
+
+# ===== 复制发布物到打包工作区 ==================================================
+rpmdev-setuptree
+TOPDIR="${HOME}/rpmbuild"
+SPECDIR="${TOPDIR}/SPECS"
+SOURCEDIR="${TOPDIR}/SOURCES"
+
+PKGROOT="v2rayN-publish"
+WORKDIR="$(mktemp -d)"
+trap 'rm -rf "$WORKDIR"' EXIT
+
+mkdir -p "$WORKDIR/$PKGROOT"
+cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+# 图标（可选）
+ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
+[[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+
+# bin 目录结构（你之前的要求）
+mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+# 核心
+if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+  download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray 下载失败（略过）"
+fi
+if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+  download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box 下载失败（略过）"
+fi
+
+# Geo / rule-sets（新增）
+download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo 规则下载失败（略过）"
+
+tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
+
+# ===== 生成 SPEC（单引号 heredoc + 占位符） ===================================
+SPECFILE="$SPECDIR/v2rayN.spec"
+cat > "$SPECFILE" <<'SPEC'
+%global debug_package %{nil}
+%undefine _debuginfo_subpackages
+%undefine _debugsource_packages
+# 避免因 .NET 运行时带出的 LTTng 旧 SONAME 造成安装失败
+%global __requires_exclude ^liblttng-ust\.so\..*$
+
+Name:           v2rayN
+Version:        __VERSION__
+Release:        1%{?dist}
+Summary:        v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
+License:        GPL-3.0-only
+URL:            https://github.com/2dust/v2rayN
+ExclusiveArch:  aarch64 x86_64
+Source0:        __PKGROOT__.tar.gz
+
+# 运行期依赖（Avalonia/X11/字体/GL）
+Requires:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrender, libXfixes, libXinerama, libxkbcommon
+Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL
+
+%description
+v2rayN GUI client built with Avalonia.
+Installs self-contained publish under /opt/v2rayN and a launcher 'v2rayn'.
+Cores (if bundled): /opt/v2rayN/bin/xray, /opt/v2rayN/bin/sing_box.
+Geo files for Xray are placed at /opt/v2rayN/bin/xray; launcher will symlink them into user's XDG data dir on first run.
+
+%prep
+%setup -q -n __PKGROOT__
+
+%build
+# no build
+
+%install
+install -dm0755 %{buildroot}/opt/v2rayN
+cp -a * %{buildroot}/opt/v2rayN/
+
+# 启动器（先 ELF，再 DLL 兜底；并为用户补齐 Geo 软链）
+install -dm0755 %{buildroot}%{_bindir}
+cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
+#!/usr/bin/bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+
+# --- SYMLINK GEO into user's XDG dir (new) ---
+XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
+SYS_XRAY_DIR="$DIR/bin/xray"
+mkdir -p "$USR_GEO_DIR"
+for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
+  if [[ -f "$SYS_XRAY_DIR/$f" && ! -e "$USR_GEO_DIR/$f" ]]; then
+    ln -s "$SYS_XRAY_DIR/$f" "$USR_GEO_DIR/$f" || true
+  fi
+done
+# --- end GEO ---
+
+# 优先原生 ELF（apphost）
+if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
+
+# DLL 兜底（framework-dependent 发布时）
+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
+chmod 0755 %{buildroot}%{_bindir}/v2rayn
+
+# 桌面文件
+install -dm0755 %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN
+Comment=GUI client for Xray / sing-box
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
+EOF
+
+# 图标
+if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
+  install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+  install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+fi
+
+%post
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2&> /dev/null || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2&> /dev/null || true
+
+%postun
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2&> /dev/null || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2&> /dev/null || true
+
+%files
+%{_bindir}/v2rayn
+/opt/v2rayN
+%{_datadir}/applications/v2rayn.desktop
+%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+SPEC
+
+# 可选：系统级自启（追加块，原逻辑不变）
+if [[ "$AUTOSTART" -eq 1 ]]; then
+cat >> "$SPECFILE" <<'SPEC'
+# 系统级自启入口
+%install
+install -dm0755 %{buildroot}/etc/xdg/autostart
+cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN (Autostart)
+Exec=v2rayn
+X-GNOME-Autostart-enabled=true
+NoDisplay=false
+EOF
+
+%files
+%config(noreplace) /etc/xdg/autostart/v2rayn.desktop
+SPEC
+fi
+
+# 版本/包根名占位符注入
+sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+# ===== 构建 RPM ================================================================
+rpmbuild -ba "$SPECFILE"
+
+echo "Build done. RPM at:"
+ls -1 "${TOPDIR}/RPMS/$( [[ "$arch" == "aarch64" ]] && echo aarch64 || echo x86_64 )/v2rayN-${VERSION}-1"*.rpm

v2rayN/ServiceLib/Global.cs

@@ -305,13 +305,6 @@ public class Global
             ""
     ];
 
-    public static readonly List<string> DomainMatchers =
-    [
-        "linear",
-            "mph",
-            ""
-    ];
-
     public static readonly List<string> Fingerprints =
     [
         "chrome",

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -963,7 +963,7 @@ public class ConfigHandler
         {
             return -1;
         }
-        if (profileItem.Security.IsNotEmpty() && profileItem.Security != Global.None)
+        if (profileItem.Security.IsNullOrEmpty())
         {
             profileItem.Security = Global.None;
         }

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -5,15 +5,18 @@ namespace ServiceLib.Handler;
 
 public class PacHandler
 {
-    private static string _configPath;
+    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
-    private static int _httpPort;
+    public static PacHandler Instance => _instance.Value;
-    private static int _pacPort;
-    private static TcpListener? _tcpListener;
-    private static byte[] _writeContent;
-    private static bool _isRunning;
-    private static bool _needRestart = true;
 
-    public static async Task Start(string configPath, int httpPort, int pacPort)
+    private string _configPath;
+    private int _httpPort;
+    private int _pacPort;
+    private TcpListener? _tcpListener;
+    private byte[] _writeContent;
+    private bool _isRunning;
+    private bool _needRestart = true;
+
+    public async Task StartAsync(string configPath, int httpPort, int pacPort)
     {
         _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;
 
@@ -30,7 +33,7 @@ public class PacHandler
         }
     }
 
-    private static async Task InitText()
+    private async Task InitText()
     {
         var path = Path.Combine(_configPath, "pac.txt");
 
@@ -59,7 +62,7 @@ public class PacHandler
         _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
     }
 
-    private static void RunListener()
+    private void RunListener()
     {
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
@@ -87,14 +90,14 @@ public class PacHandler
         }, TaskCreationOptions.LongRunning);
     }
 
-    private static void WriteContent(TcpClient client)
+    private void WriteContent(TcpClient client)
     {
         var stream = client.GetStream();
         stream.Write(_writeContent, 0, _writeContent.Length);
         stream.Flush();
     }
 
-    public static void Stop()
+    public void Stop()
     {
         if (_tcpListener == null)
         {

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -56,7 +56,7 @@ public static class SysProxyHandler
 
             if (type != ESysProxyType.Pac && Utils.IsWindows())
             {
-                PacHandler.Stop();
+                PacHandler.Instance.Stop();
             }
         }
         catch (Exception ex)
@@ -91,7 +91,7 @@ public static class SysProxyHandler
     private static async Task SetWindowsProxyPac(int port)
     {
         var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-        await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
+        await PacHandler.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
         var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
         ProxySettingWindows.SetProxy(strProxy, "", 4);
     }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -165,7 +165,6 @@ public class RoutingBasicItem
 {
     public string DomainStrategy { get; set; }
     public string DomainStrategy4Singbox { get; set; }
-    public string DomainMatcher { get; set; }
     public string RoutingIndexId { get; set; }
 }
 

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -233,8 +233,6 @@ public class Routing4Ray
 {
     public string domainStrategy { get; set; }
 
-    public string? domainMatcher { get; set; }
-
     public List<RulesItem4Ray> rules { get; set; }
 
     public List<BalancersItem4Ray>? balancers { get; set; }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2463,15 +2463,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Domain Matcher 的本地化字符串。
-        /// </summary>
-        public static string TbdomainMatcher {
-            get {
-                return ResourceManager.GetString("TbdomainMatcher", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Domain strategy 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>تنظیم کردن به عنوان قانون فعال</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>تطبیق دامنه</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>استراتژی دامنه</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Beállítás aktív szabályként (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Tartomány illesztő</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Tartomány stratégia</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain Matcher</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Domain strategy</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
+  <!-- 
-    Microsoft ResX Schema
+    Microsoft ResX Schema 
-
+    
     Version 2.0
-
+    
-    The primary goals of this format is to allow a simple XML format
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
+                
-    There are any number of "resheader" rows that contain simple
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
+    
-    Each data row contains a name, and value. The row also contains a
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture.
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
+    
-    The mimetype is used for serialized objects, and tells the
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Установить как активное правило</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Сопоставитель доменов</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>Доменная стратегия</value>
   </data>
@@ -1500,4 +1497,4 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>设为活动规则 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -825,9 +825,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>設為活動規則 (Enter)</value>
   </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配演算法</value>
-  </data>
   <data name="TbdomainStrategy" xml:space="preserve">
     <value>域名解析策略</value>
   </data>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -523,7 +523,6 @@ public class CoreConfigV2rayService
             if (v2rayConfig.routing?.rules != null)
             {
                 v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-                v2rayConfig.routing.domainMatcher = _config.RoutingBasicItem.DomainMatcher.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainMatcher;
 
                 var routing = await ConfigHandler.GetDefaultRouting(_config);
                 if (routing != null)

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -75,10 +75,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdate()
     {
-        await Task.Run(async () =>
+        await Task.Run(CheckUpdateTask);
-        {
-            await CheckUpdateTask();
-        });
     }
 
     private async Task CheckUpdateTask()

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -20,9 +20,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     [Reactive]
     public string DomainStrategy { get; set; }
 
-    [Reactive]
-    public string DomainMatcher { get; set; }
-
     [Reactive]
     public string DomainStrategy4Singbox { get; set; }
 
@@ -75,7 +72,6 @@ public class RoutingSettingViewModel : MyReactiveObject
         SelectedSource = new();
 
         DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
-        DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
         DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
 
         await ConfigHandler.InitBuiltinRouting(_config);
@@ -109,7 +105,6 @@ public class RoutingSettingViewModel : MyReactiveObject
     private async Task SaveRoutingAsync()
     {
         _config.RoutingBasicItem.DomainStrategy = DomainStrategy;
-        _config.RoutingBasicItem.DomainMatcher = DomainMatcher;
         _config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;
 
         if (await ConfigHandler.SaveConfig(_config) == 0)

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -334,10 +334,7 @@ public class StatusBarViewModel : MyReactiveObject
 
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
 
-        var msg = await Task.Run(async () =>
+        var msg = await Task.Run(ConnectionHandler.Instance.RunAvailabilityCheck);
-        {
-            return await ConnectionHandler.Instance.RunAvailabilityCheck();
-        });
 
         NoticeHandler.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -50,7 +50,7 @@
             Margin="{StaticResource Margin4}"
             ColumnDefinitions="Auto,Auto"
             DockPanel.Dock="Top"
-            RowDefinitions="Auto,Auto,Auto">
+            RowDefinitions="Auto,Auto">
 
             <TextBlock
                 Grid.Row="0"
@@ -74,19 +74,6 @@
                 Grid.Row="1"
                 Grid.Column="0"
                 Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -94,7 +81,7 @@
             </TextBlock>
             <ComboBox
                 x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                 Grid.Column="1"
                 Width="300"
                 Margin="{StaticResource Margin4}"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -27,7 +27,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
         ViewModel = new RoutingSettingViewModel(UpdateViewHandler);
 
         cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
         cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;
 
         this.WhenActivated(disposables =>
@@ -36,7 +35,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -78,7 +78,6 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -109,21 +108,6 @@
                 Grid.Column="0"
                 Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkdomainStrategy4Singbox_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -132,7 +116,7 @@
             </TextBlock>
             <ComboBox
                 x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                 Grid.Column="1"
                 Width="300"
                 Margin="{StaticResource Margin4}"

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -22,7 +22,6 @@ public partial class RoutingSettingWindow
         ViewModel = new RoutingSettingViewModel(UpdateViewHandler);
 
         cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
         cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;
 
         this.WhenActivated(disposables =>
@@ -31,7 +30,6 @@ public partial class RoutingSettingWindow
             this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);