@wwdrew/expo-spotify-sdk 0.7.1 → 1.0.0

package/android/src/main/java/expo/modules/spotifysdk/ExpoSpotifySDKModule.kt

@@ -8,13 +8,18 @@ import expo.modules.kotlin.functions.Coroutine
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
-private const val SDK_VERSION = "0.5.0"
+private const val SDK_VERSION = "1.0.0" // x-release-please-version
 private const val EVENT_SESSION_CHANGE = "onSessionChange"
+private const val EVENT_CONNECTION_STATE_CHANGE = "onConnectionStateChange"
+private const val EVENT_CONNECTION_ERROR = "onConnectionError"
+private const val EVENT_PLAYER_STATE_CHANGE = "onPlayerStateChange"
+private const val EVENT_CAPABILITIES_CHANGE = "onCapabilitiesChange"
 
 class ExpoSpotifySDKModule : Module() {
 
   private lateinit var authLauncher: AppContextActivityResultLauncher<SpotifyAuthInput, AuthorizationResponse>
-  private val coordinator = SpotifyAuthCoordinator()
+  private val authCoordinator = SpotifyAuthCoordinator()
+  private val appRemoteCoordinator = SpotifyAppRemoteCoordinator()
 
   private val context
     get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
@@ -58,17 +63,41 @@ class ExpoSpotifySDKModule : Module() {
     )
   }
 
