.github/workflows/build-osx.yml

@@ -1,32 +0,0 @@
-name: release macos
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        configuration: [Release]
-
-    runs-on: macos-latest 
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Build
-      run:  cd v2rayN && 
-        ./build-osx.sh
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: v2rayN
-        path: |
-          ./v2rayN/v2rayN-osx.zip
-
-     

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
 
     - name: Build
       run:  cd v2rayN && 
-        ./build.ps1
+        .\build.ps1
         
     # - name: Package
     #   shell: pwsh
@@ -40,7 +40,7 @@ jobs:
       with:
         name: v2rayN
         path: |
-          ./v2rayN/v2rayN.zip
+          .\v2rayN\v2rayN.zip
 
     # - name: Release
     #   uses: softprops/action-gh-release@v1

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1026,36 +1026,6 @@ namespace ServiceLib.Handler
             return result;
         }
 
-        public static async Task<ProfileItem?> GetPreSocksItem(Config config, ProfileItem node, ECoreType coreType)
-        {
-            ProfileItem? itemSocks = null;
-            var preCoreType = ECoreType.sing_box;
-            if (node.ConfigType != EConfigType.Custom && coreType != ECoreType.sing_box && config.TunModeItem.EnableTun)
-            {
-                itemSocks = new ProfileItem()
-                {
-                    CoreType = preCoreType,
-                    ConfigType = EConfigType.SOCKS,
-                    Address = Global.Loopback,
-                    Sni = node.Address, //Tun2SocksAddress
-                    Port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)
-                };
-            }
-            else if ((node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0))
-            {
-                preCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
-                itemSocks = new ProfileItem()
-                {
-                    CoreType = preCoreType,
-                    ConfigType = EConfigType.SOCKS,
-                    Address = Global.Loopback,
-                    Port = node.PreSocksPort.Value,
-                };
-            }
-
-            return itemSocks;
-        }
-
         #endregion Server
 
         #region Batch add servers

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -64,30 +64,49 @@ namespace ServiceLib.Handler
                 ShowMsg(true, result.Msg);
                 return;
             }
+            else
+            {
+                ShowMsg(true, $"{node.GetSummary()}");
+                ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
+                ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+                await CoreStop();
+                await Task.Delay(100);
+                await CoreStart(node);
 
-            ShowMsg(true, $"{node.GetSummary()}");
-            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-            await CoreStop();
-            await Task.Delay(100);
-            await CoreStart(node);
-            await CoreStartPreService(node);
+                //In tun mode, do a delay check and restart the core
+                //if (_config.tunModeItem.enableTun)
+                //{
+                //    Observable.Range(1, 1)
+                //    .Delay(TimeSpan.FromSeconds(15))
+                //    .Subscribe(x =>
+                //    {
+                //        {
+                //            if (_process == null || _process.HasExited)
+                //            {
+                //                CoreStart(node);
+                //                ShowMsg(false, "Tun mode restart the core once");
+                //                Logging.SaveLog("Tun mode restart the core once");
+                //            }
+                //        }
+                //    });
+                //}
+            }
         }
 
         public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
+            var pid = -1;
             var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
             var configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
             var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
             ShowMsg(false, result.Msg);
-            if (result.Success != true)
+            if (result.Success)
             {
-                return -1;
+                ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+                ShowMsg(false, configPath);
+                pid = await CoreStartSpeedtest(configPath, coreType);
             }
-
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-            ShowMsg(false, configPath);
-            return await CoreStartSpeedtest(configPath, coreType);
+            return pid;
         }
 
         public async Task CoreStop()
@@ -152,7 +171,8 @@ namespace ServiceLib.Handler
 
         private async Task CoreStart(ProfileItem node)
         {
-            var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+            _config.RunningCoreType = coreType;
             var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
 
             var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
@@ -162,28 +182,47 @@ namespace ServiceLib.Handler
                 return;
             }
             _process = proc;
-        }
 
-        private async Task CoreStartPreService(ProfileItem node)
-        {
+            //start a pre service
             if (_process != null && !_process.HasExited)
             {
-                var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-                var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
+                ProfileItem? itemSocks = null;
+                var preCoreType = ECoreType.sing_box;
+                if (node.ConfigType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.TunModeItem.EnableTun)
+                {
+                    itemSocks = new ProfileItem()
+                    {
+                        CoreType = preCoreType,
+                        ConfigType = EConfigType.SOCKS,
+                        Address = Global.Loopback,
+                        Sni = node.Address, //Tun2SocksAddress
+                        Port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)
+                    };
+                }
+                else if ((node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0))
+                {
+                    preCoreType = _config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+                    itemSocks = new ProfileItem()
+                    {
+                        CoreType = preCoreType,
+                        ConfigType = EConfigType.SOCKS,
+                        Address = Global.Loopback,
+                        Port = node.PreSocksPort.Value,
+                    };
+                    _config.RunningCoreType = preCoreType;
+                }
                 if (itemSocks != null)
                 {
-                    var preCoreType = _config.RunningCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
-                    var fileName = Utils.GetConfigPath(Global.CorePreConfigFileName);
-                    var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
+                    var fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
+                    var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2);
                     if (result.Success)
                     {
-                        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
-                        var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
-                        if (proc is null)
+                        var coreInfo2 = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                        var proc2 = await RunProcess(coreInfo2, Global.CorePreConfigFileName, true, true);
+                        if (proc2 is not null)
                         {
-                            return;
+                            _processPre = proc2;
                         }
-                        _processPre = proc;
                     }
                 }
             }
