fix spotify uri deserialization on native (segfault)

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt

@@ -180,8 +180,8 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
             "limit",
             limit
         ).with("offset", offset)
-            .with("market", market?.name).toString().apply { println("here1") }
-    ).toPagingObject(SimplePlaylist.serializer(), "playlists", endpoint = this, json = json).apply { println("heref") }
+            .with("market", market?.name).toString()
+    ).toPagingObject((SimplePlaylist.serializer()), "playlists", endpoint = this, json = json)
 
     /**
      * Create a playlist-style listening experience based on seed artists, tracks and genres.

src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt

@@ -20,7 +20,7 @@ public class SpotifyUriException(message: String) : SpotifyException.BadRequestE
 
 private fun String.matchType(type: String, allowColon: Boolean): String? {
     val uriContent = "[^:]".takeUnless { allowColon } ?: "."
-    val typeRegex = "^spotify:(?:.*:)*$type:($uriContent*)(?::.*)*$|^([^:]+)$".toRegex()
+    val typeRegex = "^spotify:(?:.*:)?$type:($uriContent*)(?::.*)*$|^([^:]+)\$".toRegex()
     val match = typeRegex.matchEntire(this)?.groupValues ?: return null
     return match[1].takeIf { it.isNotBlank() || match[2].isEmpty() } ?: match[2].takeIf { it.isNotEmpty() }
 }
@@ -41,7 +41,10 @@ private fun String.remove(type: String, allowColon: Boolean): String {
 
 private class SimpleUriSerializer<T : SpotifyUri>(val ctor: (String) -> T) : KSerializer<T> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("SimpleUri", PrimitiveKind.STRING)
-    override fun deserialize(decoder: Decoder): T = ctor(decoder.decodeString())
+    override fun deserialize(decoder: Decoder): T {
+        val str = decoder.decodeString()
+        return ctor(str)
+    }
     override fun serialize(encoder: Encoder, value: T) = encoder.encodeString(value.uri)
 }
 
@@ -150,7 +153,9 @@ public sealed class CollectionUri(input: String, type: String, allowColon: Boole
     @Serializer(forClass = CollectionUri::class)
     public companion object : KSerializer<CollectionUri> {
         override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("CollectionUri", PrimitiveKind.STRING)
-        override fun deserialize(decoder: Decoder): CollectionUri = CollectionUri(decoder.decodeString())
+        override fun deserialize(decoder: Decoder): CollectionUri {
+            return CollectionUri(decoder.decodeString())
+        }
         override fun serialize(encoder: Encoder, value: CollectionUri): Unit = encoder.encodeString(value.uri)
 
         public operator fun invoke(input: String): CollectionUri {
@@ -235,6 +240,7 @@ public class ArtistUri(input: String) : SpotifyUri(input, "artist") {
  */
 @Serializable
 public class UserUri(input: String) : SpotifyUri(input, "user") {
+
     @Serializer(forClass = UserUri::class)
     public companion object : KSerializer<UserUri> by SimpleUriSerializer(::UserUri)
 }

src/commonMain/kotlin/com.adamratzman.spotify/models/serialization/SerializationUtils.kt

@@ -59,7 +59,7 @@ internal inline fun <reified T> String.toList(serializer: KSerializer<List<T>>,
     }
 }
 
-internal inline fun <reified T : Any> String.toPagingObject(
+internal fun <T : Any> String.toPagingObject(
     tClazz: KClass<T>,
     tSerializer: KSerializer<T>,
     innerObjectName: String? = null,
@@ -68,24 +68,18 @@ internal inline fun <reified T : Any> String.toPagingObject(
     arbitraryInnerNameAllowed: Boolean = false,
     skipInnerNameFirstIfPossible: Boolean = true
 ): NullablePagingObject<T> {
-    println("here2")
     if (innerObjectName != null || (arbitraryInnerNameAllowed && !skipInnerNameFirstIfPossible)) {
-        println("here3 $tClazz")
-        val map = this.parseJson {
-            val t = (String.serializer() to NullablePagingObject.serializer(tSerializer)).apply { println("serializer done") }
-                val jsonObjectRoot = (json.parseToJsonElement(this) as JsonObject)
-                val jsonElement = innerObjectName?.let { jsonObjectRoot[it] } ?: jsonObjectRoot.keys.firstOrNull()?.let { jsonObjectRoot[it] }
-                ?: throw SpotifyException.ParseException("Json element was null for class $tClazz (json $this)")
-            val objectString = json.encodeToString(jsonElement)
-
-            println(objectString)
-            println(json.decodeFromString<NullablePagingObject<T>>(objectString))
-            json.decodeFromString(MapSerializer(t.first, t.second), this).apply { println("decoded") }
+        val jsonObjectRoot = (json.parseToJsonElement(this) as JsonObject)
+        val jsonElement = innerObjectName?.let { jsonObjectRoot[it] } ?: jsonObjectRoot.keys.firstOrNull()?.let { jsonObjectRoot[it] }
+        ?: throw SpotifyException.ParseException("Json element was null for class $tClazz (json $this)")
+        //println(jsonElement.toString())
+        val objectString = jsonElement.toString()
+
+        val map = objectString.parseJson {
+            json.decodeFromString(NullablePagingObject.serializer(tSerializer),this)
         }
-        println("here4")
-        return (map[innerObjectName] ?: if (arbitraryInnerNameAllowed) map.keys.firstOrNull()?.let { map[it] }
-                ?: error("") else error(""))
-                .apply {
+
+        return map.apply {
                     this.endpoint = endpoint
                     this.itemClazz = tClazz
                     this.items.map { obj ->
@@ -94,7 +88,6 @@ internal inline fun <reified T : Any> String.toPagingObject(
                     }
                 }
     }
-    println("here5")
 
     return try {
         val pagingObject = this.parseJson { json.decodeFromString(NullablePagingObject.serializer(tSerializer), this) }
@@ -227,8 +220,10 @@ internal fun <T> String.parseJson(producer: String.() -> T): T =
         try {
             producer(this)
         } catch (e: Exception) {
+            println(e.message)
+            println(e.cause)
             throw SpotifyException.ParseException(
-                    "Unable to parse $this",
+                    "Unable to parse $this (${e.message})",
                     e
             )
         }