-  private fun emitError(type: String, code: String, message: String) {
+  private fun emitSessionError(code: String, message: String) {
     sendEvent(
       EVENT_SESSION_CHANGE,
-      mapOf("type" to type, "error" to mapOf("code" to code, "message" to message)),
+      mapOf("type" to "didFail", "error" to mapOf("code" to code, "message" to message)),
     )
   }
 
   override fun definition() = ModuleDefinition {
     Name("ExpoSpotifySDK")
 
-    Events(EVENT_SESSION_CHANGE)
+    Events(
+      EVENT_SESSION_CHANGE,
+      EVENT_CONNECTION_STATE_CHANGE,
+      EVENT_CONNECTION_ERROR,
+      EVENT_PLAYER_STATE_CHANGE,
+      EVENT_CAPABILITIES_CHANGE,
+    )
+
+    // Wire up App Remote coordinator event callbacks once the module is alive.
+    OnCreate {
+      appRemoteCoordinator.onConnectionStateChange = { state ->
+        sendEvent(EVENT_CONNECTION_STATE_CHANGE, mapOf("state" to state))
+      }
+      appRemoteCoordinator.onConnectionError = { code, message ->
+        sendEvent(EVENT_CONNECTION_ERROR, mapOf("code" to code, "message" to message))
+      }
+      appRemoteCoordinator.onPlayerStateChange = { stateMap ->
+        sendEvent(EVENT_PLAYER_STATE_CHANGE, stateMap)
+      }
+      appRemoteCoordinator.onCapabilitiesChange = { capabilities ->
+        sendEvent(EVENT_CAPABILITIES_CHANGE, capabilities)
+      }
+    }
+
+    // ── Auth ────────────────────────────────────────────────────────────────
 
     Function("isAvailable") {
       isSpotifyInstalled()
@@ -97,7 +126,7 @@ class ExpoSpotifySDKModule : Module() {
           showDialog = config.showDialog,
         )
 
-        val response = coordinator.authenticate(authLauncher, input)
+        val response = authCoordinator.authenticate(authLauncher, input)
 
         val payload = when (response.type) {
           AuthorizationResponse.Type.TOKEN -> SpotifySessionPayload(
@@ -122,20 +151,20 @@ class ExpoSpotifySDKModule : Module() {
             )
           }
           AuthorizationResponse.Type.CANCELLED -> throw UserCancelledException()
-          AuthorizationResponse.Type.EMPTY -> throw UnknownSpotifyException(
-            "Spotify returned an empty response (auth activity may have been killed)",
+          AuthorizationResponse.Type.EMPTY -> throw UserCancelledException(
+            "Spotify returned an empty response (auth activity dismissed before completion)",
           )
           AuthorizationResponse.Type.ERROR -> throw SpotifyAuthErrorException(
             response.error ?: "Spotify returned an unspecified error",
           )
-          AuthorizationResponse.Type.UNKNOWN, null -> throw UnknownSpotifyException(
+          AuthorizationResponse.Type.UNKNOWN -> throw UnknownSpotifyException(
             "Unknown Spotify authorization response type",
           )
         }
         emitSession("didInitiate", payload)
         payload.toMap()
       } catch (e: expo.modules.kotlin.exception.CodedException) {
-        emitError("didFail", e.code ?: "UNKNOWN", e.localizedMessage ?: e.code ?: "Unknown error")
+        emitSessionError(e.code ?: "UNKNOWN", e.localizedMessage ?: e.code ?: "Unknown error")
         throw e
       }
     }
@@ -153,14 +182,122 @@ class ExpoSpotifySDKModule : Module() {
         val payload = client.refresh(
           refreshToken = options.refreshToken,
           tokenRefreshURL = options.tokenRefreshURL,
-          previousScopes = emptyList(),
+          previousScopes = options.scopes,
         )
         emitSession("didRenew", payload)
         payload.toMap()
       } catch (e: expo.modules.kotlin.exception.CodedException) {
-        emitError("didFail", e.code ?: "UNKNOWN", e.localizedMessage ?: e.code ?: "Unknown error")
+        emitSessionError(e.code ?: "UNKNOWN", e.localizedMessage ?: e.code ?: "Unknown error")
         throw e
       }
     }
+
+    // ── App Remote ──────────────────────────────────────────────────────────
+
+    AsyncFunction("appRemoteConnect") Coroutine { accessToken: String ->
+      val manifest = readManifestConfig()
+      appRemoteCoordinator.connect(
+        context = context,
+        clientId = manifest.clientId,
+        redirectUri = manifest.redirectUri,
+        accessToken = accessToken,
+      )
+    }
+
+    AsyncFunction("appRemoteDisconnect") Coroutine { ->
+      appRemoteCoordinator.disconnect()
+    }
+
+    Function("appRemoteIsConnected") {
+      appRemoteCoordinator.isConnected()
+    }
+
+    AsyncFunction("appRemoteGetConnectionState") Coroutine { ->
+      appRemoteCoordinator.getConnectionState()
+    }
+
+    // ── Player ──────────────────────────────────────────────────────────────
+
+    AsyncFunction("playerPlay") Coroutine { uri: String ->
+      appRemoteCoordinator.playerPlay(uri)
+    }
+
+    AsyncFunction("playerPause") Coroutine { ->
+      appRemoteCoordinator.playerPause()
+    }
+
+    AsyncFunction("playerResume") Coroutine { ->
+      appRemoteCoordinator.playerResume()
+    }
+
+    AsyncFunction("playerSkipNext") Coroutine { ->
+      appRemoteCoordinator.playerSkipNext()
+    }
+
+    AsyncFunction("playerSkipPrevious") Coroutine { ->
+      appRemoteCoordinator.playerSkipPrevious()
+    }
+
+    AsyncFunction("playerSeekTo") Coroutine { positionMs: Long ->
+      appRemoteCoordinator.playerSeekTo(positionMs)
+    }
+
+    AsyncFunction("playerSetShuffle") Coroutine { enabled: Boolean ->
+      appRemoteCoordinator.playerSetShuffle(enabled)
+    }
+
+    AsyncFunction("playerSetRepeatMode") Coroutine { mode: Int ->
+      appRemoteCoordinator.playerSetRepeatMode(mode)
+    }
+
+    AsyncFunction("playerSetPodcastPlaybackSpeed") Coroutine { value: Double ->
+      appRemoteCoordinator.playerSetPodcastPlaybackSpeed(value.toFloat())
+    }
+
+    AsyncFunction("playerQueue") Coroutine { uri: String ->
+      appRemoteCoordinator.playerQueue(uri)
+    }
+
+    AsyncFunction("playerGetPlayerState") Coroutine { ->
+      appRemoteCoordinator.playerGetPlayerState()
+    }
+
+    AsyncFunction("playerGetCrossfadeState") Coroutine { ->
+      appRemoteCoordinator.playerGetCrossfadeState()
+    }
+
+    // ── User ────────────────────────────────────────────────────────────────
+
+    AsyncFunction("userGetCapabilities") Coroutine { ->
+      appRemoteCoordinator.userGetCapabilities()
+    }
+
+    AsyncFunction("userGetLibraryState") Coroutine { uri: String ->
+      appRemoteCoordinator.userGetLibraryState(uri)
+    }
+
+    AsyncFunction("userAddToLibrary") Coroutine { uri: String ->
+      appRemoteCoordinator.userAddToLibrary(uri)
+    }
+
+    AsyncFunction("userRemoveFromLibrary") Coroutine { uri: String ->
+      appRemoteCoordinator.userRemoveFromLibrary(uri)
+    }
+
+    // ── Content ───────────────────────────────────────────────────────────────
+
+    AsyncFunction("contentGetRecommendedContentItems") Coroutine { type: String ->
+      appRemoteCoordinator.contentGetRecommendedContentItems(type)
+    }
+
+    AsyncFunction("contentGetChildren") Coroutine { item: Map<String, Any?> ->
+      appRemoteCoordinator.contentGetChildren(item)
+    }
+
+    // ── Images ────────────────────────────────────────────────────────────────
+
+    AsyncFunction("imagesLoad") Coroutine { imageIdentifier: String, size: String ->
+      appRemoteCoordinator.imagesLoad(imageIdentifier, size, context.cacheDir)
+    }
   }
 }