feat: Sends http conference-request before xmpp connecting.

JitsiConnection.js

@@ -54,11 +54,24 @@ export default function JitsiConnection(appID, token, options) {
 
 /**
  * Connect the client with the server.
- * @param options {object} connecting options
- * (for example authentications parameters).
+ * @param options {object} connecting options (for example authentications parameters).
+ * @param options.id {string} The username to use when connecting, if any.
+ * @param options.password {string} The password to use when connecting with username, if any.
+ * @param options.name {string} The name of the room/conference we will be connecting to. This is needed on connection
+ * time to be able to send conference-request over http. If missing the flow where we send conference-iq to jicofo over
+ * the established xmpp connection will be used, even in the case where we have configured conference http request url
+ * to be used.
  */
 JitsiConnection.prototype.connect = function(options = {}) {
-    this.xmpp.connect(options.id, options.password);
+    // if we get redirected, we set disableFocus to skip sending the conference request twice
+    if (this.xmpp.moderator.targetUrl && !this.options.disableFocus && options.name) {
+        this.xmpp.moderator.sendConferenceRequest(this.xmpp.getRoomJid(options.name))
+            .then(() => {
+                this.xmpp.connect(options.id, options.password);
+            });
+    } else {
+        this.xmpp.connect(options.id, options.password);
+    }
 };
 
 /**

modules/xmpp/ChatRoom.js

@@ -227,7 +227,6 @@ export default class ChatRoom extends Listenable {
             this.options.disableFocus
                 && logger.info(`Conference focus disabled for ${this.roomjid}`);
 
-            // there is no point of sending conference iq when in visitor mode
             const preJoin
                 = this.options.disableFocus
                     ? Promise.resolve()
@@ -626,6 +625,9 @@ export default class ChatRoom extends Listenable {
                     this.sendPresence();
                 }
 
+                // we need to reset it because of breakout rooms which will reuse connection but will invite jicofo
+                this.xmpp.moderator.conferenceRequestSent = false;
+
                 this.eventEmitter.emit(XMPPEvents.MUC_JOINED);
 
                 // Now let's check the disco-info to retrieve the

modules/xmpp/moderator.js

@@ -297,6 +297,16 @@ export default class Moderator extends Listenable {
      * rejected, and it'll keep on pinging Jicofo forever.
      */
     sendConferenceRequest(roomJid) {
+        // there is no point of sending conference iq when in visitor mode (disableFocus)
+        // when we have sent early the conference request via http
+        // we want to skip sending it here, or visitors can loop
+        if (this.conferenceRequestSent) {
+            return Promise.resolve();
+        }
+
+        // to mark whether we have already sent a conference request
+        this.conferenceRequestSent = false;
+
         return new Promise(resolve => {
             if (this.mode === 'xmpp') {
                 logger.info(`Sending conference request over XMPP to ${this.targetJid}`);
@@ -348,6 +358,8 @@ export default class Moderator extends Listenable {
                         this._handleError(roomJid);
                     });
             }
+        }).then(() => {
+            this.conferenceRequestSent = true;
         });
     }