Merge pull request #244 from adamint/dev

remove kotlinx-datetime dependency from all targets, add klock to native

Author: adamint

build.gradle.kts

@@ -38,7 +38,6 @@ System.getenv("signing.keyId")?.let { project.ext["signing.keyId"] = it }
 System.getenv("signing.password")?.let { project.ext["signing.password"] = it }
 System.getenv("signing.secretKeyRingFile")?.let { project.ext["signing.secretKeyRingFile"] = it }
 
-
 tasks.withType<Test> {
     this.testLogging {
         this.showStandardStreams = true
@@ -173,55 +172,22 @@ kotlin {
         listOf(jvm(), js()).map { it.name } + "kotlinMultiplatform"
 
     publishing {
-        publications {
-            matching { it.name in publicationsFromMainHost }.all {
-                val targetPublication = this@all
-                tasks.withType<AbstractPublishToMaven>()
-                    .matching { it.publication == targetPublication }
-                    .configureEach { onlyIf { findProperty("isMainHost") == "true" } }
-            }
-
-            val kotlinMultiplatform by getting(MavenPublication::class) {
-                artifactId = "spotify-api-kotlin-core"
-                setupPom(artifactId)
-            }
-
-            /*val metadata by getting(MavenPublication::class) {
-                artifactId = "spotify-api-kotlin-metadata"
-                setupPom(artifactId)
-            }*/
-        }
-
-        repositories {
-            maven {
-                name = "nexus"
-                val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-                url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
-
-                credentials {
-                    val nexusUsername: String? = System.getenv("nexus.username") ?: project.extra["nexusUsername"] as? String
-                    val nexusPassword: String? = System.getenv("nexus.password") ?: project.extra["nexusPassword"] as? String
-                    username = nexusUsername
-                    password = nexusPassword
-                }
-            }
-        }
+        if ("local" !in (version as String)) registerPublishing()
     }
 
     targets {
         sourceSets {
             val coroutineVersion = "1.4.2-native-mt"
             val serializationVersion = "1.0.1"
             val ktorVersion = "1.5.0"
-            val kotlinxDatetimeVersion = "0.1.1"
+            val klockVersion = "2.0.3"
 
             val commonMain by getting {
                 dependencies {
                     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
                     implementation("io.ktor:ktor-client-core:$ktorVersion")
-                    implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
+                    implementation("com.soywiz.korlibs.klock:klock:$klockVersion")
                 }
             }
 
@@ -296,9 +262,7 @@ kotlin {
             }
 
             val desktopTest by creating {
-                dependencies {
-
-                }
+                dependsOn(commonTest)
             }
 
             val linuxX64Main by getting {
@@ -332,6 +296,10 @@ kotlin {
     }
 }
 
+publishing {
+    if ("local" in (version as String)) registerPublishing()
+}
+
 signing {
     if (project.hasProperty("signing.keyId")
         && project.hasProperty("signing.password")
@@ -410,3 +378,32 @@ fun MavenPublication.setupPom(publicationName: String) {
     }
 }
 
+fun PublishingExtension.registerPublishing() {
+    publications {
+        val kotlinMultiplatform by getting(MavenPublication::class) {
+            artifactId = "spotify-api-kotlin-core"
+            setupPom(artifactId)
+        }
+
+        /*val metadata by getting(MavenPublication::class) {
+            artifactId = "spotify-api-kotlin-metadata"
+            setupPom(artifactId)
+        }*/
+    }
+
+    repositories {
+        maven {
+            name = "nexus"
+            val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
+
+            credentials {
+                val nexusUsername: String? = System.getenv("nexus.username") ?: if (project.extra.has("nexusUsername")) project.extra["nexusUsername"] as? String else null
+                val nexusPassword: String? = System.getenv("nexus.password") ?: if (project.extra.has("nexusPassword")) project.extra["nexusPassword"] as? String else null
+                username = nexusUsername
+                password = nexusPassword
+            }
+        }
+    }
+}

src/androidMain/kotlin/com/adamratzman/spotify/utils/Misc.kt

@@ -1,7 +1,16 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
+import android.annotation.SuppressLint
+import java.text.SimpleDateFormat
+import java.util.Date
+
 /**
  * The current time in milliseconds since UNIX epoch.
  */
 public actual fun getCurrentTimeMs(): Long = System.currentTimeMillis()
+
+@SuppressLint("SimpleDateFormat")
+internal actual fun formatDate(format: String, date: Long): String {
+    return SimpleDateFormat(format).format(Date(date))
+}

src/androidMain/kotlin/com/adamratzman/spotify/utils/Platform.kt

@@ -4,4 +4,4 @@ package com.adamratzman.spotify.utils
 /**
  * Actual platform that this program is run on.
  */
-public actual val platform: Platform = Platform.ANDROID
+public actual val currentApiPlatform: Platform = Platform.ANDROID

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

@@ -101,7 +101,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         endpointBuilder("/browse/featured-playlists").with("limit", limit).with("offset", offset).with(
             "market",
             market?.name
-        ).with("locale", locale).with("timestamp", timestamp?.let { formatDate(it) }).toString()
+        ).with("locale", locale).with("timestamp", timestamp?.let { formatDate("yyyy-MM-dd'T'HH:mm:ss", it) }).toString()
     ).toObject(FeaturedPlaylists.serializer(), api, json)
 
     /**

src/commonMain/kotlin/com.adamratzman.spotify/http/HttpConnection.kt

@@ -144,6 +144,29 @@ public class HttpConnection constructor(
         } catch (e: ResponseException) {
             val errorBody = e.response.readText()
             try {
+                if (e.response.status.value == 429) {
+                    val ratelimit = e.response.headers["Retry-After"]!!.toLong() + 1L
+                    if (api?.spotifyApiOptions?.retryWhenRateLimited == true) {
+                        api.logger.logError(
+                            false,
+                            "The request ($url) was ratelimited for $ratelimit seconds at ${getCurrentTimeMs()}",
+                            null
+                        )
+
+                        delay(ratelimit * 1000)
+                        return execute(additionalHeaders, retryIfInternalServerError = retryIfInternalServerError)
+                    } else throw SpotifyRatelimitedException(ratelimit)
+                }
+
+                if (e.response.status.value == 401 && errorBody.contains("access token") &&
+                    api != null && api.spotifyApiOptions.automaticRefresh
+                ) {
+                    api.refreshToken()
+                    val newAdditionalHeaders = additionalHeaders?.toMutableList() ?: mutableListOf()
+                    newAdditionalHeaders.add(0, HttpHeader("Authorization", "Bearer ${api.token.accessToken}"))
+                    return execute(newAdditionalHeaders, retryIfInternalServerError)
+                }
+
                 val error = errorBody.toObject(
                     ErrorResponse.serializer(),
                     api,

src/commonMain/kotlin/com.adamratzman.spotify/utils/Platform.kt

@@ -11,4 +11,4 @@ public enum class Platform {
     NATIVE
 }
 
-public expect val platform: Platform
+public expect val currentApiPlatform: Platform

src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt

@@ -3,9 +3,6 @@ package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.models.ResultEnum
-import kotlinx.datetime.Instant
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.json.JsonElement
 
 /**
@@ -28,5 +25,4 @@ internal suspend inline fun <T> catch(crossinline function: suspend () -> T): T?
 internal fun <T : ResultEnum> Array<T>.match(identifier: String) =
     firstOrNull { it.retrieveIdentifier().toString().equals(identifier, true) }
 
-internal fun formatDate(date: Long): String =
-    Instant.fromEpochMilliseconds(date).toLocalDateTime(TimeZone.currentSystemDefault()).toString()
+internal expect fun formatDate(format: String, date: Long): String

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt

@@ -10,7 +10,7 @@ import com.adamratzman.spotify.models.Playlist
 import com.adamratzman.spotify.models.SimplePlaylist
 import com.adamratzman.spotify.runBlockingTest
 import com.adamratzman.spotify.utils.Platform
-import com.adamratzman.spotify.utils.platform
+import com.adamratzman.spotify.utils.currentApiPlatform
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -99,7 +99,7 @@ class ClientPlaylistApiTest {
 
     @Test
     fun testEditPlaylists() {
-        if (platform != Platform.NATIVE) {
+        if (currentApiPlatform != Platform.NATIVE) {
             runBlockingTest {
                 if (!testPrereq()) return@runBlockingTest
 
@@ -114,7 +114,7 @@ class ClientPlaylistApiTest {
                     "7FjZU7XFs7P9jHI9Z0yRhK"
                 )
 
-                if (platform !in listOf(Platform.ANDROID, Platform.NATIVE)) {
+                if (currentApiPlatform !in listOf(Platform.ANDROID, Platform.NATIVE)) {
                     api.playlists.uploadClientPlaylistCover(
                         createdPlaylist.id,
                         imageUrl = "https://developer.spotify.com/assets/WebAPI_intro.png"
@@ -150,7 +150,7 @@ class ClientPlaylistApiTest {
 
     @Test
     fun testRemovePlaylistTracks() {
-        if (platform != Platform.NATIVE) {
+        if (currentApiPlatform != Platform.NATIVE) {
             runBlockingTest {
                 if (!testPrereq()) return@runBlockingTest
 

src/desktopMain/kotlin/com/adamratzman/spotify/utils/Platform.kt

@@ -4,4 +4,4 @@ package com.adamratzman.spotify.utils
 /**
  * Actual platform that this program is run on.
  */
-public actual val platform: Platform = Platform.NATIVE
+public actual val currentApiPlatform: Platform = Platform.NATIVE

src/jsMain/kotlin/com/adamratzman/spotify/utils/Misc.kt

@@ -9,3 +9,7 @@ import kotlin.js.Date
 public actual fun getCurrentTimeMs(): Long {
     return Date().getTime().toLong()
 }
+
+internal actual fun formatDate(format: String, date: Long): String {
+    return Date(date).toISOString()
+}