fix: Always set recroding status=on when a jibri is present (#2132)

modules/recording/JibriSession.js

@@ -14,6 +14,8 @@ export default class JibriSession {
     constructor(options = {}) {
         this._connection = options.connection;
         this._mode = options.mode;
+        this._jibriJid = null;
+        this._statusFromJicofo = '';
 
         this._setSessionID(options.sessionID);
         this.setStatus(options.status);
@@ -61,7 +63,19 @@ export default class JibriSession {
      * @returns {string|undefined}
      */
     getStatus() {
-        return this._status;
+        // If _status is not set fallback to the status reported by jicofo.
+        if (this._status) {
+            return this._status;
+        }
+
+        return this._statusFromJicofo;
+    }
+
+    /**
+     * @returns {string|undefined} the JID of jibri associated with this session.
+     */
+    getJibriJid() {
+        return this._jibriJid;
     }
 
     /**
@@ -114,6 +128,25 @@ export default class JibriSession {
         this._status = status;
     }
 
+    /**
+     * Set the session status reported by jicofo. If a jibri is present in the room,
+     * the status is always 'on'. Otherwise, we fallback to the status reported by jicofo.
+     *
+     * @param {string} status
+     */
+    setStatusFromJicofo(status) {
+        this._statusFromJicofo = status;
+    }
+
+    /**
+     * Set the JID of the jibri associated with this session.
+     *
+     * @param {*} jibriJid
+     */
+    setJibriJid(jibriJid) {
+        this._jibriJid = jibriJid;
+    }
+
     /**
      * Sets the participant that started the session.
      * @param {JitsiParticipant | string} participant - The participant or resource id

modules/recording/RecordingManager.js

@@ -29,8 +29,12 @@ class RecordingManager {
 
         this.onPresence = this.onPresence.bind(this);
 
+        this.onMemberLeft = this.onMemberLeft.bind(this);
+
         this._chatRoom.eventEmitter.addListener(
             XMPPEvents.PRESENCE_RECEIVED, this.onPresence);
+        this._chatRoom.eventEmitter.addListener(
+            XMPPEvents.MUC_MEMBER_LEFT, this.onMemberLeft);
     }
 
     /**
@@ -43,6 +47,24 @@ class RecordingManager {
         return this._sessions[sessionID];
     }
 
+    /**
+     * Find a session with a specific jibri JID.
+     *
+     * @param {string} jibriJid the JID to search for.
+     * @returns
+     */
+    getSessionByJibriJid(jibriJid) {
+        let s;
+
+        Object.values(this._sessions).forEach(session => {
+            if (session.getJibriJid() === jibriJid) {
+                s = session;
+            }
+        });
+
+        return s;
+    }
+
     /**
      * Callback to invoke to parse through a presence update to find recording
      * related updates (from Jibri participant doing the recording and the
@@ -63,6 +85,27 @@ class RecordingManager {
         }
     }
 
+    /**
+     * Handle a participant leaving the room.
+     * @param {string} jid the JID of the participant that left.
+     */
+    onMemberLeft(jid) {
+        const session = this.getSessionByJibriJid(jid);
+
+        if (session) {
+
+            const prevStatus = session.getStatus();
+
+            // Setting to ''
+            session.setStatus('');
+            session.setJibriJid(null);
+
+            if (session.getStatus() !== prevStatus) {
+                this._emitSessionUpdate(session);
+            }
+        }
+    }
+
     /**
      * Start a recording session.
      *
@@ -221,7 +264,7 @@ class RecordingManager {
             session = this._createSession(sessionID, status, recordingMode);
         }
 
-        session.setStatus(status);
+        session.setStatusFromJicofo(status);
 
         if (error) {
             session.setError(error);
@@ -251,9 +294,12 @@ class RecordingManager {
         let session = this.getSession(sessionID);
 
         if (!session) {
-            session = this._createSession(sessionID, '', mode);
+            session = this._createSession(sessionID, 'on', mode);
         }
 
+        // When a jibri is present the status is always 'on';
+        session.setStatus('on');
+        session.setJibriJid(presence.getAttribute('from'));
         session.setLiveStreamViewURL(liveStreamViewURL);
 
         this._emitSessionUpdate(session);