Merge branch 'master' into feature/sendingCanvasData

Client/Client.cs

@@ -2,52 +2,28 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Net.Sockets;
 using System.Text;
-using System.Windows.Media;
-using System.Windows;
-
 using static SharedClientServer.JSONConvert;
 
 namespace Client
 {
-    public delegate void LobbyJoinCallback(bool isHost);
-
-    public delegate void RandomWord(string word);
-    public delegate void HandleIncomingMsg(string username, string msg);
-    internal delegate void HandleIncomingPlayer(Lobby lobby);
-    public delegate void CanvasDataReceived(double[][] coordinates, Color color);
-    public delegate void CanvasReset();
-    public delegate void LobbyCallback(int id);
-
+    public delegate void OnLobbyCreated(int id);
     class Client : ObservableObject
     {
-
-        private ClientData clientData = ClientData.Instance;
-
         private TcpClient tcpClient;
         private NetworkStream stream;
-        private byte[] buffer = new byte[2048];
-        private byte[] totalBuffer = new byte[2048];
+        private byte[] buffer = new byte[1024];
+        private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
         public int Port = 5555;
         public bool Connected = false;
         private string username;
         public Callback OnSuccessfullConnect;
         public Callback OnLobbiesListReceived;
-        public LobbyJoinCallback OnLobbyJoinSuccess;
+        public Callback OnLobbyJoinSuccess;
         public Callback OnLobbiesReceivedAndWaitingForHost;
-        public Callback OnServerDisconnect;
-        public Callback OnLobbyUpdate;
-        public LobbyCallback OnLobbyCreated;
-        public LobbyCallback OnLobbyLeave;
-        public RandomWord RandomWord;
-        public HandleIncomingMsg IncomingMsg;
-        public HandleIncomingPlayer IncomingPlayer;
-        private ClientData data = ClientData.Instance;
-        public CanvasDataReceived CanvasDataReceived;
-        public CanvasReset CReset;
+        public OnLobbyCreated OnLobbyCreated;
         public Lobby[] Lobbies { get; set; }
 
         public Client(string username)
@@ -61,62 +37,41 @@ namespace Client
         private void OnConnect(IAsyncResult ar)
         {
             Debug.Write("finished connecting to server");
-            try
-            {
-                this.tcpClient.EndConnect(ar);
-                this.stream = tcpClient.GetStream();
-                OnSuccessfullConnect?.Invoke();
-                OnLobbyUpdate = updateGameLobby;
-                SendMessage(JSONConvert.ConstructUsernameMessage(username));
-                this.stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete),null);
-
-            } catch (Exception e)
-            {
-                Debug.WriteLine("Can't connect, retrying...");
-                tcpClient.BeginConnect("localhost", Port, new AsyncCallback(OnConnect), null);
-            }
+            this.tcpClient.EndConnect(ar);
+            this.stream = tcpClient.GetStream();
+            OnSuccessfullConnect?.Invoke();
+            SendMessage(JSONConvert.ConstructUsernameMessage(username));
+            this.stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete),null);
         }
 
         private void OnReadComplete(IAsyncResult ar)
         {
+            int amountReceived = stream.EndRead(ar);
 
-            if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.tcpClient.Client.Connected)
-                return;
-
-            try
+            if (totalBufferReceived + amountReceived > 1024)
             {
-                int amountReceived = stream.EndRead(ar);
-
-                if (totalBufferReceived + amountReceived > 2048)
-                {
-                    throw new OutOfMemoryException("buffer too small");
-                }
-
-
-                Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, amountReceived);
-                totalBufferReceived += amountReceived;
-
-                int expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
-
-                while (totalBufferReceived >= expectedMessageLength)
-                {
-                    // we have received the complete packet
-                    byte[] message = new byte[expectedMessageLength];
-                    // put the message received into the message array
-                    Array.Copy(totalBuffer, 0, message, 0, expectedMessageLength);
-                    handleData(message);
-
-                    totalBufferReceived -= expectedMessageLength;
-                    expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
-                }
-
-                ar.AsyncWaitHandle.WaitOne();
-                stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
-            } catch (IOException e)
-            {
-                Debug.WriteLine("[CLIENT] server not responding! got error: " + e.Message);
-                OnServerDisconnect?.Invoke();   
+                throw new OutOfMemoryException("buffer too small");
             }
+
+            Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, amountReceived);
+            totalBufferReceived += amountReceived;
+
+            int expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
+
+            while (totalBufferReceived >= expectedMessageLength)
+            {
+                // we have received the complete packet
+                byte[] message = new byte[expectedMessageLength];
+                // put the message received into the message array
+                Array.Copy(totalBuffer, 0, message, 0, expectedMessageLength);
+
+                handleData(message);
+
+                totalBufferReceived -= expectedMessageLength;
+                expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
+            }
+
+            stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
         }
 
         private void handleData(byte[] message)
@@ -126,7 +81,6 @@ namespace Client
             byte[] payload = new byte[message.Length - 5];
             Array.Copy(message, 5, payload, 0, message.Length - 5);
 
-            Debug.WriteLine("[CLIENT] GOT STRING" + Encoding.ASCII.GetString(payload));
             switch (id)
             {
                 case JSONConvert.LOGIN:
@@ -138,11 +92,6 @@ namespace Client
                     string textUsername = combo.Item1;
                     string textMsg = combo.Item2;
 
-                    if(textUsername != data.User.Username)
-                    {
-                        IncomingMsg?.Invoke(textUsername, textMsg);
-                    }
-
                     //TODO display username and message in chat window
                     Debug.WriteLine("[CLIENT] INCOMING MESSAGE!");
                     Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
@@ -158,7 +107,6 @@ namespace Client
                             Lobbies = JSONConvert.GetLobbiesFromMessage(payload);
                             OnLobbiesListReceived?.Invoke();
                             OnLobbiesReceivedAndWaitingForHost?.Invoke();
-                            OnLobbyUpdate?.Invoke();
                             break;
                         case LobbyIdentifier.HOST:
                             // we receive this when the server has made us a host of a new lobby
@@ -168,11 +116,7 @@ namespace Client
                             OnLobbyCreated?.Invoke(lobbyCreatedID);
                             break;
                         case LobbyIdentifier.JOIN_SUCCESS:
-                            OnLobbyJoinSuccess?.Invoke(JSONConvert.GetLobbyJoinIsHost(payload));
-                            break;
-                        case LobbyIdentifier.LEAVE:
-                            int lobbyLeaveID = JSONConvert.GetLobbyID(payload);
-                            OnLobbyLeave?.Invoke(lobbyLeaveID);
+                            OnLobbyJoinSuccess?.Invoke();
                             break;
                     }
                     //TODO fill lobby with the data received
