Transport Rewrite

Assets/Mirage/Authenticators/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("82.0.0")]
+[assembly: AssemblyVersion("84.0.0")]

Assets/Mirage/Authenticators/BasicAuthenticator.cs

@@ -27,15 +27,15 @@ public struct AuthResponseMessage
             public string Message;
         }
 
-        public override void OnServerAuthenticate(INetworkPlayer player)
+        public override void OnServerAuthenticate(NetworkPlayer player)
         {
             // wait for AuthRequestMessage from client
-            player.RegisterHandler<AuthRequestMessage>(OnAuthRequestMessage);
+            player.MessageReceiver.RegisterHandler<AuthRequestMessage>(OnAuthRequestMessage);
         }
 
-        public override void OnClientAuthenticate(INetworkPlayer player)
+        public override void OnClientAuthenticate(NetworkPlayer player)
         {
-            player.RegisterHandler<AuthResponseMessage>(OnAuthResponseMessage);
+            player.MessageReceiver.RegisterHandler<AuthResponseMessage>(OnAuthResponseMessage);
 
             var authRequestMessage = new AuthRequestMessage
             {
@@ -46,7 +46,7 @@ public override void OnClientAuthenticate(INetworkPlayer player)
             player.Send(authRequestMessage);
         }
 
-        public void OnAuthRequestMessage(INetworkPlayer player, AuthRequestMessage msg)
+        public void OnAuthRequestMessage(NetworkPlayer player, AuthRequestMessage msg)
         {
             if (logger.LogEnabled()) logger.LogFormat(LogType.Log, "Authentication Request: {0} {1}", msg.AuthUsername, msg.AuthPassword);
 
@@ -81,13 +81,13 @@ public void OnAuthRequestMessage(INetworkPlayer player, AuthRequestMessage msg)
             }
         }
 
-        public IEnumerator DelayedDisconnect(INetworkPlayer player, float waitTime)
+        public IEnumerator DelayedDisconnect(NetworkPlayer player, float waitTime)
         {
             yield return new WaitForSeconds(waitTime);
             player.Connection?.Disconnect();
         }
 
