Update project and mirror

Author: SoftwareGuy

Assets/Mirror/Authenticators/BasicAuthenticator.cs

@@ -14,48 +14,50 @@ public class BasicAuthenticator : NetworkAuthenticator
  public string username;
  public string password;
 
- public class AuthRequestMessage : MessageBase
+ #region Messages
+
+ public struct AuthRequestMessage : NetworkMessage
  {
  // use whatever credentials make sense for your game
  // for example, you might want to pass the accessToken if using oauth
  public string authUsername;
  public string authPassword;
  }
 
- public class AuthResponseMessage : MessageBase
+ public struct AuthResponseMessage : NetworkMessage
  {
  public byte code;
  public string message;
  }
 
+ #endregion
+
+ #region Server
+
+ /// <summary>
+ /// Called on server from StartServer to initialize the Authenticator
+ /// <para>Server message handlers should be registered in this method.</para>
+ /// </summary>
  public override void OnStartServer()
  {
  // register a handler for the authentication request we expect from client
  NetworkServer.RegisterHandler<AuthRequestMessage>(OnAuthRequestMessage, false);
  }
 
- public override void OnStartClient()
- {
- // register a handler for the authentication response we expect from server
- NetworkClient.RegisterHandler<AuthResponseMessage>(OnAuthResponseMessage, false);
- }
-
+ /// <summary>
+ /// Called on server from OnServerAuthenticateInternal when a client needs to authenticate
+ /// </summary>
+ /// <param name="conn">Connection to client.</param>
  public override void OnServerAuthenticate(NetworkConnection conn)
  {
  // do nothing...wait for AuthRequestMessage from client
  }
 
- public override void OnClientAuthenticate(NetworkConnection conn)
- {
- AuthRequestMessage authRequestMessage = new AuthRequestMessage
- {
- authUsername = username,
- authPassword = password
- };
-
- conn.Send(authRequestMessage);
- }
-
+ /// <summary>
+ /// Called on server when the client's AuthRequestMessage arrives
+ /// </summary>
+ /// <param name="conn">Connection to client.</param>
+ /// <param name="msg">The message payload</param>
  public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg)
  {
  if (logger.LogEnabled()) logger.LogFormat(LogType.Log, "Authentication Request: {0} {1}", msg.authUsername, msg.authPassword);
@@ -72,8 +74,8 @@ public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg)
 
  conn.Send(authResponseMessage);
 
- // Invoke the event to complete a successful authentication
- OnServerAuthenticated.Invoke(conn);
+ // Accept the successful authentication
+ ServerAccept(conn);
  }
  else
  {
@@ -94,31 +96,66 @@ public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg)
  }
  }
 
- public IEnumerator DelayedDisconnect(NetworkConnection conn, float waitTime)
+ IEnumerator DelayedDisconnect(NetworkConnection conn, float waitTime)
  {
  yield return new WaitForSeconds(waitTime);
- conn.Disconnect();
+
+ // Reject the unsuccessful authentication
+ ServerReject(conn);
  }
 
+ #endregion
+
+ #region Client
+
+ /// <summary>
+ /// Called on client from StartClient to initialize the Authenticator
+ /// <para>Client message handlers should be registered in this method.</para>
+ /// </summary>
+ public override void OnStartClient()
+ {
+ // register a handler for the authentication response we expect from server
+ NetworkClient.RegisterHandler<AuthResponseMessage>(OnAuthResponseMessage, false);
+ }
+
+ /// <summary>
+ /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate
+ /// </summary>
+ /// <param name="conn">Connection of the client.</param>
+ public override void OnClientAuthenticate(NetworkConnection conn)
+ {
+ AuthRequestMessage authRequestMessage = new AuthRequestMessage
+ {
+ authUsername = username,
+ authPassword = password
+ };
+
+ conn.Send(authRequestMessage);
+ }
+
+ /// <summary>
+ /// Called on client when the server's AuthResponseMessage arrives
+ /// </summary>
+ /// <param name="conn">Connection to client.</param>
+ /// <param name="msg">The message payload</param>
  public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg)
  {
  if (msg.code == 100)
  {
  if (logger.LogEnabled()) logger.LogFormat(LogType.Log, "Authentication Response: {0}", msg.message);
 
- // Invoke the event to complete a successful authentication
- OnClientAuthenticated.Invoke(conn);
+ // Authentication has been accepted
+ ClientAccept(conn);
  }
  else
  {
  logger.LogFormat(LogType.Error, "Authentication Response: {0}", msg.message);
 
- // Set this on the client for local reference
- conn.isAuthenticated = false;
-
- // disconnect the client
- conn.Disconnect();
+ // Authentication has been rejected
+ ClientReject(conn);
  }
  }
