ref(module/xmpp): ES6 for modules/xmpp/xmpp.js and it's related files

JitsiConnection.js

@@ -1,7 +1,7 @@
 var JitsiConference = require("./JitsiConference");
-var XMPP = require("./modules/xmpp/xmpp");
 import * as JitsiConnectionErrors from "./JitsiConnectionErrors";
 import * as JitsiConnectionEvents from "./JitsiConnectionEvents";
+import XMPP from "./modules/xmpp/xmpp";
 var Statistics = require("./modules/statistics/statistics");
 
 /**

modules/xmpp/ChatRoom.js

@@ -1,6 +1,7 @@
 /* global Strophe, $, $pres, $iq, $msg */
 /* jshint -W101,-W069 */
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var MediaType = require("../../service/RTC/MediaType");
 var Moderator = require("./moderator");

modules/xmpp/ConnectionPlugin.js

@@ -0,0 +1,11 @@
+/**
+ * Base class for strophe connection plugins.
+ */
+export default class ConnectionPlugin {
+    constructor() {
+        this.connection = null;
+    }
+    init (connection) {
+        this.connection = connection;
+    }
+}

modules/xmpp/JingleSession.js

@@ -3,7 +3,8 @@
  * have different implementations depending on the underlying interface used
  * (i.e. WebRTC and ORTC) and here we hold the code common to all of them.
  */
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 
 function JingleSession(me, sid, peerjid, connection,
                        media_constraints, ice_config, service, eventEmitter) {

modules/xmpp/JingleSessionPC.js

@@ -1,6 +1,6 @@
 /* jshint -W117 */
-
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var JingleSession = require("./JingleSession");
 var TraceablePeerConnection = require("./TraceablePeerConnection");
 var MediaType = require("../../service/RTC/MediaType");

modules/xmpp/SDP.js

@@ -1,6 +1,6 @@
 /* jshint -W117 */
-
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var SDPUtil = require("./SDPUtil");
 
 // SDP STUFF

modules/xmpp/SDPUtil.js

@@ -1,4 +1,5 @@
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var RTCBrowserType = require("../RTC/RTCBrowserType");
 
 

modules/xmpp/TraceablePeerConnection.js

@@ -1,6 +1,7 @@
 /* global $ */
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var RTC = require('../RTC/RTC');
-var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTCBrowserType = require("../RTC/RTCBrowserType.js");
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var transform = require('sdp-transform');

modules/xmpp/recording.js

@@ -1,10 +1,11 @@
 /* global $, $iq, config, connection, focusMucJid, messageHandler,
    Toolbar, Util, Promise */
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var JitsiRecorderErrors = require("../../JitsiRecorderErrors");
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
 
-var logger = require("jitsi-meet-logger").getLogger(__filename);
 
 function Recording(type, eventEmitter, connection, focusMucJid, jirecon,
     roomjid) {

modules/xmpp/strophe.emuc.js

@@ -2,109 +2,123 @@
 /* a simple MUC connection plugin
  * can only handle a single MUC room
  */
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import ChatRoom from "./ChatRoom";
+import ConnectionPlugin from "./ConnectionPlugin";
 
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var ChatRoom = require("./ChatRoom");
-
-module.exports = function(XMPP) {
-    Strophe.addConnectionPlugin('emuc', {
-        connection: null,
-        rooms: {},//map with the rooms
-        init: function (conn) {
-            this.connection = conn;
-            // add handlers (just once)
-            this.connection.addHandler(this.onPresence.bind(this), null,
-                'presence', null, null, null, null);
-            this.connection.addHandler(this.onPresenceUnavailable.bind(this),
-                null, 'presence', 'unavailable', null);
-            this.connection.addHandler(this.onPresenceError.bind(this), null,
-                'presence', 'error', null);
-            this.connection.addHandler(this.onMessage.bind(this), null,
-                'message', null, null);
-            this.connection.addHandler(this.onMute.bind(this),
-                'http://jitsi.org/jitmeet/audio', 'iq', 'set',null,null);
-        },
-        createRoom: function (jid, password, options, settings) {
-            var roomJid = Strophe.getBareJidFromJid(jid);
-            if (this.rooms[roomJid]) {
-                var errmsg = "You are already in the room!";
-                logger.error(errmsg);
-                throw new Error(errmsg);
-                return;
-            }
-            this.rooms[roomJid] = new ChatRoom(this.connection, jid,
-                password, XMPP, options, settings);
-            return this.rooms[roomJid];
-        },
-        doLeave: function (jid) {
-            delete this.rooms[jid];
-        },
-        onPresence: function (pres) {
-            var from = pres.getAttribute('from');
-
-            // What is this for? A workaround for something?
-            if (pres.getAttribute('type')) {
-                return true;
-            }
-
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
-
-            // Parse status.
-            if ($(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]>status[code="201"]').length) {
-                room.createNonAnonymousRoom();
-            }
-
-            room.onPresence(pres);
+class MucConnectionPlugin extends ConnectionPlugin {
+    constructor(xmpp) {
+        super();
+        this.xmpp = xmpp;
+        this.rooms = {};
+    }
 
-            return true;
-        },
-        onPresenceUnavailable: function (pres) {
-            var from = pres.getAttribute('from');
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
-
-            room.onPresenceUnavailable(pres, from);
-            return true;
-        },
-        onPresenceError: function (pres) {
-            var from = pres.getAttribute('from');
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
-
-            room.onPresenceError(pres, from);
-            return true;
-        },
-        onMessage: function (msg) {
-            // FIXME: this is a hack. but jingle on muc makes nickchanges hard
-            var from = msg.getAttribute('from');
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
-
-            room.onMessage(msg, from);
-            return true;
-        },
+    init (connection) {
+        super.init(connection);
+        // add handlers (just once)
+        this.connection.addHandler(this.onPresence.bind(this), null,
+            'presence', null, null, null, null);
+        this.connection.addHandler(this.onPresenceUnavailable.bind(this),
+            null, 'presence', 'unavailable', null);
+        this.connection.addHandler(this.onPresenceError.bind(this), null,
+            'presence', 'error', null);
+        this.connection.addHandler(this.onMessage.bind(this), null,
+            'message', null, null);
+        this.connection.addHandler(this.onMute.bind(this),
+            'http://jitsi.org/jitmeet/audio', 'iq', 'set',null,null);
+    }
 
-        setJingleSession: function (from, session) {
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
+    createRoom (jid, password, options, settings) {
+        const roomJid = Strophe.getBareJidFromJid(jid);
+        if (this.rooms[roomJid]) {
+            const errmsg = "You are already in the room!";
+            logger.error(errmsg);
+            throw new Error(errmsg);
+            return;
+        }
+        this.rooms[roomJid] = new ChatRoom(this.connection, jid,
+            password, this.xmpp, options, settings);
+        return this.rooms[roomJid];
+    }
 
-            room.setJingleSession(session);
-        },
+    doLeave (jid) {
+        delete this.rooms[jid];
+    }
 
-        onMute: function(iq) {
-            var from = iq.getAttribute('from');
-            var room = this.rooms[Strophe.getBareJidFromJid(from)];
-            if(!room)
-                return;
+    onPresence (pres) {
+        const from = pres.getAttribute('from');
 
-            room.onMute(iq);
+        // What is this for? A workaround for something?
+        if (pres.getAttribute('type')) {
             return true;
         }
-    });
-};
+
+        const room = this.rooms[Strophe.getBareJidFromJid(from)];
+        if(!room)
+            return;
+
+        // Parse status.
+        if ($(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]' +
+            '>status[code="201"]').length) {
+            room.createNonAnonymousRoom();
+        }
+
+        room.onPresence(pres);
+
+        return true;
+    }
+
+    onPresenceUnavailable (pres) {
+        const from = pres.getAttribute('from');
+        const room = this.rooms[Strophe.getBareJidFromJid(from)];
+        if(!room)
+            return;
+
+        room.onPresenceUnavailable(pres, from);
+        return true;
+    }
+
+    onPresenceError (pres) {
+        const from = pres.getAttribute('from');
+        const room = this.rooms[Strophe.getBareJidFromJid(from)];
+        if(!room)
+            return;
+
+        room.onPresenceError(pres, from);
+        return true;
+    }
+
+    onMessage (msg) {
+        // FIXME: this is a hack. but jingle on muc makes nickchanges hard
+        const from = msg.getAttribute('from');
+        const room = this.rooms[Strophe.getBareJidFromJid(from)];
+        if(!room)
+            return;
+
+        room.onMessage(msg, from);
+        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)];
+        if(!room)
+            return;
+
+        room.onMute(iq);
+        return true;
+    }
+}
+
+export default function(XMPP) {
+    Strophe.addConnectionPlugin('emuc', new MucConnectionPlugin(XMPP));
+}

