Added Multimessage support

paulpdaniels · Dec 19, 2014 · 79b2367 · 79b2367
1 parent 5b215f2
commit 79b2367
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 2 deletions.
diff --git a/MiniWamp/MessageWebSocketTransport.cs b/MiniWamp/MessageWebSocketTransport.cs
@@ -53,8 +53,12 @@ void _socket_MessageReceived(MessageWebSocket sender, MessageWebSocketMessageRec
                         {
                             args.GetDataStream().AsStreamForRead().CopyTo(ms);
                             ms.Position = 0;
-                            var parsedMessage = JArray.Load(dataReader);
-                            Message(this, new WampMessageEventArgs(parsedMessage));
+                            dataReader.SupportMultipleContent = true;
+                            while (dataReader.Read())
+                            {
+                                var parsedMessage = JArray.Load(dataReader);
+                                Message(this, new WampMessageEventArgs(parsedMessage));
+                            }
                         }
 
                     }

diff --git a/MiniWampTests/MiniWampTests.csproj b/MiniWampTests/MiniWampTests.csproj
@@ -115,6 +115,7 @@
     <SDKReference Include="TestPlatform, Version=11.0" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ParsingTests.cs" />
     <Compile Include="WampSessionTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/MiniWampTests/ParsingTests.cs b/MiniWampTests/ParsingTests.cs
@@ -0,0 +1,40 @@
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DapperWare
+{
+    [TestClass]
+    class ParsingTests
+    {
+        private JsonSerializer serializer;
+
+        [TestInitialize]
+        public void SetUp()
+        {
+            this.serializer = new JsonSerializer();
+        }
+
+        [TestMethod]
+        public void TestDeserializeMessage()
+        {
+            string message = "[]";
+
+            using (var reader  = new JsonTextReader(new StreamReader(new System.IO.MemoryStream(Encoding.UTF8.GetBytes(message)))))
+            {
+                var parsed = JArray.Load(reader);
+
+                Assert.AreEqual(0, parsed.Count);
+            }
+
+
+        }
+
+    }
+}
diff --git a/MiniWampTests/WampSessionTests.cs b/MiniWampTests/WampSessionTests.cs
@@ -6,6 +6,8 @@
 using DapperWare;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using System.IO;
 
 namespace DapperWare
 {
@@ -147,5 +149,42 @@ public void TestCallWithError()
             Assert.ThrowsException<AggregateException>(() => callTask.Wait());
 
         }
+
+        [TestMethod]
+        public void TestDeserializeMultiMessage()
+        {
+            string message = "[3][\"test\"]";
+
+            using (var reader = new JsonTextReader(new StreamReader(new System.IO.MemoryStream(Encoding.UTF8.GetBytes(message)))))
+            {
+
+                reader.SupportMultipleContent = true;
+                var parsed = JArray.Load(reader);
+                reader.Read();
+                var parsed2 = JArray.Load(reader);
+
+                Assert.AreEqual(1, parsed.Count);
+                Assert.AreEqual(1, parsed2.Count);
+            }
+        }
+
+        [TestMethod]
+        public void TestDeserializeMessage()
+        {
+            string message = "[3]";
+
+            using (var reader = new JsonTextReader(new StreamReader(new System.IO.MemoryStream(Encoding.UTF8.GetBytes(message)))))
+            {
+                List<JArray> messages = new List<JArray>();
+                reader.SupportMultipleContent = true;
+
+                while (reader.Read())
+                {
+                    messages.Add(JArray.Load(reader));
+                }
+
+                Assert.AreEqual(1, messages.Count);
+            }
+        }
     }
 }