+
+ #endregion
  }
 }

Assets/Mirror/Authenticators/TimeoutAuthenticator.cs

@@ -23,6 +23,16 @@ public void Awake()
  authenticator.OnServerAuthenticated.AddListener(connection => OnServerAuthenticated.Invoke(connection));
  }
 
+ public override void OnStartClient()
+ {
+ authenticator.OnStartClient();
+ }
+
+ public override void OnStartServer()
+ {
+ authenticator.OnStartServer();
+ }
+
  public override void OnClientAuthenticate(NetworkConnection conn)
  {
  authenticator.OnClientAuthenticate(conn);

Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs

@@ -30,7 +30,11 @@ public static void AddDefineSymbols()
  "MIRROR_13_0_OR_NEWER",
  "MIRROR_14_0_OR_NEWER",
  "MIRROR_15_0_OR_NEWER",
- "MIRROR_16_0_OR_NEWER"
+ "MIRROR_16_0_OR_NEWER",
+ "MIRROR_17_0_OR_NEWER",
+ "MIRROR_18_0_OR_NEWER",
+ "MIRROR_24_0_OR_NEWER",
+ "MIRROR_26_0_OR_NEWER"
  };
 
  // only touch PlayerSettings if we actually modified it.

Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs

@@ -18,8 +18,8 @@ namespace Mirror.Discovery
  [DisallowMultipleComponent]
  [HelpURL("https://mirror-networking.com/docs/Components/NetworkDiscovery.html")]
  public abstract class NetworkDiscoveryBase<Request, Response> : MonoBehaviour
- where Request : IMessageBase, new()
- where Response : IMessageBase, new()
+ where Request : NetworkMessage
+ where Response : NetworkMessage
  {
  public static bool SupportedOnThisPlatform { get { return Application.platform != RuntimePlatform.WebGLPlayer; } }
 
@@ -29,7 +29,7 @@ public abstract class NetworkDiscoveryBase<Request, Response> : MonoBehaviour
 
  [SerializeField]
  [Tooltip("The UDP port the server will listen for multi-cast messages")]
- int serverBroadcastListenPort = 47777;
+ protected int serverBroadcastListenPort = 47777;
 
  [SerializeField]
  [Tooltip("Time in seconds between multi-cast messages")]
@@ -62,11 +62,10 @@ public static long RandomLong()
  /// </summary>
  public virtual void Start()
  {
- // headless mode? then start advertising
- if (NetworkManager.isHeadless)
- {
- AdvertiseServer();
- }
+ // Server mode? then start advertising
+#if UNITY_SERVER
+ AdvertiseServer();
+#endif
  }
 
  // Ensure the ports are cleared no matter when Game/Unity UI exits
@@ -166,8 +165,7 @@ async Task ReceiveRequestAsync(UdpClient udpClient)
  throw new ProtocolViolationException("Invalid handshake");
  }
 
- Request request = new Request();
- request.Deserialize(networkReader);
+ Request request = networkReader.Read<Request>();
 
  ProcessClientRequest(request, udpReceiveResult.RemoteEndPoint);
  }
