Merge pull request #294 from adamint/dev

adamint · web-flow · commit 0e20b2208eb9 · 2021-08-30T01:03:28.000-04:00
3.8.2 release
diff --git a/src/commonJvmLikeMain/kotlin/com/adamratzman/spotify/utils/DateTimeUtils.kt b/src/commonJvmLikeMain/kotlin/com/adamratzman/spotify/utils/DateTimeUtils.kt
@@ -1,3 +1,4 @@
+/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
 import kotlinx.datetime.Instant
@@ -12,4 +13,4 @@ actual fun getCurrentTimeMs(): Long = System.currentTimeMillis()
  */
 internal actual fun formatDate(date: Long): String {
     return Instant.fromEpochMilliseconds(date).toString()
-}
+}
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt b/src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt
@@ -4,7 +4,6 @@ package com.adamratzman.spotify
 import com.adamratzman.spotify.utils.TimeUnit
 import com.adamratzman.spotify.utils.getCurrentTimeMs
 import com.adamratzman.spotify.utils.runBlockingOnJvmAndNative
-import com.soywiz.korio.async.runBlockingNoJs
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt b/src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt
@@ -248,7 +248,7 @@ public class ClientPlayerApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     public suspend fun setRepeatMode(state: PlayerRepeatState, deviceId: String? = null) {
         requireScopes(SpotifyScope.USER_MODIFY_PLAYBACK_STATE)
         put(
-            endpointBuilder("/me/player/repeat").with("state", state.toString().toLowerCase()).with(
+            endpointBuilder("/me/player/repeat").with("state", state.toString().lowercase()).with(
                 "device_id",
                 deviceId
             ).toString()
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt b/src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt
@@ -11,7 +11,6 @@ import com.adamratzman.spotify.models.ErrorResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.ConcurrentHashMap
 import com.adamratzman.spotify.utils.getCurrentTimeMs
-import kotlin.js.JsExport
 import kotlin.math.ceil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.async
@@ -21,7 +20,6 @@ import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
-@JsExport
 public abstract class SpotifyEndpoint(public val api: GenericSpotifyApi) {
     public val cache: SpotifyCache = SpotifyCache()
     internal val json get() = api.spotifyApiOptions.json
@@ -136,7 +134,7 @@ public abstract class SpotifyEndpoint(public val api: GenericSpotifyApi) {
         } catch (e: CancellationException) {
             throw TimeoutException(
                 e.message
-                    ?: "The request $spotifyRequest timed out after (${api.spotifyApiOptions.requestTimeoutMillis ?: 100 * 1000}ms.",
+                    ?: "The request $spotifyRequest timed out after (${api.spotifyApiOptions.requestTimeoutMillis ?: (100_000)}ms.",
                 e
             )
         }
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt b/src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt
@@ -30,5 +30,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) }
 
-
 public expect fun <T> runBlockingOnJvmAndNative(block: suspend () -> T): T
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/Common.kt b/src/commonTest/kotlin/com.adamratzman/spotify/Common.kt
@@ -71,7 +71,6 @@ fun buildSpotifyApiSync() = when {
     else -> null.also { instantiationCompleted = true }
 }
 
-
 expect fun getEnvironmentVariable(name: String): String?
 
 expect fun Exception.stackTrace()
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/TestUtilities.kt b/src/commonTest/kotlin/com.adamratzman/spotify/TestUtilities.kt
@@ -26,7 +26,6 @@ abstract class AbstractTest<T : GenericSpotifyApi> {
             false
         }
     }
-
 }
 
 typealias GenericSpotifyApiTest = AbstractTest<GenericSpotifyApi>
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlayerApiTest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlayerApiTest.kt
@@ -3,7 +3,6 @@ package com.adamratzman.spotify.priv
 
 import com.adamratzman.spotify.AbstractTest
 import com.adamratzman.spotify.SpotifyClientApi
