ref: remove JingleSession from ChatRoom

JitsiConference.js

@@ -47,6 +47,11 @@ function JitsiConference(options) {
     this._init(options);
     this.componentsVersions = new ComponentsVersions(this);
     this.participants = {};
+    /**
+     * Jingle Session instance
+     * @type {JingleSessionPC}
+     */
+    this.jingleSession = null;
     this.lastDominantSpeaker = null;
     this.dtmfManager = null;
     this.somebodySupportsDTMF = false;
@@ -181,6 +186,11 @@ JitsiConference.prototype.leave = function () {
             // ChatRoom instance.
             this.getParticipants().forEach(
                 participant => this.onMemberLeft(participant.getJid()));
+            // Close the JingleSession
+            if (this.jingleSession) {
+                this.jingleSession.close();
+                this.jingleSession = null;
+            }
         });
     }
 
@@ -517,7 +527,7 @@ JitsiConference.prototype.replaceTrack = function (oldTrack, newTrack) {
             newTrack.ssrcHandler);
     }
     // Now replace the stream at the lower levels
-    return this.room.replaceStream (oldTrack, newTrack)
+    return this._doReplaceTrack(oldTrack, newTrack)
         .then(() => {
             if (oldTrack) {
                 this.onTrackRemoved(oldTrack);
@@ -532,6 +542,25 @@ JitsiConference.prototype.replaceTrack = function (oldTrack, newTrack) {
         });
 };
 
+/**
+ * Replaces the tracks at the lower level by going through the Jingle session
+ * and WebRTC peer connection. The method will resolve immediately if there is
+ * currently no JingleSession started.
+ * @param {JitsiLocalTrack|null} oldTrack the track to be removed during
+ * the process or <tt>null</t> if the method should act as "add track"
+ * @param {JitsiLocalTrackn|null} newTrack the new track to be added or
+ * <tt>null</tt> if the method should act as "remove track"
+ * @return {Promise}
+ * @private
+ */
+JitsiConference.prototype._doReplaceTrack = function (oldTrack, newTrack) {
+    if (this.jingleSession) {
+        return this.jingleSession.replaceStream(oldTrack, newTrack);
+    } else {
+        return Promise.resolve();
+    }
+};
+
 /**
  * Operations related to creating a new track
  * @param {JitsiLocalTrack} newTrack the new track being created
@@ -590,6 +619,62 @@ JitsiConference.prototype._setupNewTrack = function (newTrack) {
     this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, newTrack);
 };
 
+/**
+ * Adds loca WebRTC stream to the conference.
+ * @param {MediaStream} stream new stream that will be added.
+ * @param {function} callback callback executed after successful stream addition.
+ * @param {function(error)} errorCallback callback executed if stream addition fail.
+ * @param {object} ssrcInfo object with information about the SSRCs associated with the
+ * stream.
+ * @param {boolean} [dontModifySources] if true _modifySources won't be called.
+ * Used for streams added before the call start.
+ */
+JitsiConference.prototype.addLocalWebRTCStream
+    = function (stream, callback, errorCallback, ssrcInfo, dontModifySources) {
+    if(this.jingleSession) {
+        this.jingleSession.addStream(
+            stream, callback, errorCallback, ssrcInfo, dontModifySources);
+    } else {
+        // We are done immediately
+        logger.warn("Add local MediaStream - no JingleSession started yet");
+        callback();
+    }
+};
+
+/**
+ * Remove local WebRTC media stream.
+ * @param {MediaStream} stream the stream that will be removed.
+ * @param {function} callback callback executed after successful stream removal.
+ * @param {function} errorCallback callback executed if stream removal fail.
+ * @param {object} ssrcInfo object with information about the SSRCs associated
+ * with the stream.
+ */
+JitsiConference.prototype.removeLocalWebRTCStream
+    = function (stream, callback, errorCallback, ssrcInfo) {
+    if(this.jingleSession) {
+        this.jingleSession.removeStream(
+            stream, callback, errorCallback, ssrcInfo);
+    } else {
+        // We are done immediately
+        logger.warn("Remove local MediaStream - no JingleSession started yet");
+        callback();
+    }
+};
+
+/**
+ * Generate ssrc info object for a stream with the following properties:
+ * - ssrcs - Array of the ssrcs associated with the stream.
+ * - groups - Array of the groups associated with the stream.
+ */
+JitsiConference.prototype._generateNewStreamSSRCInfo = function () {
+    if(!this.jingleSession) {
+        logger.warn("The call haven't been started. " +
+            "Cannot generate ssrc info at the moment!");
+        return null;
+    }
+    return this.jingleSession.generateNewStreamSSRCInfo();
+};
+
 /**
  * Get role of the local user.
  * @returns {string} user role: 'moderator' or 'none'
@@ -875,7 +960,7 @@ function (jingleSession, jingleOffer, now) {
     }
 
     // Accept incoming call
-    this.room.setJingleSession(jingleSession);
+    this.jingleSession = jingleSession;
     this.room.connectionTimes["session.initiate"] = now;
     // Log "session.restart"
     if (this.wasStopped) {
@@ -927,8 +1012,7 @@ function (jingleSession, jingleOffer, now) {
              * In order to solve issues like the above one here we have to
              * generate the ssrc information for the track .
              */
-            localTrack._setSSRC(
-                this.room.generateNewStreamSSRCInfo());
+            localTrack._setSSRC(this._generateNewStreamSSRCInfo());
             ssrcInfo = {
                 mtype: localTrack.getType(),
                 type: "addMuted",
@@ -937,9 +1021,9 @@ function (jingleSession, jingleOffer, now) {
             };
         }
         try {
-            this.room.addStream(
+            this.addLocalWebRTCStream(
                 localTrack.getOriginalStream(), function () {}, function () {},
-                ssrcInfo, true);
+                ssrcInfo, true /* don't modify SSRCs */);
         } catch(e) {
             GlobalOnErrorHandler.callErrorHandler(e);
             logger.error(e);
@@ -986,7 +1070,7 @@ JitsiConference.prototype.onCallEnded
         this.statistics.stopCallStats();
     }
     // Current JingleSession is invalid so set it to null on the room
-    this.room.setJingleSession(null);
+    this.jingleSession = null;
     // Let the RTC service do any cleanups
     this.rtc.onCallEnded();
     // PeerConnection has been closed which means that SSRCs stored in
@@ -1160,8 +1244,8 @@ JitsiConference.prototype.getPhonePin = function () {
  * for its session.
  */
 JitsiConference.prototype.getConnectionState = function () {
-    if(this.room)
-        return this.room.getConnectionState();
+    if(this.jingleSession)
+        return this.jingleSession.getIceConnectionState();
     return null;
 };
 

modules/RTC/JitsiLocalTrack.js

@@ -363,14 +363,14 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
  * @returns {Promise}
  */
 JitsiLocalTrack.prototype._addStreamToConferenceAsUnmute = function () {
-    if (!this.conference || !this.conference.room) {
+    if (!this.conference) {
         return Promise.resolve();
     }
 
     var self = this;
 
     return new Promise(function(resolve, reject) {
-        self.conference.room.addStream(
+        self.conference.addLocalWebRTCStream(
             self.stream,
             resolve,
             (error) => reject(new Error(error)),
@@ -391,12 +391,12 @@ JitsiLocalTrack.prototype._addStreamToConferenceAsUnmute = function () {
  */
 JitsiLocalTrack.prototype._removeStreamFromConferenceAsMute =
 function (successCallback, errorCallback) {
-    if (!this.conference || !this.conference.room) {
+    if (!this.conference) {
         successCallback();
         return;
     }
 
-    this.conference.room.removeStream(
+    this.conference.removeLocalWebRTCStream(
         this.stream,
         successCallback,
         (error) => errorCallback(new Error(error)),

modules/xmpp/ChatRoom.js

@@ -81,7 +81,6 @@ export default class ChatRoom extends Listenable {
         this.moderator = new Moderator(this.roomjid, this.xmpp, this.eventEmitter,
             {connection: this.xmpp.options, conference: this.options});
         this.initPresenceMap();
-        this.session = null;
         this.lastPresences = {};
         this.phoneNumber = null;
         this.phonePin = null;
@@ -705,78 +704,6 @@ export default class ChatRoom extends Listenable {
         return null;
     }
 
-    setJingleSession (session){
-        this.session = session;
-    }
-
-    /**
-     * Replaces oldStream with newStream and performs a single offer/answer
-     *  cycle after both operations are done.  Either oldStream or newStream
-     *  can be null; replacing a valid 'oldStream' with a null 'newStream'
-     *  effectively just removes 'oldStream'
-     * @param oldStream the current stream in use to be replaced
-     * @param newStream the new stream to use
-     * @returns {Promise}
-     */
-    replaceStream (oldStream, newStream) {
-        if (this.session) {
-            return this.session.replaceStream(oldStream, newStream);
-        }
-        return Promise.resolve();
-    }
-
-    /**
-     * Remove stream.
-     * @param stream stream that will be removed.
-     * @param callback callback executed after successful stream removal.
-     * @param errorCallback callback executed if stream removal fail.
-     * @param ssrcInfo object with information about the SSRCs associated with the
-     * stream.
-     */
-    removeStream (stream, callback, errorCallback, ssrcInfo) {
-        if(!this.session) {
-            callback();
-            return;
-        }
-        this.session.removeStream(stream, callback, errorCallback, ssrcInfo);
-    }
-
-    /**
-     * Adds stream.
-     * @param stream new stream that will be added.
-     * @param callback callback executed after successful stream addition.
-     * @param errorCallback callback executed if stream addition fail.
-     * @param ssrcInfo object with information about the SSRCs associated with the
-     * stream.
-     * @param dontModifySources {boolean} if true _modifySources won't be called.
-     * Used for streams added before the call start.
-     */
-    addStream (stream, callback, errorCallback, ssrcInfo, dontModifySources) {
-        if(this.session) {
-            // FIXME: will block switchInProgress on true value in case of exception
-            this.session.addStream(stream, callback, errorCallback, ssrcInfo,
-                dontModifySources);
-        } else {
-            // We are done immediately
-            logger.warn("No conference handler or conference not started yet");
-            callback();
-        }
-    }
-
-    /**
-     * Generate ssrc info object for a stream with the following properties:
-     * - ssrcs - Array of the ssrcs associated with the stream.
-     * - groups - Array of the groups associated with the stream.
-     */
-    generateNewStreamSSRCInfo () {
-        if(!this.session) {
-            logger.warn("The call haven't been started. " +
-                "Cannot generate ssrc info at the moment!");
-            return null;
-        }
-        return this.session.generateNewStreamSSRCInfo();
-    }
-
     setVideoMute (mute, callback) {
         this.sendVideoInfoPresence(mute);
         if(callback)
@@ -926,15 +853,6 @@ export default class ChatRoom extends Listenable {
         return this.phonePin;
     }
 
-    /**
-     * Returns the connection state for the current session.
-     */
-    getConnectionState () {
-        if(!this.session)
-            return null;
-        return this.session.getIceConnectionState();
-    }
-
     /**
      * Mutes remote participant.
      * @param jid of the participant
@@ -982,7 +900,6 @@ export default class ChatRoom extends Listenable {
      * rejected.
      */
     leave () {
-        this._dispose();
         return new Promise((resolve, reject) => {
             let timeout = setTimeout(() => onMucLeft(true), 5000);
             let eventEmitter = this.eventEmitter;
@@ -1001,13 +918,4 @@ export default class ChatRoom extends Listenable {
             this.doLeave();
         });
     }
-
-    /**
-     * Disposes the conference, closes the jingle session.
-     */
-    _dispose () {
-        if (this.session) {
-            this.session.close();
-        }
-    }
 }

modules/xmpp/strophe.emuc.js

@@ -106,14 +106,6 @@ class MucConnectionPlugin extends ConnectionPluginListenable {
         return true;
     }
 
-    setJingleSession (from, session) {
-        const room = this.rooms[Strophe.getBareJidFromJid(from)];
-        if(!room)
-            return;
-
-        room.setJingleSession(session);
-    }
-
     onMute(iq) {
         const from = iq.getAttribute('from');
         const room = this.rooms[Strophe.getBareJidFromJid(from)];