Added send async message overload on relay client

Author: ReferenceType

Protobuff/Components/MessageEnvelope.cs

@@ -83,7 +83,11 @@ public T UnpackPayload<T>() where T : IProtoMessage
         {
             return serialiser.UnpackEnvelopedMessage<T>(this);
         }
-
+        /// <summary>
+        /// Locks the payload bytes by making a copy.
+        /// You Must Lock the bytes or unpack payload if message will leave the stack.
+        /// Payload will be overwitten on next message
+        /// </summary>
         public void LockBytes()
         {
             if (payload == null || IsLocked)

Protobuff/P2P/RelayClient.cs

@@ -346,8 +346,6 @@ public void SendUdpMesssage(Guid toId, byte[] data, int offset, int count, strin
                 udpRelayClient.SendAsyncMessage(env, data, offset, count);
         }
 
-
-
         public void SendAsyncMessage(Guid toId, MessageEnvelope message)
         {
             if (!Peers.TryGetValue(toId, out _) && toId != sessionId)
@@ -362,18 +360,29 @@ public void SendAsyncMessage<T>(Guid toId, T message, string messageHeader = nul
             if (!Peers.TryGetValue(toId, out _) && toId != sessionId)
                 return;
 
-            var envelopedMessage = InternalMessageResources.MakeRelayMessage(sessionId, toId, null);
-            envelopedMessage.Header = messageHeader == null ? typeof(T).Name : messageHeader;
-            protoClient.SendAsyncMessage(envelopedMessage, message);
+            var envelope = InternalMessageResources.MakeRelayMessage(sessionId, toId, null);
+            envelope.Header = messageHeader == null ? typeof(T).Name : messageHeader;
+            protoClient.SendAsyncMessage(envelope, message);
+        }
+
+        public void SendAsyncMessage<T>(Guid toId, MessageEnvelope envelope, T message) where T : IProtoMessage
+        {
+            if (!Peers.TryGetValue(toId, out _) && toId != sessionId)
+                return;
+
+            envelope.From = sessionId;
+            envelope.To = toId;
+            protoClient.SendAsyncMessage(envelope, message);
         }
+
         public void SendAsyncMessage(Guid toId, byte[] data, string dataName)
         {
             if (!Peers.TryGetValue(toId, out _) && toId != sessionId)
                 return;
 
-            var envelopedMessage = InternalMessageResources.MakeRelayMessage(sessionId, toId, null);
-            envelopedMessage.Header = dataName;
-            protoClient.SendAsyncMessage(envelopedMessage, data, 0, data.Length);
+            var envelope = InternalMessageResources.MakeRelayMessage(sessionId, toId, null);
+            envelope.Header = dataName;
+            protoClient.SendAsyncMessage(envelope, data, 0, data.Length);
         }
 
         public void SendAsyncMessage(Guid toId, byte[] data, int offset, int count, string dataName)
@@ -388,17 +397,15 @@ public void SendAsyncMessage(Guid toId, byte[] data, int offset, int count, stri
 
         public async Task<MessageEnvelope> SendRequestAndWaitResponse<T>(Guid toId, T message, string messageHeader = null, int timeoutMs = 10000) where T : IProtoMessage
         {
+            var envelope = InternalMessageResources.MakeRelayRequestMessage(Guid.NewGuid(), sessionId, toId, null);
+            envelope.Header = messageHeader == null ? typeof(T).Name : messageHeader;
 
-            var envelopedMessage = InternalMessageResources.MakeRelayRequestMessage(Guid.NewGuid(), sessionId, toId, null);
-            envelopedMessage.Header = messageHeader == null ? typeof(T).Name : messageHeader;
-
-            var result = await protoClient.SendMessageAndWaitResponse(envelopedMessage, message, timeoutMs);
+            var result = await protoClient.SendMessageAndWaitResponse(envelope, message, timeoutMs);
             return result;
         }
 
         public async Task<MessageEnvelope> SendRequestAndWaitResponse(Guid toId, byte[] data, string dataName, int timeoutMs = 10000)
         {
-
             var envelopedMessage = InternalMessageResources.MakeRelayRequestMessage(Guid.NewGuid(), sessionId, toId, null);
             envelopedMessage.Header = dataName;
 
@@ -422,6 +429,15 @@ public async Task<MessageEnvelope> SendRequestAndWaitResponse(Guid toId, Message
             return response;
         }
 
+        public async Task<MessageEnvelope> SendRequestAndWaitResponse<T>(Guid toId, MessageEnvelope envelope, T message ,int timeoutMs = 10000) where T:IProtoMessage
+        {
+            envelope.From = sessionId;
+            envelope.To = toId;
+
+            var response = await protoClient.SendMessageAndWaitResponse(envelope,message, timeoutMs);
+            return response;
+        }
+
         #endregion
 
         private void HandleMessageReceived(MessageEnvelope message)