@@ -180,50 +124,15 @@ namespace Client
 
                 case JSONConvert.CANVAS:
                     // canvas data
-                    //clientData.CanvasData = JSONConvert.getCoordinates(payload);         
-                    int type = JSONConvert.GetCanvasMessageType(payload);
-                    switch (type)
-                    {
-                        case JSONConvert.CANVAS_RESET:
-                            CReset?.Invoke();
-                            break;
-
-                        case JSONConvert.CANVAS_WRITING:
-                            CanvasDataReceived?.Invoke(JSONConvert.getCoordinates(payload), JSONConvert.getCanvasDrawingColor(payload));
-                            // we hebben gedrawed, dus stuur dat we weer kunnen drawen
-                            
-                            break;
-                    }
-                break;
-
-
-                case JSONConvert.RANDOMWORD:
-                    //Flag byte for receiving the random word.
-                    int lobbyId = JSONConvert.GetLobbyID(payload);
-                    string randomWord = JSONConvert.GetRandomWord(payload);
-
-                    if (data.Lobby?.ID == lobbyId)
-                        RandomWord?.Invoke(randomWord);
-                    
                     break;
+
                 default:
                     Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
                     break;
             }
-            SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE_RECEIVED,null));
 
         }
 
-        private void updateGameLobby()
-        {
-            foreach (var item in Lobbies)
-            {
-                Debug.WriteLine("[CLIENT] lobby data: {0}", item.Users.Count);
-                if (item.ID == data.Lobby?.ID)
-                    IncomingPlayer?.Invoke(item);
-            }
-        }
-        
         public void SendMessage(byte[] message)
         {
             Debug.WriteLine("[CLIENT] sending message " + Encoding.ASCII.GetString(message));
@@ -234,7 +143,6 @@ namespace Client
         {
             Debug.WriteLine("[CLIENT] finished writing");
             stream.EndWrite(ar);
-            stream.Flush();
         }
     }
 }

Client/ClientData.cs

@@ -31,7 +31,6 @@ namespace Client
         private Client _client;
         private Lobby _lobby;
         private string _message;
-        private double[] _canvasData = new double[4];
 
         private ClientData()
         {
@@ -69,11 +68,5 @@ namespace Client
             }
         }
 
-        public double[] CanvasData
-        {
-            get { return _canvasData; }
-            set { _canvasData = value; }
-        }
-
     }
 }

Client/ViewModels/ViewModel.cs

@@ -11,9 +11,6 @@ using System.Collections.ObjectModel;
 using Client.Views;
 using System.Linq;
 using System.Windows.Data;
-using System.Data;
-using System.Windows.Controls.Primitives;
-using System.Windows.Controls;
 
 namespace Client
 {
@@ -37,11 +34,6 @@ namespace Client
             _lobbies = new ObservableCollection<Lobby>();
             client = ClientData.Instance.Client;
             client.OnLobbiesListReceived = updateLobbies;
-            client.OnLobbyLeave = leaveLobby;
-            client.OnServerDisconnect = () =>
-            {
-                Environment.Exit(0);
-            };
             
 
             OnHostButtonClick = new RelayCommand(hostGame);
@@ -49,13 +41,6 @@ namespace Client
             JoinSelectedLobby = new RelayCommand(joinLobby, true);
         }
 
-        private void leaveLobby(int id)
-        {
-            _model.CanStartGame = true;
-            ClientData.Instance.Lobby = null;
-            SelectedLobby = null;
-        }
-
         private void hostGame()
         {
             Debug.WriteLine("attempting to host game for " + ClientData.Instance.User.Username);
@@ -65,10 +50,12 @@ namespace Client
 
         private void becomeHostForLobby(int id)
         {
+            
             Debug.WriteLine($"got host succes with data {id} ");
             wantToBeHost = true;
             wantToBeHostId = id;
             client.OnLobbiesReceivedAndWaitingForHost = hostLobbiesReceived;
+
         }
 
         private void hostLobbiesReceived()
@@ -90,21 +77,14 @@ namespace Client
 
         private void joinLobby()
         {
-            if (SelectedLobby != null)
-            {
-                if (SelectedLobby.PlayersIn == SelectedLobby.MaxPlayers || !SelectedLobby.LobbyJoinable)
-                {
-                    return;
-                }
-                client.OnLobbyJoinSuccess = OnLobbyJoinSuccess;
-                client.SendMessage(JSONConvert.ConstructLobbyJoinMessage(SelectedLobby.ID));
-            }
-            
+            // lobby die je wilt joinen verwijderen
+            // nieuwe binnengekregen lobby toevoegen
+            client.OnLobbyJoinSuccess = OnLobbyJoinSuccess;
+            client.SendMessage(JSONConvert.ConstructLobbyJoinMessage(SelectedLobby.ID));
         }
 
-        private void OnLobbyJoinSuccess(bool isHost)
+        private void OnLobbyJoinSuccess()
         {
-            ClientData.Instance.User.Host = isHost;
             startGameInLobby();
         }
 
@@ -116,6 +96,19 @@ namespace Client
             Lobby[] lobbiesArr = client.Lobbies;
             Application.Current.Dispatcher.Invoke(delegate
             {
+                
+                //for (int i = 0; i < lobbiesArr.Length; i++)
+                //{
+                //    Lobby lobby = lobbiesArr[i];
+                //    Debug.WriteLine(lobby.PlayersIn);
+                //    if (i < _lobbies.Count && _lobbies[i].ID == lobby.ID)
+                //    {
+                //        _lobbies[i].Set(lobby);
+                //    } else
+                //    {
+                //        _lobbies.Add(lobbiesArr[i]);
+                //    }
+                //}
 
                 _lobbies.Clear();
 
@@ -175,7 +168,5 @@ namespace Client
             get { return _lobbies; }
             set { _lobbies = value; }
         }
-
-   
     }
 }

Client/ViewModels/ViewModelGame.cs

