Update monitoring URL (#753)

SRGSSR · Oct 16, 2024 · a1d208c · a1d208c
1 parent 72896e7
commit a1d208c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,7 +44,9 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
 androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
+androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "androidx-datastore" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
+androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "androidx-datastore" }
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }

diff --git a/pillarbox-core-business/src/main/java/ch/srgssr/pillarbox/core/business/DefaultPillarbox.kt b/pillarbox-core-business/src/main/java/ch/srgssr/pillarbox/core/business/DefaultPillarbox.kt
@@ -5,6 +5,7 @@
 package ch.srgssr.pillarbox.core.business
 
 import android.content.Context
+import android.os.Looper
 import androidx.annotation.VisibleForTesting
 import androidx.media3.common.Player
 import androidx.media3.common.util.Clock
@@ -17,7 +18,6 @@ import ch.srgssr.pillarbox.player.PillarboxExoPlayer
 import ch.srgssr.pillarbox.player.PillarboxExoPlayer.Companion.DEFAULT_MAX_SEEK_TO_PREVIOUS_POSITION
 import ch.srgssr.pillarbox.player.PillarboxLoadControl
 import ch.srgssr.pillarbox.player.SeekIncrement
-import ch.srgssr.pillarbox.player.monitoring.LogcatMonitoringMessageHandler
 import ch.srgssr.pillarbox.player.monitoring.MonitoringMessageHandler
 import ch.srgssr.pillarbox.player.monitoring.NoOpMonitoringMessageHandler
 import ch.srgssr.pillarbox.player.monitoring.RemoteMonitoringMessageHandler
@@ -40,15 +40,13 @@ object DefaultPillarbox {
      * Default Monitoring message handler.
      */
     val defaultMonitoringMessageHandler by lazy {
-        if (BuildConfig.DEBUG) {
-            RemoteMonitoringMessageHandler(
-                httpClient = PillarboxHttpClient(),
-                endpointUrl = URL("http://sse-broker-alb-1501344577.eu-central-1.elb.amazonaws.com/api/events"),
-                coroutineScope = CoroutineScope(Dispatchers.IO),
-            )
-        } else {
-            LogcatMonitoringMessageHandler()
-        }
+        val monitoringUrl = if (BuildConfig.DEBUG) "https://dev.monitoring.pillarbox.ch/api/events" else "https://monitoring.pillarbox.ch/api/events"
+
+        RemoteMonitoringMessageHandler(
+            httpClient = PillarboxHttpClient(),
+            endpointUrl = URL(monitoringUrl),
+            coroutineScope = CoroutineScope(Dispatchers.IO),
+        )
     }
 
     /**
@@ -61,6 +59,7 @@ object DefaultPillarbox {
      * @param loadControl The load control, by default [PillarboxLoadControl].
      * @param coroutineContext The coroutine context to use for this player.
      * @param monitoringMessageHandler The class to handle each Monitoring message.
+     * @param playbackLooper The [Looper] to use for playback.
      * @return [PillarboxExoPlayer] suited for SRG.
      */
     operator fun invoke(
@@ -71,6 +70,7 @@ object DefaultPillarbox {
         loadControl: LoadControl = PillarboxLoadControl(),
         coroutineContext: CoroutineContext = Dispatchers.Default,
         monitoringMessageHandler: MonitoringMessageHandler = defaultMonitoringMessageHandler,
+        playbackLooper: Looper? = null,
     ): PillarboxExoPlayer {
         return DefaultPillarbox(
             context = context,
@@ -81,6 +81,7 @@ object DefaultPillarbox {
             clock = Clock.DEFAULT,
             coroutineContext = coroutineContext,
             monitoringMessageHandler = monitoringMessageHandler,
+            playbackLooper = playbackLooper,
         )
     }
 
@@ -95,6 +96,7 @@ object DefaultPillarbox {
      * @param clock The internal clock used by the player.
      * @param coroutineContext The coroutine context to use for this player.
      * @param monitoringMessageHandler The class to handle each Monitoring message.
+     * @param playbackLooper The [Looper] to use for playback.
      * @return [PillarboxExoPlayer] suited for SRG.
      */
     @VisibleForTesting
@@ -107,6 +109,7 @@ object DefaultPillarbox {
         clock: Clock,
         coroutineContext: CoroutineContext,
         monitoringMessageHandler: MonitoringMessageHandler = NoOpMonitoringMessageHandler,
+        playbackLooper: Looper? = null,
     ): PillarboxExoPlayer {
         return PillarboxExoPlayer(
             context = context,
@@ -119,6 +122,7 @@ object DefaultPillarbox {
             clock = clock,
             coroutineContext = coroutineContext,
             monitoringMessageHandler = monitoringMessageHandler,
+            playbackLooper = playbackLooper,
         )
     }
 }
diff --git a/pillarbox-demo-shared/build.gradle.kts b/pillarbox-demo-shared/build.gradle.kts
@@ -28,7 +28,9 @@ dependencies {
     api(libs.androidx.compose.ui.text)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.ui.unit)
+    api(libs.androidx.datastore.core)
     api(libs.androidx.datastore.preferences)
+    api(libs.androidx.datastore.preferences.core)
     api(libs.androidx.lifecycle.viewmodel)
     api(libs.androidx.media3.common)
     implementation(libs.androidx.media3.exoplayer)

diff --git a/pillarbox-demo/build.gradle.kts b/pillarbox-demo/build.gradle.kts
@@ -69,6 +69,7 @@ dependencies {
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.ui.unit)
     implementation(libs.androidx.core)
+    implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.common)
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.runtime.compose)

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/layouts/StoryViewModel.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/layouts/StoryViewModel.kt
@@ -16,6 +16,7 @@ import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.preload.DefaultPreloadManager.Status
 import androidx.media3.exoplayer.source.preload.DefaultPreloadManager.Status.STAGE_LOADED_TO_POSITION_MS
 import androidx.media3.exoplayer.source.preload.TargetPreloadStatusControl
+import ch.srgssr.pillarbox.core.business.DefaultPillarbox
 import ch.srgssr.pillarbox.core.business.source.SRGAssetLoader
 import ch.srgssr.pillarbox.demo.shared.data.Playlist
 import ch.srgssr.pillarbox.player.PillarboxExoPlayer
@@ -60,7 +61,7 @@ class StoryViewModel(application: Application) : AndroidViewModel(application) {
 
     private val players = SparseArray<PillarboxExoPlayer>(PLAYERS_COUNT).apply {
         for (i in 0 until PLAYERS_COUNT) {
-            val player = PillarboxExoPlayer(
+            val player = DefaultPillarbox(
                 context = application,
                 playbackLooper = preloadManager.playbackLooper,
                 loadControl = loadControl

diff --git a/pillarbox-demo/src/main/res/xml/network_security.xml b/pillarbox-demo/src/main/res/xml/network_security.xml
@@ -9,7 +9,4 @@
             <certificates src="user" />
         </trust-anchors>
     </debug-overrides>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">sse-broker-alb-1501344577.eu-central-1.elb.amazonaws.com</domain>
-    </domain-config>
 </network-security-config>