2025-10-13 11:59:13 +00:00
5 changed files with 51 additions and 12 deletions
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@ -1484,7 +1484,16 @@ public static class ConfigHandler
        if (profileItem is null)
        {
            profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks);
-        }  
+        }
+        if (profileItem is null)
+        {
+            profileItem = Hysteria2Fmt.ResolveFull(strData, subRemarks);
+        }
+        //Is naiveproxy configuration
+        if (profileItem is null)
+        {
+            profileItem = NaiveproxyFmt.ResolveFull(strData, subRemarks);
+        }
        if (profileItem is null || profileItem.Address.IsNullOrEmpty())
        {
            return -1;
--- a/v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs
@ -4,7 +4,7 @@ public class ClashFmt : BaseFmt
 {
    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
    {
-        if (Contains(strData, "rules", "-port", "proxies"))
+        if (Contains(strData, "external-controller", "-port", "proxies"))
        {
            var fileName = WriteAllText(strData, "yaml");

--- a/v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
@ -63,6 +63,24 @@ public class Hysteria2Fmt : BaseFmt
        return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark);
    }

+    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    {
+        if (Contains(strData, "server", "up", "down", "listen", "<html>", "<body>"))
+        {
+            var fileName = WriteAllText(strData);
+
+            var profileItem = new ProfileItem
+            {
+                CoreType = ECoreType.hysteria,
+                Address = fileName,
+                Remarks = subRemarks ?? "hysteria_custom"
+            };
+            return profileItem;
+        }
+
+        return null;
+    }
+
    public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
    {
        if (Contains(strData, "server", "auth", "up", "down", "listen"))
--- a/v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs
@ -0,0 +1,22 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class NaiveproxyFmt : BaseFmt
+{
+    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    {
+        if (Contains(strData, "listen", "proxy", "<html>", "<body>"))
+        {
+            var fileName = WriteAllText(strData);
+
+            var profileItem = new ProfileItem
+            {
+                CoreType = ECoreType.naiveproxy,
+                Address = fileName,
+                Remarks = subRemarks ?? "naiveproxy_custom"
+            };
+            return profileItem;
+        }
+
+        return null;
+    }
+}
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@ -43,16 +43,6 @@ public partial class CoreConfigSingboxService
                });
            }

-            //Outbound Freedom Resolver
-            var freedomOutbound = singboxConfig.outbounds?.FirstOrDefault(t => t is { type: "direct", tag: Global.DirectTag });
-            if (freedomOutbound != null)
-            {
-                freedomOutbound.domain_resolver = new()
-                {
-                    server = Global.SingboxDirectDNSTag,
-                };
-            }
-
            await GenOutboundDnsRule(node, singboxConfig, Global.SingboxOutboundResolverTag);
        }
        catch (Exception ex)