pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-08-11 09:42:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom config import

Browse Source 
https://github.com/2dust/v2rayN/issues/9902
This commit is contained in:
2dust
2026-08-06 09:29:33 +08:00
parent 1034ce6e02
commit 9638b4c368
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/ServiceLib/Common/Utils.cs
View File

@@ -753,11 +753,11 @@ public class Utils
return false;
}
public static int GetFreePort(int defaultPort = 0)
public static int GetFreePort(int defaultPort)
{
try
{
if (!(defaultPort == 0 || Utils.PortInUse(defaultPort)))
if (!PortInUse(defaultPort))
{
return defaultPort;
}

36
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View File

@@ -586,7 +586,6 @@ public static class ConfigHandler
return 0;
}
public static async Task<int> AddCustomOutboundServer(Config config, ProfileItem profileItem, bool blDelete, bool toFile = true)
{
var fileName = profileItem.Address;
@@ -1739,8 +1738,16 @@ public static class ConfigHandler
SubItem? subItem)
{
var subRemarks = subItem?.Remarks;
// Safe Mode: Only allow full configuration if it's not from a subscription
var lstProfiles = V2rayFmt.ResolveToCustomOutbound(strData, subRemarks);
// Prioritize using complete custom parsing, followed by custom outbound parsing.
var lstProfiles = V2rayFmt.ResolveToCustom(strData, subRemarks);
if (lstProfiles.Count == 0)
{
lstProfiles = SingboxFmt.ResolveToCustom(strData, subRemarks);
}
if (lstProfiles.Count == 0)
{
lstProfiles = V2rayFmt.ResolveToCustomOutbound(strData, subRemarks);
}
if (lstProfiles.Count == 0)
{
lstProfiles = SingboxFmt.ResolveToCustomOutbound(strData, subRemarks);
@@ -1750,7 +1757,7 @@ public static class ConfigHandler
return -1;
}
var count = await AddCustomOutboundServers(config, lstProfiles, subid, isSub);
var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
if (count > 0)
{
return count;
@@ -1786,7 +1793,7 @@ public static class ConfigHandler
var subRemarks = subItem.Remarks;
var customCoreType = subItem.CustomCoreType!.Value;
List<ProfileItem>? lstProfiles = customCoreType switch
var lstProfiles = customCoreType switch
{
ECoreType.Xray => V2rayFmt.ResolveToCustom(strData, subRemarks),
ECoreType.sing_box => SingboxFmt.ResolveToCustom(strData, subRemarks),
@@ -1800,7 +1807,7 @@ public static class ConfigHandler
return -1;
}
var count = await AddCustomOutboundServers(config, lstProfiles, subid, isSub);
var count = await AddBatchCustomServers(config, lstProfiles, subid, isSub);
if (count > 0)
{
return count;
@@ -1810,7 +1817,7 @@ public static class ConfigHandler
return await SaveCustomRawFileServer(config, strData, subid, isSub, subItem, customCoreType);
}
private static async Task<int> AddCustomOutboundServers(
private static async Task<int> AddBatchCustomServers(
Config config,
List<ProfileItem> lstProfiles,
string subid,
@@ -1821,9 +1828,20 @@ public static class ConfigHandler
{
it.Subid = subid;
it.IsSub = isSub;
if (await AddCustomOutboundServer(config, it, true) == 0)
if (it.ConfigType == EConfigType.Custom)
{
count++;
if (await AddCustomServer(config, it, true) == 0)
{
count++;
}
}
else
{
if (await AddCustomOutboundServer(config, it, true) == 0)
{
count++;
}
}
}
return count;

1
v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs
View File

@@ -76,6 +76,7 @@ public class SingboxFmt : BaseFmt
var fileName = WriteAllText(JsonUtils.Serialize(jsonObject));
var profileItem = new ProfileItem
{
ConfigType = EConfigType.Custom,
CoreType = ECoreType.sing_box,
Address = fileName,
Remarks = subRemarks ?? "singbox_custom",

1
v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs
View File

@@ -77,6 +77,7 @@ public class V2rayFmt : BaseFmt
var profileItem = new ProfileItem
{
ConfigType = EConfigType.Custom,
CoreType = ECoreType.Xray,
Address = fileName,
Remarks = jsonObject["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom",