expose ktor and coroutines at compile time

Author: adamint

build.gradle.kts

@@ -64,9 +64,9 @@ kotlin {
             val commonMain by getting {
                 dependencies {
                     implementation(kotlin("stdlib-common"))
-                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutineVersion")
+                    api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$serializationVersion")
-                    implementation("io.ktor:ktor-client-core:$ktorVersion")
+                    api("io.ktor:ktor-client-core:$ktorVersion")
                 }
             }
             val commonTest by getting {
@@ -84,9 +84,9 @@ kotlin {
                 }
 
                 dependencies {
-                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
+                    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
-                    implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+                    api("io.ktor:ktor-client-okhttp:$ktorVersion")
                     implementation("commons-codec:commons-codec:1.14")
                     implementation(kotlin("stdlib-jdk8"))
                 }
@@ -106,9 +106,9 @@ kotlin {
             val jsMain by getting {
                 dependencies {
                     implementation(npm("text-encoding", "0.7.0"))
-                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutineVersion")
+                    api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$serializationVersion")
-                    implementation("io.ktor:ktor-client-js:$ktorVersion")
+                    api("io.ktor:ktor-client-js:$ktorVersion")
                     implementation(npm("abort-controller", "3.0.0"))
                     implementation(npm("node-fetch", "2.6.0"))
 

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

@@ -687,6 +687,10 @@ typealias SpotifyClientAPI = SpotifyClientApi
 @Deprecated("API name has been updated for kotlin convention consistency", ReplaceWith("SpotifyAppApi"))
 typealias SpotifyAppAPI = SpotifyAppApi
 
+/**
+ * Represents a generic instance of the Spotify API client, with common functionality and information between
+ * implementations of the API
+ */
 typealias GenericSpotifyApi = SpotifyApi<*, *>
 
 /**

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

@@ -31,6 +31,7 @@ typealias SearchAPI = SearchApi
 
 /**
  * Get Spotify catalog information about artists, albums, tracks or playlists that match a keyword string.
+ * It is possible to have 0 results and no exception thrown with these methods. Check the size of items returned.
  *
  * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/search/search/)**
  */

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

@@ -63,7 +63,7 @@ abstract class SpotifyEndpoint(val api: GenericSpotifyApi) {
         contentType: String? = null,
         attemptedRefresh: Boolean = false
     ): String {
-        if (getCurrentTimeMs() >= api.expireTime) {
+        if (api.token.shouldRefresh()) {
             if (!api.automaticRefresh) throw SpotifyException.AuthenticationException("The access token has expired.")
             else api.refreshToken()
         }
@@ -94,6 +94,8 @@ abstract class SpotifyEndpoint(val api: GenericSpotifyApi) {
                     )
                 } catch (e: BadRequestException) {
                     if (e.statusCode?.equals(401) == true && !attemptedRefresh) {
+                        api.refreshToken()
+
                         execute(
                                 url,
                                 body,