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

Refactor Transport (#9004)

Browse Source 
* Refactor transport

* Rename tcp to raw

* Fix

* Fix

Fix raw http ui

Fill xhttp default mode

Fix share uri

Remove RawHost

Fix singbox tcp http path

Fix vmess share uri

* Tidy Resx

* Fix

* Rename TransportExtra to TransportExtraItem

---------

Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>
This commit is contained in:
DHR60
2026-04-16 12:21:10 +00:00
committed by GitHub
parent 494b35c1f7
commit 9f0ef36cc0
28 changed files with 1612 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
+32 -32
View File
@@ -84,6 +84,8 @@ public partial class CoreConfigSingboxService
try
{
var protocolExtra = _node.GetProtocolExtra();
var transportExtra = _node.GetTransportExtra();
var network = _node.GetNetwork();
outbound.server = _node.Address;
outbound.server_port = _node.Port;
outbound.type = Global.ProtocolTypes[_node.ConfigType];
@@ -114,27 +116,23 @@ public partial class CoreConfigSingboxService
outbound.password = _node.Password;
outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null;
if (_node.Network == nameof(ETransport.tcp) && _node.HeaderType == Global.TcpHeaderHttp)
if (network == nameof(ETransport.raw) && transportExtra.RawHeaderType == Global.RawHeaderHttp)
{
outbound.plugin = "obfs-local";
outbound.plugin_opts = $"obfs=http;obfs-host={_node.RequestHost};";
outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.Host};";
}
else
{
var pluginArgs = string.Empty;
if (_node.Network == nameof(ETransport.ws))
if (network == nameof(ETransport.ws))
{
pluginArgs += "mode=websocket;";
pluginArgs += $"host={_node.RequestHost};";
pluginArgs += $"host={transportExtra.Host};";
// https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172
// Equal signs and commas [and backslashes] must be escaped with a backslash.
var path = _node.Path.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
var path = (transportExtra.Path ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
pluginArgs += $"path={path};";
}
else if (_node.Network == nameof(ETransport.quic))
{
pluginArgs += "mode=quic;";
}
if (_node.StreamSecurity == Global.StreamSecurity)
{
pluginArgs += "tls;";
@@ -381,9 +379,18 @@ public partial class CoreConfigSingboxService
{
serverName = _node.Sni;
}
else if (_node.RequestHost.IsNotEmpty())
else
{
serverName = Utils.String2List(_node.RequestHost)?.First();
var host = _node.GetNetwork() switch
{
nameof(ETransport.raw) => _node.GetTransportExtra().Host,
nameof(ETransport.ws) => _node.GetTransportExtra().Host,
nameof(ETransport.httpupgrade) => _node.GetTransportExtra().Host,
nameof(ETransport.xhttp) => _node.GetTransportExtra().Host,
nameof(ETransport.grpc) => _node.GetTransportExtra().GrpcAuthority,
_ => null,
};
serverName = Utils.String2List(host)?.First();
}
var tls = new Tls4Sbox()
{
@@ -438,23 +445,20 @@ public partial class CoreConfigSingboxService
try
{
var transport = new Transport4Sbox();
var transportExtra = _node.GetTransportExtra();
var useragent = _config.CoreBasicItem.DefUserAgent ?? string.Empty;
var useragentValue = Global.TcpHttpUserAgentTexts.GetValueOrDefault(useragent, useragent);
var useragentValue = Global.RawHttpUserAgentTexts.GetValueOrDefault(useragent, useragent);
switch (_node.GetNetwork())
{
case nameof(ETransport.h2):
transport.type = nameof(ETransport.http);
transport.host = _node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(_node.RequestHost);
transport.path = _node.Path.NullIfEmpty();
break;
case nameof(ETransport.tcp): //http
if (_node.HeaderType == Global.TcpHeaderHttp)
case nameof(ETransport.raw): //http
if (transportExtra.RawHeaderType == Global.RawHeaderHttp)
{
transport.type = nameof(ETransport.http);
transport.host = _node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(_node.RequestHost);
transport.path = _node.Path.NullIfEmpty();
transport.host = transportExtra.Host.IsNullOrEmpty()
? null
: Utils.String2List(transportExtra.Host);
transport.path = transportExtra.Path.NullIfEmpty();
if (!useragentValue.IsNullOrEmpty())
{
transport.headers ??= new();
@@ -465,7 +469,7 @@ public partial class CoreConfigSingboxService
case nameof(ETransport.ws):
transport.type = nameof(ETransport.ws);
var wsPath = _node.Path;
var wsPath = transportExtra.Path;
// Parse eh and ed parameters from path using regex
if (!wsPath.IsNullOrEmpty())
@@ -494,11 +498,11 @@ public partial class CoreConfigSingboxService
}
transport.path = wsPath.NullIfEmpty();
if (_node.RequestHost.IsNotEmpty())
if (transportExtra.Host.IsNotEmpty())
{
transport.headers = new()
{
Host = _node.RequestHost
Host = transportExtra.Host
};
}
if (!useragentValue.IsNullOrEmpty())
@@ -510,8 +514,8 @@ public partial class CoreConfigSingboxService
case nameof(ETransport.httpupgrade):
transport.type = nameof(ETransport.httpupgrade);
transport.path = _node.Path.NullIfEmpty();
transport.host = _node.RequestHost.NullIfEmpty();
transport.path = transportExtra.Path.NullIfEmpty();
transport.host = transportExtra.Host.NullIfEmpty();
if (!useragentValue.IsNullOrEmpty())
{
transport.headers ??= new();
@@ -520,13 +524,9 @@ public partial class CoreConfigSingboxService
break;
case nameof(ETransport.quic):
transport.type = nameof(ETransport.quic);
break;
case nameof(ETransport.grpc):
transport.type = nameof(ETransport.grpc);
transport.service_name = _node.Path;
transport.service_name = transportExtra.GrpcServiceName;
transport.idle_timeout = _config.GrpcItem.IdleTimeout?.ToString("##s");
transport.ping_timeout = _config.GrpcItem.HealthCheckTimeout?.ToString("##s");
transport.permit_without_stream = _config.GrpcItem.PermitWithoutStream;