-import com.adamratzman.spotify.endpoints.client.ClientPlayerApi
 import com.adamratzman.spotify.models.CurrentlyPlayingType
 import com.adamratzman.spotify.models.PlayableUri
 import com.adamratzman.spotify.models.SpotifyContextType
@@ -15,13 +14,14 @@ import com.adamratzman.spotify.models.toPlaylistUri
 import com.adamratzman.spotify.models.toShowUri
 import com.adamratzman.spotify.models.toTrackUri
 import com.adamratzman.spotify.runBlockingTest
-import kotlinx.coroutines.delay
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
+import kotlin.time.DurationUnit
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTime
+import kotlinx.coroutines.delay
 
 @ExperimentalTime
 class ClientPlayerApiTest : AbstractTest<SpotifyClientApi>() {
@@ -146,7 +146,7 @@ class ClientPlayerApiTest : AbstractTest<SpotifyClientApi>() {
             val delay = measureTime {
                 api!!.player.seek(skipTo.toLong())
                 api!!.player.resume()
-            }.inMilliseconds
+            }.toDouble(DurationUnit.MILLISECONDS)
 
             val waitTime = 3000
             delay(waitTime.toLong())
@@ -155,6 +155,8 @@ class ClientPlayerApiTest : AbstractTest<SpotifyClientApi>() {
         }
     }
 
