support Wireguard endpoint

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -8,6 +8,7 @@ public class SingboxConfig
     public Dns4Sbox? dns { get; set; }
     public List<Inbound4Sbox> inbounds { get; set; }
     public List<Outbound4Sbox> outbounds { get; set; }
+    public List<Endpoints4Sbox>? endpoints { get; set; }
     public Route4Sbox route { get; set; }
     public Experimental4Sbox? experimental { get; set; }
 }
@@ -123,11 +124,6 @@ public class Outbound4Sbox
     public string? version { get; set; }
     public string? network { get; set; }
     public string? packet_encoding { get; set; }
-    public List<string>? local_address { get; set; }
-    public string? private_key { get; set; }
-    public string? peer_public_key { get; set; }
-    public List<int>? reserved { get; set; }
-    public int? mtu { get; set; }
     public string? plugin { get; set; }
     public string? plugin_opts { get; set; }
     public Tls4Sbox? tls { get; set; }
@@ -152,6 +148,8 @@ public class Endpoints4Sbox
     public string? udp_timeout { get; set; }
     public int? workers { get; set; }
     public List<Peer4Sbox> peers { get; set; }
+    public string? detour { get; set; }
+    public Rule4Sbox? domain_resolver { get; set; }
 }
 
 public class Peer4Sbox

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -55,7 +55,18 @@ public class CoreConfigSingboxService
 
             await GenInbounds(singboxConfig);
 
-            await GenOutbound(node, singboxConfig.outbounds.First());
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
 
             await GenMoreOutbounds(node, singboxConfig);
 
@@ -204,16 +215,32 @@ public class CoreConfigSingboxService
                     continue;
                 }
 
-                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                var tag = string.Empty;
-                await GenOutbound(item, outbound);
+                if (item.ConfigType == EConfigType.WireGuard)
-                outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                {
-                singboxConfig.outbounds.Add(outbound);
+                    var endpoints = new Endpoints4Sbox();
+                    await GenEndpoint(item, endpoints);
+                    endpoints.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoints);
+
+                    tag = endpoints.tag;
+                }
+                else
+                {
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    await GenOutbound(item, outbound);
+                    outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                    singboxConfig.outbounds.Add(outbound);
+
+                    tag = outbound.tag;
+                }
 
                 //rule
                 Rule4Sbox rule = new()
                 {
                     inbound = new List<string> { inbound.tag },
-                    outbound = outbound.tag
+                    outbound = tag
                 };
                 singboxConfig.route.rules.Add(rule);
             }
@@ -277,7 +304,18 @@ public class CoreConfigSingboxService
             }
 
             await GenLog(singboxConfig);
-            await GenOutbound(node, singboxConfig.outbounds.First());
+            if (node.ConfigType == EConfigType.WireGuard)
+            {
+                singboxConfig.outbounds.RemoveAt(0);
+                var endpoints = new Endpoints4Sbox();
+                await GenEndpoint(node, endpoints);
+                endpoints.tag = Global.ProxyTag;
+                singboxConfig.endpoints = new() { endpoints };
+            }
+            else
+            {
+                await GenOutbound(node, singboxConfig.outbounds.First());
+            }
             await GenMoreOutbounds(node, singboxConfig);
             await GenDnsDomains(null, singboxConfig, null);
 
@@ -371,12 +409,26 @@ public class CoreConfigSingboxService
                     continue;
                 }
 
-                //outbound
+
-                var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                if (item.ConfigType == EConfigType.WireGuard)
-                await GenOutbound(item, outbound);
+                {
-                outbound.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
+                    //endpoint
-                singboxConfig.outbounds.Insert(0, outbound);
+                    var endpoints = new Endpoints4Sbox();
-                tagProxy.Add(outbound.tag);
+                    await GenEndpoint(item, endpoints);
+                    endpoints.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(endpoints);
+                    tagProxy.Add(endpoints.tag);
+                }
+                else
+                {
+                    //outbound
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    await GenOutbound(item, outbound);
+                    outbound.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
+                    singboxConfig.outbounds.Insert(0, outbound);
+                    tagProxy.Add(outbound.tag);
+                }
             }
             if (tagProxy.Count <= 0)
             {
@@ -750,15 +802,6 @@ public class CoreConfigSingboxService
                         outbound.congestion_control = node.HeaderType;
                         break;
                     }
