@webex/plugin-meetings 2.18.0 → 2.19.2

package/src/meeting/util.js

@@ -1,22 +1,17 @@
 import {isEmpty} from 'lodash';
 
 import {MeetingNotActiveError, UserNotJoinedError} from '../common/errors/webex-errors';
-import StatsUtil from '../stats/util';
 import Metrics from '../metrics';
-import {eventType, trigger, mediaType} from '../metrics/config';
+import {eventType, trigger} from '../metrics/config';
 import Media from '../media';
 import LoggerProxy from '../common/logs/logger-proxy';
-import WebRTCStats from '../stats/index';
 import {INTENT_TO_JOIN,
   _LEFT_,
   _IDLE_,
   _JOINED_,
-  STATS,
-  EVENT_TRIGGERS,
   PASSWORD_STATUS,
   DISPLAY_HINTS,
   FULL_STATE} from '../constants';
-import Trigger from '../common/events/trigger-proxy';
 import IntentToJoinError from '../common/errors/intent-to-join';
 import JoinMeetingError from '../common/errors/join-meeting';
 import ParameterError from '../common/errors/parameter';
@@ -121,9 +116,10 @@ MeetingUtil.joinMeeting = (meeting, options) => {
 
 MeetingUtil.cleanUp = (meeting) => {
   // make sure we send last metrics before we close the peerconnection
-  if (meeting.statsAnalyzer) meeting.statsAnalyzer.stopAnalyzer();
+  const stopStatsAnalyzer = (meeting.statsAnalyzer) ? meeting.statsAnalyzer.stopAnalyzer() : Promise.resolve();
 
-  return meeting.closeLocalStream()
+  return stopStatsAnalyzer
+    .then(() => meeting.closeLocalStream())
     .then(() => meeting.closeLocalShare())
     .then(() => meeting.closeRemoteTracks())
     .then(() => meeting.closePeerConnections())
@@ -132,7 +128,6 @@ MeetingUtil.cleanUp = (meeting) => {
       meeting.unsetLocalShareTrack();
       meeting.unsetRemoteTracks();
       meeting.unsetPeerConnections();
-      meeting.cleanMQAInterval();
       meeting.reconnectionManager.cleanUp();
     })
     .then(() => meeting.roap.stop(meeting.correlationId, meeting.roapSeq));
@@ -467,249 +462,6 @@ MeetingUtil.unlockMeeting = (actions, request, locusUrl) => {
   return Promise.reject(new PermissionError('Unlock not allowed, due to joined property.'));
 };
 
-MeetingUtil.startInternalStats = (meeting) => {
-  if (!meeting.internalStats) {
-    const options = {
-      useConfig: true,
-      senders: [
-        {
-          id: 'mainAudio',
-          correlate: 'audio',
-          history: true,
-          onEvent: (event) => {
-            // TODO: we don't need checks like this since it comes from the transceiver
-            // refactor event linkage to use callbacks instead of events
-            if (event.kind === 'audio' && event.stat === 'bytesSent') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_LOCAL_STARTED,
-                {
-                  type: mediaType.AUDIO
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.SENDING_MEDIA_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.AUDIO
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesSent') {
-              Metrics.postEvent({
-                event: eventType.SENDING_MEDIA_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.AUDIO
-                }
-              });
-            }
-          },
-          onData: () => {}
-        },
-        {
-          id: 'mainVideo',
-          correlate: 'video',
-          history: true,
-          onEvent: (event) => {
-            if (event.kind === 'video' && event.stat === 'bytesSent') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_LOCAL_STARTED,
-                {
-                  type: mediaType.VIDEO
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.SENDING_MEDIA_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.VIDEO
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesSent') {
-              Metrics.postEvent({
-                event: eventType.SENDING_MEDIA_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.VIDEO
-                }
-              });
-            }
-          },
-          onData: () => {}
-        },
-        {
-          id: 'mainShare',
-          correlate: 'video',
-          onEvent: (event) => {
-            if (event.kind === 'share' && event.stat === 'bytesSent') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_LOCAL_STARTED,
-                {
-                  type: mediaType.SHARE
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.SENDING_SHARE_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.SHARE
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesSent') {
-              Metrics.postEvent({
-                event: eventType.SENDING_SHARE_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.SHARE
-                }
-              });
-            }
-          },
-          onData: () => {}
-        }
-      ],
-      receivers: [
-        {
-          id: 'mainAudio',
-          correlate: 'audio',
-          history: true,
-          onEvent: (event) => {
-            if (event.kind === 'audio' && event.stat === 'bytesReceived') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_REMOTE_STARTED,
-                {
-                  type: mediaType.AUDIO
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.AUDIO
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesReceived') {
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.AUDIO
-                }
-              });
-            }
-          },
-          onData: () => {}
-        },
-        {
-          id: 'mainVideo',
-          correlate: 'video',
-          history: true,
-          onEvent: (event) => {
-            if (event.kind === 'video' && event.stat === 'bytesReceived') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_REMOTE_STARTED,
-                {
-                  type: mediaType.VIDEO
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.VIDEO
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesReceived') {
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.VIDEO
-                }
-              });
-            }
-          },
-          onData: () => {}
-        },
-        {
-          id: 'mainShare',
-          correlate: 'video',
-          onEvent: (event) => {
-            if (event.kind === 'share' && event.stat === 'bytesReceived') {
-              Trigger.trigger(
-                meeting,
-                {
-                  file: 'meeting/util',
-                  function: 'startInternalStats'
-                },
-                EVENT_TRIGGERS.MEETING_MEDIA_REMOTE_STARTED,
-                {
-                  type: mediaType.SHARE
-                }
-              );
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_START,
-                meeting,
-                data: {
-                  mediaType: mediaType.SHARE
-                }
-              });
-            }
-            else if (event.stop && event.stat === 'bytesReceived') {
-              Metrics.postEvent({
-                event: eventType.RECEIVING_MEDIA_STOP,
-                meeting,
-                data: {
-                  mediaType: mediaType.SHARE
-                }
-              });
-            }
-          },
-          onData: () => {}
-        }
-      ]
-    };
-
-    StatsUtil.generateOptions(options, STATS.CONFIG, meeting);
-
-    options.config = STATS.CONFIG;
-
-    // pass the attrs and options for the webex instance
-    meeting.internalStats = new WebRTCStats(meeting.attrs, meeting.options, options);
-  }
-
-  return meeting.internalStats;
-};
-
 MeetingUtil.handleAudioLogging = (audioTrack) => {
   const LOG_HEADER = 'MeetingUtil#handleAudioLogging -->';
 

package/src/meetings/index.js

@@ -45,8 +45,6 @@ import Meeting from '../meeting';
 import PersonalMeetingRoom from '../personal-meeting-room';
 import Reachability from '../reachability';
 import Request from '../meetings/request';
-import StatsAnalyzer from '../analyzer/analyzer';
-import StatsCalculator from '../analyzer/calculator';
 import PasswordError from '../common/errors/password-error';
 import CaptchaError from '../common/errors/captcha-error';
 
@@ -971,24 +969,4 @@ export default class Meetings extends WebexPlugin {
   getLogger() {
     return LoggerProxy.get();
   }
-
-  /**
-     * Get the Stats Analyzer singleton
-     * @returns {StatsAnalyzer}
-     * @public
-     * @memberof Meetings
-     */
-  getAnalyzer() {
-    return StatsAnalyzer;
-  }
-
-  /**
-     * Get the Stats Calculator singleton
-     * @returns {StatsCalculator}
-     * @public
-     * @memberof Meetings
-     */
-  getCalculator() {
-    return StatsCalculator;
-  }
 }