Adds call support

JitsiConference.js

         reject(new Error("The conference is not created yet!"))});
 }
 
+/**
+ * Dials a number.
+ * @param number the number
+ */
+JitsiConference.prototype.dial = function (number) {
+    if(this.room)
+        return this.room.dial(number);
+    return new Promise(function(resolve, reject){
+        reject(new Error("The conference is not created yet!"))});
+}
+
+/**
+ * Hangup an existing call
+ */
+JitsiConference.prototype.hangup = function () {
+    if(this.room)
+        return this.room.hangup();
+    return new Promise(function(resolve, reject){
+        reject(new Error("The conference is not created yet!"))});
+}
+
+/**
+ * Returns the phone number for joining the conference.
+ */
+JitsiConference.prototype.getPhoneNumber = function () {
+    if(this.room)
+        return this.room.getPhoneNumber();
+    return null;
+}
+
+/**
+ * Returns the pin for joining the conference with phone.
+ */
+JitsiConference.prototype.getPhonePin = function () {
+    if(this.room)
+        return this.room.getPhonePin();
+    return null;
+}
+
 /**
  * Setups the listeners needed for the conference.
  * @param conference the conference
     conference.room.addListener(XMPPEvents.CONNECTION_INTERRUPTED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_INTERRUPTED);
     });
-    conference.room.addListener(XMPPEvents.RECORDING_STATE_CHANGED, function () {
-        conference.eventEmitter.emit(JitsiConferenceEvents.RECORDING_STATE_CHANGED);
+
+    conference.room.addListener(XMPPEvents.RECORDING_STATE_CHANGED,
+        function () {
+            conference.eventEmitter.emit(
+                JitsiConferenceEvents.RECORDING_STATE_CHANGED);
+        });
+
+    conference.room.addListener(XMPPEvents.PHONE_NUMBER_CHANGED, function () {
+        conference.eventEmitter.emit(
+            JitsiConferenceEvents.PHONE_NUMBER_CHANGED);
     });
 
     conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {

JitsiConferenceEvents.js

     /**
      * Indicates that recording state changed.
      */
-    RECORDING_STATE_CHANGED: "conference.recordingStateChanged"
+    RECORDING_STATE_CHANGED: "conference.recordingStateChanged",
+    /**
+     * Indicates that phone number changed.
+     */
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged"
 };
 
 module.exports = JitsiConferenceEvents;

doc/example/example.js

 var options = {
     hosts: {
+        call_control: "callcontrol.chaos.hipchat.me",
+        focus: "focus.chaos.hipchat.me",
         domain: 'chaos.hipchat.me',
         muc: 'conference.chaos.hipchat.me', // FIXME: use XEP-0030
         bridge: 'jitsi-videobridge.chaos.hipchat.me', // FIXME: use XEP-0030
             $("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' id='localAudio" + i + "' />");
+            // localTracks[i].attach($("#localAudio" + i ));
         }
         if(isJoined)
             room.addTrack(localTracks[i]);
 }
 
 function onUserLeft(id) {
+    console.log("user left");
     if(!remoteTracks[id])
         return;
     var tracks = remoteTracks[id];
  * That function is called when connection is established successfully
  */
 function onConnectionSuccess(){
-    room = connection.initJitsiConference("conference2", confOptions);
+    room = connection.initJitsiConference("conference6", confOptions);
     room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
     room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, function (track) {
         console.log("track removed!!!" + track);
     });
     room.on(JitsiMeetJS.events.conference.CONFERENCE_JOINED, onConferenceJoined);
-    room.on(JitsiMeetJS.events.conference.USER_JOINED, function(id){ remoteTracks[id] = [];});
+    room.on(JitsiMeetJS.events.conference.USER_JOINED, function(id){ console.log("user join");remoteTracks[id] = [];});
     room.on(JitsiMeetJS.events.conference.USER_LEFT, onUserLeft);
     room.on(JitsiMeetJS.events.conference.TRACK_MUTE_CHANGED, function (track) {
         console.log(track.getType() + " - " + track.isMuted());
         console.log(room.isRecordingSupported() + " - " +
             room.getRecordingState() + " - " +
             room.getRecordingURL());
-    })
+    });
+    room.on(JitsiMeetJS.events.conference.PHONE_NUMBER_CHANGED, function () {
+        console.log(
+            room.getPhoneNumber() + " - " +
+            room.getPhonePin());
+    });
     room.join();
 };
 

