GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-18 18:13:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor V2rayConfigUtils methods signature

Browse Source 
Refactor V2rayController, TrojanController Write TempConfig File
This commit is contained in:
ChsBuffer
2021-07-09 21:09:16 +08:00
parent 7015784e4f
commit 320b1f66c9
3 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Netch/Servers/Trojan/TrojanController.cs
View File

@@ -6,6 +6,7 @@ using Netch.Controllers;
using Netch.Interfaces;
using Netch.Models;
using Netch.Servers.Models;
using Netch.Utils;
namespace Netch.Servers
{
@@ -37,16 +38,17 @@ namespace Netch.Servers
password = new List<string>
{
server.Password
},
ssl = new TrojanSSL
{
sni = server.Host.ValueOrDefault() ?? (Global.Settings.ResolveServerHostname ? server.Hostname : "")
}
};
if (!string.IsNullOrWhiteSpace(server.Host))
trojanConfig.ssl.sni = server.Host;
else if (Global.Settings.ResolveServerHostname)
trojanConfig.ssl.sni = server.Hostname;
File.WriteAllBytes(Constants.TempConfig, JsonSerializer.SerializeToUtf8Bytes(trojanConfig, Global.NewCustomJsonSerializerOptions()));
using (var fileStream = new FileStream(Constants.TempConfig, FileMode.Create, FileAccess.Write))
{
JsonSerializer.SerializeAsync(fileStream, trojanConfig, Global.NewCustomJsonSerializerOptions()).Wait();
}
StartGuard("-c ..\\data\\last.json");
return new Socks5Bridge(IPAddress.Loopback.ToString(), this.Socks5LocalPort(), server.Hostname);

60
Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs
View File

@@ -1,6 +1,4 @@
using System.Diagnostics;
using System.Text.Json;
using Netch.Models;
using Netch.Models;
using Netch.Servers.V2ray.Models;
using Netch.Utils;
using V2rayConfig = Netch.Servers.V2ray.Models.V2rayConfig;
@@ -9,7 +7,7 @@ namespace Netch.Servers.Utils
{
public static class V2rayConfigUtils
{
public static string GenerateClientConfig(Server server)
public static V2rayConfig GenerateClientConfig(Server server)
{
var v2rayConfig = new V2rayConfig
{
@@ -28,25 +26,19 @@ namespace Netch.Servers.Utils
}
};
outbound(server, ref v2rayConfig);
v2rayConfig.outbounds = new[] { outbound(server) };
return JsonSerializer.Serialize(v2rayConfig, Global.NewCustomJsonSerializerOptions());
return v2rayConfig;
}
private static void outbound(Server server, ref V2rayConfig v2rayConfig)
private static Outbound outbound(Server server)
{
var outbound = new Outbound
{
settings = new OutboundConfiguration(),
mux = new Mux(),
streamSettings = new StreamSettings
{
network = "tcp"
}
mux = new Mux()
};
v2rayConfig.outbounds = new[] { outbound };
switch (server)
{
case Socks5 socks5:
@@ -56,6 +48,8 @@ namespace Netch.Servers.Utils
{
new
{
address = server.AutoResolveHostname(),
port = server.Port,
users = socks5.Auth()
? new[]
{
@@ -66,9 +60,7 @@ namespace Netch.Servers.Utils
level = 1
}
}
: null,
address = server.AutoResolveHostname(),
port = server.Port
: null
}
};
@@ -90,7 +82,6 @@ namespace Netch.Servers.Utils
new User
{
id = vless.UserID,
alterId = 0,
flow = vless.Flow.ValueOrDefault(),
encryption = vless.EncryptMethod
}
@@ -98,8 +89,7 @@ namespace Netch.Servers.Utils
}
};
var streamSettings = outbound.streamSettings;
boundStreamSettings(vless, ref streamSettings);
outbound.streamSettings = boundStreamSettings(vless);
if (vless.TLSSecureType == "xtls")
{
@@ -135,22 +125,26 @@ namespace Netch.Servers.Utils
}
};
var streamSettings = outbound.streamSettings;
boundStreamSettings(vmess, ref streamSettings);
outbound.streamSettings = boundStreamSettings(vmess);
outbound.mux.enabled = vmess.UseMux ?? Global.Settings.V2RayConfig.UseMux;
outbound.mux.concurrency = vmess.UseMux ?? Global.Settings.V2RayConfig.UseMux ? 8 : -1;
break;
}
}
return outbound;
}
private static void boundStreamSettings(VMess server, ref StreamSettings streamSettings)
private static StreamSettings boundStreamSettings(VMess server)
{
// https://xtls.github.io/config/transports
streamSettings.network = server.TransferProtocol;
streamSettings.security = server.TLSSecureType;
var streamSettings = new StreamSettings
{
network = server.TransferProtocol,
security = server.TLSSecureType
};
if (server.TLSSecureType != "none")
{
@@ -180,16 +174,19 @@ namespace Netch.Servers.Utils
header = new
{
type = server.FakeType,
request = server.FakeType is "http"
? new
request = server.FakeType switch
{
"none" => null,
"http" => new
{
path = server.Path.SplitOrDefault(),
headers = new
{
Host = server.Host.SplitOrDefault()
}
}
: null
},
_ => throw new MessageException($"Invalid tcp type {server.FakeType}")
}
}
};
@@ -257,9 +254,10 @@ namespace Netch.Servers.Utils
break;
default:
Trace.Assert(false);
break;
throw new MessageException($"transfer protocol \"{server.TransferProtocol}\" not implemented yet");
}
return streamSettings;
}
}
}

7
Netch/Servers/V2ray/V2rayController.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text.Json;
using Netch.Controllers;
using Netch.Interfaces;
using Netch.Models;
@@ -28,7 +29,11 @@ namespace Netch.Servers
public virtual Socks5 Start(in Server s)
{
File.WriteAllText(Constants.TempConfig, V2rayConfigUtils.GenerateClientConfig(s));
using (var fileStream = new FileStream(Constants.TempConfig, FileMode.Create, FileAccess.Write))
{
JsonSerializer.SerializeAsync(fileStream, V2rayConfigUtils.GenerateClientConfig(s), Global.NewCustomJsonSerializerOptions()).Wait();
}
StartGuard("-config ..\\data\\last.json");
return new Socks5Bridge(IPAddress.Loopback.ToString(), this.Socks5LocalPort(), s.Hostname);
}