@@ -339,7 +378,7 @@ namespace ServiceLib.Handler
             }
             await File.WriteAllTextAsync(shFilePath, sb.ToString());
             await Utils.SetLinuxChmod(shFilePath);
-
+ 
             proc.StartInfo.FileName = shFilePath;
             proc.StartInfo.Arguments = "";
             proc.StartInfo.WorkingDirectory = "";
@@ -352,24 +391,24 @@ namespace ServiceLib.Handler
             {
                 return;
             }
+            var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(1));
             try
             {
-                proc?.Kill();
+                await proc.WaitForExitAsync(timeout.Token);
             }
-            catch (Exception)
+            catch (OperationCanceledException)
             {
-                // ignored
+                proc.Kill();
             }
-            await Task.Delay(100);
-            if (proc?.HasExited == false)
+            if (!proc.HasExited)
             {
                 try
                 {
-                    proc?.Kill();
+                    await proc.WaitForExitAsync(timeout.Token);
                 }
                 catch (Exception)
                 {
-                    // ignored
+                    proc.Kill();
                 }
             }
         }

v2rayN/build-osx.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo 'Building'
-
-OutputPath='./bin/v2rayN'
-
-dotnet publish 	./v2rayN.Desktop/v2rayN.Desktop.csproj 	-c Release 	-r osx-x64 	--self-contained true 	-p:PublishReadyToRun=false 	-p:PublishSingleFile=true 	-o "${OutputPath}/osx-x64"
-dotnet publish 	./v2rayN.Desktop/v2rayN.Desktop.csproj 	-c Release 	-r osx-arm64 	--self-contained true 	-p:PublishReadyToRun=false 	-p:PublishSingleFile=true 	-o "${OutputPath}/osx-arm64"
-
-rm -rf "$OutputPath/osx-x64/*.pdb"
-rm -rf "$OutputPath/osx-arm64/*.pdb"
-
-echo 'Build done'
-
-ls $OutputPath
-7z a  v2rayN-osx.zip $OutputPath
-exit 0

v2rayN/build.ps1

@@ -2,57 +2,37 @@ param (
 	[Parameter()]
 	[ValidateNotNullOrEmpty()]
 	[string]
-	$OutputPath = './bin/v2rayN'
+	$OutputPath = '.\bin\v2rayN'
 )
 
 Write-Host 'Building'
 
 dotnet publish `
-	./v2rayN/v2rayN.csproj `
+	.\v2rayN\v2rayN.csproj `
 	-c Release `
 	-r win-x64 `
 	--self-contained false `
 	-p:PublishReadyToRun=false `
 	-p:PublishSingleFile=true `
-	-o "$OutputPath/win-x64"
+	-o "$OutputPath\win-x64"
 
 dotnet publish `
-	./v2rayN/v2rayN.csproj `
-	-c Release `
-	-r win-arm64 `
-	--self-contained false `
-	-p:PublishReadyToRun=false `
-	-p:PublishSingleFile=true `
-	-o "$OutputPath/win-arm64"
-
-dotnet publish `
-	./v2rayN.Desktop/v2rayN.Desktop.csproj `
+	.\v2rayN.Desktop\v2rayN.Desktop.csproj `
 	-c Release `
 	-r linux-x64 `
 	--self-contained true `
 	-p:PublishReadyToRun=false `
 	-p:PublishSingleFile=true `
-	-o "$OutputPath/linux-x64"
-	
-dotnet publish `
-	./v2rayN.Desktop/v2rayN.Desktop.csproj `
-	-c Release `
-	-r linux-arm64 `
-	--self-contained true `
-	-p:PublishReadyToRun=false `
-	-p:PublishSingleFile=true `
-	-o "$OutputPath/linux-arm64"
- 
+	-o "$OutputPath\linux-x64"
+
 
 if ( -Not $? ) {
 	exit $lastExitCode
 	}
 
-if ( Test-Path -Path ./bin/v2rayN ) {
-    rm -Force "$OutputPath/win-x64/*.pdb"
-    rm -Force "$OutputPath/win-arm64/*.pdb"
-    rm -Force "$OutputPath/linux-x64/*.pdb"
-    rm -Force "$OutputPath/linux-arm64/*.pdb"
+if ( Test-Path -Path .\bin\v2rayN ) {
+    rm -Force "$OutputPath\win-x64\*.pdb"
+    rm -Force "$OutputPath\linux-x64\*.pdb"
 }
 
 Write-Host 'Build done'