sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lars
2020-10-20 16:38:59 +02:00
parent 84bf1b3e64 e90d782887
commit 1a539efdd1
8 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Server/Models/ServerClient.cs
View File

@@ -10,12 +10,12 @@ namespace Server.Models
{
class ServerClient : ObservableObject
{
public string Username { get; set; }
private TcpClient tcpClient;
private NetworkStream stream;
private byte[] buffer = new byte[1024];
private byte[] totalBuffer = new byte[1024];
private int totalBufferReceived = 0;
public User User { get; set; }
/// <summary>
@@ -84,24 +84,25 @@ namespace Server.Models
/// <param name="message">the incoming message</param>
private void HandleIncomingMessage(byte[] message)
{
Debug.WriteLine($"Got message from {Username} : {message}");
Debug.WriteLine($"Got message from {User?.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:
case JSONConvert.LOGIN:
// json log in username data
string uName = JSONConvert.GetUsernameLogin(message);
string uName = JSONConvert.GetUsernameLogin(payload);
if (uName != null)
{
Username = uName;
Debug.WriteLine("[SERVERCLIENT] set username to " + Username);
User = new User(uName);
User.Username = uName;
Debug.WriteLine("[SERVERCLIENT] set username to " + uName);
}
break;
case 0x02:
case JSONConvert.MESSAGE:
// json message data
(string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
string textUsername = combo.Item1;
@@ -110,10 +111,10 @@ namespace Server.Models
// todo handle sending to all except this user the username and message to display in chat
break;
case 0x03:
case JSONConvert.LOBBY:
// lobby data
break;
case 0x04:
case JSONConvert.CANVAS:
// canvas data
// todo send canvas data to all other serverclients in lobby
break;

3
Server/Models/ServerCommunication.cs
View File

@@ -18,6 +18,7 @@ namespace Server.Models
public List<Lobby> lobbies;
private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies;
public Action newClientAction;
/// <summary>
/// use a padlock object to make sure the singleton is thread-safe
@@ -98,7 +99,7 @@ namespace Server.Models
{
foreach (ServerClient sc in serverClients)
{
if (sc.Username != username) sc.sendMessage(message);
if (sc.User.Username != username) sc.sendMessage(message);
}
}