Fixed issue with new message parser

Author: dsrees

src/main/kotlin/org/phoenixframework/Defaults.kt

@@ -29,7 +29,9 @@ import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.google.gson.reflect.TypeToken
 import okhttp3.HttpUrl
+import org.phoenixframework.Defaults.gson
 import java.net.URL
+import javax.swing.text.html.HTML.Tag.P
 
 object Defaults {
 
@@ -68,41 +70,50 @@ object Defaults {
   @Suppress("UNCHECKED_CAST")
   val decode: DecodeClosure = { rawMessage ->
 
+    val parseValue: (String) -> String? = { value ->
+      when(value) {
+        "null" -> null
+        else -> value.replace("\"", "")
+      }
+    }
+
     var message = rawMessage
     message = message.removeRange(0, 1) // remove '['
 
-    val joinRef = message.takeWhile { it != ',' } // take join ref, 'null' or '5'
+    val joinRef = message.takeWhile { it != ',' } // take "join ref", "null" or "\"5\""
     message = message.removeRange(0, joinRef.length) // remove join ref
     message = message.removeRange(0, 1) // remove ','
 
-    val ref = message.takeWhile { it != ',' } // take ref, 'null' or '5'
+    val ref = message.takeWhile { it != ',' } // take ref, "null" or "\"5\""
     message = message.removeRange(0, ref.length) // remove ref
-    message = message.removeRange(0, 2) // remove ',"'
+    message = message.removeRange(0, 1) // remove ','
 
-    val topic = message.takeWhile { it != '"' }
+    val topic = message.takeWhile { it != ',' } // take topic, "\"topic\""
     message = message.removeRange(0, topic.length)
-    message = message.removeRange(0, 3) // remove '","'
+    message = message.removeRange(0, 1) // remove ','
 
-    val event = message.takeWhile { it != '"' }
+    val event = message.takeWhile { it != ',' } // take event, "\"phx_reply\""
     message = message.removeRange(0, event.length)
-    message = message.removeRange(0, 2) // remove '",'
+    message = message.removeRange(0, 1) // remove ','
 
-    val remaining = message.removeRange(message.length - 1, message.length)
+    var remaining = message.removeRange(message.length - 1, message.length) // remove ']'
 
+    // Payload should now just be "{"message":"hello","from":"user_1"}" or
+    // "{"response": {"message":"hello","from":"user_1"}},"status":"ok"}", flatten.
     val jsonObj = gson.fromJson(remaining, JsonObject::class.java)
     val response = jsonObj.get("response")
-    val payload =  response?.let { gson.toJson(response) } ?: remaining
+    val payload = response?.let { gson.toJson(response) } ?: remaining
 
     val anyType = object : TypeToken<Map<String, Any>>() {}.type
     val result = gson.fromJson<Map<String, Any>>(remaining, anyType)
 
     // vsn=2.0.0 message structure
     // [join_ref, ref, topic, event, payload]
     Message(
-      joinRef = joinRef.toIntOrNull()?.toString(),
-      ref = ref.toIntOrNull()?.toString() ?: "",
-      topic = topic,
-      event = event,
+      joinRef = parseValue(joinRef),
+      ref = parseValue(ref) ?: "",
+      topic = parseValue(topic) ?: "",
+      event = parseValue(event) ?: "",
       rawPayload = result,
       payloadJson = payload
     )

src/test/kotlin/org/phoenixframework/DefaultsTest.kt

@@ -60,7 +60,7 @@ internal class DefaultsTest {
   @Test
   internal fun `decoder provides raw json payload`() {
     val v2Json = """
-      [1,2,"room:lobby","shout",{"message":"Hi","name":"Tester","count":15,"ratio":0.2}]
+      ["1","2","room:lobby","shout",{"message":"Hi","name":"Tester","count":15,"ratio":0.2}]
     """.trimIndent()
 
     val message = Defaults.decode(v2Json)
@@ -80,7 +80,7 @@ internal class DefaultsTest {
   @Test
   internal fun `decoder decodes a status`() {
     val v2Json = """
-      [1,2,"room:lobby","phx_reply",{"response":{"message":"Hi","name":"Tester","count":15,"ratio":0.2},"status":"ok"}]
+      ["1","2","room:lobby","phx_reply",{"response":{"message":"Hi","name":"Tester","count":15,"ratio":0.2},"status":"ok"}]
     """.trimIndent()
 
     val message = Defaults.decode(v2Json)