modules/xmpp/strophe.jingle.js

@@ -1,252 +1,273 @@
 /* jshint -W117 */
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import JingleSession from "./JingleSessionPC";
+import XMPPEvents from "../../service/xmpp/XMPPEvents";
+import RTCBrowserType from "../RTC/RTCBrowserType";
+import GlobalOnErrorHandler from "../util/GlobalOnErrorHandler";
+import Statistics from "../statistics/statistics";
+import ConnectionPlugin from "./ConnectionPlugin";
 
-
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var JingleSession = require("./JingleSessionPC");
-var XMPPEvents = require("../../service/xmpp/XMPPEvents");
-var RTCBrowserType = require("../RTC/RTCBrowserType");
-var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
-var Statistics = require("../statistics/statistics");
-
-module.exports = function(XMPP, eventEmitter) {
-    Strophe.addConnectionPlugin('jingle', {
-        connection: null,
-        sessions: {},
-        ice_config: {iceServers: []},
-        media_constraints: {
+class JingleConnectionPlugin extends ConnectionPlugin {
+    constructor(xmpp, eventEmitter) {
+        super();
+        this.xmpp = xmpp;
+        this.eventEmitter = eventEmitter;
+        this.sessions = {};
+        this.ice_config = {iceServers: []};
+        this.media_constraints = {
             mandatory: {
                 'OfferToReceiveAudio': true,
                 'OfferToReceiveVideo': true
             }
             // MozDontOfferDataChannel: true when this is firefox
-        },
-        init: function (conn) {
-            this.connection = conn;
-            this.connection.addHandler(this.onJingle.bind(this), 'urn:xmpp:jingle:1', 'iq', 'set', null, null);
-        },
-        onJingle: function (iq) {
-            var sid = $(iq).find('jingle').attr('sid');
-            var action = $(iq).find('jingle').attr('action');
-            var fromJid = iq.getAttribute('from');
-            // send ack first
-            var ack = $iq({type: 'result',
-                to: fromJid,
-                id: iq.getAttribute('id')
-            });
-            logger.log('on jingle ' + action + ' from ' + fromJid, iq);
-            var sess = this.sessions[sid];
-            if ('session-initiate' != action) {
-                if (!sess) {
-                    ack.attrs({ type: 'error' });
-                    ack.c('error', {type: 'cancel'})
-                        .c('item-not-found', {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up()
-                        .c('unknown-session', {xmlns: 'urn:xmpp:jingle:errors:1'});
-                    logger.warn('invalid session id', iq);
-                    this.connection.send(ack);
-                    return true;
-                }
-                // local jid is not checked
-                if (fromJid != sess.peerjid) {
-                    logger.warn(
-                        'jid mismatch for session id', sid, sess.peerjid, iq);
-                    ack.attrs({ type: 'error' });
-                    ack.c('error', {type: 'cancel'})
-                        .c('item-not-found', {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up()
-                        .c('unknown-session', {xmlns: 'urn:xmpp:jingle:errors:1'});
-                    this.connection.send(ack);
-                    return true;
-                }
-            } else if (sess !== undefined) {
-                // existing session with same session id
-                // this might be out-of-order if the sess.peerjid is the same as from
+        };
+    }
+
+    init (connection) {
+        super.init(connection);
+        this.connection.addHandler(this.onJingle.bind(this),
+            'urn:xmpp:jingle:1', 'iq', 'set', null, null);
+    }
+
+    onJingle (iq) {
+        const sid = $(iq).find('jingle').attr('sid');
+        const action = $(iq).find('jingle').attr('action');
+        const fromJid = iq.getAttribute('from');
+        // send ack first
+        const ack = $iq({type: 'result',
+            to: fromJid,
+            id: iq.getAttribute('id')
+        });
+        logger.log('on jingle ' + action + ' from ' + fromJid, iq);
+        let sess = this.sessions[sid];
+        if ('session-initiate' != action) {
+            if (!sess) {
                 ack.attrs({ type: 'error' });
                 ack.c('error', {type: 'cancel'})
-                    .c('service-unavailable', {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up();
-                logger.warn('duplicate session id', sid, iq);
+                    .c('item-not-found', {
+                        xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up()
+                    .c('unknown-session', {xmlns: 'urn:xmpp:jingle:errors:1'});
+                logger.warn('invalid session id', iq);
                 this.connection.send(ack);
                 return true;
             }
-            // see http://xmpp.org/extensions/xep-0166.html#concepts-session
-            switch (action) {
-                case 'session-initiate':
-                    var now = window.performance.now();
-                    logger.log("(TIME) received session-initiate:\t", now);
-                    var startMuted = $(iq).find('jingle>startmuted');
-                    if (startMuted && startMuted.length > 0) {
-                        var audioMuted = startMuted.attr("audio");
-                        var videoMuted = startMuted.attr("video");
-                        eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
-                                audioMuted === "true", videoMuted === "true");
-                    }
-                    sess = new JingleSession(
-                            $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
-                            fromJid,
-                            this.connection,
-                            this.media_constraints,
-                            this.ice_config, XMPP);
-
-                    this.sessions[sess.sid] = sess;
+            // local jid is not checked
+            if (fromJid != sess.peerjid) {
+                logger.warn(
+                    'jid mismatch for session id', sid, sess.peerjid, iq);
+                ack.attrs({ type: 'error' });
+                ack.c('error', {type: 'cancel'})
+                    .c('item-not-found', {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up()
+                    .c('unknown-session', {xmlns: 'urn:xmpp:jingle:errors:1'});
+                this.connection.send(ack);
+                return true;
+            }
+        } else if (sess !== undefined) {
+            // existing session with same session id
+            // this might be out-of-order if the sess.peerjid is the same as from
+            ack.attrs({ type: 'error' });
+            ack.c('error', {type: 'cancel'})
+                .c('service-unavailable', {xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas'}).up();
+            logger.warn('duplicate session id', sid, iq);
+            this.connection.send(ack);
+            return true;
+        }
+        const now = window.performance.now();
+        // see http://xmpp.org/extensions/xep-0166.html#concepts-session
+        switch (action) {
+            case 'session-initiate':
+                logger.log("(TIME) received session-initiate:\t", now);
+                const startMuted = $(iq).find('jingle>startmuted');
+                if (startMuted && startMuted.length > 0) {
+                    const audioMuted = startMuted.attr("audio");
+                    const videoMuted = startMuted.attr("video");
+                    this.eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
+                            audioMuted === "true", videoMuted === "true");
+                }
+                sess = new JingleSession(
+                        $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
+                        fromJid,
+                        this.connection,
+                        this.media_constraints,
+                        this.ice_config, this.xmpp);
 
-                    var jingleOffer = $(iq).find('>jingle');
-                    // FIXME there's no nice way with event to get the reason
-                    // why the call was rejected
-                    eventEmitter.emit(XMPPEvents.CALL_INCOMING, sess, jingleOffer, now);
-                    if (!sess.active())
-                    {
-                        // Call not accepted
-                        ack.attrs({ type: 'error' });
-                        ack.c('error', {type: 'cancel'})
-                           .c('bad-request',
-                            { xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas' })
-                            .up();
-                        this.terminate(sess.sid);
-                    }
-                    Statistics.analytics.sendEvent(
-                        'xmpp.session-initiate', now);
-                    break;
-                case 'session-terminate':
-                    logger.log('terminating...', sess.sid);
-                    var reasonCondition = null;
-                    var reasonText = null;
-                    if ($(iq).find('>jingle>reason').length) {
-                        reasonCondition
-                            = $(iq).find('>jingle>reason>:first')[0].tagName;
-                        reasonText = $(iq).find('>jingle>reason>text').text();
-                    }
-                    this.terminate(sess.sid, reasonCondition, reasonText);
-                    eventEmitter.emit(XMPPEvents.CALL_ENDED,
-                        sess, reasonCondition, reasonText);
-                    break;
-                case 'transport-replace':
-                    var now = window.performance.now();
-                    logger.info("(TIME) Start transport replace", now);
-                    Statistics.analytics.sendEvent(
-                        'xmpp.transport-replace.start', now);
+                this.sessions[sess.sid] = sess;
 
-                    sess.replaceTransport($(iq).find('>jingle'),
-                        function () {
-                            var now = window.performance.now();
-                            logger.info(
-                                "(TIME) Transport replace success!", now);
-                            Statistics.analytics.sendEvent(
-                                'xmpp.transport-replace.success', now);
-                        },
-                        function(error) {
-                            GlobalOnErrorHandler.callErrorHandler(error);
-                            logger.error('Transport replace failed', error);
-                            sess.sendTransportReject();
-                        });
-                    break;
-                case 'addsource': // FIXME: proprietary, un-jingleish
-                case 'source-add': // FIXME: proprietary
-                    sess.addSource($(iq).find('>jingle>content'));
-                    break;
-                case 'removesource': // FIXME: proprietary, un-jingleish
-                case 'source-remove': // FIXME: proprietary
-                    sess.removeSource($(iq).find('>jingle>content'));
-                    break;
-                default:
-                    logger.warn('jingle action not implemented', action);
+                let jingleOffer = $(iq).find('>jingle');
+                // FIXME there's no nice way with event to get the reason
+                // why the call was rejected
+                this.eventEmitter.emit(XMPPEvents.CALL_INCOMING,
+                    sess, jingleOffer, now);
+                if (!sess.active())
+                {
+                    // Call not accepted
                     ack.attrs({ type: 'error' });
                     ack.c('error', {type: 'cancel'})
-                        .c('bad-request',
-                            { xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas' })
+                       .c('bad-request',
+                        { xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas' })
                         .up();
-                    break;
-            }
-            this.connection.send(ack);
-            return true;
-        },
-        terminate: function (sid, reasonCondition, reasonText) {
-            if (this.sessions.hasOwnProperty(sid)) {
-                if (this.sessions[sid].state != 'ended') {
-                    this.sessions[sid].onTerminated(reasonCondition, reasonText);
+                    this.terminate(sess.sid);
+                }
+                Statistics.analytics.sendEvent(
+                    'xmpp.session-initiate', now);
+                break;
+            case 'session-terminate':
+                logger.log('terminating...', sess.sid);
+                let reasonCondition = null;
+                let reasonText = null;
+                if ($(iq).find('>jingle>reason').length) {
+                    reasonCondition
+                        = $(iq).find('>jingle>reason>:first')[0].tagName;
+                    reasonText = $(iq).find('>jingle>reason>text').text();
                 }
-                delete this.sessions[sid];
+                this.terminate(sess.sid, reasonCondition, reasonText);
+                this.eventEmitter.emit(XMPPEvents.CALL_ENDED,
+                    sess, reasonCondition, reasonText);
+                break;
+            case 'transport-replace':
+                logger.info("(TIME) Start transport replace", now);
+                Statistics.analytics.sendEvent(
+                    'xmpp.transport-replace.start', now);
+
+                sess.replaceTransport($(iq).find('>jingle'), () => {
+                    const successTime = window.performance.now();
+                    logger.info(
+                        "(TIME) Transport replace success!", successTime);
+                    Statistics.analytics.sendEvent(
+                        'xmpp.transport-replace.success', successTime);
+                }, (error) => {
+                    GlobalOnErrorHandler.callErrorHandler(error);
+                    logger.error('Transport replace failed', error);
+                    sess.sendTransportReject();
+                });
+                break;
+            case 'addsource': // FIXME: proprietary, un-jingleish
+            case 'source-add': // FIXME: proprietary
+                sess.addSource($(iq).find('>jingle>content'));
+                break;
+            case 'removesource': // FIXME: proprietary, un-jingleish
+            case 'source-remove': // FIXME: proprietary
+                sess.removeSource($(iq).find('>jingle>content'));
+                break;
+            default:
+                logger.warn('jingle action not implemented', action);
+                ack.attrs({ type: 'error' });
+                ack.c('error', {type: 'cancel'})
+                    .c('bad-request',
+                        { xmlns: 'urn:ietf:params:xml:ns:xmpp-stanzas' })
+                    .up();
+                break;
+        }
+        this.connection.send(ack);
+        return true;
+    }
+
+    terminate (sid, reasonCondition, reasonText) {
+        if (this.sessions.hasOwnProperty(sid)) {
+            if (this.sessions[sid].state != 'ended') {
+                this.sessions[sid].onTerminated(reasonCondition, reasonText);
             }
-        },
-        getStunAndTurnCredentials: function () {
-            // get stun and turn configuration from server via xep-0215
-            // uses time-limited credentials as described in
-            // http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00
-            //
-            // see https://code.google.com/p/prosody-modules/source/browse/mod_turncredentials/mod_turncredentials.lua
-            // for a prosody module which implements this
-            //
-            // currently, this doesn't work with updateIce and therefore credentials with a long
-            // validity have to be fetched before creating the peerconnection
-            // TODO: implement refresh via updateIce as described in
-            //      https://code.google.com/p/webrtc/issues/detail?id=1650
-            var self = this;
-            this.connection.sendIQ(
-                $iq({type: 'get', to: this.connection.domain})
-                    .c('services', {xmlns: 'urn:xmpp:extdisco:1'}).c('service', {host: 'turn.' + this.connection.domain}),
-                function (res) {
-                    var iceservers = [];
-                    $(res).find('>services>service').each(function (idx, el) {
-                        el = $(el);
-                        var dict = {};
-                        var type = el.attr('type');
-                        switch (type) {
-                            case 'stun':
-                                dict.url = 'stun:' + el.attr('host');
-                                if (el.attr('port')) {
-                                    dict.url += ':' + el.attr('port');
-                                }
-                                iceservers.push(dict);
-                                break;
-                            case 'turn':
-                            case 'turns':
-                                dict.url = type + ':';
-                                if (el.attr('username')) { // https://code.google.com/p/webrtc/issues/detail?id=1508
-                                    if (navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./) && parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2], 10) < 28) {
-                                        dict.url += el.attr('username') + '@';
-                                    } else {
-                                        dict.username = el.attr('username'); // only works in M28
-                                    }
-                                }
-                                dict.url += el.attr('host');
-                                if (el.attr('port') && el.attr('port') != '3478') {
-                                    dict.url += ':' + el.attr('port');
-                                }
-                                if (el.attr('transport') && el.attr('transport') != 'udp') {
-                                    dict.url += '?transport=' + el.attr('transport');
-                                }
-                                if (el.attr('password')) {
-                                    dict.credential = el.attr('password');
+            delete this.sessions[sid];
+        }
+    }
+
+    getStunAndTurnCredentials () {
+        // get stun and turn configuration from server via xep-0215
+        // uses time-limited credentials as described in
+        // http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00
+        //
+        // see https://code.google.com/p/prosody-modules/source/browse/mod_turncredentials/mod_turncredentials.lua
+        // for a prosody module which implements this
+        //
+        // currently, this doesn't work with updateIce and therefore credentials with a long
+        // validity have to be fetched before creating the peerconnection
+        // TODO: implement refresh via updateIce as described in
+        //      https://code.google.com/p/webrtc/issues/detail?id=1650
+        this.connection.sendIQ(
+            $iq({type: 'get', to: this.connection.domain})
+                .c('services', {xmlns: 'urn:xmpp:extdisco:1'})
+                .c('service', {host: 'turn.' + this.connection.domain}),
+            (res) => {
+                let iceservers = [];
+                $(res).find('>services>service').each((idx, el) => {
+                    el = $(el);
+                    let dict = {};
+                    const type = el.attr('type');
+                    switch (type) {
+                        case 'stun':
+                            dict.url = 'stun:' + el.attr('host');
+                            if (el.attr('port')) {
+                                dict.url += ':' + el.attr('port');
+                            }
+                            iceservers.push(dict);
+                            break;
+                        case 'turn':
+                        case 'turns':
+                            dict.url = type + ':';
+                            const username = el.attr('username');
+                            // https://code.google.com/p/webrtc/issues/detail?id=1508
+                            if (username) {
+                                if (navigator.userAgent.match(
+                                    /Chrom(e|ium)\/([0-9]+)\./)
+                                    && parseInt(
+                                        navigator.userAgent.match(
+                                            /Chrom(e|ium)\/([0-9]+)\./)[2],
+                                            10) < 28) {
+                                    dict.url += username + '@';
+                                } else {
+                                    // only works in M28
+                                    dict.username = username;
                                 }
-                                iceservers.push(dict);
-                                break;
-                        }
-                    });
-                    self.ice_config.iceServers = iceservers;
-                },
-                function (err) {
-                    logger.warn('getting turn credentials failed', err);
-                    logger.warn('is mod_turncredentials or similar installed?');
-                }
-            );
-            // implement push?
-        },
+                            }
+                            dict.url += el.attr('host');
+                            const port = el.attr('port');
+                            if (port && port != '3478') {
+                                dict.url += ':' + el.attr('port');
+                            }
+                            const transport = el.attr('transport');
+                            if (transport && transport != 'udp') {
+                                dict.url += '?transport=' + transport;
+                            }
 
-        /**
-         * Returns the data saved in 'updateLog' in a format to be logged.
-         */
-        getLog: function () {
-            var data = {};
-            var self = this;
-            Object.keys(this.sessions).forEach(function (sid) {
-                var session = self.sessions[sid];
-                if (session.peerconnection && session.peerconnection.updateLog) {
-                    // FIXME: should probably be a .dump call
-                    data["jingle_" + session.sid] = {
-                        updateLog: session.peerconnection.updateLog,
-                        stats: session.peerconnection.stats,
-                        url: window.location.href
-                    };
-                }
+                            dict.credential = el.attr('password')
+                                || dict.credential;
+                            iceservers.push(dict);
+                            break;
+                    }
+                });
+                self.ice_config.iceServers = iceservers;
+            }, (err) => {
+                logger.warn('getting turn credentials failed', err);
+                logger.warn('is mod_turncredentials or similar installed?');
             });
-            return data;
-        }
-    });
+        // implement push?
+    }
+
+    /**
+     * Returns the data saved in 'updateLog' in a format to be logged.
+     */
+    getLog () {
+        const data = {};
+        Object.keys(this.sessions).forEach((sid) => {
+            const session = self.sessions[sid];
+            const pc = session.peerconnection
+            if (pc && pc.updateLog) {
+                // FIXME: should probably be a .dump call
+                data["jingle_" + sid] = {
+                    updateLog: pc.updateLog,
+                    stats: pc.stats,
+                    url: window.location.href
+                };
+            }
+        });
+        return data;
+    }
+}
+
+
+
+module.exports = function(XMPP, eventEmitter) {
+    Strophe.addConnectionPlugin('jingle',
+        new JingleConnectionPlugin(XMPP, eventEmitter));
 };

modules/xmpp/strophe.logger.js

@@ -1,20 +1,30 @@
 /* global Strophe */
-module.exports = function () {
+import ConnectionPlugin from "./ConnectionPlugin";
 
-    Strophe.addConnectionPlugin('logger', {
-        // logs raw stanzas and makes them available for download as JSON
-        connection: null,
-        log: [],
-        init: function (conn) {
-            this.connection = conn;
-            this.connection.rawInput = this.log_incoming.bind(this);
-            this.connection.rawOutput = this.log_outgoing.bind(this);
-        },
-        log_incoming: function (stanza) {
-            this.log.push([new Date().getTime(), 'incoming', stanza]);
-        },
-        log_outgoing: function (stanza) {
-            this.log.push([new Date().getTime(), 'outgoing', stanza]);
-        }
-    });
-};
+/**
+ *  Logs raw stanzas and makes them available for download as JSON
+ */
+class StropheLogger extends ConnectionPlugin {
+    constructor() {
+        super();
+        this.log = [];
+    }
+
+    init (connection) {
+        super.init(connection);
+        this.connection.rawInput = this.log_incoming.bind(this);
+        this.connection.rawOutput = this.log_outgoing.bind(this);
+    }
+
+    log_incoming (stanza) {
+        this.log.push([new Date().getTime(), 'incoming', stanza]);
+    }
+
+    log_outgoing (stanza) {
+        this.log.push([new Date().getTime(), 'outgoing', stanza]);
+    }
+}
+
+export default function () {
+    Strophe.addConnectionPlugin('logger', new StropheLogger());
+}

modules/xmpp/strophe.ping.js

@@ -1,149 +1,143 @@
 /* global $, $iq, Strophe */
-
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
-var XMPPEvents = require("../../service/xmpp/XMPPEvents");
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import GlobalOnErrorHandler from "../util/GlobalOnErrorHandler";
+import XMPPEvents from "../../service/xmpp/XMPPEvents";
+import ConnectionPlugin from "./ConnectionPlugin";
 
 /**
  * Ping every 10 sec
  */
-var PING_INTERVAL = 10000;
+const PING_INTERVAL = 10000;
 
 /**
  * Ping timeout error after 15 sec of waiting.
  */
-var PING_TIMEOUT = 15000;
+const PING_TIMEOUT = 15000;
 
 /**
  * Will close the connection after 3 consecutive ping errors.
  */
-var PING_THRESHOLD = 3;
+const PING_THRESHOLD = 3;
+
+
+
 
 /**
  * XEP-0199 ping plugin.
  *
  * Registers "urn:xmpp:ping" namespace under Strophe.NS.PING.
  */
-module.exports = function (XMPP, eventEmitter) {
-    Strophe.addConnectionPlugin('ping', {
-
-        connection: null,
-
-        failedPings: 0,
+class PingConnectionPlugin extends ConnectionPlugin {
+    constructor() {
+        super();
+        this.failedPings = 0;
+    }
 
-        /**
-         * Initializes the plugin. Method called by Strophe.
-         * @param connection Strophe connection instance.
-         */
-        init: function (connection) {
-            this.connection = connection;
-            Strophe.addNamespace('PING', "urn:xmpp:ping");
-        },
+    /**
+     * Initializes the plugin. Method called by Strophe.
+     * @param connection Strophe connection instance.
+     */
+    init (connection) {
+        super.init(connection);
+        Strophe.addNamespace('PING', "urn:xmpp:ping");
+    }
 
-        /**
-         * Sends "ping" to given <tt>jid</tt>
-         * @param jid the JID to which ping request will be sent.
-         * @param success callback called on success.
-         * @param error callback called on error.
-         * @param timeout ms how long are we going to wait for the response. On
-         *        timeout <tt>error<//t> callback is called with undefined error
-         *        argument.
-         */
-        ping: function (jid, success, error, timeout) {
-            var iq = $iq({type: 'get', to: jid});
-            iq.c('ping', {xmlns: Strophe.NS.PING});
-            this.connection.sendIQ(iq, success, error, timeout);
-        },
+    /**
+     * Sends "ping" to given <tt>jid</tt>
+     * @param jid the JID to which ping request will be sent.
+     * @param success callback called on success.
+     * @param error callback called on error.
+     * @param timeout ms how long are we going to wait for the response. On
+     *        timeout <tt>error<//t> callback is called with undefined error
+     *        argument.
+     */
+    ping (jid, success, error, timeout) {
+        const iq = $iq({type: 'get', to: jid});
+        iq.c('ping', {xmlns: Strophe.NS.PING});
+        this.connection.sendIQ(iq, success, error, timeout);
+    }
 
-        /**
-         * Checks if given <tt>jid</tt> has XEP-0199 ping support.
-         * @param jid the JID to be checked for ping support.
-         * @param callback function with boolean argument which will be
-         * <tt>true</tt> if XEP-0199 ping is supported by given <tt>jid</tt>
-         */
-        hasPingSupport: function (jid, callback) {
-            var disco = this.connection.disco;
-            // XXX The following disco.info was observed to throw a "TypeError:
-            // Cannot read property 'info' of undefined" during porting to React
-            // Native. Since disco is checked in multiple places (e.g.
-            // strophe.jingle.js, strophe.rayo.js), check it here as well.
-            if (disco) {
-                disco.info(
-                    jid,
-                    null,
-                    function (result) {
-                        var ping
-                            = $(result).find('>>feature[var="urn:xmpp:ping"]');
-                        callback(ping.length > 0);
-                    },
-                    function (error) {
-                        var errmsg = "Ping feature discovery error";
-                        GlobalOnErrorHandler.callErrorHandler(new Error(
-                            errmsg + ": " + error));
-                        logger.error(errmsg, error);
-                        callback(false);
-                    }
-                );
-            } else {
-              // FIXME Should callback be invoked here? Maybe with false as an
-              // argument?
-            }
-        },
-
-        /**
-         * Starts to send ping in given interval to specified remote JID.
-         * This plugin supports only one such task and <tt>stopInterval</tt>
-         * must be called before starting a new one.
-         * @param remoteJid remote JID to which ping requests will be sent to.
-         * @param interval task interval in ms.
-         */
-        startInterval: function (remoteJid, interval) {
-            if (this.intervalId) {
-                var errmsg = "Ping task scheduled already";
-                GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
-                logger.error(errmsg);
-                return;
-            }
-            if (!interval)
-                interval = PING_INTERVAL;
-            var self = this;
-            this.intervalId = window.setInterval(function () {
-                self.ping(remoteJid,
-                function (result) {
-                    // Ping OK
-                    self.failedPings = 0;
-                },
-                function (error) {
-                    self.failedPings += 1;
-                    var errmsg = "Ping " + (error ? "error" : "timeout");
-                    if (self.failedPings >= PING_THRESHOLD) {
-                        GlobalOnErrorHandler.callErrorHandler(
-                            new Error(errmsg));
-                        logger.error(errmsg, error);
-                        // FIXME it doesn't help to disconnect when 3rd PING
-                        // times out, it only stops Strophe from retrying.
-                        // Not really sure what's the right thing to do in that
-                        // situation, but just closing the connection makes no
-                        // sense.
-                        //self.connection.disconnect();
-                    } else {
-                        logger.warn(errmsg, error);
-                    }
-                }, PING_TIMEOUT);
-            }, interval);
-            logger.info("XMPP pings will be sent every " + interval + " ms");
-        },
+    /**
+     * Checks if given <tt>jid</tt> has XEP-0199 ping support.
+     * @param jid the JID to be checked for ping support.
+     * @param callback function with boolean argument which will be
+     * <tt>true</tt> if XEP-0199 ping is supported by given <tt>jid</tt>
+     */
+    hasPingSupport (jid, callback) {
+        const disco = this.connection.disco;
+        // XXX The following disco.info was observed to throw a "TypeError:
+        // Cannot read property 'info' of undefined" during porting to React
+        // Native. Since disco is checked in multiple places (e.g.
+        // strophe.jingle.js, strophe.rayo.js), check it here as well.
+        if (disco) {
+            disco.info(jid, null, (result)  => {
+                const ping
+                    = $(result).find('>>feature[var="urn:xmpp:ping"]');
+                callback(ping.length > 0);
+            }, (error) => {
+                const errmsg = "Ping feature discovery error";
+                GlobalOnErrorHandler.callErrorHandler(new Error(
+                    errmsg + ": " + error));
+                logger.error(errmsg, error);
+                callback(false);
+            });
+        } else {
+          // FIXME Should callback be invoked here? Maybe with false as an
+          // argument?
+        }
+    }
 
-        /**
-         * Stops current "ping"  interval task.
-         */
-        stopInterval: function () {
-            if (this.intervalId) {
-                window.clearInterval(this.intervalId);
-                this.intervalId = null;
+    /**
+     * Starts to send ping in given interval to specified remote JID.
+     * This plugin supports only one such task and <tt>stopInterval</tt>
+     * must be called before starting a new one.
+     * @param remoteJid remote JID to which ping requests will be sent to.
+     * @param interval task interval in ms.
+     */
+    startInterval (remoteJid, interval = PING_INTERVAL) {
+        if (this.intervalId) {
+            const errmsg = "Ping task scheduled already";
+            GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
+            logger.error(errmsg);
+            return;
+        }
+        this.intervalId = window.setInterval(() => {
+            this.ping(remoteJid, (result) => {
                 this.failedPings = 0;
-                logger.info("Ping interval cleared");
-            }
+            }, (error) => {
+                this.failedPings += 1;
+                const errmsg = "Ping " + (error ? "error" : "timeout");
+                if (this.failedPings >= PING_THRESHOLD) {
+                    GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
+                    logger.error(errmsg, error);
+                    // FIXME it doesn't help to disconnect when 3rd PING
+                    // times out, it only stops Strophe from retrying.
+                    // Not really sure what's the right thing to do in that
+                    // situation, but just closing the connection makes no
+                    // sense.
+                    //self.connection.disconnect();
+                } else {
+                    logger.warn(errmsg, error);
+                }
+            }, PING_TIMEOUT);
+        }, interval);
+        logger.info("XMPP pings will be sent every " + interval + " ms");
+    }
+
+    /**
+     * Stops current "ping"  interval task.
+     */
+    stopInterval () {
+        if (this.intervalId) {
+            window.clearInterval(this.intervalId);
+            this.intervalId = null;
+            this.failedPings = 0;
+            logger.info("Ping interval cleared");
         }
-    });
-};
+    }
+}
+
+export default function () {
+    Strophe.addConnectionPlugin('ping', new PingConnectionPlugin());
+}

modules/xmpp/strophe.rayo.js

@@ -1,114 +1,97 @@
 /* jshint -W117 */
-var logger = require("jitsi-meet-logger").getLogger(__filename);
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import ConnectionPlugin from "./ConnectionPlugin";
 
-module.exports = function() {
-    Strophe.addConnectionPlugin('rayo',
-        {
-            RAYO_XMLNS: 'urn:xmpp:rayo:1',
-            connection: null,
-            init: function (conn) {
-                this.connection = conn;
-                var disco = conn.disco;
-                if (disco) {
-                    disco.addFeature('urn:xmpp:rayo:client:1');
-                }
+const RAYO_XMLNS = 'urn:xmpp:rayo:1';
 
-                this.connection.addHandler(
-                    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, focusMucJid) {
-                var self = this;
-                return new Promise(function (resolve, reject) {
-                    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: 'JvbRoomName',
-                            value: roomName
-                        }).up();
+class RayoConnectionPlugin extends ConnectionPlugin {
+    init (connection) {
+        super.init(connection);
+        const disco = this.connection.disco;
+        if (disco) {
+            disco.addFeature('urn:xmpp:rayo:client:1');
+        }
+
+        this.connection.addHandler(
+            this.onRayo.bind(this), RAYO_XMLNS, 'iq', 'set', null, null);
+    }
 
-                    if (roomPass !== null && roomPass.length) {
+    onRayo (iq) {
+        logger.info("Rayo IQ", iq);
+    }
 
-                        req.c('header',
-                            {
-                                name: 'JvbRoomPassword',
-                                value: roomPass
-                            }).up();
-                    }
+    dial (to, from, roomName, roomPass, focusMucJid) {
+        return new Promise((resolve, reject) => {
+            if(!focusMucJid) {
+                reject(new Error("Internal error!"));
+                return;
+            }
+            const req = $iq({
+                type: 'set',
+                to: focusMucJid
+            });
+            req.c('dial', {
+                xmlns: self.RAYO_XMLNS,
+                to: to,
+                from: from
+            });
+            req.c('header', {
+                name: 'JvbRoomName',
+                value: roomName
+            }).up();
 
-                    self.connection.sendIQ(
-                        req,
-                        function (result) {
-                            logger.info('Dial result ', result);
+            if (roomPass !== null && roomPass.length) {
+                req.c('header', {
+                    name: 'JvbRoomPassword',
+                    value: roomPass
+                }).up();
+            }
 
-                            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;
-                return new Promise(function (resolve, reject) {
-                    if (!self.call_resource) {
-                        reject(new Error("No call in progress"));
-                        logger.warn("No call in progress");
-                        return;
-                    }
+            this.connection.sendIQ(req, (result) => {
+                logger.info('Dial result ', result);
 
-                    var req = $iq(
-                        {
-                            type: 'set',
-                            to: self.call_resource
-                        }
-                    );
-                    req.c('hangup',
-                        {
-                            xmlns: self.RAYO_XMLNS
-                        });
+                let resource = $(result).find('ref').attr('uri');
+                this.call_resource =
+                    resource.substr('xmpp:'.length);
+                logger.info("Received call resource: " + this.call_resource);
+                resolve();
+            }, (error) => {
+                logger.info('Dial error ', error);
+                reject(error);
+            });
+        });
+    }
 
-                    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 '));
-                        }
-                    );
-                });
+    hangup () {
+        return new Promise((resolve, reject) => {
+            if (!this.call_resource) {
+                reject(new Error("No call in progress"));
+                logger.warn("No call in progress");
+                return;
             }
-        }
-    );
-};
+
+            const req = $iq({
+                type: 'set',
+                to: this.call_resource
+            });
+            req.c('hangup', {
+                xmlns: RAYO_XMLNS
+            });
+
+            this.connection.sendIQ(req, (result) => {
+                logger.info('Hangup result ', result);
+                this.call_resource = null;
+                resolve();
+            }, (error) => {
+                logger.info('Hangup error ', error);
+                this.call_resource = null;
+                reject(new Error('Hangup error '));
+            });
+        });
+    }
+}
+
+export default function() {
+    Strophe.addConnectionPlugin('rayo', new RayoConnectionPlugin());
+}

modules/xmpp/strophe.util.js

@@ -2,10 +2,11 @@
 /**
  * Strophe logger implementation. Logs from level WARN and above.
  */
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import GlobalOnErrorHandler from "../util/GlobalOnErrorHandler";
 
-module.exports = function () {
+export default function () {
 
     Strophe.log = function (level, msg) {
         // Our global handler reports uncaught errors to the stats which may
@@ -55,4 +56,4 @@ module.exports = function () {
                 return "unknown";
         }
     };
-};
+}

modules/xmpp/xmpp.js

@@ -1,21 +1,25 @@
 /* global $, APP, config, Strophe */
-
-var logger = require("jitsi-meet-logger").getLogger(__filename);
-var EventEmitter = require("events");
-var Pako = require("pako");
-var RandomUtil = require("../util/RandomUtil");
-var RTCEvents = require("../../service/RTC/RTCEvents");
-var XMPPEvents = require("../../service/xmpp/XMPPEvents");
+import {getLogger} from "jitsi-meet-logger";
+const logger = getLogger(__filename);
+import EventEmitter from "events";
+import Pako from "pako";
+import RandomUtil from "../util/RandomUtil";
+import RTCEvents from "../../service/RTC/RTCEvents";
+import XMPPEvents from "../../service/xmpp/XMPPEvents";
 import * as JitsiConnectionErrors from "../../JitsiConnectionErrors";
 import * as JitsiConnectionEvents from "../../JitsiConnectionEvents";
-var RTC = require("../RTC/RTC");
-var RTCBrowserType = require("../RTC/RTCBrowserType");
-
-var authenticatedUser = false;
-
-function createConnection(bosh, token) {
-    bosh = bosh || '/http-bind';
-
+import RTC from "../RTC/RTC";
+import RTCBrowserType from "../RTC/RTCBrowserType";
+import initEmuc from "./strophe.emuc";
+import initJingle from "./strophe.jingle";
+import initStropheUtil from "./strophe.util";
+import initPing from "./strophe.ping";
+import initRayo from "./strophe.rayo";
+import initStropheLogger from "./strophe.logger";
+
+let authenticatedUser = true;
+
+function createConnection(token, bosh = '/http-bind') {
     // Append token as URL param
     if (token) {
         bosh += (bosh.indexOf('?') == -1 ? '?' : '&') + 'token=' + token;
@@ -24,79 +28,43 @@ function createConnection(bosh, token) {
     return new Strophe.Connection(bosh);
 };
 
-//!!!!!!!!!! FIXME: ...
-function initStrophePlugins(XMPP) {
-    require("./strophe.emuc")(XMPP);
-    require("./strophe.jingle")(XMPP, XMPP.eventEmitter);
-//    require("./strophe.moderate")(XMPP, eventEmitter);
-    require("./strophe.util")();
-    require("./strophe.ping")(XMPP, XMPP.eventEmitter);
-    require("./strophe.rayo")();
-    require("./strophe.logger")();
-}
-
-function XMPP(options, token) {
-    this.eventEmitter = new EventEmitter();
-    this.connection = null;
-    this.disconnectInProgress = false;
-    this.connectionTimes = {};
-    this.forceMuted = false;
-    this.options = options;
-    this.connectParams = {};
-    this.token = token;
-    initStrophePlugins(this);
-
-    this.connection = createConnection(options.bosh, token);
-
-    if(!this.connection.disco || !this.connection.caps)
-        throw new Error(
-            "Missing strophe-plugins (disco and caps plugins are required)!");
-
-    // Initialize features advertised in disco-info
-    this.initFeaturesList();
-
-    // Setup a disconnect on unload as a way to facilitate API consumers. It
-    // sounds like they would want that. A problem for them though may be if
-    // they wanted to utilize the connected connection in an unload handler of
-    // their own. However, it should be fairly easy for them to do that by
-    // registering their unload handler before us.
-    $(window).on('beforeunload unload', this.disconnect.bind(this));
-}
-
-/**
- * Reloads the XMPP module
- */
-XMPP.prototype.reload = function () {
-    this.disconnect();
-    this.connection.pause();
-    this.connection = createConnection(this.options.bosh, this.token);
-
-    // Initialize features advertised in disco-info
-    this.initFeaturesList();
-
-    //getData for attach
-    if(this.options.prebindURL &&
-        typeof(createConnectionExternally) === "function") {
-        var self = this;
-        createConnectionExternally(this.options.prebindURL, function (data) {
-            self.attach(data);
-        }, function (error) {
-            //connect
-            self.connect(this.connectParams.jid, this.connectParams.password);
-        });
-    } else {
-        //connect
-        this.connect(this.connectParams.jid, this.connectParams.password);
+export default class XMPP {
+    constructor(options, token) {
+        this.eventEmitter = new EventEmitter();
+        this.connection = null;
+        this.disconnectInProgress = false;
+        this.connectionTimes = {};
+        this.forceMuted = false;
+        this.options = options;
+        this.connectParams = {};
+        this.token = token;
+        this._initStrophePlugins(this);
+
+        this.connection = createConnection(options.bosh, token);
+
+        if(!this.connection.disco || !this.connection.caps)
+            throw new Error(
+                "Missing strophe-plugins (disco and caps plugins are required)!");
+
+        // Initialize features advertised in disco-info
+        this.initFeaturesList();
+
+        // Setup a disconnect on unload as a way to facilitate API consumers. It
+        // sounds like they would want that. A problem for them though may be if
+        // they wanted to utilize the connected connection in an unload handler of
+        // their own. However, it should be fairly easy for them to do that by
+        // registering their unload handler before us.
+        $(window).on('beforeunload unload', this.disconnect.bind(this));
     }
 
-}
+    /**
+     * Initializes the list of feature advertised through the disco-info mechanism
+     */
+    initFeaturesList () {
+        const disco = this.connection.disco;
+        if (!disco)
+            return;
 
-/**
- * Initializes the list of feature advertised through the disco-info mechanism
- */
-XMPP.prototype.initFeaturesList = function () {
-    var disco = this.connection.disco;
-    if (disco) {
         // http://xmpp.org/extensions/xep-0167.html#support
         // http://xmpp.org/extensions/xep-0176.html#support
         disco.addFeature('urn:xmpp:jingle:1');
@@ -124,288 +92,292 @@ XMPP.prototype.initFeaturesList = function () {
         // Enable Lipsync ?
         if (RTCBrowserType.isChrome() && false !== this.options.enableLipSync) {
             logger.info("Lip-sync enabled !");
-            this.connection.disco.addFeature('http://jitsi.org/meet/lipsync');
+            disco.addFeature('http://jitsi.org/meet/lipsync');
         }
     }
-};
 
-XMPP.prototype.getConnection = function () { return this.connection; };
-
-/**
- * Receive connection status changes and handles them.
- * @password {string} the password passed in connect method
- * @status the connection status
- * @msg message
- */
-XMPP.prototype.connectionHandler = function (password, status, msg) {
-    var now = window.performance.now();
-    this.connectionTimes[Strophe.getStatusString(status).toLowerCase()] = now;
-    logger.log("(TIME) Strophe " + Strophe.getStatusString(status) +
-        (msg ? "[" + msg + "]" : "") + ":\t", now);
-    if (status === Strophe.Status.CONNECTED ||
-        status === Strophe.Status.ATTACHED) {
-        if (this.options.useStunTurn) {
-            this.connection.jingle.getStunAndTurnCredentials();
-        }
-
-        logger.info("My Jabber ID: " + this.connection.jid);
-
-        // Schedule ping ?
-        var pingJid = this.connection.domain;
-        this.connection.ping.hasPingSupport(
-            pingJid,
-            function (hasPing) {
-                if (hasPing)
-                    this.connection.ping.startInterval(pingJid);
-                else
-                    logger.warn("Ping NOT supported by " + pingJid);
-            }.bind(this));
-
-        if (password)
-            authenticatedUser = true;
-        if (this.connection && this.connection.connected &&
-            Strophe.getResourceFromJid(this.connection.jid)) {
-            // .connected is true while connecting?
-//                this.connection.send($pres());
-            this.eventEmitter.emit(
-                    JitsiConnectionEvents.CONNECTION_ESTABLISHED,
-                    Strophe.getResourceFromJid(this.connection.jid));
-        }
-    } else if (status === Strophe.Status.CONNFAIL) {
-        if (msg === 'x-strophe-bad-non-anon-jid') {
-            this.anonymousConnectionFailed = true;
-        } else {
-            this.connectionFailed = true;
-        }
-        this.lastErrorMsg = msg;
-    } else if (status === Strophe.Status.DISCONNECTED) {
-        // Stop ping interval
-        this.connection.ping.stopInterval();
-        this.disconnectInProgress = false;
-        if (this.anonymousConnectionFailed) {
-            // prompt user for username and password
+    getConnection () { return this.connection; }
+
+    /**
+     * Receive connection status changes and handles them.
+     * @password {string} the password passed in connect method
+     * @status the connection status
+     * @msg message
+     */
+    connectionHandler (password, status, msg) {
+        const now = window.performance.now();
+        const statusStr = Strophe.getStatusString(status).toLowerCase();
+        this.connectionTimes[statusStr] = now;
+        logger.log("(TIME) Strophe " + statusStr +
+            (msg ? "[" + msg + "]" : "") + ":\t", now);
+        if (status === Strophe.Status.CONNECTED ||
+            status === Strophe.Status.ATTACHED) {
+            if (this.options.useStunTurn) {
+                this.connection.jingle.getStunAndTurnCredentials();
+            }
+
+            logger.info("My Jabber ID: " + this.connection.jid);
+
+            // Schedule ping ?
+            var pingJid = this.connection.domain;
+            this.connection.ping.hasPingSupport(
+                pingJid,
+                function (hasPing) {
+                    if (hasPing)
+                        this.connection.ping.startInterval(pingJid);
+                    else
+                        logger.warn("Ping NOT supported by " + pingJid);
+                }.bind(this));
+
+            if (password)
+                authenticatedUser = true;
+            if (this.connection && this.connection.connected &&
+                Strophe.getResourceFromJid(this.connection.jid)) {
+                // .connected is true while connecting?
+    //                this.connection.send($pres());
+                this.eventEmitter.emit(
+                        JitsiConnectionEvents.CONNECTION_ESTABLISHED,
+                        Strophe.getResourceFromJid(this.connection.jid));
+            }
+        } else if (status === Strophe.Status.CONNFAIL) {
+            if (msg === 'x-strophe-bad-non-anon-jid') {
+                this.anonymousConnectionFailed = true;
+            } else {
+                this.connectionFailed = true;
+            }
+            this.lastErrorMsg = msg;
+        } else if (status === Strophe.Status.DISCONNECTED) {
+            // Stop ping interval
+            this.connection.ping.stopInterval();
+            this.disconnectInProgress = false;
+            if (this.anonymousConnectionFailed) {
+                // prompt user for username and password
+                this.eventEmitter.emit(JitsiConnectionEvents.CONNECTION_FAILED,
+                    JitsiConnectionErrors.PASSWORD_REQUIRED);
+            } else if(this.connectionFailed) {
+                this.eventEmitter.emit(JitsiConnectionEvents.CONNECTION_FAILED,
+                    JitsiConnectionErrors.OTHER_ERROR,
+                    msg ? msg : this.lastErrorMsg);
+            } else {
+                this.eventEmitter.emit(
+                        JitsiConnectionEvents.CONNECTION_DISCONNECTED,
+                        msg ? msg : this.lastErrorMsg);
+            }
+        } else if (status === Strophe.Status.AUTHFAIL) {
+            // wrong password or username, prompt user
             this.eventEmitter.emit(JitsiConnectionEvents.CONNECTION_FAILED,
                 JitsiConnectionErrors.PASSWORD_REQUIRED);
-        } else if(this.connectionFailed) {
-            this.eventEmitter.emit(JitsiConnectionEvents.CONNECTION_FAILED,
-                JitsiConnectionErrors.OTHER_ERROR,
-                msg ? msg : this.lastErrorMsg);
-        } else {
-            this.eventEmitter.emit(
-                    JitsiConnectionEvents.CONNECTION_DISCONNECTED,
-                    msg ? msg : this.lastErrorMsg);
-        }
-    } else if (status === Strophe.Status.AUTHFAIL) {
-        // wrong password or username, prompt user
-        this.eventEmitter.emit(JitsiConnectionEvents.CONNECTION_FAILED,
-            JitsiConnectionErrors.PASSWORD_REQUIRED);
 
+        }
     }
-}
 
-XMPP.prototype._connect = function (jid, password) {
-    // connection.connect() starts the connection process.
-    //
-    // As the connection process proceeds, the user supplied callback will
-    // be triggered multiple times with status updates. The callback should
-    // take two arguments - the status code and the error condition.
-    //
-    // The status code will be one of the values in the Strophe.Status
-    // constants. The error condition will be one of the conditions defined
-    // in RFC 3920 or the condition ‘strophe-parsererror’.
-    //
-    // The Parameters wait, hold and route are optional and only relevant
-    // for BOSH connections. Please see XEP 124 for a more detailed
-    // explanation of the optional parameters.
-    //
-    // Connection status constants for use by the connection handler
-    // callback.
-    //
-    //  Status.ERROR - An error has occurred (websockets specific)
-    //  Status.CONNECTING - The connection is currently being made
-    //  Status.CONNFAIL - The connection attempt failed
-    //  Status.AUTHENTICATING - The connection is authenticating
-    //  Status.AUTHFAIL - The authentication attempt failed
-    //  Status.CONNECTED - The connection has succeeded
-    //  Status.DISCONNECTED - The connection has been terminated
-    //  Status.DISCONNECTING - The connection is currently being terminated
-    //  Status.ATTACHED - The connection has been attached
-
-    this.anonymousConnectionFailed = false;
-    this.connectionFailed = false;
-    this.lastErrorMsg = undefined;
-    this.connection.connect(jid, password,
-        this.connectionHandler.bind(this, password));
-}
+    _connect (jid, password) {
+        // connection.connect() starts the connection process.
+        //
+        // As the connection process proceeds, the user supplied callback will
+        // be triggered multiple times with status updates. The callback should
+        // take two arguments - the status code and the error condition.
+        //
+        // The status code will be one of the values in the Strophe.Status
+        // constants. The error condition will be one of the conditions defined
+        // in RFC 3920 or the condition ‘strophe-parsererror’.
+        //
+        // The Parameters wait, hold and route are optional and only relevant
+        // for BOSH connections. Please see XEP 124 for a more detailed
+        // explanation of the optional parameters.
+        //
+        // Connection status constants for use by the connection handler
+        // callback.
+        //
+        //  Status.ERROR - An error has occurred (websockets specific)
+        //  Status.CONNECTING - The connection is currently being made
+        //  Status.CONNFAIL - The connection attempt failed
+        //  Status.AUTHENTICATING - The connection is authenticating
+        //  Status.AUTHFAIL - The authentication attempt failed
+        //  Status.CONNECTED - The connection has succeeded
+        //  Status.DISCONNECTED - The connection has been terminated
+        //  Status.DISCONNECTING - The connection is currently being terminated
+        //  Status.ATTACHED - The connection has been attached
+
+        this.anonymousConnectionFailed = false;
+        this.connectionFailed = false;
+        this.lastErrorMsg = undefined;
+        this.connection.connect(jid, password,
+            this.connectionHandler.bind(this, password));
+    }
 
-/**
- * Attach to existing connection. Can be used for optimizations. For example:
- * if the connection is created on the server we can attach to it and start
- * using it.
- *
- * @param options {object} connecting options - rid, sid, jid and password.
- */
- XMPP.prototype.attach = function (options) {
-    var now = this.connectionTimes["attaching"] = window.performance.now();
-    logger.log("(TIME) Strophe Attaching\t:" + now);
-    this.connection.attach(options.jid, options.sid, parseInt(options.rid,10)+1,
-        this.connectionHandler.bind(this, options.password));
-}
+    /**
+     * Attach to existing connection. Can be used for optimizations. For example:
+     * if the connection is created on the server we can attach to it and start
+     * using it.
+     *
+     * @param options {object} connecting options - rid, sid, jid and password.
+     */
+    attach (options) {
+        const now = this.connectionTimes["attaching"] = window.performance.now();
+        logger.log("(TIME) Strophe Attaching\t:" + now);
+        this.connection.attach(options.jid, options.sid,
+            parseInt(options.rid,10)+1,
+            this.connectionHandler.bind(this, options.password));
+    }
 
-XMPP.prototype.connect = function (jid, password) {
-    this.connectParams = {
-        jid: jid,
-        password: password
-    };
-    if (!jid) {
-        var configDomain
-            = this.options.hosts.anonymousdomain || this.options.hosts.domain;
-        // Force authenticated domain if room is appended with '?login=true'
-        // or if we're joining with the token
-        if (this.options.hosts.anonymousdomain
-                && (window.location.search.indexOf("login=true") !== -1
-                    || this.options.token)) {
-            configDomain = this.options.hosts.domain;
+    connect (jid, password) {
+        this.connectParams = {
+            jid: jid,
+            password: password
+        };
+        if (!jid) {
+            let configDomain
+                = this.options.hosts.anonymousdomain ||
+                    this.options.hosts.domain;
+            // Force authenticated domain if room is appended with '?login=true'
+            // or if we're joining with the token
+            if (this.options.hosts.anonymousdomain
+                    && (window.location.search.indexOf("login=true") !== -1
+                        || this.options.token)) {
+                configDomain = this.options.hosts.domain;
+            }
+            jid = configDomain || window.location.hostname;
         }
-        jid = configDomain || window.location.hostname;
+        return this._connect(jid, password);
     }
-    return this._connect(jid, password);
-};
-
-XMPP.prototype.createRoom = function (roomName, options, settings) {
-    var roomjid = roomName  + '@' + this.options.hosts.muc;
 
-    if (options.useNicks) {
-        if (options.nick) {
-            roomjid += '/' + options.nick;
-        } else {
-            roomjid += '/' + Strophe.getNodeFromJid(this.connection.jid);
-        }
-    } else {
-        var tmpJid = Strophe.getNodeFromJid(this.connection.jid);
+    createRoom (roomName, options, settings) {
+        let tmpJid = Strophe.getNodeFromJid(this.connection.jid);
+        let roomjid = roomName  + "@" + this.options.hosts.muc + "/";
 
-        if (!authenticatedUser)
-            tmpJid = tmpJid.substr(0, 8);
-        else
-            tmpJid += "-" + RandomUtil.randomHexString(6);
+        roomjid += (options.useNicks)? options.nick || tmpJid :
+            (authenticatedUser? "-" + RandomUtil.randomHexString(6):
+                tmpJid.substr(0, 8));
+        return this.connection.emuc.createRoom(roomjid, null, options,
+            settings);
+    }
 
-        roomjid += '/' + tmpJid;
+    addListener (type, listener) {
+        this.eventEmitter.on(type, listener);
     }
 
-    return this.connection.emuc.createRoom(roomjid, null, options, settings);
-}
+    removeListener (type, listener) {
+        this.eventEmitter.removeListener(type, listener);
+    };
 
-XMPP.prototype.addListener = function(type, listener) {
-    this.eventEmitter.on(type, listener);
-};
+    /**
+     * Sends 'data' as a log message to the focus. Returns true iff a message
+     * was sent.
+     * @param data
+     * @returns {boolean} true iff a message was sent.
+     */
+    sendLogs (data) {
+        if (!this.connection.emuc.focusMucJid)
+            return false;
+
+        const content = Base64.encode(
+            String.fromCharCode.apply(null,
+                Pako.deflateRaw(JSON.stringify(data))));
+        // XEP-0337-ish
+        const message = $msg({
+            to: this.connection.emuc.focusMucJid,
+            type: "normal"
+        });
+        message.c("log", {
+            xmlns: "urn:xmpp:eventlog",
+            id: "PeerConnectionStats"
+        });
+        message.c("message").t(content).up();
+        message.c("tag", {name: "deflated", value: "true"}).up();
+        message.up();
 
-XMPP.prototype.removeListener = function (type, listener) {
-    this.eventEmitter.removeListener(type, listener);
-};
+        this.connection.send(message);
+        return true;
+    }
 
-/**
- * Sends 'data' as a log message to the focus. Returns true iff a message
- * was sent.
- * @param data
- * @returns {boolean} true iff a message was sent.
- */
-XMPP.prototype.sendLogs = function (data) {
-    if (!this.connection.emuc.focusMucJid)
-        return false;
-
-    var deflate = true;
-
-    var content = JSON.stringify(data);
-    if (deflate) {
-        content = String.fromCharCode.apply(null, Pako.deflateRaw(content));
+    /**
+     * Returns the logs from strophe.jingle.
+     * @returns {Object}
+     */
+    getJingleLog () {
+        const jingle = this.connection.jingle;
+        return jingle? jingle.getLog() : {};
     }
-    content = Base64.encode(content);
-    // XEP-0337-ish
-    var message = $msg({to: this.connection.emuc.focusMucJid, type: 'normal'});
-    message.c('log', {xmlns: 'urn:xmpp:eventlog', id: 'PeerConnectionStats'});
-    message.c('message').t(content).up();
-    if (deflate) {
-        message.c('tag', {name: "deflated", value: "true"}).up();
+
+    /**
+     * Returns the logs from strophe.
+     */
+    getXmppLog () {
+        return (this.connection.logger || {}).log || null;
     }
-    message.up();
 
-    this.connection.send(message);
-    return true;
-};
+    dial (to, from, roomName,roomPass) {
+        this.connection.rayo.dial(to, from, roomName,roomPass);
+    }
 
-// Gets the logs from strophe.jingle.
-XMPP.prototype.getJingleLog = function () {
-    return this.connection.jingle ? this.connection.jingle.getLog() : {};
-};
+    setMute (jid, mute) {
+        this.connection.moderate.setMute(jid, mute);
+    }
 
-// Gets the logs from strophe.
-XMPP.prototype.getXmppLog = function () {
-    return this.connection.logger ? this.connection.logger.log : null;
-};
+    eject (jid) {
+        this.connection.moderate.eject(jid);
+    }
 
-XMPP.prototype.dial = function (to, from, roomName,roomPass) {
-    this.connection.rayo.dial(to, from, roomName,roomPass);
-};
+    getSessions () {
+        return this.connection.jingle.sessions;
+    }
 
-XMPP.prototype.setMute = function (jid, mute) {
-    this.connection.moderate.setMute(jid, mute);
-};
+    /**
+     * Disconnects this from the XMPP server (if this is connected).
+     *
+     * @param ev optionally, the event which triggered the necessity to disconnect
+     * from the XMPP server (e.g. beforeunload, unload)
+     */
+    disconnect (ev) {
+        if (this.disconnectInProgress
+                || !this.connection
+                || !this.connection.connected) {
+            this.eventEmitter.emit(JitsiConnectionEvents.WRONG_STATE);
+            return;
+        }
 
-XMPP.prototype.eject = function (jid) {
-    this.connection.moderate.eject(jid);
-};
+        this.disconnectInProgress = true;
+
+        // XXX Strophe is asynchronously sending by default. Unfortunately, that
+        // means that there may not be enough time to send an unavailable presence
+        // or disconnect at all. Switching Strophe to synchronous sending is not
+        // much of an option because it may lead to a noticeable delay in navigating
+        // away from the current location. As a compromise, we will try to increase
+        // the chances of sending an unavailable presence and/or disconecting within
+        // the short time span that we have upon unloading by invoking flush() on
+        // the connection. We flush() once before disconnect() in order to attemtp
+        // to have its unavailable presence at the top of the send queue. We flush()
+        // once more after disconnect() in order to attempt to have its unavailable
+        // presence sent as soon as possible.
+        this.connection.flush();
 
-XMPP.prototype.getSessions = function () {
-    return this.connection.jingle.sessions;
-};
+        if (ev !== null && typeof ev !== 'undefined') {
+            const evType = ev.type;
+
+            if (evType == 'beforeunload' || evType == 'unload') {
+                // XXX Whatever we said above, synchronous sending is the best
+                // (known) way to properly disconnect from the XMPP server.
+                // Consequently, it may be fine to have the source code and comment
+                // it in or out depending on whether we want to run with it for some
+                // time.
+                this.connection.options.sync = true;
+            }
+        }
 
-/**
- * Disconnects this from the XMPP server (if this is connected).
- *
- * @param ev optionally, the event which triggered the necessity to disconnect
- * from the XMPP server (e.g. beforeunload, unload)
- */
-XMPP.prototype.disconnect = function (ev) {
-    if (this.disconnectInProgress
-            || !this.connection
-            || !this.connection.connected) {
-        this.eventEmitter.emit(JitsiConnectionEvents.WRONG_STATE);
-        return;
-    }
+        this.connection.disconnect();
 
-    this.disconnectInProgress = true;
-
-    // XXX Strophe is asynchronously sending by default. Unfortunately, that
-    // means that there may not be enough time to send an unavailable presence
-    // or disconnect at all. Switching Strophe to synchronous sending is not
-    // much of an option because it may lead to a noticeable delay in navigating
-    // away from the current location. As a compromise, we will try to increase
-    // the chances of sending an unavailable presence and/or disconecting within
-    // the short time span that we have upon unloading by invoking flush() on
-    // the connection. We flush() once before disconnect() in order to attemtp
-    // to have its unavailable presence at the top of the send queue. We flush()
-    // once more after disconnect() in order to attempt to have its unavailable
-    // presence sent as soon as possible.
-    this.connection.flush();
-
-    if (ev !== null && typeof ev !== 'undefined') {
-        var evType = ev.type;
-
-        if (evType == 'beforeunload' || evType == 'unload') {
-            // XXX Whatever we said above, synchronous sending is the best
-            // (known) way to properly disconnect from the XMPP server.
-            // Consequently, it may be fine to have the source code and comment
-            // it in or out depending on whether we want to run with it for some
-            // time.
-            this.connection.options.sync = true;
+        if (this.connection.options.sync !== true) {
+            this.connection.flush();
         }
     }
 
-    this.connection.disconnect();
-
-    if (this.connection.options.sync !== true) {
-        this.connection.flush();
+    _initStrophePlugins() {
+        initEmuc(this);
+        initJingle(this, this.eventEmitter);
+        initStropheUtil();
+        initPing(this, this.eventEmitter);
+        initRayo();
+        initStropheLogger();
     }
-};
-
-module.exports = XMPP;
+}