Fix

https://github.com/2dust/v2rayN/pull/7089

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,3 +1,4 @@
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -86,7 +87,8 @@ public class JsonUtils
             var options = new JsonSerializerOptions
             {
                 WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping // 避免转义加号
             };
             result = JsonSerializer.Serialize(obj, options);
         }

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -716,7 +716,6 @@ public class ConfigHandler
     public static async Task<int> AddWireguardServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.WireGuard;
-        profileItem.CoreType = ECoreType.sing_box;
 
         profileItem.Address = profileItem.Address.TrimEx();
         profileItem.Id = profileItem.Id.TrimEx();

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -101,7 +101,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC) ? ECoreType.sing_box : ECoreType.Xray;
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -127,6 +127,26 @@ public class Outboundsettings4Ray
     public int? userLevel { get; set; }
 
     public FragmentItem4Ray? fragment { get; set; }
+
+    public string? secretKey { get; set; }
+
+    public List<string>? address { get; set; }
+
+    public List<WireguardPeer4Ray>? peers { get; set; }
+
+    public bool? noKernelTun { get; set; }
+
+    public int? mtu { get; set; }
+
+    public List<int>? reserved { get; set; }
+
+    public int? workers { get; set; }
+}
+
+public class WireguardPeer4Ray
+{
+    public string endpoint { get; set; }
+    public string publicKey { get; set; }
 }
 
 public class VnextItem4Ray

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -120,7 +120,7 @@ public class CoreConfigV2rayService
                 {
                     continue;
                 }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)
+                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC)
                 {
                     continue;
                 }
@@ -805,6 +805,26 @@ public class CoreConfigV2rayService
                         outbound.settings.vnext = null;
                         break;
                     }
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new WireguardPeer4Ray
+                        {
+                            publicKey = node.PublicKey,
+                            endpoint = node.Address + ":" + node.Port.ToString()
+                        };
+                        var setting = new Outboundsettings4Ray
+                        {
+                            address = Utils.String2List(node.RequestHost),
+                            secretKey = node.Id,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt(),
+                            peers = new List<WireguardPeer4Ray> { peer }
+                        };
+                        outbound.settings = setting;
+                        outbound.settings.vnext = null;
+                        outbound.settings.servers = null;
+                        break;
+                    }
             }
 
             outbound.protocol = Global.ProtocolTypes[node.ConfigType];
@@ -1270,8 +1290,7 @@ public class CoreConfigV2rayService
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom
                 && prevNode.ConfigType != EConfigType.Hysteria2
-                && prevNode.ConfigType != EConfigType.TUIC
+                && prevNode.ConfigType != EConfigType.TUIC)
-                && prevNode.ConfigType != EConfigType.WireGuard)
             {
                 var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(prevNode, prevOutbound);
@@ -1289,8 +1308,7 @@ public class CoreConfigV2rayService
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom
                 && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC
+                && nextNode.ConfigType != EConfigType.TUIC)
-                && nextNode.ConfigType != EConfigType.WireGuard)
             {
                 var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(nextNode, nextOutbound);

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -100,6 +100,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string CoreType4 { get; set; }
     [Reactive] public string CoreType5 { get; set; }
     [Reactive] public string CoreType6 { get; set; }
+    [Reactive] public string CoreType9 { get; set; }
 
     #endregion CoreType
 
@@ -259,6 +260,10 @@ public class OptionSettingViewModel : MyReactiveObject
                 case 6:
                     CoreType6 = type;
                     break;
+
+                case 9:
+                    CoreType9 = type;
+                    break;
             }
         });
         await Task.CompletedTask;
@@ -407,6 +412,10 @@ public class OptionSettingViewModel : MyReactiveObject
                     type = CoreType6;
                     break;
 
+                case 9:
+                    type = CoreType9;
+                    break;
+
                 default:
                     continue;
             }

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -131,7 +131,6 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                 sepa2.IsVisible = false;
                 gridTransport.IsVisible = false;
                 gridTls.IsVisible = false;
-                cmbCoreType.IsEnabled = false;
 
                 break;
         }

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -813,7 +813,7 @@
                 <Grid
                     Margin="{StaticResource Margin4}"
                     ColumnDefinitions="Auto,Auto"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
@@ -891,6 +891,19 @@
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="Wireguard" />
+                    <ComboBox
+                        x:Name="cmbCoreType9"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
             </TabItem>
         </TabControl>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -64,6 +64,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             cmbCoreType4.Items.Add(it);
             cmbCoreType5.Items.Add(it);
             cmbCoreType6.Items.Add(it);
+            cmbCoreType9.Items.Add(it);
         });
 
         for (var i = 2; i <= 8; i++)
@@ -160,6 +161,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -125,7 +125,6 @@ public partial class AddServerWindow
                 sepa2.Visibility = Visibility.Collapsed;
                 gridTransport.Visibility = Visibility.Collapsed;
                 gridTls.Visibility = Visibility.Collapsed;
-                cmbCoreType.IsEnabled = false;
 
                 break;
         }

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -1098,6 +1098,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -1192,6 +1193,21 @@
                         Width="200"
                         Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="Wireguard" />
+                    <ComboBox
+                        x:Name="cmbCoreType9"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin8}"
+                        Style="{StaticResource DefComboBox}" />
                 </Grid>
             </TabItem>
         </TabControl>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -66,6 +66,7 @@ public partial class OptionSettingWindow
             cmbCoreType4.Items.Add(it);
             cmbCoreType5.Items.Add(it);
             cmbCoreType6.Items.Add(it);
+            cmbCoreType9.Items.Add(it);
         });
 
         for (var i = 2; i <= 8; i++)
@@ -178,6 +179,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });