Revert "Moving client methods to another class"

This reverts commit 2d71422.

Author: ivynya

Cynobroad/Client.Designer.cs

@@ -19,6 +19,14 @@ public partial class Client : Form
         private int port = 42069;
         private string serverIP = "";
 
+        //Connection handlers
+        private Thread receivingThread;
+        private Thread sendingThread;
+        private TcpClient _client;
+        private StreamReader _sReader;
+        private StreamWriter _sWriter;
+        private bool isConnected = false;
+        
         private List<string> connectedUsers = new List<string>();
 
         //Messages to send
@@ -66,15 +74,27 @@ private void Client_Load(object sender, EventArgs e)
                 User_UsernameLabel.Text = username;
                 User_ConnectedServer.Text = serverIP;
 
-                InitializeConnection();
+                try
+                {
+                    _client = new TcpClient();
+                    isConnected = true;
+                    InitializeConnection();
 
-                Show();
-                SendMsgBox.Focus();
+                    //show main form and close login dialog
+                    Show();
+                    SendMsgBox.Focus();
+                }
+                catch
+                {
+                    isConnected = false;
+                }
             }
 
             //if connection failed set status to red, else green
-            User_ConnectionStatus.BackColor = Color.FromArgb(224, 102, 102);
-            User_ConnectionStatus.BackColor = Color.FromArgb(147, 196, 125);
+            if (!isConnected)
+                User_ConnectionStatus.BackColor = Color.FromArgb(224, 102, 102);
+            else
+                User_ConnectionStatus.BackColor = Color.FromArgb(147, 196, 125);
         }
 
         private void SelfHoster_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
@@ -84,7 +104,6 @@ private void SelfHoster_DoWork(object sender, System.ComponentModel.DoWorkEventA
 
         private void CreateAndSendPacket(string type, string message = null)
         {
-            //TODO: make this specify server and channel names
             PacketStruct packetStruct = new PacketStruct
             {
                 Type = type,
@@ -97,7 +116,22 @@ private void CreateAndSendPacket(string type, string message = null)
 
         private void InitializeConnection()
         {
-            //TODO: create instance of client and add it to an accessible dictionary or something
+            //connect to server ip on port 42069
+            _client.Connect(serverIP, port);
+            _sWriter = new StreamWriter(_client.GetStream(), Encoding.ASCII);
+            _sReader = new StreamReader(_client.GetStream(), Encoding.ASCII);
+            
+            //start a background task handling incoming messages
+            ThreadStart startReceiver = new ThreadStart(HandleReceiver);
+            receivingThread = new Thread(startReceiver)
+            { IsBackground = true };
+            receivingThread.Start();
+
+            //start a background task handling outgoing messages
+            ThreadStart startSender = new ThreadStart(HandleSender);
+            sendingThread = new Thread(startSender)
+            { IsBackground = true };
+            sendingThread.Start();
         }
 
         private void HandleReceiver()
@@ -106,12 +140,23 @@ private void HandleReceiver()
             AddRichMsg addRichMsg = RichMessageReceived;
             AddUserBlock addUser = AddConnectedUser;
             DelUserBlock delUser = RemoveConnectedUser;
-            
+
+            //send to server join message
+            PacketStruct packetStruct = new PacketStruct
+            {
+                Type = "join",
+                User = username
+            };
+            _sWriter.WriteLine(JsonConvert.SerializeObject(packetStruct));
+            _sWriter.Flush();
+
+            //while connected, recieve messages and process them
             PacketStruct packet = new PacketStruct();
-            while (true)
+            while (isConnected)
             {
-                //Get packet from client instance and process
-                packet = new PacketStruct();
+                //Deserialize packet from StreamReader
+                try   { packet = JsonConvert.DeserializeObject<PacketStruct>(_sReader.ReadLine()); }
+                catch { packet = new PacketStruct(); }
 
                 switch (packet.Type)
                 {
@@ -159,7 +204,20 @@ private void HandleReceiver()
 
         private void HandleSender()
         {
-            //TODO: Route packet to correct client instance
+            //while connected, if there are messages to send, send them
+            while (isConnected)
+            {
+                if (!MessageQueue.IsEmpty)
+                {
+                    foreach (string msg in MessageQueue)
+                    {
+                        MessageQueue.TryDequeue(out string str);
+                        _sWriter.WriteLine(msg);
+                        _sWriter.Flush();
+                    }
+                }
+                Thread.Sleep(10);
+            }
         }
 
         private void RichMessageReceived(Tuple<string,string> nameAndMessage)
@@ -298,13 +356,55 @@ private void Window_Close_Click(object sender, EventArgs e)
 
         private void Client_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //TODO: close all client connections
-            SelfHoster.Dispose();
+            if (isConnected)
+                CreateAndSendPacket("close");
         }
 
         private void Button_SignOut_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            //send closing request to single client
+            //send closing request and reset variables
+            CreateAndSendPacket("close");
+            Thread.Sleep(10);
+            isConnected = false;
+            _client.Close();
+            SelfHoster.Dispose();
+            
+            //rerun launch method to sign in again
+            Client_Load(sender, e);
+        }
+
+        private void Button_Reconnect_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            //try reconnection and set connection bool
+            try
+            {
+                InitializeConnection();
+                isConnected = true;
+            }
+            catch (SocketException) { }
+            catch { isConnected = false; }
+
+            if (_client.Connected)
+                isConnected = true;
+            else
+                isConnected = false;
+
+            //useless visual effect
+            for (int i = 0; i < 3; i++)
+            {
+                User_ConnectionStatus.BackColor = Color.FromArgb(255, 217, 102);
+                Update();
+                Thread.Sleep(500);
+                User_ConnectionStatus.BackColor = Color.FromArgb(183, 183, 183);
+                Update();
+                Thread.Sleep(500);
+            }
+
+            //update connection status indicator
+            if (!isConnected)
+                User_ConnectionStatus.BackColor = Color.FromArgb(224, 102, 102);
+            else
+                User_ConnectionStatus.BackColor = Color.FromArgb(147, 196, 125);
         }
 
         private void SendMsgBox_KeyDown(object sender, KeyEventArgs e)

Cynobroad/Client.cs

@@ -101,7 +101,6 @@
     <Compile Include="PacketStruct.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TCPClient.cs" />
     <Compile Include="TCPServer.cs" />
     <EmbeddedResource Include="Client.resx">
       <DependentUpon>Client.cs</DependentUpon>