squash: Update to use "connect".

jitsi · Oct 24, 2024 · 5106167 · 5106167
1 parent da3ff8b
commit 5106167
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/Colibri2Session.kt b/jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/Colibri2Session.kt
@@ -35,8 +35,8 @@ import org.jitsi.xmpp.extensions.colibri2.Colibri2Error
 import org.jitsi.xmpp.extensions.colibri2.Colibri2Relay
 import org.jitsi.xmpp.extensions.colibri2.ConferenceModifiedIQ
 import org.jitsi.xmpp.extensions.colibri2.ConferenceModifyIQ
+import org.jitsi.xmpp.extensions.colibri2.Connect
 import org.jitsi.xmpp.extensions.colibri2.Endpoints
-import org.jitsi.xmpp.extensions.colibri2.Export
 import org.jitsi.xmpp.extensions.colibri2.InitialLastN
 import org.jitsi.xmpp.extensions.colibri2.Media
 import org.jitsi.xmpp.extensions.colibri2.Sctp
@@ -59,7 +59,7 @@ class Colibri2Session(
     val bridge: Bridge,
     // Whether the session was constructed for the purpose of visitor nodes
     val visitor: Boolean,
-    val audioExportUrl: URI?,
+    val audioRecordUrl: URI?,
     parentLogger: Logger
 ) : CascadeNode<Colibri2Session, Colibri2Session.Relay> {
     private val logger = createChildLogger(parentLogger).apply {
@@ -199,9 +199,16 @@ class Colibri2Session(
             setCreate(true)
             setConferenceName(colibriSessionManager.conferenceName)
             setRtcstatsEnabled(colibriSessionManager.rtcStatsEnabled)
-            audioExportUrl?.let {
-                logger.warn("XXX adding export to colibri iq url=$it")
-                addExport(Export(it, audio = true))
+            audioRecordUrl?.let {
+                logger.warn("Adding export to colibri iq url=$it")
+                addConnect(
+                    Connect(
+                        url = it,
+                        type = Connect.Types.RECORDER,
+                        protocol = Connect.Protocols.MEDIAJSON,
+                        audio = true
+                    )
+                )
             }
         }
     }

diff --git a/jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/ColibriV2SessionManager.kt b/jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/ColibriV2SessionManager.kt
@@ -69,7 +69,7 @@ class ColibriV2SessionManager(
      */
     internal val meetingId: String,
     internal val rtcStatsEnabled: Boolean,
-    private val audioExportUrl: URI?,
+    private val audioRecordUrl: URI?,
     private val bridgeVersion: String?,
     parentLogger: Logger
 ) : ColibriSessionManager, Cascade<Colibri2Session, Colibri2Session.Relay> {
@@ -249,10 +249,10 @@ class ColibriV2SessionManager(
                 this,
                 bridge,
                 visitor,
-                if (audioExportUrl != null && sessionForAudioRecording == null) audioExportUrl else null,
+                if (audioRecordUrl != null && sessionForAudioRecording == null) audioRecordUrl else null,
                 logger
             )
-            if (audioExportUrl != null && sessionForAudioRecording == null) {
+            if (audioRecordUrl != null && sessionForAudioRecording == null) {
                 sessionForAudioRecording = session
             }
             return Pair(session, true)

diff --git a/jicofo-selector/src/main/resources/reference.conf b/jicofo-selector/src/main/resources/reference.conf
@@ -406,7 +406,9 @@ jicofo {
     enable-live-room = false
   }
   recording {
-    multi-track-recorder-url-template = "wss://example.com/recorder/MEETING_ID"
+    # A templated URL to use for audio recording. The string "MEEETING_ID" will be replaced with the actual meeting ID.
+    # Note: if this is set all conferences will automatically be recorded using the specified URL.
+    //multi-track-recorder-url-template = "wss://example.com/recorder/MEETING_ID"
   }
 
   xmpp {

diff --git a/jicofo/src/main/kotlin/org/jitsi/jicofo/RecordingConfig.kt b/jicofo/src/main/kotlin/org/jitsi/jicofo/RecordingConfig.kt
@@ -22,7 +22,7 @@ import org.jitsi.metaconfig.optionalconfig
 import java.net.URI
 
 class RecordingConfig private constructor() {
-    val multiTrackRecorderUrlTemplate: String? by optionalconfig {
+    private val multiTrackRecorderUrlTemplate: String? by optionalconfig {
         "jicofo.recording.multi-track-recorder-url-template".from(JitsiConfig.newConfig)
     }