From 514460781b859432b1c06be0f501768ad8c2d21d Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 13 Oct 2020 10:23:06 +0200
Subject: [PATCH 1/3] added switch for incoming network data

---
 Server/Models/Information.cs       |   3 +++
 Server/Models/ServerClient.cs      |  18 +++++++++++++++++-
 Server/ViewModels/MainViewModel.cs |   6 +++++-
 Server/Views/MainWindow.xaml       |   7 +++++--
 Server/img/offline.png             | Bin 0 -> 762 bytes
 Server/img/online.png              | Bin 0 -> 742 bytes
 6 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Server/img/offline.png
 create mode 100644 Server/img/online.png

diff --git a/Server/Models/Information.cs b/Server/Models/Information.cs
index 8f41ba9..eb2b690 100644
--- a/Server/Models/Information.cs
+++ b/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; set; }
     }
 }
\ No newline at end of file
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 4db4128..bb8f2e9 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -84,7 +84,23 @@ 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];
+            switch(id)
+            {
+                case 0x01:
+                    // canvas data
+                    break;
+                case 0x02:
+                    // message data
+                    break;
+                case 0x03:
+                    // json data
+                    break;
+                default:
+                    Debug.WriteLine("Received weird identifier: " + id);
+                    break;
+            }
             //TODO implement ways to handle the message
         }
 
