Compare commits

...

2 commits

Author SHA1 Message Date
2dust
65ee5eb510 Fix,remove NaiveproxyFmt HysteriaFmt ,adjust ClashFmt
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run
https://github.com/2dust/v2rayN/issues/8102
2025-10-10 17:12:45 +08:00
DHR60
1f42d32e1a
Fix Freedom Resolver (#8100) 2025-10-10 16:58:18 +08:00
5 changed files with 12 additions and 51 deletions

View file

@ -1485,15 +1485,6 @@ public static class ConfigHandler
{ {
profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks); 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()) if (profileItem is null || profileItem.Address.IsNullOrEmpty())
{ {
return -1; return -1;

View file

@ -4,7 +4,7 @@ public class ClashFmt : BaseFmt
{ {
public static ProfileItem? ResolveFull(string strData, string? subRemarks) public static ProfileItem? ResolveFull(string strData, string? subRemarks)
{ {
if (Contains(strData, "external-controller", "-port", "proxies")) if (Contains(strData, "rules", "-port", "proxies"))
{ {
var fileName = WriteAllText(strData, "yaml"); var fileName = WriteAllText(strData, "yaml");

View file

@ -63,24 +63,6 @@ public class Hysteria2Fmt : BaseFmt
return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark); 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) public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
{ {
if (Contains(strData, "server", "auth", "up", "down", "listen")) if (Contains(strData, "server", "auth", "up", "down", "listen"))

View file

@ -1,22 +0,0 @@
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;
}
}

View file

@ -43,6 +43,16 @@ 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); await GenOutboundDnsRule(node, singboxConfig, Global.SingboxOutboundResolverTag);
} }
catch (Exception ex) catch (Exception ex)