more action callbacks for various events, removing objects on leave room, made some stuff static in VelNetManager

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/NetworkGUI.cs

@@ -46,7 +46,7 @@ namespace VelNet
 		{
 			comms = FindObjectOfType<DissonanceComms>();
 			microphones.AddOptions(new List<string>(Microphone.devices));
-			velNetManager.MessageReceived += (m) =>
+			VelNetManager.MessageReceived += (m) =>
 			{
 				string s = m.type + ":" + m.sender + ":" + m.text;
 				messageBuffer.Add(s);

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/VelNetMan.cs

@@ -10,7 +10,7 @@ public class VelNetMan : MonoBehaviour
 	// Start is called before the first frame update
 	private void Start()
 	{
-		VelNetManager.instance.OnJoinedRoom += player =>
+		VelNetManager.OnJoinedRoom += player =>
 		{
 			VelNetManager.InstantiateNetworkObject(playerPrefab.name);
 		};

TestVelGameServer/Assets/Samples/VelNet/1.0.4/Example/test.unity

@@ -301,7 +301,7 @@ RectTransform:
   - {fileID: 1557879931}
   - {fileID: 927188573}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 7
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -596,14 +596,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 1278634767}
-  - {fileID: 711524767}
   - {fileID: 1894247853}
-  - {fileID: 626742070}
+  - {fileID: 117638565}
   - {fileID: 1760805525}
+  - {fileID: 1278634767}
+  - {fileID: 626742070}
+  - {fileID: 711524767}
   - {fileID: 945446556}
   - {fileID: 1843597586}
-  - {fileID: 117638565}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -870,7 +870,7 @@ RectTransform:
   - {fileID: 2034439}
   - {fileID: 1560686264}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1041,7 +1041,7 @@ RectTransform:
   - {fileID: 162005664}
   - {fileID: 1484033256}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 1
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1609,7 +1609,7 @@ RectTransform:
   - {fileID: 1954037272}
   - {fileID: 1235343401}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1839,12 +1839,12 @@ MonoBehaviour:
   udpConnected: 0
   userid: -1
   room: 
+  connected: 0
   prefabs:
   - {fileID: 3951900052977689805, guid: 6e4a023f70e01405e8b249a4488fe319, type: 3}
   - {fileID: 9102273340480352682, guid: d4158ab9c4a204cdbba28d3273fc1fb3, type: 3}
   sceneObjects: []
   deletedSceneObjects: []
-  connected: 0
 --- !u!1 &1154194181
 GameObject:
   m_ObjectHideFlags: 0
@@ -2082,7 +2082,7 @@ RectTransform:
   m_Children:
   - {fileID: 1295274441}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 0
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2350,7 +2350,7 @@ MonoBehaviour:
   _metadataExpanded: 1
   _activationModeExpanded: 1
   _tokensExpanded: 1
-  _ampExpanded: 0
+  _ampExpanded: 1
   _activationFaderSettings:
     _volume: 1
     _fadeInTicks: 0
@@ -2685,7 +2685,7 @@ RectTransform:
   m_Children:
   - {fileID: 2118429759}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2818,7 +2818,7 @@ RectTransform:
   m_Children:
   - {fileID: 1852007163}
   m_Father: {fileID: 244561620}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3028,7 +3028,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 244561620}
-  m_RootOrder: 2
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}

TestVelGameServer/Packages/VelNetUnity/Runtime/VelNetManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
@@ -37,9 +38,34 @@ namespace VelNet
 
 		public readonly Dictionary<int, VelNetPlayer> players = new Dictionary<int, VelNetPlayer>();
 
-		public Action<VelNetPlayer> OnJoinedRoom;
+		/// <summary>
-		public Action<VelNetPlayer> OnPlayerJoined;
+		/// We just joined a room
-		public Action<VelNetPlayer> OnPlayerLeft;
+		/// string - the room name
+		/// </summary>
+		public static Action<string> OnJoinedRoom;
+
+		/// <summary>
+		/// We just left a room
+		/// string - the room name we left
+		/// </summary>
+		public static Action<string> OnLeftRoom;
+
+		/// <summary>
+		/// Somebody else just joined our room
+		/// </summary>
+		public static Action<VelNetPlayer> OnPlayerJoined;
+
+		/// <summary>
+		/// Somebody else just left our room
+		/// </summary>
+		public static Action<VelNetPlayer> OnPlayerLeft;
+
+		public static Action OnConnectedToServer;
+		public static Action<Message> MessageReceived;
+		public static Action LoggedIn;
+		public static Action<string[], int> RoomsReceived;
+
+		public bool connected;
 
 		public List<NetworkObject> prefabs = new List<NetworkObject>();
 		public NetworkObject[] sceneObjects;