@@ -1,263 +1,126 @@
-using Client.Views;
-using GalaSoft.MvvmLight.Command;
-using SharedClientServer;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Timers;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-
-namespace Client.ViewModels
-{
-    class ViewModelGame : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-        private ClientData data = ClientData.Instance;
-        private GameWindow window;
-        private Point currentPoint = new Point();
-        public Color color;
-        public double[][] buffer;
-        public int pos = 0;
-        public int maxLines = 50;
-        public Queue<double[][]> linesQueue;
-        private Timer queueTimer;
-
-        public static ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
-        public ObservableCollection<string> Players { get; } = new ObservableCollection<string>();
-
-        private dynamic _payload;
-
-        public string _username;
-
-        public string _message;
-        public string Message
-        {
-            get
-            {
-                return _message;
-            }
-            set
-            {
-                _message = value;
-            }
-        }
-
-        private string _randomWord;
-
-        public string RandomWord
-        {
-            get { return _randomWord; }
-            set { _randomWord = value; }
-        }
-
-        public static string Word
-        {
-            get;
-            set;
-        }
-
-        public bool IsHost
-        {
-            get { return data.User.Host; }
-        }
-
-        public ViewModelGame(GameWindow window)
-        {
-            this.window = window;
-            if (_payload == null)
-            {
-                _message = "";
-
-            }
-            else
-            {
-                //_message = data.Message;
-                //_username = data.User.Username;
-                //Messages.Add($"{data.User.Username}: {Message}");
-            }
-
-            buffer = new double[maxLines][];
-            linesQueue = new Queue<double[][]>();
-            OnKeyDown = new RelayCommand(ChatBox_KeyDown);
-            ButtonStartGame = new RelayCommand(BeginGame);
-            ButtonResetCanvas = new RelayCommand(CanvasResetLocal);
-            data.Client.CanvasDataReceived = UpdateCanvasWithNewData;
-            data.Client.CReset = CanvasResetData;
-            data.Client.RandomWord = HandleRandomWord;
-            data.Client.IncomingMsg = HandleIncomingMsg;
-            data.Client.IncomingPlayer = HandleIncomingPlayer;
-        }
-
-        public ICommand OnKeyDown { get; set; }
-        public ICommand ButtonStartGame { get; set; }
-        public ICommand ButtonResetCanvas { get; set; }
-       
-        public void BeginGame()
-        {
-            
-            queueTimer = new Timer(50);
-            queueTimer.Start();
-            queueTimer.Elapsed += sendArrayFromQueue;
-            data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID));
-        }
-
-
-        private void CanvasResetLocal()
-        {
-            this.window.CanvasForPaint.Children.Clear();
-            data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.CANVAS, JSONConvert.CANVAS_RESET));
-        }
-
-
-        public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
-        {
-            if (e.ButtonState == MouseButtonState.Pressed)
-            {
-                currentPoint = e.GetPosition(window.CanvasForPaint);
-            }
-        }
-
-        public void Canvas_MouseMove(MouseEventArgs e, GameWindow window)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                double[] coordinates = new double[4];
-                Line line = new Line();
-
-                line.Stroke = new SolidColorBrush(color);
-                //line.Stroke = SystemColors.WindowFrameBrush;
-                line.X1 = currentPoint.X;
-                line.Y1 = currentPoint.Y;
-                line.X2 = e.GetPosition(window.CanvasForPaint).X;
-                line.Y2 = e.GetPosition(window.CanvasForPaint).Y;
-                coordinates[0] = line.X1;
-                coordinates[1] = line.Y1;
-                coordinates[2] = line.X2;
-                coordinates[3] = line.Y2;
-                currentPoint = e.GetPosition(window.CanvasForPaint);
-                buffer[pos] = coordinates;
-                pos++;
-
-                window.CanvasForPaint.Children.Add(line);
-                if (pos == maxLines)
-                {
-                    double[][] temp = new double[maxLines][];
-                    for (int i = 0; i < maxLines; i++)
-                    {
-                        temp[i] = buffer[i];
-                    }
-                    linesQueue.Enqueue(temp);
-                    Array.Clear(buffer, 0, buffer.Length);
-                    pos = 0;
-                }
-                
-            }
-        }
-
-        public void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            sendArrayFromQueue(sender, null);
-        }
-
-        private void sendArrayFromQueue(object sender, ElapsedEventArgs e)
-        {
-            
-            if (linesQueue.Count != 0)
-            {
-                double[][] temp = linesQueue.Dequeue();
-                data.Client.SendMessage(JSONConvert.ConstructDrawingCanvasData(temp,color));
-            }
-        }
-
-        public void Color_Picker(RoutedPropertyChangedEventArgs<Color?> e, GameWindow window)
-        {
-            Color colorSelected = new Color();
-            colorSelected.A = 255;
-            colorSelected.R = window.ClrPcker_Background.SelectedColor.Value.R;
-            colorSelected.G = window.ClrPcker_Background.SelectedColor.Value.G;
-            colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B;
-            color = colorSelected;
-        }
-
-        private void UpdateCanvasWithNewData(double[][] buffer, Color color)
-        {
-            Application.Current.Dispatcher.Invoke(delegate
-            {
-                foreach (double[] arr in buffer)
-                {
-                    Line line = new Line();
-                    line.Stroke = new SolidColorBrush(color);
-                    line.X1 = arr[0];
-                    line.Y1 = arr[1];
-                    line.X2 = arr[2];
-                    line.Y2 = arr[3];
-                    this.window.CanvasForPaint.Children.Add(line);
-                }
-            });
-        }
-
-        private void CanvasResetData()
-        {
-            this.window.CanvasForPaint.Children.Clear();
-        }
-
-        private void ChatBox_KeyDown()
-        {
-            //if enter then clear textbox and send message.
-            if (Message != string.Empty) AddMessage(Message);
-            Message = string.Empty;
-        }
-
-        internal void AddMessage(string message)
-        {
-            Messages.Add($"{data.User.Username}: {message}");
-
-            _payload = new
-            {
-                username = data.User.Username,
-                message = message
-            };
-
-            //Broadcast the message after adding it to the list!
-            data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
-        }
-
-        public static void HandleIncomingMsg(string username, string message)
-        {
-            Application.Current.Dispatcher.Invoke(delegate
-            {
-                Messages.Add($"{username}: {message}");
-            });
-        }
-        public void LeaveGame(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            Debug.WriteLine("Leaving...");
-            data.Client.SendMessage(JSONConvert.ConstructLobbyLeaveMessage(data.Lobby.ID));
-        }
-
-        public static void HandleRandomWord(string randomWord)
-        {
-            Debug.WriteLine("[CLIENT] Reached the handle random word method!");
-            Application.Current.Dispatcher.Invoke(delegate
-            {
-                Word = randomWord;
-            });
-        }
-        public void HandleIncomingPlayer(Lobby lobby)
-        {
-            Application.Current.Dispatcher.Invoke(delegate
-            {
-                Players.Clear();
-                foreach (var item in lobby.Users)
-                {
-                    Players.Add(item.Username);
-                }
-            });
-        }
-    }
-}
+
+using Client.Views;
+using GalaSoft.MvvmLight.Command;
+using SharedClientServer;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace Client.ViewModels
+{
+    class ViewModelGame : INotifyPropertyChanged
+    {
+        private ClientData data = ClientData.Instance;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private Point currentPoint = new Point();
+        private Color color;
+
+        public ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
+
+        private dynamic _payload;
+
+        private string _username;
+
+        private string _message;
+        public string Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                _message = value;
+            }
+        }
+        public ICommand OnKeyDown { get; set; }
+
+        public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
+        {
+            if (e.ButtonState == MouseButtonState.Pressed)
+            {
+                currentPoint = e.GetPosition(window.CanvasForPaint);
+            }
+        }
+
+        public void Canvas_MouseMove(MouseEventArgs e, GameWindow window)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                double[] coordinates = new double[4];
+                Line line = new Line();
+
+                line.Stroke = new SolidColorBrush(color);
+                //line.Stroke = SystemColors.WindowFrameBrush;
+                line.X1 = currentPoint.X;
+                line.Y1 = currentPoint.Y;
+                line.X2 = e.GetPosition(window.CanvasForPaint).X;
+                line.Y2 = e.GetPosition(window.CanvasForPaint).Y;
+                coordinates[0] = line.X1;
+                coordinates[1] = line.Y1;
+                coordinates[2] = line.X2;
+                coordinates[3] = line.Y2;
+                currentPoint = e.GetPosition(window.CanvasForPaint);
+
+                window.CanvasForPaint.Children.Add(line);
+                data.Client.SendMessage(JSONConvert.GetMessageToSend(0x04, coordinates));
+            }
+        }
+
+        public void Color_Picker(RoutedPropertyChangedEventArgs<Color?> e, GameWindow window)
+        {
+            Color colorSelected = new Color();
+            colorSelected.A = 255;
+            colorSelected.R = window.ClrPcker_Background.SelectedColor.Value.R;
+            colorSelected.G = window.ClrPcker_Background.SelectedColor.Value.G;
+            colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B;
+            color = colorSelected;
+        }
+        
+
+        public ViewModelGame()
+        {
+            if (_payload == null)
+            {
+                _message = "";
+
+            }
+            else
+            {
+                //_message = data.Message;
+                //_username = data.User.Username;
+                //Messages.Add($"{data.User.Username}: {Message}");
+            }
+            OnKeyDown = new RelayCommand(ChatBox_KeyDown);
+        }
+
+        private void ChatBox_KeyDown()
+        {
+            //if enter then clear textbox and send message.
+            if (Message != string.Empty) AddMessage(Message);
+            Message = string.Empty;
+        }
+
+        internal void AddMessage(string message)
+        {
+            Messages.Add($"{data.User.Username}: {message}");
+
+            _payload = new
+            {
+                username = data.User.Username,
+                message = message
+            };
+
+            //Broadcast the message after adding it to the list!
+            data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
+        }
+
+
+    }
+}
+       

