a safer way to get pingInterval and pingTimeout

Author: doghappy

src/SocketIOClient.UnitTest/MessageTests/MessageFactoryTest.cs

@@ -7,7 +7,7 @@ namespace SocketIOClient.UnitTest.MessageTests
     public class MessageFactoryTest
     {
         [TestMethod]
-        public void CreateEio3OpenedMessage()
+        public void CreateEio3HttpOpenedMessage()
         {
             var msg = MessageFactory.CreateOpenedMessage("97:0{\"sid\":\"wOuAvDB9Jj6yE0VrAL8N\",\"upgrades\":[\"websocket\"],\"pingInterval\":25000,\"pingTimeout\":30000}");
             Assert.AreEqual(MessageType.Opened, msg.Type);
@@ -19,6 +19,19 @@ public void CreateEio3OpenedMessage()
             Assert.AreEqual("websocket", msg.Upgrades[0]);
         }
 
+        [TestMethod]
+        public void CreateEio3HttpOpenedMessageWithQuote()
+        {
+            var msg = MessageFactory.CreateOpenedMessage("97:0{\"sid\":\"wOuAvDB9Jj6yE0VrAL8N\",\"upgrades\":[\"websocket\"],\"pingInterval\":\"26000\",\"pingTimeout\":\"31000\"}");
+            Assert.AreEqual(MessageType.Opened, msg.Type);
+            Assert.AreEqual("wOuAvDB9Jj6yE0VrAL8N", msg.Sid);
+            Assert.AreEqual(26000, msg.PingInterval);
+            Assert.AreEqual(31000, msg.PingTimeout);
+            Assert.AreEqual(3, msg.Eio);
+            Assert.AreEqual(1, msg.Upgrades.Count);
+            Assert.AreEqual("websocket", msg.Upgrades[0]);
+        }
+
         [TestMethod]
         public void CreateEio4OpenedMessage()
         {
@@ -30,5 +43,17 @@ public void CreateEio4OpenedMessage()
             Assert.AreEqual(4, msg.Eio);
             Assert.AreEqual(0, msg.Upgrades.Count);
         }
+
+        [TestMethod]
+        public void CreateEio4OpenedMessageWithQuote()
+        {
+            var msg = MessageFactory.CreateOpenedMessage("0{\"sid\":\"6lV4Ef7YOyGF-5dCBvKy\",\"upgrades\":[],\"pingInterval\":\"20000\",\"pingTimeout\":\"6000\"}");
+            Assert.AreEqual(MessageType.Opened, msg.Type);
+            Assert.AreEqual("6lV4Ef7YOyGF-5dCBvKy", msg.Sid);
+            Assert.AreEqual(20000, msg.PingInterval);
+            Assert.AreEqual(6000, msg.PingTimeout);
+            Assert.AreEqual(4, msg.Eio);
+            Assert.AreEqual(0, msg.Upgrades.Count);
+        }
     }
 }

src/SocketIOClient/Messages/OpenedMessage.cs

@@ -29,13 +29,33 @@ public class OpenedMessage : IMessage
 
         public TransportProtocol Protocol { get; set; }
 
+        private int GetInt32FromJsonElement(JsonElement element, string msg, string name)
+        {
+            var p = element.GetProperty(name);
+            int val;
+            switch (p.ValueKind)
+            {
+                case JsonValueKind.String:
+                    val = int.Parse(p.GetString());
+                    break;
+                case JsonValueKind.Number:
+                    val = p.GetInt32();
+                    break;
+                default:
+                    throw new ArgumentException($"Invalid message: '{msg}'");
+            }
+            return val;
+        }
+
         public void Read(string msg)
         {
             var doc = JsonDocument.Parse(msg);
             var root = doc.RootElement;
             Sid = root.GetProperty("sid").GetString();
-            PingInterval = root.GetProperty("pingInterval").GetInt32();
-            PingTimeout = root.GetProperty("pingTimeout").GetInt32();
+
+            PingInterval = GetInt32FromJsonElement(root, msg, "pingInterval");
+            PingTimeout = GetInt32FromJsonElement(root, msg, "pingTimeout");
+
             Upgrades = new List<string>();
             var upgrades = root.GetProperty("upgrades").EnumerateArray();
             foreach (var item in upgrades)