Using this optimization also for AspNetCore WebSockets Server

Author: darkl

src/net45/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs

@@ -33,7 +33,7 @@ public override void Dispose()
 
         protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)
         {
-            WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;
+            IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;
 
             Task task = Task.Run(casted.RunAsync);
 
@@ -49,6 +49,8 @@ protected override IWampConnection<TMessage> CreateBinaryConnection<TMessage>
             (WebSocketData connection,
              IWampBinaryBinding<TMessage> binding)
         {
+            ConfigureComputeBytes(binding);
+
             return new BinaryWebSocketConnection<TMessage>
                 (connection.WebSocket,
                  binding,
@@ -60,13 +62,23 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
             (WebSocketData connection,
              IWampTextBinding<TMessage> binding)
         {
+            ConfigureComputeBytes(binding);
+
             return new TextWebSocketConnection<TMessage>
                 (connection.WebSocket,
                  binding,
                  new AspNetCoreCookieProvider(connection.HttpContext),
                  AuthenticatorFactory);
         }
 
+        private void ConfigureComputeBytes<TMessage, TRaw>(IWampTransportBinding<TMessage, TRaw> binding)
+        {
+            if (binding.ComputeBytes == null)
+            {
+                binding.ComputeBytes = true;
+            }
+        }
+
         public override void Open()
         {
             mHandler = this.WebSocketHandler;

src/net45/Extensions/WampSharp.WebSockets/WebSockets/BinaryWebSocketWrapperConnection.cs

@@ -6,7 +6,7 @@
 
 namespace WampSharp.WebSockets
 {
-    public class BinaryWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnection<TMessage>
+    public class BinaryWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnection<TMessage, byte[]>
     {
         private readonly IWampBinaryBinding<TMessage> mBinding;
 
@@ -22,12 +22,6 @@ protected BinaryWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSock
             mBinding = binding;
         }
 
-        protected override ArraySegment<byte> GetMessageInBytes(WampMessage<object> message)
-        {
-            byte[] bytes = mBinding.Format(message);
-            return new ArraySegment<byte>(bytes);
-        }
-
         protected override WebSocketMessageType WebSocketMessageType => WebSocketMessageType.Binary;
     }
 }

src/net45/Extensions/WampSharp.WebSockets/WebSockets/IWampWebSocketWrapperConnection.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace WampSharp.WebSockets
+{
+    public interface IWampWebSocketWrapperConnection
+    {
+        IClientWebSocketWrapper ClientWebSocket { get; }
+        Task RunAsync();
+    }
+}

src/net45/Extensions/WampSharp.WebSockets/WebSockets/TextWebSocketWrapperConnection.cs

@@ -7,7 +7,7 @@
 
 namespace WampSharp.WebSockets
 {
-    public class TextWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnection<TMessage>
+    public class TextWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnection<TMessage, string>
     {
         private readonly IWampTextBinding<TMessage> mBinding;
 
@@ -23,15 +23,6 @@ protected TextWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket
             mBinding = binding;
         }
 
-        protected override ArraySegment<byte> GetMessageInBytes(WampMessage<object> message)
-        {
-            string formatted = mBinding.Format(message);
-
-            byte[] bytes = Encoding.UTF8.GetBytes(formatted);
-
-            return new ArraySegment<byte>(bytes);
-        }
-
         protected override WebSocketMessageType WebSocketMessageType => WebSocketMessageType.Text;
     }
 }

src/net45/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs

@@ -13,15 +13,15 @@ namespace WampSharp.WebSockets
 {
     // Based on this sample:
     // https://code.msdn.microsoft.com/vstudio/The-simple-WebSocket-4524921c
-    public abstract class WebSocketWrapperConnection<TMessage> : AsyncWebSocketWampConnection<TMessage>
+    public abstract class WebSocketWrapperConnection<TMessage, TRaw> : AsyncWebSocketWampConnection<TMessage>, IWampWebSocketWrapperConnection
     {
-        private readonly IWampStreamingMessageParser<TMessage> mParser;
+        private readonly IWampMessageParser<TMessage, TRaw> mParser;
         private readonly IWebSocketWrapper mWebSocket;
         private CancellationTokenSource mCancellationTokenSource;
         private readonly Uri mAddressUri;
         private readonly CancellationToken mCancellationToken;
 
-        public WebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampStreamingMessageParser<TMessage> parser, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
+        public WebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampMessageParser<TMessage, TRaw> parser, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
             base(cookieProvider, cookieAuthenticatorFactory)
         {
             mWebSocket = webSocket;
@@ -30,7 +30,7 @@ public WebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampStreamingMes
             mCancellationToken = mCancellationTokenSource.Token;
         }
 
-        protected WebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri, string protocolName, IWampStreamingMessageParser<TMessage> parser) :
+        protected WebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri, string protocolName, IWampMessageParser<TMessage, TRaw> parser) :
             this(clientWebSocket, parser, null, null)
         {
             clientWebSocket.Options.AddSubProtocol(protocolName);
@@ -44,7 +44,11 @@ protected override Task SendAsync(WampMessage<object> message)
             return mWebSocket.SendAsync(messageToSend, WebSocketMessageType, true, mCancellationToken);
         }
 
-        protected abstract ArraySegment<byte> GetMessageInBytes(WampMessage<object> message);
+        private ArraySegment<byte> GetMessageInBytes(WampMessage<object> message)
+        {
+            byte[] bytes = mParser.GetBytes(message);
+            return new ArraySegment<byte>(bytes);
+        }
 
         protected abstract WebSocketMessageType WebSocketMessageType { get; }
 

src/net45/WampSharp/WAMP2/V2/Binding/Parsers/WampMessageParserExtensions.cs

@@ -0,0 +1,24 @@
+using WampSharp.Core.Message;
+using WampSharp.V2.Binding.Messages;
+
+namespace WampSharp.V2.Binding.Parsers
+{
+    public static class WampMessageParserExtensions
+    {
+        public static byte[] GetBytes<TMessage, TRaw>(this IWampMessageParser<TMessage, TRaw> parser,
+                                                      WampMessage<object> message)
+        {
+            if (message is RawMessage<TRaw> rawMessage &&
+                rawMessage.Bytes != null)
+            {
+                return rawMessage.Bytes;
+            }
+            else
+            {
+                TRaw raw = parser.Format(message);
+                byte[] binary = parser.GetBytes(raw);
+                return binary;
+            }
+        }
+    }
+}

src/net45/WampSharp/WAMP2/V2/Binding/WampTransportBinding.cs

@@ -45,7 +45,6 @@ public override WampMessage<object> GetRawMessage(WampMessage<object> message)
 
         private RawMessage<TRaw> GetFormattedMessage(WampMessage<object> message)
         {
-
             if (!(message is RawMessage<TRaw> result))
             {
                 result = new RawMessage<TRaw>(message);