Client/Views/GameWindow.xaml

@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Client.Views"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
         Title="Scrubl.io" Height="600" Width="1200">
@@ -22,34 +23,24 @@
         <Grid Grid.Column="0" Grid.Row="1">
             <Grid.RowDefinitions>
                 <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <ListBox Name="PlayerList" ItemsSource="{Binding Path=Players}" Margin="10,0,0,10" FontSize="20"/>
+
         </Grid>
 
-        <Grid Grid.Row="0" Grid.Column="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="160"/>
-                <ColumnDefinition Width="160"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="100"/>
-            </Grid.ColumnDefinitions>
-            <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" FontSize="20" Content="Pick a color -->"/>
-            <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/>
-
-
-        <Label Name="GuessWord" Grid.Row="0" Grid.Column="1" Content="{Binding Path=RandomWord, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-
-            <Label Grid.Row="0" Grid.Column="2" FontSize="20" Content="" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-            
-            <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET"/>
-        </Grid>
-
-        <Button Name="StartGame" Grid.Row="0" Grid.Column="2" Content="Start Game" FontSize="20" Command="{Binding ButtonStartGame}" IsEnabled="{Binding IsHost}"/>
+        <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="2" Margin="84,10,10,10" Content="RESET"/>
 
+        <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/>
 
         <Border Grid.Row="1" Grid.Column="1" Margin ="10,10,10,10" BorderBrush="Black" BorderThickness ="2.5">
-            <Canvas Name="CanvasForPaint" MouseDown="CanvasForPaint_MouseDown" MouseMove="CanvasForPaint_MouseMove" MouseUp="CanvasForPaint_MouseUp">
+            <Canvas Name="CanvasForPaint" MouseDown="CanvasForPaint_MouseDown" MouseMove="CanvasForPaint_MouseMove">
                 <Canvas.Background>
                     <SolidColorBrush Color="White" Opacity="0"/>
                 </Canvas.Background>
@@ -57,9 +48,9 @@
         </Border>
 
         <Grid Grid.Column="2" Grid.Row="1">
-            <ListBox Name ="TextBox" ItemsSource="{Binding Path=Messages}" Margin="0,0,10,69" />
+            <ListBox Name ="TextBox" ItemsSource="{Binding Path=Messages}" Margin="0,0,0,69"/>
 
-            <TextBox Name="ChatBox" Text="{Binding Message, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,465,10,0">
+            <TextBox Name="ChatBox" Text="{Binding Message, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,465,0,0">
                 <TextBox.InputBindings>
                     <KeyBinding Key="Return" Command="{Binding OnKeyDown}"/>
                 </TextBox.InputBindings>

Client/Views/GameWindow.xaml.cs

@@ -1,8 +1,15 @@
 using Client.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
 
 namespace Client.Views
 {
@@ -15,9 +22,8 @@ namespace Client.Views
         private ViewModelGame viewModel;
         public GameWindow()
         {
-            this.viewModel = new ViewModelGame(this);
+            this.viewModel = new ViewModelGame();
             DataContext = this.viewModel;
-            Closing += this.viewModel.LeaveGame;
             InitializeComponent();
             
         }
@@ -36,16 +42,21 @@ namespace Client.Views
         private void CanvasReset_Click(object sender, RoutedEventArgs e)
         {
             CanvasForPaint.Children.Clear();
+
+            //FOR FUTURE USE, IF NECCESSARY
+            //TEST.Children.Clear();
+
+            //foreach (UIElement child in CanvasForPaint.Children)
+            //{
+            //    var xaml = System.Windows.Markup.XamlWriter.Save(child);
+            //    var deepCopy = System.Windows.Markup.XamlReader.Parse(xaml) as UIElement;
+            //    TEST.Children.Add(deepCopy);
+            //}
         }
 
         private void ClrPcker_Background_SelectedColorChanged_1(object sender, RoutedPropertyChangedEventArgs<Color?> e)
         {
             viewModel.Color_Picker(e, this);
         }
-
-        private void CanvasForPaint_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            viewModel.Canvas_MouseUp(sender, e);
-        }
     }
 }

Client/Views/LoginScreen.xaml

@@ -11,7 +11,6 @@
             <RowDefinition Height="60"/>
             <RowDefinition Height="50"/>
             <RowDefinition Height="30"/>
-            <RowDefinition Height="100"/>
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
@@ -23,9 +22,8 @@
         <Label Grid.Row="1" FontSize="30" Content="Enter a username:"/>
         <Label Grid.Row="2" FontSize="15" Content="(max amount of characters for the username is 10)"/>
 
