feat: Waits for the room dataform to be received before setting lobby.

Waits to check if lobby is already enabled, and if enabled ignore the request.

modules/util/Listenable.js

@@ -34,7 +34,7 @@ export default class Listenable {
      * Adds new listener.
      * @param {String} eventName the name of the event
      * @param {Function} listener the listener.
-     * @returns {EventEmitter} - The unsubscribe function.
+     * @returns {EventEmitter} - The emitter, so that calls can be chained.
      */
     addListener(eventName, listener) {
         return this.eventEmitter.addListener(eventName, listener);
@@ -45,7 +45,7 @@ export default class Listenable {
      * @param {String} eventName the name of the event that triggers the
      * listener
      * @param {Function} listener the listener.
-     * @returns {EventEmitter} - The unsubscribe function.
+     * @returns {EventEmitter} - The emitter, so that calls can be chained.
      */
     removeListener(eventName, listener) {
         return this.eventEmitter.removeListener(eventName, listener);

modules/xmpp/ChatRoom.js

@@ -21,6 +21,12 @@ import XmppConnection from './XmppConnection';
 
 const logger = getLogger(__filename);
 
+/**
+ * How long we're going to wait for IQ response, before timeout error is triggered.
+ * @type {number}
+ */
+const IQ_TIMEOUT = 10000;
+
 export const parser = {
     packet2JSON(xmlElement, nodes) {
         for (const child of Array.from(xmlElement.children)) {
@@ -190,6 +196,7 @@ export default class ChatRoom extends Listenable {
 
         this.locked = false;
         this.transcriptionStatus = JitsiTranscriptionStatus.OFF;
+        this.initialDiscoRoomInfoReceived = false;
     }
 
     /* eslint-enable max-params */
@@ -402,9 +409,14 @@ export default class ChatRoom extends Listenable {
                     logger.warn('Failed to set room metadata', e);
                 }
             }
+
+            this.initialDiscoRoomInfoReceived = true;
+            this.eventEmitter.emit(XMPPEvents.ROOM_DISCO_INFO_UPDATED);
         }, error => {
             logger.error('Error getting room info: ', error);
-        });
+            this.eventEmitter.emit(XMPPEvents.ROOM_DISCO_INFO_FAILED, error);
+        },
+        IQ_TIMEOUT);
     }
 
     /**

modules/xmpp/Lobby.js

@@ -63,6 +63,36 @@ export default class Lobby {
             return Promise.reject(new Error('Lobby not supported!'));
         }
 
+        // let's wait for the room data form to be populated after XMPPEvents.MUC_JOINED
+        if (!this.mainRoom.initialDiscoRoomInfoReceived) {
+            return new Promise((resolve, reject) => {
+                let unsubscribers = [];
+                const unsubscribe = () => {
+                    unsubscribers.forEach(remove => remove());
+                    unsubscribers = [];
+                };
+
+                unsubscribers.push(
+                    this.mainRoom.addCancellableListener(XMPPEvents.ROOM_DISCO_INFO_UPDATED, () => {
+                        unsubscribe();
+
+                        if (this.mainRoom.membersOnlyEnabled) {
+                            resolve();
+
+                            return;
+                        }
+
+                        this.mainRoom.setMembersOnly(true, resolve, reject);
+                    }));
+
+                // on timeout or failure
+                unsubscribers.push(this.mainRoom.addCancellableListener(XMPPEvents.ROOM_DISCO_INFO_FAILED, e => {
+                    unsubscribe();
+                    reject(e);
+                }));
+            });
+        }
+
         if (this.mainRoom.membersOnlyEnabled) {
             return Promise.resolve();
         }

service/xmpp/XMPPEvents.ts

@@ -223,6 +223,12 @@ export enum XMPPEvents {
     ROOM_JOIN_ERROR = 'xmpp.room_join_error',
     ROOM_CONNECT_MEMBERS_ONLY_ERROR = 'xmpp.room_connect_error.members_only',
 
+    /**
+     * Indicates that we have received a reply to our disco-info request for the room.
+     */
+    ROOM_DISCO_INFO_UPDATED = 'xmpp.room_disco_info_updated',
+    ROOM_DISCO_INFO_FAILED = 'xmpp.room_disco_info_failed',
+
     /**
      * Indicates that max users limit has been reached.
      */