Merge branch '2dust:master' into master

2025-08-25 20:36:55 +00:00 · 2024-11-19 18:41:29 +08:00 · 2024-11-19 18:41:29 +08:00 · ea7653c771
commit ea7653c771
parent 3a2837b223 bee66d06dd
29 changed files with 137 additions and 80 deletions
--- a/README.md
+++ b/README.md
@ -9,13 +9,19 @@ A GUI client for Windows and Linux, support [Xray core](https://github.com/XTLS/


 ## How to use
- If you are new to this, please download v2rayN-With-Core.zip from [releases](https://github.com/2dust/v2rayN/releases)
- Otherwise please download v2rayN.zip (you will also need to download cores in the bin directory)
- Run v2rayN.exe
+Check [Release files introduction](https://github.com/2dust/v2rayN/wiki/Release-files-introduction) and select the version you need to download 
+### Windows
+- Run `v2rayN.exe`
+### Linux
+- `chmod +x v2rayN` Run `./v2rayN`
+```
+Debian 9+
+Ubuntu 16.04+
+Fedora 30+
+```

 ## Requirements  
- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+- [Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 - [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)


--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@ -20,6 +20,7 @@
        public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
+        public const string IPAPIUrl = "https://ipapi.co/json";

        public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
        public const string ConfigFileName = "guiNConfig.json";
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreHandler.cs
@ -259,7 +259,7 @@ namespace ServiceLib.Handler
            return _config.TunModeItem.EnableTun
                   && eCoreType == ECoreType.sing_box
                   && Utils.IsLinux()
-                   && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
+                //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
                ;
        }

@ -275,7 +275,6 @@ namespace ServiceLib.Handler
                return null;
            }

-            var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
            try
            {
                Process proc = new()
@ -294,14 +293,10 @@ namespace ServiceLib.Handler
                    }
                };

+                var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
                if (isNeedSudo)
                {
-                    proc.StartInfo.FileName = $"/bin/sudo";
-                    proc.StartInfo.Arguments = $"-S {fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
-                    proc.StartInfo.WorkingDirectory = null;
-                    proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
-                    proc.StartInfo.RedirectStandardInput = true;
-                    Logging.SaveLog(proc.StartInfo.Arguments);
+                    await RunProcessAsLinuxRoot(proc, fileName, coreInfo, configPath);
                }

                var startUpErrorMessage = new StringBuilder();
@ -326,7 +321,7 @@ namespace ServiceLib.Handler
                }
                proc.Start();

-                if (isNeedSudo)
+                if (isNeedSudo && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
                {
                    var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
                    await Task.Delay(10);
@ -362,6 +357,37 @@ namespace ServiceLib.Handler
            }
        }

+        private async Task RunProcessAsLinuxRoot(Process proc, string fileName, CoreInfo coreInfo, string configPath)
+        {
+            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
+
+            //Prefer shell scripts
+            var shFilePath = Utils.GetBinPath("run_as_root.sh");
+            File.Delete(shFilePath);
+            var sb = new StringBuilder();
+            sb.AppendLine("#!/bin/sh");
+            sb.AppendLine(cmdLine);
+            await File.WriteAllTextAsync(shFilePath, sb.ToString());
+            await Utils.SetLinuxChmod(shFilePath);
+
+            //Replace command
+            var args = File.Exists(shFilePath) ? shFilePath : cmdLine;
+            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+            {
+                proc.StartInfo.FileName = $"/bin/sudo";
+                proc.StartInfo.Arguments = $"-S {args}";
+            }
+            else
+            {
+                proc.StartInfo.FileName = $"/bin/pkexec";
+                proc.StartInfo.Arguments = $"{args}";
+            }
+            proc.StartInfo.WorkingDirectory = null;
+            proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
+            proc.StartInfo.RedirectStandardInput = true;
+            Logging.SaveLog(proc.StartInfo.Arguments);
+        }
+
        private async Task KillProcess(Process? proc)
        {
            if (proc is null)
--- a/v2rayN/ServiceLib/Handler/StatisticsHandler.cs
+++ b/v2rayN/ServiceLib/Handler/StatisticsHandler.cs
@ -9,8 +9,10 @@
        private ServerStatItem? _serverStatItem;
        private List<ServerStatItem> _lstServerStat;
        private Action<ServerSpeedItem>? _updateFunc;
+
        //private StatisticsV2rayService? _statisticsV2Ray;
        private StatisticsXrayService? _statisticsXray;
+
        private StatisticsSingboxService? _statisticsSingbox;

        public List<ServerStatItem> ServerStat => _lstServerStat;
--- a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs
@ -5,6 +5,7 @@
        /*
         * 仅测试了，MacOS 13.7.1 x86 版本，其他版本有待确认
         */
+
        /// <summary>
        /// 应用接口类型
        /// </summary>
@ -21,14 +22,12 @@
            await ExecCmd(lstCmd);
        }

-
        public static async Task UnsetProxy()
        {
            var lstCmd = GetUnsetCmds();
            await ExecCmd(lstCmd);
        }

-
        private static async Task ExecCmd(List<CmdItem> lstCmd)
        {
            foreach (var cmd in lstCmd)
--- a/v2rayN/ServiceLib/Models/Config.cs
+++ b/v2rayN/ServiceLib/Models/Config.cs
@ -20,6 +20,7 @@
                case ECoreType.Xray when RunningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5:
                case ECoreType.sing_box when RunningCoreType is ECoreType.sing_box or ECoreType.mihomo:
                    return true;
+
                default:
                    return false;
            }
