попытка буферизировать сообщения не увенчалась успехом, но может использоваться в будущем

mROA/Abstract/IInteractionModule.cs

@@ -8,4 +8,6 @@ public interface INextGenerationInteractionModule : IInjectableModule
     public Stream? BaseStream { get; set; }
     Task<NetworkMessage> GetNextMessageReceiving();
     Task PostMessage(NetworkMessage message);
+    void HandleMessage(NetworkMessage message);
+    NetworkMessage[] UnhandledMessages { get; }
 }

mROA/Implementation/Frontend/RequestExtractor.cs

@@ -61,7 +61,7 @@ public class RequestExtractor : IRequestExtractor
                 var request = 
                     _representationModule!.GetMessage<DefaultCallRequest>(messageType: MessageType.CallRequest);
 
-                Console.WriteLine("Executing {0}", request.Id);
+                // Console.WriteLine("Executing {0}", request.Id);
                 
                 if (request.Parameter is not null)
                 {

mROA/Implementation/NextGenerationInteractionModule.cs

@@ -1,6 +1,4 @@
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.Json;
+using System.Text;
 using mROA.Abstract;
 
 namespace mROA.Implementation;
@@ -15,7 +13,7 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
     private readonly byte[] _buffer = new byte[BufferSize];
     private List<NetworkMessage> _messageBuffer = [];
 
-    
+
     public void Inject<T>(T dependency)
     {
         switch (dependency)
@@ -32,27 +30,43 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
 
     public Task<NetworkMessage> GetNextMessageReceiving()
     {
-        Console.WriteLine(_currentReceiving?.Status);
-        if (_currentReceiving is { Status: TaskStatus.Running })
-            return _currentReceiving;
+        // Console.WriteLine(_currentReceiving?.Status);
 
-        _currentReceiving = Task.Run(GetNextMessage);
-        return _currentReceiving;
+        if (_currentReceiving == null)
+        {
+            _currentReceiving = Task.Run(GetNextMessage);
+            return _currentReceiving;
+        }
+        lock (_currentReceiving)
+        {
+            if (_currentReceiving is { Status: TaskStatus.Running })
+                return _currentReceiving;
+
+            _currentReceiving = Task.Run(GetNextMessage);
+            return _currentReceiving;
+        }
     }
 
     public async Task PostMessage(NetworkMessage message)
     {
         if (BaseStream == null)
             throw new NullReferenceException("BaseStream is null");
-        
-        Console.WriteLine("Sending {0}", JsonSerializer.Serialize(message));
 
-        
+        // Console.WriteLine("Sending {0}", JsonSerializer.Serialize(message));
+
+
         var rawMessage = _serialization.Serialize(message);
         await BaseStream.WriteAsync(BitConverter.GetBytes((ushort)rawMessage.Length).AsMemory(0, sizeof(ushort)));
         await BaseStream.WriteAsync(rawMessage);
     }
 
+    public void HandleMessage(NetworkMessage message)
+    {
+        _messageBuffer.Remove(message);
+    }
+
+    public NetworkMessage[] UnhandledMessages => _messageBuffer.ToArray();
+
     private NetworkMessage GetNextMessage()
     {
         if (BaseStream == null)
@@ -62,14 +76,14 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
             throw new NullReferenceException("Serialization toolkit is null");
 
 
-        Console.WriteLine("Receiving message");
+        // Console.WriteLine("Receiving message");
         BaseStream.ReadExactly(_buffer, 0, 2);
         var len = BitConverter.ToUInt16(_buffer, 0);
         BaseStream.ReadExactly(_buffer, 0, len);
 
-        Console.WriteLine("Receiving {0}", Encoding.Default.GetString(_buffer[..len]));
-        
-        var message = JsonSerializer.Deserialize<NetworkMessage>(Encoding.Default.GetString(_buffer[..len]));
+        // Console.WriteLine("Receiving {0}", Encoding.Default.GetString(_buffer[..len]));
+
+        var message = _serialization.Deserialize<NetworkMessage>(_buffer[..len]);
         _messageBuffer.Add(message!);
 
         return message!;

mROA/Implementation/RepresentationModule.cs

@@ -35,13 +35,26 @@ public class RepresentationModule : IRepresentationModule
 
     public async Task<byte[]> GetRawMessage(Guid? requestId = null, MessageType? messageType = null)
     {
-        while (true)
+        var fromBuffer =
+            _interaction.UnhandledMessages.FirstOrDefault(message =>
+                (requestId is null || message.Id == requestId) &&
+                (messageType is null || message.SchemaId == messageType));
+        if (fromBuffer == null)
         {
-            var message = await _interaction.GetNextMessageReceiving();
-            if ((requestId is null || message.Id == requestId) &&
-                (messageType is null || message.SchemaId == messageType))
-                return message.Data;
+            while (true)
+            {
+                var message = await _interaction.GetNextMessageReceiving();
+                if ((requestId is null || message.Id == requestId) &&
+                    (messageType is null || message.SchemaId == messageType))
+                {
+                    _interaction.HandleMessage(message);
+                    return message.Data;
+                }
+            }
         }
+
+        _interaction.HandleMessage(fromBuffer);
+        return fromBuffer.Data;
     }
 
     public async Task PostCallMessageAsync<T>(Guid id, MessageType messageType, T payload)