diff --git a/Server/ViewModels/MainViewModel.cs b/Server/ViewModels/MainViewModel.cs
index 7652c38..bd7d0a4 100644
--- a/Server/ViewModels/MainViewModel.cs
+++ b/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
 {
@@ -24,8 +25,11 @@ namespace Server.ViewModels
             this.mainWindow = mainWindow;
             Debug.WriteLine("init mainviewmodel");
             InformationModel = new Information();
+            InformationModel.ClientsConnected = 0;
             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(() =>
             {
@@ -38,7 +42,7 @@ namespace Server.ViewModels
                 if (!serverCommunication.Started)
                 {
                     
-                    Debug.WriteLine("can start server " + InformationModel.CanStartServer);
+                    
                     serverCommunication.Start();
                     InformationModel.ServerOnline = true;
                     InformationModel.CanStartServer = false;
diff --git a/Server/Views/MainWindow.xaml b/Server/Views/MainWindow.xaml
index 4cb49fb..5ff94af 100644
--- a/Server/Views/MainWindow.xaml
+++ b/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>
diff --git a/Server/img/offline.png b/Server/img/offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..be764b20e1d7279c8a31c0433395cb021275b740
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008PNkl<Zc-n1K
zOG}$k5ItXf!~`WMC@4k~l$0n4!H6#~7D3IztXwJLM$#@^C@%aBuG|Q1gWy7NrGmH!
z3erUIg^_@uX(eENi-I6APc=F-F{zdgT<*Q!cjwH^nKKIhvBAMXOF=<_Gb=0WGc5yu
zdwzcYL+fWa9Cppj%=q8GSJDTE!=bIHsF*YwjYIYI^(s1pfaG5&6vFB0DfagElE=r#
z)0dZ*ql=4+kqiJiYYYa1yQ{0qR##VtoSYmeiXw~c<>f`z<KrXt_xG`~vf{nCxUerQ
zEJWqS@bK`D*49>MLqmf&2Lb`a<8knvZFhGUYPA|>vspm+zOk|4nwpyWq6`cSSjx)E
ze7(KBDxFS;)zwvaJRX#mmSTK-TmU8}CUA9ih4%J#bar;){{9~G^Yh7@n;WY_(ZA{S
z`mY@w9XL5T!Q9-OWYN>p1Dnkz0A8;b%gf6Wy|1qim6erPTU*1~+1YnxWMt&mCo)ct
ziQ3xQLQ6}FM9a?37J#RxC&_Aaa}&+Y&0vDL%->|n*w|RCrlv;CDHjzL3G=zRxyZ}Q
zlbtP*NFWxA$<7_QyStN;4i69G9{{vkE%Nj8W!GplLL3_t8jVH~iA3=5@F05zAYDRv
zdAV@l_xsV<*od~awhtw&udicgX9pIGML0M=KTnmACb7D@8pJBxZnuy~nm|)ilK^aQ
zZ*%X3M7!ONl9CbxgTWMu{r&wGitaO+Oe+52^Z6u;;^JaBolXI8xm>uty_M)zt5pIW
z9UUdFudl5cA(69_WDM2<r$^dHZEdXp92^{g<^o(MYk=g;ASog714>I%RaNCC5F3d~
zK)3_!^fpY=0d}T2U}rC-Z(mwkie`qXySrOUJWNsthNzt?Zs+?hytOY$9hfGvM@d+J
shv~gBCxwND{~c$_z%@HN`(d140e(koYH*2Oi2wiq07*qoM6N<$f(-v>^8f$<

literal 0
HcmV?d00001

diff --git a/Server/img/online.png b/Server/img/online.png
new file mode 100644
index 0000000000000000000000000000000000000000..63b8395f1106d384c16ff72ce4a5dbf8ebcb8bfb
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00085Nkl<Zc-nQ7
zOH30{6o$V$9ZFlE<^8D0Lo`C%2$<-?1T`8Y(L{+GRxBiF;zm|3jZ0U!F(_ffio^vj
zG(n=#khsu<hZ_S%5kVeO5NLU{Ks)1^&Oj)MlQzBSz2}>A{{O#<LyvxoT9rY&%f&^_
zMTPaBk>FP%!3Q%+cl-ro2hXeh!YlZ+Af0tpr`wv(-qh+V>nZY=B=;603ye&S(Es_R
zF*^CB#|Y68A7E=ApkKzDR;CZ!zjm+TYHcGfT{g4>cvC(GB;xR9Y>+3fpAPLV#G3>X
zO&)Q#^1P*?x&8XNCR}c(_z(cYf$YGmPXqJ~^>^>|a!2XS)Ow2<e%SIr^9Q`BG&$^&
zT9*UCDNe|*e9c{mgrhv_du&9PIiu2A>B=wVZd+q3o(wn2ZOtTy<`r8jcD*kb{6T3$
zMlhv=*yavBgS{-z@=SSdGZ8$&$+}ZD94)9sd0=HmvHnN8a7HktHmewN%S_A|{9c-3
z^y@hD-}$C|?Zir}N%sd8M+(aE`?Hz)s4VMJG!RRvJZ}<-tTDGVEghQ7PO!ZX$P&l2
zOz>o-GyUF&GIY_wCYT9%vlgfP(iXAxZHx_AU%&?JjgVa`+6h2H#Nq_}om43u<W-pz
zRm*Zyv=qSFEcOUuVOO4rSa=N5{L+Qb@>L+?usUPc=afNFjVwe!L*la=fzVHE5%n8l
zW02vJ<1#^^0KD?zbdqi;$41M4OMP=&08!Wo!NLz&hQ!9bAO#9&7Y*@b3&aBGb{>+C
z<-b^H2q3lwq9NfW>>wqhd;zak!9XCNh8z*o8^BJa1F%A5B`_M6u|&M^GDF53P4Tx*
zlpTmqE2lHvM_Xo&Od^8nZhJ3o6^n2itJ1_4JyP5ee|O+ArCevxL<RnHo!8|$_orUx
Yf2j@(fG*v@L;wH)07*qoM6N<$g5GXc`~Uy|

literal 0
HcmV?d00001


From 3dc641680d215ab070f299be53a2676d9885b0ac Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 13 Oct 2020 10:56:13 +0200
Subject: [PATCH 2/3] added template for receiving json chat message

---
 Server/Models/ServerClient.cs                   | 11 +++++++++--
 Server/Models/ServerCommunication.cs            |  8 ++++++++
 Server/Server.csproj                            |  1 +
 SharedClientServer/JSONConvert.cs               | 17 +++++++++++++++++
 SharedClientServer/SharedClientServer.projitems |  1 +
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 SharedClientServer/JSONConvert.cs

diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index bb8f2e9..94a563f 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -86,16 +86,23 @@ namespace Server.Models
         {
             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:
-                    // message data
+                    // 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:
-                    // json data
+                    // object data
                     break;
                 default:
                     Debug.WriteLine("Received weird identifier: " + id);
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 0ead864..8869581 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -85,5 +85,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);
+            }
+        }
     }
 }
diff --git a/Server/Server.csproj b/Server/Server.csproj
index afc85b6..c6ad1ce 100644
--- a/Server/Server.csproj
+++ b/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>
 
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
new file mode 100644
index 0000000..004567a
--- /dev/null
+++ b/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);
+        }
+    }
+}
diff --git a/SharedClientServer/SharedClientServer.projitems b/SharedClientServer/SharedClientServer.projitems
index e7cdd0b..97e39cb 100644
--- a/SharedClientServer/SharedClientServer.projitems
+++ b/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>
\ No newline at end of file

From 9bd45a5ba6f9a6abd6bba8823de3cc46e16ebd97 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Tue, 13 Oct 2020 11:11:51 +0200
Subject: [PATCH 3/3] added clients connected

---
 Server/Models/Information.cs         |  2 +-
 Server/Models/ServerCommunication.cs |  1 +
 Server/ViewModels/MainViewModel.cs   | 10 ++--------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Server/Models/Information.cs b/Server/Models/Information.cs
index eb2b690..1764312 100644
--- a/Server/Models/Information.cs
+++ b/Server/Models/Information.cs
@@ -17,6 +17,6 @@ namespace Server.Models
             }
         }
 
-        public int ClientsConnected{ get; set; }
+        public int ClientsConnected{ get { return ServerCommunication.INSTANCE.ClientsConnected; } }
     }
 }
\ No newline at end of file
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 8869581..4dcf07a 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/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
diff --git a/Server/ViewModels/MainViewModel.cs b/Server/ViewModels/MainViewModel.cs
index bd7d0a4..0ff5359 100644
--- a/Server/ViewModels/MainViewModel.cs
+++ b/Server/ViewModels/MainViewModel.cs
@@ -22,10 +22,10 @@ namespace Server.ViewModels
 
         public MainViewModel(MainWindow mainWindow)
         {
+            serverCommunication = ServerCommunication.INSTANCE;
             this.mainWindow = mainWindow;
             Debug.WriteLine("init mainviewmodel");
             InformationModel = new Information();
-            InformationModel.ClientsConnected = 0;
             InformationModel.CanStartServer = true;
             InformationModel.ServerOnline = false;
             //BitmapImage onlineImg = new BitmapImage(new Uri(@"/img/online.png",UriKind.Relative));
@@ -34,15 +34,9 @@ namespace Server.ViewModels
             this.ServerStartCommand = new RelayCommand(() =>
             {
                 Debug.WriteLine("connect button clicked");
-                if (serverCommunication == null)
-                {
-                    Debug.WriteLine("making new server communication");
-                    serverCommunication = ServerCommunication.INSTANCE;
-                }
+                
                 if (!serverCommunication.Started)
                 {
-                    
-                    
                     serverCommunication.Start();
                     InformationModel.ServerOnline = true;
                     InformationModel.CanStartServer = false;