@@ -195,7 +193,7 @@ protected virtual void ProcessClientRequest(Request request, IPEndPoint endpoint
  {
  writer.WriteInt64(secretHandshake);
 
- info.Serialize(writer);
+ writer.Write(info);
 
  ArraySegment<byte> data = writer.ToArraySegment();
  // signature matches
@@ -306,7 +304,7 @@ public void BroadcastDiscoveryRequest()
  {
  Request request = GetRequest();
 
- request.Serialize(writer);
+ writer.Write(request);
 
  ArraySegment<byte> data = writer.ToArraySegment();
 
@@ -326,7 +324,7 @@ public void BroadcastDiscoveryRequest()
  /// Override if you wish to include additional data in the discovery message
  /// such as desired game mode, language, difficulty, etc... </remarks>
  /// <returns>An instance of ServerRequest with data to be broadcasted</returns>
- protected virtual Request GetRequest() => new Request();
+ protected virtual Request GetRequest() => default;
 
  async Task ReceiveGameBroadcastAsync(UdpClient udpClient)
  {
@@ -340,8 +338,7 @@ async Task ReceiveGameBroadcastAsync(UdpClient udpClient)
  if (networkReader.ReadInt64() != secretHandshake)
  return;
 
- Response response = new Response();
- response.Deserialize(networkReader);
+ Response response = networkReader.Read<Response>();
 
  ProcessResponse(response, udpReceiveResult.RemoteEndPoint);
  }

Assets/Mirror/Components/Discovery/ServerRequest.cs

@@ -1,4 +1,4 @@
 namespace Mirror.Discovery
 {
- public class ServerRequest : MessageBase { }
+ public struct ServerRequest : NetworkMessage { }
 }

Assets/Mirror/Components/Discovery/ServerResponse.cs

@@ -3,7 +3,7 @@
 
 namespace Mirror.Discovery
 {
- public class ServerResponse : MessageBase
+ public struct ServerResponse : NetworkMessage
  {
  // The server that sent this
  // this is a property so that it is not serialized, but the

Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs

@@ -0,0 +1,93 @@
+using UnityEngine;
+
+namespace Mirror.Experimental
+{
+ [AddComponentMenu("Network/Experimental/NetworkLerpRigidbody")]
+ [HelpURL("https://mirror-networking.com/docs/Components/NetworkLerpRigidbody.html")]
+ public class NetworkLerpRigidbody : NetworkBehaviour
+ {
+ [Header("Settings")]
+ [SerializeField] internal Rigidbody target = null;
+ [Tooltip("How quickly current velocity approaches target velocity")]
+ [SerializeField] float lerpVelocityAmount = 0.5f;
+ [Tooltip("How quickly current position approaches target position")]
+ [SerializeField] float lerpPositionAmount = 0.5f;
+
+ [Tooltip("Set to true if moves come from owner client, set to false if moves always come from server")]
+ [SerializeField] bool clientAuthority = false;
+
+ float nextSyncTime;
+
+
+ [SyncVar()]
+ Vector3 targetVelocity;
+
+ [SyncVar()]
+ Vector3 targetPosition;
+
+ /// <summary>
+ /// Ignore value if is host or client with Authority
+ /// </summary>
+ /// <returns></returns>
+ bool IgnoreSync => isServer || ClientWithAuthority;
+
+ bool ClientWithAuthority => clientAuthority && hasAuthority;
+
+ void OnValidate()
+ {
+ if (target == null)
+ {
+ target = GetComponent<Rigidbody>();
+ }
+ }
+
+ void Update()
+ {
+ if (isServer)
+ {
+ SyncToClients();
+ }
+ else if (ClientWithAuthority)
+ {
+ SendToServer();
+ }
+ }
+
+ private void SyncToClients()
+ {
+ targetVelocity = target.velocity;
+ targetPosition = target.position;
+ }
+
+ private void SendToServer()
+ {
+ float now = Time.time;
+ if (now > nextSyncTime)
+ {
+ nextSyncTime = now + syncInterval;
+ CmdSendState(target.velocity, target.position);
+ }
+ }
+
+ [Command]
+ private void CmdSendState(Vector3 velocity, Vector3 position)
+ {
+ target.velocity = velocity;
+ target.position = position;
+ targetVelocity = velocity;
+ targetPosition = position;
+ }
+
+ void FixedUpdate()
+ {
+ if (IgnoreSync) { return; }
+
+ target.velocity = Vector3.Lerp(target.velocity, targetVelocity, lerpVelocityAmount);
+ target.position = Vector3.Lerp(target.position, targetPosition, lerpPositionAmount);
+ // add velocity to position as position would have moved on server at that velocity
+ targetPosition += target.velocity * Time.fixedDeltaTime;
+
+ // TODO does this also need to sync acceleration so and update velocity?
+ }
+ }
+}