-        <TextBox Name="usernameTextbox" Grid.Row="1" Grid.Column="1" MaxLength="69" FontSize="30" VerticalAlignment="Center" HorizontalAlignment="Left" Width="250"/>
+        <TextBox Name="usernameTextbox" Grid.Row="1" Grid.Column="1" MaxLength="10" FontSize="30" VerticalAlignment="Center" HorizontalAlignment="Left" Width="250"/>
         <Button Content="ENTER" Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Width="100" Height="40" Click="Button_EnterUsername"/>
 
-        <Label Grid.Row="3" Grid.Column="0" Content="Tip of the century: base64 != UTF8!" FontSize="20" FontWeight="Bold"/>
     </Grid>
 </Window>

Client/Views/LoginScreen.xaml.cs

@@ -1,5 +1,4 @@
-using Client.ViewModels;
-using SharedClientServer;
+using SharedClientServer;
 using System;
 using System.Collections.Generic;
 using System.Text;

Client/Views/MainWindow.xaml

@@ -57,8 +57,7 @@
                 <GridView x:Name="grdList">
                     <GridViewColumn Header="Lobby ID" DisplayMemberBinding="{Binding ID}" Width="70"/>
                     <GridViewColumn Header="Players in" DisplayMemberBinding="{Binding PlayersIn}" Width="70"/>
-                    <GridViewColumn Header="max players available" DisplayMemberBinding="{Binding MaxPlayers}" Width="150"/>
-                    <GridViewColumn Header="joinable" DisplayMemberBinding="{Binding LobbyJoinable}"/>
+                    <GridViewColumn Header="max players available" DisplayMemberBinding="{Binding MaxPlayers}"/>
                 </GridView>
             </ListView.View>
         </ListView>

Server/Models/ServerClient.cs

@@ -6,27 +6,22 @@ using SharedClientServer;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using static SharedClientServer.JSONConvert;
 
 namespace Server.Models
 {
-    public delegate void Callback();
     class ServerClient : ObservableObject
     {
         private TcpClient tcpClient;
         private NetworkStream stream;
-        private byte[] buffer = new byte[2048];
-        private byte[] totalBuffer = new byte[2048];
+        private byte[] buffer = new byte[1024];
+        private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
         public User User { get; set; }
         private ServerCommunication serverCom = ServerCommunication.INSTANCE;
-        private Callback OnMessageReceivedOk;
-
+        
 
         /// <summary>
         /// Constructor that creates a new serverclient object with the given tcp client.
@@ -50,60 +45,49 @@ namespace Server.Models
             if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.tcpClient.Client.Connected)
                 return;
 
-            try
+
+            int bytesReceived = this.stream.EndRead(ar);
+
+            if (totalBufferReceived + bytesReceived > 1024)
             {
-                int bytesReceived = this.stream.EndRead(ar);
-
-                if (totalBufferReceived + bytesReceived > 2048)
-                {
-                    throw new OutOfMemoryException("buffer is too small!");
-                }
-
-
-                // copy the received bytes into the buffer
-                Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, bytesReceived);
-                // add the bytes we received to the total amount
-                totalBufferReceived += bytesReceived;
-
-                // calculate the expected length of the message
-                int expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
-
-                while (totalBufferReceived >= expectedMessageLength)
-                {
-                    // we have received the full packet
-                    byte[] message = new byte[expectedMessageLength];
-                    // copy the total buffer contents into the message array so we can pass it to the handleIncomingMessage method
-                    Array.Copy(totalBuffer, 0, message, 0, expectedMessageLength);
-                    HandleIncomingMessage(message);
-
-                    // move the contents of the totalbuffer to the start of the array
-                    Array.Copy(totalBuffer, expectedMessageLength, totalBuffer, 0, (totalBufferReceived - expectedMessageLength));
-
-                    // remove the length of the expected message from the total buffer
-                    totalBufferReceived -= expectedMessageLength;
-                    // and set the new expected length to the rest that is still in the buffer
-                    expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
-
-                    if (expectedMessageLength == 0)
-                    {
-                        break;
-                    }
-
-
-                }
-
-                ar.AsyncWaitHandle.WaitOne();
-                // start reading for a new message
-                stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
-            }
-            catch (IOException e)
-            {
-                Debug.WriteLine("[SERVERCLIENT] Client disconnected! exception was " + e.Message);
-                tcpClient.Close();
-                ServerCommunication.INSTANCE.ServerClientDisconnect(this);
+                throw new OutOfMemoryException("buffer is too small!");
             }
 
+            // copy the received bytes into the buffer
+            Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, bytesReceived);
+            // add the bytes we received to the total amount
+            totalBufferReceived += bytesReceived;
 
+            // calculate the expected length of the message
+            int expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
+
+            while (totalBufferReceived >= expectedMessageLength)
+            {
+                // we have received the full packet
+                byte[] message = new byte[expectedMessageLength];
+                // copy the total buffer contents into the message array so we can pass it to the handleIncomingMessage method
+                Array.Copy(totalBuffer, 0, message, 0, expectedMessageLength);
+                HandleIncomingMessage(message);
+
+                // move the contents of the totalbuffer to the start of the array
+                Array.Copy(totalBuffer, expectedMessageLength, totalBuffer, 0, (totalBufferReceived - expectedMessageLength));
+
+                // remove the length of the expected message from the total buffer
+                totalBufferReceived -= expectedMessageLength;
+                // and set the new expected length to the rest that is still in the buffer
+                expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
+
+                if (expectedMessageLength == 0)
+                {
+                    break;
+                } 
+
+
+            }
+            // start reading for a new message
+            stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
+
+            
         }
 
         /// <summary>
@@ -115,21 +99,21 @@ namespace Server.Models
             Debug.WriteLine($"Got message : {Encoding.ASCII.GetString(message)}");
             byte id = message[4];
             byte[] payload = new byte[message.Length - 5];
-            Array.Copy(message, 5, payload, 0, message.Length - 5);
+            Array.Copy(message,5,payload,0,message.Length-5);
             Debug.WriteLine("[SERVERCLIENT] GOT STRING" + Encoding.ASCII.GetString(payload));
