ref(stats) Delete Jvb121EventGenerator class.

Use JitsiConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED event instead to trigger JVB stats reset.

Author: jallamsetty1

JitsiConference.ts

@@ -28,7 +28,6 @@ import VADNoiseDetection from './modules/detection/VADNoiseDetection';
 import VADTalkMutedDetection from './modules/detection/VADTalkMutedDetection';
 import { E2EEncryption } from './modules/e2ee/E2EEncryption';
 import E2ePing from './modules/e2eping/e2eping';
-import Jvb121EventGenerator from './modules/event/Jvb121EventGenerator';
 import FeatureFlags from './modules/flags/FeatureFlags';
 import { LiteModeContext } from './modules/litemode/LiteModeContext';
 import { QualityController } from './modules/qualitycontrol/QualityController';
@@ -316,7 +315,6 @@ export default class JitsiConference extends Listenable {
     public rtc?: RTC;
     public qualityController?: QualityController;
     public statistics?: Statistics;
-    public jvb121Status?: Jvb121EventGenerator;
     public p2pDominantSpeakerDetection?: P2PDominantSpeakerDetection;
     public authIdentity?: string;
     public p2pEstablishmentDuration?: number;
@@ -735,12 +733,6 @@ export default class JitsiConference extends Listenable {
             this.setLastN(config.channelLastN);
         }
 
-        /**
-         * Emits {@link JitsiConferenceEvents.JVB121_STATUS}.
-         * @type {Jvb121EventGenerator}
-         */
-        this.jvb121Status = new Jvb121EventGenerator(this);
-
         // creates dominant speaker detection that works only in p2p mode
         this.p2pDominantSpeakerDetection = new P2PDominantSpeakerDetection(this);
 

JitsiConferenceEvents.spec.ts

@@ -37,7 +37,6 @@ describe( "/JitsiConferenceEvents members", () => {
         expect( JitsiConferenceEvents.FILE_SHARING_FILES_RECEIVED ).toBe( 'conference.file_sharing.files_received' );
         expect( JitsiConferenceEvents.FILE_SHARING_FILE_ADDED ).toBe( 'conference.file_sharing.file_added' );
         expect( JitsiConferenceEvents.FILE_SHARING_FILE_REMOVED ).toBe( 'conference.file_sharing.file_removed' );
-        expect( JitsiConferenceEvents.JVB121_STATUS ).toBe( 'conference.jvb121Status' );
         expect( JitsiConferenceEvents.KICKED ).toBe( 'conference.kicked' );
         expect( JitsiConferenceEvents.PARTICIPANT_KICKED ).toBe( 'conference.participant_kicked' );
         expect( JitsiConferenceEvents.LAST_N_ENDPOINTS_CHANGED ).toBe( 'conference.lastNEndpointsChanged' );

JitsiConferenceEvents.ts

@@ -227,20 +227,6 @@ export enum JitsiConferenceEvents {
      */
     FORWARDED_SOURCES_CHANGED = 'conference.forwardedSourcesChanged',
 
-    /**
-     * NOTE This is lib-jitsi-meet internal event and can be removed at any time !
-     *
-     * Event emitted when conference transits, between one to one and multiparty JVB
-     * conference. If the conference switches to P2P it's neither one to one nor
-     * a multiparty JVB conference, but P2P (the status argument of this event will
-     * be <tt>false</tt>).
-     *
-     * The first argument is a boolean which carries the previous value and
-     * the seconds argument is a boolean with the new status. The event is emitted
-     * only if the previous and the new values are different.
-     */
-    JVB121_STATUS = 'conference.jvb121Status',
-
     /**
      * You are kicked from the conference.
      * @param {JitsiParticipant} the participant that initiated the kick.

modules/event/Jvb121EventGenerator.ts

@@ -14,6 +14,7 @@ import {
 import TraceablePeerConnection from '../RTC/TraceablePeerConnection';
 import browser from '../browser';
 import { isValidNumber } from '../util/MathUtil';
+import JingleSession from '../xmpp/JingleSession';
 
 import Statistics from './statistics';
 
@@ -374,7 +375,7 @@ export default class AvgRTPStatsReporter {
     _cachedTransportStats: Optional<Record<string, unknown>>;
     _onLocalStatsUpdated: (data: any) => void;
     _onP2PStatusChanged: () => void;
-    _onJvb121StatusChanged: (oldStatus: boolean, newStatus: boolean) => void;
+    _onJvb121StatusChanged: (activeSession: JingleSession) => void;
     jvbStatsMonitor: ConnectionAvgStats;
     p2pStatsMonitor: ConnectionAvgStats;
 
@@ -592,17 +593,15 @@ export default class AvgRTPStatsReporter {
             ConferenceEvents.P2P_STATUS,
             this._onP2PStatusChanged);
 
-        this._onJvb121StatusChanged = (oldStatus: boolean, newStatus: boolean) => {
-            // We want to reset only on the transition from false => true,
-            // because otherwise those stats are resetted on JVB <=> P2P
-            // transition.
-            if (newStatus === true) {
+        this._onJvb121StatusChanged = activeSession => {
+
+            if (activeSession === conference.jvbJingleSession) {
                 logger.info('Resetting JVB avg RTP stats');
                 this._resetAvgJvbStats();
             }
         };
         conference.on(
-            ConferenceEvents.JVB121_STATUS,
+            ConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED,
             this._onJvb121StatusChanged);
 
         this.jvbStatsMonitor
@@ -1052,7 +1051,7 @@ export default class AvgRTPStatsReporter {
             ConnectionQualityEvents.LOCAL_STATS_UPDATED,
             this._onLocalStatsUpdated);
         this._conference.off(
-            ConferenceEvents.JVB121_STATUS,
+            ConferenceEvents._MEDIA_SESSION_ACTIVE_CHANGED,
             this._onJvb121StatusChanged);
         this.jvbStatsMonitor.dispose();
         this.p2pStatsMonitor.dispose();