fix: new update yandex api

pank-su · Dec 13, 2023 · 8d10e19 · 8d10e19
1 parent 44925a3
commit 8d10e19
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 14 deletions.
diff --git a/library/src/commonMain/kotlin/Client.kt b/library/src/commonMain/kotlin/Client.kt
@@ -10,9 +10,7 @@ import io.ktor.client.request.forms.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
-import model.BasicResponse
-import model.PermissionAlerts
-import model.Result
+import model.*
 import model.account.Experiments
 import model.account.PromoCodeStatus
 import model.account.Status
@@ -53,6 +51,47 @@ class Client {
         }
     }
 
+    private suspend inline fun <reified T> requestPrimitive(
+        vararg components: String,
+        method: HttpMethod = HttpMethod.Get,
+        body: HashMap<String, String> = hashMapOf()
+    ): ResultPrimitive<T> {
+        return httpClient.request(baseUrl) {
+            requestSettings()
+            this.method = method
+            url {
+                appendPathSegments(components.toList())
+            }
+            headers {
+
+                append("X-Yandex-Music-Client", "YandexMusicAndroid/24023231")
+                append("USER_AGENT", "Yandex-Music-API")
+                append("Accept-Language", language)
+
+                if (token != "") {
+                    append(HttpHeaders.Authorization, "OAuth $token")
+                }
+            }
+            if (method == HttpMethod.Post) {
+                headers {
+                    append(HttpHeaders.ContentType, "form-encoded")
+                }
+                formData {
+                    parameters {
+                        body.forEach {
+                            append(it.key, it.value)
+                        }
+                    }
+                }
+            }
+            headers {
+                remove(HttpHeaders.ContentType)
+                remove(HttpHeaders.ContentLength)
+            }
+        }.body<BasicResponsePrimitive<T>>().result.apply { client = this@Client }
+    }
+
+
     private suspend inline fun <reified T : Result> request(
         components: List<String>,
         method: HttpMethod = HttpMethod.Get,
@@ -149,7 +188,7 @@ class Client {
 
     suspend fun permissionAlerts() = request<PermissionAlerts>("permission-alerts")
 
-    suspend fun accountExperiments() = request<Experiments>("account", "experiments")
+    suspend fun accountExperiments() = requestPrimitive<HashMap<String, String>>("account", "experiments")
 
     suspend fun consumePromoCode(code: String) = requestForm<PromoCodeStatus>(
         "account",

diff --git a/library/src/commonMain/kotlin/model/BasicResponse.kt b/library/src/commonMain/kotlin/model/BasicResponse.kt
@@ -11,6 +11,15 @@ open class Result {
     @Transient var client: Client? = null
 }
 
+@Serializable
+open class ResultPrimitive<T>() {
+    var value: T? = null
+    @Transient
+    var invocationInfo: InvocationInfo? = null
+    @Transient
+    var client: Client? = null
+}
+
 
 
 @Serializable
@@ -29,4 +38,26 @@ data class BasicResponse<T>(
                 this.invocationInfo = this@BasicResponse.invocationInfo
             }
         }
+}
+
+@Serializable
+data class BasicResponsePrimitive<T>(
+    val invocationInfo: InvocationInfo,
+    @SerialName("result") private val _result: T? = null,
+    @SerialName("error") private val _error: Error? = null
+) {
+    val result: ResultPrimitive<T>
+        get() {
+            if (_result == null) {
+                errorTypeToException[_error?.type]!!(_error?.message ?: "Неизвестна ошибка")
+                throw Throwable()
+            }
+
+            val result = ResultPrimitive<T>()
+
+            return result.apply {
+                value = this@BasicResponsePrimitive._result
+                this.invocationInfo = this@BasicResponsePrimitive.invocationInfo
+            }
+        }
 }
diff --git a/library/src/commonMain/kotlin/model/album/Album.kt b/library/src/commonMain/kotlin/model/album/Album.kt
@@ -12,13 +12,28 @@ enum class AlbumType {
     Single,
 
     @SerialName("compilation")
-    Compilation
+    Compilation,
+
+    @SerialName("podcast")
+    Podcast,
+
+    @SerialName("audiobook")
+    AudioBook
 }
 
 @Serializable
 enum class MetaType {
     @SerialName("music")
-    Music
+    Music,
+
+    @SerialName("podcast")
+    Podcast,
+
+    @SerialName("podcast-episode")
+    PodcastEpisode,
+
+    @SerialName("audiobook")
+    AudioBook
 }
 
 @Serializable
@@ -69,7 +84,27 @@ enum class Genre {
     SoundTrack,
 
     @SerialName("rusbards")
-    Rusbards
+    Rusbards,
+
+    @SerialName("ruspop")
+    RusPop,
+
+    @SerialName("dance")
+    Dance,
+
+    @SerialName("podcasts")
+    Podcasts,
+
+    edmgenre, breakbeatgenre,
+
+    @SerialName("dnb")
+    DrumAndBase,
+
+    @SerialName("soviet")
+    Soviet,
+
+    @SerialName("fairytales")
+    FairyTales
 }
 
 @Serializable
@@ -82,7 +117,7 @@ data class Album(
     val releaseDate: Instant? = null,
     val coverUri: String,
     val ogImage: String,
-    val genre: Genre,
+    val genre: Genre? = null,
     val trackCount: Int,
     val likesCount: Int,
     val recent: Boolean,

diff --git a/library/src/commonMain/kotlin/model/feed/GeneratedPlaylist.kt b/library/src/commonMain/kotlin/model/feed/GeneratedPlaylist.kt
@@ -22,7 +22,9 @@ enum class GeneratedPlaylistType {
     podcasts,
 
     @JsonNames("missed_likes", "missedLikes")
-    MissedLikes
+    MissedLikes,
+
+    rewind2023
 }
 
 @Serializable

diff --git a/library/src/commonTest/kotlin/AdsTest.kt b/library/src/commonTest/kotlin/AdsTest.kt
@@ -1,4 +1,3 @@
-
 import dsl.client
 import io.getenv
 import kotlinx.coroutines.test.runTest
@@ -12,6 +11,8 @@ class AdsTest {
         if (token == "") return@runTest
         val ad = client { }.ads()
 
-        client { this.token = token }.ads()
+        client {
+            this.token = token
+        }.ads()
     }
 }
diff --git a/library/src/commonTest/kotlin/ConsumePromocodeTest.kt b/library/src/commonTest/kotlin/ConsumePromocodeTest.kt
@@ -12,7 +12,6 @@ class ConsumePromoCodeTest {
             this.token = token
         }
 
-
         println(client.consumePromoCode("test"))
     }
 }
diff --git a/library/src/commonTest/kotlin/ExperimentsTest.kt b/library/src/commonTest/kotlin/ExperimentsTest.kt
@@ -6,7 +6,9 @@ import kotlin.test.Test
 class ExperimentsTest {
     @Test
     fun gettingTest() = runTest{
-        client {  }.accountExperiments()
+        client { }.accountExperiments().value?.forEach {
+            println("${it.key}: ${it.value}")
+        }
         val token = getenv("token") ?: return@runTest
         if (token == "") return@runTest
         client {

diff --git a/library/src/commonTest/kotlin/FeedTest.kt b/library/src/commonTest/kotlin/FeedTest.kt
@@ -1,6 +1,7 @@
 import dsl.client
 import io.getenv
 import kotlinx.coroutines.test.runTest
+import model.playlist.CoverSize
 import kotlin.test.Test
 
 class FeedTest {
@@ -15,6 +16,8 @@ class FeedTest {
         }
         println(client.feed())
 
-
+        client.feed().generatedPlaylists.forEach {
+            println(it.data.getUrlBackgroundImage(CoverSize.`400x400`))
+        }
     }
 }