@@ -47,6 +73,7 @@ namespace VelNet
 		public readonly Dictionary<string, NetworkObject> objects = new Dictionary<string, NetworkObject>(); //maintains a list of all known objects on the server (ones that have ids)
 		private VelNetPlayer masterPlayer;
 		public static VelNetPlayer LocalPlayer => instance.players.Where(p => p.Value.isLocal).Select(p => p.Value).FirstOrDefault();
+		public static bool InRoom => LocalPlayer != null && LocalPlayer.room != "-1" && LocalPlayer.room != "";
 
 
 		// Use this for initialization
@@ -69,10 +96,21 @@ namespace VelNet
 			instance = this;
 		}
 
-		private void Start()
+		private IEnumerator Start()
 		{
 			ConnectToTcpServer();
 			sceneObjects = FindObjectsOfType<NetworkObject>(); //add all local network objects
+			yield return null;
+
+			try
+			{
+				OnConnectedToServer?.Invoke();
+			}
+			// prevent errors in subscribers from breaking our code
+			catch (Exception e)
+			{
+				Debug.LogError(e);
+			}
 		}
 
 
@@ -92,25 +130,35 @@ namespace VelNet
 				//the main thread, which can do Unity stuff
 				foreach (Message m in receivedMessages)
 				{
-					if (m.type == 0) //when you join the server
+					switch (m.type)
 					{
-						userid = m.sender;
+						// when you join the server
-						Debug.Log("joined server");
+						case 0:
+							userid = m.sender;
+							Debug.Log("joined server");
 
-						//start the udp thread 
+							try
-						clientReceiveThreadUDP = new Thread(ListenForDataUDP);
+							{
-						clientReceiveThreadUDP.IsBackground = true;
+								LoggedIn?.Invoke();
-						clientReceiveThreadUDP.Start();
+							}
-					}
+							// prevent errors in subscribers from breaking our code
+							catch (Exception e)
+							{
+								Debug.LogError(e);
+							}
 
-					if (m.type == 2)
+							//start the udp thread 
-					{
+							clientReceiveThreadUDP = new Thread(ListenForDataUDP);
+							clientReceiveThreadUDP.IsBackground = true;
+							clientReceiveThreadUDP.Start();
+							break;
 						// if this message is for me, that means I joined a new room...
-						if (userid == m.sender)
+						case 2 when userid == m.sender:
 						{
-							// TODO delete all old objects when joining a new room
+							string oldRoom = LocalPlayer?.room;
 
-							players.Clear(); //we clear the list, but will recreate as we get messages from people in our room
+							// we clear the list, but will recreate as we get messages from people in our room
+							players.Clear();
 
 							if (m.text != "")
 							{
@@ -122,10 +170,44 @@ namespace VelNet
 								};
 
 								players.Add(userid, player);
-								OnJoinedRoom?.Invoke(player);
+								if (m.text != "")
+								{
+									try
+									{
+										OnJoinedRoom?.Invoke(m.text);
+									}
+									// prevent errors in subscribers from breaking our code
+									catch (Exception e)
+									{
+										Debug.LogError(e);
+									}
+								}
 							}
+							// we just left a room
+							else
+							{
+								// delete all networkobjects that aren't sceneobjects or are null now
+								objects
+									.Where(kvp => kvp.Value == null || !kvp.Value.isSceneObject)
+									.Select(o => o.Key)
+									.ToList().ForEach(DeleteNetworkObject);
+
+								Debug.Log("Left VelNet Room: " + oldRoom);
+								try
+								{
+									OnLeftRoom?.Invoke(oldRoom);
+								}
+								// prevent errors in subscribers from breaking our code
+								catch (Exception e)
+								{
+									Debug.LogError(e);
+								}
+							}
+
+							break;
 						}
-						else // not for me, a player is joining or leaving
+						// not for me, a player is joining or leaving
+						case 2:
 						{
 							VelNetPlayer me = players[userid];
 
@@ -171,51 +253,62 @@ namespace VelNet
 									userid = m.sender
 								};
 								players.Add(m.sender, player);
-								OnPlayerJoined?.Invoke(player);
+								try
+								{
+									OnPlayerJoined?.Invoke(player);
+								}
+								// prevent errors in subscribers from breaking our code
+								catch (Exception e)
+								{
+									Debug.LogError(e);
+								}
 							}
