feat: Removes eventEmitter from Moderator.

It creates its own emitter now extending Listenable.

modules/util/EventEmitterForwarder.js

@@ -12,6 +12,7 @@ function EventEmitterForwarder(src, dest) {
     }
     this.src = src;
     this.dest = dest;
+    this.listeners = new Map();
 }
 
 /**
@@ -30,9 +31,26 @@ EventEmitterForwarder.prototype.forward = function(...args) {
     args[0] = this.dest;
 
     // Using bind.apply to pass the arguments as Array-like object ("arguments")
-    this.src.addListener(
-        srcEvent,
-        Function.prototype.bind.apply(this.dest.emit, args));
+    const newListener = Function.prototype.bind.apply(this.dest.emit, args);
+
+    this.src.addListener(srcEvent, newListener);
+    this.listeners.set(srcEvent, newListener);
+};
+
+/**
+ * Clears the listeners for the supplied events.
+ *
+ * @param args all the events which listeners to be cleaned.
+ */
+EventEmitterForwarder.prototype.removeListeners = function(...args) {
+    args.forEach(a => {
+        const l = this.listeners.get(a);
+
+        if (l) {
+            this.src.removeListener(a, l);
+            this.listeners.delete(a);
+        }
+    });
 };
 
 module.exports = EventEmitterForwarder;

modules/xmpp/ChatRoom.js

@@ -7,8 +7,10 @@ import { $iq, $msg, $pres, Strophe } from 'strophe.js';
 import * as JitsiTranscriptionStatus from '../../JitsiTranscriptionStatus';
 import { MediaType } from '../../service/RTC/MediaType';
 import { VideoType } from '../../service/RTC/VideoType';
+import AuthenticationEvents from '../../service/authentication/AuthenticationEvents';
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
 import Settings from '../settings/Settings';
+import EventEmitterForwarder from '../util/EventEmitterForwarder';
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 import Listenable from '../util/Listenable';
 
@@ -168,7 +170,15 @@ export default class ChatRoom extends Listenable {
         this.focusMucJid = null;
         this.noBridgeAvailable = false;
         this.options = options || {};
-        this.moderator = new Moderator(this.xmpp, this.eventEmitter, xmpp.options);
+        this.moderator = new Moderator(this.xmpp, xmpp.options);
+
+        this.eventsForwarder = new EventEmitterForwarder(this.moderator, this.eventEmitter);
+        this.eventsForwarder.forward(AuthenticationEvents.IDENTITY_UPDATED, AuthenticationEvents.IDENTITY_UPDATED);
+        this.eventsForwarder.forward(XMPPEvents.REDIRECTED, XMPPEvents.REDIRECTED);
+        this.eventsForwarder.forward(XMPPEvents.AUTHENTICATION_REQUIRED, XMPPEvents.AUTHENTICATION_REQUIRED);
+        this.eventsForwarder.forward(XMPPEvents.FOCUS_DISCONNECTED, XMPPEvents.FOCUS_DISCONNECTED);
+        this.eventsForwarder.forward(XMPPEvents.RESERVATION_ERROR, XMPPEvents.RESERVATION_ERROR);
+
         if (typeof this.options.enableLobby === 'undefined' || this.options.enableLobby) {
             this.lobby = new Lobby(this);
         }
@@ -1823,6 +1833,13 @@ export default class ChatRoom extends Listenable {
         this._removeConnListeners.forEach(remove => remove());
         this._removeConnListeners = [];
 
+        this.eventsForwarder.removeListeners(
+            AuthenticationEvents.IDENTITY_UPDATED,
+            XMPPEvents.REDIRECTED,
+            XMPPEvents.AUTHENTICATION_REQUIRED,
+            XMPPEvents.FOCUS_DISCONNECTED,
+            XMPPEvents.RESERVATION_ERROR);
+
         this.joined = false;
         this.inProgressEmitted = false;
     }

modules/xmpp/moderator.js

@@ -5,6 +5,7 @@ import { $iq, Strophe } from 'strophe.js';
 
 import FeatureFlags from '../flags/FeatureFlags';
 import Settings from '../settings/Settings';
+import Listenable from '../util/Listenable';
 
 const AuthenticationEvents
     = require('../../service/authentication/AuthenticationEvents');
@@ -41,14 +42,15 @@ function createExpBackoffTimer(step) {
 /**
  * The moderator/focus responsible for direct communication with jicofo
  */
-export default class Moderator {
+export default class Moderator extends Listenable {
     /**
      * Constructs moderator.
      * @param xmpp The xmpp.
-     * @param emitter The emitter.
      * @param options The options.
      */
-    constructor(xmpp, emitter, options) {
+    constructor(xmpp, options) {
+        super();
+
         this.getNextTimeout = createExpBackoffTimer(1000);
         this.getNextErrorTimeout = createExpBackoffTimer(1000);
         this.options = options;
@@ -60,8 +62,6 @@ export default class Moderator {
         // availability.
         this.sipGatewayEnabled = false;
 
-        this.eventEmitter = emitter;
-
         this.connection = xmpp.connection;
 
         // The JID to which conference-iq requests are sent over XMPP.