-        public void OnAuthResponseMessage(INetworkPlayer player, AuthResponseMessage msg)
+        public void OnAuthResponseMessage(NetworkPlayer player, AuthResponseMessage msg)
         {
             if (msg.Code == 100)
             {

Assets/Mirage/Authenticators/TimeoutAuthenticator.cs

@@ -25,21 +25,21 @@ public void Awake()
             Authenticator.OnServerAuthenticated += HandleServerAuthenticated;
         }
 
-        private readonly HashSet<INetworkPlayer> pendingAuthentication = new HashSet<INetworkPlayer>();
+        private readonly HashSet<NetworkPlayer> pendingAuthentication = new HashSet<NetworkPlayer>();
 
-        private void HandleServerAuthenticated(INetworkPlayer player)
+        private void HandleServerAuthenticated(NetworkPlayer player)
         {
             pendingAuthentication.Remove(player);
             base.OnClientAuthenticate(player);
         }
 
-        private void HandleClientAuthenticated(INetworkPlayer player)
+        private void HandleClientAuthenticated(NetworkPlayer player)
         {
             pendingAuthentication.Remove(player);
             base.OnServerAuthenticate(player);
         }
 
-        public override void OnClientAuthenticate(INetworkPlayer player)
+        public override void OnClientAuthenticate(NetworkPlayer player)
         {
             pendingAuthentication.Add(player);
             Authenticator.OnClientAuthenticate(player);
@@ -48,15 +48,15 @@ public override void OnClientAuthenticate(INetworkPlayer player)
                 StartCoroutine(BeginAuthentication(player));
         }
 
-        public override void OnServerAuthenticate(INetworkPlayer player)
+        public override void OnServerAuthenticate(NetworkPlayer player)
         {
             pendingAuthentication.Add(player);
             Authenticator.OnServerAuthenticate(player);
             if (Timeout > 0)
                 StartCoroutine(BeginAuthentication(player));
         }
 
-        IEnumerator BeginAuthentication(INetworkPlayer player)
+        IEnumerator BeginAuthentication(NetworkPlayer player)
         {
             if (logger.LogEnabled()) logger.Log($"Authentication countdown started {player} {Timeout}");
 

Assets/Mirage/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [84.0.0](https://github.com/MirageNet/Mirage/compare/v83.0.0...v84.0.0) (2021-03-24)
+
+
+### Code Refactoring
+
+* using interface instead of network server ([#722](https://github.com/MirageNet/Mirage/issues/722)) ([7312bd8](https://github.com/MirageNet/Mirage/commit/7312bd8cd83f2133f9d0a6162dea9689630d88f2))
+
+
+### BREAKING CHANGES
+
+* fields and parameters using NetworkServer are now using INetworkServer Instead
+
+# [83.0.0](https://github.com/MirageNet/Mirage/compare/v82.0.0...v83.0.0) (2021-03-24)
+
+
+### Code Refactoring
+
+* using interface instead of network client ([#721](https://github.com/MirageNet/Mirage/issues/721)) ([703596a](https://github.com/MirageNet/Mirage/commit/703596aa4678eeef6e6e89b8877fceb8062e4476))
+
+
+### BREAKING CHANGES
+
+* fields and parameters using NetworkClient are now using INetworkClient Instead
+
 # [82.0.0](https://github.com/MirageNet/Mirage/compare/v81.0.2...v82.0.0) (2021-03-24)
 
 

Assets/Mirage/Components/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("82.0.0")]
+[assembly: AssemblyVersion("84.0.0")]

Assets/Mirage/Components/HeadlessAutoStart.cs

@@ -1,4 +1,3 @@
-using Cysharp.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Serialization;
@@ -24,7 +23,7 @@ void Start()
             // some transports might not be ready until Start.
             if (Server && SystemInfo.graphicsDeviceType == GraphicsDeviceType.Null && startOnHeadless)
             {
-                Server.ListenAsync().Forget();
+                Server.Listen();
             }
         }
     }

Assets/Mirage/Components/LobbyReady.cs

@@ -12,7 +12,7 @@ public class LobbyReady : MonoBehaviour
 
         // just a cached memory area where we can collect connections
         // for broadcasting messages
-        private static readonly List<INetworkPlayer> playerCache = new List<INetworkPlayer>();
+        private static readonly List<NetworkPlayer> playerCache = new List<NetworkPlayer>();
 
         public void SetAllClientsNotReady()
         {

Assets/Mirage/Components/NetworkMatchChecker.cs

@@ -105,7 +105,7 @@ void RebuildMatchObservers(Guid specificMatch)
         /// </summary>
         /// <param name="player">Network connection of a player.</param>
         /// <returns>True if the player can see this object.</returns>
-        public override bool OnCheckObserver(INetworkPlayer player)
+        public override bool OnCheckObserver(NetworkPlayer player)
         {
             // Not Visible if not in a match
             if (MatchId == Guid.Empty)
@@ -125,7 +125,7 @@ public override bool OnCheckObserver(INetworkPlayer player)
         /// </summary>
         /// <param name="observers">The new set of observers for this object.</param>
         /// <param name="initialize">True if the set of observers is being built for the first time.</param>
-        public override void OnRebuildObservers(HashSet<INetworkPlayer> observers, bool initialize)
+        public override void OnRebuildObservers(HashSet<NetworkPlayer> observers, bool initialize)
         {
             if (currentMatch == Guid.Empty) return;
 

Assets/Mirage/Components/NetworkProximityChecker.cs

@@ -59,7 +59,7 @@ void RebuildObservers()
 
         /// <param name="player">Network connection of a player.</param>
         /// <returns>True if the player can see this object.</returns>
-        public override bool OnCheckObserver(INetworkPlayer player)
+        public override bool OnCheckObserver(NetworkPlayer player)
         {
             if (ForceHidden)
                 return false;
@@ -73,7 +73,7 @@ public override bool OnCheckObserver(INetworkPlayer player)
         /// </summary>
         /// <param name="observers">The new set of observers for this object.</param>
         /// <param name="initialize">True if the set of observers is being built for the first time.</param>
-        public override void OnRebuildObservers(HashSet<INetworkPlayer> observers, bool initialize)
+        public override void OnRebuildObservers(HashSet<NetworkPlayer> observers, bool initialize)
         {
             // if force hidden then return without adding any observers.
             if (ForceHidden)
@@ -89,7 +89,7 @@ public override void OnRebuildObservers(HashSet<INetworkPlayer> observers, bool
             //    magnitude faster. if we have 10k monsters and run a sphere
             //    cast 10k times, we will see a noticeable lag even with physics
             //    layers. but checking to every connection is fast.
-            foreach (INetworkPlayer player in Server.Players)
+            foreach (NetworkPlayer player in Server.Players)
             {
                 // check distance
                 if (player != null && player.Identity != null && Vector3.Distance(player.Identity.transform.position, position) < VisibilityRange)

Assets/Mirage/Components/NetworkSceneChecker.cs

@@ -89,7 +89,7 @@ void RebuildSceneObservers()
         /// </summary>
         /// <param name="player">Network connection of a player.</param>
         /// <returns>True if the player can see this object.</returns>
-        public override bool OnCheckObserver(INetworkPlayer player)
+        public override bool OnCheckObserver(NetworkPlayer player)
         {
             if (forceHidden)
                 return false;
@@ -103,7 +103,7 @@ public override bool OnCheckObserver(INetworkPlayer player)
         /// </summary>
         /// <param name="observers">The new set of observers for this object.</param>
         /// <param name="initialize">True if the set of observers is being built for the first time.</param>
-        public override void OnRebuildObservers(HashSet<INetworkPlayer> observers, bool initialize)
+        public override void OnRebuildObservers(HashSet<NetworkPlayer> observers, bool initialize)
         {
             // If forceHidden then return without adding any observers.
             if (forceHidden)

Assets/Mirage/Editor/NetworkInformationPreview.cs

@@ -181,7 +181,7 @@ float DrawObservers(NetworkIdentity identity, float initialX, float Y)
                 observerRect.x += 20;
                 observerRect.y += observerRect.height;
 
-                foreach (INetworkPlayer player in identity.observers)
+                foreach (NetworkPlayer player in identity.observers)
                 {
                     GUI.Label(observerRect, player.Connection.GetEndPointAddress() + ":" + player, styles.ComponentName);
                     observerRect.y += observerRect.height;

Assets/Mirage/Editor/NetworkMenu.cs

@@ -21,7 +21,7 @@ public static GameObject CreateNetworkManager()
             networkClient.Transport = transport;
 
             NetworkServer networkServer = go.GetComponent<NetworkServer>();
-            networkServer.Transport = transport;
+            networkServer.Peer = transport;
 
             ServerObjectManager serverObjectManager = go.GetComponent<ServerObjectManager>();
             serverObjectManager.Server = networkServer;

Assets/Mirage/Mirage.asmdef

@@ -2,7 +2,8 @@
     "name": "Mirage",
     "references": [
         "UniTask",
-        "UniTask.Linq"
+        "UniTask.Linq",
+        "Mirage.SocketLayer"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Mirage/Runtime/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("82.0.0")]
+[assembly: AssemblyVersion("84.0.0")]
 
 [assembly: InternalsVisibleTo("Mirage.Tests.Common")]
 [assembly: InternalsVisibleTo("Mirage.Tests")]

Assets/Mirage/Runtime/CharacterSpawner.cs

@@ -82,10 +82,10 @@ void OnDestroy()
             }
         }
 
-        private void OnServerAuthenticated(INetworkPlayer player)
+        private void OnServerAuthenticated(NetworkPlayer player)
         {
             // wait for client to send us an AddPlayerMessage
-            player.RegisterHandler<AddCharacterMessage>(OnServerAddPlayerInternal);
+            Server.MessageReceiver.RegisterHandler<AddCharacterMessage>(OnServerAddPlayerInternal);
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ public virtual void RequestServerSpawnPlayer()
             Client.Send(new AddCharacterMessage());
         }
 
-        void OnServerAddPlayerInternal(INetworkPlayer player, AddCharacterMessage msg)
+        void OnServerAddPlayerInternal(NetworkPlayer player, AddCharacterMessage msg)
         {
             logger.Log("CharacterSpawner.OnServerAddPlayer");
 
@@ -121,7 +121,7 @@ void OnServerAddPlayerInternal(INetworkPlayer player, AddCharacterMessage msg)
         /// <para>The default implementation for this function creates a new player object from the playerPrefab.</para>
         /// </summary>
         /// <param name="player">Connection from client.</param>
-        public virtual void OnServerAddPlayer(INetworkPlayer player)
+        public virtual void OnServerAddPlayer(NetworkPlayer player)
         {
             Transform startPos = GetStartPosition();
             NetworkIdentity character = startPos != null