+
+							break;
 						}
-					}
+						// generic message
-
+						case 3:
-					if (m.type == 3) // generic message
+							players[m.sender]?.HandleMessage(m);
-					{
+							break;
-						players[m.sender]?.HandleMessage(m);
+						// change master player (this should only happen when the first player joins or if the master player leaves)
-					}
+						case 4:
-
-					if (m.type == 4) // change master player (this should only happen when the first player joins or if the master player leaves)
-					{
-						if (masterPlayer == null)
 						{
-							masterPlayer = players[m.sender];
+							if (masterPlayer == null)
-
-							// no master player yet, add the scene objects
-
-							for (int i = 0; i < sceneObjects.Length; i++)
 							{
-								sceneObjects[i].networkId = -1 + "-" + i;
+								masterPlayer = players[m.sender];
-								sceneObjects[i].owner = masterPlayer;
+
-								sceneObjects[i].isSceneObject = true; // needed for special handling when deleted
+								// no master player yet, add the scene objects
-								objects.Add(sceneObjects[i].networkId, sceneObjects[i]);
+
+								for (int i = 0; i < sceneObjects.Length; i++)
+								{
+									sceneObjects[i].networkId = -1 + "-" + i;
+									sceneObjects[i].owner = masterPlayer;
+									sceneObjects[i].isSceneObject = true; // needed for special handling when deleted
+									objects.Add(sceneObjects[i].networkId, sceneObjects[i]);
+								}
 							}
-						}
+							else
-						else
-						{
-							masterPlayer = players[m.sender];
-						}
-
-						masterPlayer.SetAsMasterPlayer();
-
-						// master player should take over any objects that do not have an owner
-
-						foreach (KeyValuePair<string, NetworkObject> kvp in objects)
-						{
-							if (kvp.Value.owner == null)
 							{
-								kvp.Value.owner = masterPlayer;
+								masterPlayer = players[m.sender];
 							}
+
+							masterPlayer.SetAsMasterPlayer();
+
+							// master player should take over any objects that do not have an owner
+
+							foreach (KeyValuePair<string, NetworkObject> kvp in objects)
+							{
+								if (kvp.Value.owner == null)
+								{
+									kvp.Value.owner = masterPlayer;
+								}
+							}
+
+							break;
 						}
 					}
 
-					MessageReceived(m);
+					MessageReceived?.Invoke(m);
 				}
 
 				receivedMessages.Clear();
@@ -227,13 +320,6 @@ namespace VelNet
 			socketConnection.Close();
 		}
 
-		public Action<string, int> JoinedRoom = delegate { };
-		public Action<Message> MessageReceived = delegate { };
-		public Action<string, int> LoggedIn = delegate { };
-		public Action<string[], int> RoomsReceived = delegate { };
-
-		public bool connected;
-
 		/// <summary> 	
 		/// Setup socket connection. 	
 		/// </summary> 	
@@ -251,70 +337,70 @@ namespace VelNet
 			}
 		}
 
