Add receiver thread

unity/Assets/Scripts/Client.cs

@@ -4,6 +4,7 @@ using System.Net.Sockets;
 using UnityEngine;
 using Utilities;
 using System.Net;
+using System;
 
 public static class Client
 {
@@ -30,7 +31,7 @@ public static class Client
 
 	public class ConnectionImpl // : MonoBehaviour
 	{
-		private TcpClient conn;
+		public TcpConnection conn;
 		
 		private string connId;
 		private uint? lobby = null;
@@ -39,19 +40,25 @@ public static class Client
 		private Modifiable<Lobby.LobbyStatus> lobby_status = null;
 		public ConnectionImpl(string user, string address)
 		{
-			// channel = new Channel(address, ChannelCredentials.Insecure);
+			Debug.Log("Connecting with the tcp channel");
-			// connection = new ConnectionService.Connection.ConnectionClient(channel);
+			conn = new TcpConnection(address);
-			// lobby_client = new Lobby.Lobby.LobbyClient(channel);
+			conn.SendMessage(new Protocol.ClientServerPacket() {Connect = new Common.Name{Name_ = user}});
-			// game_client = new Game.Game.GameClient(channel);
+			Protocol.ServerClientPacket p = null;
-			string[] ipAndPort = address.Split(':');
+			Debug.Log("Waiting for response");
-			conn = new TcpClient(ipAndPort[0], int.Parse(ipAndPort[1]));
+			while(p == null) {
-			// connId = connection.connect(new Common.Name { Name_ = user }).Id;
+				conn.q.TryDequeue(out p);
+			}
+			if (p.ReturnConnect == null) {
+				throw new Exception("Unexpected non ReturnConnect packet");
+			}
+			connId = p.ReturnConnect.Id;
 			this.address = address;
 		}
 
-		// public string Name() {
+		public void QueryName() {
-		// 	return connection.name(new Google.Protobuf.WellKnownTypes.Empty()).Name_;
+			conn.SendMessage(new Protocol.ClientServerPacket() {QueryName = new Google.Protobuf.WellKnownTypes.Empty()});
-		// }
+			// return connection.name(new Google.Protobuf.WellKnownTypes.Empty()).Name_;
+		}
 		public string GetServerAddress() {
 			return address;
 		}

unity/Assets/Scripts/DiscordController.cs

@@ -17,17 +17,8 @@ public class DiscordController : MonoBehaviour {
 	void Awake() {
 		DontDestroyOnLoad(this.gameObject);
 	}
-
-	public TcpConnection t;
-
 	// Use this for initialization
 	void Start() {
-		t = new TcpConnection("127.0.0.1:50052");
-		t.SendMessage(new Protocol.ClientServerPacket() {
-			Connect = new Common.Name() {
-				Name_ = "AAAAAAAAAAAAAAAAA"
-			}
-		});
 	
 		Debug.Log("Starting discord");
 		discord = new Discord.Discord(778707900293971979, (uint)Discord.CreateFlags.NoRequireDiscord);

unity/Assets/Scripts/MainMenuController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.SceneManagement;
+using System;
 
 public class MainMenuController : MonoBehaviour {
     [Header("Prefabs")]
@@ -96,28 +97,28 @@ public class MainMenuController : MonoBehaviour {
     }
 
     public void ConnectServer() {
-        // try {
+        try {
-        //     var conn = Client.GetConnection();
+            var conn = Client.GetConnection();
-        //     if (conn == null) {
+            if (conn == null) {
-        //         if (ip.text != "" && port.text != "")
+                if (ip.text != "" && port.text != "")
-        //             Client.Connect(username.text, ip.text.Trim() + ":" + port.text.Trim());
+                    Client.Connect(username.text, ip.text.Trim() + ":" + port.text.Trim());
-        //         else
+                else
-        //             Client.Connect(username.text);
+                    Client.Connect(username.text);
-        //         conn = Client.GetConnection();
+                conn = Client.GetConnection();
-        //         currentUsername = username.text;
+                currentUsername = username.text;
-        //     }
+            }
-
+
-        //     if (conn != null) {
+            if (conn != null) {
-        //         mainMenu.SetActive(false);
+                mainMenu.SetActive(false);
-        //         serverMenu.SetActive(true);
+                serverMenu.SetActive(true);
-        //         lobbyMenu.SetActive(false);
+                lobbyMenu.SetActive(false);
-        //         ReloadMenu();
+                ReloadMenu();
-        //     }
+            }
-        // } catch(RpcException e) {
+        } catch(Exception e) {
-        //     if(e.StatusCode == StatusCode.Unavailable) {
+            Debug.Log(e.ToString());
-        //         Popup.Open(PopupType.Alert, mainMenu.transform, "ConnectionUnavailableError", "Error", "Server unavailable.\nPlease retry later or contact the server admin.\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nPOOTIS");
+                Popup.Open(PopupType.Alert, mainMenu.transform, "ConnectionUnavailableError", "Error", "Server unavailable.\nPlease retry later or contact the server admin.\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nPOOTIS");
-        //     }
+            
-        // }
+        }
     }
 
     public void LeaveServer() {
@@ -235,6 +236,13 @@ public class MainMenuController : MonoBehaviour {
                 }
                 // conn.Close();
             }
+            // FIXME
+            Client.GetConnection().QueryName();
+            Protocol.ServerClientPacket p = null;
+            while (p == null) {
+                Client.GetConnection().conn.q.TryDequeue(out p);
+            }
+            serverName.text = p.ReturnName.Name_;
             // serverName.text = Client.GetConnection().Name();
             serverMenu.GetComponentInChildren<Scrollable>().Reload();
 

unity/Assets/Scripts/TcpConnection.cs

@@ -1,15 +1,49 @@
 using System.Net.Sockets;
+using System.Collections.Concurrent;
+using System.Threading;
 using System;
 using Google.Protobuf;
 using UnityEngine;
 
 public class TcpConnection {
 	private TcpClient c;
+	public ConcurrentQueue<Protocol.ServerClientPacket> q;
+	private Thread receiverThread;
+
+	private Protocol.ServerClientPacket Receive() {
+		byte[] b = new byte[4];
+		c.Client.Receive(b, 0, 4,
+								   SocketFlags.None);
+		if (!BitConverter.IsLittleEndian) {
+			// Invert byte order, in order to get little endian byte order
+			byte a = b[0];
+			b[0] = b[3];
+			b[3] = a;
+			a = b[1];
+			b[1] = b[2];
+			b[2] = a;
+		}
+		int size = BitConverter.ToInt32(b, 0);
+		byte[] data = new byte[size];
+		c.Client.Receive(data, 0, size, SocketFlags.None);
+		return Protocol.ServerClientPacket.Parser.ParseFrom(data);
+	}
+
+	private void ReceiverThread() {
+		Debug.Log("Started receiver thread");
+		while(true) {
+			Protocol.ServerClientPacket packet = Receive();
+			q.Enqueue(packet);
+		}
+	}
 
 	public TcpConnection(string address) {
 		string[] ipAndPort = address.Split(':');
 		c = new TcpClient(ipAndPort[0], int.Parse(ipAndPort[1]));
-		
+		q = new ConcurrentQueue<Protocol.ServerClientPacket>();
+		receiverThread = new Thread(new ThreadStart(ReceiverThread));
+		Debug.Log("Starting receiver thread");
+		receiverThread.Start();
 	}
 
 	public void SendMessage(Protocol.ClientServerPacket packet) {
@@ -28,16 +62,6 @@ public class TcpConnection {
 		c.Client.Send(sizeBytes);
 		byte[] data = packet.ToByteArray();
 		c.Client.Send(data);
-
-		
-		byte[] b = new byte[4];
-		int byteCount = c.Client.Receive(b, 0, 4,
-                                   SocketFlags.None);
-		size = BitConverter.ToInt32(b, 0);
-		data = new byte[size];
-		c.Client.Receive(data, 0, size, SocketFlags.None);
-		var p = Protocol.ServerClientPacket.Parser.ParseFrom(data);
-		Debug.Log(p.ToString());
 	}
 
 }