Skip to content

Commit 9e108e7

Browse files
InvisibleManVPNInvisibleManVPN
authored
Merge pull request #36 from InvisibleManVPN/develop
InvisibleMan XRay version 0.4.1
2 parents c7acfa1 + 3243a8a commit 9e108e7

8 files changed

Lines changed: 110 additions & 68 deletions

File tree

‎InvisibleMan-XRay/Handlers/NotifyHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private void HandleNotifyIconClick()
5959

6060
private void AddMenuStrip()
6161
{
62-
AddMenuItem("Open InvisibleMan XRay", onOpenClick);
62+
AddMenuItem("Open Invisible Man XRay", onOpenClick);
6363
AddMenuItem("Check for updates", onUpdateClick);
6464
AddMenuItem("About", onAboutClick);
6565
AddMenuItem("Close", onCloseClick);

‎InvisibleMan-XRay/InvisibleMan-XRay.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net7.0-windows</TargetFramework>
66
<RootNamespace>InvisibleManXRay</RootNamespace>
7-
<AssemblyName>InvisibleMan XRay</AssemblyName>
8-
<Product>InvisibleMan XRay</Product>
9-
<PackageId>InvisibleMan XRay</PackageId>
10-
<Company>InvisibleMan</Company>
7+
<AssemblyName>Invisible Man XRay</AssemblyName>
8+
<Product>Invisible Man XRay</Product>
9+
<PackageId>Invisible Man XRay</PackageId>
10+
<Company>Invisible Man</Company>
1111
<Copyright>Copyright (C) 2023 Invisible Man</Copyright>
12-
<Version>0.3.0.0</Version>
13-
<AssemblyVersion>0.3.0.0</AssemblyVersion>
12+
<Version>0.4.1.0</Version>
13+
<AssemblyVersion>0.4.1.0</AssemblyVersion>
1414
<Nullable>enable</Nullable>
1515
<NoWarn>0108;8600;8601;8602;8603;8604;8618;8625;8762</NoWarn>
1616
<UseWPF>true</UseWPF>
@@ -19,7 +19,7 @@
1919
<_SuppressWpfTrimError>true</_SuppressWpfTrimError>
2020
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
2121
<PublishTrimmed>true</PublishTrimmed>
22-
<TrimMode>Link</TrimMode>
22+
<TrimMode>partial</TrimMode>
2323
</PropertyGroup>
2424

2525
<ItemGroup>

‎InvisibleMan-XRay/Models/Templates/Base/Adapter.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ public class Adapter
1919
public string sni;
2020
public string alpn;
2121
public string fingerprint;
22+
public string publicKey;
23+
public string shortId;
24+
public string spiderX;
2225
}
2326
}

‎InvisibleMan-XRay/Models/Templates/Base/Template.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public V2Ray ConvertToV2Ray()
7272
wsSettings = WsSettings,
7373
httpSettings = HttpSettings,
7474
quicSettings = QuicSettings,
75-
tcpSettings = TcpSettings
75+
tcpSettings = TcpSettings,
76+
realitySettings = RealitySettings
7677
}
7778
}
7879
};
@@ -236,5 +237,27 @@ object GetRequest()
236237
}
237238
}
238239
}
240+
241+
private V2Ray.StreamSettings.RealitySettings RealitySettings
242+
{
243+
get
244+
{
245+
V2Ray.StreamSettings.RealitySettings realitySettings = null;
246+
247+
if (Adapter.streamSecurity == "reality")
248+
{
249+
realitySettings = new V2Ray.StreamSettings.RealitySettings()
250+
{
251+
fingerprint = Adapter.fingerprint,
252+
serverName = Adapter.sni,
253+
publicKey = Adapter.publicKey,
254+
shortId = Adapter.shortId,
255+
spiderX = Adapter.spiderX
256+
};
257+
}
258+
259+
return realitySettings;
260+
}
261+
}
239262
}
240263
}

‎InvisibleMan-XRay/Models/Templates/Base/V2Ray.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public class StreamSettings
143143
public QuicSettings quicSettings;
144144
public TlsSettings xtlsSettings;
145145
public GrpcSettings grpcSettings;
146+
public RealitySettings realitySettings;
146147