-		private void HandleMessage(string s) //this parses messages from the server, and adds them to a queue to be processed on the main thread
+		private void HandleMessage(string s) // this parses messages from the server, and adds them to a queue to be processed on the main thread
 		{
+			// Debug.Log("Received: " + s);
 			Message m = new Message();
 			string[] sections = s.Split(':');
-			if (sections.Length > 0)
+			if (sections.Length <= 0) return;
+
+			int type = int.Parse(sections[0]);
+
+			switch (type)
 			{
-				int type = int.Parse(sections[0]);
+				case 0: // logged in message
-
-				switch (type)
 				{
-					case 0: //logged in message
+					if (sections.Length > 1)
 					{
-						if (sections.Length > 1)
+						m.type = type;
-						{
+						m.sender = int.Parse(sections[1]);
-							m.type = type;
+						m.text = "";
-							m.sender = int.Parse(sections[1]);
+						AddMessage(m);
-							m.text = "";
-							AddMessage(m);
-						}
-
-						break;
 					}
-					case 1: //room info message
+
+					break;
+				}
+				case 1: // room info message
+				{
+					break;
+				}
+				case 2: // joined room message
+				{
+					if (sections.Length > 2)
 					{
-						break;
+						m.type = 2;
+						int user_id = int.Parse(sections[1]);
+						m.sender = user_id;
+						string new_room = sections[2];
+						m.text = new_room;
+
+						AddMessage(m);
 					}
-					case 2: //joined room message
+
+					break;
+				}
+				case 3: // text message
+				{
+					if (sections.Length > 2)
 					{
-						if (sections.Length > 2)
+						m.type = 3;
-						{
+						m.sender = int.Parse(sections[1]);
-							m.type = 2;
+						m.text = sections[2];
-							int user_id = int.Parse(sections[1]);
+						AddMessage(m);
-							m.sender = user_id;
-							string new_room = sections[2];
-							m.text = new_room;
-
-							AddMessage(m);
-						}
-
-						break;
 					}
-					case 3: //text message
+
+					break;
+				}
+				case 4: // change master client
+				{
+					if (sections.Length > 1)
 					{
-						if (sections.Length > 2)
+						m.type = 4;
-						{
+						m.sender = int.Parse(sections[1]);
-							m.type = 3;
+						AddMessage(m);
-							m.sender = int.Parse(sections[1]);
-							m.text = sections[2];
-							AddMessage(m);
-						}
-
-						break;
 					}
-					case 4: //change master client
-					{
-						if (sections.Length > 1)
-						{
-							m.type = 4;
-							m.sender = int.Parse(sections[1]);
-							AddMessage(m);
-						}
 
-						break;
+					break;
-					}
 				}
 			}
 		}
@@ -452,6 +538,7 @@ namespace VelNet
 		/// </summary> 	
 		private static void SendNetworkMessage(string clientMessage)
 		{
+			// Debug.Log("Sent: " + clientMessage);
 			if (instance.socketConnection == null)
 			{
 				return;
@@ -476,19 +563,29 @@ namespace VelNet
 			}
 		}
 
+		/// <summary>
+		/// Connects to the server with a username
+		/// </summary>
 		public static void Login(string username, string password)
 		{
 			SendNetworkMessage("0:" + username + ":" + password);
 		}
 
+		/// <summary>
+		/// Joins a room by name
+		/// </summary>
+		/// <param name="roomname">The name of the room to join</param>
 		public static void Join(string roomname)
 		{
 			SendNetworkMessage("2:" + roomname);
 		}
 
+		/// <summary>
+		/// Leaves a room if we're in one
+		/// </summary>
 		public static void Leave()
 		{
-			SendNetworkMessage("2:-1");
+			if (InRoom) SendNetworkMessage("2:-1");
 		}
 
 		public static void SendTo(MessageType type, string message, bool reliable = true)
@@ -557,17 +654,16 @@ namespace VelNet
 
 		public void DeleteNetworkObject(string networkId)
 		{
-			if (objects.ContainsKey(networkId))
+			if (!objects.ContainsKey(networkId)) return;
+			NetworkObject obj = objects[networkId];
+			if (obj == null) return;
+			if (obj.isSceneObject)
 			{
-				NetworkObject obj = objects[networkId];
+				deletedSceneObjects.Add(networkId);
-				if (obj.isSceneObject)
-				{
-					deletedSceneObjects.Add(networkId);
-				}
-
-				Destroy(obj.gameObject);
-				objects.Remove(networkId);
 			}
+
+			Destroy(obj.gameObject);
+			objects.Remove(networkId);
 		}
 	}
 }

TestVelGameServer/Packages/VelNetUnity/Runtime/VelNetPlayer.cs

@@ -29,7 +29,7 @@ namespace VelNet
 		public VelNetPlayer()
 		{
 			manager = VelNetManager.instance;
-			manager.OnPlayerJoined += HandlePlayerJoined;
+			VelNetManager.OnPlayerJoined += HandlePlayerJoined;
 		}
 
 		public void HandlePlayerJoined(VelNetPlayer player)