lib-jitsi-meet.js

         reject(new Error("The conference is not created yet!"))});
 }
 
+/**
+ * Dials a number.
+ * @param number the number
+ */
+JitsiConference.prototype.dial = function (number) {
+    if(this.room)
+        return this.room.dial(number);
+    return new Promise(function(resolve, reject){
+        reject(new Error("The conference is not created yet!"))});
+}
+
+/**
+ * Hangup an existing call
+ */
+JitsiConference.prototype.hangup = function () {
+    if(this.room)
+        return this.room.hangup();
+    return new Promise(function(resolve, reject){
+        reject(new Error("The conference is not created yet!"))});
+}
+
+/**
+ * Returns the phone number for joining the conference.
+ */
+JitsiConference.prototype.getPhoneNumber = function () {
+    if(this.room)
+        return this.room.getPhoneNumber();
+    return null;
+}
+
+/**
+ * Returns the pin for joining the conference with phone.
+ */
+JitsiConference.prototype.getPhonePin = function () {
+    if(this.room)
+        return this.room.getPhonePin();
+    return null;
+}
+
 /**
  * Setups the listeners needed for the conference.
  * @param conference the conference
     conference.room.addListener(XMPPEvents.CONNECTION_INTERRUPTED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONNECTION_INTERRUPTED);
     });
-    conference.room.addListener(XMPPEvents.RECORDING_STATE_CHANGED, function () {
-        conference.eventEmitter.emit(JitsiConferenceEvents.RECORDING_STATE_CHANGED);
+
+    conference.room.addListener(XMPPEvents.RECORDING_STATE_CHANGED,
+        function () {
+            conference.eventEmitter.emit(
+                JitsiConferenceEvents.RECORDING_STATE_CHANGED);
+        });
+
+    conference.room.addListener(XMPPEvents.PHONE_NUMBER_CHANGED, function () {
+        conference.eventEmitter.emit(
+            JitsiConferenceEvents.PHONE_NUMBER_CHANGED);
     });
 
     conference.room.addListener(XMPPEvents.CONNECTION_RESTORED, function () {
     /**
      * Indicates that recording state changed.
      */
-    RECORDING_STATE_CHANGED: "conference.recordingStateChanged"
+    RECORDING_STATE_CHANGED: "conference.recordingStateChanged",
+    /**
+     * Indicates that phone number changed.
+     */
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged"
 };
 
 module.exports = JitsiConferenceEvents;
     this.session = null;
     var self = this;
     this.lastPresences = {};
+    this.phoneNumber = null;
+    this.phonePin = null;
 }
 
 ChatRoom.prototype.initPresenceMap = function () {
 };
 
 ChatRoom.prototype.onPresence = function (pres) {
+    console.log(pres);
     var from = pres.getAttribute('from');
     // Parse roles.
     var member = {};
                 break;
             case "jibri-recording-status":
                 var jibri = node;
+                break;
+            case "call-control":
+                console.log(pres);
+                var att = node.attributes;
+                if(!att)
+                    break;
+                this.phoneNumber = att.phone || null;
+                this.phonePin = att.pin || null;
+                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
+                break;
             default :
                 this.processNode(node, from);
         }
  * @param token token for authentication
  */
 ChatRoom.prototype.toggleRecording = function (token) {
-    if(this.recording/** && this.isModerator()**/)
+    if(this.recording)
         return this.recording.toggleRecording(token);
 
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});
 }
 
