charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkServer/NetworkClient: add/remove from transport events instead of overwriting them. This allows addons to hook into Transport OnConnect/OnData/etc.

Browse Source
This commit is contained in:
vis2k 2021-01-27 14:41:26 +08:00
parent 4d3eff0b7f
commit f761a864c1
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Mirror/Runtime/NetworkClient.cs
View File

@ -147,10 +147,18 @@ public static void DisconnectLocalServer()
static void AddTransportHandlers()
{
Transport.activeTransport.OnClientConnected = OnConnected;
Transport.activeTransport.OnClientDataReceived = OnDataReceived;
Transport.activeTransport.OnClientDisconnected = OnDisconnected;
Transport.activeTransport.OnClientError = OnError;
Transport.activeTransport.OnClientConnected += OnConnected;
Transport.activeTransport.OnClientDataReceived += OnDataReceived;
Transport.activeTransport.OnClientDisconnected += OnDisconnected;
Transport.activeTransport.OnClientError += OnError;
}
static void RemoveTransportHandlers()
{
Transport.activeTransport.OnClientConnected -= OnConnected;
Transport.activeTransport.OnClientDataReceived -= OnDataReceived;
Transport.activeTransport.OnClientDisconnected -= OnDisconnected;
Transport.activeTransport.OnClientError -= OnError;
}
static void OnError(Exception exception)
@ -218,6 +226,8 @@ public static void Disconnect()
connection = null;
}
}
RemoveTransportHandlers();
}
/// <summary>

17
Assets/Mirror/Runtime/NetworkServer.cs
View File

@ -98,6 +98,7 @@ public static void Shutdown()
CleanupNetworkIdentities();
NetworkIdentity.ResetNextNetworkId();
RemoveTransportHandlers();
}
static void CleanupNetworkIdentities()
@ -489,10 +490,18 @@ static void CheckForInactiveConnections()
static void AddTransportHandlers()
{
Transport.activeTransport.OnServerConnected = OnConnected;
Transport.activeTransport.OnServerDataReceived = OnDataReceived;
Transport.activeTransport.OnServerDisconnected = OnDisconnected;
Transport.activeTransport.OnServerError = OnError;
Transport.activeTransport.OnServerConnected += OnConnected;
Transport.activeTransport.OnServerDataReceived += OnDataReceived;
Transport.activeTransport.OnServerDisconnected += OnDisconnected;
Transport.activeTransport.OnServerError += OnError;
}
static void RemoveTransportHandlers()
{
Transport.activeTransport.OnServerConnected -= OnConnected;
Transport.activeTransport.OnServerDataReceived -= OnDataReceived;
Transport.activeTransport.OnServerDisconnected -= OnDisconnected;
Transport.activeTransport.OnServerError -= OnError;
}
static void OnConnected(int connectionId)

18
Assets/Mirror/Runtime/Transport/Transport.cs
View File

@ -8,7 +8,7 @@ namespace Mirror
/// </summary>
/// <remarks>
/// <h2>
/// Transport Rules
/// Transport Rules
/// </h2>
/// <list type="bullet">
/// <listheader><description>
@ -58,25 +58,25 @@ public abstract class Transport : MonoBehaviour
/// Notify subscribers when when this client establish a successful connection to the server
/// <para>callback()</para>
/// </summary>
public Action OnClientConnected = () => Debug.LogWarning("OnClientConnected called with no handler");
public Action OnClientConnected;
/// <summary>
/// Notify subscribers when this client receive data from the server
/// <para>callback(ArraySegment&lt;byte&gt; data, int channel)</para>
/// </summary>
public Action<ArraySegment<byte>, int> OnClientDataReceived = (data, channel) => Debug.LogWarning("OnClientDataReceived called with no handler");
public Action<ArraySegment<byte>, int> OnClientDataReceived;
/// <summary>
/// Notify subscribers when this client encounters an error communicating with the server
/// <para>callback(Exception e)</para>
/// </summary>
public Action<Exception> OnClientError = (error) => Debug.LogWarning("OnClientError called with no handler");
public Action<Exception> OnClientError;
/// <summary>
/// Notify subscribers when this client disconnects from the server
/// <para>callback()</para>
/// </summary>
public Action OnClientDisconnected = () => Debug.LogWarning("OnClientDisconnected called with no handler");
public Action OnClientDisconnected;
/// <summary>
/// Determines if we are currently connected to the server
@ -131,25 +131,25 @@ public virtual void ClientConnect(Uri uri)
/// Notify subscribers when a client connects to this server
/// <para>callback(int connId)</para>
/// </summary>
public Action<int> OnServerConnected = (connId) => Debug.LogWarning("OnServerConnected called with no handler");
public Action<int> OnServerConnected;
/// <summary>
/// Notify subscribers when this server receives data from the client
/// <para>callback(int connId, ArraySegment&lt;byte&gt; data, int channel)</para>
/// </summary>
public Action<int, ArraySegment<byte>, int> OnServerDataReceived = (connId, data, channel) => Debug.LogWarning("OnServerDataReceived called with no handler");
public Action<int, ArraySegment<byte>, int> OnServerDataReceived;
/// <summary>
/// Notify subscribers when this server has some problem communicating with the client
/// <para>callback(int connId, Exception e)</para>
/// </summary>
public Action<int, Exception> OnServerError = (connId, error) => Debug.LogWarning("OnServerError called with no handler");
public Action<int, Exception> OnServerError;
/// <summary>
/// Notify subscribers when a client disconnects from this server
/// <para>callback(int connId)</para>
/// </summary>
public Action<int> OnServerDisconnected = (connId) => Debug.LogWarning("OnServerDisconnected called with no handler");
public Action<int> OnServerDisconnected;
/// <summary>
/// Determines if the server is up and running