ref(TS) Convert more base files to TS (#12222)

react/features/base/app/actions.js → react/features/base/app/actions.ts

@@ -1,11 +1,7 @@
-// @flow
-
-import type { Dispatch } from 'redux';
+import { IStore } from '../../app/types';
 
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
 
-declare var APP;
-
 /**
  * Signals that a specific App will mount (in the terms of React).
  *
@@ -16,7 +12,7 @@ declare var APP;
  * }}
  */
 export function appWillMount(app: Object) {
-    return (dispatch: Dispatch<any>) => {
+    return (dispatch: IStore['dispatch']) => {
         // TODO There was a redux action creator appInit which I did not like
         // because we already had the redux action creator appWillMount and,
         // respectively, the redux action APP_WILL_MOUNT. So I set out to remove

react/features/base/app/functions.js → react/features/base/app/functions.ts

@@ -1,19 +1,19 @@
-// @flow
+import { toState } from '../redux/functions';
 
-import { toState } from '../redux';
+import { IStateful } from './types';
 
 /**
  * Gets the value of a specific React {@code Component} prop of the currently
  * mounted {@link App}.
  *
- * @param {Function|Object} stateful - The redux store or {@code getState}
+ * @param {IStateful} stateful - The redux store or {@code getState}
  * function.
  * @param {string} propName - The name of the React {@code Component} prop of
  * the currently mounted {@code App} to get.
  * @returns {*} The value of the specified React {@code Component} prop of the
  * currently mounted {@code App}.
  */
-export function getAppProp(stateful: Function | Object, propName: string) {
+export function getAppProp(stateful: IStateful, propName: string) {
     const state = toState(stateful)['features/base/app'];
 
     if (state) {

react/features/base/app/logger.js → react/features/base/app/logger.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { getLogger } from '../logging/functions';
 
 export default getLogger('features/base/app');

react/features/base/app/reducer.ts

@@ -3,7 +3,7 @@ import ReducerRegistry from '../redux/ReducerRegistry';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from './actionTypes';
 
 export interface IAppState {
-    app?: Object | undefined;
+    app?: any;
 }
 
 ReducerRegistry.register<IAppState>('features/base/app', (state = {}, action): IAppState => {

react/features/base/config/configType.ts

@@ -425,7 +425,7 @@ export interface IConfig {
     };
     serviceUrl?: string;
     speakerStatsOrder?: Array<'role' | 'name' | 'hasLeft'>;
-    startAudioMuted?: boolean;
+    startAudioMuted?: number;
     startAudioOnly?: boolean;
     startLastN?: number;
     startScreenSharing?: boolean;

react/features/base/devices/middleware.js → react/features/base/devices/middleware.ts

@@ -1,18 +1,21 @@
-/* global APP */
+import { AnyAction } from 'redux';
 
+/* eslint-disable lines-around-comment */
+// @ts-ignore
 import UIEvents from '../../../../service/UI/UIEvents';
-import { processExternalDeviceRequest } from '../../device-selection';
-import {
-    NOTIFICATION_TIMEOUT_TYPE,
-    showNotification,
-    showWarningNotification
-} from '../../notifications';
+import { IStore } from '../../app/types';
+import { processExternalDeviceRequest } from '../../device-selection/functions';
+import { showNotification, showWarningNotification } from '../../notifications/actions';
+import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
+// @ts-ignore
 import { replaceAudioTrackById, replaceVideoTrackById, setDeviceStatusWarning } from '../../prejoin/actions';
+// @ts-ignore
 import { isPrejoinPageVisible } from '../../prejoin/functions';
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app';
+import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app/actionTypes';
 import JitsiMeetJS, { JitsiMediaDevicesEvents, JitsiTrackErrors } from '../lib-jitsi-meet';
-import { MiddlewareRegistry } from '../redux';
-import { updateSettings } from '../settings';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+import { updateSettings } from '../settings/actions';
+
 
 import {
     CHECK_AND_NOTIFY_FOR_NEW_DEVICE,
@@ -35,6 +38,7 @@ import {
     setAudioOutputDeviceId
 } from './functions';
 import logger from './logger';
+import { IDevicesState } from './reducer';
 
 const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
     microphone: {
@@ -57,7 +61,7 @@ const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
 /**
  * A listener for device permissions changed reported from lib-jitsi-meet.
  */
-let permissionsListener;
+let permissionsListener: Function | undefined;
 
 /**
  * Logs the current device list.
@@ -65,8 +69,9 @@ let permissionsListener;
  * @param {Object} deviceList - Whatever is returned by {@link groupDevicesByKind}.
  * @returns {string}
  */
-function logDeviceList(deviceList) {
-    const devicesToStr = list => list.map(device => `\t\t${device.label}[${device.deviceId}]`).join('\n');
+function logDeviceList(deviceList: IDevicesState['availableDevices']) {
+    const devicesToStr = (list?: MediaDeviceInfo[]) =>
+        list?.map(device => `\t\t${device.label}[${device.deviceId}]`).join('\n');
     const audioInputs = devicesToStr(deviceList.audioInput);
     const audioOutputs = devicesToStr(deviceList.audioOutput);
     const videoInputs = devicesToStr(deviceList.videoInput);
@@ -87,7 +92,7 @@ function logDeviceList(deviceList) {
 MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
     case APP_WILL_MOUNT: {
-        const _permissionsListener = permissions => {
+        const _permissionsListener = (permissions: Object) => {
             store.dispatch(devicePermissionsChanged(permissions));
         };
         const { mediaDevices } = JitsiMeetJS;
@@ -214,7 +219,7 @@ MiddlewareRegistry.register(store => next => action => {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _processPendingRequests({ dispatch, getState }, next, action) {
+function _processPendingRequests({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
     const result = next(action);
     const state = getState();
     const { pendingRequests } = state['features/base/devices'];
@@ -223,7 +228,7 @@ function _processPendingRequests({ dispatch, getState }, next, action) {
         return result;
     }
 
-    pendingRequests.forEach(request => {
+    pendingRequests.forEach((request: any) => {
         processExternalDeviceRequest(
             dispatch,
             getState,
@@ -248,7 +253,7 @@ function _processPendingRequests({ dispatch, getState }, next, action) {
  * @private
  * @returns {void}
  */
-function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
+function _checkAndNotifyForNewDevice(store: IStore, newDevices: MediaDeviceInfo[], oldDevices: MediaDeviceInfo[]) {
     const { dispatch } = store;
 
     // let's intersect both newDevices and oldDevices and handle thew newly
@@ -260,7 +265,9 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
     // we group devices by groupID which normally is the grouping by physical device
     // plugging in headset we provide normally two device, one input and one output
     // and we want to show only one notification for this physical audio device
-    const devicesGroupBy = onlyNewDevices.reduce((accumulated, value) => {
+    const devicesGroupBy: {
+        [key: string]: MediaDeviceInfo[];
+    } = onlyNewDevices.reduce((accumulated: any, value) => {
         accumulated[value.groupId] = accumulated[value.groupId] || [];
         accumulated[value.groupId].push(value);
 
@@ -314,7 +321,7 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
  * @returns {boolean} - Returns true in order notifications to be dismissed.
  * @private
  */
-function _useDevice({ dispatch }, devices) {
+function _useDevice({ dispatch }: IStore, devices: MediaDeviceInfo[]) {
     devices.forEach(device => {
         switch (device.kind) {
         case 'videoinput': {

react/features/base/jwt/actions.js → react/features/base/jwt/actions.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { SET_JWT } from './actionTypes';
 
 /**
@@ -11,7 +9,7 @@ import { SET_JWT } from './actionTypes';
  *     jwt: (string|undefined)
  * }}
  */
-export function setJWT(jwt: ?string) {
+export function setJWT(jwt?: string) {
     return {
         type: SET_JWT,
         jwt

react/features/base/lastn/actions.js → react/features/base/lastn/actions.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { SET_LAST_N } from './actionTypes';
 
 /**

react/features/base/lastn/functions.js → react/features/base/lastn/functions.ts

@@ -7,7 +7,7 @@ import { VIDEO_QUALITY_LEVELS } from '../../video-quality/constants';
  * @param {number} channelLastN - LastN value set for the whole conference.
  * @returns {number} LastN value applicable to the quality level specified.
  */
-export function getLastNForQualityLevel(qualityLevel, channelLastN) {
+export function getLastNForQualityLevel(qualityLevel: number, channelLastN: number) {
     let lastN = channelLastN;
 
     const videoQualityLevels = Object.values(VIDEO_QUALITY_LEVELS);
@@ -15,8 +15,8 @@ export function getLastNForQualityLevel(qualityLevel, channelLastN) {
     for (const lvl in videoQualityLevels) {
         if (videoQualityLevels.hasOwnProperty(lvl)
             && qualityLevel === videoQualityLevels[lvl]
-            && lvl > 1) {
-            lastN = Math.floor(channelLastN / Math.pow(2, lvl - 1));
+            && Number(lvl) > 1) {
+            lastN = Math.floor(channelLastN / Math.pow(2, Number(lvl) - 1));
         }
     }
 
@@ -30,7 +30,7 @@ export function getLastNForQualityLevel(qualityLevel, channelLastN) {
  * @param {Object} lastNLimits - The Object to be verified.
  * @returns {undefined|Map<number, number>}
  */
-export function validateLastNLimits(lastNLimits) {
+export function validateLastNLimits(lastNLimits: any) {
     // Checks if only numbers are used
     if (typeof lastNLimits !== 'object'
         || !Object.keys(lastNLimits).length
@@ -64,7 +64,7 @@ export function validateLastNLimits(lastNLimits) {
  * @returns {number|undefined} - A "last N" number if there was a corresponding "last N" value matched with the number
  * of participants or {@code undefined} otherwise.
  */
-export function limitLastN(participantsCount, lastNLimits) {
+export function limitLastN(participantsCount: number, lastNLimits: Map<number, number>) {
     if (!lastNLimits || !lastNLimits.keys) {
         return undefined;
     }

react/features/base/lastn/logger.js → react/features/base/lastn/logger.ts

@@ -1,5 +1,3 @@
-// @flow
-
 import { getLogger } from '../logging/functions';
 
 export default getLogger('features/base/lastn');

react/features/base/lastn/middleware.js → react/features/base/lastn/middleware.ts

@@ -1,7 +1,6 @@
-// @flow
-
 import debounce from 'lodash/debounce';
 
+import { IStore } from '../../app/types';
 import { SET_FILMSTRIP_ENABLED } from '../../filmstrip/actionTypes';
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from '../../large-video/actionTypes';
 import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
@@ -22,7 +21,9 @@ import {
     getParticipantById,
     getParticipantCount
 } from '../participants/functions';
-import { MiddlewareRegistry } from '../redux';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
 import { isLocalVideoTrackDesktop } from '../tracks/functions';
 
 import { setLastN } from './actions';
@@ -36,7 +37,7 @@ import logger from './logger';
  * @private
  * @returns {void}
  */
-const _updateLastN = debounce(({ dispatch, getState }) => {
+const _updateLastN = debounce(({ dispatch, getState }: IStore) => {
     const state = getState();
     const { conference } = state['features/base/conference'];
 
@@ -61,6 +62,7 @@ const _updateLastN = debounce(({ dispatch, getState }) => {
     let lastNSelected = config.startLastN ?? (config.channelLastN ?? -1);
 
     // Apply last N limit based on the # of participants and config settings.
+    // @ts-ignore
     const limitedLastN = limitLastN(participantCount, lastNLimits);
 
     if (limitedLastN !== undefined) {
@@ -81,7 +83,7 @@ const _updateLastN = debounce(({ dispatch, getState }) => {
         // view since we make an exception only for screenshare when in audio-only mode. If the user unpins
         // the screenshare, lastN will be set to 0 here. It will be set to 1 if screenshare has been auto pinned.
         if (!tileViewEnabled && largeVideoParticipant && !largeVideoParticipant.local) {
-            lastNSelected = (remoteScreenShares || []).includes(largeVideoParticipantId) ? 1 : 0;
+            lastNSelected = (remoteScreenShares || []).includes(largeVideoParticipantId ?? '') ? 1 : 0;
         } else {
             lastNSelected = 0;
         }

react/features/base/participants/middleware.js → react/features/base/participants/middleware.ts

@@ -1,36 +1,35 @@
-// @flow
-
 import i18n from 'i18next';
 import { batch } from 'react-redux';
 
+// @ts-ignore
 import UIEvents from '../../../../service/UI/UIEvents';
+import { IStore } from '../../app/types';
 import { approveParticipant } from '../../av-moderation/actions';
 import { UPDATE_BREAKOUT_ROOMS } from '../../breakout-rooms/actionTypes';
 import { getBreakoutRooms } from '../../breakout-rooms/functions';
 import { toggleE2EE } from '../../e2ee/actions';
 import { MAX_MODE } from '../../e2ee/constants';
+import { showNotification } from '../../notifications/actions';
 import {
     LOCAL_RECORDING_NOTIFICATION_ID,
     NOTIFICATION_TIMEOUT_TYPE,
-    RAISE_HAND_NOTIFICATION_ID,
-    showNotification
-} from '../../notifications';
+    RAISE_HAND_NOTIFICATION_ID
+} from '../../notifications/constants';
 import { isForceMuted } from '../../participants-pane/functions';
-import { CALLING, INVITED } from '../../presence-status';
+import { CALLING, INVITED } from '../../presence-status/constants';
 import { RAISE_HAND_SOUND_ID } from '../../reactions/constants';
-import { RECORDING_OFF_SOUND_ID, RECORDING_ON_SOUND_ID } from '../../recording';
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app';
-import {
-    CONFERENCE_WILL_JOIN,
-    forEachConference,
-    getCurrentConference
-} from '../conference';
-import { SET_CONFIG } from '../config';
+import { RECORDING_OFF_SOUND_ID, RECORDING_ON_SOUND_ID } from '../../recording/constants';
+import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app/actionTypes';
+import { CONFERENCE_WILL_JOIN } from '../conference/actionTypes';
+import { forEachConference, getCurrentConference } from '../conference/functions';
+import { IJitsiConference } from '../conference/reducer';
+import { SET_CONFIG } from '../config/actionTypes';
 import { getDisableRemoveRaisedHandOnFocus } from '../config/functions.any';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
-import { MEDIA_TYPE } from '../media';
-import { MiddlewareRegistry, StateListenerRegistry } from '../redux';
-import { playSound, registerSound, unregisterSound } from '../sounds';
+import { MEDIA_TYPE } from '../media/constants';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+import StateListenerRegistry from '../redux/StateListenerRegistry';
+import { playSound, registerSound, unregisterSound } from '../sounds/actions';
 
 import {
     DOMINANT_SPEAKER_CHANGED,
@@ -79,9 +78,9 @@ import {
 } from './functions';
 import logger from './logger';
 import { PARTICIPANT_JOINED_FILE, PARTICIPANT_LEFT_FILE } from './sounds';
-import './subscriber';
+import { IJitsiParticipant } from './types';
 
-declare var APP: Object;
+import './subscriber';
 
 /**
  * Middleware that captures CONFERENCE_JOINED and CONFERENCE_LEFT actions and
@@ -128,8 +127,7 @@ MiddlewareRegistry.register(store => next => action => {
         const participant = getDominantSpeakerParticipant(state);
 
         if (
-            participant
-            && participant.local
+            participant?.local
             && hasRaisedHand(participant)
             && action.level > LOWER_HAND_AUDIO_LEVEL
             && !getDisableRemoveRaisedHandOnFocus(state)
@@ -142,14 +140,14 @@ MiddlewareRegistry.register(store => next => action => {
     case GRANT_MODERATOR: {
         const { conference } = store.getState()['features/base/conference'];
 
-        conference.grantOwner(action.id);
+        conference?.grantOwner(action.id);
         break;
     }
 
     case KICK_PARTICIPANT: {
         const { conference } = store.getState()['features/base/conference'];
 
-        conference.kickParticipant(action.id);
+        conference?.kickParticipant(action.id);
         break;
     }
 
@@ -164,13 +162,13 @@ MiddlewareRegistry.register(store => next => action => {
             // participant is uniquely identified by the very fact that there is
             // only one local participant.
 
-            id: localId,
+            id: localId ?? '',
             local: true,
             raisedHandTimestamp
         }));
 
         store.dispatch(raiseHandUpdateQueue({
-            id: localId,
+            id: localId ?? '',
             raisedHandTimestamp
         }));
 
@@ -188,14 +186,16 @@ MiddlewareRegistry.register(store => next => action => {
         const { deploymentInfo } = state['features/base/config'];
 
         // if there userRegion set let's use it for the local participant
-        if (deploymentInfo && deploymentInfo.userRegion) {
+        if (deploymentInfo?.userRegion) {
             const localId = getLocalParticipant(state)?.id;
 
-            store.dispatch(participantUpdated({
-                id: localId,
-                local: true,
-                region: deploymentInfo.userRegion
-            }));
+            if (localId) {
+                store.dispatch(participantUpdated({
+                    id: localId,
+                    local: true,
+                    region: deploymentInfo.userRegion
+                }));
+            }
         }
 
         return result;
@@ -207,7 +207,7 @@ MiddlewareRegistry.register(store => next => action => {
         const localId = getLocalParticipant(state)?.id;
         const { localRecording } = state['features/base/config'];
 
-        if (localRecording?.notifyAllParticipants && !onlySelf) {
+        if (localRecording?.notifyAllParticipants && !onlySelf && localId) {
             store.dispatch(participantUpdated({
                 // XXX Only the local participant is allowed to update without
                 // stating the JitsiConference instance (i.e. participant property
@@ -227,7 +227,7 @@ MiddlewareRegistry.register(store => next => action => {
     case MUTE_REMOTE_PARTICIPANT: {
         const { conference } = store.getState()['features/base/conference'];
 
-        conference.muteParticipant(action.id, action.mediaType);
+        conference?.muteParticipant(action.id, action.mediaType);
         break;
     }
 
@@ -319,7 +319,7 @@ MiddlewareRegistry.register(store => next => action => {
         if (breakoutRoom) {
             const rooms = getBreakoutRooms(state);
             const roomCounter = state['features/breakout-rooms'].roomCounter;
-            const newRooms = {};
+            const newRooms: any = {};
 
             Object.entries(rooms).forEach(([ key, r ]) => {
                 const participants = r?.participants || {};
@@ -393,7 +393,7 @@ StateListenerRegistry.register(
     /* listener */ ({ leaving }, { dispatch, getState }) => {
         const state = getState();
         const localParticipant = getLocalParticipant(state);
-        let id;
+        let id: string;
 
         if (!localParticipant
                 || (id = localParticipant.id)
@@ -421,37 +421,41 @@ StateListenerRegistry.register(
     state => state['features/base/conference'].conference,
     (conference, store) => {
         if (conference) {
-            const propertyHandlers = {
-                'e2ee.enabled': (participant, value) => _e2eeUpdated(store, conference, participant.getId(), value),
-                'features_e2ee': (participant, value) =>
+            const propertyHandlers: {
+                [key: string]: Function;
+            } = {
+                'e2ee.enabled': (participant: IJitsiParticipant, value: string) =>
+                    _e2eeUpdated(store, conference, participant.getId(), value),
+                'features_e2ee': (participant: IJitsiParticipant, value: boolean) =>
                     store.dispatch(participantUpdated({
                         conference,
                         id: participant.getId(),
                         e2eeSupported: value
                     })),
-                'features_jigasi': (participant, value) =>
+                'features_jigasi': (participant: IJitsiParticipant, value: boolean) =>
                     store.dispatch(participantUpdated({
                         conference,
                         id: participant.getId(),
                         isJigasi: value
                     })),
-                'features_screen-sharing': (participant, value) => // eslint-disable-line no-unused-vars
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                'features_screen-sharing': (participant: IJitsiParticipant, value: string) =>
                     store.dispatch(participantUpdated({
                         conference,
                         id: participant.getId(),
                         features: { 'screen-sharing': true }
                     })),
-                'localRecording': (participant, value) =>
+                'localRecording': (participant: IJitsiParticipant, value: string) =>
                     _localRecordingUpdated(store, conference, participant.getId(), value),
-                'raisedHand': (participant, value) =>
+                'raisedHand': (participant: IJitsiParticipant, value: string) =>
                     _raiseHandUpdated(store, conference, participant.getId(), value),
-                'region': (participant, value) =>
+                'region': (participant: IJitsiParticipant, value: string) =>
                     store.dispatch(participantUpdated({
                         conference,
                         id: participant.getId(),
                         region: value
                     })),
-                'remoteControlSessionStatus': (participant, value) =>
+                'remoteControlSessionStatus': (participant: IJitsiParticipant, value: boolean) =>
                     store.dispatch(participantUpdated({
                         conference,
                         id: participant.getId(),
@@ -460,12 +464,12 @@ StateListenerRegistry.register(
             };
 
             // update properties for the participants that are already in the conference
-            conference.getParticipants().forEach(participant => {
+            conference.getParticipants().forEach((participant: any) => {
                 Object.keys(propertyHandlers).forEach(propertyName => {
                     const value = participant.getProperty(propertyName);
 
                     if (value !== undefined) {
-                        propertyHandlers[propertyName](participant, value);
+                        propertyHandlers[propertyName as keyof typeof propertyHandlers](participant, value);
                     }
                 });
             });
@@ -473,17 +477,17 @@ StateListenerRegistry.register(
             // We joined a conference
             conference.on(
                 JitsiConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,
-                (participant, propertyName, oldValue, newValue) => {
+                (participant: IJitsiParticipant, propertyName: string, oldValue: string, newValue: string) => {
                     if (propertyHandlers.hasOwnProperty(propertyName)) {
                         propertyHandlers[propertyName](participant, newValue);
                     }
                 });
         } else {
-            const localParticipantId = getLocalParticipant(store.getState).id;
+            const localParticipantId = getLocalParticipant(store.getState)?.id;
 
             // We left the conference, the local participant must be updated.
-            _e2eeUpdated(store, conference, localParticipantId, false);
-            _raiseHandUpdated(store, conference, localParticipantId, 0);
+            _e2eeUpdated(store, conference, localParticipantId ?? '', false);
+            _raiseHandUpdated(store, conference, localParticipantId ?? '', 0);
         }
     }
 );
@@ -497,7 +501,8 @@ StateListenerRegistry.register(
  * @param {boolean} newValue - The new value of the E2EE enabled status.
  * @returns {void}
  */
-function _e2eeUpdated({ getState, dispatch }, conference, participantId, newValue) {
+function _e2eeUpdated({ getState, dispatch }: IStore, conference: IJitsiConference,
+        participantId: string, newValue: string | boolean) {
     const e2eeEnabled = newValue === 'true';
     const { e2ee = {} } = getState()['features/base/config'];
 
@@ -530,11 +535,12 @@ function _e2eeUpdated({ getState, dispatch }, conference, participantId, newValu
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _localParticipantJoined({ getState, dispatch }, next, action) {
+function _localParticipantJoined({ getState, dispatch }: IStore, next: Function, action: any) {
     const result = next(action);
 
     const settings = getState()['features/base/settings'];
 
+    // @ts-ignore
     dispatch(localParticipantJoined({
         avatarURL: settings.avatarURL,
         email: settings.email,
@@ -555,7 +561,7 @@ function _localParticipantJoined({ getState, dispatch }, next, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _localParticipantLeft({ dispatch }, next, action) {
+function _localParticipantLeft({ dispatch }: IStore, next: Function, action: any) {
     const result = next(action);
 
     dispatch(localParticipantLeft());
@@ -572,7 +578,7 @@ function _localParticipantLeft({ dispatch }, next, action) {
  * @private
  * @returns {void}
  */
-function _maybePlaySounds({ getState, dispatch }, action) {
+function _maybePlaySounds({ getState, dispatch }: IStore, action: any) {
     const state = getState();
     const { startAudioMuted } = state['features/base/config'];
     const { soundsParticipantJoined: joinSound, soundsParticipantLeft: leftSound } = state['features/base/settings'];
@@ -617,7 +623,7 @@ function _maybePlaySounds({ getState, dispatch }, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _participantJoinedOrUpdated(store, next, action) {
+function _participantJoinedOrUpdated(store: IStore, next: Function, action: any) {
     const { dispatch, getState } = store;
     const { overwrittenNameList } = store.getState()['features/base/participants'];
     const { participant: {
@@ -639,7 +645,7 @@ function _participantJoinedOrUpdated(store, next, action) {
             const rHand = parseInt(raisedHandTimestamp, 10);
 
             // Send raisedHand signalling only if there is a change
-            if (conference && rHand !== getLocalParticipant(getState()).raisedHandTimestamp) {
+            if (conference && rHand !== getLocalParticipant(getState())?.raisedHandTimestamp) {
                 conference.setLocalParticipantProperty('raisedHand', rHand);
             }
         }
@@ -657,7 +663,7 @@ function _participantJoinedOrUpdated(store, next, action) {
 
             // Send localRecording signalling only if there is a change
             if (conference
-                && localRecording !== getLocalParticipant(getState()).localRecording) {
+                && localRecording !== getLocalParticipant(getState())?.localRecording) {
                 conference.setLocalParticipantProperty('localRecording', localRecording);
             }
         }
@@ -673,12 +679,12 @@ function _participantJoinedOrUpdated(store, next, action) {
         const { disableThirdPartyRequests } = getState()['features/base/config'];
 
         if (!disableThirdPartyRequests && (avatarURL || email || id || name)) {
-            const participantId = !id && local ? getLocalParticipant(getState()).id : id;
+            const participantId = !id && local ? getLocalParticipant(getState())?.id : id;
             const updatedParticipant = getParticipantById(getState(), participantId);
 
-            getFirstLoadableAvatarUrl(updatedParticipant, store)
-                .then(urlData => {
-                    dispatch(setLoadableAvatarUrl(participantId, urlData?.src, urlData?.isUsingCORS));
+            getFirstLoadableAvatarUrl(updatedParticipant ?? { id: '' }, store)
+                .then((urlData?: { isUsingCORS: boolean; src: string; }) => {
+                    dispatch(setLoadableAvatarUrl(participantId, urlData?.src ?? '', Boolean(urlData?.isUsingCORS)));
                 });
         }
     }
@@ -703,7 +709,8 @@ function _participantJoinedOrUpdated(store, next, action) {
  * @param {boolean} newValue - The new value of the local recording status.
  * @returns {void}
  */
-function _localRecordingUpdated({ dispatch, getState }, conference, participantId, newValue) {
+function _localRecordingUpdated({ dispatch, getState }: IStore, conference: IJitsiConference,
+        participantId: string, newValue: string) {
     const state = getState();
 
     dispatch(participantUpdated({
@@ -732,7 +739,8 @@ function _localRecordingUpdated({ dispatch, getState }, conference, participantI
  * @param {boolean} newValue - The new value of the raise hand status.
  * @returns {void}
  */
-function _raiseHandUpdated({ dispatch, getState }, conference, participantId, newValue) {
+function _raiseHandUpdated({ dispatch, getState }: IStore, conference: IJitsiConference,
+        participantId: string, newValue: string | number) {
     let raisedHandTimestamp;
 
     switch (newValue) {
@@ -744,7 +752,7 @@ function _raiseHandUpdated({ dispatch, getState }, conference, participantId, ne
         raisedHandTimestamp = Date.now();
         break;
     default:
-        raisedHandTimestamp = parseInt(newValue, 10);
+        raisedHandTimestamp = parseInt(`${newValue}`, 10);
     }
     const state = getState();
 
@@ -811,7 +819,7 @@ function _raiseHandUpdated({ dispatch, getState }, conference, participantId, ne
  * @private
  * @returns {void}
  */
-function _registerSounds({ dispatch }) {
+function _registerSounds({ dispatch }: IStore) {
     dispatch(
         registerSound(PARTICIPANT_JOINED_SOUND_ID, PARTICIPANT_JOINED_FILE));
     dispatch(registerSound(PARTICIPANT_LEFT_SOUND_ID, PARTICIPANT_LEFT_FILE));
@@ -824,7 +832,7 @@ function _registerSounds({ dispatch }) {
  * @private
  * @returns {void}
  */
-function _unregisterSounds({ dispatch }) {
+function _unregisterSounds({ dispatch }: IStore) {
     dispatch(unregisterSound(PARTICIPANT_JOINED_SOUND_ID));
     dispatch(unregisterSound(PARTICIPANT_LEFT_SOUND_ID));
 }

react/features/base/participants/types.ts

@@ -5,6 +5,7 @@ export interface Participant {
     connectionStatus?: string;
     displayName?: string;
     dominantSpeaker?: boolean;
+    e2eeEnabled?: boolean;
     e2eeSupported?: boolean;
     email?: string;
     features?: {
@@ -42,3 +43,7 @@ export interface LocalParticipant extends Participant {
     userSelectedMicDeviceId?: string;
     userSelectedMicDeviceLabel?: string;
 }
+
+export interface IJitsiParticipant {
+    getId: () => string;
+}

react/features/base/sounds/actions.ts

@@ -68,7 +68,7 @@ export function _removeAudioElement(soundId: string) {
  * which was used in {@link registerSound} to register the sound).
  * @returns {Function}
  */
-export function playSound(soundId: string): Object {
+export function playSound(soundId: string) {
     return (dispatch: Function, getState: Function) => {
         const disabledSounds = getDisabledSounds(getState());
 
@@ -103,7 +103,7 @@ export function playSound(soundId: string): Object {
  * }}
  */
 export function registerSound(
-        soundId: string, soundName: string, options: Object = {}): Object {
+        soundId: string, soundName: string, options: Object = {}) {
     return {
         type: REGISTER_SOUND,
         soundId,
@@ -122,7 +122,7 @@ export function registerSound(
  *     soundId: string
  * }}
  */
-export function stopSound(soundId: string): Object {
+export function stopSound(soundId: string) {
     return {
         type: STOP_SOUND,
         soundId
@@ -141,7 +141,7 @@ export function stopSound(soundId: string): Object {
  *     soundId: string
  * }}
  */
-export function unregisterSound(soundId: string): Object {
+export function unregisterSound(soundId: string) {
     return {
         type: UNREGISTER_SOUND,
         soundId

react/features/device-selection/functions.js → react/features/device-selection/functions.ts

@@ -1,37 +1,37 @@
-// @flow
-
-import type { Dispatch } from 'redux';
-
+import { IStore } from '../app/types';
+import { IStateful } from '../base/app/types';
 import {
     addPendingDeviceRequest,
-    areDeviceLabelsInitialized,
-    getAudioOutputDeviceId,
     getAvailableDevices,
-    getDeviceIdByLabel,
-    groupDevicesByKind,
     setAudioInputDeviceAndUpdateSettings,
     setAudioOutputDevice,
     setVideoInputDeviceAndUpdateSettings
-} from '../base/devices';
+} from '../base/devices/actions';
+import {
+    areDeviceLabelsInitialized,
+    getAudioOutputDeviceId,
+    getDeviceIdByLabel,
+    groupDevicesByKind
+} from '../base/devices/functions';
 import { isIosMobileBrowser } from '../base/environment/utils';
 import JitsiMeetJS from '../base/lib-jitsi-meet';
-import { toState } from '../base/redux';
+import { toState } from '../base/redux/functions';
 import {
     getUserSelectedCameraDeviceId,
     getUserSelectedMicDeviceId,
     getUserSelectedOutputDeviceId
-} from '../base/settings';
+} from '../base/settings/functions.any';
 
 /**
  * Returns the properties for the device selection dialog from Redux state.
  *
- * @param {(Function|Object)} stateful -The (whole) redux state, or redux's
+ * @param {IStateful} stateful -The (whole) redux state, or redux's
  * {@code getState} function to be used to retrieve the state.
  * @param {boolean} isDisplayedOnWelcomePage - Indicates whether the device selection dialog is displayed on the
  * welcome page or not.
  * @returns {Object} - The properties for the device selection dialog.
  */
-export function getDeviceSelectionDialogProps(stateful: Object | Function, isDisplayedOnWelcomePage) {
+export function getDeviceSelectionDialogProps(stateful: IStateful, isDisplayedOnWelcomePage: boolean) {
     // On mobile Safari because of https://bugs.webkit.org/show_bug.cgi?id=179363#c30, the old track is stopped
     // by the browser when a new track is created for preview. That's why we are disabling all previews.
     const disablePreviews = isIosMobileBrowser();
@@ -96,9 +96,9 @@ export function getDeviceSelectionDialogProps(stateful: Object | Function, isDis
  * @returns {boolean} - True if the request has been processed and false otherwise.
  */
 export function processExternalDeviceRequest( // eslint-disable-line max-params
-        dispatch: Dispatch<any>,
-        getState: Function,
-        request: Object,
+        dispatch: IStore['dispatch'],
+        getState: IStore['getState'],
+        request: any,
         responseCallback: Function) {
     if (request.type !== 'devices') {
         return false;
@@ -119,10 +119,10 @@ export function processExternalDeviceRequest( // eslint-disable-line max-params
     case 'isMultipleAudioInputSupported':
         responseCallback(JitsiMeetJS.isMultipleAudioInputSupported());
         break;
-    case 'getCurrentDevices':
-        dispatch(getAvailableDevices()).then(devices => {
+    case 'getCurrentDevices': // @ts-ignore
+        dispatch(getAvailableDevices()).then((devices: MediaDeviceInfo[]) => {
             if (areDeviceLabelsInitialized(state)) {
-                const deviceDescriptions = {
+                const deviceDescriptions: any = {
                     audioInput: undefined,
                     audioOutput: undefined,
                     videoInput: undefined
@@ -164,8 +164,8 @@ export function processExternalDeviceRequest( // eslint-disable-line max-params
         });
 
         break;
-    case 'getAvailableDevices':
-        dispatch(getAvailableDevices()).then(devices => {
+    case 'getAvailableDevices': // @ts-ignore
+        dispatch(getAvailableDevices()).then((devices: MediaDeviceInfo[]) => {
             if (areDeviceLabelsInitialized(state)) {
                 responseCallback(groupDevicesByKind(devices));
             } else {

react/features/notifications/actions.ts

@@ -92,9 +92,12 @@ export function setNotificationsEnabled(enabled: boolean) {
 interface INotificationProps {
     appearance?: string;
     concatText?: boolean;
+    customActionHandler?: Function[];
+    customActionNameKey?: string[];
     description?: string;
     descriptionKey?: string;
     icon?: string;
+    title?: string;
     titleArguments?: {
         [key: string]: string;
     };