OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9 from cxxpxr/main

Browse source 
Switched server list request to use http
This commit is contained in:
Derek S 2021-04-02 11:06:17 -07:00 committed by GitHub
commit 01362b7513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
UnityTransport/LightReflectiveMirrorTransport.cs
View file

@ -1,10 +1,12 @@
using Mirror; using Mirror;
using Newtonsoft.Json;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.Networking;
namespace LightReflectiveMirror namespace LightReflectiveMirror
{ {
@ -14,6 +16,7 @@ namespace LightReflectiveMirror
[Header("Connection Variables")] [Header("Connection Variables")]
public Transport clientToServerTransport; public Transport clientToServerTransport;
public string serverIP = "34.67.125.123"; public string serverIP = "34.67.125.123";
public ushort endpointServerPort = 8080;
public float heartBeatInterval = 3; public float heartBeatInterval = 3;
public bool connectOnAwake = true; public bool connectOnAwake = true;
public string authenticationKey = "Secret Auth Key"; public string authenticationKey = "Secret Auth Key";
@ -107,15 +110,9 @@ namespace LightReflectiveMirror
public void RequestServerList() public void RequestServerList()
{ {
if (_isAuthenticated && _connectedToRelay) if (_isAuthenticated && _connectedToRelay)
{ StartCoroutine(GetServerList());
int pos = 0;
_clientSendBuffer.WriteByte(ref pos, (byte)OpCodes.RequestServers);
clientToServerTransport.ClientSend(0, new ArraySegment<byte>(_clientSendBuffer, 0, pos));
}
else else
{
Debug.Log("You must be connected to Relay to request server list!"); Debug.Log("You must be connected to Relay to request server list!");
}
} }
void DataReceived(ArraySegment<byte> segmentData, int channel) void DataReceived(ArraySegment<byte> segmentData, int channel)
@ -175,26 +172,46 @@ namespace LightReflectiveMirror
_currentMemberId++; _currentMemberId++;
} }
break; break;
case OpCodes.ServerListReponse:
relayServerList.Clear();
while (data.ReadBool(ref pos))
{
relayServerList.Add(new RelayServerInfo()
{
serverName = data.ReadString(ref pos),
serverData = data.ReadString(ref pos),
serverId = data.ReadInt(ref pos),
maxPlayers = data.ReadInt(ref pos),
currentPlayers = data.ReadInt(ref pos)
});
}
serverListUpdated?.Invoke();
break;
} }
} }
catch { } catch { }
} }
IEnumerator GetServerList()
{
Uri uri = new Uri($"http://{serverIP}:{endpointServerPort}/api/servers");
using (UnityWebRequest webRequest = UnityWebRequest.Get(uri))
{
// Request and wait for the desired page.
yield return webRequest.SendWebRequest();
var result = webRequest.downloadHandler.text;
switch (webRequest.result)
{
case UnityWebRequest.Result.ConnectionError:
case UnityWebRequest.Result.DataProcessingError:
case UnityWebRequest.Result.ProtocolError:
Debug.LogWarning("LRM | Server list request failed. Make sure your ports match!");
break;
case UnityWebRequest.Result.Success:
if (result == "Access Denied")
{
Debug.LogWarning("LRM | Server list request denied. Make sure you enable 'EndpointServerList' in server config!");
break;
}
else
{
relayServerList?.Clear();
relayServerList = JsonConvert.DeserializeObject<RelayServerInfo[]>(webRequest.downloadHandler.text).ToList();
serverListUpdated?.Invoke();
break;
}
}
}
}
public void UpdateRoomInfo(string newServerName = null, string newServerData = null, bool? newServerIsPublic = null, int? newPlayerCap = null) public void UpdateRoomInfo(string newServerName = null, string newServerData = null, bool? newServerIsPublic = null, int? newPlayerCap = null)
{ {
if (_isServer) if (_isServer)