[L33T-3002] Update

.eslintignore

@@ -4,7 +4,6 @@ lib-jitsi-meet.*
 # Third-party source code which we (1) do not want to modify or (2) try to
 # modify as little as possible.
 doc/example/libs/*
-flow-typed/*
 
 # ESLint will by default ignore its own configuration file. However, there does
 # not seem to be a reason why we will want to risk being inconsistent with our

.github/workflows/ci.yml

@@ -10,7 +10,8 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '14.x'
+    - run: npm i -g npm@7
     - run: npm install
     - run: npm run lint
     - run: npm run test

JitsiConference.js

@@ -126,6 +126,17 @@ export default function JitsiConference(options) {
         logger.error(errmsg);
         throw new Error(errmsg);
     }
+    this.connection = options.connection;
+    this.xmpp = this.connection?.xmpp;
+
+    if (this.xmpp.isRoomCreated(options.name, options.customDomain)) {
+        const errmsg = 'A coference with the same name has already been created!';
+
+        delete this.connection;
+        delete this.xmpp;
+        logger.error(errmsg);
+        throw new Error(errmsg);
+    }
     this.eventEmitter = new EventEmitter();
     this.options = options;
     this.eventManager = new JitsiConferenceEventManager(this);
@@ -258,7 +269,7 @@ export default function JitsiConference(options) {
      * End-to-End Encryption. Make it available if supported.
      */
     if (this.isE2EESupported()) {
-        logger.info('End-to-End Encryprtion is supported');
+        logger.info('End-to-End Encryption is supported');
 
         this._e2eEncryption = new E2EEncryption(this);
     }