+/**
+ * Dials a number.
+ * @param number the number
+ */
+ChatRoom.prototype.dial = function (number) {
+    return this.connection.rayo.dial(number, "fromnumber",
+        Strophe.getNodeFromJid(this.myroomjid), this.password,
+        this.focusMucJid);
+}
+
+/**
+ * Hangup an existing call
+ */
+ChatRoom.prototype.hangup = function () {
+    return this.connection.rayo.hangup();
+}
+
+/**
+ * Returns the phone number for joining the conference.
+ */
+ChatRoom.prototype.getPhoneNumber = function () {
+    return this.phoneNumber;
+}
+
+/**
+ * Returns the pin for joining the conference with phone.
+ */
+ChatRoom.prototype.getPhonePin = function () {
+    return this.phonePin;
+}
+
 module.exports = ChatRoom;
 
 }).call(this,"/modules/xmpp/ChatRoom.js")
 
 }).call(this,"/modules/xmpp/moderator.js")
 },{"../../service/authentication/AuthenticationEvents":87,"../../service/xmpp/XMPPEvents":91,"../settings/Settings":21,"jitsi-meet-logger":48}],35:[function(require,module,exports){
+(function (__filename){
 /* global $, $iq, config, connection, focusMucJid, messageHandler,
    Toolbar, Util, Promise */
 var XMPPEvents = require("../../service/XMPP/XMPPEvents");
+var logger = require("jitsi-meet-logger").getLogger(__filename);
 
 function Recording(ee, connection, focusMucJid) {
     this.eventEmitter = ee;
             streamid: streamId
         }).up();
 
-    console.log('Set jibri recording: '+state, iq);
+    logger.log('Set jibri recording: '+state, iq);
 
     this.connection.sendIQ(
         iq,
             $(result).find('jibri').attr('url'));
         },
         function (error) {
-            console.log('Failed to start recording, error: ', error);
+            logger.log('Failed to start recording, error: ', error);
             errCallback(error);
         });
 };
     var self = this;
     return new Promise(function(resolve, reject) {
         if (!token) {
-            console.error("No token passed!");
             reject(new Error("No token passed!"));
+            logger.error("No token passed!");
+            return;
+        }
+        if(self.state === "on") {
+            reject(new Error("Recording is already started!"));
+            logger.error("Recording is already started!");
+            return;
         }
 
         var oldState = self.state;
         self.setRecording(newState,
             token,
             function (state, url) {
-                console.log("New recording state: ", state);
+                logger.log("New recording state: ", state);
                 if (state && state !== oldState) {
                     self.state = state;
                     self.url = url;
 
 module.exports = Recording;
 
-},{"../../service/XMPP/XMPPEvents":86}],36:[function(require,module,exports){
+}).call(this,"/modules/xmpp/recording.js")
+},{"../../service/XMPP/XMPPEvents":86,"jitsi-meet-logger":48}],36:[function(require,module,exports){
 (function (__filename){
 /* jshint -W117 */
 /* a simple MUC connection plugin
                 }
 
                 this.connection.addHandler(
-                    this.onRayo.bind(this),
-                    this.RAYO_XMLNS, 'iq', 'set', null, null);
+                    this.onRayo.bind(this), this.RAYO_XMLNS, 'iq', 'set',
+                    null, null);
             },
             onRayo: function (iq) {
                 logger.info("Rayo IQ", iq);
             },
-            dial: function (to, from, roomName, roomPass) {
+            dial: function (to, from, roomName, roomPass, focusMucJid) {
                 var self = this;
-                var req = $iq(
-                    {
-                        type: 'set',
-                        to: this.connection.emuc.focusMucJid
+                return new Promise(function (resolve, reject) {
+                    if(self.call_resource) {
+                        reject(new Error("There is already started call!"));
+                        return;
                     }
-                );
-                req.c('dial',
-                    {
-                        xmlns: this.RAYO_XMLNS,
-                        to: to,
-                        from: from
-                    });
-                req.c('header',
-                    {
-                        name: 'JvbRoomName',
-                        value: roomName
-                    }).up();
-
-                if (roomPass !== null && roomPass.length) {
-
+                    if(!focusMucJid) {
+                        reject(new Error("Internal error!"));
+                        return;
+                    }
+                    var req = $iq(
+                        {
+                            type: 'set',
+                            to: focusMucJid
+                        }
+                    );
+                    req.c('dial',
+                        {
+                            xmlns: self.RAYO_XMLNS,
+                            to: to,
+                            from: from
+                        });
                     req.c('header',
                         {
-                            name: 'JvbRoomPassword',
-                            value: roomPass
+                            name: 'JvbRoomName',
+                            value: roomName
                         }).up();
-                }
 
-                this.connection.sendIQ(
-                    req,
-                    function (result) {
-                        logger.info('Dial result ', result);
+                    if (roomPass !== null && roomPass.length) {
 
-                        var resource = $(result).find('ref').attr('uri');
-                        this.call_resource = resource.substr('xmpp:'.length);
-                        logger.info(
-                            "Received call resource: " + this.call_resource);
-                    },
-                    function (error) {
-                        logger.info('Dial error ', error);
+                        req.c('header',
+                            {
+                                name: 'JvbRoomPassword',
+                                value: roomPass
+                            }).up();
                     }
-                );
-            },
-            hang_up: function () {
-                if (!this.call_resource) {
-                    logger.warn("No call in progress");
-                    return;
-                }
 
+                    self.connection.sendIQ(
+                        req,
+                        function (result) {
+                            logger.info('Dial result ', result);
+
+                            var resource = $(result).find('ref').attr('uri');
+                            self.call_resource = resource.substr('xmpp:'.length);
+                            logger.info(
+                                "Received call resource: " + self.call_resource);
+                            resolve();
+                        },
+                        function (error) {
+                            logger.info('Dial error ', error);
+                            reject(error);
+                        }
+                    );
+                });
+            },
+            hangup: function () {
                 var self = this;
-                var req = $iq(
-                    {
-                        type: 'set',
-                        to: this.call_resource
+                return new Promise(function (resolve, reject) {
+                    if (!self.call_resource) {
+                        reject(new Error("No call in progress"));
+                        logger.warn("No call in progress");
+                        return;
                     }
-                );
-                req.c('hangup',
-                    {
-                        xmlns: this.RAYO_XMLNS
-                    });
 
-                this.connection.sendIQ(
-                    req,
-                    function (result) {
-                        logger.info('Hangup result ', result);
-                        self.call_resource = null;
-                    },
-                    function (error) {
-                        logger.info('Hangup error ', error);
-                        self.call_resource = null;
-                    }
-                );
+                    var req = $iq(
+                        {
+                            type: 'set',
+                            to: self.call_resource
+                        }
+                    );
+                    req.c('hangup',
+                        {
+                            xmlns: self.RAYO_XMLNS
+                        });
+
+                    self.connection.sendIQ(
+                        req,
+                        function (result) {
+                            logger.info('Hangup result ', result);
+                            self.call_resource = null;
+                            resolve();
+                        },
+                        function (error) {
+                            logger.info('Hangup error ', error);
+                            self.call_resource = null;
+                            reject(new Error('Hangup error '));
+                        }
+                    );
+                });
             }
         }
     );
     /**
      * Indicates that recording state changed.
      */
-    RECORDING_STATE_CHANGED: "xmpp.recordingStateChanged"
+    RECORDING_STATE_CHANGED: "xmpp.recordingStateChanged",
+    /**
+     * Indicates that phone number changed.
+     */
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged"
 };
 module.exports = XMPPEvents;
 

modules/xmpp/ChatRoom.js

     this.session = null;
     var self = this;
     this.lastPresences = {};
+    this.phoneNumber = null;
+    this.phonePin = null;
 }
 
 ChatRoom.prototype.initPresenceMap = function () {
 };
 
 ChatRoom.prototype.onPresence = function (pres) {
+    console.log(pres);
     var from = pres.getAttribute('from');
     // Parse roles.
     var member = {};
                 break;
             case "jibri-recording-status":
                 var jibri = node;
+                break;
+            case "call-control":
+                console.log(pres);
+                var att = node.attributes;
+                if(!att)
+                    break;
+                this.phoneNumber = att.phone || null;
+                this.phonePin = att.pin || null;
+                this.eventEmitter.emit(XMPPEvents.PHONE_NUMBER_CHANGED);
+                break;
             default :
                 this.processNode(node, from);
         }
  * @param token token for authentication
  */
 ChatRoom.prototype.toggleRecording = function (token) {
-    if(this.recording/** && this.isModerator()**/)
+    if(this.recording)
         return this.recording.toggleRecording(token);
 
     return new Promise(function(resolve, reject){
         reject(new Error("The conference is not created yet!"))});
 }
 
+/**
+ * Dials a number.
+ * @param number the number
+ */
+ChatRoom.prototype.dial = function (number) {
+    return this.connection.rayo.dial(number, "fromnumber",
+        Strophe.getNodeFromJid(this.myroomjid), this.password,
+        this.focusMucJid);
+}
+
+/**
+ * Hangup an existing call
+ */
+ChatRoom.prototype.hangup = function () {
+    return this.connection.rayo.hangup();
+}
+
+/**
+ * Returns the phone number for joining the conference.
+ */
+ChatRoom.prototype.getPhoneNumber = function () {
+    return this.phoneNumber;
+}
+
+/**
+ * Returns the pin for joining the conference with phone.
+ */
+ChatRoom.prototype.getPhonePin = function () {
+    return this.phonePin;
+}
+
 module.exports = ChatRoom;

modules/xmpp/recording.js

 /* global $, $iq, config, connection, focusMucJid, messageHandler,
    Toolbar, Util, Promise */
 var XMPPEvents = require("../../service/XMPP/XMPPEvents");
+var logger = require("jitsi-meet-logger").getLogger(__filename);
 
 function Recording(ee, connection, focusMucJid) {
     this.eventEmitter = ee;
             streamid: streamId
         }).up();
 
-    console.log('Set jibri recording: '+state, iq);
+    logger.log('Set jibri recording: '+state, iq);
 
     this.connection.sendIQ(
         iq,
             $(result).find('jibri').attr('url'));
         },
         function (error) {
-            console.log('Failed to start recording, error: ', error);
+            logger.log('Failed to start recording, error: ', error);
             errCallback(error);
         });
 };
     var self = this;
     return new Promise(function(resolve, reject) {
         if (!token) {
-            console.error("No token passed!");
             reject(new Error("No token passed!"));
+            logger.error("No token passed!");
+            return;
+        }
+        if(self.state === "on") {
+            reject(new Error("Recording is already started!"));
+            logger.error("Recording is already started!");
+            return;
         }
 
         var oldState = self.state;
         self.setRecording(newState,
             token,
             function (state, url) {
-                console.log("New recording state: ", state);
+                logger.log("New recording state: ", state);
                 if (state && state !== oldState) {
                     self.state = state;
                     self.url = url;

modules/xmpp/strophe.rayo.js

                 }
 
                 this.connection.addHandler(
-                    this.onRayo.bind(this),
-                    this.RAYO_XMLNS, 'iq', 'set', null, null);
+                    this.onRayo.bind(this), this.RAYO_XMLNS, 'iq', 'set',
+                    null, null);
             },
             onRayo: function (iq) {
                 logger.info("Rayo IQ", iq);
             },
-            dial: function (to, from, roomName, roomPass) {
+            dial: function (to, from, roomName, roomPass, focusMucJid) {
                 var self = this;
-                var req = $iq(
-                    {
-                        type: 'set',
-                        to: this.connection.emuc.focusMucJid
+                return new Promise(function (resolve, reject) {
+                    if(self.call_resource) {
+                        reject(new Error("There is already started call!"));
+                        return;
                     }
-                );
-                req.c('dial',
-                    {
-                        xmlns: this.RAYO_XMLNS,
-                        to: to,
-                        from: from
-                    });
-                req.c('header',
-                    {
-                        name: 'JvbRoomName',
-                        value: roomName
-                    }).up();
-
-                if (roomPass !== null && roomPass.length) {
-
+                    if(!focusMucJid) {
+                        reject(new Error("Internal error!"));
+                        return;
+                    }
+                    var req = $iq(
+                        {
+                            type: 'set',
+                            to: focusMucJid
+                        }
+                    );
+                    req.c('dial',
+                        {
+                            xmlns: self.RAYO_XMLNS,
+                            to: to,
+                            from: from
+                        });
                     req.c('header',
                         {
-                            name: 'JvbRoomPassword',
-                            value: roomPass
+                            name: 'JvbRoomName',
+                            value: roomName
                         }).up();
-                }
 
-                this.connection.sendIQ(
-                    req,
-                    function (result) {
-                        logger.info('Dial result ', result);
+                    if (roomPass !== null && roomPass.length) {
 
-                        var resource = $(result).find('ref').attr('uri');
-                        this.call_resource = resource.substr('xmpp:'.length);
-                        logger.info(
-                            "Received call resource: " + this.call_resource);
-                    },
-                    function (error) {
-                        logger.info('Dial error ', error);
+                        req.c('header',
+                            {
+                                name: 'JvbRoomPassword',
+                                value: roomPass
+                            }).up();
                     }
-                );
-            },
-            hang_up: function () {
-                if (!this.call_resource) {
-                    logger.warn("No call in progress");
-                    return;
-                }
 
+                    self.connection.sendIQ(
+                        req,
+                        function (result) {
+                            logger.info('Dial result ', result);
+
+                            var resource = $(result).find('ref').attr('uri');
+                            self.call_resource =
+                                resource.substr('xmpp:'.length);
+                            logger.info(
+                                "Received call resource: " +
+                                self.call_resource);
+                            resolve();
+                        },
+                        function (error) {
+                            logger.info('Dial error ', error);
+                            reject(error);
+                        }
+                    );
+                });
+            },
+            hangup: function () {
                 var self = this;
-                var req = $iq(
-                    {
-                        type: 'set',
-                        to: this.call_resource
+                return new Promise(function (resolve, reject) {
+                    if (!self.call_resource) {
+                        reject(new Error("No call in progress"));
+                        logger.warn("No call in progress");
+                        return;
                     }
-                );
-                req.c('hangup',
-                    {
-                        xmlns: this.RAYO_XMLNS
-                    });
 
-                this.connection.sendIQ(
-                    req,
-                    function (result) {
-                        logger.info('Hangup result ', result);
-                        self.call_resource = null;
-                    },
-                    function (error) {
-                        logger.info('Hangup error ', error);
-                        self.call_resource = null;
-                    }
-                );
+                    var req = $iq(
+                        {
+                            type: 'set',
+                            to: self.call_resource
+                        }
+                    );
+                    req.c('hangup',
+                        {
+                            xmlns: self.RAYO_XMLNS
+                        });
+
+                    self.connection.sendIQ(
+                        req,
+                        function (result) {
+                            logger.info('Hangup result ', result);
+                            self.call_resource = null;
+                            resolve();
+                        },
+                        function (error) {
+                            logger.info('Hangup error ', error);
+                            self.call_resource = null;
+                            reject(new Error('Hangup error '));
+                        }
+                    );
+                });
             }
         }
     );

service/xmpp/XMPPEvents.js

     /**
      * Indicates that recording state changed.
      */
-    RECORDING_STATE_CHANGED: "xmpp.recordingStateChanged"
+    RECORDING_STATE_CHANGED: "xmpp.recordingStateChanged",
+    /**
+     * Indicates that phone number changed.
+     */
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged"
 };
 module.exports = XMPPEvents;