Merge branch 'jitsi:master' into proxyconnectionpc

Author: naman9271

JitsiConference.js renamed to JitsiConference.ts

@@ -15,14 +15,21 @@ const logger = getLogger('JitsiConnection');
 
 export interface IConnectionOptions {
     analytics?: any;
+    bridgeChannel?: {
+        ignoreDomain?: string;
+        preferSctp?: boolean;
+    };
     disableFocus?: boolean;
     enableWebsocketResume: boolean;
     flags?: Record<string, any>;
+    hosts: {
+        domain: string;
+    };
     name?: string;
     p2pStunServers: any[];
     serviceUrl: string;
     websocketKeepAlive?: number;
-    websocketKeepAliveUrl?: number;
+    websocketKeepAliveUrl?: string;
     xmppPing?: any;
 }
 
@@ -44,8 +51,8 @@ export interface IAttachOptions {
  */
 export default class JitsiConnection {
     private appID?: string;
-    private token: string | null;
-    private xmpp: XMPP;
+    private token?: string;
+    private _xmpp: XMPP;
     readonly options: IConnectionOptions;
 
     /**
@@ -54,15 +61,15 @@ export default class JitsiConnection {
      * @param token - The JWT token used to authenticate with the server (optional).
      * @param options - Object with properties / settings related to connection with the server.
      */
-    constructor(appID: string, token: string | null, options: IConnectionOptions) {
+    constructor(appID: string, token: Nullable<string>, options: IConnectionOptions) {
         this.appID = appID;
         this.token = token;
         this.options = options;
 
         // Initialize the feature flags so that they are advertised through the disco-info.
         FeatureFlags.init(options.flags || {});
 
-        this.xmpp = new XMPP(options, token);
+        this._xmpp = new XMPP(options, token);
 
         this.addEventListener(JitsiConnectionEvents.CONNECTION_FAILED,
             (errType: string, msg: string, credentials: any, details: any) => {
@@ -128,7 +135,7 @@ export default class JitsiConnection {
      * @param args - Optional arguments to be passed to XMPP.disconnect
      * @returns Promise that resolves when the disconnect process is finished or rejects with an error.
      */
-    disconnect(...args: [string?]): Promise<void> {
+    disconnect(...args: any): boolean | Promise<void> {
         // XXX Forward any arguments passed to JitsiConnection.disconnect to
         // XMPP.disconnect. For example, the caller of JitsiConnection.disconnect
         // may optionally pass the event which triggered the disconnect in order to
@@ -161,7 +168,7 @@ export default class JitsiConnection {
      * that will be created.
      * @returns The new conference object.
      */
-    initJitsiConference(name: string | null, options: Record<string, any>): JitsiConference {
+    initJitsiConference(name: Nullable<string>, options: Record<string, any>): JitsiConference {
         return new JitsiConference({
             config: options,
             connection: this,
@@ -240,4 +247,12 @@ export default class JitsiConnection {
 
         return data;
     }
+
+    /**
+     * Get the XMPP instance.
+     * @internal
+     */
+    get xmpp(): XMPP {
+        return this._xmpp;
+    }
 }

JitsiConferenceEventManager.js renamed to JitsiConferenceEventManager.ts

@@ -443,7 +443,7 @@ export default {
     async joinConference(
             roomName: string,
             appId: string = '',
-            token: string | null = null,
+            token: Nullable<string> = null,
             options: IJoinConferenceOptions = {}): Promise<JitsiConference> {
         const d = new Deferred();
         let connectionOptions = options.connectionOptions ?? {};

JitsiConnection.ts

@@ -2,7 +2,7 @@ import { Strophe } from 'strophe.js';
 
 import JitsiConference from './JitsiConference';
 import * as JitsiConferenceEvents from './JitsiConferenceEvents';
-import JitsiTrack from './modules/RTC/JitsiTrack';
+import JitsiRemoteTrack from './modules/RTC/JitsiRemoteTrack';
 import { MediaType } from './service/RTC/MediaType';
 
 export interface ISourceInfo {
@@ -18,11 +18,7 @@ export default class JitsiParticipant {
     private _jid: string;
     private _id: string;
     private _conference: JitsiConference;
-    private _displayName: string;
-    private _supportsDTMF: boolean;
-    private _tracks: JitsiTrack[];
     private _role: string;
-    private _status?: string;
     private _hidden: boolean;
     private _statsID?: string;
     private _properties: Map<string, any>;
@@ -34,6 +30,22 @@ export default class JitsiParticipant {
     private _sources: Map<MediaType, Map<string, ISourceInfo>>;
     private _botType?: string;
     private _connectionJid?: string;
+    /**
+     * @internal
+     */
+    _status?: string;
+    /**
+     * @internal
+     */
+    _displayName: string;
+    /**
+     * @internal
+     */
+    _supportsDTMF: boolean;
+    /**
+     * @internal
+     */
+    _tracks: JitsiRemoteTrack[];
 
     /* eslint-disable max-params */
 
@@ -141,9 +153,9 @@ export default class JitsiParticipant {
     /**
      * Returns the bot type for the participant.
      *
-     * @returns {string|undefined} - The bot type of the participant.
+     * @returns {Optional<string>} - The bot type of the participant.
      */
-    getBotType(): string | undefined {
+    getBotType(): Optional<string> {
         return this._botType;
     }
 
@@ -158,9 +170,9 @@ export default class JitsiParticipant {
     /**
      * Returns the connection jid for the participant.
      *
-     * @returns {string|undefined} - The connection jid of the participant.
+     * @returns {Optional<string>} - The connection jid of the participant.
      */
-    getConnectionJid(): string | undefined {
+    getConnectionJid(): Optional<string> {
         return this._connectionJid;
     }
 
@@ -190,9 +202,9 @@ export default class JitsiParticipant {
      * Returns the XMPP identity. This is defined by your application in the
      * JWT `context` claims section.
      *
-     * @returns {object|undefined} - XMPP user identity.
+     * @returns {Optional<object>} - XMPP user identity.
      */
-    getIdentity(): object | undefined {
+    getIdentity(): Optional<object> {
         return this._identity;
     }
 
@@ -240,19 +252,19 @@ export default class JitsiParticipant {
     }
 
     /**
-     * @returns {Array.<JitsiTrack>} The list of media tracks for this
+     * @returns {Array.<JitsiRemoteTrack>} The list of media tracks for this
      * participant.
      */
-    getTracks(): JitsiTrack[] {
+    getTracks(): (JitsiRemoteTrack)[] {
         return this._tracks.slice();
     }
 
     /**
      * @param {MediaType} mediaType
-     * @returns {Array.<JitsiTrack>} an array of media tracks for this
+     * @returns {Array.<JitsiRemoteTrack>} an array of media tracks for this
      * participant, for given media type.
      */
-    getTracksByMediaType(mediaType: MediaType): JitsiTrack[] {
+    getTracksByMediaType(mediaType: MediaType): (JitsiRemoteTrack)[] {
         return this.getTracks().filter(track => track.getType() === mediaType);
     }
 

JitsiMeetJS.ts

@@ -3,7 +3,12 @@ export {};
 declare global {
     type Timeout = ReturnType<typeof setTimeout>;
     interface Window {
-        connectionTimes: any;
+                JitsiMeetJS?: {
+            app?: {
+                connectionTimes?: Record<string, any>;
+            };
+        };
+        connectionTimes?: Record<string, any>;
     }
     interface RTCRtpReceiver {
         createEncodedStreams?: () => {

JitsiParticipant.ts

@@ -5,6 +5,7 @@ import { EventEmitter } from 'events';
 import JitsiConference from '../../JitsiConference';
 import { BridgeVideoType } from '../../service/RTC/BridgeVideoType';
 import RTCEvents from '../../service/RTC/RTCEvents';
+import { IReceiverAudioSubscriptionMessage } from '../../service/RTC/ReceiverAudioSubscription';
 import { SourceName } from '../../service/RTC/SignalingLayer';
 import { createBridgeChannelClosedEvent } from '../../service/statistics/AnalyticsEvents';
 import ReceiverVideoConstraints from '../qualitycontrol/ReceiveVideoController';
@@ -19,11 +20,11 @@ const logger = getLogger('modules/RTC/BridgeChannel');
  */
 export default class BridgeChannel {
 
-    private _channel: RTCDataChannel | WebSocket | null = null;
+    private _channel: Nullable<RTCDataChannel | WebSocket> = null;
     private _conference: JitsiConference;
-    private _connected: boolean | undefined = undefined;
+    private _connected: Optional<boolean> = undefined;
     private _eventEmitter: EventEmitter;
-    private _mode: 'datachannel' | 'websocket' | null = null;
+    private _mode: Nullable<'datachannel' | 'websocket'> = null;
     private _areRetriesEnabled: boolean = false;
     private _closedFromClient: boolean = false;
     private _wsUrl?: string;
@@ -34,15 +35,15 @@ export default class BridgeChannel {
      * instance, or creates a WebSocket connection with the videobridge.
      * At least one of both, peerconnection or wsUrl parameters, must be
      * given.
-     * @param {RTCPeerConnection} [peerconnection] WebRTC peer connection
+     * @param {Nullable<RTCPeerConnection>} [peerconnection] WebRTC peer connection
      * instance.
-     * @param {string} [wsUrl] WebSocket URL.
+     * @param {Nullable<string>} [wsUrl] WebSocket URL.
      * @param {EventEmitter} emitter the EventEmitter instance to use for event emission.
      * @param {JitsiConference} conference the conference instance.
      */
     constructor(
-            peerconnection: RTCPeerConnection | null,
-            wsUrl: string | null,
+            peerconnection: Nullable<RTCPeerConnection>,
+            wsUrl: Nullable<string>,
             emitter: EventEmitter,
             conference: JitsiConference
     ) {
@@ -258,6 +259,21 @@ export default class BridgeChannel {
         });
     }
 
+    /**
+     * Sends a message for audio subscription updates.
+     *
+     * @param {IReceiverAudioSubscriptionMessage} message - The audio subscription message.
+     * @returns {void}
+     */
+    sendReceiverAudioSubscriptionMessage(message: IReceiverAudioSubscriptionMessage): void {
+        logger.info(`Sending ReceiverAudioSubscription with mode: ${message.mode}`
+            + ` and ${message.list?.length ? 'list=' + message.list.join(', ') : 'no list'}`);
+        this._send({
+            colibriClass: 'ReceiverAudioSubscription',
+            ...message
+        });
+    }
+
     /**
      * Sends a 'ReceiverVideoConstraints' message via the bridge channel.
      *
@@ -293,7 +309,7 @@ export default class BridgeChannel {
     _handleChannel(channel: RTCDataChannel | WebSocket): void {
         const emitter = this._eventEmitter;
 
-        channel.onopen = (): void | null => {
+        channel.onopen = (): Nullable<void> => {
             logger.info(`${this._mode} channel opened`);
 
             this._connected = true;