rebaased and conflicts resolved

Author: naman9271

modules/xmpp/moderator.ts

@@ -12,7 +12,7 @@ import Listenable from '../util/Listenable';
 import $ from '../util/XMLParser';
 
 import XmppConnection from './XmppConnection';
-import XMPP from './xmpp';
+import XMPP, { IXMPPOptions } from './xmpp';
 
 
 const logger = getLogger('modules/xmpp/moderator');
@@ -76,15 +76,17 @@ function createExpBackoffTimer(step: number): (reset?: boolean) => Optional<numb
 export default class Moderator extends Listenable {
     private getNextTimeout: (reset?: boolean) => Optional<number>;
     private getNextErrorTimeout: (reset?: boolean) => Optional<number>;
-    // Todo: IXMPPOptions after xmpp pr merge
-    private options: any;
+    private options: IXMPPOptions;
     private sipGatewayEnabled: boolean;
     private xmpp: XMPP;
     private connection: XmppConnection;
     private targetJid: string;
     private mode: string;
     private focusUserJids: Set<string>;
-    private conferenceRequestSent: boolean;
+    /**
+     * @internal
+     */
+    conferenceRequestSent: boolean;
     public targetUrl: string;
 
     /**

modules/xmpp/xmpp.ts

@@ -84,6 +84,7 @@ interface IDeploymentInfo {
 interface IHostsConfig {
     anonymousdomain?: string;
     domain?: string;
+    focus?: string;
     muc?: string;
 }
 
@@ -102,22 +103,37 @@ interface IP2PConfig {
     stunServers?: Array<{ urls: string; }>;
 }
 
+/**
+ * Analytics configuration interface
+ */
+interface IAnalyticsConfig {
+    rtcstatsEnabled?: boolean;
+}
+
 /**
  * XMPP options interface
  */
 export interface IXMPPOptions {
+    analytics?: IAnalyticsConfig;
     bosh?: string;
+    conferenceRequestUrl?: string;
     deploymentInfo?: IDeploymentInfo;
     disableBeforeUnloadHandlers?: boolean;
     disableRtx?: boolean;
     enableOpusRed?: boolean;
     enableRemb?: boolean;
     enableTcc?: boolean;
     enableWebsocketResume?: boolean;
+    focusUserJid?: string;
     hosts?: IHostsConfig;
+    iAmRecorder?: boolean;
+    iAmSipGateway?: boolean;
     p2p?: IP2PConfig;
     p2pStunServers?: Array<{ urls: string; }>;
+    preferVisitor?: boolean;
     serviceUrl?: string;
+    startAudioMuted?: boolean;
+    startVideoMuted?: boolean;
     testing?: ITestingConfig;
     websocketKeepAlive?: number;
     websocketKeepAliveUrl?: string;