Merge remote-tracking branch 'origin/setupBranch' into setupBranch

Server/Models/Information.cs

@@ -4,6 +4,7 @@ namespace Server.Models
 {
     public class Information : ObservableObject
     {
+        
         public bool CanStartServer { get; set; }
         public bool ServerOnline { get; set; }
 
@@ -15,5 +16,7 @@ namespace Server.Models
                 return "Offline";
             }
         }
+
+        public int ClientsConnected{ get { return ServerCommunication.INSTANCE.ClientsConnected; } }
     }
 }

Server/Models/ServerClient.cs

@@ -84,7 +84,30 @@ namespace Server.Models
         /// <param name="message">the incoming message</param>
         private void HandleIncomingMessage(byte[] message)
         {
-            Debug.WriteLine($"Got message from client : {message}");
+            Debug.WriteLine($"Got message from {Username} : {message}");
+            byte id = message[0];
+            byte[] payload = new byte[message.Length - 1];
+            Array.Copy(message,1,payload,0,message.Length-1);
+            switch(id)
+            {
+                case 0x01:
+                    // canvas data
+                    break;
+                case 0x02:
+                    // json message data
+                    (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
+                    string textUsername = combo.Item1;
+                    string textMsg = combo.Item2;
+                    // todo handle sending to all except this user the username and message to display in chat
+                    break;
+
+                case 0x03:
+                    // object data
+                    break;
+                default:
+                    Debug.WriteLine("Received weird identifier: " + id);
+                    break;
+            }
             //TODO implement ways to handle the message
         }
 

Server/Models/ServerCommunication.cs

@@ -14,6 +14,7 @@ namespace Server.Models
         private TcpListener listener;
         private List<ServerClient> serverClients;
         public bool Started = false;
+        public int ClientsConnected { get { return serverClients.Count; } }
 
         /// <summary>
         /// use a padlock object to make sure the singleton is thread-safe
@@ -85,5 +86,13 @@ namespace Server.Models
                 sc.sendMessage(message);
             }
         }
+
+        public void sendToAllExcept(string username, byte[] message)
+        {
+            foreach (ServerClient sc in serverClients)
+            {
+                if (sc.Username != username) sc.sendMessage(message);
+            }
+        }
     }
 }

Server/Server.csproj

@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="AsyncAwaitBestPractices" Version="4.3.0" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
   </ItemGroup>
 

Server/ViewModels/MainViewModel.cs

@@ -9,6 +9,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace Server.ViewModels
 {
@@ -21,24 +22,21 @@ namespace Server.ViewModels
 
         public MainViewModel(MainWindow mainWindow)
         {
+            serverCommunication = ServerCommunication.INSTANCE;
             this.mainWindow = mainWindow;
             Debug.WriteLine("init mainviewmodel");
             InformationModel = new Information();
             InformationModel.CanStartServer = true;
             InformationModel.ServerOnline = false;
+            //BitmapImage onlineImg = new BitmapImage(new Uri(@"/img/online.png",UriKind.Relative));
+            //BitmapImage offlineImg = new BitmapImage(new Uri(@"/img/offline.png", UriKind.Relative));
             
             this.ServerStartCommand = new RelayCommand(() =>
             {
                 Debug.WriteLine("connect button clicked");
-                if (serverCommunication == null)
-                {
-                    Debug.WriteLine("making new server communication");
-                    serverCommunication = ServerCommunication.INSTANCE;
-                }
+                
                 if (!serverCommunication.Started)
                 {
-                    
-                    Debug.WriteLine("can start server " + InformationModel.CanStartServer);
                     serverCommunication.Start();
                     InformationModel.ServerOnline = true;
                     InformationModel.CanStartServer = false;

Server/Views/MainWindow.xaml

@@ -8,8 +8,11 @@
         Title="MainWindow" Height="450" Width="800">
     <Grid>
         <Button Content="Start Server" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Command="{Binding ServerStartCommand}" IsEnabled="{Binding InformationModel.CanStartServer}"/>
-        <Label Name="serverStatusLabel" Content="{Binding InformationModel.ServerStatus}" HorizontalAlignment="Left" Margin="169,10,0,0" VerticalAlignment="Top"/>
+        <Label Name="serverStatusLabel" Content="{Binding InformationModel.ServerStatus}" HorizontalAlignment="Left" Margin="174,7,0,0" VerticalAlignment="Top"/>
         <Label Content="Server Status:" HorizontalAlignment="Left" Margin="80,7,0,0" VerticalAlignment="Top"/>
-        <Image Source="https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/16/Status-user-online-icon.png" HorizontalAlignment="Left" Margin="161,16,0,0" VerticalAlignment="Top" Width="8"/>
+        <Label Content="Clients connected:" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top"/>
+        <Label Content="{Binding InformationModel.ClientsConnected}" HorizontalAlignment="Left" Margin="117,35,0,0" VerticalAlignment="Top"/>
+
+
     </Grid>
 </Window>

SharedClientServer/JSONConvert.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharedClientServer
+{
+    class JSONConvert
+    {
+        public static (string,string) GetUsernameAndMessage(byte[] json)
+        {
+            string msg = Encoding.ASCII.GetString(json);
+            dynamic payload = JsonConvert.DeserializeObject(msg);
+            return (payload.username, payload.message);
+        }
+    }
+}

SharedClientServer/SharedClientServer.projitems

@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ClientServerUtil.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSONConvert.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObservableObject.cs" />
   </ItemGroup>
 </Project>