--- a/v2rayN/ServiceLib/Models/IPAPIInfo.cs
+++ b/v2rayN/ServiceLib/Models/IPAPIInfo.cs
@ -0,0 +1,13 @@
+namespace ServiceLib.Models
+{
+    internal class IPAPIInfo
+    {
+        public string? ip { get; set; }
+        public string? city { get; set; }
+        public string? region { get; set; }
+        public string? region_code { get; set; }
+        public string? country { get; set; }
+        public string? country_name { get; set; }
+        public string? country_code { get; set; }
+    }
+}
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@ -3644,7 +3644,7 @@ namespace ServiceLib.Resx {
        }
        
        /// <summary>
-        ///   查找类似 The ping of current service: {0} ms 的本地化字符串。
+        ///   查找类似 The delay : {0} ms, {1} 的本地化字符串。
        /// </summary>
        public static string TestMeOutput {
            get {
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@ -302,7 +302,7 @@
    <value>اسکن URL وارد کردن با موفقیت</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>پینگ سرویس فعلی: {0} ms</value>
+    <value>پینگ سرویس فعلی: {0} ms, {1}</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>موفقیت عملیات</value>
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@ -302,7 +302,7 @@
    <value>Scan import the shared link successfully</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>The ping of current service: {0} ms</value>
+    <value>The delay : {0} ms, {1}</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>Operation success</value>
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@ -302,7 +302,7 @@
    <value>Сканирование URL-адреса импорта успешна.</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>Задержка текущего сервера: {0} мс</value>
+    <value>Задержка текущего сервера: {0} мс, {1}</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>Операция успешна</value>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@ -302,7 +302,7 @@
    <value>扫描导入分享链接成功</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>当前服务的真连接延迟: {0} ms</value>
+    <value>当前延迟: {0} ms，{1}</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>操作成功</value>
@ -1370,7 +1370,7 @@
    <value>Linux系统的sudo密码</value>
  </data>
  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密码已加密且只存储在本地文件中，无密码无法开启Tun</value>
+    <value>密码已加密且只存储在本地文件中，无密码则每次都要输入</value>
  </data>
  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
    <value>请先在Tun模式设置中设置sudo密码</value>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@ -301,7 +301,7 @@
    <value>掃描匯入分享链接成功</value>
  </data>
  <data name="TestMeOutput" xml:space="preserve">
-    <value>目前服務的真連線延遲: {0} ms</value>
+    <value>目前延遲: {0} ms，{1}</value>
  </data>
  <data name="OperationSuccess" xml:space="preserve">
    <value>操作成功</value>
@ -1370,7 +1370,7 @@
    <value>Linux系統的sudo密碼</value>
  </data>
  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密碼已加密且只儲存在本機檔案中，無密碼無法開啟Tun</value>
+    <value>密碼已加密且只儲存在本機檔案中，無密碼則每次都要輸入</value>
  </data>
  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
    <value>請先在Tun模式設定中設定sudo密碼</value>
--- a/v2rayN/ServiceLib/ServiceLib.csproj
+++ b/v2rayN/ServiceLib/ServiceLib.csproj
@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.1.2</Version>
+	<Version>7.1.3</Version>
  </PropertyGroup>
 
 	<ItemGroup>
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@ -244,8 +244,17 @@ namespace ServiceLib.Services

        public async Task RunAvailabilityCheck(Action<bool, string> updateFunc)
        {
-            var time = await new DownloadService().RunAvailabilityCheck(null);
-            updateFunc?.Invoke(false, string.Format(ResUI.TestMeOutput, time));
+            var downloadHandle = new DownloadService();
+            var time = await downloadHandle.RunAvailabilityCheck(null);
+            var ip = Global.None;
+            if (time > 0)
+            {
+                var result = await downloadHandle.TryDownloadString(Global.IPAPIUrl, true, "ipapi");
+                var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+                ip = $"({ipInfo?.country}) {ipInfo?.ip}";
+            }
+
+            updateFunc?.Invoke(false, string.Format(ResUI.TestMeOutput, time, ip));
        }

        #region CheckUpdate private
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@ -416,17 +416,17 @@ namespace ServiceLib.ViewModels
                // When running as a non-administrator, reboot to administrator mode
                if (EnableTun && AllowEnableTun() == false)
                {
-                    _config.TunModeItem.EnableTun = false;
                    if (Utils.IsWindows())
                    {
+                        _config.TunModeItem.EnableTun = false;
                        Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
-                    }
-                    else if (Utils.IsLinux())
-                    {
-                        NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
-                    }
                        return;
                    }
+                    //else if (Utils.IsLinux())
+                    //{
+                    //    NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
+                    //}
+                }
                await ConfigHandler.SaveConfig(_config);
                Locator.Current.GetService<MainWindowViewModel>()?.Reload();
            }
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@ -1,9 +1,9 @@
 <Application
    x:Class="v2rayN.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    ShutdownMode="OnExplicitShutdown"
    StartupUri="Views/MainWindow.xaml">
    <Application.Resources>
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
    x:Class="v2rayN.Views.ClashConnectionsView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
    d:DesignHeight="450"
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
    x:Class="v2rayN.Views.ClashProxiesView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
    d:DesignHeight="450"
    d:DesignWidth="800"
    x:TypeArguments="vms:ClashProxiesViewModel"
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.RoutingRuleSettingWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.SubEditWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
    Title="{x:Static resx:ResUI.menuSubSetting}"