-            switch (id)
+            switch(id)
             {
-
+                
                 case JSONConvert.LOGIN:
                     // json log in username data
                     string uName = JSONConvert.GetUsernameLogin(payload);
-
+                    
                     if (uName != null)
                     {
                         User = new User(uName);
                         User.Username = uName;
                         Debug.WriteLine("[SERVERCLIENT] set username to " + uName);
-
+                        
                     }
                     break;
                 case JSONConvert.MESSAGE:
@@ -138,73 +122,23 @@ namespace Server.Models
                     string textUsername = combo.Item1;
                     string textMsg = combo.Item2;
 
-                    //Takes the data sent from the client, and then sets it in a data packet to be sent.
-                    dynamic packet = new
-                    {
-                        username = textUsername,
-                        message = textMsg
-                    };
+                    Debug.WriteLine("[SERVERCLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
 
-                    //Sends the incomming message to be broadcast to all of the clients inside the current lobby.
-                    serverCom.SendToLobby(serverCom.GetLobbyForUser(User), JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, packet));
+                    // todo handle sending to all except this user the username and message to display in chat
+                    serverCom.SendToLobby(ServerCommunication.INSTANCE.GetLobbyForUser(User),payload);
+                    Debug.WriteLine("Payload has been sent!");
                     break;
 
                 case JSONConvert.LOBBY:
                     // lobby data
                     LobbyIdentifier l = JSONConvert.GetLobbyIdentifier(payload);
-                    handleLobbyMessage(payload, l);
+                    handleLobbyMessage(payload,l);
                     break;
-
                 case JSONConvert.CANVAS:
-                    
-                    int typeToCheck = JSONConvert.GetCanvasMessageType(payload);
-                    switch (typeToCheck)
-                    {
-                        case JSONConvert.CANVAS_WRITING:
-                            dynamic canvasData = new
-                            {
-                                canvasType = typeToCheck,
-                                coords = JSONConvert.getCoordinates(payload),
-                                color = JSONConvert.getCanvasDrawingColor(payload)
-                            };
-                            serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
-                            break;
-
-                        case JSONConvert.CANVAS_RESET:
-                            dynamic canvasDataForReset = new
-                            {
-                                type = JSONConvert.GetCanvasMessageType(payload)
-                            };
-                            serverCom.SendToLobby(serverCom.GetLobbyForUser(User), JSONConvert.GetMessageToSend(CANVAS, canvasDataForReset));
-                            break;
-                    }
-                    
-
+                    Debug.WriteLine("GOT A MESSAGE FROM THE CLIENT ABOUT THE CANVAS!!!");
                     // canvas data
                     // todo send canvas data to all other serverclients in lobby
                     break;
-
-                case JSONConvert.GAME:
-                    Debug.WriteLine("[SERVERCLIENT] Got a message about the game logic");
-                    string command = JSONConvert.GetGameCommand(payload);
-                    switch (command)
-                    {
-                        case "startGame":
-                            int lobbyID = JSONConvert.GetStartGameLobbyID(payload);
-                            serverCom.CloseALobby(lobbyID);
-                            ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
-                            break;
-                    }
-
-                    break;
-                case JSONConvert.RANDOMWORD:
-                    //Flag byte for receiving the random word.
-                    break;
-                case JSONConvert.MESSAGE_RECEIVED:
-                    // we now can send a new message
-                    OnMessageReceivedOk?.Invoke();
-                    break;
-
                 default:
                     Debug.WriteLine("[SERVER] Received weird identifier: " + id);
                     break;
@@ -228,45 +162,13 @@ namespace Server.Models
                     break;
                 case LobbyIdentifier.JOIN:
                     int id = JSONConvert.GetLobbyID(payload);
-                    bool isHost;
-                    ServerCommunication.INSTANCE.JoinLobby(this.User,id, out isHost);
-                    sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage(isHost));
-                    ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
-                    OnMessageReceivedOk = () =>
-                    {
-
-                        serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
-                        {
-                            id = serverCom.GetLobbyForUser(User).ID,
-                            word = JSONConvert.SendRandomWord("WordsForGame.json")
-                        }));
-                        OnMessageReceivedOk = null;
-                    };
-                    break;
-                case LobbyIdentifier.LEAVE:
-                    id = JSONConvert.GetLobbyID(payload);
-                    ServerCommunication.INSTANCE.LeaveLobby(User, id);
-                    sendMessage(JSONConvert.ConstructLobbyLeaveMessage(id));
+                    ServerCommunication.INSTANCE.JoinLobby(this.User,id);
+                    sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
                     ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
                     break;
             }
         }
 
-        private async void SendLobbyData()
-        {
-            string result = await WaitForData();
-            if(result == "bruh momento")
-            {
-              
-            }
-        }
-
-        private async Task<string> WaitForData()
-        {
-            await Task.Delay(1000);
-            return "bruh momento";
-        }
-
         /// <summary>
         /// sends a message to the tcp client
         /// </summary>

Server/Models/ServerCommunication.cs

@@ -16,7 +16,6 @@ namespace Server.Models
         public bool Started = false;
         public List<Lobby> lobbies;
         private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies;
-        internal Action DisconnectClientAction;
         public Action newClientAction;
         
 
@@ -90,7 +89,7 @@ namespace Server.Models
         /// send a message to all tcp clients in the list
         /// </summary>
         /// <param name="message">the message to send</param>
-        public async void sendToAll(byte[] message)
+        public void sendToAll(byte[] message)
         {
             foreach (ServerClient sc in serverClients)
             {
@@ -98,26 +97,6 @@ namespace Server.Models
             }
         }
 
-        public void ServerClientDisconnect(ServerClient serverClient)
-        {
-            Debug.WriteLine("[SERVERCOMM] handling disconnect");
-            DisconnectClientAction?.Invoke();
-            int id = -1;
-            foreach (Lobby l in serverClientsInlobbies.Keys)
-            {
-                if (serverClientsInlobbies[l].Contains(serverClient))
-                {
-                    id = l.ID;
-                }break;
-            }
-
-            if (id != -1)
-            {
-                LeaveLobby(serverClient.User, id);
-                SendToAllExcept(serverClient, JSONConvert.ConstructLobbyLeaveMessage(id));
-            }
-        }
-
         public void SendToAllExcept(string username, byte[] message)
         {
             foreach (ServerClient sc in serverClients)
@@ -126,14 +105,6 @@ namespace Server.Models
             }
         }
 
-        public void SendToAllExcept(ServerClient sc, byte[] message)
-        {
-            foreach (ServerClient s in serverClients)
-            {
-                if (s != sc) s.sendMessage(message);
-            }
-        }
-
         public void SendToLobby(Lobby lobby, byte[] message)
         {
             foreach (Lobby l in lobbies)
@@ -142,7 +113,6 @@ namespace Server.Models
                 {
                     foreach (ServerClient sc in serverClientsInlobbies[l])
                     {
-                        Debug.WriteLine("[SERVERCLIENT] Sending message");
                         sc.sendMessage(message);
                     }
                     break;
@@ -150,21 +120,6 @@ namespace Server.Models
             }
         }
 
