@webex/plugin-meetings 2.60.1-next.9 → 2.60.2

package/src/meetings/request.ts

@@ -23,7 +23,6 @@ export default class MeetingRequest extends StatelessWebexPlugin {
         LoggerProxy.logger.error(
           `Meetings:request#getActiveMeetings --> failed to get locus details, ${error}`
         );
-        throw new Error(error);
       });
   }
 
@@ -72,7 +71,6 @@ export default class MeetingRequest extends StatelessWebexPlugin {
               LoggerProxy.logger.error(
                 `Meetings:request#determineRedirections --> failed to get locus details from url: ${url}, reason: ${error}`
               );
-              throw new Error(error);
             })
         )
       ).then(() => Promise.resolve(responseBody));

package/src/meetings/util.ts

@@ -1,23 +1,15 @@
 /* globals window */
 
 import {
-  _CREATED_,
-  _INCOMING_,
-  _JOINED_,
-  _LEFT_,
   _LOCUS_ID_,
-  _MOVED_,
-  BREAKOUTS,
+  _INCOMING_,
+  _CREATED_,
+  LOCUSEVENT,
   CORRELATION_ID,
   EVENT_TRIGGERS,
-  LOCUS,
-  LOCUSEVENT,
-  ROAP,
 } from '../constants';
 import LoggerProxy from '../common/logs/logger-proxy';
 import Trigger from '../common/events/trigger-proxy';
-import BEHAVIORAL_METRICS from '../metrics/constants';
-import Metrics from '../metrics';
 
 /**
  * Meetings Media Codec Missing Event
@@ -49,54 +41,11 @@ MeetingsUtil.handleRoapMercury = (envelope, meetingCollection) => {
     const meeting = meetingCollection.getByKey(CORRELATION_ID, data.correlationId);
 
     if (meeting) {
-      const {seq, messageType, tieBreaker, errorType, errorCause} = data.message;
-
-      Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.ROAP_MERCURY_EVENT_RECEIVED, {
-        correlation_id: data.correlationId,
-        seq,
-        message_type: messageType,
-        error_type: errorType,
-        error_cause: errorCause,
-      });
-
-      if (messageType === ROAP.ROAP_TYPES.TURN_DISCOVERY_RESPONSE) {
-        // turn discovery is not part of normal roap protocol and so we are not handling it
-        // through the usual roap state machine
-        meeting.roap.turnDiscovery.handleTurnDiscoveryResponse(data.message);
-      } else {
-        const roapMessage = {
-          seq,
-          messageType,
-          sdp: data.message.sdps?.length > 0 ? data.message.sdps[0] : undefined,
-          tieBreaker,
-          errorType,
-          errorCause,
-        };
-
-        meeting.roapMessageReceived(roapMessage);
-      }
+      meeting.roap.roapEvent(data);
     }
   }
 };
 
-MeetingsUtil.getMediaServer = (sdp) => {
-  let mediaServer;
-
-  // Attempt to collect the media server from the roap message.
-  try {
-    mediaServer = sdp
-      .split('\r\n')
-      .find((line) => line.startsWith('o='))
-      .split(' ')
-      .shift()
-      .replace('o=', '');
-  } catch {
-    mediaServer = undefined;
-  }
-
-  return mediaServer;
-};
-
 MeetingsUtil.checkForCorrelationId = (deviceUrl, locus) => {
   let devices = [];
 
@@ -118,13 +67,11 @@ MeetingsUtil.checkForCorrelationId = (deviceUrl, locus) => {
 MeetingsUtil.parseDefaultSiteFromMeetingPreferences = (userPreferences) => {
   let result = '';
 
-  if (userPreferences?.sites?.length) {
+  if (userPreferences && userPreferences.sites) {
     const defaultSite = userPreferences.sites.find((site) => site.default);
 
     if (defaultSite) {
       result = defaultSite.siteUrl;
-    } else {
-      result = userPreferences.sites[0].siteUrl;
     }
   }
 
@@ -231,62 +178,4 @@ MeetingsUtil.checkH264Support = async function checkH264Support(options: {
   }, delay);
 };
 
-/**
- * get device from locus data
- * @param {Object} newLocus new locus data
- * @param {String} deviceUrl current device url
- * @returns {Object}
- */
-MeetingsUtil.getThisDevice = (newLocus: any, deviceUrl: string) => {
-  if (newLocus?.self?.devices?.length > 0) {
-    return newLocus.self.devices.find((device) => device.url === deviceUrl);
-  }
-
-  return null;
-};
-
-/**
- * get self device joined status from locus data
- * @param {Object} meeting current meeting data
- * @param {Object} newLocus new locus data
- * @param {String} deviceUrl current device url
- * @returns {Object}
- */
-MeetingsUtil.joinedOnThisDevice = (meeting: any, newLocus: any, deviceUrl: string) => {
-  const thisDevice = MeetingsUtil.getThisDevice(newLocus, deviceUrl);
-  if (thisDevice) {
-    if (!thisDevice.correlationId || meeting?.correlationId === thisDevice.correlationId) {
-      return (
-        thisDevice.state === _JOINED_ ||
-        (thisDevice.state === _LEFT_ && thisDevice.reason === _MOVED_)
-      );
-    }
-  }
-
-  return false;
-};
-
-/**
- * check the new locus is breakout session's one or not
- * @param {Object} newLocus new locus data
- * @returns {boolean}
- * @private
- */
-MeetingsUtil.isBreakoutLocusDTO = (newLocus: any) => {
-  return newLocus?.controls?.breakout?.sessionType === BREAKOUTS.SESSION_TYPES.BREAKOUT;
-};
-
-/**
- * check the locus is valid breakout locus or not
- * @param {Object} locus
- * @returns {boolean}
- * @private
- */
-MeetingsUtil.isValidBreakoutLocus = (locus: any) => {
-  const inActiveStatus = locus?.fullState?.state === LOCUS.STATE.INACTIVE;
-  const isLocusAsBreakout = MeetingsUtil.isBreakoutLocusDTO(locus);
-  const selfJoined = locus.self?.state === _JOINED_;
-
-  return isLocusAsBreakout && !inActiveStatus && selfJoined;
-};
 export default MeetingsUtil;

