fix jsObject conversion issue

Author: wenxi-zeng

analytics-kotlin-live/src/androidTest/java/com/segment/analytics/liveplugins/kotlin/JSStorageTest.kt

@@ -1,11 +1,15 @@
 package com.segment.analytics.liveplugins.kotlin
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.segment.analytics.kotlin.core.utilities.getInt
+import com.segment.analytics.kotlin.core.utilities.getString
 import com.segment.analytics.liveplugins.kotlin.utils.MemorySharedPreferences
 import com.segment.analytics.substrata.kotlin.JSArray
 import com.segment.analytics.substrata.kotlin.JSObject
 import com.segment.analytics.substrata.kotlin.JSScope
+import com.segment.analytics.substrata.kotlin.JsonElementConverter
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.serialization.json.jsonObject
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
@@ -138,24 +142,32 @@ class JSStorageTest {
     @Test
     fun testJSStorageWithJSObject() {
         // set from js
-        var value = engine.await {
+        var value = engine.await(true) {
             evaluate("""storage.setValue("object", {name: "test", value: 42})""")
             evaluate("""storage.getValue("object")""")
         }
         assertNull(exceptionThrown)
-        val jsObjectValue = value as JSObject
-        assertEquals("test", jsObjectValue.getString("name"))
-        assertEquals(42, jsObjectValue.getInt("value"))
+        val jsonObject = JsonElementConverter.read(value).jsonObject
+        assertEquals("test", jsonObject.getString("name"))
+        assertEquals(42, jsonObject.getInt("value"))
 
         // set from native
-        val nativeObject = engine.await {
-            evaluate("""{name: "native", value: 100}""")
-        } as JSObject
-        jsStorage.setValue("object", nativeObject)
+        val nativeObject = engine.await(true) {
+            evaluate("""
+                let obj = {name: "native", value: 100}
+                obj
+                """.trimIndent())
+        }
+        jsStorage.setValue("object", nativeObject as JSObject)
         value = engine.await {
-            evaluate("""storage.getValue("object")""")
+            evaluate("""
+                let obj2 = storage.getValue("object")
+                obj.name == obj2.name && obj.value == obj2.value
+                """.trimIndent())
         }
-        val retrievedObject = value as JSObject
+        assertEquals(true, value)
+        val jsValue = jsStorage.getValue("object")
+        val retrievedObject = JsonElementConverter.read(jsValue).jsonObject
         assertEquals("native", retrievedObject.getString("name"))
         assertEquals(100, retrievedObject.getInt("value"))
     }

analytics-kotlin-live/src/main/java/com/segment/analytics/liveplugins/kotlin/JSStorage.kt

@@ -13,6 +13,7 @@ import com.segment.analytics.substrata.kotlin.JSScope
 import com.segment.analytics.substrata.kotlin.JsonElementConverter
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
@@ -52,11 +53,19 @@ class JSStorage {
     }
 
     fun setValue(key: String, value: JSObject) {
-        save(key, value, TYPE_OBJECT)
+        save(
+            key,
+            JsonElementConverter.read(value),
+            TYPE_OBJECT
+        )
     }
 
     fun setValue(key: String, value: JSArray) {
-        save(key, value, TYPE_ARRAY)
+        save(
+            key,
+            JsonElementConverter.read(value),
+            TYPE_ARRAY
+        )
     }
 
     fun getValue(key: String): Any? {
@@ -82,9 +91,10 @@ class JSStorage {
             TYPE_STRING -> this.getString(PROP_VALUE)?.let { Json.decodeFromString<String>(it) }
             TYPE_LONG -> this.getLong(PROP_VALUE)?.toDouble()
             else -> {
-                this[PROP_VALUE]?.let {
-                    engine?.await {
-                        JsonElementConverter.write(it, context)
+                this.getString(PROP_VALUE)?.let {
+                    val json = Json.decodeFromString<JsonElement>(it)
+                    engine?.await(true) {
+                        JsonElementConverter.write(json, context)
                     }
                 }
             }