ref(JitsiConference) Make methods getMediaSessions and getActiveMediaSession public.

JitsiConference.js

@@ -730,9 +730,8 @@ JitsiConference.prototype.leave = async function() {
  * Returns the currently active media session if any.
  *
  * @returns {JingleSessionPC|undefined}
- * @private
  */
-JitsiConference.prototype._getActiveMediaSession = function() {
+JitsiConference.prototype.getActiveMediaSession = function() {
     return this.isP2PActive() ? this.p2pJingleSession : this.jvbJingleSession;
 };
 
@@ -740,9 +739,8 @@ JitsiConference.prototype._getActiveMediaSession = function() {
  * Returns an array containing all media sessions existing in this conference.
  *
  * @returns {Array<JingleSessionPC>}
- * @private
  */
-JitsiConference.prototype._getMediaSessions = function() {
+JitsiConference.prototype.getMediaSessions = function() {
     const sessions = [];
 
     this.jvbJingleSession && sessions.push(this.jvbJingleSession);
@@ -1275,7 +1273,7 @@ JitsiConference.prototype.replaceTrack = function(oldTrack, newTrack) {
 
                 // we do not want to send presence update during setEffect switching, which does remove and then add
                 && !(oldTrack?._setEffectInProgress || newTrack?._setEffectInProgress)) {
-                this._updateRoomPresence(this._getActiveMediaSession());
+                this._updateRoomPresence(this.getActiveMediaSession());
             }
 
             if (newTrack !== null && (this.isMutedByFocus || this.isVideoMutedByFocus)) {
@@ -1911,7 +1909,7 @@ JitsiConference.prototype.onMemberLeft = function(jid) {
     }
 
     const participant = this.participants[id];
-    const mediaSessions = this._getMediaSessions();
+    const mediaSessions = this.getMediaSessions();
     let tracksToBeRemoved = [];
 
     for (const session of mediaSessions) {
@@ -3325,9 +3323,7 @@ JitsiConference.prototype._setP2PStatus = function(newStatus) {
         JitsiConferenceEvents.P2P_STATUS,
         this,
         this.p2p);
-    this.eventEmitter.emit(
-        JitsiConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED,
-        this._getActiveMediaSession());
+    this.eventEmitter.emit(JitsiConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED, this.getActiveMediaSession());
 
     // Refresh connection interrupted/restored
     this.eventEmitter.emit(

modules/e2ee/KeyHandler.js

@@ -101,7 +101,7 @@ export class KeyHandler extends Listenable {
      * @private
      */
     _onLocalTrackAdded(track) {
-        for (const session of this.conference._getMediaSessions()) {
+        for (const session of this.conference.getMediaSessions()) {
             this._setupSenderE2EEForTrack(session, track);
         }
     }
@@ -167,7 +167,7 @@ export class KeyHandler extends Listenable {
      */
     _trackMuteChanged(track) {
         if (browser.doesVideoMuteByStreamRemove() && track.isLocal() && track.isVideoTrack() && !track.isMuted()) {
-            for (const session of this.conference._getMediaSessions()) {
+            for (const session of this.conference.getMediaSessions()) {
                 this._setupSenderE2EEForTrack(session, track);
             }
         }

modules/qualitycontrol/ReceiveVideoController.js

@@ -285,7 +285,7 @@ export class ReceiveVideoController {
     setPreferredReceiveMaxFrameHeight(maxFrameHeight) {
         this._maxFrameHeight = maxFrameHeight;
 
-        for (const session of this._conference._getMediaSessions()) {
+        for (const session of this._conference.getMediaSessions()) {
             if (session.isP2P || !this._receiverVideoConstraints) {
                 maxFrameHeight && session.setReceiverVideoConstraint(maxFrameHeight);
             } else {
@@ -328,7 +328,7 @@ export class ReceiveVideoController {
             this._selectedEndpoints = constraints.selectedEndpoints ?? this._selectedEndpoints;
             this._rtc.setNewReceiverVideoConstraints(constraints);
 
-            const p2pSession = this._conference._getMediaSessions().find(session => session.isP2P);
+            const p2pSession = this._conference.getMediaSessions().find(session => session.isP2P);
 
             if (p2pSession) {
                 let maxFrameHeight = Object.values(constraints.constraints)[0]?.maxHeight;

modules/qualitycontrol/ReceiveVideoController.spec.js

@@ -22,7 +22,7 @@ class MockConference extends Listenable {
         this.mediaSessions = [];
     }
 
-    _getMediaSessions() {
+    getMediaSessions() {
         return this.mediaSessions;
     }
 }

modules/qualitycontrol/SendVideoController.js

@@ -50,7 +50,7 @@ export class SendVideoController {
         mediaSession.addListener(
             MediaSessionEvents.REMOTE_VIDEO_CONSTRAINTS_CHANGED,
             session => {
-                if (session === this.conference._getActiveMediaSession()) {
+                if (session === this.conference.getActiveMediaSession()) {
                     this._propagateSendMaxFrameHeight();
                 }
             });
@@ -68,7 +68,7 @@ export class SendVideoController {
         const promises = [];
 
         if (sendMaxFrameHeight >= 0) {
-            for (const session of this.conference._getMediaSessions()) {
+            for (const session of this.conference.getMediaSessions()) {
                 promises.push(session.setSenderVideoConstraint(sendMaxFrameHeight));
             }
         }
@@ -83,7 +83,7 @@ export class SendVideoController {
      * @returns {number|undefined}
      */
     selectSendMaxFrameHeight() {
-        const activeMediaSession = this.conference._getActiveMediaSession();
+        const activeMediaSession = this.conference.getActiveMediaSession();
         const remoteRecvMaxFrameHeight = activeMediaSession
             ? activeMediaSession.isP2P
                 ? activeMediaSession.getRemoteRecvMaxFrameHeight()

modules/qualitycontrol/SendVideoController.spec.js

@@ -74,11 +74,11 @@ class MockConference extends Listenable {
         this.eventEmitter.emit(JitsiConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED, this.activeMediaSession);
     }
 
-    _getActiveMediaSession() {
+    getActiveMediaSession() {
         return this.activeMediaSession;
     }
 
-    _getMediaSessions() {
+    getMediaSessions() {
         return this.mediaSessions;
     }
 }

types/auto/JitsiConference.d.ts

@@ -255,8 +255,18 @@ declare class JitsiConference {
      * @returns {Promise}
      */
     leave(): Promise<any>;
-    private _getActiveMediaSession;
-    private _getMediaSessions;
+    /**
+     * Returns the currently active media session if any.
+     *
+     * @returns {JingleSessionPC|undefined}
+     */
+    getActiveMediaSession(): any | undefined;
+    /**
+     * Returns an array containing all media sessions existing in this conference.
+     *
+     * @returns {Array<JingleSessionPC>}
+     */
+    getMediaSessions(): Array<any>;
     private _registerRtcListeners;
     private _sendBridgeVideoTypeMessage;
     /**