Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

InvisibleMan XRay version 0.4.1 #36

Merged
merged 4 commits into from
Mar 23, 2023
Merged

InvisibleMan XRay version 0.4.1 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcf2dbc
Update xray-core to v1.7.5
InvisibleManVPN Mar 20, 2023
f760a54
Add reality settings in templates
InvisibleManVPN Mar 20, 2023
c9cf9cd
Merge pull request #33 from InvisibleManVPN/core/reality-support
InvisibleManVPN Mar 20, 2023
3243a8a
Upgrading to dotnet 7
InvisibleManVPN Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion InvisibleMan-XRay/Handlers/NotifyHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private void HandleNotifyIconClick()

private void AddMenuStrip()
{
AddMenuItem("Open InvisibleMan XRay", onOpenClick);
AddMenuItem("Open Invisible Man XRay", onOpenClick);
AddMenuItem("Check for updates", onUpdateClick);
AddMenuItem("About", onAboutClick);
AddMenuItem("Close", onCloseClick);
Expand Down
16 changes: 8 additions & 8 deletions InvisibleMan-XRay/InvisibleMan-XRay.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<RootNamespace>InvisibleManXRay</RootNamespace>
<AssemblyName>InvisibleMan XRay</AssemblyName>
<Product>InvisibleMan XRay</Product>
<PackageId>InvisibleMan XRay</PackageId>
<Company>InvisibleMan</Company>
<AssemblyName>Invisible Man XRay</AssemblyName>
<Product>Invisible Man XRay</Product>
<PackageId>Invisible Man XRay</PackageId>
<Company>Invisible Man</Company>
<Copyright>Copyright (C) 2023 Invisible Man</Copyright>
<Version>0.3.0.0</Version>
<AssemblyVersion>0.3.0.0</AssemblyVersion>
<Version>0.4.1.0</Version>
<AssemblyVersion>0.4.1.0</AssemblyVersion>
<Nullable>enable</Nullable>
<NoWarn>0108;8600;8601;8602;8603;8604;8618;8625;8762</NoWarn>
<UseWPF>true</UseWPF>
Expand All @@ -19,7 +19,7 @@
<_SuppressWpfTrimError>true</_SuppressWpfTrimError>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>Link</TrimMode>
<TrimMode>partial</TrimMode>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions InvisibleMan-XRay/Models/Templates/Base/Adapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ public class Adapter
public string sni;
public string alpn;
public string fingerprint;
public string publicKey;
public string shortId;
public string spiderX;
}
}
25 changes: 24 additions & 1 deletion InvisibleMan-XRay/Models/Templates/Base/Template.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ public V2Ray ConvertToV2Ray()
wsSettings = WsSettings,
httpSettings = HttpSettings,
quicSettings = QuicSettings,
tcpSettings = TcpSettings
tcpSettings = TcpSettings,
realitySettings = RealitySettings
}
}
};
Expand Down Expand Up @@ -236,5 +237,27 @@ object GetRequest()
}
}
}

private V2Ray.StreamSettings.RealitySettings RealitySettings
{
get
{
V2Ray.StreamSettings.RealitySettings realitySettings = null;

if (Adapter.streamSecurity == "reality")
{
realitySettings = new V2Ray.StreamSettings.RealitySettings()
{
fingerprint = Adapter.fingerprint,
serverName = Adapter.sni,
publicKey = Adapter.publicKey,
shortId = Adapter.shortId,
spiderX = Adapter.spiderX
};
}

return realitySettings;
}
}
}
}
11 changes: 11 additions & 0 deletions InvisibleMan-XRay/Models/Templates/Base/V2Ray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public class StreamSettings
public QuicSettings quicSettings;
public TlsSettings xtlsSettings;
public GrpcSettings grpcSettings;
public RealitySettings realitySettings;

public class TlsSettings
{
Expand Down Expand Up @@ -206,6 +207,16 @@ public class GrpcSettings
public bool permit_without_stream;
public int initial_windows_size;
}

public class RealitySettings
{
public bool show;
public string fingerprint;
public string serverName;
public string publicKey;
public string shortId;
public string spiderX;
}
}

public class Header
Expand Down
7 changes: 6 additions & 1 deletion InvisibleMan-XRay/Models/Templates/Vless.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ protected override V2Ray.Outbound.Settings OutboundSettings
{
get
{
if (Adapter.streamSecurity == "xtls")
if (Adapter.streamSecurity == "reality")
{
if (string.IsNullOrEmpty(Adapter.flow))
Adapter.flow = "xtls-rprx-vision";
}
else if (Adapter.streamSecurity == "xtls")
{
if (string.IsNullOrEmpty(Adapter.flow))
Adapter.flow = "xtls-rprx-origin";
Expand Down
36 changes: 18 additions & 18 deletions XRay-Wrapper/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@ module github.com/invisiblemanvpn/xray-wrapper

go 1.19

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

require (
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/pprof v0.0.0-20221219190121-3cb0bae90811 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/klauspost/compress v1.15.14 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/lucas-clemente/quic-go v0.31.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/onsi/ginkgo/v2 v2.6.1 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pires/go-proxyproto v0.6.2 // indirect
github.com/refraction-networking/utls v1.2.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/quic-go/quic-go v0.32.0 // indirect
github.com/refraction-networking/utls v1.2.2-0.20230207151345-a75a4b484849 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/sagernet/sing v0.1.2 // indirect
github.com/sagernet/sing-shadowsocks v0.1.0 // indirect
github.com/sagernet/sing v0.1.6 // indirect
github.com/sagernet/sing-shadowsocks v0.1.1-0.20230202035033-e3123545f2f7 // indirect
github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c // indirect
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
github.com/xtls/go v0.0.0-20220914232946-0441cf4cf837 // indirect
go.starlark.net v0.0.0-20230105143730-d7da88764354 // indirect
github.com/xtls/go v0.0.0-20230107031059-4610f88d00f3 // indirect
go.starlark.net v0.0.0-20230128213706-3f75dec8e403 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c // indirect
Expand Down
Loading