-        public void SendCanvasDataToLobby(Lobby lobby, string username, byte[] message)
-        {
-            foreach (Lobby l in lobbies)
-            {
-                if (l == lobby)
-                {
-                    foreach (ServerClient sc in serverClientsInlobbies[l])
-                    {
-                        sc.sendMessage(message);
-                    }
-                    break;
-                }
-            }
-        }
-
         public Lobby GetLobbyForUser(User user)
         {
             foreach (Lobby l in lobbies)
@@ -206,7 +161,6 @@ namespace Server.Models
             }
         }
 
-
         public int HostForLobby(User user)
         {
             Lobby lobby = new Lobby( lobbies.Count + 1,0, 8);
@@ -217,69 +171,17 @@ namespace Server.Models
             return lobby.ID;
         }
 
-        public void JoinLobby(User user, int id, out bool isHost)
+        public void JoinLobby(User user, int id)
         {
-            isHost = false;
             foreach (Lobby l in lobbies)
             {
                 if (l.ID == id)
                 {
-                    if (l.Users.Count == 0)
-                    {
-                        user.Host = true;
-                        isHost = true;
-                    }
                     AddToLobby(l, user);
                     Debug.WriteLine($"{user.Username} joined lobby with id {id}");
                     break;
                 }
             }
         }
-
-        public void LeaveLobby(User user, int id)
-        {
-            Debug.WriteLine("[SERVERCOMM] removing user from lobby");
-            foreach (Lobby l in lobbies)
-            {
-                if (l.ID == id)
-                {
-                    Debug.WriteLine($"[SERVERCOMM] checking for lobby with id {l.ID}");
-                    
-                    foreach (User u in l.Users)
-                    {
-                        Debug.WriteLine($"[SERVERCOMM] checking if {u.Username} is {user.Username} ");
-                        // contains doesn't work, so we'll do it like this...
-                        if (u.Username == user.Username)
-                        {
-                            Debug.WriteLine("[SERVERCOMM] removed user from lobby!");
-                            l.Users.Remove(user);
-                            foreach (ServerClient sc in serverClients)
-                            {
-                                if (sc.User.Username == user.Username)
-                                {
-                                    serverClientsInlobbies[l].Remove(sc);
-                                    break;
-                                }
-                            }
-                            break;
-                        }
-                    }
-
-                    
-                   
-                }
-            }
-        }
-
-        public void CloseALobby(int lobbyID)
-        {
-            foreach (Lobby lobby in lobbies)
-            {
-                if (lobby.ID == lobbyID)
-                {
-                    lobby.LobbyJoinable = false;
-                }
-            }
-        }
     }
 }

Server/Server.csproj

@@ -6,16 +6,6 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="resources\WordsForGame.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="resources\WordsForGame.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AsyncAwaitBestPractices" Version="4.3.0" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />

Server/ViewModels/MainViewModel.cs

@@ -33,10 +33,6 @@ namespace Server.ViewModels
             {
                 InformationModel.ClientsConnected++;
             };
-            serverCommunication.DisconnectClientAction = () =>
-            {
-                InformationModel.ClientsConnected--;
-            };
             //BitmapImage onlineImg = new BitmapImage(new Uri(@"/img/online.png",UriKind.Relative));
             //BitmapImage offlineImg = new BitmapImage(new Uri(@"/img/offline.png", UriKind.Relative));
             

Server/resources/WordsForGame.json

@@ -1,31 +0,0 @@
-{
-  "filename": "wordsForGame",
-  "words": [
-    "teacher",
-    "love",
-    "engineer",
-    "supermarket",
-    "disaster",
-    "studio",
-    "restaurant",
-    "music",
-    "chocolate",
-    "dirt",
-    "thought",
-    "virus",
-    "lieutenant",
-    "painter",
-    "kiwi",
-    "power ranger",
-    "computer",
-    "people",
-    "candidate",
-    "security guard",
-    "Canada",
-    "teeth",
-    "army",
-    "airport",
-    "president",
-    "bedroom"
-  ]
-}

SharedClientServer/ClientServerUtil.cs

@@ -7,8 +7,6 @@ using System.Text;
 namespace SharedClientServer
 {
     public delegate void Callback();
-
-
     class ClientServerUtil
     {
         // creates a message array to send to the server or to clients

SharedClientServer/JSONConvert.cs

@@ -1,13 +1,11 @@
-using Client;
+using Client;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text;
-using System.Windows.Media;
 
 namespace SharedClientServer
 {
@@ -17,13 +15,6 @@ namespace SharedClientServer
         public const byte MESSAGE = 0x02;
         public const byte LOBBY = 0x03;
         public const byte CANVAS = 0x04;
-        public const byte GAME = 0x05;
-        public const byte MESSAGE_RECEIVED = 0x06;
-        public const byte RANDOMWORD = 0x07;
-
-        public const int CANVAS_WRITING = 0;
-        public const int CANVAS_RESET = 1;
-        
 
         public enum LobbyIdentifier
         {
@@ -34,10 +25,9 @@ namespace SharedClientServer
             LIST,
             REQUEST
         }
-
         public static (string,string) GetUsernameAndMessage(byte[] json)
         {
-            string msg = Encoding.UTF8.GetString(json);
+            string msg = Encoding.ASCII.GetString(json);
             dynamic payload = JsonConvert.DeserializeObject(msg);
             
             return (payload.username, payload.message);
@@ -45,7 +35,7 @@ namespace SharedClientServer
 
         public static string GetUsernameLogin(byte[] json)
         {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             return payload.username;
         }
 
@@ -93,7 +83,6 @@ namespace SharedClientServer
             });
         }
 
-
         public static byte[] ConstructLobbyJoinMessage(int lobbyID)
         {
             return GetMessageToSend(LOBBY, new
@@ -113,13 +102,13 @@ namespace SharedClientServer
         }
         public static LobbyIdentifier GetLobbyIdentifier(byte[] json)
         {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             return payload.identifier;
         }
 
         public static Lobby[] GetLobbiesFromMessage(byte[] json)
         {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             JArray lobbiesArray = payload.lobbies;
             Debug.WriteLine("[JSONCONVERT] got lobbies from message" + lobbiesArray.ToString());
             Lobby[] lobbiesTemp = lobbiesArray.ToObject<Lobby[]>();
@@ -133,98 +122,24 @@ namespace SharedClientServer
 
         public static int GetLobbyID(byte[] json)
         {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             return payload.id;
         }
 
         public static Lobby GetLobby(byte[] json)
         {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             JObject dynamicAsObject = payload.lobby;
             return dynamicAsObject.ToObject<Lobby>();
         }
 
-        public static byte[] ConstructLobbyJoinSuccessMessage(bool isHost)
+        public static byte[] ConstructLobbyJoinSuccessMessage()
         {
-            return GetMessageToSend(LOBBY, new { identifier = LobbyIdentifier.JOIN_SUCCESS,
-            host = isHost});
-        }
-
-        public static bool GetLobbyJoinIsHost(byte[] json)
-        {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
-            return payload.host;
+            return GetMessageToSend(LOBBY, new { identifier = LobbyIdentifier.JOIN_SUCCESS});
         }
 
         #endregion
 
-        public static byte[] ConstructCanvasDataSend(int typeToSend, double[][] buffer, Color colorToSend)
-        {
-            
-            return GetMessageToSend(CANVAS, new
-            {
-                canvasType = typeToSend,
-                coords = buffer,
-                color = colorToSend
-            }); ;
-        }
-
-        public static byte[] ConstructDrawingCanvasData(double[][] buffer, Color colorToSend)
-        {
-            return GetMessageToSend(CANVAS, new
-            {
-                canvasType = CANVAS_WRITING,
-                coords = buffer,
-                color = colorToSend
-            });
-        }
-
-        public static int GetCanvasMessageType(byte[] json)
-        {
-            dynamic d = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));
-            return d.canvasType;
-        }
-
-        public static double[][] getCoordinates(byte[] payload)
-        {
-            Debug.WriteLine("got coords " + Encoding.UTF8.GetString(payload));
-            dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload));
-            JArray coordinatesArray = json.coords;
-
-            double[][] coordinates = coordinatesArray.ToObject<double[][]>();
-
-            return coordinates;
-        }
-
-        public static Color getCanvasDrawingColor(byte[] payload)
-        {
-            dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload));
-            Color color = json.color;
-            return color;
-        }
-
-        public static byte[] ConstructGameStartData(int lobbyID)
-        {
-            string startGame = "startGame";
-            return GetMessageToSend(GAME, new
-            {
-                command = startGame,
-                lobbyToStart = lobbyID
-            }); ;
-        }
-
-        public static string GetGameCommand(byte[] payload)
-        {
-            dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload));
-            return json.command;
-        }
-
-        public static int GetStartGameLobbyID(byte[] payload)
-        {
-            dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload));
-            return json.lobbyToStart;
-        }
-
         /// <summary>
         /// constructs a message that can be sent to the clients or server
         /// </summary>
