Drain messagewebsocket's stream before passing it via events

Author: Trolldemorted

Signal-Windows.Lib/Signal-Windows.Lib.csproj

@@ -166,7 +166,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="libsignal-service-dotnet">
-      <Version>2.7.5.15</Version>
+      <Version>2.7.5.16</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore">
       <Version>1.1.5</Version>

Signal-Windows.Lib/SignalWebSocket.cs

@@ -49,23 +49,21 @@ private void WebSocket_Closed(IWebSocket sender, WebSocketClosedEventArgs args)
             Logger.LogWarning("WebSocket_Closed() {0} ({1})", args.Code, args.Reason);
         }
 
-        private async void WebSocket_MessageReceived(MessageWebSocket sender, MessageWebSocketMessageReceivedEventArgs args)
+        private void WebSocket_MessageReceived(MessageWebSocket sender, MessageWebSocketMessageReceivedEventArgs args)
         {
             try
             {
                 using (var data = args.GetDataStream())
+                using (var buffer = new MemoryStream())
                 {
-                    MessageReceived.Invoke(sender, new SignalWebSocketMessageReceivedEventArgs() { Message = data.AsStreamForRead() });
+                    data.AsStreamForRead().CopyTo(buffer);
+                    MessageReceived.Invoke(sender, new SignalWebSocketMessageReceivedEventArgs() { Message = buffer.ToArray() });
                 }
             }
             catch(Exception e)
             {
                 Logger.LogError("WebSocket_MessageReceived failed: {0}\n{1}", e.Message, e.StackTrace);
-                try
-                {
-                    await ConnectAsync();
-                }
-                catch (TaskCanceledException) { }
+                Task.Run(ConnectAsync);
             }
         }