Metadata messages

Cloet · Feb 6, 2020 · cbdb8e4 · cbdb8e4
1 parent d77cc56
commit cbdb8e4
Show file tree

Hide file tree

Showing 16 changed files with 277 additions and 134 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -13,5 +13,4 @@ jobs:
       with:
         dotnet-version: '3.1.100' # SDK Version to use.
     - run: dotnet build SimpleSockets --configuration Release
-    - run: dotnet test Tests/Test.Sockets.Basic --configuration Release
-    - run: dotnet test Tests/Test.Sockets.Parallel --configuration Release
+    - run: dotnet test Tests/Test.Sockets.Basic --configuration Release
diff --git a/Examples/Console/NetCore.Console.Client/Client.cs b/Examples/Console/NetCore.Console.Client/Client.cs
@@ -326,7 +326,7 @@ private static void ClientOnFileReceiver(SimpleSocketClient a, int currentPart,
 				WriteLine("File received and stored at location: " + loc);
 		}
 
-		private static void CustomHeader(SimpleSocket a, object msg, IDictionary<object, object> dict)
+		private static void CustomHeader(SimpleSocket a, object msg, IDictionary<object, object> dict, Type objectType)
 		{
 			WriteLine("Test");
 			// WriteLine("Bytes received from server with header = " + header + " and message = " + msg);

diff --git a/Examples/Console/NetCore.Console.Server/Server.cs b/Examples/Console/NetCore.Console.Server/Server.cs
@@ -358,7 +358,7 @@ private static void ListenerOnFileReceiver(IClientInfo client, int currentPart,
 				WriteLine("File received and stored at location: " + loc);
 		}
 
-		private static void CustomHeaderReceived(IClientInfo client, object msg, IDictionary<object, object> metadata)
+		private static void CustomHeaderReceived(IClientInfo client, object msg, IDictionary<object, object> metadata, Type objectType)
 		{
 			WriteLine("Test");
 			// WriteLine("The server received a message from the client with ID " + client.Id + " the header is : " + header + " and the message is : " + msg);

diff --git a/SimpleSockets/Client/SimpleSocketClient.cs b/SimpleSockets/Client/SimpleSocketClient.cs
@@ -19,7 +19,7 @@ namespace SimpleSockets.Client
 
 	public delegate void MessageReceivedDelegate(SimpleSocketClient client, string msg);
 
-	public delegate void MessageWithMetadataReceivedDelegate(SimpleSocketClient client, object message, IDictionary<object,object> metadata);
+	public delegate void MessageWithMetadataReceivedDelegate(SimpleSocketClient client, object message, IDictionary<object,object> metadata, Type ObjectType);
 
 	public delegate void BytesReceivedDelegate(SimpleSocketClient client, byte[] messageBytes);
 
@@ -383,9 +383,9 @@ protected internal override void RaiseMessageContractReceived(IClientInfo client
 			contract.RaiseOnMessageReceived(this, client, contract.DeserializeToObject(data), contract.MessageHeader);
 		}
 
-		protected internal override void RaiseMessageWithMetaDataReceived(IClientInfo client, object message, IDictionary<object,object> metadata)
+		protected internal override void RaiseMessageWithMetaDataReceived(IClientInfo client, object message, IDictionary<object,object> metadata, Type objectType)
 		{
-			MessageWithMetadataReceived?.Invoke(this, message, metadata);
+			MessageWithMetadataReceived?.Invoke(this, message, metadata, objectType);
 		}
 
 		protected internal override void RaiseBytesReceived(IClientInfo client, byte[] data)

diff --git a/SimpleSockets/Client/SimpleSocketTcpClient.cs b/SimpleSockets/Client/SimpleSocketTcpClient.cs
@@ -43,6 +43,8 @@ public override void StartClient(string ipServer, int port, int reconnectInSecon
 
 			if (EnableExtendedAuth)
 				SendAuthMessage();
+			else
+				SendBasicAuthMessage();
 
 			Endpoint = new IPEndPoint(GetIp(ipServer), port);
 
@@ -217,7 +219,7 @@ protected internal override void Receive(IClientMetadata state, int offset = 0)
 			}
 		}
 
-		protected override async void ReceiveCallback(IAsyncResult result)
+		protected override void ReceiveCallback(IAsyncResult result)
 		{
 			var state = (ClientMetadata)result.AsyncState;
 
@@ -247,11 +249,11 @@ protected override async void ReceiveCallback(IAsyncResult result)
 					{
 						if (state.SimpleMessage == null)
 							state.SimpleMessage = new SimpleMessage(state, this, true);
-						await state.SimpleMessage.ReadBytesAndBuildMessage(receive);
+						state.SimpleMessage.ReadBytesAndBuildMessage(receive);
 					}
 					else if (receive > 0)
 					{
-						await state.SimpleMessage.ReadBytesAndBuildMessage(receive);
+						state.SimpleMessage.ReadBytesAndBuildMessage(receive);
 					}
 				}
 

diff --git a/SimpleSockets/Client/SimpleSocketTcpSslClient.cs b/SimpleSockets/Client/SimpleSocketTcpSslClient.cs
@@ -83,13 +83,14 @@ public override void StartClient(string ipServer, int port, int reconnectInSecon
 
 			if (EnableExtendedAuth)
 				SendAuthMessage();
+			else
+				SendBasicAuthMessage();
 
 			Endpoint = new IPEndPoint(GetIp(ipServer), port);
 
 			TokenSource = new CancellationTokenSource();
 			Token = TokenSource.Token;
 
-
 			Task.Run(SendFromQueue, Token);
 
 			Task.Run(() =>
@@ -339,7 +340,7 @@ protected internal override void Receive(IClientMetadata state, int offset = 0)
 			}
 		}
 
-		protected override async void ReceiveCallback(IAsyncResult result)
+		protected override void ReceiveCallback(IAsyncResult result)
 		{
 			var state = (ClientMetadata)result.AsyncState;
 			try
@@ -369,18 +370,19 @@ protected override async void ReceiveCallback(IAsyncResult result)
 					{
 						if (state.SimpleMessage == null)
 							state.SimpleMessage = new SimpleMessage(state, this, Debug);
-						await state.SimpleMessage.ReadBytesAndBuildMessage(receive);
+						state.SimpleMessage.ReadBytesAndBuildMessage(receive);
 					}
 					else if (receive > 0)
-						await state.SimpleMessage.ReadBytesAndBuildMessage(receive);
+						state.SimpleMessage.ReadBytesAndBuildMessage(receive);
 				}
 
 				_mreRead.Set();
 				_mreReceiving.Set();
 			}
 			catch (SocketException se)
 			{
-				RaiseLog("Server was forcibly closed.");
+				Log("Server was forcibly closed.");
+				Log(se);
 				state.Reset();
 				DisposeSslStream();
 				_mreRead.Set();