feat(JingleSessionPC) Handle source-add rejects by Jicofo.

JitsiConference.js

@@ -400,9 +400,11 @@ JitsiConference.prototype._init = function(options = {}) {
     this._sendConferenceJoinAnalyticsEvent = this._sendConferenceJoinAnalyticsEvent.bind(this);
     this.room.addListener(XMPPEvents.MEETING_ID_SET, this._sendConferenceJoinAnalyticsEvent);
 
+    this._removeLocalSourceOnReject = this._removeLocalSourceOnReject.bind(this);
     this._updateRoomPresence = this._updateRoomPresence.bind(this);
     this.room.addListener(XMPPEvents.SESSION_ACCEPT, this._updateRoomPresence);
     this.room.addListener(XMPPEvents.SOURCE_ADD, this._updateRoomPresence);
+    this.room.addListener(XMPPEvents.SOURCE_ADD_ERROR, this._removeLocalSourceOnReject);
     this.room.addListener(XMPPEvents.SOURCE_REMOVE, this._updateRoomPresence);
 
     this.e2eping = new E2ePing(
@@ -692,6 +694,7 @@ JitsiConference.prototype.leave = async function() {
     room.removeListener(XMPPEvents.MEETING_ID_SET, this._sendConferenceJoinAnalyticsEvent);
     room.removeListener(XMPPEvents.SESSION_ACCEPT, this._updateRoomPresence);
     room.removeListener(XMPPEvents.SOURCE_ADD, this._updateRoomPresence);
+    room.removeListener(XMPPEvents.SOURCE_ADD_ERROR, this._removeLocalSourceOnReject);
     room.removeListener(XMPPEvents.SOURCE_REMOVE, this._updateRoomPresence);
 
     this.eventManager.removeXMPPListeners();
@@ -1311,6 +1314,24 @@ JitsiConference.prototype._doReplaceTrack = function(oldTrack, newTrack) {
     return Promise.all(replaceTrackPromises);
 };
 
+/**
+ * Handler for when a source-add for a local source is rejected by Jicofo.
+ *
+ * @param {JingleSessionPC} jingleSession - The media session.
+ * @param {Error} error - The error message.
+ * @param {MediaType} mediaType - The media type of the track associated with the source that was rejected.
+ * @returns {void}
+ */
+JitsiConference.prototype._removeLocalSourceOnReject = function(jingleSession, error, mediaType) {
+    if (!jingleSession) {
+        return;
+    }
+    logger.warn(`Source-add rejected on ${jingleSession}, reason="${error?.reason}", message="${error?.msg}"`);
+    const track = this.getLocalTracks(mediaType)[0];
+
+    this.eventEmitter.emit(JitsiConferenceEvents.TRACK_UNMUTE_REJECTED, track);
+};
+
 /**
  * Operations related to creating a new track
  * @param {JitsiLocalTrack} newTrack the new track being created

JitsiConferenceEvents.js

@@ -338,6 +338,12 @@ export const TRACK_MUTE_CHANGED = 'conference.trackMuteChanged';
  */
 export const TRACK_REMOVED = 'conference.trackRemoved';
 
+/**
+ * The source-add for unmuting of a media track was rejected by Jicofo.
+ *
+ */
+export const TRACK_UNMUTE_REJECTED = 'conference.trackUnmuteRejected';
+
 /**
  * Notifies for transcription status changes. The event provides the
  * following parameters to its listeners:

modules/xmpp/JingleSessionPC.js

@@ -2487,7 +2487,6 @@ export default class JingleSessionPC extends JingleSession {
      * @param newSDP SDP object for new description.
      */
     notifyMySSRCUpdate(oldSDP, newSDP) {
-
         if (this.state !== JingleSessionState.ACTIVE) {
             logger.warn(`${this} Skipping SSRC update in '${this.state} ' state.`);
 
@@ -2508,6 +2507,27 @@ export default class JingleSessionPC extends JingleSession {
         this._cachedOldLocalSdp = undefined;
         this._cachedNewLocalSdp = undefined;
 
+        const getSignaledSourceInfo = sdpDiffer => {
+            const newMedia = sdpDiffer.getNewMedia();
+            let ssrcs = [];
+            let mediaType = null;
+
+            // It is assumed that sources are signaled one at a time.
+            Object.keys(newMedia).forEach(mediaIndex => {
+                const signaledSsrcs = Object.keys(newMedia[mediaIndex].ssrcs);
+
+                mediaType = newMedia[mediaIndex].mid;
+                if (signaledSsrcs?.length) {
+                    ssrcs = ssrcs.concat(signaledSsrcs);
+                }
+            });
+
+            return {
+                mediaType,
+                ssrcs
+            };
+        };
+
         // send source-remove IQ.
         let sdpDiffer = new SDPDiffer(newSDP, oldSDP);
         const remove = $iq({ to: this.remoteJid,
@@ -2526,8 +2546,10 @@ export default class JingleSessionPC extends JingleSession {
         const ctx = {};
 
         if (removedAnySSRCs) {
-            logger.info(`${this} Sending source-remove`);
-            logger.debug(remove.tree());
+            const sourceInfo = getSignaledSourceInfo(sdpDiffer);
+
+            // Log only the SSRCs instead of the full IQ.
+            logger.info(`${this} Sending source-remove for ${sourceInfo.mediaType} ssrcs=${sourceInfo.ssrcs}`);
             this.connection.sendIQ(
                 remove,
                 () => {
@@ -2554,15 +2576,17 @@ export default class JingleSessionPC extends JingleSession {
         const containsNewSSRCs = sdpDiffer.toJingle(add);
 
         if (containsNewSSRCs) {
-            logger.info(`${this} Sending source-add`);
-            logger.debug(add.tree());
+            const sourceInfo = getSignaledSourceInfo(sdpDiffer);
+
+            // Log only the SSRCs instead of the full IQ.
+            logger.info(`${this} Sending source-add for ${sourceInfo.mediaType} ssrcs=${sourceInfo.ssrcs}`);
             this.connection.sendIQ(
                 add,
                 () => {
                     this.room.eventEmitter.emit(XMPPEvents.SOURCE_ADD, this, ctx);
                 },
                 this.newJingleErrorHandler(add, error => {
-                    this.room.eventEmitter.emit(XMPPEvents.SOURCE_ADD_ERROR, this, error, ctx);
+                    this.room.eventEmitter.emit(XMPPEvents.SOURCE_ADD_ERROR, this, error, sourceInfo.mediaType, ctx);
                 }),
                 IQ_TIMEOUT);
         }