pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-28 16:14:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting the text display

Browse Source
This commit is contained in:
2dust
2024-09-23 17:17:12 +08:00
parent 4d330cedac
commit cc428618e5
21 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Handler/ConfigHandler.cs
+11 -11
View File
@@ -401,13 +401,13 @@ namespace ServiceLib.Handler
{
EConfigType.VMess => AddVMessServer(config, item),
EConfigType.Shadowsocks => AddShadowsocksServer(config, item),
EConfigType.Socks => AddSocksServer(config, item),
EConfigType.Http => AddHttpServer(config, item),
EConfigType.SOCKS => AddSocksServer(config, item),
EConfigType.HTTP => AddHttpServer(config, item),
EConfigType.Trojan => AddTrojanServer(config, item),
EConfigType.VLESS => AddVlessServer(config, item),
EConfigType.Hysteria2 => AddHysteria2Server(config, item),
EConfigType.Tuic => AddTuicServer(config, item),
EConfigType.Wireguard => AddWireguardServer(config, item),
EConfigType.TUIC => AddTuicServer(config, item),
EConfigType.WireGuard => AddWireguardServer(config, item),
_ => -1,
};
return ret;
@@ -739,7 +739,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static int AddSocksServer(Config config, ProfileItem profileItem, bool toFile = true)
{
profileItem.configType = EConfigType.Socks;
profileItem.configType = EConfigType.SOCKS;
profileItem.address = profileItem.address.TrimEx();
@@ -756,7 +756,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static int AddHttpServer(Config config, ProfileItem profileItem, bool toFile = true)
{
profileItem.configType = EConfigType.Http;
profileItem.configType = EConfigType.HTTP;
profileItem.address = profileItem.address.TrimEx();
@@ -829,7 +829,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static int AddTuicServer(Config config, ProfileItem profileItem, bool toFile = true)
{
profileItem.configType = EConfigType.Tuic;
profileItem.configType = EConfigType.TUIC;
profileItem.coreType = ECoreType.sing_box;
profileItem.address = profileItem.address.TrimEx();
@@ -868,7 +868,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static int AddWireguardServer(Config config, ProfileItem profileItem, bool toFile = true)
{
profileItem.configType = EConfigType.Wireguard;
profileItem.configType = EConfigType.WireGuard;
profileItem.coreType = ECoreType.sing_box;
profileItem.address = profileItem.address.TrimEx();
@@ -1263,12 +1263,12 @@ namespace ServiceLib.Handler
{
EConfigType.VMess => AddVMessServer(config, profileItem, false),
EConfigType.Shadowsocks => AddShadowsocksServer(config, profileItem, false),
EConfigType.Socks => AddSocksServer(config, profileItem, false),
EConfigType.SOCKS => AddSocksServer(config, profileItem, false),
EConfigType.Trojan => AddTrojanServer(config, profileItem, false),
EConfigType.VLESS => AddVlessServer(config, profileItem, false),
EConfigType.Hysteria2 => AddHysteria2Server(config, profileItem, false),
EConfigType.Tuic => AddTuicServer(config, profileItem, false),
EConfigType.Wireguard => AddWireguardServer(config, profileItem, false),
EConfigType.TUIC => AddTuicServer(config, profileItem, false),
EConfigType.WireGuard => AddWireguardServer(config, profileItem, false),
_ => -1,
};
v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigSingbox.cs
+5 -5
View File
@@ -606,7 +606,7 @@ namespace ServiceLib.Handler.CoreConfig
GenOutboundMux(node, outbound);
break;
}
case EConfigType.Socks:
case EConfigType.SOCKS:
{
outbound.version = "5";
if (Utils.IsNotEmpty(node.security)
@@ -617,7 +617,7 @@ namespace ServiceLib.Handler.CoreConfig
}
break;
}
case EConfigType.Http:
case EConfigType.HTTP:
{
if (Utils.IsNotEmpty(node.security)
&& Utils.IsNotEmpty(node.id))
@@ -667,14 +667,14 @@ namespace ServiceLib.Handler.CoreConfig
outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
break;
}
case EConfigType.Tuic:
case EConfigType.TUIC:
{
outbound.uuid = node.id;
outbound.password = node.security;
outbound.congestion_control = node.headerType;
break;
}
case EConfigType.Wireguard:
case EConfigType.WireGuard:
{
outbound.private_key = node.id;
outbound.peer_public_key = node.publicKey;
@@ -1240,7 +1240,7 @@ namespace ServiceLib.Handler.CoreConfig
}
//Tun2SocksAddress
if (_config.tunModeItem.enableTun && node?.configType == EConfigType.Socks && Utils.IsDomain(node?.sni))
if (_config.tunModeItem.enableTun && node?.configType == EConfigType.SOCKS && Utils.IsDomain(node?.sni))
{
dns4Sbox.rules.Insert(0, new()
{
v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigV2ray.cs
+7 -7
View File
@@ -110,7 +110,7 @@ namespace ServiceLib.Handler.CoreConfig
{
continue;
}
if (it.configType is EConfigType.Hysteria2 or EConfigType.Tuic or EConfigType.Wireguard)
if (it.configType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)
{
continue;
}
@@ -647,8 +647,8 @@ namespace ServiceLib.Handler.CoreConfig
outbound.settings.vnext = null;
break;
}
case EConfigType.Socks:
case EConfigType.Http:
case EConfigType.SOCKS:
case EConfigType.HTTP:
{
ServersItem4Ray serversItem;
if (outbound.settings.servers.Count <= 0)
@@ -1208,8 +1208,8 @@ namespace ServiceLib.Handler.CoreConfig
if (prevNode is not null
&& prevNode.configType != EConfigType.Custom
&& prevNode.configType != EConfigType.Hysteria2
&& prevNode.configType != EConfigType.Tuic
&& prevNode.configType != EConfigType.Wireguard)
&& prevNode.configType != EConfigType.TUIC
&& prevNode.configType != EConfigType.WireGuard)
{
var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(prevNode, prevOutbound);
@@ -1227,8 +1227,8 @@ namespace ServiceLib.Handler.CoreConfig
if (nextNode is not null
&& nextNode.configType != EConfigType.Custom
&& nextNode.configType != EConfigType.Hysteria2
&& nextNode.configType != EConfigType.Tuic
&& nextNode.configType != EConfigType.Wireguard)
&& nextNode.configType != EConfigType.TUIC
&& nextNode.configType != EConfigType.WireGuard)
{
var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(nextNode, nextOutbound);
v2rayN/ServiceLib/Handler/CoreHandler.cs
+3 -3
View File
@@ -66,7 +66,7 @@ namespace ServiceLib.Handler
public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
{
int pid = -1;
var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.TUIC || t.configType == EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
{
@@ -204,7 +204,7 @@ namespace ServiceLib.Handler
itemSocks = new ProfileItem()
{
coreType = preCoreType,
configType = EConfigType.Socks,
configType = EConfigType.SOCKS,
address = Global.Loopback,
sni = node.address, //Tun2SocksAddress
port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)
@@ -216,7 +216,7 @@ namespace ServiceLib.Handler
itemSocks = new ProfileItem()
{
coreType = preCoreType,
configType = EConfigType.Socks,
configType = EConfigType.SOCKS,
address = Global.Loopback,
port = node.preSocksPort.Value,
};
v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs
+6 -6
View File
@@ -10,12 +10,12 @@
{
EConfigType.VMess => VmessFmt.ToUri(item),
EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
EConfigType.Socks => SocksFmt.ToUri(item),
EConfigType.SOCKS => SocksFmt.ToUri(item),
EConfigType.Trojan => TrojanFmt.ToUri(item),
EConfigType.VLESS => VLESSFmt.ToUri(item),
EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
EConfigType.Tuic => TuicFmt.ToUri(item),
EConfigType.Wireguard => WireguardFmt.ToUri(item),
EConfigType.TUIC => TuicFmt.ToUri(item),
EConfigType.WireGuard => WireguardFmt.ToUri(item),
_ => null,
};
@@ -49,7 +49,7 @@
{
return ShadowsocksFmt.Resolve(str, out msg);
}
else if (str.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
{
return SocksFmt.Resolve(str, out msg);
}
@@ -65,11 +65,11 @@
{
return Hysteria2Fmt.Resolve(str, out msg);
}
else if (str.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
else if (str.StartsWith(Global.ProtocolShares[EConfigType.TUIC]))
{
return TuicFmt.Resolve(str, out msg);
}
else if (str.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
else if (str.StartsWith(Global.ProtocolShares[EConfigType.WireGuard]))
{
return WireguardFmt.Resolve(str, out msg);
}
v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs
+4 -4
View File
@@ -17,7 +17,7 @@
return null;
}
item.configType = EConfigType.Socks;
item.configType = EConfigType.SOCKS;
return item;
}
@@ -41,7 +41,7 @@
//new
var pw = Utils.Base64Encode($"{item.security}:{item.id}");
url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
url = $"{Global.ProtocolShares[EConfigType.SOCKS]}{url}{remark}";
return url;
}
@@ -49,9 +49,9 @@
{
ProfileItem item = new()
{
configType = EConfigType.Socks
configType = EConfigType.SOCKS
};
result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
result = result[Global.ProtocolShares[EConfigType.SOCKS].Length..];
//remark
int indexRemark = result.IndexOf("#");
if (indexRemark > 0)
v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs
+2 -2
View File
@@ -8,7 +8,7 @@
ProfileItem item = new()
{
configType = EConfigType.Tuic
configType = EConfigType.TUIC
};
Uri url = new(str);
@@ -57,7 +57,7 @@
$"{item.id}:{item.security}",
GetIpv6(item.address),
item.port);
url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
url = $"{Global.ProtocolShares[EConfigType.TUIC]}{url}{query}{remark}";
return url;
}
}
v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs
+2 -2
View File
@@ -8,7 +8,7 @@
ProfileItem item = new()
{
configType = EConfigType.Wireguard
configType = EConfigType.WireGuard
};
Uri url = new(str);
@@ -62,7 +62,7 @@
Utils.UrlEncode(item.id),
GetIpv6(item.address),
item.port);
url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
url = $"{Global.ProtocolShares[EConfigType.WireGuard]}{url}/{query}{remark}";
return url;
}
}