@@ -234,8 +149,7 @@ namespace SharedClientServer
         public static byte[] GetMessageToSend(byte identifier, dynamic payload)
         {
             // convert the dynamic to bytes
-            string json = JsonConvert.SerializeObject(payload);
-            byte[] payloadBytes = Encoding.UTF8.GetBytes(json);
+            byte[] payloadBytes = Encoding.ASCII.GetBytes(JsonConvert.SerializeObject(payload));
             // make the array that holds the message and copy the payload into it with the first spot containing the identifier
             byte[] res = new byte[payloadBytes.Length + 5];
             // put the payload in the res array
@@ -246,40 +160,6 @@ namespace SharedClientServer
             Array.Copy(BitConverter.GetBytes(payloadBytes.Length+5),0,res,0,4);
             return res;
         }
-      
-             /*
-         * This method sends a random word from the json file, this happens when the client joins a lobby.
-         */
-        public static string SendRandomWord(string filename)
-        {
-            dynamic words;
-            Random random = new Random();
-            string workingDir = Path.GetFullPath(@"..\Server");
-            string projDir = Directory.GetParent(workingDir).Parent.Parent.FullName;
-            string filePath = projDir += $@"\resources\{filename}";
-
-            using(StreamReader reader = new StreamReader(filePath))
-            {
-                string json = reader.ReadToEnd();
-                words = JsonConvert.DeserializeObject(json);
-            }
-
-
-            int index = random.Next(0, 24);
-
-            Debug.WriteLine($"[SERVERCLIENT] Sending random words {words}");
-
-            return words.words[index];
-        }
-        
-        /*
-         * Client gets the payload and retrieves the word from the payload
-         */
-        public static string GetRandomWord(byte[] json)
-        {
-            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
-            return payload.word;
-        }
 
         
     }

SharedClientServer/Lobby.cs

@@ -6,7 +6,7 @@ using System.Text;
 
 namespace Client
 {
-    internal class Lobby : INotifyPropertyChanged
+    class Lobby : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -14,7 +14,6 @@ namespace Client
         private int _id;
         private int _playersIn;
         private int _maxPlayers;
-        private bool _lobbyJoinable;
         //private List<string> _usernames;
         private List<User> _users;
 
@@ -35,7 +34,6 @@ namespace Client
             _maxPlayers = maxPlayers;
             //_usernames = new List<string>();
             _users = new List<User>();
-            _lobbyJoinable = true;
         }
 
         public void AddUser(string username, out bool succes)
@@ -43,7 +41,7 @@ namespace Client
             succes = false;
             if (_users.Count < _maxPlayers)
             {
-                _users.Add(new User(username, 0, false, false));
+                _users.Add(new User(username, 0, false));
                 succes = true;
             }
         }
@@ -89,11 +87,6 @@ namespace Client
             set { _users = value; }
         }
 
-        public bool LobbyJoinable
-        {
-            get { return _lobbyJoinable; }
-            set { _lobbyJoinable = value; }
-        }
 
     }
 }

SharedClientServer/User.cs

@@ -1,26 +1,23 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
 
 namespace SharedClientServer
 {
-    class User : IEquatable<User>
+    class User
     {
         private string _username;
         private int _score;
         private bool _host;
-        private bool _turnToDraw;
         private string _message;
 
         [JsonConstructor]
-        public User(string username, int score, bool host, bool turnToDraw)
+        public User(string username, int score, bool host)
         {
             _username = username;
             _score = score;
             _host = host;
-            _turnToDraw = turnToDraw;
         }
 
         public User(string username)
@@ -28,43 +25,6 @@ namespace SharedClientServer
             _username = username;
             _score = 0;
             _host = false;
-            _turnToDraw = false;
-        }
-
-        public static bool operator ==(User u1, User u2)
-        {
-            if (object.ReferenceEquals(u1, null))
-            {
-                return object.ReferenceEquals(u2, null);
-            }
-            return u1.Equals(u2 as object);
-        }
-
-        public static bool operator !=(User u1, User u2)
-        {
-            if (object.ReferenceEquals(u1, null))
-            {
-                return object.ReferenceEquals(u2, null);
-            }
-            return u1.Equals(u2 as object);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if ((obj == null) || !this.GetType().Equals(obj.GetType()))
-            {
-                return false;
-            }
-            else
-            {
-                return this.Equals(obj as User);
-                
-            }
-        }
-
-        public bool Equals([AllowNull] User other)
-        {
-            return other.Username == this.Username;
         }
 
         public string Username
@@ -84,11 +44,5 @@ namespace SharedClientServer
             get { return _host; }
             set { _host = value; }
         }
-
-        public bool TurnToDraw
-        {
-            get { return _turnToDraw; }
-            set { _turnToDraw = value; }
-        }
     }
 }