feat: Adds to JitsiConferenceEvents CONFERENCE_JOIN_IN_PROGRESS. (#1754)

* feat: Adds to JitsiConferenceEvents CONFERENCE_JOIN_IN_PROGRESS.

* squash: Fixes tests.

JitsiConferenceEventManager.js

@@ -151,6 +151,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
     this.chatRoomForwarder.forward(XMPPEvents.MUC_JOINED,
         JitsiConferenceEvents.CONFERENCE_JOINED);
 
+    this.chatRoomForwarder.forward(XMPPEvents.MUC_JOIN_IN_PROGRESS,
+        JitsiConferenceEvents.CONFERENCE_JOIN_IN_PROGRESS);
+
     this.chatRoomForwarder.forward(XMPPEvents.MEETING_ID_SET,
         JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET);
 

JitsiConferenceEvents.js

@@ -30,6 +30,11 @@ export const CONFERENCE_ERROR = 'conference.error';
  */
 export const CONFERENCE_FAILED = 'conference.failed';
 
+/**
+ * Indicates that conference is in progress of joining.
+ */
+export const CONFERENCE_JOIN_IN_PROGRESS = 'conference.join_in_progress';
+
 /**
  * Indicates that conference has been joined. The event does NOT provide any
  * parameters to its listeners.

modules/xmpp/ChatRoom.js

@@ -123,6 +123,7 @@ export default class ChatRoom extends Listenable {
         this.presHandlers = {};
         this._removeConnListeners = [];
         this.joined = false;
+        this.inProgressEmitted = false;
         this.role = null;
         this.focusMucJid = null;
         this.noBridgeAvailable = false;
@@ -546,6 +547,15 @@ export default class ChatRoom extends Listenable {
             }
         }
 
+        if (!this.joined && !this.inProgressEmitted) {
+            const now = this.connectionTimes['muc.join.started'] = window.performance.now();
+
+            logger.log('(TIME) MUC join started:\t', now);
+
+            this.eventEmitter.emit(XMPPEvents.MUC_JOIN_IN_PROGRESS);
+            this.inProgressEmitted = true;
+        }
+
         if (from === this.myroomjid) {
             const newRole
                 = member.affiliation === 'owner' ? member.role : 'none';
@@ -1721,7 +1731,7 @@ export default class ChatRoom extends Listenable {
      * @param mediaType
      */
     muteParticipant(jid, mute, mediaType) {
-        logger.info('set mute', mute);
+        logger.info('set mute', mute, jid);
         const iqToFocus = $iq(
             { to: this.focusMucJid,
                 type: 'set' })
@@ -1796,6 +1806,7 @@ export default class ChatRoom extends Listenable {
         this._removeConnListeners = [];
 
         this.joined = false;
+        this.inProgressEmitted = false;
     }
 
     /**

modules/xmpp/ChatRoom.spec.js

@@ -161,12 +161,15 @@ describe('ChatRoom', () => {
             const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
 
             room.onPresence(pres);
-            expect(emitterSpy.calls.count()).toEqual(2);
+            expect(emitterSpy.calls.count()).toEqual(3);
             expect(emitterSpy.calls.argsFor(0)).toEqual([
                 XMPPEvents.PRESENCE_RECEIVED,
                 jasmine.any(Object)
             ]);
             expect(emitterSpy.calls.argsFor(1)).toEqual([
+                XMPPEvents.MUC_JOIN_IN_PROGRESS
+            ]);
+            expect(emitterSpy.calls.argsFor(2)).toEqual([
                 XMPPEvents.MUC_MEMBER_JOINED,
                 'fromjid',
                 undefined, // nick
@@ -192,11 +195,15 @@ describe('ChatRoom', () => {
             const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
 
             room.onPresence(pres);
-            expect(emitterSpy.calls.count()).toEqual(2);
+            expect(emitterSpy.calls.count()).toEqual(3);
             expect(emitterSpy.calls.argsFor(0)).toEqual([
                 XMPPEvents.PRESENCE_RECEIVED,
                 jasmine.any(Object)
             ]);
+            expect(emitterSpy.calls.argsFor(1)).toEqual([
+                XMPPEvents.MUC_JOIN_IN_PROGRESS
+            ]);
+
             expect(emitterSpy).toHaveBeenCalledWith(
                 XMPPEvents.MUC_MEMBER_JOINED,
                 'fromjid',
@@ -223,11 +230,14 @@ describe('ChatRoom', () => {
             const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
 
             room.onPresence(pres);
-            expect(emitterSpy.calls.count()).toEqual(2);
+            expect(emitterSpy.calls.count()).toEqual(3);
             expect(emitterSpy.calls.argsFor(0)).toEqual([
                 XMPPEvents.PRESENCE_RECEIVED,
                 jasmine.any(Object)
             ]);
+            expect(emitterSpy.calls.argsFor(1)).toEqual([
+                XMPPEvents.MUC_JOIN_IN_PROGRESS
+            ]);
             expect(emitterSpy).toHaveBeenCalledWith(
               XMPPEvents.MUC_MEMBER_JOINED,
               'fromjid',
@@ -271,12 +281,15 @@ describe('ChatRoom', () => {
             };
 
             room.onPresence(pres);
-            expect(emitterSpy.calls.count()).toEqual(2);
+            expect(emitterSpy.calls.count()).toEqual(3);
             expect(emitterSpy.calls.argsFor(0)).toEqual([
                 XMPPEvents.PRESENCE_RECEIVED,
                 jasmine.any(Object)
             ]);
             expect(emitterSpy.calls.argsFor(1)).toEqual([
+                XMPPEvents.MUC_JOIN_IN_PROGRESS
+            ]);
+            expect(emitterSpy.calls.argsFor(2)).toEqual([
                 XMPPEvents.MUC_MEMBER_JOINED,
                 'fromjid',
                 undefined, // nick
@@ -305,12 +318,15 @@ describe('ChatRoom', () => {
             const pres = new DOMParser().parseFromString(presStr, 'text/xml').documentElement;
 
             room.onPresence(pres);
-            expect(emitterSpy.calls.count()).toEqual(2);
+            expect(emitterSpy.calls.count()).toEqual(3);
             expect(emitterSpy.calls.argsFor(0)).toEqual([
                 XMPPEvents.PRESENCE_RECEIVED,
                 jasmine.any(Object)
             ]);
             expect(emitterSpy.calls.argsFor(1)).toEqual([
+                XMPPEvents.MUC_JOIN_IN_PROGRESS
+            ]);
+            expect(emitterSpy.calls.argsFor(2)).toEqual([
                 XMPPEvents.MUC_MEMBER_JOINED,
                 'fromjid',
                 undefined, // nick

service/xmpp/XMPPEvents.js

@@ -130,6 +130,9 @@ const XMPPEvents = {
     // Designates an event indicating that the XMPP MUC was destroyed.
     MUC_DESTROYED: 'xmpp.muc_destroyed',
 
+    // Designates an event indicating that we are currently in process of joining the XMPP MUC.
+    MUC_JOIN_IN_PROGRESS: 'xmpp.muc_join_in_progress',
+
     // Designates an event indicating that we have joined the XMPP MUC.
     MUC_JOINED: 'xmpp.muc_joined',