Make incoming messages API async

Author: Trolldemorted

libsignal-service-dotnet/SignalServiceMessagePipe.cs

@@ -11,6 +11,7 @@
 using System.IO;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace libsignalservice
 {
@@ -39,7 +40,7 @@ internal SignalServiceMessagePipe(CancellationToken token, SignalWebSocketConnec
         /// Blocks until a message was received, calls the IMessagePipeCallback and confirms the message to the server, unless the pipe's token is cancelled.
         /// </summary>
         /// <param name="callback"></param>
-        public void ReadBlocking(IMessagePipeCallback callback)
+        public async Task ReadBlocking(IMessagePipeCallback callback)
         {
             Logger.LogTrace("ReadBlocking()");
             WebSocketRequestMessage request = Websocket.ReadRequestBlocking();
@@ -51,7 +52,7 @@ public void ReadBlocking(IMessagePipeCallback callback)
                 try
                 {
                     Logger.LogDebug("Calling callback with message {0}", request.Id);
-                    callback.OnMessage(message);
+                    await callback.OnMessage(message);
                 }
                 finally
                 {
@@ -65,7 +66,7 @@ public void ReadBlocking(IMessagePipeCallback callback)
             else if (IsPipeEmptyMessage(request))
             {
                 Logger.LogInformation("Calling callback with SignalServiceMessagePipeEmptyMessage");
-                callback.OnMessage(new SignalServiceMessagePipeEmptyMessage());
+                await callback.OnMessage(new SignalServiceMessagePipeEmptyMessage());
             }
             else
             {
@@ -205,7 +206,7 @@ public interface IMessagePipeCallback
             /// This message is called for every message received via the pipe.
             /// </summary>
             /// <param name="message">The received message</param>
-            void OnMessage(SignalServiceMessagePipeMessage message);
+            Task OnMessage(SignalServiceMessagePipeMessage message);
         }
     }
 }

libsignal-service-dotnet/SignalServiceMessageReceiver.cs

@@ -15,6 +15,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using static libsignalservice.messages.SignalServiceAttachment;
 using static libsignalservice.SignalServiceMessagePipe;
 
@@ -116,7 +117,7 @@ public SignalServiceMessagePipe CreateMessagePipe()
             return new SignalServiceMessagePipe(Token, webSocket, CredentialsProvider);
         }
 
-        public List<SignalServiceEnvelope> RetrieveMessages(IMessagePipeCallback callback)
+        public async Task<List<SignalServiceEnvelope>> RetrieveMessages(IMessagePipeCallback callback)
         {
             List<SignalServiceEnvelope> results = new List<SignalServiceEnvelope>();
             List<SignalServiceEnvelopeEntity> entities = Socket.GetMessages();
@@ -128,7 +129,7 @@ public List<SignalServiceEnvelope> RetrieveMessages(IMessagePipeCallback callbac
                                                                       (int)entity.Timestamp, entity.Message,
                                                                       entity.Content);
 
-                callback.OnMessage(envelope);
+                await callback.OnMessage(envelope);
                 results.Add(envelope);
 
                 Socket.AcknowledgeMessage(entity.Source, entity.Timestamp);