@webex/plugin-meetings 3.8.1-next.4 → 3.8.1-next.40

package/src/constants.ts

@@ -217,6 +217,7 @@ export const DIALER_REGEX = {
   PHONE_NUMBER:
     /^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\s*\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?$/,
   E164_FORMAT: /^\+[1-9]\d{1,14}$/,
+  INTERNAL_NUMBER: /^\d{1,14}$/,
 };
 
 // eslint-disable-next-line max-len
@@ -262,7 +263,6 @@ export const RECORDING_STATE = {
   PAUSED: 'paused',
   RESUMED: 'resumed',
 };
-
 export const SHARE_STATUS = {
   NO_SHARE: 'no_share',
   REMOTE_SHARE_ACTIVE: 'remote_share_active',
@@ -948,6 +948,9 @@ export const DISPLAY_HINTS = {
   PREMISE_RECORDING_CONTROL_PAUSE: 'PREMISE_RECORDING_CONTROL_PAUSE',
   PREMISE_RECORDING_CONTROL_STOP: 'PREMISE_RECORDING_CONTROL_STOP',
   PREMISE_RECORDING_CONTROL_RESUME: 'PREMISE_RECORDING_CONTROL_RESUME',
+  LOCAL_RECORDING_STATUS_STARTED: 'LOCAL_RECORDING_STATUS_STARTED',
+  LOCAL_RECORDING_STATUS_STOPPED: 'LOCAL_RECORDING_STATUS_STOPPED',
+  LOCAL_RECORDING_STATUS_PAUSED: 'LOCAL_RECORDING_STATUS_PAUSED',
   LOCK_CONTROL_UNLOCK: 'LOCK_CONTROL_UNLOCK',
   LOCK_CONTROL_LOCK: 'LOCK_CONTROL_LOCK',
   LOCK_STATUS_LOCKED: 'LOCK_STATUS_LOCKED',
@@ -987,7 +990,6 @@ export const DISPLAY_HINTS = {
   CAN_RENAME_SELF_AND_OBSERVED: 'CAN_RENAME_SELF_AND_OBSERVED',
   CAN_RENAME_OTHERS: 'CAN_RENAME_OTHERS',
   MOVE_TO_LOBBY: 'MOVE_TO_LOBBY',
-
   // breakout session
   BREAKOUT_MANAGEMENT: 'BREAKOUT_MANAGEMENT',
   BROADCAST_MESSAGE_TO_BREAKOUT: 'BROADCAST_MESSAGE_TO_BREAKOUT',
@@ -1188,6 +1190,7 @@ export const QUALITY_LEVELS = {
   HIGH: 'HIGH',
   '360p': '360p',
   '480p': '480p',
+  '540p': '540p',
   '720p': '720p',
   '1080p': '1080p',
 };
@@ -1217,6 +1220,18 @@ export const AVAILABLE_RESOLUTIONS = {
       },
     },
   },
+  '540p': {
+    video: {
+      width: {
+        max: 960,
+        ideal: 960,
+      },
+      height: {
+        max: 540,
+        ideal: 540,
+      },
+    },
+  },
   '720p': {
     video: {
       width: {
@@ -1357,3 +1372,9 @@ export const INITIAL_REGISTRATION_STATUS = {
   mercuryConnect: false,
   checkH264Support: false,
 };
+
+export const STAGE_MANAGER_TYPE = {
+  LOGO: 0b001,
+  BACKGROUND: 0b010,
+  NAME_LABEL: 0b100,
+};

package/src/locus-info/index.ts

@@ -48,7 +48,6 @@ export default class LocusInfo extends EventsScope {
   aclUrl: any;
   baseSequence: any;
   created: any;
-  deltaParticipants: any;
   identities: any;
   membership: any;
   participants: any;
@@ -99,6 +98,7 @@ export default class LocusInfo extends EventsScope {
   private doLocusSync(meeting: any) {
     let isDelta;
     let url;
+    let meetingDestroyed = false;
 
     if (this.locusParser.workingCopy.syncUrl) {
       url = this.locusParser.workingCopy.syncUrl;
@@ -134,32 +134,56 @@ export default class LocusInfo extends EventsScope {
 
           isDelta = false;
 
-          return meeting.meetingRequest.getLocusDTO({url: meeting.locusUrl}).catch((err) => {
-            LoggerProxy.logger.info(
-              'Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting'
-            );
-            this.webex.meetings.destroy(meeting, MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
-            throw err;
-          });
+          // Locus sometimes returns 403, for example if meeting has ended, no point trying the fallback to full sync in that case
+          if (e.statusCode !== 403) {
+            return meeting.meetingRequest.getLocusDTO({url: meeting.locusUrl}).catch((err) => {
+              LoggerProxy.logger.info(
+                'Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting'
+              );
+              this.webex.meetings.destroy(meeting, MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
+              meetingDestroyed = true;
+              throw err;
+            });
+          }
+          LoggerProxy.logger.info(
+            'Locus-info:index#doLocusSync --> got 403 from Locus, skipping fallback to full sync, destroying the meeting'
+          );
+        } else {
+          LoggerProxy.logger.info(
+            'Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting'
+          );
         }
-        LoggerProxy.logger.info(
-          'Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting'
-        );
         this.webex.meetings.destroy(meeting, MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
+        meetingDestroyed = true;
         throw e;
       })
       .then((res) => {
-        if (isDelta) {
-          if (!isEmpty(res.body)) {
-            meeting.locusInfo.handleLocusDelta(res.body, meeting);
-          } else {
+        if (isEmpty(res.body)) {
+          if (isDelta) {
             LoggerProxy.logger.info(
               'Locus-info:index#doLocusSync --> received empty body from syncUrl, so we already have latest Locus DTO'
             );
+          } else {
+            LoggerProxy.logger.info(
+              'Locus-info:index#doLocusSync --> received empty body from full DTO sync request'
+            );
           }
-        } else {
-          meeting.locusInfo.onFullLocus(res.body);
+
+          return;
+        }
+
+        if (isDelta) {
+          if (res.body.baseSequence) {
+            meeting.locusInfo.handleLocusDelta(res.body, meeting);
+
+            return;
+          }
+          // in some cases Locus might return us full DTO even when we asked for a delta
+          LoggerProxy.logger.info(
+            'Locus-info:index#doLocusSync --> got full DTO when we asked for delta'
+          );
         }
+        meeting.locusInfo.onFullLocus(res.body);
       })
       .catch((e) => {
         LoggerProxy.logger.info(
@@ -176,9 +200,11 @@ export default class LocusInfo extends EventsScope {
         });
       })
       .finally(() => {
-        // Notify parser to resume processing delta events.
-        // Any deltas in the queue that have now been superseded by this sync will simply be ignored
-        this.locusParser.resume();
+        if (!meetingDestroyed) {
+          // Notify parser to resume processing delta events.
+          // Any deltas in the queue that have now been superseded by this sync will simply be ignored
+          this.locusParser.resume();
+        }
       });
   }
 
@@ -257,17 +283,6 @@ export default class LocusInfo extends EventsScope {
      * @property {Object} person - Contains person data.
      */
 
-    /**
-     * Stored participant changes between the last event and the current event.
-     * All previously stored events are overwritten between events.
-     *
-     * @instance
-     * @type {Array<DeltaParticipant>}
-     * @private
-     * @member LocusInfo
-     */
-    this.deltaParticipants = [];
-
     this.updateLocusCache(locus);
     // above section only updates the locusInfo object
     // The below section makes sure it updates the locusInfo as well as updates the meeting object
@@ -373,7 +388,6 @@ export default class LocusInfo extends EventsScope {
       return;
     }
 
-    this.updateParticipantDeltas(locus.participants);
     this.scheduledMeeting = locus.meeting || null;
     this.participants = locus.participants;
     const isReplaceMembers = ControlsUtils.isNeedReplaceMembers(this.controls, locus.controls);
@@ -462,12 +476,12 @@ export default class LocusInfo extends EventsScope {
     this.updateCreated(locus.created);
     this.updateFullState(locus.fullState);
     this.updateHostInfo(locus.host);
+    this.updateLocusUrl(locus.url);
     this.updateMeetingInfo(locus.info, locus.self);
     this.updateMediaShares(locus.mediaShares);
     this.updateParticipantsUrl(locus.participantsUrl);
     this.updateReplace(locus.replace);
     this.updateSelf(locus.self);
-    this.updateLocusUrl(locus.url);
     this.updateAclUrl(locus.aclUrl);
     this.updateBasequence(locus.baseSequence);
     this.updateSequence(locus.sequence);
@@ -728,55 +742,6 @@ export default class LocusInfo extends EventsScope {
     }
   }
 
-  /**
-   * Update the deltaParticipants property of this object based on a list of
-   * provided participants.
-   *
-   * @param {Array} [participants] - The participants to update against.
-   * @returns {void}
-   */
-  updateParticipantDeltas(participants: Array<any> = []) {
-    // Used to find a participant within a participants collection.
-    const findParticipant = (participant, collection) =>
-      collection.find((item) => item.person.id === participant.person.id);
-
-    // Generates an object that indicates which state properties have changed.
-    const generateDelta = (prevState: any = {}, newState: any = {}) => {
-      // Setup deltas.
-      const deltas = {
-        audioStatus: prevState.audioStatus !== newState.audioStatus,
-        videoSlidesStatus: prevState.videoSlidesStatus !== newState.videoSlidesStatus,
-        videoStatus: prevState.videoStatus !== newState.videoStatus,
-      };
-
-      // Clean the object
-      Object.keys(deltas).forEach((key) => {
-        if (deltas[key] !== true) {
-          delete deltas[key];
-        }
-      });
-
-      return deltas;
-    };
-
-    this.deltaParticipants = participants.reduce((collection, participant) => {
-      const existingParticipant = findParticipant(participant, this.participants || []) || {};
-
-      const delta = generateDelta(existingParticipant.status, participant.status);
-
-      const changed = Object.keys(delta).length > 0;
-
-      if (changed) {
-        collection.push({
-          person: participant.person,
-          delta,
-        });
-      }
-
-      return collection;
-    }, []);
-  }
-
   /**
    * update meeting's members
    * @param {Object} participants new participants object

package/src/media/index.ts

@@ -239,8 +239,8 @@ Media.createMediaConnection = (
         screenShareAudio: shareAudioStream?.outputStream?.getTracks()[0], // TODO: add type for screenShareAudio in internal-media-core SPARK-446923
       } as unknown,
       direction: {
-        audio: Media.getDirection(true, mediaDirection.receiveAudio, mediaDirection.sendAudio),
-        video: Media.getDirection(true, mediaDirection.receiveVideo, mediaDirection.sendVideo),
+        audio: Media.getDirection(false, mediaDirection.receiveAudio, mediaDirection.sendAudio),
+        video: Media.getDirection(false, mediaDirection.receiveVideo, mediaDirection.sendVideo),
         screenShareVideo: Media.getDirection(
           false,
           mediaDirection.receiveShare,

package/src/meeting/brbState.ts

@@ -58,7 +58,13 @@ export class BrbState {
   public enable(enabled: boolean, sendSlotManager: SendSlotManager) {
     this.state.client.enabled = enabled;
 
-    return this.applyClientStateToServer(sendSlotManager);
+    // Don't set the source state override if enabling brb fails
+    return this.applyClientStateToServer(sendSlotManager).then(() => {
+      sendSlotManager.setSourceStateOverride(
+        MediaType.VideoMain,
+        this.state.client.enabled ? 'away' : null
+      );
+    });
   }
 
   /**
@@ -92,7 +98,7 @@ export class BrbState {
 
     this.state.syncToServerInProgress = true;
 
-    return this.sendLocalBrbStateToServer(sendSlotManager)
+    return this.sendLocalBrbStateToServer()
       .then(() => {
         this.state.syncToServerInProgress = false;
 
@@ -120,10 +126,9 @@ export class BrbState {
   /**
    * Send the local brb state to the server
    *
-   * @param {SendSlotManager} sendSlotManager
    * @returns {Promise}
    */
-  private async sendLocalBrbStateToServer(sendSlotManager: SendSlotManager) {
+  private async sendLocalBrbStateToServer() {
     const {enabled} = this.state.client;
 
     if (!this.meeting.isMultistream) {
@@ -153,9 +158,6 @@ export class BrbState {
         deviceUrl: this.meeting.deviceUrl,
         selfId: this.meeting.selfId,
       })
-      .then(() => {
-        sendSlotManager.setSourceStateOverride(MediaType.VideoMain, enabled ? 'away' : null);
-      })
       .catch((error) => {
         LoggerProxy.logger.error('Meeting:brbState#sendLocalBrbStateToServer: Error ', error);
 

package/src/meeting/in-meeting-actions.ts

@@ -38,6 +38,10 @@ interface IInMeetingActions {
   isClosedCaptionActive?: boolean;
   canStartManualCaption?: boolean;
   canStopManualCaption?: boolean;
+  isLocalRecordingStarted?: boolean;
+  isLocalRecordingStopped?: boolean;
+  isLocalRecordingPaused?: boolean;
+
   isManualCaptionActive?: boolean;
   isSaveTranscriptsEnabled?: boolean;
   isWebexAssistantActive?: boolean;
@@ -173,6 +177,12 @@ export default class InMeetingActions implements IInMeetingActions {
 
   canStopManualCaption = null;
 
+  isLocalRecordingStopped = null;
+
+  isLocalRecordingStarted = null;
+
+  isLocalRecordingPaused = null;
+
   isManualCaptionActive = null;
 
   isSaveTranscriptsEnabled = null;
@@ -347,6 +357,9 @@ export default class InMeetingActions implements IInMeetingActions {
     canStopTranscribing: this.canStopTranscribing,
     isClosedCaptionActive: this.isClosedCaptionActive,
     canStartManualCaption: this.canStartManualCaption,
+    isLocalRecordingStarted: this.isLocalRecordingStarted,
+    isLocalRecordingStopped: this.isLocalRecordingStopped,
+    isLocalRecordingPaused: this.isLocalRecordingPaused,
     canStopManualCaption: this.canStopManualCaption,
     isManualCaptionActive: this.isManualCaptionActive,
     isSaveTranscriptsEnabled: this.isSaveTranscriptsEnabled,