[ADDITION] tried to fix the async methods.
This commit is contained in:
@@ -48,6 +48,9 @@ namespace Client
|
||||
|
||||
private void OnReadComplete(IAsyncResult ar)
|
||||
{
|
||||
if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.tcpClient.Client.Connected)
|
||||
return;
|
||||
|
||||
int amountReceived = stream.EndRead(ar);
|
||||
|
||||
if (totalBufferReceived + amountReceived > 1024)
|
||||
@@ -140,6 +143,9 @@ namespace Client
|
||||
|
||||
case JSONConvert.RANDOMWORD:
|
||||
//Flag byte for receiving the random word.
|
||||
int lobbyId = JSONConvert.GetLobbyID(payload);
|
||||
|
||||
if(data.Lobby?.ID == lobbyId)
|
||||
ViewModels.ViewModelGame.HandleRandomWord(JSONConvert.GetRandomWord(payload));
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -9,6 +9,8 @@ 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
|
||||
@@ -108,9 +110,9 @@ 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:
|
||||
@@ -145,7 +147,7 @@ namespace Server.Models
|
||||
case JSONConvert.LOBBY:
|
||||
// lobby data
|
||||
LobbyIdentifier l = JSONConvert.GetLobbyIdentifier(payload);
|
||||
handleLobbyMessage(payload,l);
|
||||
handleLobbyMessage(payload, l);
|
||||
break;
|
||||
case JSONConvert.CANVAS:
|
||||
Debug.WriteLine("GOT A MESSAGE FROM THE CLIENT ABOUT THE CANVAS!!!");
|
||||
@@ -179,15 +181,17 @@ namespace Server.Models
|
||||
break;
|
||||
case LobbyIdentifier.JOIN:
|
||||
int id = JSONConvert.GetLobbyID(payload);
|
||||
ServerCommunication.INSTANCE.JoinLobby(this.User,id);
|
||||
ServerCommunication.INSTANCE.JoinLobby(this.User, id);
|
||||
sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
|
||||
ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
|
||||
|
||||
serverCom.SendToLobby(serverCom.GetLobbyForUser(User), JSONConvert.GetMessageToSend(RANDOMWORD, new
|
||||
Task.Run(SendLobbyData);
|
||||
|
||||
serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
|
||||
{
|
||||
id = serverCom.GetLobbyForUser(User).ID,
|
||||
word = JSONConvert.SendRandomWord("WordsForGame.json")
|
||||
}));
|
||||
|
||||
ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
|
||||
break;
|
||||
case LobbyIdentifier.LEAVE:
|
||||
id = JSONConvert.GetLobbyID(payload);
|
||||
@@ -198,6 +202,20 @@ namespace Server.Models
|
||||
}
|
||||
}
|
||||
|
||||
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>
|
||||
|
||||
@@ -90,7 +90,7 @@ namespace Server.Models
|
||||
/// send a message to all tcp clients in the list
|
||||
/// </summary>
|
||||
/// <param name="message">the message to send</param>
|
||||
public void sendToAll(byte[] message)
|
||||
public async void sendToAll(byte[] message)
|
||||
{
|
||||
foreach (ServerClient sc in serverClients)
|
||||
{
|
||||
|
||||
@@ -184,6 +184,7 @@ namespace SharedClientServer
|
||||
int index = random.Next(0, 24);
|
||||
|
||||
Debug.WriteLine($"[SERVERCLIENT] Sending random words {words}");
|
||||
|
||||
return words.words[index];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user