Merge branch 'master' of github.com:Saltosion/Cyber

Assets/Scripts/Networking/Client.cs

@@ -3,24 +3,35 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
 
+/// <summary>
+/// Client-class used to connecting to a server and communicating to it.
+/// Also handles all events incoming from the server and forwards them where they should be handled.
+/// </summary>
 public class Client : MonoBehaviour {
 
     NetworkClient NetClient;
     private bool Running = false;
 
+    private static Client Singleton;
+
+    public Client() {
+        Singleton = this;
+    }
+
 	// Use this for initialization
 	void Start () {
+
     }
 	
 	// Update is called once per frame
 	void Update () {
-		if (NetClient.isConnected) {
-        }
 	}
 
-    public void LaunchClient(string ip, int port) {
+    // Launches the client at given IP and port.
+
+    private bool LaunchClient(string ip, int port) {
         if (Running) {
-            return;
+            return false;
         }
 
         ConnectionConfig Config = new ConnectionConfig();
@@ -43,9 +54,13 @@ public class Client : MonoBehaviour {
 
         Debug.Log("Client launched!");
         Term.Println("Client launched!");
+
+        return true;
     }
 
-    public void HandlePacket(NetworkMessage msg) {
+    // Handles custom packets
+
+    private void HandlePacket(NetworkMessage msg) {
         switch (msg.msgType) {
         case (PktType.TextMessage):
             TextMessage TextMsg = new TextMessage();
@@ -59,29 +74,75 @@ public class Client : MonoBehaviour {
         }
     }
 
-    public void Send(short type, MessageBase message) {
-        NetClient.Send(type, message);
-    }
-
-    public void OnConnected(NetworkMessage msg) {
+    // Built-in handles for some events
+    
+    private void OnConnected(NetworkMessage msg) {
         Debug.Log("Connected!");
         Term.Println("Connected!");
 
         Term.AddCommand("send (message)", "Send a message across the vastness of space and time!", (args) => {
             Term.Println("You: " + args[0]);
-            Send(PktType.TextMessage, new TextMessage("A Client: " + args[0]));
+            NetClient.Send(PktType.TextMessage, new TextMessage("A Client: " + args[0]));
         });
     }
 
-    public void OnDisconnected(NetworkMessage msg) {
+    private void OnDisconnected(NetworkMessage msg) {
         Debug.Log("Disconnected!");
         Term.Println("Disconnected!");
+        Running = false;
     }
 
-    public void OnError(NetworkMessage msg) {
+    private void OnError(NetworkMessage msg) {
         Debug.LogError("Encountered a network error. Shutting down.");
         Term.Println("Encountered a network error. Shutting down.");
         NetClient.Disconnect();
         Running = false;
     }
+
+    // Static interface for usage outside of Client
+
+    /// <summary>
+    /// Will launch the client and attempt to connect to the server.
+    /// Returns false if client is already running, otherwise true.
+    /// </summary>
+    /// <param name="ip"></param>
+    /// <param name="port"></param>
+    /// <returns></returns>
+    public static bool Launch(string ip, int port) {
+        return Singleton.LaunchClient(ip, port);
+    }
+
+    /// <summary>
+    /// Send messages to the server if the connection is active.
+    /// If client is not active, this will return false, otherwise true.
+    /// </summary>
+    /// <param name="msgType"></param>
+    /// <param name="message"></param>
+    /// <returns></returns>
+    public static bool Send(short msgType, MessageBase message) {
+        if (Singleton.Running) {
+            Singleton.NetClient.Send(msgType, message);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Returns if the client is running or not. 
+    /// This is independant weather the client is connected or not.
+    /// </summary>
+    /// <returns></returns>
+    public static bool isRunning() {
+        return Singleton.Running;
+    }
+
+    /// <summary>
+    /// Returns if the client is connected or not.
+    /// </summary>
+    /// <returns></returns>
+    public static bool isConnected() {
+        return Singleton.NetClient.isConnected;
+    }
+    
 }

Assets/Scripts/Networking/Messages/TextMessage.cs

@@ -1,20 +1,42 @@
 using UnityEngine.Networking;
 
+/// <summary>
+/// Generic Text Message for chat etc.
+/// To be removed later when no longer necessary.
+/// </summary>
 public class TextMessage : MessageBase {
 
+    /// <summary>
+    /// Message inside the Text Message. Does not container sender information.
+    /// </summary>
     public string Message;
     
+    /// <summary>
+    /// Create a TextMessage containing the message to be sent.
+    /// </summary>
+    /// <param name="message"></param>
     public TextMessage(string message) {
         this.Message = message;
     }
 
+    /// <summary>
+    /// Parameter-less constructor using when deserializing the message.
+    /// </summary>
     public TextMessage() {
     }
 
+    /// <summary>
+    /// Used to deserialize a message received via networking.
+    /// </summary>
+    /// <param name="reader"></param>
     public override void Deserialize(NetworkReader reader) {
         Message = reader.ReadString();
     }
 
+    /// <summary>
+    /// Used to serialize the message before it is sent.
+    /// </summary>
+    /// <param name="writer"></param>
     public override void Serialize(NetworkWriter writer) {
         writer.Write(Message);
     }

Assets/Scripts/Networking/NetworkEstablisher.cs

@@ -65,8 +65,8 @@ public class NetworkEstablisher : MonoBehaviour {
     }
 
     public void StartClient(string ip, int port) {
-        Client Client = WorldRoot.AddComponent<Client>();
-        Client.LaunchClient(ip, port);
+        WorldRoot.AddComponent<Client>();
+        Client.Launch(ip, port);
     }
 
     public void StartServer() {
@@ -79,7 +79,7 @@ public class NetworkEstablisher : MonoBehaviour {
     }
 
     public void StartServer(int port) {
-        Server Server = WorldRoot.AddComponent<Server>();
-        Server.LaunchServer(port);
+        WorldRoot.AddComponent<Server>();
+        Server.Launch(port);
     }
 }

Assets/Scripts/Networking/PktType.cs

@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+/// <summary>
+/// Types of custom created packets.
+/// </summary>
 public class PktType {
 
     public const short TextMessage = 200;

Assets/Scripts/Networking/Server.cs

@@ -4,9 +4,12 @@ using UnityEngine;
 using UnityEngine.Networking;
 
 public class Server : MonoBehaviour {
+
+    private static Server Singleton;
     
 	// Use this for initialization
 	void Start () {
+        Singleton = this;
 	}
 	
 	// Update is called once per frame
@@ -14,7 +17,10 @@ public class Server : MonoBehaviour {
 		
 	}
 
-    public void LaunchServer(int port) {
+    private bool LaunchServer(int port) {
+        if (NetworkServer.active) {
+            return false;
+        }
 
         ConnectionConfig Config = new ConnectionConfig();
         Config.AddChannel(QosType.ReliableSequenced);
@@ -36,9 +42,13 @@ public class Server : MonoBehaviour {
             Term.Println("You: " + args[0]);
             SendToAll(PktType.TextMessage, new TextMessage("Server: " + args[0]));
         });
+
+        return true;
     }
 
-    public void HandlePacket(NetworkMessage msg) {
+    // Custon packet handler
+
+    private void HandlePacket(NetworkMessage msg) {
 
         switch(msg.msgType) {
         case PktType.TextMessage:
@@ -53,22 +63,73 @@ public class Server : MonoBehaviour {
         }
     }
 
-    public void SendToAll(short type, MessageBase message) {
-        NetworkServer.SendToAll(type, message);
-    }
+    // Internal built-in event handler
 
-    public void OnConnected(NetworkMessage msg) {
+    private void OnConnected(NetworkMessage msg) {
         Debug.Log("Someone connected!");
         Term.Println("Someone connected!");
     }
 
-    public void OnDisconnected(NetworkMessage msg) {
+    private void OnDisconnected(NetworkMessage msg) {
         Debug.Log("Someone disconnected.");
         Term.Println("Someone disconnected.");
     }
 
-    public void OnError(NetworkMessage msg) {
+    private void OnError(NetworkMessage msg) {
         Debug.LogError("Encountered a network error on server");
         Term.Println("Encountered a network error on server");
     }
+
+    // Static methods for public usage
+
+    /// <summary>
+    /// Launches the server if not already launched.
+    /// Returns false if the server was already launched, true otherwise.
+    /// </summary>
+    /// <param name="port"></param>
+    /// <returns></returns>
+    public static bool Launch(int port) {
+        return Singleton.LaunchServer(port);
+    }
+
+    /// <summary>
+    /// Attempts to send a message to all clients who are listening.
+    /// Returns false if server wasn't active, true otherwise.
+    /// </summary>
+    /// <param name="msgType"></param>
+    /// <param name="message"></param>
+    /// <returns></returns>
+    public static bool SendToAll(short msgType, MessageBase message) {
+        if (NetworkServer.active) {
+            NetworkServer.SendToAll(msgType, message);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Attempts to send a message to a specific client.
+    /// Returns false if server wasn't active, true otherwise.
+    /// </summary>
+    /// <param name="clientID"></param>
+    /// <param name="msgType"></param>
+    /// <param name="message"></param>
+    /// <returns></returns>
+    public static bool Send(int clientID, short msgType, MessageBase message) {
+        if (NetworkServer.active) {
+            NetworkServer.SendToClient(clientID, msgType, message);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Is the server currently active.
+    /// </summary>
+    /// <returns></returns>
+    public static bool isRunning() {
+        return NetworkServer.active;
+    }
 }