+    /*
+    // TODO add back once this isn't flaky anymore
     @Test
     fun testSetPlaybackOptions() {
         return runBlockingTest {
@@ -172,7 +174,7 @@ class ClientPlayerApiTest : AbstractTest<SpotifyClientApi>() {
             api!!.player.toggleShuffle(shuffle = false)
             assertEquals(false, api!!.player.getCurrentContext()!!.shuffleState)
         }
-    }
+    }*/
 
     @Test
     fun testStartPlayback() {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt
@@ -11,19 +11,18 @@ import com.adamratzman.spotify.models.toTrackUri
 import com.adamratzman.spotify.runBlockingTest
 import com.adamratzman.spotify.utils.Platform
 import com.adamratzman.spotify.utils.currentApiPlatform
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 
 class ClientPlaylistApiTest : AbstractTest<SpotifyClientApi>() {
     var createdPlaylist: Playlist? = null
     var playlistsBefore: List<SimplePlaylist>? = null
 
-
     private suspend fun init() {
         if (api != null) {
             playlistsBefore = api!!.playlists.getClientPlaylists().getAllItemsNotNull()
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/pub/BrowseApiTest.kt b/src/commonTest/kotlin/com.adamratzman/spotify/pub/BrowseApiTest.kt
@@ -17,7 +17,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertTrue
 
-class BrowseApiTest: AbstractTest<GenericSpotifyApi>() {
+class BrowseApiTest : AbstractTest<GenericSpotifyApi>() {
     @Test
     fun testGenreSeeds() {
         return runBlockingTest {
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt b/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt
@@ -11,12 +11,12 @@ import com.adamratzman.spotify.models.SpotifyUri
 import com.adamratzman.spotify.models.SpotifyUriException
 import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.runBlockingTest
-import kotlinx.serialization.json.Json
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlinx.serialization.json.Json
 
 class UrisTests {
     @Test
diff --git a/src/desktopMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/desktopMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -26,4 +26,4 @@ public actual fun getCurrentTimeMs(): Long = Clock.System.now().toEpochMilliseco
  */
 internal actual fun formatDate(date: Long): String {
     return Instant.fromEpochMilliseconds(date).toString()
-}
+}
diff --git a/src/jsMain/kotlin/co.scdn.sdk/SpotifyPlayerJs.kt b/src/jsMain/kotlin/co.scdn.sdk/SpotifyPlayerJs.kt
@@ -51,4 +51,4 @@ public enum class SpotifyWebPlaybackEvent(public val spotifyId: String) {
 
 public typealias ErrorListener = (err: Error) -> Unit
 public typealias PlaybackPlayerListener = (inst: WebPlaybackInstance) -> Unit
-public typealias PlaybackStateListener = (s: PlaybackState) -> Unit
+public typealias PlaybackStateListener = (s: PlaybackState) -> Unit
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/ImplicitGrant.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/ImplicitGrant.kt
@@ -5,9 +5,8 @@ package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyImplicitGrantApi
 import com.adamratzman.spotify.models.Token
-import org.w3c.dom.url.URLSearchParams
-
 import kotlinx.browser.window
+import org.w3c.dom.url.URLSearchParams
 
 /**
  * Parse the current url into a valid [Token] to be used when instantiating a new [SpotifyImplicitGrantApi]
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/jsMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -3,10 +3,10 @@ package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.SpotifyRestAction
 import io.ktor.http.encodeURLQueryComponent
+import kotlin.js.Date
 import kotlin.js.Promise
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.promise
-import kotlin.js.Date
 
 internal actual fun String.encodeUrl() = encodeURLQueryComponent()
 
@@ -37,4 +37,4 @@ public actual fun getCurrentTimeMs(): Long = Date.now().toLong()
  */
 internal actual fun formatDate(date: Long): String {
     return Date(date).toISOString()
-}
+}
diff --git a/src/jsMain/kotlin/com/adamratzman/spotify/webplayer/WebPlaybackSdk.kt b/src/jsMain/kotlin/com/adamratzman/spotify/webplayer/WebPlaybackSdk.kt
@@ -1,4 +1,5 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
+@file:JsQualifier("window.Spotify")
 @file:Suppress("PropertyName", "unused")
 
 package com.adamratzman.spotify.webplayer
@@ -284,4 +285,4 @@ public external interface Track {
  */
 public external interface WebPlaybackInstance {
     public var device_id: String
-}
+}
diff --git a/src/jsTest/kotlin/com/adamratzman/spotify/CommonImpl.kt b/src/jsTest/kotlin/com/adamratzman/spotify/CommonImpl.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.promise
 
 actual fun getEnvironmentVariable(name: String): String? {
-    //return if (jsTypeOf("process") === undefined) null else js("process")?.env[name].unsafeCast<String?>()
+    // return if (jsTypeOf("process") === undefined) null else js("process")?.env[name].unsafeCast<String?>()
     return null
 }
 
diff --git a/src/jvmTest/kotlin/com/adamratzman/spotify/PkceTest.kt b/src/jvmTest/kotlin/com/adamratzman/spotify/PkceTest.kt
@@ -4,11 +4,11 @@ package com.adamratzman.spotify
 import com.adamratzman.spotify.SpotifyException.AuthenticationException
 import kotlin.random.Random
 import kotlin.test.Test
+import kotlin.test.assertFailsWith
 import kotlinx.coroutines.runBlocking
 import spark.Spark.exception
 import spark.Spark.get
 import spark.Spark.port
-import kotlin.test.assertFailsWith
 
 class PkceTest {
 
diff --git a/src/nativeDarwinMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt b/src/nativeDarwinMain/kotlin/com/adamratzman/spotify/utils/PlatformUtils.kt
@@ -26,4 +26,4 @@ public actual fun getCurrentTimeMs(): Long = Clock.System.now().toEpochMilliseco
  */
 internal actual fun formatDate(date: Long): String {
     return Instant.fromEpochMilliseconds(date).toString()
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ fun buildSpotifyApiSync() = when {`
`71`	`71`	`else -> null.also { instantiationCompleted = true }`
`72`	`72`	`}`
`73`	`73`
`74`		`-`
`75`	`74`	`expect fun getEnvironmentVariable(name: String): String?`
`76`	`75`
`77`	`76`	`expect fun Exception.stackTrace()`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ abstract class AbstractTest<T : GenericSpotifyApi> {`
`26`	`26`	`false`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`-`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`typealias GenericSpotifyApiTest = AbstractTest<GenericSpotifyApi>`