147148
public class TlsSettings
148149
{
@@ -206,6 +207,16 @@ public class GrpcSettings
206207
public bool permit_without_stream;
207208
public int initial_windows_size;
208209
}
210+
211+
public class RealitySettings
212+
{
213+
public bool show;
214+
public string fingerprint;
215+
public string serverName;
216+
public string publicKey;
217+
public string shortId;
218+
public string spiderX;
219+
}
209220
}
210221

211222
public class Header

‎InvisibleMan-XRay/Models/Templates/Vless.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,12 @@ protected override V2Ray.Outbound.Settings OutboundSettings
9898
{
9999
get
100100
{
101-
if (Adapter.streamSecurity == "xtls")
101+
if (Adapter.streamSecurity == "reality")
102+
{
103+
if (string.IsNullOrEmpty(Adapter.flow))
104+
Adapter.flow = "xtls-rprx-vision";
105+
}
106+
else if (Adapter.streamSecurity == "xtls")
102107
{
103108
if (string.IsNullOrEmpty(Adapter.flow))
104109
Adapter.flow = "xtls-rprx-origin";

‎XRay-Wrapper/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,48 @@ module github.com/invisiblemanvpn/xray-wrapper
22

33
go 1.19
44

5-
require github.com/xtls/xray-core v1.7.2
5+
require github.com/xtls/xray-core v1.7.5
66

77
require (
88
github.com/andybalholm/brotli v1.0.4 // indirect
99
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
1010
github.com/francoispqt/gojay v1.2.13 // indirect
11-
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
11+
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect
1212
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
1313
github.com/golang/mock v1.6.0 // indirect
1414
github.com/golang/protobuf v1.5.2 // indirect
1515
github.com/google/btree v1.1.2 // indirect
16-
github.com/google/pprof v0.0.0-20221219190121-3cb0bae90811 // indirect
16+
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
1717
github.com/gorilla/websocket v1.5.0 // indirect
18-
github.com/klauspost/compress v1.15.14 // indirect
18+
github.com/klauspost/compress v1.15.15 // indirect
1919
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
20-
github.com/lucas-clemente/quic-go v0.31.1 // indirect
21-
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
22-
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
23-
github.com/onsi/ginkgo/v2 v2.6.1 // indirect
20+
github.com/onsi/ginkgo/v2 v2.8.0 // indirect
2421
github.com/pelletier/go-toml v1.9.5 // indirect
2522
github.com/pires/go-proxyproto v0.6.2 // indirect
26-
github.com/refraction-networking/utls v1.2.0 // indirect
23+
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
24+
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
25+
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
26+
github.com/quic-go/quic-go v0.32.0 // indirect
27+
github.com/refraction-networking/utls v1.2.2-0.20230207151345-a75a4b484849 // indirect
2728
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
28-
github.com/rogpeppe/go-internal v1.9.0 // indirect
29-
github.com/sagernet/sing v0.1.2 // indirect
30-
github.com/sagernet/sing-shadowsocks v0.1.0 // indirect
29+
github.com/sagernet/sing v0.1.6 // indirect
30+
github.com/sagernet/sing-shadowsocks v0.1.1-0.20230202035033-e3123545f2f7 // indirect
3131
github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c // indirect
3232
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
3333
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
34-
github.com/xtls/go v0.0.0-20220914232946-0441cf4cf837 // indirect
35-
go.starlark.net v0.0.0-20230105143730-d7da88764354 // indirect
34+
github.com/xtls/go v0.0.0-20230107031059-4610f88d00f3 // indirect
35+
go.starlark.net v0.0.0-20230128213706-3f75dec8e403 // indirect
3636
go.uber.org/atomic v1.10.0 // indirect
3737
golang.org/x/crypto v0.5.0 // indirect
38-
golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 // indirect
38+
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
3939
golang.org/x/mod v0.7.0 // indirect
4040
golang.org/x/net v0.5.0 // indirect
41-
golang.org/x/sys v0.4.0 // indirect
41+
golang.org/x/sys v0.5.0 // indirect
4242
golang.org/x/text v0.6.0 // indirect
4343
golang.org/x/time v0.3.0 // indirect
4444
golang.org/x/tools v0.5.0 // indirect
45-
google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 // indirect
46-
google.golang.org/grpc v1.51.0 // indirect
45+
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
46+
google.golang.org/grpc v1.53.0 // indirect
4747
google.golang.org/protobuf v1.28.1 // indirect
4848
gopkg.in/yaml.v2 v2.4.0 // indirect
4949
gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c // indirect

0 commit comments

Comments
 (0)