-                case EConfigType.WireGuard:
-                    {
-                        outbound.private_key = node.Id;
-                        outbound.peer_public_key = node.PublicKey;
-                        outbound.reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList();
-                        outbound.local_address = Utils.String2List(node.RequestHost);
-                        outbound.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
-                        break;
-                    }
                 case EConfigType.Anytls:
                     {
                         outbound.password = node.Id;
@@ -777,6 +820,51 @@ public class CoreConfigSingboxService
         return 0;
     }
 
+    private async Task<int> GenEndpoint(ProfileItem node, Endpoints4Sbox endpoints)
+    {
+        try
+        {
+            endpoints.address = Utils.String2List(node.RequestHost);
+            // Utils.GetFreePort() 9090 ?
+            endpoints.listen_port = Utils.GetFreePort();
+            endpoints.type = Global.ProtocolTypes[node.ConfigType];
+
+            if (Utils.IsDomain(node.Address))
+            {
+                var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+                endpoints.domain_resolver = new()
+                {
+                    server = "local_local",
+                    strategy = string.IsNullOrEmpty(item?.DomainStrategy4Freedom) ? null : item?.DomainStrategy4Freedom
+                };
+            }
+
+            switch (node.ConfigType)
+            {
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new Peer4Sbox
+                        {
+                            public_key = node.PublicKey,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            address = node.Address,
+                            port = node.Port,
+                            // TODO default ["0.0.0.0/0", "::/0"]
+                            allowed_ips = new() { "0.0.0.0/0", "::/0" },
+                        };
+                        endpoints.private_key = node.Id;
+                        endpoints.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
+                        break;
+                    }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return await Task.FromResult(0);
+    }
+
     private async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
     {
         try
@@ -942,7 +1030,9 @@ public class CoreConfigSingboxService
             }
 
             //current proxy
-            var outbound = singboxConfig.outbounds.First();
+            var endpoint = singboxConfig.endpoints?.FirstOrDefault(t => t.tag == Global.ProxyTag);
+            var outbound = endpoint == null ? singboxConfig.outbounds.First() : null;
+
             var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
 
             //Previous proxy
@@ -950,12 +1040,34 @@ public class CoreConfigSingboxService
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom)
             {
-                var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                var tag = string.Empty;
-                await GenOutbound(prevNode, prevOutbound);
+                if (prevNode.ConfigType == EConfigType.WireGuard)
-                prevOutbound.tag = $"{Global.ProxyTag}2";
+                {
-                singboxConfig.outbounds.Add(prevOutbound);
+                    var prevEndpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
+                    await GenEndpoint(prevNode, prevEndpoint);
+                    prevEndpoint.tag = $"{Global.ProxyTag}2";
+                    singboxConfig.endpoints ??= new();
+                    singboxConfig.endpoints.Add(prevEndpoint);
 
-                outbound.detour = prevOutbound.tag;
+                    tag = prevEndpoint.tag;
+                }
+                else
+                {
+                    var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    await GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    singboxConfig.outbounds.Add(prevOutbound);
+
+                    tag = prevOutbound.tag;
+                }
+                if (endpoint != null)
+                {
+                    endpoint.detour = tag;
+                }
+                else
+                {
+                    outbound.detour = tag;
+                }
             }
 
             //Next proxy
@@ -963,13 +1075,33 @@ public class CoreConfigSingboxService
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom)
             {
-                var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                var tag = $"{Global.ProxyTag}1";
-                await GenOutbound(nextNode, nextOutbound);
+                if (endpoint != null)
-                nextOutbound.tag = Global.ProxyTag;
+                {
-                singboxConfig.outbounds.Insert(0, nextOutbound);
+                    endpoint.tag = tag;
+                }
+                else
+                {
+                    outbound.tag = tag;
+                }
+                if (nextNode.ConfigType == EConfigType.WireGuard)
+                {
+                    var nextEndpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
+                    await GenEndpoint(nextNode, nextEndpoint);
+                    nextEndpoint.tag = Global.ProxyTag;
+                    singboxConfig.endpoints.Insert(0, nextEndpoint);
 
-                outbound.tag = $"{Global.ProxyTag}1";
+                    nextEndpoint.detour = tag;
-                nextOutbound.detour = outbound.tag;
+                }
+                else
+                {
+                    var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    await GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    singboxConfig.outbounds.Insert(0, nextOutbound);
+
+                    nextOutbound.detour = tag;
+                }
             }
         }
         catch (Exception ex)