fix(lobby): Handles race on joining and disabling lobby. (#2950)

* fix(lobby): Handles race on joining and disabling lobby.

If a participant tries to join a lobby becuase it was enabled, but it was just disabled a room creation restriction error is received. For lobby rooms, this will retry joining the main room.

Author: damencho

modules/xmpp/ChatRoom.ts

@@ -65,6 +65,7 @@ export interface IChatRoomOptions {
     deploymentInfo?: any;
     disableDiscoInfo?: boolean;
     disableFocus?: boolean;
+    disableRoomCreationRetry?: boolean;
     enableLobby?: boolean;
     hiddenDomain?: string;
     hiddenFromRecorderFeatureEnabled?: boolean;
@@ -1552,21 +1553,23 @@ export default class ChatRoom extends Listenable {
                 if (txt === 'Room creation is restricted') {
                     type = AUTH_ERROR_TYPES.ROOM_CREATION_RESTRICTION;
 
-                    if (!this._roomCreationRetries) {
-                        this._roomCreationRetries = 0;
-                    }
-                    this._roomCreationRetries++;
+                    if (!this.options.disableRoomCreationRetry) {
+                        if (!this._roomCreationRetries) {
+                            this._roomCreationRetries = 0;
+                        }
+                        this._roomCreationRetries++;
 
-                    if (this._roomCreationRetries <= 3) {
-                        const retryDelay = getJitterDelay(
-                            /* retry */ this._roomCreationRetries,
-                            /* minDelay */ 500,
-                            1.5);
+                        if (this._roomCreationRetries <= 3) {
+                            const retryDelay = getJitterDelay(
+                                /* retry */ this._roomCreationRetries,
+                                /* minDelay */ 500,
+                                1.5);
 
-                        // let's retry inviting jicofo and joining the room, retries will take between 1 and 3 seconds
-                        setTimeout(() => this.join(this.password, this.replaceParticipant), retryDelay);
+                            // let's retry inviting jicofo and joining the room, retries will take between 1 and 3 seconds
+                            setTimeout(() => this.join(this.password, this.replaceParticipant), retryDelay);
 
-                        return;
+                            return;
+                        }
                     }
                 } else if (exists(pres,
                     ':scope>error[type="cancel"]>authentication-required[*|xmlns="http://jitsi.org/jitmeet"]')) {

modules/xmpp/Lobby.js

@@ -1,6 +1,7 @@
 import { getLogger } from '@jitsi/logger';
 import { $msg, Strophe } from 'strophe.js';
 
+import { AUTH_ERROR_TYPES } from '../../JitsiConferenceErrors';
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
 
 import { handleStropheError } from './StropheErrorHandler';
@@ -255,6 +256,7 @@ export default class Lobby {
                 customDomain,
                 disableDiscoInfo: true,
                 disableFocus: true,
+                disableRoomCreationRetry: true,
                 enableLobby: false
             }
         );
@@ -383,12 +385,22 @@ export default class Lobby {
                 }
             });
             this.lobbyRoom.addEventListener(XMPPEvents.ROOM_JOIN_ERROR, reject);
-            this.lobbyRoom.addEventListener(XMPPEvents.ROOM_CONNECT_NOT_ALLOWED_ERROR, reject);
             this.lobbyRoom.addEventListener(XMPPEvents.ROOM_CONNECT_ERROR, reject);
+            this.lobbyRoom.addEventListener(XMPPEvents.ROOM_CONNECT_NOT_ALLOWED_ERROR, (type, txt) => {
+                if (type === AUTH_ERROR_TYPES.ROOM_CREATION_RESTRICTION) {
+                    logger.info('Lobby room creation not allowed, we will retry on main room.');
+                    this.lobbyRoom?.clean();
+
+                    this.lobbyRoom = undefined;
+
+                    this.mainRoom.join();
+                } else {
+                    reject(type, txt);
+                }
+            });
 
             this.lobbyRoom.join();
         });
-
     }
 
     /**