Text message API changed, bug fix

Author: gencebay

src/NetCoreStack.WebSockets/ConnectionManager.cs

@@ -42,7 +42,7 @@ public ConnectionManager(IServiceProvider serviceProvider,
             Connections = new ConcurrentDictionary<string, WebSocketTransport>(StringComparer.OrdinalIgnoreCase);
         }
 
-        private async Task<byte[]> PrepareFramesBytesAsync(byte[] body, IDictionary<string, object> properties = null)
+        private async Task<byte[]> ToBytesAsync(byte[] body, IDictionary<string, object> properties = null)
         {
             if (body == null)
             {
@@ -67,7 +67,7 @@ private async Task<byte[]> PrepareFramesBytesAsync(byte[] body, IDictionary<stri
 
             _headerProvider.Invoke(properties);
             string props = JsonConvert.SerializeObject(properties);
-            byte[] header = Encoding.UTF8.GetBytes($"{props}");
+            byte[] header = Encoding.UTF8.GetBytes(props);
 
             if (!compressed)
             {
@@ -187,22 +187,21 @@ public async Task BroadcastBinaryAsync(byte[] inputs, IDictionary<string, object
                 return;
             }
 
-            var bytes = await PrepareFramesBytesAsync(inputs, properties);
+            var bytes = await ToBytesAsync(inputs, properties);
             using (var stream = new MemoryStream(bytes))
             {
                 await SendDataAsync(stream, WebSocketMessageType.Binary, Connections.Select(c => c.Key).ToArray());
             }
         }
 
-        public async Task BroadcastAsync(byte[] inputs, IDictionary<string, object> properties = null)
+        public async Task BroadcastAsync(byte[] inputs)
         {
             if (!Connections.Any())
             {
                 return;
             }
 
-            var bytes = await PrepareFramesBytesAsync(inputs, properties);
-            using (var stream = new MemoryStream(bytes))
+            using (var stream = new MemoryStream(inputs))
             {
                 await SendDataAsync(stream, WebSocketMessageType.Text, Connections.Select(c => c.Key).ToArray());
             }
@@ -217,7 +216,7 @@ public async Task BroadcastBinaryAsync(WebSocketMessageContext context)
 
             using (var ms = context.ToMemoryStream())
             {
-                var bytes = await PrepareFramesBytesAsync(ms.ToArray());
+                var bytes = await ToBytesAsync(ms.ToArray());
                 using (var stream = new MemoryStream(bytes))
                 {
                     await SendDataAsync(stream, WebSocketMessageType.Binary, Connections.Select(c => c.Key).ToArray());
@@ -251,7 +250,7 @@ public async Task SendBinaryAsync(string connectionId, byte[] input, IDictionary
                 throw new ArgumentOutOfRangeException(nameof(transport));
             }
 
-            byte[] bytes = await PrepareFramesBytesAsync(input, properties);
+            byte[] bytes = await ToBytesAsync(input, properties);
             using (var stream = new MemoryStream(bytes))
             {
                 await SendDataAsync(stream, WebSocketMessageType.Binary, connectionId);

src/NetCoreStack.WebSockets/Interfaces/IConnectionManager.cs

@@ -23,9 +23,8 @@ public interface IConnectionManager
         /// Text message broadcaster
         /// </summary>
         /// <param name="inputs">Byte content</param>
-        /// <param name="properties">Extra properties, header</param>
         /// <returns></returns>
-        Task BroadcastAsync(byte[] inputs, IDictionary<string, object> properties = null);
+        Task BroadcastAsync(byte[] inputs);
 
         /// <summary>
         /// Binary message broadcaster

test/ServerTestApp/Controllers/DiscoveryController.cs

@@ -5,6 +5,7 @@
 using NetCoreStack.WebSockets;
 using NetCoreStack.WebSockets.Internal;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 using ServerTestApp.Models;
 using System;
 using System.Linq;
@@ -51,6 +52,27 @@ public async Task<IActionResult> SendAsync([FromBody]SimpleModel model)
             return Ok();
         }
 
+        [HttpPost(nameof(SendTextAsync))]
+        public async Task<IActionResult> SendTextAsync([FromBody]SimpleModel model)
+        {
+            if (model != null)
+            {
+                var echo = $"Echo from server '{model.Key}' - {DateTime.Now}";
+                var obj = new { message = echo };
+                var webSocketContext = new WebSocketMessageContext { Command = WebSocketCommands.DataSend, Value = obj };
+
+                var str = JsonConvert.SerializeObject(webSocketContext, new JsonSerializerSettings
+                {
+                    ContractResolver = new CamelCasePropertyNamesContractResolver()
+                });
+
+                var bytes = Encoding.UTF8.GetBytes(str);
+                await _connectionManager.BroadcastAsync(bytes);
+            }
+
+            return Ok();
+        }
+
         [HttpPost(nameof(BroadcastBinaryAsync))]
         public async Task<IActionResult> BroadcastBinaryAsync([FromBody]SimpleModel model)
         {