Adds follow entity parameter for the recording

JitsiConference.js

@@ -447,9 +447,9 @@ JitsiConference.prototype.getRecordingURL = function () {
  * Starts/stops the recording
  * @param token a token for authentication.
  */
-JitsiConference.prototype.toggleRecording = function (token) {
+JitsiConference.prototype.toggleRecording = function (token, followEntity) {
     if(this.room)
-        return this.room.toggleRecording(token);
+        return this.room.toggleRecording(token, followEntity);
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});
 }

doc/example/example.js

@@ -42,8 +42,8 @@ function onLocalTracks(tracks)
             $("body").append("<video autoplay='1' id='localVideo" + i + "' />");
             localTracks[i].attach($("#localVideo" + i ));
         } else {
-            // $("body").append("<audio autoplay='1' id='localAudio" + i + "' />");
-            // localTracks[i].attach($("#localAudio" + i ));
+            $("body").append("<audio autoplay='1' muted='true' id='localAudio" + i + "' />");
+            localTracks[i].attach($("#localAudio" + i ));
         }
         if(isJoined)
             room.addTrack(localTracks[i]);
@@ -105,7 +105,7 @@ function onUserLeft(id) {
  * That function is called when connection is established successfully
  */
 function onConnectionSuccess(){
-    room = connection.initJitsiConference("conference6", confOptions);
+    room = connection.initJitsiConference("conference10", confOptions);
     room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
     room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, function (track) {
         console.log("track removed!!!" + track);

lib-jitsi-meet.js

@@ -449,9 +449,9 @@ JitsiConference.prototype.getRecordingURL = function () {
  * Starts/stops the recording
  * @param token a token for authentication.
  */
-JitsiConference.prototype.toggleRecording = function (token) {
+JitsiConference.prototype.toggleRecording = function (token, followEntity) {
     if(this.room)
-        return this.room.toggleRecording(token);
+        return this.room.toggleRecording(token, followEntity);
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});
 }
@@ -6503,9 +6503,9 @@ ChatRoom.prototype.getRecordingURL = function () {
  * Starts/stops the recording
  * @param token token for authentication
  */
-ChatRoom.prototype.toggleRecording = function (token) {
+ChatRoom.prototype.toggleRecording = function (token, followEntity) {
     if(this.recording)
-        return this.recording.toggleRecording(token);
+        return this.recording.toggleRecording(token, followEntity);
 
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});
@@ -10725,8 +10725,8 @@ Recording.prototype.handleJibriPresence = function (jibri) {
     this.eventEmitter.emit(XMPPEvents.RECORDING_STATE_CHANGED);
 };
 
-Recording.prototype.setRecording = function (state, streamId, callback,
-    errCallback){
+Recording.prototype.setRecording = function (state, streamId, followEntity,
+    callback, errCallback){
     if (state == this.state){
         return;
     }
@@ -10735,13 +10735,14 @@ Recording.prototype.setRecording = function (state, streamId, callback,
 
     var iq = $iq({to: this.focusMucJid, type: 'set'})
         .c('jibri', {
-            xmlns: 'http://jitsi.org/protocol/jibri',
-            action: (state === 'on') ? 'start' : 'stop',
-            streamid: streamId
+            "xmlns": 'http://jitsi.org/protocol/jibri',
+            "action": (state === 'on') ? 'start' : 'stop',
+            "streamid": streamId,
+            "follow-entity": followEntity
         }).up();
 
-    logger.log('Set jibri recording: '+state, iq);
-
+    logger.log('Set jibri recording: '+state, iq.nodeTree);
+    console.log(iq.nodeTree);
     this.connection.sendIQ(
         iq,
         function (result) {
@@ -10754,7 +10755,7 @@ Recording.prototype.setRecording = function (state, streamId, callback,
         });
 };
 
-Recording.prototype.toggleRecording = function (token) {
+Recording.prototype.toggleRecording = function (token, followEntity) {
     var self = this;
     return new Promise(function(resolve, reject) {
         if (!token) {
@@ -10772,7 +10773,7 @@ Recording.prototype.toggleRecording = function (token) {
         var newState = (oldState === 'off' || !oldState) ? 'on' : 'off';
 
         self.setRecording(newState,
-            token,
+            token, followEntity,
             function (state, url) {
                 logger.log("New recording state: ", state);
                 if (state && state !== oldState) {
@@ -11424,9 +11425,11 @@ module.exports = function() {
                             logger.info('Dial result ', result);
 
                             var resource = $(result).find('ref').attr('uri');
-                            self.call_resource = resource.substr('xmpp:'.length);
+                            self.call_resource =
+                                resource.substr('xmpp:'.length);
                             logger.info(
-                                "Received call resource: " + self.call_resource);
+                                "Received call resource: " +
+                                self.call_resource);
                             resolve();
                         },
                         function (error) {

modules/xmpp/ChatRoom.js

@@ -702,9 +702,9 @@ ChatRoom.prototype.getRecordingURL = function () {
  * Starts/stops the recording
  * @param token token for authentication
  */
-ChatRoom.prototype.toggleRecording = function (token) {
+ChatRoom.prototype.toggleRecording = function (token, followEntity) {
     if(this.recording)
-        return this.recording.toggleRecording(token);
+        return this.recording.toggleRecording(token, followEntity);
 
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});

modules/xmpp/recording.js

@@ -26,8 +26,8 @@ Recording.prototype.handleJibriPresence = function (jibri) {
     this.eventEmitter.emit(XMPPEvents.RECORDING_STATE_CHANGED);
 };
 
-Recording.prototype.setRecording = function (state, streamId, callback,
-    errCallback){
+Recording.prototype.setRecording = function (state, streamId, followEntity,
+    callback, errCallback){
     if (state == this.state){
         return;
     }
@@ -36,13 +36,14 @@ Recording.prototype.setRecording = function (state, streamId, callback,
 
     var iq = $iq({to: this.focusMucJid, type: 'set'})
         .c('jibri', {
-            xmlns: 'http://jitsi.org/protocol/jibri',
-            action: (state === 'on') ? 'start' : 'stop',
-            streamid: streamId
+            "xmlns": 'http://jitsi.org/protocol/jibri',
+            "action": (state === 'on') ? 'start' : 'stop',
+            "streamid": streamId,
+            "follow-entity": followEntity
         }).up();
 
-    logger.log('Set jibri recording: '+state, iq);
-
+    logger.log('Set jibri recording: '+state, iq.nodeTree);
+    console.log(iq.nodeTree);
     this.connection.sendIQ(
         iq,
         function (result) {
@@ -55,7 +56,7 @@ Recording.prototype.setRecording = function (state, streamId, callback,
         });
 };
 
-Recording.prototype.toggleRecording = function (token) {
+Recording.prototype.toggleRecording = function (token, followEntity) {
     var self = this;
     return new Promise(function(resolve, reject) {
         if (!token) {
@@ -73,7 +74,7 @@ Recording.prototype.toggleRecording = function (token) {
         var newState = (oldState === 'off' || !oldState) ? 'on' : 'off';
 
         self.setRecording(newState,
-            token,
+            token, followEntity,
             function (state, url) {
                 logger.log("New recording state: ", state);
                 if (state && state !== oldState) {