package/src/member/index.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 import {MEETINGS, _IN_LOBBY_, _NOT_IN_MEETING_, _IN_MEETING_} from '../constants';
-import {IExternalRoles, IMediaStatus, ParticipantWithRoles} from './types';
+import {IMediaStatus} from './member.types';
 
 import MemberUtil from './util';
 
@@ -30,14 +30,10 @@ export default class Member {
   isSelf: any;
   isUser: any;
   isVideoMuted: any;
-  roles: IExternalRoles;
   mediaStatus: IMediaStatus;
   name: any;
   participant: any;
   status: any;
-  supportsBreakouts: boolean;
-  supportsInterpretation: boolean;
-  supportLiveAnnotation: boolean;
   type: any;
   namespace = MEETINGS;
 
@@ -114,20 +110,6 @@ export default class Member {
      * @memberof Member
      */
     this.isHandRaised = null;
-    /**
-     * @instance
-     * @type {Boolean}
-     * @public
-     * @memberof Member
-     */
-    this.supportsBreakouts = null;
-    /**
-     * @instance
-     * @type {Boolean}
-     * @public
-     * @memberof Member
-     */
-    this.supportLiveAnnotation = null;
     /**
      * @instance
      * @type {Boolean}
@@ -248,15 +230,6 @@ export default class Member {
      * @memberof Member
      */
     this.isModeratorAssignmentProhibited = null;
-
-    /**
-     * @instance
-     * @type {IExternalRoles}
-     * @public
-     * @memberof Member
-     */
-    this.roles = null;
-
     /**
      * @instance
      * @type {IMediaStatus}
@@ -291,9 +264,6 @@ export default class Member {
       this.isAudioMuted = MemberUtil.isAudioMuted(participant);
       this.isVideoMuted = MemberUtil.isVideoMuted(participant);
       this.isHandRaised = MemberUtil.isHandRaised(participant);
-      this.supportsBreakouts = MemberUtil.isBreakoutsSupported(participant);
-      this.supportsInterpretation = MemberUtil.isInterpretationSupported(participant);
-      this.supportLiveAnnotation = MemberUtil.isLiveAnnotationSupported(participant);
       this.isGuest = MemberUtil.isGuest(participant);
       this.isUser = MemberUtil.isUser(participant);
       this.isDevice = MemberUtil.isDevice(participant);
@@ -301,7 +271,6 @@ export default class Member {
       this.isModeratorAssignmentProhibited =
         MemberUtil.isModeratorAssignmentProhibited(participant);
       this.processStatus(participant);
-      this.processRoles(participant as ParticipantWithRoles);
       // must be done last
       this.isNotAdmitted = MemberUtil.isNotAdmitted(participant, this.isGuest, this.status);
     }
@@ -473,17 +442,6 @@ export default class Member {
     }
   }
 
-  /**
-   * process the roles that have been applied to this member
-   * @param {Object} participant
-   * @returns {undefined}
-   * @private
-   * @memberof Member
-   */
-  private processRoles(participant: ParticipantWithRoles) {
-    this.roles = MemberUtil.extractControlRoles(participant);
-  }
-
   /**
    * set the type for the member, could be MEETING or CALL
    * @param {String} type

package/src/member/util.ts

@@ -1,10 +1,3 @@
-import {
-  IExternalRoles,
-  ParticipantWithRoles,
-  ServerRoles,
-  ServerRoleShape,
-  IMediaStatus,
-} from './types';
 import {
   _USER_,
   _RESOURCE_ROOM_,
@@ -21,10 +14,9 @@ import {
   _SEND_RECEIVE_,
   _RECEIVE_ONLY_,
   _CALL_,
-  VIDEO,
-  AUDIO,
 } from '../constants';
 import ParameterError from '../common/errors/parameter';
+import {IMediaStatus} from './member.types';
 
 const MemberUtil: any = {};
 
@@ -42,58 +34,6 @@ MemberUtil.canReclaimHost = (participant) => {
   return participant.canReclaimHostRole || false;
 };
 
-/**
- * @param {Object} participant the locus participant
- * @returns {[ServerRoleShape]}
- */
-MemberUtil.getControlsRoles = (participant: ParticipantWithRoles): Array<ServerRoleShape> =>
-  participant?.controls?.role?.roles;
-
-/**
- * @param {Object} participant the locus participant
- * @param {ServerRoles} controlRole the search role
- * @returns {Boolean}
- */
-MemberUtil.hasRole = (participant: any, controlRole: ServerRoles): boolean =>
-  MemberUtil.getControlsRoles(participant)?.some(
-    (role) => role.type === controlRole && role.hasRole
-  );
-
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.hasCohost = (participant: ParticipantWithRoles): boolean =>
-  MemberUtil.hasRole(participant, ServerRoles.Cohost) || false;
-
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.hasModerator = (participant: ParticipantWithRoles): boolean =>
-  MemberUtil.hasRole(participant, ServerRoles.Moderator) || false;
-
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.hasPresenter = (participant: ParticipantWithRoles): boolean =>
-  MemberUtil.hasRole(participant, ServerRoles.Presenter) || false;
-
-/**
- * @param {Object} participant the locus participant
- * @returns {IExternalRoles}
- */
-MemberUtil.extractControlRoles = (participant: ParticipantWithRoles): IExternalRoles => {
-  const roles = {
-    cohost: MemberUtil.hasCohost(participant),
-    moderator: MemberUtil.hasModerator(participant),
-    presenter: MemberUtil.hasPresenter(participant),
-  };
-
-  return roles;
-};
-
 /**
  * @param {Object} participant the locus participant
  * @returns {Boolean}
@@ -168,20 +108,30 @@ MemberUtil.isAudioMuted = (participant: any) => {
   if (!participant) {
     throw new ParameterError('Audio could not be processed, participant is undefined.');
   }
+  const mutedStatus = MemberUtil.isMuted(participant.status, AUDIO_STATUS);
+
+  if (participant.controls && participant.controls.audio) {
+    if (participant.controls.audio.muted) {
+      return true;
+    }
+    if (mutedStatus) {
+      return true;
+    }
+  }
 
-  return MemberUtil.isMuted(participant, AUDIO_STATUS, AUDIO);
+  return false;
 };
 
 /**
  * @param {Object} participant the locus participant
  * @returns {Boolean}
  */
-MemberUtil.isVideoMuted = (participant: any): boolean => {
+MemberUtil.isVideoMuted = (participant: any) => {
   if (!participant) {
     throw new ParameterError('Video could not be processed, participant is undefined.');
   }
 
-  return MemberUtil.isMuted(participant, VIDEO_STATUS, VIDEO);
+  return MemberUtil.isMuted(participant.status, VIDEO_STATUS);
 };
 
 /**
@@ -196,70 +146,23 @@ MemberUtil.isHandRaised = (participant: any) => {
   return participant.controls?.hand?.raised || false;
 };
 
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.isBreakoutsSupported = (participant) => {
-  if (!participant) {
-    throw new ParameterError('Breakout support could not be processed, participant is undefined.');
-  }
-
-  return !participant.doesNotSupportBreakouts;
-};
-
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.isInterpretationSupported = (participant) => {
-  if (!participant) {
-    throw new ParameterError(
-      'Interpretation support could not be processed, participant is undefined.'
-    );
-  }
-
-  return !participant.doesNotSupportSiInterpreter;
-};
-
-/**
- * @param {Object} participant the locus participant
- * @returns {Boolean}
- */
-MemberUtil.isLiveAnnotationSupported = (participant) => {
-  if (!participant) {
-    throw new ParameterError(
-      'LiveAnnotation support could not be processed, participant is undefined.'
-    );
-  }
-
-  return !participant.annotatorAssignmentNotAllowed;
-};
-
 /**
  * utility method for audio/video muted status
- * @param {any} participant
- * @param {String} statusAccessor
- * @param {String} controlsAccessor
- * @returns {Boolean | undefined}
+ * @param {String} status
+ * @param {String} accessor
+ * @returns {Boolean}
  */
-MemberUtil.isMuted = (participant: any, statusAccessor: string, controlsAccessor: string) => {
-  // check remote mute
-  const remoteMute = participant?.controls?.[controlsAccessor]?.muted;
-  if (remoteMute === true) {
-    return true;
-  }
-
-  // check local mute
-  const localStatus = participant?.status?.[statusAccessor];
-  if (localStatus === _RECEIVE_ONLY_) {
-    return true;
-  }
-  if (localStatus === _SEND_RECEIVE_) {
-    return false;
+MemberUtil.isMuted = (status: string, accessor: string) => {
+  if (status) {
+    if (status[accessor] === _RECEIVE_ONLY_) {
+      return true;
+    }
+    if (status[accessor] === _SEND_RECEIVE_) {
+      return false;
+    }
   }
 
-  return remoteMute;
+  return null;
 };
 
 /**
@@ -377,8 +280,8 @@ MemberUtil.extractMediaStatus = (participant: any): IMediaStatus => {
   }
 
   return {
-    audio: participant.status?.audioStatus,
-    video: participant.status?.videoStatus,
+    audio: participant.status.audioStatus,
+    video: participant.status.videoStatus,
   };
 };
 

package/src/members/collection.ts

@@ -37,12 +37,4 @@ export default class MembersCollection {
   getAll() {
     return this.members;
   }
-
-  /**
-   * @returns {void}
-   * reset members
-   */
-  reset() {
-    this.members = {};
-  }
 }