@@ -310,15 +321,7 @@ JitsiConference.resourceCreator = function(jid, isAuthenticatedUser) {
  * @param options.connection {JitsiConnection} overrides this.connection
  */
 JitsiConference.prototype._init = function(options = {}) {
-    // Override connection and xmpp properties (Useful if the connection
-    // reloaded)
-    if (options.connection) {
-        this.connection = options.connection;
-        this.xmpp = this.connection.xmpp;
-
-        // Setup XMPP events only if we have new connection object.
-        this.eventManager.setupXMPPListeners();
-    }
+    this.eventManager.setupXMPPListeners();
 
     const { config } = this.options;
 
@@ -394,10 +397,9 @@ JitsiConference.prototype._init = function(options = {}) {
             this.rtc,
             this,
             {
-                // Both these options are not public API, leaving it here only
-                // as an entry point through config for tuning up purposes.
-                // Default values should be adjusted as soon as optimal values
-                // are discovered.
+                // These options are not public API, leaving it here only as an entry point through config for tuning
+                // up purposes. Default values should be adjusted as soon as optimal values are discovered.
+                p2pRtcMuteTimeout: config._p2pConnStatusRtcMuteTimeout,
                 rtcMuteTimeout: config._peerConnStatusRtcMuteTimeout,
                 outOfLastNTimeout: config._peerConnStatusOutOfLastNTimeout
             });
@@ -946,7 +948,14 @@ JitsiConference.prototype.removeCommand = function(name) {
  */
 JitsiConference.prototype.setDisplayName = function(name) {
     if (this.room) {
-        this.room.addOrReplaceInPresence('nick', {
+        const nickKey = 'nick';
+
+        // if there is no display name already set, avoid setting an empty one
+        if (!name && !this.room.getFromPresence(nickKey)) {
+            return;
+        }
+
+        this.room.addOrReplaceInPresence(nickKey, {
             attributes: { xmlns: 'http://jabber.org/protocol/nick' },
             value: name
         }) && this.room.sendPresence();
@@ -1094,11 +1103,23 @@ JitsiConference.prototype._fireMuteChangeEvent = function(track) {
  * @returns {Array<JitsiLocalTrack>} - list of local tracks that are unmuted.
  */
 JitsiConference.prototype._getInitialLocalTracks = function() {
-    // Always add the audio track on mobile Safari because of a known issue where audio playout doesn't happen
-    // if the user joins audio and video muted.
+    // Always add the audio track on certain platforms:
+    //  * Safari / WebKit: because of a known issue where audio playout doesn't happen
+    //    if the user joins audio and video muted.
+    //  * React Native: after iOS 15, if a user joins muted they won't be able to unmute.
     return this.getLocalTracks()
-        .filter(track => (track.getType() === MediaType.AUDIO && (!this.isStartAudioMuted() || browser.isIosBrowser()))
-        || (track.getType() === MediaType.VIDEO && !this.isStartVideoMuted()));
+        .filter(track => {
+            const trackType = track.getType();
+
+            if (trackType === MediaType.AUDIO
+                    && (!this.isStartAudioMuted() || browser.isWebKitBased() || browser.isReactNative())) {
+                return true;
+            } else if (trackType === MediaType.VIDEO && !this.isStartVideoMuted()) {
+                return true;
+            }
+
+            return false;
+        });
 };
 
 /**
@@ -2033,7 +2054,7 @@ JitsiConference.prototype.onIncomingCall = function(
     if (jingleSession.isP2P) {
         this._onIncomingCallP2P(jingleSession, jingleOffer);
     } else {
-        if (!this.room.isFocus(jingleSession.remoteJid)) {
+        if (!this.isFocus(jingleSession.remoteJid)) {
             const description = 'Rejecting session-initiate from non-focus.';
 
             this._rejectIncomingCall(
@@ -2638,14 +2659,13 @@ JitsiConference.prototype.sendApplicationLog = function(message) {
 };
 
 /**
- * Checks if the user identified by given <tt>mucJid</tt> is the conference
- * focus.
+ * Checks if the user identified by given <tt>mucJid</tt> is the conference focus.
  * @param mucJid the full MUC address of the user to be checked.
  * @returns {boolean|null} <tt>true</tt> if MUC user is the conference focus,
  * <tt>false</tt> when is not. <tt>null</tt> if we're not in the MUC anymore and
  * are unable to figure out the status or if given <tt>mucJid</tt> is invalid.
  */
-JitsiConference.prototype._isFocus = function(mucJid) {
+JitsiConference.prototype.isFocus = function(mucJid) {
     return this.room ? this.room.isFocus(mucJid) : null;
 };
 
@@ -2767,7 +2787,6 @@ JitsiConference.prototype.isConnectionInterrupted = function() {
  */
 JitsiConference.prototype._onConferenceRestarted = function(session) {
     if (!session.isP2P && this.options.config.enableForcedReload) {
-        this.restartInProgress = true;
         this.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CONFERENCE_RESTARTED);
     }
 };
@@ -3705,7 +3724,7 @@ JitsiConference.prototype._restartMediaSessions = function() {
  * @returns {boolean}
  */
 JitsiConference.prototype.isE2EEEnabled = function() {
-    return this._e2eEncryption && this._e2eEncryption.isEnabled();
+    return Boolean(this._e2eEncryption && this._e2eEncryption.isEnabled());
 };
 
 /**
@@ -3734,6 +3753,17 @@ JitsiConference.prototype.toggleE2EE = function(enabled) {
     this._e2eEncryption.setEnabled(enabled);
 };
 
+/**
+ * Sets the key and index for End-to-End encryption.
+ *
+ * @param {CryptoKey} [keyInfo.encryptionKey] - encryption key.
+ * @param {Number} [keyInfo.index] - the index of the encryption key.
+ * @returns {void}
+ */
+JitsiConference.prototype.setMediaEncryptionKey = function(keyInfo) {
+    this._e2eEncryption.setEncryptionKey(keyInfo);
+};
+
 /**
  * Returns <tt>true</tt> if lobby support is enabled in the backend.
  *
@@ -3873,7 +3903,31 @@ JitsiConference.prototype.avModerationApprove = function(mediaType, id) {
 
         this.room.getAVModeration().approve(mediaType, participant.getJid());
     } else {
-        logger.warn(`AV moderation skipped , ${this.room ? '' : 'not in a room, '}${
+        logger.warn(`AV moderation approve skipped , ${this.room ? '' : 'not in a room, '}${
+            this.isModerator() ? '' : 'participant is not a moderator, '}${
+            this.room && this.isModerator() ? 'wrong media type passed' : ''}`);
+    }
+};
+
+/**
+ * Reject participant access to certain media, blocks unmuting audio or video.
+ *
+ * @param {MediaType} mediaType "audio" or "video"
+ * @param id the id of the participant.
+ */
+JitsiConference.prototype.avModerationReject = function(mediaType, id) {
+    if (this.room && this.isModerator()
+        && (mediaType === MediaType.AUDIO || mediaType === MediaType.VIDEO)) {
+
+        const participant = this.getParticipantById(id);
+
+        if (!participant) {
+            return;
+        }
+
+        this.room.getAVModeration().reject(mediaType, participant.getJid());
+    } else {
+        logger.warn(`AV moderation reject skipped , ${this.room ? '' : 'not in a room, '}${
             this.isModerator() ? '' : 'participant is not a moderator, '}${
             this.room && this.isModerator() ? 'wrong media type passed' : ''}`);
     }

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);
 
@@ -722,8 +725,23 @@ JitsiConferenceEventManager.prototype.setupXMPPListeners = function() {
                 });
             }
         });
+    this._addConferenceXMPPListener(XMPPEvents.AV_MODERATION_PARTICIPANT_REJECTED,
+        (mediaType, jid) => {
+            const participant = conference.getParticipantById(Strophe.getResourceFromJid(jid));
+
+            if (participant) {
+                conference.eventEmitter.emit(JitsiConferenceEvents.AV_MODERATION_PARTICIPANT_REJECTED, {
+                    participant,
+                    mediaType
+                });
+            }
+        });
     this._addConferenceXMPPListener(XMPPEvents.AV_MODERATION_APPROVED,
         value => conference.eventEmitter.emit(JitsiConferenceEvents.AV_MODERATION_APPROVED, { mediaType: value }));
+    this._addConferenceXMPPListener(XMPPEvents.AV_MODERATION_REJECTED,
+        value => {
+            conference.eventEmitter.emit(JitsiConferenceEvents.AV_MODERATION_REJECTED, { mediaType: value });
+        });
 };
 
 /**

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.
@@ -385,6 +390,14 @@ export const LOBBY_USER_LEFT = 'conference.lobby.userLeft';
  */
 export const AV_MODERATION_APPROVED = 'conference.av_moderation.approved';
 
+/**
+ * The local participant was blocked to be able to unmute.
+ * @param {options} event - {
+ *     {MediaType} mediaType
+ * }.
+ */
+export const AV_MODERATION_REJECTED = 'conference.av_moderation.rejected';
+
 /**
  * AV Moderation was enabled/disabled. The actor is the participant that is currently in the meeting,
  * or undefined if that participant has left the meeting.
@@ -405,3 +418,12 @@ export const AV_MODERATION_CHANGED = 'conference.av_moderation.changed';
  * }.
  */
 export const AV_MODERATION_PARTICIPANT_APPROVED = 'conference.av_moderation.participant.approved';
+
+/**
+ * AV Moderation, report for user being blocked to unmute.
+ * @param {options} event - {
+ *     {JitsiParticipant} participant,
+ *     {MediaType} mediaType
+ * }.
+ */
+export const AV_MODERATION_PARTICIPANT_REJECTED = 'conference.av_moderation.participant.rejected';

JitsiMeetJS.js

@@ -21,6 +21,7 @@ import { ParticipantConnectionStatus }
 import getActiveAudioDevice from './modules/detection/ActiveDeviceDetector';
 import * as DetectionEvents from './modules/detection/DetectionEvents';
 import TrackVADEmitter from './modules/detection/TrackVADEmitter';
+import FeatureFlags from './modules/flags/FeatureFlags';
 import ProxyConnectionService
     from './modules/proxyconnection/ProxyConnectionService';
 import recordingConstants from './modules/recording/recordingConstants';
@@ -146,6 +147,11 @@ export default _mergeNamespaceAndModule({
         Settings.init(options.externalStorage);
         Statistics.init(options);
 
+        // Configure the feature flags.
+        FeatureFlags.init({
+            sourceNameSignaling: options.sourceNameSignaling
+        });
+
         // Initialize global window.connectionTimes
         // FIXME do not use 'window'
         if (!window.connectionTimes) {

karma.conf.js

@@ -10,7 +10,7 @@ module.exports = function(config) {
 
         // frameworks to use
         // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-        frameworks: [ 'jasmine' ],
+        frameworks: [ 'jasmine', 'webpack' ],
 
         // list of files / patterns to load in the browser
         files: [
@@ -60,6 +60,6 @@ module.exports = function(config) {
         // if true, Karma captures browsers, runs the tests and exits
         singleRun: true,
 
-        webpack: require('./webpack-shared-config')
+        webpack: require('./webpack-shared-config')(false /* minimize */, false /* analyzeBundle */)
     });
 };

modules/RTC/CodecSelection.js

@@ -47,9 +47,7 @@ export class CodecSelection {
         logger.debug(`Codec preferences for the conference are JVB: ${this.jvbPreferredCodec},
             P2P: ${this.p2pPreferredCodec}`);
 
-        // Do not prefer VP9 on Firefox because of the following bug.
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=1633876
-        if (browser.isFirefox() && this.jvbPreferredCodec === CodecMimeType.VP9) {
+        if (this.jvbPreferredCodec === CodecMimeType.VP9 && !browser.supportsVP9()) {
             this.jvbPreferredCodec = CodecMimeType.VP8;
         }
 
@@ -136,11 +134,9 @@ export class CodecSelection {
                 const peerMediaInfo = session.signalingLayer.getPeerMediaInfo(remote, MediaType.VIDEO);
                 const peerCodec = peerMediaInfo?.codecType;
 
-                // We do not want Firefox to switch to VP9 because of the following bug.
-                // https://bugzilla.mozilla.org/show_bug.cgi?id=1492500.
                 if (peerCodec
                     && peerCodec !== currentCodec
-                    && !(browser.isFirefox() && peerCodec === CodecMimeType.VP9)) {
+                    && (peerCodec !== CodecMimeType.VP9 || browser.supportsVP9())) {
                     selectedCodec = peerCodec;
                 }
             }