Message header and body, tests, improvements

Author: gedem

NetCoreStack.WebSockets.sln

@@ -24,6 +24,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetCoreStack.WebSockets", "
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetCoreStack.WebSockets.ProxyClient", "src\NetCoreStack.WebSockets.ProxyClient\NetCoreStack.WebSockets.ProxyClient.xproj", "{7E772C91-3D01-4886-A591-BD663D9B017F}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebClientTestApp2", "test\WebClientTestApp2\WebClientTestApp2.xproj", "{7B3B956E-DF5A-4AD8-BCB9-14235D53471C}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Common.Libs", "test\Common.Libs\Common.Libs.xproj", "{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,6 +54,14 @@ Global
 		{7E772C91-3D01-4886-A591-BD663D9B017F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E772C91-3D01-4886-A591-BD663D9B017F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E772C91-3D01-4886-A591-BD663D9B017F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B3B956E-DF5A-4AD8-BCB9-14235D53471C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B3B956E-DF5A-4AD8-BCB9-14235D53471C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B3B956E-DF5A-4AD8-BCB9-14235D53471C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B3B956E-DF5A-4AD8-BCB9-14235D53471C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -60,5 +72,7 @@ Global
 		{079F8A19-BC40-46AC-A31F-B133F7D7F1B8} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
 		{C6BD4266-256A-4FF6-B991-D44EFC825FC6} = {52C54080-F48B-4DBA-A418-8057611CAF6D}
 		{7E772C91-3D01-4886-A591-BD663D9B017F} = {52C54080-F48B-4DBA-A418-8057611CAF6D}
+		{7B3B956E-DF5A-4AD8-BCB9-14235D53471C} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
+		{7ACFEED0-C1D7-43DE-95D7-3D2CEFDF6F9F} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
 	EndGlobalSection
 EndGlobal

src/NetCoreStack.WebSockets/ConnectionManager.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.WebSockets;
@@ -39,17 +40,17 @@ public ConnectionManager(IStreamCompressor compressor,
             Connections = new ConcurrentDictionary<string, WebSocketTransport>();
         }
 
-        private async Task<byte[]> PrepareBytesAsync(byte[] input, IDictionary<string, object> properties)
+        private async Task<byte[]> PrepareBytesAsync(byte[] body, IDictionary<string, object> properties)
         {
-            if (input == null)
+            if (body == null)
             {
-                throw new ArgumentNullException(nameof(input));
+                throw new ArgumentNullException(nameof(body));
             }
 
             if (properties == null)
                 properties = new Dictionary<string, object>();
 
-            bool compressed = GZipHelper.IsGZipHeader(input);
+            bool compressed = GZipHelper.IsGZipBody(body);
 
             object key = null;
             if (properties.TryGetValue(CompressedKey, out key))
@@ -58,17 +59,22 @@ private async Task<byte[]> PrepareBytesAsync(byte[] input, IDictionary<string, o
                 properties.Add(CompressedKey, compressed);
 
             string props = JsonConvert.SerializeObject(properties);
-            byte[] header = Encoding.UTF8.GetBytes($"{props}{Splitter}");
+            byte[] header = Encoding.UTF8.GetBytes($"{props}");
 
-            if (compressed)
-                header = await _compressor.CompressAsync(header);
-
-            input = header.Concat(input).ToArray();
+#if DEBUG
+            if (properties.TryGetValue("Key", out key))
+            {
+                int length = body.Length;
+                Debug.WriteLine($"=====Key: {key?.ToString()}=====Length: {length}=====");
+            }
+#endif
 
             if (!compressed)
-                return await _compressor.CompressAsync(input);
+                body = await _compressor.CompressAsync(body);
+
+            body = header.Concat(Splitter).Concat(body).ToArray();
 
-            return input;
+            return body;
         }
 
         private async Task SendAsync(WebSocketTransport transport, WebSocketMessageDescriptor descriptor)
@@ -111,7 +117,7 @@ public async Task ConnectAsync(WebSocket webSocket)
             var context = new WebSocketMessageContext();
             context.Command = WebSocketCommands.Handshake;
             context.Value = connectionId;
-            context.State = await _initState.GetStateAsync();
+            context.Header = await _initState.GetStateAsync();
             Connections.TryAdd(connectionId, transport);
 
             await SendAsync(connectionId, context);

src/NetCoreStack.WebSockets/Extensions/ByteExtensions.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Linq;
+using static NetCoreStack.WebSockets.Internal.SocketsConstants;
+
+namespace NetCoreStack.WebSockets
+{
+    internal static class ByteExtensions
+    {
+        public static Tuple<byte[], byte[]> Split(this byte[] input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            var value = Splitter.First();
+            var index = Array.IndexOf(input, value, 1);
+            if (index == -1)
+            {
+                throw new InvalidOperationException($"Invalid data format! " +
+                        $"Check the splitter pattern exist: \"{Splitter}\"");
+            }
+
+            var header = new ArraySegment<byte>(input, 0, index);
+            var body = new ArraySegment<byte>(input, (index + 1), input.Length - (index + 1));
+
+            return new Tuple<byte[], byte[]>(header.ToArray(), body.ToArray());
+        }
+    }
+}

src/NetCoreStack.WebSockets/Extensions/WebSocketExtensions.cs

@@ -46,52 +46,49 @@ public static async Task<WebSocketMessageContext> ToBinaryContextAsync(this WebS
                 throw new ArgumentNullException(nameof(result));
             }
 
+            var content = input.Split();
+            byte[] header = content.Item1;
+            byte[] body = content.Item2;
+
             var webSocketContext = new WebSocketMessageContext();
-            bool compression = GZipHelper.IsGZipHeader(input);
-            byte[] bytes = null;
-            if (compression)
-            {
-                bytes = await compressor.DeCompressAsync(input);
-            }
-            else
+            bool isCompressed = GZipHelper.IsGZipBody(body);
+            if (isCompressed)
             {
-                bytes = input;
+                body = await compressor.DeCompressAsync(body);
             }
 
-            using (var ms = new MemoryStream(bytes))
+            using (var ms = new MemoryStream(header))
             using (var sr = new StreamReader(ms))
             {
-                var content = await sr.ReadToEndAsync();
-                if (content != null)
+                var data = await sr.ReadToEndAsync();
+                if (data != null)
                 {
-                    string[] parts = content.Split(new string[] { SocketsConstants.Splitter }, StringSplitOptions.None);
-                    if (parts.Length != 2)
-                    {
-                        throw new InvalidOperationException($"Invalid binary data format! " +
-                            $"Check the splitter pattern exist: \"{SocketsConstants.Splitter}\"");
-                    }
-
-                    webSocketContext.Value = parts.Last();
-
                     try
                     {
-                        webSocketContext.State = JsonConvert.DeserializeObject<Dictionary<string, object>>(parts.First());
+                        webSocketContext.Header = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
                     }
                     catch (Exception ex)
                     {
-                        webSocketContext.State = new Dictionary<string, object>
+                        webSocketContext.Header = new Dictionary<string, object>
                         {
                             ["Exception"] = ex.Message,
-                            ["Unknown"] = "Unknown binary message"
+                            ["Unknown"] = "Unknown binary message!"
                         };
                     }
                 }
+            }
 
-                webSocketContext.Length = input.Length;
-                webSocketContext.MessageType = WebSocketMessageType.Binary;
-                webSocketContext.Command = WebSocketCommands.DataSend;
+            using (var ms = new MemoryStream(body))
+            using (var sr = new StreamReader(ms))
+            {
+                var data = await sr.ReadToEndAsync();
+                webSocketContext.Value = data;
             }
 
+            webSocketContext.Length = input.Length;
+            webSocketContext.MessageType = WebSocketMessageType.Binary;
+            webSocketContext.Command = WebSocketCommands.DataSend;
+
             return webSocketContext;
         }
 

src/NetCoreStack.WebSockets/Internal/GZipHelper.cs

@@ -5,7 +5,7 @@ public static class GZipHelper
         /// <summary>
         /// Checks the first two bytes in a GZIP file, which must be 31 and 139.
         /// </summary>
-        public static bool IsGZipHeader(byte[] arr)
+        public static bool IsGZipBody(byte[] arr)
         {
             return arr.Length >= 2 &&
                 arr[0] == 31 &&

src/NetCoreStack.WebSockets/Internal/SocketsConstants.cs

@@ -2,7 +2,7 @@
 {
     public class SocketsConstants
     {
-        public const string Splitter = "<|>";
+        public static byte[] Splitter = new byte[] { 0x1f };
         public const string CompressedKey = "Compressed";
         public const int ChunkSize = 1024 * 4;
     }

src/NetCoreStack.WebSockets/WebSocketMessageContext.cs

@@ -11,7 +11,7 @@ public class WebSocketMessageContext
 
         public object Value { get; set; }
 
-        public IDictionary<string, object> State { get; set; }
+        public IDictionary<string, object> Header { get; set; }
 
         public int Length { get; set; }
 
@@ -30,7 +30,7 @@ public string CommandText
 
         public WebSocketMessageContext()
         {
-            State = new Dictionary<string, object>();
+            Header = new Dictionary<string, object>();
         }
     }
 }

test/Common.Libs/ApplicationVariables.cs

@@ -0,0 +1,7 @@
+namespace Common.Libs
+{
+    public static class ApplicationVariables
+    {
+        public static int CacheReady { get; set; }
+    }
+}

test/Common.Libs/Common.Libs.xproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>7acfeed0-c1d7-43de-95d7-3d2cefdf6f9f</ProjectGuid>
+    <RootNamespace>Common.Libs</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

test/Common.Libs/InMemoryCacheProvider.cs

@@ -0,0 +1,57 @@
+using Microsoft.Extensions.Caching.Memory;
+using System;
+
+namespace Common.Libs
+{
+    public class InMemoryCacheProvider
+    {
+        private readonly IMemoryCache _memoryCache;
+
+        public InMemoryCacheProvider(IMemoryCache memoryCache)
+        {
+            _memoryCache = memoryCache;
+        }
+
+        public object SetObject(string key, object value, MemoryCacheEntryOptions options)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException("Cache value is null");
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            var entryOptions = new MemoryCacheEntryOptions
+            {
+                AbsoluteExpiration = options.AbsoluteExpiration,
+                Priority = options.Priority
+            };
+
+            _memoryCache.Set(key, value, entryOptions);
+            return value;
+        }
+
+        public object GetObject(string key)
+        {
+            return _memoryCache.Get(key);
+        }
+
+        public T GetObject<T>(string key)
+        {
+            return (T)_memoryCache.Get(key);
+        }
+
+        public void Remove(string key)
+        {
+            _memoryCache.Remove(key);
+        }
+    }
+}