@webex/plugin-meetings 3.0.0-beta.170 → 3.0.0-beta.172

package/src/meeting/index.ts

@@ -19,6 +19,7 @@ import {
   LocalTrack,
   LocalCameraTrack,
   LocalDisplayTrack,
+  LocalSystemAudioTrack,
   LocalMicrophoneTrack,
   LocalTrackEvents,
   TrackMuteEvent,
@@ -145,7 +146,7 @@ export type LocalTracks = {
   microphone?: LocalMicrophoneTrack;
   camera?: LocalCameraTrack;
   screenShare?: {
-    audio?: LocalTrack; // todo: for now screen share audio is not supported (will be done in SPARK-399690)
+    audio?: LocalSystemAudioTrack;
     video?: LocalDisplayTrack;
   };
   annotationInfo?: AnnotationInfo;
@@ -167,6 +168,12 @@ export const MEDIA_UPDATE_TYPE = {
   UPDATE_MEDIA: 'UPDATE_MEDIA',
 };
 
+export enum ScreenShareFloorStatus {
+  PENDING = 'floor_request_pending',
+  GRANTED = 'floor_request_granted',
+  RELEASED = 'floor_released',
+}
+
 /**
  * MediaDirection
  * @typedef {Object} MediaDirection
@@ -484,7 +491,6 @@ export default class Meeting extends StatelessWebexPlugin {
   inMeetingActions: InMeetingActions;
   isLocalShareLive: boolean;
   isRoapInProgress: boolean;
-  isSharing: boolean;
   keepAliveTimerId: NodeJS.Timeout;
   lastVideoLayoutInfo: any;
   locusInfo: any;
@@ -511,6 +517,7 @@ export default class Meeting extends StatelessWebexPlugin {
   receiveSlotManager: ReceiveSlotManager;
   selfUserPolicies: any;
   shareStatus: string;
+  screenShareFloorState: ScreenShareFloorStatus;
   statsAnalyzer: StatsAnalyzer;
   transcription: Transcription;
   updateMediaConnections: (mediaConnections: any[]) => void;
@@ -964,24 +971,20 @@ export default class Meeting extends StatelessWebexPlugin {
      */
     this.inMeetingActions = new InMeetingActions();
     /**
-     * This is deprecated, please use shareStatus instead.
      * @instance
-     * @type {Boolean}
+     * @type {string}
      * @readonly
      * @public
      * @memberof Meeting
-     * @deprecated after v1.118.13
      */
-    this.isSharing = false;
+    this.shareStatus = SHARE_STATUS.NO_SHARE;
     /**
      * @instance
-     * @type {string}
-     * @readonly
-     * @public
-     * @memberof Meeting
+     * @type {ScreenShareFloorStatus}
+     * @private
+     * @memberof
      */
-    this.shareStatus = SHARE_STATUS.NO_SHARE;
-
+    this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
     /**
      * @instance
      * @type {Array}
@@ -2224,7 +2227,10 @@ export default class Meeting extends StatelessWebexPlugin {
                 this.mediaProperties.mediaDirection?.sendShare &&
                 oldShareStatus === SHARE_STATUS.LOCAL_SHARE_ACTIVE
               ) {
-                await this.unpublishTracks([this.mediaProperties.shareTrack]); // todo screen share audio (SPARK-399690)
+                await this.unpublishTracks([
+                  this.mediaProperties.shareVideoTrack,
+                  this.mediaProperties.shareAudioTrack,
+                ]);
               }
             } finally {
               sendStartedSharingRemote();
@@ -2902,8 +2908,11 @@ export default class Meeting extends StatelessWebexPlugin {
 
       // TODO: Handle sharing and wireless sharing when meeting end
       if (this.wirelessShare) {
-        if (this.mediaProperties.shareTrack) {
-          await this.setLocalShareTrack(undefined);
+        if (this.mediaProperties.shareVideoTrack) {
+          await this.setLocalShareVideoTrack(undefined);
+        }
+        if (this.mediaProperties.shareAudioTrack) {
+          await this.setLocalShareAudioTrack(undefined);
         }
       }
       // when multiple WEB deviceType join with same user
@@ -3359,34 +3368,62 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * Stores the reference to a new screen share track, sets up the required event listeners
+   * Stores the reference to a new screen share video track, sets up the required event listeners
    * on it, cleans up previous track, etc.
-   * It also sends the floor grant/release request.
    *
    * @param {LocalDisplayTrack | undefined} localDisplayTrack local camera track
    * @returns {Promise<void>}
    */
-  private async setLocalShareTrack(localDisplayTrack?: LocalDisplayTrack) {
-    const oldTrack = this.mediaProperties.shareTrack;
+  private async setLocalShareVideoTrack(localDisplayTrack?: LocalDisplayTrack) {
+    const oldTrack = this.mediaProperties.shareVideoTrack;
 
-    oldTrack?.off(LocalTrackEvents.Ended, this.handleShareTrackEnded);
+    oldTrack?.off(LocalTrackEvents.Ended, this.handleShareVideoTrackEnded);
     oldTrack?.off(LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
 
-    this.mediaProperties.setLocalShareTrack(localDisplayTrack);
+    this.mediaProperties.setLocalShareVideoTrack(localDisplayTrack);
 
-    localDisplayTrack?.on(LocalTrackEvents.Ended, this.handleShareTrackEnded);
+    localDisplayTrack?.on(LocalTrackEvents.Ended, this.handleShareVideoTrackEnded);
     localDisplayTrack?.on(
       LocalTrackEvents.UnderlyingTrackChange,
       this.underlyingLocalTrackChangeHandler
     );
 
-    this.mediaProperties.mediaDirection.sendShare = !!localDisplayTrack;
+    this.mediaProperties.mediaDirection.sendShare = this.mediaProperties.hasLocalShareTrack();
 
     if (!this.isMultistream || !localDisplayTrack) {
       // for multistream WCME automatically un-publishes the old track when we publish a new one
       await this.unpublishTrack(oldTrack);
     }
-    await this.publishTrack(this.mediaProperties.shareTrack);
+    await this.publishTrack(this.mediaProperties.shareVideoTrack);
+  }
+
+  /**
+   * Stores the reference to a new screen share audio track, sets up the required event listeners
+   * on it, cleans up previous track, etc.
+   *
+   * @param {LocalSystemAudioTrack | undefined} localSystemAudioTrack local system audio track
+   * @returns {Promise<void>}
+   */
+  private async setLocalShareAudioTrack(localSystemAudioTrack?: LocalSystemAudioTrack) {
+    const oldTrack = this.mediaProperties.shareAudioTrack;
+
+    oldTrack?.off(LocalTrackEvents.Ended, this.handleShareAudioTrackEnded);
+    oldTrack?.off(LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+
+    this.mediaProperties.setLocalShareAudioTrack(localSystemAudioTrack);
+
+    localSystemAudioTrack?.on(LocalTrackEvents.Ended, this.handleShareAudioTrackEnded);
+    localSystemAudioTrack?.on(
+      LocalTrackEvents.UnderlyingTrackChange,
+      this.underlyingLocalTrackChangeHandler
+    );
+
+    this.mediaProperties.mediaDirection.sendShare = this.mediaProperties.hasLocalShareTrack();
+
+    if (!this.isMultistream || !localSystemAudioTrack) {
+      await this.unpublishTrack(oldTrack);
+    }
+    await this.publishTrack(this.mediaProperties.shareAudioTrack);
   }
 
   /**
@@ -3397,7 +3434,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {void}
    */
   public cleanupLocalTracks() {
-    const {audioTrack, videoTrack, shareTrack} = this.mediaProperties;
+    const {audioTrack, videoTrack, shareVideoTrack, shareAudioTrack} = this.mediaProperties;
 
     audioTrack?.off(LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
     audioTrack?.off(LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
@@ -3405,12 +3442,22 @@ export default class Meeting extends StatelessWebexPlugin {
     videoTrack?.off(LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
     videoTrack?.off(LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
 
-    shareTrack?.off(LocalTrackEvents.Ended, this.handleShareTrackEnded);
-    shareTrack?.off(LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+    shareVideoTrack?.off(LocalTrackEvents.Ended, this.handleShareVideoTrackEnded);
+    shareVideoTrack?.off(
+      LocalTrackEvents.UnderlyingTrackChange,
+      this.underlyingLocalTrackChangeHandler
+    );
+
+    shareAudioTrack?.off(LocalTrackEvents.Ended, this.handleShareAudioTrackEnded);
+    shareAudioTrack?.off(
+      LocalTrackEvents.UnderlyingTrackChange,
+      this.underlyingLocalTrackChangeHandler
+    );
 
     this.mediaProperties.setLocalAudioTrack(undefined);
     this.mediaProperties.setLocalVideoTrack(undefined);
-    this.mediaProperties.setLocalShareTrack(undefined);
+    this.mediaProperties.setLocalShareVideoTrack(undefined);
+    this.mediaProperties.setLocalShareAudioTrack(undefined);
 
     this.mediaProperties.mediaDirection.sendAudio = false;
     this.mediaProperties.mediaDirection.sendVideo = false;
@@ -3420,7 +3467,8 @@ export default class Meeting extends StatelessWebexPlugin {
     // (we have to do it for transcoded meetings anyway, so we might as well do for multistream too)
     audioTrack?.setPublished(false);
     videoTrack?.setPublished(false);
-    shareTrack?.setPublished(false);
+    shareVideoTrack?.setPublished(false);
+    shareAudioTrack?.setPublished(false);
   }
 
   /**
@@ -3522,6 +3570,18 @@ export default class Meeting extends StatelessWebexPlugin {
     this.correlationId = id;
   }
 
+  /**
+   * Enqueue request for screenshare floor and set the status to pending
+   * @returns {Promise}
+   * @private
+   * @memberof Meeting
+   */
+  private enqueueScreenShareFloorRequest() {
+    this.screenShareFloorState = ScreenShareFloorStatus.PENDING;
+
+    return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
+  }
+
   /**
    * Mute the audio for a meeting
    * @returns {Promise} resolves the data from muting audio {mute, self} or rejects if there is no audio set
@@ -4501,7 +4561,7 @@ export default class Meeting extends StatelessWebexPlugin {
       // Clean up the camera , microphone track and re initiate it
 
       try {
-        if (this.isSharing) {
+        if (this.screenShareFloorState === ScreenShareFloorStatus.GRANTED) {
           await this.releaseScreenShareFloor();
         }
         const mediaSettings = {
@@ -5106,8 +5166,11 @@ export default class Meeting extends StatelessWebexPlugin {
     if (this.mediaProperties.videoTrack) {
       await this.publishTrack(this.mediaProperties.videoTrack);
     }
-    if (this.mediaProperties.shareTrack) {
-      await this.publishTrack(this.mediaProperties.shareTrack);
+    if (this.mediaProperties.shareVideoTrack) {
+      await this.publishTrack(this.mediaProperties.shareVideoTrack);
+    }
+    if (this.isMultistream && this.mediaProperties.shareAudioTrack) {
+      await this.publishTrack(this.mediaProperties.shareAudioTrack);
     }
 
     return mc;
@@ -5243,7 +5306,10 @@ export default class Meeting extends StatelessWebexPlugin {
       promises.push(this.setLocalVideoTrack(localTracks.camera));
     }
     if (localTracks?.screenShare?.video) {
-      promises.push(this.setLocalShareTrack(localTracks.screenShare.video));
+      promises.push(this.setLocalShareVideoTrack(localTracks.screenShare.video));
+    }
+    if (this.isMultistream && localTracks?.screenShare?.audio) {
+      promises.push(this.setLocalShareAudioTrack(localTracks.screenShare.audio));
     }
 
     return Promise.all(promises)
@@ -5373,9 +5439,11 @@ export default class Meeting extends StatelessWebexPlugin {
         })
       )
       .then(() => {
-        if (localTracks?.screenShare?.video) {
-          this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
+        if (this.mediaProperties.hasLocalShareTrack()) {
+          return this.enqueueScreenShareFloorRequest();
         }
+
+        return Promise.resolve();
       })
       .then(() => this.mediaProperties.getCurrentConnectionType())
       .then((connectionType) => {
@@ -5821,7 +5889,7 @@ export default class Meeting extends StatelessWebexPlugin {
       return this.meetingRequest
         .changeMeetingFloor(body)
         .then(() => {
-          this.isSharing = false;
+          this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
 
           return Promise.resolve();
         })
@@ -5902,16 +5970,23 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   private requestScreenShareFloor() {
-    if (!this.mediaProperties.shareTrack || !this.mediaProperties.mediaDirection.sendShare) {
+    if (
+      !this.mediaProperties.hasLocalShareTrack() ||
+      !this.mediaProperties.mediaDirection.sendShare
+    ) {
       LoggerProxy.logger.log(
-        `Meeting:index#requestScreenShareFloor --> NOT requesting floor, because we don't have the share track anymore (shareTrack=${
-          this.mediaProperties.shareTrack ? 'yes' : 'no'
-        }, sendShare=${this.mediaProperties.mediaDirection.sendShare})`
+        `Meeting:index#requestScreenShareFloor --> NOT requesting floor, because we don't have the share track anymore (shareVideoTrack=${
+          this.mediaProperties.shareVideoTrack ? 'yes' : 'no'
+        }, shareAudioTrack=${this.mediaProperties.shareAudioTrack ? 'yes' : 'no'}, sendShare=${
+          this.mediaProperties.mediaDirection.sendShare
+        })`
       );
+      this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
 
       return Promise.resolve({});
     }
     if (this.state === MEETING_STATE.STATES.JOINED) {
+      this.screenShareFloorState = ScreenShareFloorStatus.PENDING;
       const content = this.locusInfo.mediaShares.find((element) => element.name === CONTENT);
 
       if (content && this.shareStatus !== SHARE_STATUS.LOCAL_SHARE_ACTIVE) {
@@ -5934,7 +6009,7 @@ export default class Meeting extends StatelessWebexPlugin {
             annotationInfo: this.annotationInfo,
           })
           .then(() => {
-            this.isSharing = true;
+            this.screenShareFloorState = ScreenShareFloorStatus.GRANTED;
 
             return Promise.resolve();
           })
@@ -5948,11 +6023,18 @@ export default class Meeting extends StatelessWebexPlugin {
               stack: error.stack,
             });
 
+            this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
+
             return Promise.reject(error);
           });
       }
+      if (!content) {
+        this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
+
+        return Promise.reject(new ParameterError('Cannot share without content.'));
+      }
 
-      return Promise.reject(new ParameterError('Cannot share without content.'));
+      return Promise.resolve();
     }
     this.floorGrantPending = true;
 
@@ -5982,6 +6064,10 @@ export default class Meeting extends StatelessWebexPlugin {
   private releaseScreenShareFloor() {
     const content = this.locusInfo.mediaShares.find((element) => element.name === CONTENT);
 
+    if (this.screenShareFloorState === ScreenShareFloorStatus.RELEASED) {
+      return Promise.resolve();
+    }
+    this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
     if (content) {
       // @ts-ignore
       this.webex.internal.newMetrics.submitClientEvent({
@@ -5994,8 +6080,6 @@ export default class Meeting extends StatelessWebexPlugin {
 
       if (content.floor?.beneficiary.id !== this.selfId) {
         // remote participant started sharing and caused our sharing to stop, we don't want to send any floor action request in that case
-        this.isSharing = false;
-
         return Promise.resolve();
       }
 
@@ -6018,15 +6102,10 @@ export default class Meeting extends StatelessWebexPlugin {
           });
 
           return Promise.reject(error);
-        })
-        .finally(() => {
-          this.isSharing = false;
         });
     }
 
     // according to Locus there is no content, so we don't need to release the floor (it's probably already been released)
-    this.isSharing = false;
-
     return Promise.resolve();
   }
 
@@ -6330,37 +6409,75 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * Functionality for when a share is ended.
+   * Functionality for when a share audio is ended.
    * @private
    * @memberof Meeting
-   * @param {MediaStream} localShare
    * @returns {undefined}
    */
-  private handleShareTrackEnded = async () => {
-    if (this.wirelessShare) {
+  private handleShareAudioTrackEnded = async () => {
+    // current share audio track has ended, but there might be an active
+    // share video track. we only leave from wireless share if share has
+    // completely ended, which means no share audio or video tracks active
+    if (this.wirelessShare && !this.mediaProperties.shareVideoTrack) {
       this.leave({reason: MEETING_REMOVED_REASON.USER_ENDED_SHARE_STREAMS});
     } else {
       try {
-        await this.unpublishTracks([this.mediaProperties.shareTrack]); // todo: screen share audio (SPARK-399690)
+        await this.unpublishTracks([this.mediaProperties.shareAudioTrack]);
       } catch (error) {
         LoggerProxy.logger.log(
-          'Meeting:index#handleShareTrackEnded --> Error stopping share: ',
+          'Meeting:index#handleShareAudioTrackEnded --> Error stopping share: ',
           error
         );
       }
     }
+    this.triggerStoppedSharing();
+  };
 
-    Trigger.trigger(
-      this,
-      {
-        file: 'meeting/index',
-        function: 'handleShareTrackEnded',
-      },
-      EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL,
-      {
-        reason: SHARE_STOPPED_REASON.TRACK_ENDED,
+  /**
+   * Functionality for when a share video is ended.
+   * @private
+   * @memberof Meeting
+   * @returns {undefined}
+   */
+  private handleShareVideoTrackEnded = async () => {
+    // current share video track has ended, but there might be an active
+    // share audio track. we only leave from wireless share if share has
+    // completely ended, which means no share audio or video tracks active
+    if (this.wirelessShare && !this.mediaProperties.shareAudioTrack) {
+      this.leave({reason: MEETING_REMOVED_REASON.USER_ENDED_SHARE_STREAMS});
+    } else {
+      try {
+        await this.unpublishTracks([this.mediaProperties.shareVideoTrack]);
+      } catch (error) {
+        LoggerProxy.logger.log(
+          'Meeting:index#handleShareVideoTrackEnded --> Error stopping share: ',
+          error
+        );
       }
-    );
+    }
+    this.triggerStoppedSharing();
+  };
+
+  /**
+   * Emits meeting:stoppedSharingLocal
+   * @private
+   * @returns {undefined}
+   * @memberof Meeting
+   */
+  private triggerStoppedSharing = () => {
+    if (!this.mediaProperties.hasLocalShareTrack()) {
+      Trigger.trigger(
+        this,
+        {
+          file: 'meeting/index',
+          function: 'handleShareTrackEnded',
+        },
+        EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL,
+        {
+          reason: SHARE_STOPPED_REASON.TRACK_ENDED,
+        }
+      );
+    }
   };
 
   /**
@@ -6499,7 +6616,7 @@ export default class Meeting extends StatelessWebexPlugin {
   clearMeetingData = () => {
     this.audio = null;
     this.video = null;
-    this.isSharing = false;
+    this.screenShareFloorState = ScreenShareFloorStatus.RELEASED;
     if (this.shareStatus === SHARE_STATUS.LOCAL_SHARE_ACTIVE) {
       this.shareStatus = SHARE_STATUS.NO_SHARE;
     }
@@ -6683,7 +6800,7 @@ export default class Meeting extends StatelessWebexPlugin {
         localTracks: {
           audio: this.mediaProperties.audioTrack?.underlyingTrack || null,
           video: this.mediaProperties.videoTrack?.underlyingTrack || null,
-          screenShareVideo: this.mediaProperties.shareTrack?.underlyingTrack || null,
+          screenShareVideo: this.mediaProperties.shareVideoTrack?.underlyingTrack || null,
         },
         direction: {
           audio: Media.getDirection(
@@ -6783,9 +6900,15 @@ export default class Meeting extends StatelessWebexPlugin {
     let floorRequestNeeded = false;
 
     if (tracks.screenShare?.video) {
-      await this.setLocalShareTrack(tracks.screenShare?.video);
+      await this.setLocalShareVideoTrack(tracks.screenShare?.video);
 
-      floorRequestNeeded = true;
+      floorRequestNeeded = this.screenShareFloorState === ScreenShareFloorStatus.RELEASED;
+    }
+
+    if (this.isMultistream && tracks.screenShare?.audio) {
+      await this.setLocalShareAudioTrack(tracks.screenShare.audio);
+
+      floorRequestNeeded = this.screenShareFloorState === ScreenShareFloorStatus.RELEASED;
     }
 
     if (tracks.microphone) {
@@ -6804,7 +6927,7 @@ export default class Meeting extends StatelessWebexPlugin {
       // we're sending the http request to Locus to request the screen share floor
       // only after the SDP update, because that's how it's always been done for transcoded meetings
       // and also if sharing from the start, we need confluence to have been created
-      await this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
+      await this.enqueueScreenShareFloorRequest();
     }
   }
 
@@ -6820,13 +6943,12 @@ export default class Meeting extends StatelessWebexPlugin {
     const promises = [];
 
     for (const track of tracks.filter((t) => !!t)) {
-      if (track === this.mediaProperties.shareTrack) {
-        try {
-          this.releaseScreenShareFloor(); // we ignore the returned promise here on purpose
-        } catch (e) {
-          // nothing to do here, error is logged already inside releaseScreenShareFloor()
-        }
-        promises.push(this.setLocalShareTrack(undefined));
+      if (track === this.mediaProperties.shareVideoTrack) {
+        promises.push(this.setLocalShareVideoTrack(undefined));
+      }
+
+      if (track === this.mediaProperties.shareAudioTrack) {
+        promises.push(this.setLocalShareAudioTrack(undefined));
       }
 
       if (track === this.mediaProperties.audioTrack) {
@@ -6843,5 +6965,16 @@ export default class Meeting extends StatelessWebexPlugin {
     }
 
     await Promise.all(promises);
+
+    // we're allowing for the SDK to support just audio share as well
+    // so a share could be active with only video, only audio, or both
+    // we're only releasing the floor if both tracks have ended
+    if (!this.mediaProperties.hasLocalShareTrack()) {
+      try {
+        this.releaseScreenShareFloor(); // we ignore the returned promise here on purpose
+      } catch (e) {
+        // nothing to do here, error is logged already inside releaseScreenShareFloor()
+      }
+    }
   }
 }

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, ParticipantWithRoles} from './types';
+import {IExternalRoles, IMediaStatus, ParticipantWithRoles} from './types';
 
 import MemberUtil from './util';
 
@@ -30,6 +30,7 @@ export default class Member {
   isUser: any;
   isVideoMuted: any;
   roles: IExternalRoles;
+  mediaStatus: IMediaStatus;
   name: any;
   participant: any;
   status: any;
@@ -247,6 +248,19 @@ export default class Member {
      * @memberof Member
      */
     this.roles = null;
+
+    /**
+     * @instance
+     * @type {IMediaStatus}
+     * @public
+     * @memberof Member
+     * @example {audio: MediaStatus.RECVONLY, video: MediaStatus.SENDRECV}
+     */
+    this.mediaStatus = {
+      audio: null,
+      video: null,
+    };
+
     // TODO: more participant types
     // such as native client, web client, is a device, what type of phone, etc
     this.processParticipant(participant);
@@ -325,6 +339,8 @@ export default class Member {
       this.isAudioMuted,
       this.type
     );
+
+    this.mediaStatus = MemberUtil.extractMediaStatus(this.participant);
   }
 
   /**

package/src/member/types.ts

@@ -22,3 +22,17 @@ export type ParticipantWithRoles = {
     };
   };
 };
+
+// values are inherited from locus so don't update these
+export enum MediaStatus {
+  RECVONLY = 'RECVONLY', // participant only receiving and not sending
+  SENDONLY = 'SENDONLY', // participant only sending and not receiving
+  SENDRECV = 'SENDRECV', // participant both sending and receiving
+  INACTIVE = 'INACTIVE', // participant is not connected to media source
+  UNKNOWN = 'UNKNOWN', // participant has not added media in the meeting
+}
+
+export interface IMediaStatus {
+  audio: MediaStatus;
+  video: MediaStatus;
+}

package/src/member/util.ts

@@ -1,4 +1,10 @@
-import {IExternalRoles, ParticipantWithRoles, ServerRoles, ServerRoleShape} from './types';
+import {
+  IExternalRoles,
+  ParticipantWithRoles,
+  ServerRoles,
+  ServerRoleShape,
+  IMediaStatus,
+} from './types';
 import {
   _USER_,
   _RESOURCE_ROOM_,
@@ -347,6 +353,22 @@ MemberUtil.extractId = (participant: any) => {
   return null;
 };
 
+/**
+ * extracts the media status from nested participant object
+ * @param {Object} participant the locus participant
+ * @returns {Object}
+ */
+MemberUtil.extractMediaStatus = (participant: any): IMediaStatus => {
+  if (!participant) {
+    throw new ParameterError('Media status could not be extracted, participant is undefined.');
+  }
+
+  return {
+    audio: participant.status.audioStatus,
+    video: participant.status.videoStatus,
+  };
+};
+
 /**
  * @param {Object} participant the locus participant
  * @returns {String}

package/src/reconnection-manager/index.ts

@@ -239,7 +239,10 @@ export default class ReconnectionManager {
    * @memberof ReconnectionManager
    */
   private async stopLocalShareTrack(reason: string) {
-    await this.meeting.unpublishTracks([this.meeting.mediaProperties.shareTrack]); // todo screen share audio SPARK-399690
+    await this.meeting.unpublishTracks([
+      this.meeting.mediaProperties.shareVideoTrack,
+      this.meeting.mediaProperties.shareAudioTrack,
+    ]);
     Trigger.trigger(
       this.meeting,
       {