ref(xmpp): pass XmppConnection wrapper to LJM Strophe plugins

All calls to connection.send should go through the wrapper in order to
prevent breaking the connection by calling it in the not connected
state.

modules/xmpp/ChatRoom.js

@@ -90,7 +90,7 @@ export default class ChatRoom extends Listenable {
 
     /**
      *
-     * @param connection
+     * @param {XmppConnection} connection - The XMPP connection instance.
      * @param jid
      * @param password
      * @param XMPP
@@ -252,7 +252,7 @@ export default class ChatRoom extends Listenable {
         // unavailable presence in order to attempt to have it sent as soon as
         // possible.
         // FIXME do not use Strophe.Connection in the ChatRoom directly
-        !this.xmpp.connection.isUsingWebSocket && this.connection.flush();
+        !this.connection.isUsingWebSocket && this.connection.flush();
         this.connection.send(pres);
         this.connection.flush();
     }

modules/xmpp/JingleSessionPC.js

@@ -98,8 +98,7 @@ export default class JingleSessionPC extends JingleSession {
      * identifies the session
      * @param {string} localJid our JID
      * @param {string} remoteJid remote peer JID
-     * @param {Strophe.Connection} connection Strophe XMPP connection instance
-     * used to send packets.
+     * @param {XmppConnection} connection - The XMPP connection instance.
      * @param mediaConstraints the media constraints object passed to
      * createOffer/Answer, as defined by the WebRTC standard
      * @param iceConfig the ICE servers config object as defined by the WebRTC

modules/xmpp/XmppConnection.js

@@ -65,15 +65,6 @@ export default class XmppConnection {
         return this._stropheConn.domain;
     }
 
-    /**
-     * FIXME.
-     *
-     * @returns {*}
-     */
-    get emuc() {
-        return this._stropheConn.emuc;
-    }
-
     /**
      * Tells if Websocket is used as the transport for the current XMPP connection. Returns true for Websocket or false
      * for BOSH.
@@ -92,15 +83,6 @@ export default class XmppConnection {
         return this._stropheConn.jid;
     }
 
-    /**
-     * FIXME.
-     *
-     * @returns {*}
-     */
-    get jingle() {
-        return this._stropheConn.jingle;
-    }
-
     /**
      * FIXME.
      *
@@ -128,24 +110,6 @@ export default class XmppConnection {
         return this._stropheConn.options;
     }
 
-    /**
-     * FIXME.
-     *
-     * @returns {PingConnectionPlugin}
-     */
-    get ping() {
-        return this._stropheConn.ping;
-    }
-
-    /**
-     * FIXME.
-     *
-     * @returns {*}
-     */
-    get rayo() {
-        return this._stropheConn.rayo;
-    }
-
     /**
      * FIXME.
      *
@@ -176,6 +140,18 @@ export default class XmppConnection {
         this._stropheConn.service = _service;
     }
 
+    /**
+     * Adds a connection plugin to this instance.
+     *
+     * @param {string} name - The name of the plugin or rather a key under which it will be stored on this connection
+     * instance.
+     * @param {ConnectionPluginListenable} plugin - The plugin to add.
+     */
+    addConnectionPlugin(name, plugin) {
+        this[name] = plugin;
+        plugin.init(this);
+    }
+
     /**
      * FIXME.
      *

modules/xmpp/strophe.emuc.js

@@ -12,7 +12,7 @@ const logger = getLogger(__filename);
 /**
  * MUC connection plugin.
  */
-class MucConnectionPlugin extends ConnectionPluginListenable {
+export default class MucConnectionPlugin extends ConnectionPluginListenable {
     /**
      *
      * @param xmpp
@@ -175,11 +175,3 @@ class MucConnectionPlugin extends ConnectionPluginListenable {
         return true;
     }
 }
-
-/**
- *
- * @param XMPP
- */
-export default function(XMPP) {
-    Strophe.addConnectionPlugin('emuc', new MucConnectionPlugin(XMPP));
-}

modules/xmpp/strophe.jingle.js

@@ -25,7 +25,7 @@ const logger = getLogger(__filename);
 /**
  *
  */
-class JingleConnectionPlugin extends ConnectionPlugin {
+export default class JingleConnectionPlugin extends ConnectionPlugin {
     /**
      * Creates new <tt>JingleConnectionPlugin</tt>
      * @param {XMPP} xmpp
@@ -404,15 +404,3 @@ class JingleConnectionPlugin extends ConnectionPlugin {
 }
 
 /* eslint-enable newline-per-chained-call */
-
-/**
- *
- * @param XMPP
- * @param eventEmitter
- * @param iceConfig
- */
-export default function initJingle(XMPP, eventEmitter, iceConfig) {
-    Strophe.addConnectionPlugin(
-        'jingle',
-        new JingleConnectionPlugin(XMPP, eventEmitter, iceConfig));
-}

modules/xmpp/strophe.ping.js

@@ -35,7 +35,7 @@ const PING_TIMESTAMPS_TO_KEEP = 120000 / PING_INTERVAL;
  *
  * Registers "urn:xmpp:ping" namespace under Strophe.NS.PING.
  */
-class PingConnectionPlugin extends ConnectionPlugin {
+export default class PingConnectionPlugin extends ConnectionPlugin {
     /**
      * Contructs new object
      * @param {XMPP} xmpp the xmpp module.
@@ -186,11 +186,3 @@ class PingConnectionPlugin extends ConnectionPlugin {
         return Math.max(maxInterval, 0);
     }
 }
-
-/**
- *
- * @param xmpp
- */
-export default function(xmpp) {
-    Strophe.addConnectionPlugin('ping', new PingConnectionPlugin(xmpp));
-}

modules/xmpp/strophe.rayo.js

@@ -1,7 +1,7 @@
 /* global $ */
 
 import { getLogger } from 'jitsi-meet-logger';
-import { $iq, Strophe } from 'strophe.js';
+import { $iq } from 'strophe.js';
 
 import ConnectionPlugin from './ConnectionPlugin';
 
@@ -12,7 +12,7 @@ const RAYO_XMLNS = 'urn:xmpp:rayo:1';
 /**
  *
  */
-class RayoConnectionPlugin extends ConnectionPlugin {
+export default class RayoConnectionPlugin extends ConnectionPlugin {
     /**
      *
      * @param connection
@@ -125,10 +125,3 @@ class RayoConnectionPlugin extends ConnectionPlugin {
         });
     }
 }
-
-/**
- *
- */
-export default function() {
-    Strophe.addConnectionPlugin('rayo', new RayoConnectionPlugin());
-}

modules/xmpp/xmpp.js

@@ -8,11 +8,11 @@ import RandomUtil from '../util/RandomUtil';
 import * as JitsiConnectionErrors from '../../JitsiConnectionErrors';
 import * as JitsiConnectionEvents from '../../JitsiConnectionEvents';
 import browser from '../browser';
-import initEmuc from './strophe.emuc';
-import initJingle from './strophe.jingle';
+import MucConnectionPlugin from './strophe.emuc';
+import JingleConnectionPlugin from './strophe.jingle';
 import initStropheUtil from './strophe.util';
-import initPing from './strophe.ping';
-import initRayo from './strophe.rayo';
+import PingConnectionPlugin from './strophe.ping';
+import RayoConnectionPlugin from './strophe.rayo';
 import initStropheLogger from './strophe.logger';
 import Listenable from '../util/Listenable';
 import Caps from './Caps';
@@ -40,6 +40,17 @@ function createConnection(xmpp, token, serviceUrl = '/http-bind') {
     return new XmppConnection(xmpp, serviceUrl);
 }
 
+/**
+ * Initializes Strophe plugins that need to work with Strophe.Connection directly rather than the lib-jitsi-meet's
+ * {@link XmppConnection} wrapper.
+ *
+ * @returns {void}
+ */
+function initStropheNativePlugins() {
+    initStropheUtil();
+    initStropheLogger();
+}
+
 // FIXME: remove once we have a default config template. -saghul
 /**
  * A list of ice servers to use by default for P2P.
@@ -80,13 +91,16 @@ export default class XMPP extends Listenable {
         this.options = options;
         this.token = token;
         this.authenticatedUser = false;
-        this._initStrophePlugins(this);
 
         // FIXME remove deprecated bosh option at some point
         const serviceUrl = options.serviceUrl || options.bosh;
 
+        initStropheNativePlugins();
+
         this.connection = createConnection(this, token, serviceUrl);
 
+        this._initStrophePlugins();
+
         this.caps = new Caps(this.connection, this.options.clientNode);
 
         // Initialize features advertised in disco-info
@@ -593,12 +607,10 @@ export default class XMPP extends Listenable {
                 = this.options.p2p.iceTransportPolicy;
         }
 
-        initEmuc(this);
-        initJingle(this, this.eventEmitter, iceConfig);
-        initStropheUtil();
-        initPing(this);
-        initRayo();
-        initStropheLogger();
+        this.connection.addConnectionPlugin('emuc', new MucConnectionPlugin(this));
+        this.connection.addConnectionPlugin('jingle', new JingleConnectionPlugin(this, this.eventEmitter, iceConfig));
+        this.connection.addConnectionPlugin('ping', new PingConnectionPlugin(this));
+        this.connection.addConnectionPlugin('rayo', new RayoConnectionPlugin());
     }
 
     /**