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

Feat/wss tls beta support #2

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Feat/wss tls beta support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03cb7a2
feat!: +new transport ver, +WS TLS (!) beta (!)
dylanh724 Sep 28, 2023
8d7e61c
chore: autogen
dylanh724 Sep 28, 2023
0fe0859
chore: Autogen
dylanh724 Sep 28, 2023
345f0e0
doc: Quick log typo fix
dylanh724 Sep 28, 2023
55478d6
chore: Disable WS by default
dylanh724 Sep 28, 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: 2 additions & 0 deletions src/Assets/HathoraNgo/Scenes/HathoraDemoScene-Ngo.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4799,6 +4799,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ProtocolType: 0
m_UseWebSockets: 0
m_UseEncryption: 0
m_MaxPacketQueueSize: 128
m_MaxPayloadSize: 6144
m_HeartbeatTimeoutMS: 500
Expand Down
4 changes: 2 additions & 2 deletions src/Assets/HathoraNgo/Scripts/NgoStateMgr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public bool StartClient(string _hostPort)
/// </returns>
public bool StartClient()
{
string logPrefix = $"[{nameof(NgoStateMgr)}.{nameof(StartClient)}";
string logPrefix = $"[{nameof(NgoStateMgr)}.{nameof(StartClient)}]";
Debug.Log($"{logPrefix} Start");

// Validate
Expand All @@ -196,7 +196,7 @@ public bool StartClient()
// Log "host:port (transport)" -> Connect using NetworkManager settings
string ipPort = $"{transport.ConnectionData.Address}:{transport.ConnectionData.Port}";
string transportName = transport.GetType().Name;
Debug.Log($"[{logPrefix} Connecting to `{ipPort}` via`{transportName}` transport");
Debug.Log($"{logPrefix} Connecting to `{ipPort}` via`{transportName}` transport");

base.OnClientConnecting(); // => callback @ OnClientConected() || OnLocalStartClientFail()
bool startedConnection = netMgr.StartClient();
Expand Down
8 changes: 8 additions & 0 deletions src/Assets/Resources.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
"com.unity.transport": "2.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.8.0",
"com.unity.modules.ai": "1.0.0",
Expand Down
32 changes: 22 additions & 10 deletions src/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {}
},
"com.unity.burst": {
"version": "1.8.7",
"version": "1.8.8",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -31,12 +31,14 @@
"url": "https://packages.unity.com"
},
"com.unity.collections": {
"version": "1.2.4",
"version": "2.2.1",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.6.6",
"com.unity.test-framework": "1.1.31"
"com.unity.burst": "1.8.8",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.nuget.mono-cecil": "1.11.4",
"com.unity.test-framework.performance": "3.0.2"
},
"url": "https://packages.unity.com"
},
Expand Down Expand Up @@ -94,7 +96,7 @@
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
"version": "1.3.1",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -223,6 +225,16 @@
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework.performance": {
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.31",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.4",
"depth": 1,
Expand Down Expand Up @@ -253,13 +265,13 @@
"url": "https://packages.unity.com"
},
"com.unity.transport": {
"version": "1.3.4",
"depth": 1,
"version": "2.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.collections": "1.2.4",
"com.unity.burst": "1.6.6",
"com.unity.mathematics": "1.2.6"
"com.unity.collections": "2.2.1",
"com.unity.burst": "1.8.8",
"com.unity.mathematics": "1.3.1"
},
"url": "https://packages.unity.com"
},
Expand Down