up 7.2.2

https://github.com/2dust/v2rayN/issues/6172

.github/workflows/build-osx.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: v2rayN
+        name: v2rayN-osx
         path: |
           ./v2rayN/v2rayN-osx.zip
 

v2rayN/ServiceLib/Global.cs

@@ -20,7 +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 IPAPIUrl = "https://api.ip.sb/geoip";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -13,6 +13,7 @@ namespace ServiceLib.Handler
         private Config _config;
         private Process? _process;
         private Process? _processPre;
+        private int _linuxSudoPid = -1;
         private Action<bool, string>? _updateFunc;
 
         public async Task Init(Config config, Action<bool, string> updateFunc)
@@ -107,6 +108,12 @@ namespace ServiceLib.Handler
                     _processPre.Dispose();
                     _processPre = null;
                 }
+
+                if (_linuxSudoPid > 0)
+                {
+                    await KillProcessAsLinuxSudo();
+                }
+                _linuxSudoPid = -1;
             }
             catch (Exception ex)
             {
@@ -257,7 +264,7 @@ namespace ServiceLib.Handler
                 var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
                 if (isNeedSudo)
                 {
-                    await RunProcessAsLinuxRoot(proc, fileName, coreInfo, configPath);
+                    await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
                 }
 
                 var startUpErrorMessage = new StringBuilder();
@@ -290,6 +297,7 @@ namespace ServiceLib.Handler
                     await Task.Delay(10);
                     await proc.StandardInput.WriteLineAsync(pwd);
                 }
+                if (isNeedSudo) _linuxSudoPid = proc.Id;
 
                 if (displayLog)
                 {
@@ -318,34 +326,6 @@ 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())}";
-
-            //Shell scripts
-            var shFilePath = Utils.GetBinPath("run_as_root.sh");
-            File.Delete(shFilePath);
-            var sb = new StringBuilder();
-            sb.AppendLine("#!/bin/sh");
-            if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
-            {
-                sb.AppendLine($"pkexec {cmdLine}");
-            }
-            else
-            {
-                sb.AppendLine($"sudo -S {cmdLine}");
-                proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
-                proc.StartInfo.RedirectStandardInput = true;
-            }
-            await File.WriteAllTextAsync(shFilePath, sb.ToString());
-            await Utils.SetLinuxChmod(shFilePath);
-
-            proc.StartInfo.FileName = shFilePath;
-            proc.StartInfo.Arguments = "";
-            proc.StartInfo.WorkingDirectory = "";
-            Logging.SaveLog(shFilePath);
-        }
-
         private async Task KillProcess(Process? proc)
         {
             if (proc is null)
@@ -375,5 +355,78 @@ namespace ServiceLib.Handler
         }
 
         #endregion Process
+
+        #region Linux
+
+        private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
+        {
+            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
+
+            var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+            proc.StartInfo.FileName = shFilePath;
+            proc.StartInfo.Arguments = "";
+            proc.StartInfo.WorkingDirectory = "";
+            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+            {
+                proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
+                proc.StartInfo.RedirectStandardInput = true;
+            }
+        }
+
+        private async Task KillProcessAsLinuxSudo()
+        {
+            var cmdLine = $"kill -9 {_linuxSudoPid}";
+            var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+            Process proc = new()
+            {
+                StartInfo = new()
+                {
+                    FileName = shFilePath,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    StandardInputEncoding = Encoding.UTF8,
+                    RedirectStandardInput = true
+                }
+            };
+            proc.Start();
+
+            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+            {
+                var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
+                await Task.Delay(10);
+                await proc.StandardInput.WriteLineAsync(pwd);
+                await Task.Delay(10);
+                await proc.StandardInput.WriteLineAsync(pwd);
+            }
+
+            var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+            await proc.WaitForExitAsync(timeout.Token);
+            await Task.Delay(1000);
+        }
+
+        private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
+        {
+            //Shell scripts
+            var shFilePath = Utils.GetBinPath(fileName);
+            File.Delete(shFilePath);
+            var sb = new StringBuilder();
+            sb.AppendLine("#!/bin/sh");
+            if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
+            {
+                sb.AppendLine($"pkexec {cmdLine}");
+            }
+            else
+            {
+                sb.AppendLine($"sudo -S {cmdLine}");
+            }
+
+            await File.WriteAllTextAsync(shFilePath, sb.ToString());
+            await Utils.SetLinuxChmod(shFilePath);
+            Logging.SaveLog(shFilePath);
+
+            return shFilePath;
+        }
+
+        #endregion Linux
     }
 }

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.2.1</Version>
+	<Version>7.2.2</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -249,9 +249,9 @@ namespace ServiceLib.Services
             var ip = Global.None;
             if (time > 0)
             {
-                var result = await downloadHandle.TryDownloadString(Global.IPAPIUrl, true, "ipapi");
+                var result = await downloadHandle.TryDownloadString(Global.IPAPIUrl, true, Global.IPAPIUrl);
                 var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
-                ip = $"({ipInfo?.country}) {ipInfo?.ip}";
+                ip = $"({ipInfo?.country_code}) {ipInfo?.ip}";
             }
 
             updateFunc?.Invoke(false, string.Format(ResUI.TestMeOutput, time, ip));

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -20,12 +20,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.1" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.1" />
+        <PackageReference Include="Avalonia" Version="11.2.2" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.2" />
         <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />		
         <PackageReference Include="Semi.Avalonia" Version="11.2.1" />