@webex/plugin-meetings 3.0.0-beta.0 → 3.0.0-beta.10

package/src/meeting/{index.js → index.ts}

@@ -1,11 +1,12 @@
 import uuid from 'uuid';
-import {cloneDeep, isEqual, pick, isString} from 'lodash';
+import {cloneDeep, isEqual, pick, isString, defer} from 'lodash';
+// @ts-ignore - Fix this
 import {StatelessWebexPlugin} from '@webex/webex-core';
-import {Media as WebRTCMedia} from '@webex/internal-media-core';
+import {Media as WebRTCMedia, MediaConnection as MC} from '@webex/internal-media-core';
 
 import {
   MeetingNotActiveError, createMeetingsError, UserInLobbyError,
-  NoMediaEstablishedYetError, UserNotJoinedError, InvalidSdpError
+  NoMediaEstablishedYetError, UserNotJoinedError
 } from '../common/errors/webex-errors';
 import {StatsAnalyzer, EVENTS as StatsAnalyzerEvents} from '../statsAnalyzer';
 import NetworkQualityMonitor from '../networkQualityMonitor';
@@ -18,9 +19,8 @@ import MeetingStateMachine from '../meeting/state';
 import createMuteState from '../meeting/muteState';
 import createEffectsState from '../meeting/effectsState';
 import LocusInfo from '../locus-info';
-import PeerConnectionManager from '../peer-connection-manager';
 import Metrics from '../metrics';
-import {trigger, mediaType, eventType} from '../metrics/config';
+import {trigger, mediaType, error as MetricsError, eventType} from '../metrics/config';
 import ReconnectionManager from '../reconnection-manager';
 import MeetingRequest from '../meeting/request';
 import Members from '../members/index';
@@ -36,7 +36,6 @@ import {
   _INCOMING_,
   _JOIN_,
   AUDIO,
-  CONNECTION_STATE,
   CONTENT,
   ENDED,
   EVENT_TRIGGERS,
@@ -45,7 +44,6 @@ import {
   FLOOR_ACTION,
   FULL_STATE,
   LAYOUT_TYPES,
-  LIVE,
   LOCUSINFO,
   MEETING_INFO_FAILURE_REASON,
   MEETING_REMOVED_REASON,
@@ -58,13 +56,9 @@ import {
   ONLINE,
   OFFLINE,
   PASSWORD_STATUS,
-  PC_BAIL_TIMEOUT,
   PSTN_STATUS,
   QUALITY_LEVELS,
   RECORDING_STATE,
-  ROAP_SEQ_PRE,
-  SDP,
-  SENDRECV,
   SHARE_STATUS,
   SHARE_STOPPED_REASON,
   VIDEO_RESOLUTIONS,
@@ -77,14 +71,17 @@ import ParameterError from '../common/errors/parameter';
 import MediaError from '../common/errors/media';
 import {MeetingInfoV2PasswordError, MeetingInfoV2CaptchaError} from '../meeting-info/meeting-info-v2';
 import BrowserDetection from '../common/browser-detection';
-import RoapCollection from '../roap/collection';
+import {ReceiveSlotManager} from '../multistream/receiveSlotManager';
+import {MediaRequestManager} from '../multistream/mediaRequestManager';
+import {RemoteMediaManager, Event as RemoteMediaManagerEvent} from '../multistream/remoteMediaManager';
+import {MultistreamMedia} from '../multistream/multistreamMedia';
 
 import InMeetingActions from './in-meeting-actions';
 
 
 const {isBrowser} = BrowserDetection();
 
-const logRequest = (request, {header = '', success = '', failure = ''}) => {
+const logRequest = (request: any, { header = '', success = '', failure = '' }) => {
   LoggerProxy.logger.info(header);
 
   return request
@@ -145,6 +142,7 @@ export const MEDIA_UPDATE_TYPE = {
  * @property {String} [meetingQuality.local]
  * @property {String} [meetingQuality.remote]
  * @property {Boolean} [rejoin]
+ * @property {Boolean} [enableMultistream]
  */
 
 /**
@@ -394,6 +392,92 @@ export const MEDIA_UPDATE_TYPE = {
  * @class Meeting
  */
 export default class Meeting extends StatelessWebexPlugin {
+  attrs: any;
+  audio: any;
+  conversationUrl: string;
+  correlationId: string;
+  destination: string;
+  destinationType: string;
+  deviceUrl: string;
+  effects: any;
+  hostId: string;
+  id: string;
+  isMultistream: boolean;
+  locusUrl: string;
+  mediaConnections: any[];
+  mediaId?: string;
+  meetingFiniteStateMachine: any;
+  meetingInfo: object;
+  meetingRequest: any;
+  members: Members;
+  options: object;
+  orgId: string;
+  owner: string;
+  partner: any;
+  policy: string;
+  reconnectionManager: ReconnectionManager;
+  resource: string;
+  roap: Roap;
+  roapSeq: number;
+  sipUri: string;
+  type: string;
+  userId: string;
+  video: any;
+  callEvents: any[];
+  deferJoin: Promise<any>;
+  dialInDeviceStatus: string;
+  dialInUrl: string;
+  dialOutDeviceStatus: string;
+  dialOutUrl: string;
+  fetchMeetingInfoTimeoutId: NodeJS.Timeout;
+  floorGrantPending: boolean;
+  hasJoinedOnce: boolean;
+  hasWebsocketConnected: boolean;
+  inMeetingActions: InMeetingActions;
+  isLocalShareLive: boolean;
+  isRoapInProgress: boolean;
+  isSharing: boolean;
+  keepAliveTimerId: NodeJS.Timeout;
+  lastVideoLayoutInfo: any;
+  locusInfo: any;
+  media: MultistreamMedia;
+  mediaProperties: MediaProperties;
+  mediaRequestManagers: {
+    audio: MediaRequestManager;
+    video: MediaRequestManager;
+  };
+  meetingInfoFailureReason: string;
+  networkQualityMonitor: NetworkQualityMonitor;
+  networkStatus: string;
+  passwordStatus: string;
+  queuedMediaUpdates: any[];
+  recording: any;
+  remoteMediaManager: RemoteMediaManager | null;
+  requiredCaptcha: any;
+  receiveSlotManager: ReceiveSlotManager;
+  shareStatus: string;
+  statsAnalyzer: StatsAnalyzer;
+  transcription: Transcription;
+  updateMediaConnections: (mediaConnections: any[]) => void;
+  endCallInitiateJoinReq: any;
+  endJoinReqResp: any;
+  endLocalSDPGenRemoteSDPRecvDelay: any;
+  joinedWith: any;
+  locusId: any;
+  startCallInitiateJoinReq: any;
+  startJoinReqResp: any;
+  startLocalSDPGenRemoteSDPRecvDelay: any;
+  wirelessShare: any;
+  guest: any;
+  meetingJoinUrl: any;
+  meetingNumber: any;
+  meetingState: any;
+  permissionToken: any;
+  resourceId: any;
+  resourceUrl: string;
+  selfId: string;
+  state: any;
+
   namespace = MEETINGS;
 
   /**
@@ -402,7 +486,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @constructor
    * @memberof Meeting
   */
-  constructor(attrs, options) {
+  constructor(attrs: any, options: object) {
     super({}, options);
     /**
      * @instance
@@ -470,15 +554,6 @@ export default class Meeting extends StatelessWebexPlugin {
      * @memberof Meeting
      */
     this.deviceUrl = attrs.deviceUrl;
-    /**
-     * @description set you -1 as default values is 0 (used to idenfify if 1st roap request was sent)
-     * @instance
-     * @type {Number}
-     * @readonly
-     * @private
-     * @memberof Meeting
-     */
-    this.roapSeq = ROAP_SEQ_PRE;
     /**
      * @instance
      * @type {Object}
@@ -488,13 +563,44 @@ export default class Meeting extends StatelessWebexPlugin {
      */
     // TODO: needs to be defined as a class
     this.meetingInfo = {};
+    /**
+     * helper class for managing receive slots (for multistream media connections)
+     */
+    this.receiveSlotManager = new ReceiveSlotManager(this);
+    /**
+     * Helper class for managing media requests for main video (for multistream media connections)
+     * All media requests sent out for main video for this meeting have to go through it.
+     */
+    this.mediaRequestManagers = {
+      audio: new MediaRequestManager((mediaRequests) => {
+        if (!this.mediaProperties.webrtcMediaConnection) {
+          LoggerProxy.logger.warn('Meeting:index#mediaRequestManager --> trying to send audio media request before media connection was created');
+
+          return;
+        }
+        this.mediaProperties.webrtcMediaConnection.requestMedia(MC.MediaType.AudioMain, mediaRequests);
+      }),
+      video: new MediaRequestManager((mediaRequests) => {
+        if (!this.mediaProperties.webrtcMediaConnection) {
+          LoggerProxy.logger.warn('Meeting:index#mediaRequestManager --> trying to send video media request before media connection was created');
+
+          return;
+        }
+        this.mediaProperties.webrtcMediaConnection.requestMedia(MC.MediaType.VideoMain, mediaRequests);
+      })
+    };
     /**
      * @instance
      * @type {Members}
      * @public
      * @memberof Meeting
      */
-    this.members = new Members({locusUrl: (attrs.locus && attrs.locus.url)}, {parent: this.webex});
+    this.members = new Members({
+      locusUrl: (attrs.locus && attrs.locus.url),
+      receiveSlotManager: this.receiveSlotManager,
+      mediaRequestManagers: this.mediaRequestManagers,
+    // @ts-ignore - Fix type
+    }, {parent: this.webex});
     /**
      * @instance
      * @type {Roap}
@@ -502,7 +608,18 @@ export default class Meeting extends StatelessWebexPlugin {
      * @private
      * @memberof Meeting
      */
+    // @ts-ignore - Fix type
     this.roap = new Roap({}, {parent: this.webex});
+    /**
+     * indicates if an SDP exchange is happening
+     *
+     * @instance
+     * @type {Boolean}
+     * @readonly
+     * @private
+     * @memberof Meeting
+     */
+    this.isRoapInProgress = false;
     /**
      * created later
      * @instance
@@ -640,6 +757,11 @@ export default class Meeting extends StatelessWebexPlugin {
      */
     this.mediaConnections = null;
 
+    /**
+     * If true, then media is sent over multiple separate streams.
+     * If false, then media is transcoded by the server into a single stream.
+     */
+    this.isMultistream = false;
     /**
      * Fetching meeting info can be done randomly 2-5 mins before meeting start
      * In case it is done before the timer expires, this timeout id is reset to cancel the timer.
@@ -658,7 +780,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @private
      * @memberof Meeting
      */
-    this.updateMediaConnections = (mediaConnections) => {
+    this.updateMediaConnections = (mediaConnections: any[]) => {
       if (!isEqual(this.mediaConnections, mediaConnections)) {
         // grab last/latest item in the new mediaConnections information
         this.mediaConnections = mediaConnections.slice(-1);
@@ -691,35 +813,13 @@ export default class Meeting extends StatelessWebexPlugin {
     this.isSharing = false;
     /**
      * @instance
-     * @type {Boolean}
+     * @type {string}
      * @readonly
      * @public
      * @memberof Meeting
      */
     this.shareStatus = SHARE_STATUS.NO_SHARE;
-    /**
-     * @instance
-     * @type {Boolean}
-     * @readonly
-     * @private
-     * @memberof Meeting
-     */
-    Object.defineProperty(this, 'isLocalShareLive', {
-      get: () => {
-        const {shareTransceiver} = this.mediaProperties.peerConnection;
-        const shareDirection = shareTransceiver?.direction;
-        const trackReadyState = shareTransceiver?.sender?.track?.readyState;
-        const activeShare = trackReadyState === LIVE;
-        const offersToSendData = shareDirection === SENDRECV;
-
-        if (activeShare && offersToSendData) {
-          return true;
-        }
 
-        return false;
-      },
-      configurable: true
-    });
     /**
      * @instance
      * @type {Array}
@@ -731,7 +831,7 @@ export default class Meeting extends StatelessWebexPlugin {
     /**
      * There is a pending floor requested by the user
      * @instance
-     * @type {floorGrantPending}
+     * @type {boolean}
      * @private
      * @memberof Meeting
      */
@@ -799,6 +899,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @private
      * @memberof Meeting
      */
+    // @ts-ignore - Fix type
     this.locusInfo = new LocusInfo(this.updateMeetingObject.bind(this), this.webex, this.id);
     // We had to add listeners first before setting up the locus instance
     /**
@@ -826,6 +927,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @private
      * @memberof Meeting
      */
+    // @ts-ignore - Fix type
     this.hasWebsocketConnected = this.webex.internal.mercury.connected;
 
     /**
@@ -901,6 +1003,13 @@ export default class Meeting extends StatelessWebexPlugin {
     this.setUpLocusInfoListeners();
     this.locusInfo.init(attrs.locus ? attrs.locus : {});
     this.hasJoinedOnce = false;
+
+    this.media = new MultistreamMedia(this);
+
+    /**
+     * helper class for managing remote streams
+     */
+    this.remoteMediaManager = null;
   }
 
   /**
@@ -912,9 +1021,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @returns {Promise}
    */
-  async fetchMeetingInfo({
-    password = null, captchaCode = null
-  }) {
+  public async fetchMeetingInfo({ password = null, captchaCode = null }: { password?: string; captchaCode?: string }) {
     // when fetch meeting info is called directly by the client, we want to clear out the random timer for sdk to do it
     if (this.fetchMeetingInfoTimeoutId) {
       clearTimeout(this.fetchMeetingInfoTimeoutId);
@@ -956,6 +1063,7 @@ export default class Meeting extends StatelessWebexPlugin {
     }
     catch (err) {
       if (err instanceof MeetingInfoV2PasswordError) {
+        // @ts-ignore
         LoggerProxy.logger.info(`Meeting:index#fetchMeetingInfo --> Info Unable to fetch meeting info for ${this.destination} - password required (code=${err?.body?.code}).`);
 
         // when wbxappapi requires password it still populates partial meeting info in the response
@@ -974,6 +1082,7 @@ export default class Meeting extends StatelessWebexPlugin {
         throw (new PasswordError());
       }
       else if (err instanceof MeetingInfoV2CaptchaError) {
+        // @ts-ignore
         LoggerProxy.logger.info(`Meeting:index#fetchMeetingInfo --> Info Unable to fetch meeting info for ${this.destination} - captcha required (code=${err?.body?.code}).`);
 
         this.meetingInfoFailureReason = (this.requiredCaptcha) ?
@@ -1003,7 +1112,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @returns {Promise<{isPasswordValid: boolean, requiredCaptcha: boolean, failureReason: MEETING_INFO_FAILURE_REASON}>}
    */
-  verifyPassword(password, captchaCode) {
+  public verifyPassword(password: string, captchaCode: string) {
     return this.fetchMeetingInfo({
       password, captchaCode
     })
@@ -1033,7 +1142,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @returns {Promise}
    */
-  refreshCaptcha() {
+  public refreshCaptcha() {
     if (!this.requiredCaptcha) {
       return Promise.reject(new Error('There is no captcha to refresh'));
     }
@@ -1063,7 +1172,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusInfoListeners() {
+  private setUpLocusInfoListeners() {
     // meeting update listeners
     this.setUpLocusInfoSelfListener();
     this.setUpLocusInfoMeetingListener();
@@ -1081,14 +1190,13 @@ export default class Meeting extends StatelessWebexPlugin {
     this.setUpLocusInfoMediaInactiveListener();
   }
 
-
   /**
    * Set up the locus info listener for meetings disconnected due to inactivity
    * @returns {undefined}
    * @private
    * @memberof Meeting
    */
-  setUpLocusInfoMediaInactiveListener() {
+  private setUpLocusInfoMediaInactiveListener() {
     // User gets kicked off the meeting due to inactivity or user did a refresh
     this.locusInfo.on(EVENTS.DISCONNECT_DUE_TO_INACTIVITY, (res) => {
       // https:// jira-eng-gpk2.cisco.com/jira/browse/SPARK-240520
@@ -1116,6 +1224,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
       LoggerProxy.logger.error(`Meeting:index#setUpLocusInfoMediaInactiveListener --> Meeting disconnected due to inactivity: ${res.reason}`);
 
+      // @ts-ignore - config coming from registerPlugin
       if (this.config.reconnection.autoRejoin) {
         this.reconnect();
       }
@@ -1139,7 +1248,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusInfoAssignHostListener() {
+  private setUpLocusInfoAssignHostListener() {
     this.locusInfo.on(EVENTS.LOCUS_INFO_CAN_ASSIGN_HOST, (payload) => {
       const changed = this.inMeetingActions.set({
         canAssignHost: payload.canAssignHost,
@@ -1165,7 +1274,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusFullStateListener() {
+  private setUpLocusFullStateListener() {
     this.locusInfo.on(LOCUSINFO.EVENTS.FULL_STATE_MEETING_STATE_CHANGE, (payload) => {
       Trigger.trigger(
         this,
@@ -1196,7 +1305,13 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {Object}
    * @memberof Meeting
    */
-  getAnalyzerMetricsPrePayload(options) {
+  getAnalyzerMetricsPrePayload(options: {
+    event: string;
+    trackingId: string;
+    locus: object;
+    mediaConnections: Array<any>;
+    errors: object;
+  } | any) {
     if (options) {
       const {
         event,
@@ -1210,11 +1325,12 @@ export default class Meeting extends StatelessWebexPlugin {
         return null;
       }
 
-      const identifiers = {
+      const identifiers: any = {
         correlationId: this.correlationId,
         userId: this.userId,
         deviceId: this.deviceUrl,
         orgId: this.orgId,
+        // @ts-ignore fix type
         locusUrl: this.webex.internal.services.get('locus')
       };
 
@@ -1336,12 +1452,14 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  sendCallAnalyzerMetrics(options) {
+  private sendCallAnalyzerMetrics(options: { event: string; trackingId: string; locus: object; errors: object }) {
     const payload = this.getAnalyzerMetricsPrePayload({
+      // @ts-ignore - config coming from registerPlugin
       ...pick(this.config.metrics, ['clientType', 'subClientType']),
       ...options
     });
 
+    // @ts-ignore - fix type
     return this.webex.internal.metrics.submitCallDiagnosticEvents(payload);
   }
 
@@ -1355,13 +1473,15 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  sendMediaQualityAnalyzerMetrics(options) {
+  private sendMediaQualityAnalyzerMetrics(options: { event: string; trackingId: string; locus: object }) {
     const payload = this.getAnalyzerMetricsPrePayload({
       type: MQA_STATS.CA_TYPE,
+      // @ts-ignore - config coming from registerPlugin
       ...pick(this.config.metrics, ['clientType', 'subClientType']),
       ...options
     });
 
+    // @ts-ignore
     return this.webex.internal.metrics.submitCallDiagnosticEvents(payload);
   }
 
@@ -1372,7 +1492,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {undefined}
    * @memberof Meeting
    */
-  setNetworkStatus(networkStatus) {
+  private setNetworkStatus(networkStatus: string) {
     if (networkStatus === NETWORK_STATUS.DISCONNECTED) {
       Trigger.trigger(
         this,
@@ -1405,14 +1525,14 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusSelfListener() {
+  private setUpLocusSelfListener() {
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_SELF, (payload) => {
       this.members.locusSelfUpdate(payload);
       this.pstnUpdate(payload);
 
       // If user moved to a JOINED state and there is a pending floor grant trigger it
       if (this.floorGrantPending && payload.newSelf.state === MEETING_STATE.STATES.JOINED) {
-        this.share()
+        this.requestScreenShareFloor()
           .then(() => { this.floorGrantPending = false; });
       }
     });
@@ -1425,7 +1545,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  pstnUpdate(payload) {
+  private pstnUpdate(payload: any) {
     if (this.locusInfo.self) {
       const dialInPstnDevice = payload.newSelf?.pstnDevices.find((device) => device.url === this.dialInUrl);
       const dialOutPstnDevice = payload.newSelf?.pstnDevices.find((device) => device.url === this.dialOutUrl);
@@ -1480,7 +1600,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusHostListener() {
+  private setUpLocusHostListener() {
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_HOST, (payload) => {
       this.members.locusHostUpdate(payload);
     });
@@ -1494,13 +1614,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusParticipantsListener() {
+  private setUpLocusParticipantsListener() {
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_PARTICIPANTS, (payload) => {
       this.members.locusParticipantsUpdate(payload);
     });
   }
 
-
   /**
    * Set up the locus info recording update listener
    * update recording value for the meeting
@@ -1519,7 +1638,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setupLocusControlsListener() {
+   private setupLocusControlsListener() {
     this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_RECORDING_UPDATED,
       ({state, modifiedBy, lastModified}) => {
         let event;
@@ -1575,6 +1694,8 @@ export default class Meeting extends StatelessWebexPlugin {
 
     this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIBE_UPDATED,
       ({caption, transcribing}) => {
+
+        // @ts-ignore - config coming from registerPlugin
         if (transcribing && this.transcription && this.config.receiveTranscription) {
           this.receiveTranscription();
         }
@@ -1613,7 +1734,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusMediaSharesListener() {
+   private setUpLocusMediaSharesListener() {
     // Will get triggered on local and remote share
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_MEDIA_SHARES, (payload) => {
       const {content: contentShare, whiteboard: whiteboardShare} = payload.current;
@@ -1701,7 +1822,7 @@ export default class Meeting extends StatelessWebexPlugin {
               this,
               {
                 file: 'meeting/index',
-                function: 'stopFloorRequest'
+                function: 'localShare'
               },
               EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL,
               {
@@ -1844,7 +1965,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusUrlListener() {
+  private setUpLocusUrlListener() {
     this.locusInfo.on(EVENTS.LOCUS_INFO_UPDATE_URL, (payload) => {
       this.members.locusUrlUpdate(payload);
       this.locusUrl = payload;
@@ -1858,7 +1979,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof meeting
    */
-  setUpLocusInfoMeetingInfoListener() {
+  private setUpLocusInfoMeetingInfoListener() {
     this.locusInfo.on(LOCUSINFO.EVENTS.MEETING_LOCKED, (payload) => {
       if (payload) {
         Trigger.trigger(
@@ -1926,17 +2047,34 @@ export default class Meeting extends StatelessWebexPlugin {
             this.inMeetingActions.get()
           );
         }
+
+        this.handleDataChannelUrlChange(payload.info.datachannelUrl);
       }
     });
   }
 
+  /**
+   * Handles a data channel URL change
+   * @param {String} datachannelUrl
+   * @returns {void}
+   */
+  handleDataChannelUrlChange(datachannelUrl) {
+    if (datachannelUrl && this.config.enableAutomaticLLM) {
+      // Defer this as updateLLMConnection relies upon this.locusInfo.url which is only set
+      // after the MEETING_INFO_UPDATED callback finishes
+      defer(() => {
+        this.updateLLMConnection();
+      });
+    }
+  }
+
   /**
    * Set up the locus info embedded apps listener
    * @returns {undefined}
    * @private
    * @memberof meeting
    */
-  setUpLocusEmbeddedAppsListener() {
+  private setUpLocusEmbeddedAppsListener() {
     this.locusInfo.on(LOCUSINFO.EVENTS.EMBEDDED_APPS_UPDATED, (embeddedApps) => {
       if (embeddedApps) {
         Trigger.trigger(
@@ -1958,7 +2096,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusInfoSelfListener() {
+  private setUpLocusInfoSelfListener() {
     this.locusInfo.on(LOCUSINFO.EVENTS.LOCAL_UNMUTE_REQUIRED, (payload) => {
       if (this.audio) {
         this.audio.handleServerLocalUnmuteRequired(this);
@@ -2056,6 +2194,7 @@ export default class Meeting extends StatelessWebexPlugin {
       }
     });
 
+    // @ts-ignore - check if MEDIA_INACTIVITY exists
     this.locusInfo.on(LOCUSINFO.EVENTS.MEDIA_INACTIVITY, () => {
       Metrics.sendBehavioralMetric(
         BEHAVIORAL_METRICS.MEETING_MEDIA_INACTIVE,
@@ -2122,7 +2261,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setUpLocusInfoMeetingListener() {
+  private setUpLocusInfoMeetingListener() {
     this.locusInfo.on(EVENTS.REMOTE_RESPONSE, (payload) => {
       this.meetingFiniteStateMachine.remote(payload);
 
@@ -2130,6 +2269,7 @@ export default class Meeting extends StatelessWebexPlugin {
         this.leave({reason: payload.reason}).then(() => {
           LoggerProxy.logger.info('Meeting:index#setUpLocusInfoMeetingListener --> REMOTE_RESPONSE. Attempting to leave meeting.');
         }).catch((error) => {
+          // @ts-ignore
           LoggerProxy.logger.error(`Meeting:index#setUpLocusInfoMeetingListener --> REMOTE_RESPONSE. Issue with leave for meeting, meeting still in collection: ${this.meeting}, error: ${error}`);
         });
       }
@@ -2158,6 +2298,7 @@ export default class Meeting extends StatelessWebexPlugin {
         this.leave({reason: payload.reason}).then(() => {
           LoggerProxy.logger.warn('Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. The meeting has been left, but has not been destroyed, you should see a later event for leave.');
         }).catch((error) => {
+          // @ts-ignore
           LoggerProxy.logger.error(`Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. Issue with leave for meeting, meeting still in collection: ${this.meeting}, error: ${error}`);
         });
       }
@@ -2189,7 +2330,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * // TODO: is this function necessary?
    */
-  updateMeetingObject(object) {
+  private updateMeetingObject(object: object) {
     // Validate if these are valid meeting object property
     // TODO: add a check to make sure the value passed in the constructor
     // is not changed by any delta event
@@ -2211,7 +2352,14 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  invite(invitee, alertIfActive = true) {
+  public invite(
+    invitee: {
+      emailAddress: string;
+      email: string;
+      phoneNumber: string;
+    },
+    alertIfActive: boolean = true
+  ) {
     return this.members.addMember(invitee, alertIfActive);
   }
 
@@ -2223,7 +2371,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  cancelPhoneInvite(invitee) {
+  public cancelPhoneInvite(invitee: { phoneNumber: string }) {
     return this.members.cancelPhoneInvite(invitee);
   }
 
@@ -2234,7 +2382,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  admit(memberIds) {
+  public admit(memberIds: Array<any>) {
     return this.members.admitMembers(memberIds);
   }
 
@@ -2245,7 +2393,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  remove(memberId) {
+  public remove(memberId: string) {
     return this.members.removeMember(memberId);
   }
 
@@ -2257,7 +2405,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  mute(memberId, mute = true) {
+  public mute(memberId: string, mute: boolean = true) {
     return this.members.muteMember(memberId, mute);
   }
 
@@ -2269,7 +2417,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  transfer(memberId, moderator = true) {
+  public transfer(memberId: string, moderator: boolean = true) {
     return this.members.transferHostToMember(memberId, moderator);
   }
 
@@ -2279,7 +2427,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  getMembers() {
+  public getMembers() {
     return this.members;
   }
 
@@ -2289,7 +2437,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isAudioConnected() {
+  public isAudioConnected() {
     return !!this.audio;
   }
 
@@ -2299,7 +2447,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isAudioMuted() {
+  public isAudioMuted() {
     return this.audio && this.audio.isMuted();
   }
 
@@ -2309,7 +2457,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isAudioSelf() {
+  public isAudioSelf() {
     return this.audio && this.audio.isSelf();
   }
 
@@ -2319,7 +2467,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isVideoConnected() {
+  public isVideoConnected() {
     return !!this.video;
   }
 
@@ -2329,7 +2477,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isVideoMuted() {
+  public isVideoMuted() {
     return this.video && this.video.isMuted();
   }
 
@@ -2339,7 +2487,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isVideoSelf() {
+  public isVideoSelf() {
     return this.video && this.video.isSelf();
   }
 
@@ -2356,7 +2504,17 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  parseMeetingInfo(meetingInfo, destination = null) {
+  parseMeetingInfo(
+    meetingInfo: {
+      body: {
+        conversationUrl: string;
+        locusUrl: string;
+        sipUri: string;
+        owner: object;
+      };
+    } | any,
+    destination: object | string | null = null
+  ) {
     const webexMeetingInfo = meetingInfo?.body;
     // We try to use as much info from Locus meeting object, stored in destination
 
@@ -2370,7 +2528,9 @@ export default class Meeting extends StatelessWebexPlugin {
     if (locusMeetingObject || (webexMeetingInfo && !(meetingInfo?.errors && meetingInfo?.errors.length > 0))) {
       this.conversationUrl = locusMeetingObject?.conversationUrl || webexMeetingInfo?.conversationUrl || this.conversationUrl;
       this.locusUrl = locusMeetingObject?.url || webexMeetingInfo?.locusUrl || this.locusUrl;
+      // @ts-ignore - config coming from registerPlugin
       this.setSipUri(this.config.experimental.enableUnifiedMeetings ? locusMeetingObject?.info.sipUri || webexMeetingInfo?.sipUrl : locusMeetingObject?.info.sipUri || webexMeetingInfo?.sipMeetingUri || this.sipUri);
+      // @ts-ignore - config coming from registerPlugin
       if (this.config.experimental.enableUnifiedMeetings) {
         this.meetingNumber = locusMeetingObject?.info.webExMeetingId || webexMeetingInfo?.meetingNumber;
         this.meetingJoinUrl = webexMeetingInfo?.meetingJoinUrl;
@@ -2390,7 +2550,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  parseLocus(locus) {
+  private parseLocus(locus: { url: string; participants: Array<any>; self: object }) {
     if (locus) {
       this.locusUrl = locus.url;
       // TODO: move this to parse participants module
@@ -2417,24 +2577,11 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setSipUri(sipUri) {
+  setSipUri(sipUri: string) {
     // This can be tel no, device id or a sip uri, user Id
     this.sipUri = sipUri;
   }
 
-  /**
-   * Set the roap seq on the class instance
-   * @param {Number} seq
-   * @returns {undefined}
-   * @private
-   * @memberof Meeting
-   */
-  setRoapSeq(seq) {
-    if (seq >= 0) {
-      this.roapSeq = seq;
-    }
-  }
-
   /**
    * Set the locus info the class instance
    * @param {Object} locus
@@ -2448,8 +2595,14 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setLocus(locus) {
-    const mtgLocus = locus.locus || locus;
+  private setLocus(locus: {
+    mediaConnections: Array<any>;
+    locusUrl: string;
+    locusId: string;
+    mediaId: string;
+    host: object;
+  } | any) {
+    const mtgLocus: any = locus.locus || locus;
 
     // LocusInfo object saves the locus object
     // this.locus = mtgLocus;
@@ -2462,111 +2615,6 @@ export default class Meeting extends StatelessWebexPlugin {
     this.locusInfo.initialSetup(mtgLocus);
   }
 
-  /**
-   * Sets the remote stream on the class instance and emits and
-   * event to developers
-   * @param {Object} pc The remote stream peer connection
-   * @returns {undefined}
-   * @public
-   * @memberof Meeting
-   */
-  setRemoteStream(pc) {
-    if (!pc) {
-      return;
-    }
-    // eslint-disable-next-line no-param-reassign
-    pc.ontrack = (event) => {
-      // eslint-disable-next-line no-warning-comments
-      // TODO: It's possible for media to not be present
-      // so we might need to either
-      // A) wait until we have media flowing
-      // B) trigger a second event when video is flowing
-      LoggerProxy.logger.log(`Meeting:index#setRemoteStream --> ontrack event received for peerConnection: ${event}`);
-
-      const MEDIA_ID = {
-        AUDIO_TRACK: '0',
-        VIDEO_TRACK: '1',
-        SHARE_TRACK: '2'
-      };
-      let eventType = null;
-      const mediaTrack = event.track;
-      let trackMediaID = null;
-
-
-      // In case of safari some time the transceiver is not present for specific os version
-      // sdk tries to determine the transceive using the track id present
-      if (event.transceiver && event.transceiver.mid) {
-        trackMediaID = event.transceiver.mid;
-      }
-      else {
-        const {audioTransceiver, videoTransceiver, shareTransceiver} = event.target;
-
-        // audio kind indicates its a audio stream
-        if (mediaTrack.id === audioTransceiver.receiver.track.id) {
-          trackMediaID = '0';
-        }
-        else
-        if (mediaTrack.id === videoTransceiver.receiver.track.id) {
-          trackMediaID = '1';
-        }
-        else
-        if (mediaTrack.id === shareTransceiver.receiver.track.id) {
-          trackMediaID = '2';
-        }
-        else {
-          trackMediaID = null;
-          Metrics.sendBehavioralMetric(
-            BEHAVIORAL_METRICS.MUTE_AUDIO_FAILURE,
-            {
-              correlation_id: this.correlationId,
-              locus_id: this.locusUrl.split('/').pop()
-            }
-          );
-        }
-      }
-
-
-      switch (trackMediaID) {
-        case MEDIA_ID.AUDIO_TRACK:
-          eventType = EVENT_TYPES.REMOTE_AUDIO;
-          this.mediaProperties.setRemoteAudioTrack(mediaTrack);
-          break;
-        case MEDIA_ID.VIDEO_TRACK:
-          eventType = EVENT_TYPES.REMOTE_VIDEO;
-          this.mediaProperties.setRemoteVideoTrack(mediaTrack);
-          break;
-        case MEDIA_ID.SHARE_TRACK:
-          if (event.track) {
-            eventType = EVENT_TYPES.REMOTE_SHARE;
-            this.mediaProperties.setRemoteShare(mediaTrack);
-          }
-          break;
-        default: {
-          LoggerProxy.logger.log('Meeting:index#setRemoteStream --> no matching media track id');
-        }
-      }
-
-      // start stats here the stats are coming null if you dont receive streams
-
-      this.statsAnalyzer.startAnalyzer(this.mediaProperties.peerConnection);
-
-      if (eventType && mediaTrack) {
-        Trigger.trigger(
-          this,
-          {
-            file: 'meeting/index',
-            function: 'setRemoteStream:pc.ontrack'
-          },
-          EVENT_TRIGGERS.MEDIA_READY,
-          {
-            type: eventType,
-            stream: MediaUtil.createMediaStream([mediaTrack])
-          }
-        );
-      }
-    };
-  }
-
   /**
    * Upload logs for the current meeting
    * @param {object} options file name and function name
@@ -2574,7 +2622,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  uploadLogs(options = {file: 'meeting/index', function: 'uploadLogs'}) {
+  public uploadLogs(options: object = { file: 'meeting/index', function: 'uploadLogs' }) {
     Trigger.trigger(
       this,
       options,
@@ -2583,7 +2631,6 @@ export default class Meeting extends StatelessWebexPlugin {
     );
   }
 
-
   /**
    * Removes remote audio and video stream on the class instance and triggers an event
    * to developers
@@ -2592,7 +2639,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @deprecated after v1.89.3
    */
-  unsetRemoteStream() {
+  public unsetRemoteStream() {
     LoggerProxy.logger.warn('Meeting:index#unsetRemoteStream --> [DEPRECATION WARNING]: unsetRemoteStream has been deprecated after v1.89.3');
     this.mediaProperties.unsetRemoteMedia();
   }
@@ -2613,7 +2660,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @deprecated after v1.89.3
    */
-  closeRemoteStream() {
+  public closeRemoteStream() {
     LoggerProxy.logger.warn('Meeting:index#closeRemoteStream --> [DEPRECATION WARNING]: closeRemoteStream has been deprecated after v1.89.3');
     this.closeRemoteTracks();
   }
@@ -2637,7 +2684,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @returns {void}
      * @inner
      */
-    const triggerMediaStoppedEvent = (mediaType) => {
+    const triggerMediaStoppedEvent = (mediaType: string) => {
       Trigger.trigger(
         this,
         {
@@ -2659,7 +2706,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @inner
      */
     // eslint-disable-next-line arrow-body-style
-    const stopTrack = (track, type) => {
+    const stopTrack = (track: MediaStreamTrack, type: string) => {
       return Media.stopTracks(track)
         .then(() => {
           const isTrackStopped = track && track.readyState === ENDED;
@@ -2687,7 +2734,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  sendLocalMediaReadyEvent() {
+  private sendLocalMediaReadyEvent() {
     Trigger.trigger(
       this,
       {
@@ -2710,7 +2757,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setLocalAudioTrack(audioTrack, emitEvent = true) {
+  private setLocalAudioTrack(audioTrack: MediaStreamTrack, emitEvent: boolean = true) {
     if (audioTrack) {
       const settings = audioTrack.getSettings();
 
@@ -2737,7 +2784,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setLocalVideoTrack(videoTrack, emitEvent = true) {
+  private setLocalVideoTrack(videoTrack: MediaStreamTrack, emitEvent: boolean = true) {
     if (videoTrack) {
       const {
         aspectRatio, frameRate, height, width, deviceId
@@ -2777,7 +2824,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  setLocalTracks(localStream) {
+  public setLocalTracks(localStream: any) {
     if (localStream) {
       const {audioTrack, videoTrack} = MeetingUtil.getTrack(localStream);
 
@@ -2790,12 +2837,12 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Sets the local media stream on the class and emits an event to the developer
-   * @param {Stream} localShare the local media stream
+   * @param {MediaStream} localShare the local media stream
    * @returns {undefined}
    * @public
    * @memberof Meeting
    */
-  setLocalShareTrack(localShare) {
+  public setLocalShareTrack(localShare: MediaStream) {
     let settings = null;
 
     if (localShare) {
@@ -2839,7 +2886,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  closeLocalStream() {
+  public closeLocalStream() {
     const {audioTrack, videoTrack} = this.mediaProperties;
 
     return Media.stopTracks(audioTrack)
@@ -2874,7 +2921,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  closeLocalShare() {
+  public closeLocalShare() {
     const track = this.mediaProperties.shareTrack;
 
     return Media.stopTracks(track).then(() => {
@@ -2903,7 +2950,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  unsetLocalVideoTrack() {
+  public unsetLocalVideoTrack() {
     this.mediaProperties.unsetLocalVideoTrack();
   }
 
@@ -2913,7 +2960,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  unsetLocalShareTrack() {
+  public unsetLocalShareTrack() {
     this.mediaProperties.unsetLocalShareTrack();
   }
 
@@ -2923,9 +2970,10 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  setMercuryListener() {
+  public setMercuryListener() {
     // Client will have a socket manager and handle reconnecting to mercury, when we reconnect to mercury
     // if the meeting has active peer connections, it should try to reconnect.
+    // @ts-ignore
     this.webex.internal.mercury.on(ONLINE, () => {
       LoggerProxy.logger.info('Meeting:index#setMercuryListener --> Web socket online');
 
@@ -2945,6 +2993,7 @@ export default class Meeting extends StatelessWebexPlugin {
       this.hasWebsocketConnected = true;
     });
 
+    // @ts-ignore
     this.webex.internal.mercury.on(OFFLINE, () => {
       LoggerProxy.logger.error('Meeting:index#setMercuryListener --> Web socket offline');
       Metrics.postEvent({
@@ -2961,27 +3010,41 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * Close the peer connections and remove them from the class. Triggers an event
-   * when each is closed.
-   * @returns {Promise} returns a resolved promise with an array of closed peer connections
+   * Close the peer connections and remove them from the class.
+   * Cleanup any media connection related things.
+   *
+   * @returns {Promise}
    * @public
    * @memberof Meeting
    */
-  closePeerConnections() {
-    return PeerConnectionManager.close(this.mediaProperties.peerConnection);
+  public closePeerConnections() {
+    if (this.mediaProperties.webrtcMediaConnection) {
+      if (this.remoteMediaManager) {
+        this.remoteMediaManager.stop();
+        this.remoteMediaManager = null;
+      }
+
+      Object.values(this.mediaRequestManagers).forEach((mediaRequestManager) => mediaRequestManager.reset());
+
+      this.receiveSlotManager.reset();
+      this.mediaProperties.webrtcMediaConnection.close();
+    }
+
+    return Promise.resolve();
   }
 
   /**
    * Unsets the peer connections on the class
    * warning DO NOT CALL WITHOUT CLOSING PEER CONNECTIONS FIRST
-   * @param {PeerConnection} peerConnection
    * @returns {undefined}
    * @public
    * @memberof Meeting
    */
-  unsetPeerConnections() {
+  public unsetPeerConnections() {
     this.mediaProperties.unsetPeerConnection();
+    // @ts-ignore - config coming from registerPlugin
     if (this.config.reconnection.detection) {
+      // @ts-ignore
       this.webex.internal.mercury.off(ONLINE);
     }
   }
@@ -2993,7 +3056,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  setCorrelationId(id) {
+  private setCorrelationId(id: string) {
     this.correlationId = id;
   }
 
@@ -3003,11 +3066,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  muteAudio() {
+  public muteAudio() {
     if (!MeetingUtil.isUserInJoinedState(this.locusInfo)) {
       return Promise.reject(new UserNotJoinedError());
     }
 
+    // @ts-ignore
     if (!this.mediaId) {
       // Happens when addMedia and mute are triggered in succession
       return Promise.reject(new NoMediaEstablishedYetError());
@@ -3054,11 +3118,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  unmuteAudio() {
+  public unmuteAudio() {
     if (!MeetingUtil.isUserInJoinedState(this.locusInfo)) {
       return Promise.reject(new UserNotJoinedError());
     }
 
+    // @ts-ignore
     if (!this.mediaId) {
       // Happens when addMedia and mute are triggered in succession
       return Promise.reject(new NoMediaEstablishedYetError());
@@ -3105,11 +3170,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  muteVideo() {
+  public muteVideo() {
     if (!MeetingUtil.isUserInJoinedState(this.locusInfo)) {
       return Promise.reject(new UserNotJoinedError());
     }
 
+    // @ts-ignore
     if (!this.mediaId) {
       // Happens when addMedia and mute are triggered in succession
       return Promise.reject(new NoMediaEstablishedYetError());
@@ -3155,11 +3221,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  unmuteVideo() {
+  public unmuteVideo() {
     if (!MeetingUtil.isUserInJoinedState(this.locusInfo)) {
       return Promise.reject(new UserNotJoinedError());
     }
 
+    // @ts-ignore
     if (!this.mediaId) {
       // Happens when addMedia and mute are triggered in succession
       return Promise.reject(new NoMediaEstablishedYetError());
@@ -3224,7 +3291,13 @@ export default class Meeting extends StatelessWebexPlugin {
    *   video: 'videoDeviceId'
    * }})
    */
-  joinWithMedia(options = {}) {
+  public joinWithMedia(
+    options: {
+      joinOptions?: any;
+      mediaSettings: any;
+      audioVideoOptions?: any;
+    } = {} as any
+  ) {
     // TODO: add validations for parameters
     const {mediaSettings, joinOptions, audioVideoOptions} = options;
 
@@ -3268,19 +3341,21 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  reconnect(options) {
+  public reconnect(options?: object) {
     LoggerProxy.logger.log(`Meeting:index#reconnect --> attempting to reconnect meeting ${this.id}`);
 
     if (!this.reconnectionManager || !this.reconnectionManager.reconnect) {
       return Promise.reject(new ParameterError('Cannot reconnect, ReconnectionManager must first be defined.'));
     }
 
+    // @ts-ignore - currentMediaStatus coming from SelfUtil
     if (!MeetingUtil.isMediaEstablished(this.currentMediaStatus)) {
       return Promise.reject(new ParameterError('Cannot reconnect, Media has not established to reconnect'));
     }
 
     try {
       LoggerProxy.logger.info('Meeting:index#reconnect --> Validating reconnect ability.');
+      // @ts-ignore
       this.reconnectionManager.validate();
     }
     catch (error) {
@@ -3304,7 +3379,6 @@ export default class Meeting extends StatelessWebexPlugin {
       EVENT_TRIGGERS.MEETING_RECONNECTION_STARTING
     );
 
-
     return this.reconnectionManager
       .reconnect(options)
       .then(() => {
@@ -3377,7 +3451,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @returns {void}
    */
-  monitorTranscriptionSocketConnection() {
+  private monitorTranscriptionSocketConnection() {
     this.transcription.onCloseSocket((event) => {
       LoggerProxy.logger.info(
         `Meeting:index#onCloseSocket -->
@@ -3415,7 +3489,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @returns {Promise<void>} a promise to open the WebSocket connection
    */
-  async receiveTranscription() {
+  private async receiveTranscription() {
     LoggerProxy.logger.info(
       `Meeting:index#receiveTranscription -->
       Attempting to generate a web socket url.`
@@ -3423,6 +3497,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
     try {
       const {datachannelUrl} = this.locusInfo.info;
+      // @ts-ignore - fix type
       const {body: {webSocketUrl}} = await this.request({
         method: HTTP_VERBS.POST,
         uri: datachannelUrl,
@@ -3436,6 +3511,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
       this.transcription = new Transcription(
         webSocketUrl,
+        // @ts-ignore - fix type
         this.webex.sessionId,
         this.members,
       );
@@ -3459,6 +3535,7 @@ export default class Meeting extends StatelessWebexPlugin {
       });
 
       this.monitorTranscriptionSocketConnection();
+      // @ts-ignore - fix type
       this.transcription.connect(this.webex.credentials.supertoken.access_token);
     }
     catch (error) {
@@ -3491,12 +3568,11 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @returns{void}
    */
-  triggerStopReceivingTranscriptionEvent() {
+  private triggerStopReceivingTranscriptionEvent() {
     LoggerProxy.logger.info(`
       Meeting:index#stopReceivingTranscription -->
       closed transcription LLM web socket connection successfully.`);
 
-
     Trigger.trigger(
       this,
       {
@@ -3519,7 +3595,8 @@ export default class Meeting extends StatelessWebexPlugin {
    *             if joining as host on second loop, pass pin and pass moderator if joining as guest on second loop
    * Scenario D: Joining any other way (sip, pstn, conversationUrl, link just need to specify resourceId)
    */
-  join(options = {}) {
+  public join(options: any = {}) {
+    // @ts-ignore - fix type
     if (!this.webex.meetings.registered) {
       const errorMessage = 'Meeting:index#join --> Device not registered';
       const error = new Error(errorMessage);
@@ -3625,6 +3702,8 @@ export default class Meeting extends StatelessWebexPlugin {
       }
     }
 
+    this.isMultistream = !!options.enableMultistream;
+
     return MeetingUtil.joinMeetingOptions(this, options)
       .then((join) => {
         this.meetingFiniteStateMachine.join();
@@ -3643,8 +3722,17 @@ export default class Meeting extends StatelessWebexPlugin {
         );
 
         return join;
-      }).then(async (join) => {
+      })
+      .then(async (join) => {
+        if (this.config.enableAutomaticLLM) {
+          await this.updateLLMConnection();
+        }
+
+        return join;
+      })
+      .then(async (join) => {
         if (isBrowser) {
+          // @ts-ignore - config coming from registerPlugin
           if (this.config.receiveTranscription || options.receiveTranscription) {
             if (this.isTranscriptionSupported()) {
               await this.receiveTranscription();
@@ -3656,7 +3744,6 @@ export default class Meeting extends StatelessWebexPlugin {
           LoggerProxy.logger.error('Meeting:index#join --> Receving transcription is not supported on this platform');
         }
 
-
         return join;
       })
       .catch((error) => {
@@ -3702,6 +3789,31 @@ export default class Meeting extends StatelessWebexPlugin {
       });
   }
 
+  /**
+   * Connects to low latency mercury and reconnects if the address has changed
+   * It will also disconnect if called when the meeting has ended
+   * @param {String} datachannelUrl
+   * @returns {Promise}
+   */
+  async updateLLMConnection() {
+    const {url, info: {datachannelUrl} = {}} = this.locusInfo;
+
+    const isJoined = this.joinedWith && this.joinedWith.state === 'JOINED';
+
+    if (this.webex.internal.llm.isConnected()) {
+      if (url === this.webex.internal.llm.getLocusUrl() && isJoined) {
+        return undefined;
+      }
+      await this.webex.internal.llm.disconnectLLM();
+    }
+
+    if (!isJoined) {
+      return undefined;
+    }
+
+    return this.webex.internal.llm.registerAndConnect(url, datachannelUrl);
+  }
+
   /**
    * Use phone for meeting audio
    * @param {String} phoneNumber If provided, it will dial-out using this number. If not provided, dial-in will be used
@@ -3709,7 +3821,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  usePhoneAudio(phoneNumber) {
+  public usePhoneAudio(phoneNumber: string) {
     if (!phoneNumber) {
       return this.dialInPstn();
     }
@@ -3724,7 +3836,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  isPhoneProvisioned(pstnStatus) {
+  private isPhoneProvisioned(pstnStatus: string) {
     return [PSTN_STATUS.JOINED, PSTN_STATUS.CONNECTED, PSTN_STATUS.SUCCESS].includes(pstnStatus);
   }
 
@@ -3734,7 +3846,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  dialInPstn() {
+  private dialInPstn() {
     if (this.isPhoneProvisioned(this.dialInDeviceStatus)) return Promise.resolve(); // prevent multiple dial in devices from being provisioned
 
     const {correlationId, locusUrl} = this;
@@ -3772,7 +3884,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  dialOutPstn(phoneNumber) {
+  private dialOutPstn(phoneNumber: string) {
     if (this.isPhoneProvisioned(this.dialOutDeviceStatus)) return Promise.resolve(); // prevent multiple dial out devices from being provisioned
 
     const {correlationId, locusUrl} = this;
@@ -3811,7 +3923,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    * @returns {Promise}
    */
-  disconnectPhoneAudio() {
+  public disconnectPhoneAudio() {
     return Promise.all([
       this.isPhoneProvisioned(this.dialInDeviceStatus) ?
         MeetingUtil.disconnectPhoneAudio(this, this.dialInUrl) :
@@ -3829,7 +3941,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  moveTo(resourceId) {
+  public moveTo(resourceId: string) {
     if (!resourceId) {
       throw new ParameterError('Cannot move call without a resourceId.');
     }
@@ -3864,7 +3976,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
       try {
         if (this.isSharing) {
-          await this.stopFloorRequest();
+          await this.releaseScreenShareFloor();
         }
         const mediaSettings = {
           mediaDirection: {
@@ -3889,6 +4001,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
         // when a move to is intiated by the client , Locus delets the existing media node from the server as soon the DX answers the meeting
         // once the DX answers we establish connection back the media server with only receiveShare enabled
+        // @ts-ignore - reconnectMedia does not accept any argument
         await this.reconnectionManager.reconnectMedia(mediaSettings)
           .then(() => {
             Metrics.sendBehavioralMetric(
@@ -3938,7 +4051,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  moveFrom(resourceId) {
+  public moveFrom(resourceId: string) {
     // On moveFrom ask the developer to re capture it moveFrom  then updateMedia
     if (!resourceId) {
       throw new ParameterError('Cannot move call without a resourceId.');
@@ -3976,6 +4089,9 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Get local media streams based on options passed
+   *
+   * NOTE: this method can only be used with transcoded meetings, not with multistream meetings
+   *
    * @param {MediaDirection} mediaDirection A configurable options object for joining a meeting
    * @param {AudioVideo} [audioVideo] audio/video object to set audioinput and videoinput devices, see #Media.getUserMedia
    * @param {SharePreferences} [sharePreferences] audio/video object to set audioinput and videoinput devices, see #Media.getUserMedia
@@ -3985,10 +4101,10 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   getMediaStreams = (
-    mediaDirection,
+    mediaDirection: any,
     // This return an OBJECT {video: {height, widght}}
-    audioVideo = VIDEO_RESOLUTIONS[this.mediaProperties.localQualityLevel],
-    sharePreferences
+    audioVideo: any = VIDEO_RESOLUTIONS[this.mediaProperties.localQualityLevel],
+    sharePreferences?: any
   ) => {
     if (
       mediaDirection &&
@@ -4065,6 +4181,7 @@ export default class Meeting extends StatelessWebexPlugin {
             },
             audioVideo,
             sharePreferences,
+            // @ts-ignore - config coming from registerPlugin
             this.config
           )
             .catch((error) => {
@@ -4102,7 +4219,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {Object}
    * @memberof Meetings
    */
-  getSupportedDevices = ({sendAudio = true, sendVideo = true}) => Media.getSupportedDevice({sendAudio, sendVideo});
+  getSupportedDevices = ({ sendAudio = true, sendVideo = true }: { sendAudio: boolean; sendVideo: boolean }) => Media.getSupportedDevice({ sendAudio, sendVideo });
 
   /**
    * Get the devices from the Media module
@@ -4111,6 +4228,344 @@ export default class Meeting extends StatelessWebexPlugin {
    */
   getDevices = () => Media.getDevices();
 
+  /**
+   * Handles ROAP_FAILURE event from the webrtc media connection
+   *
+   * @param {Error} error
+   * @returns {void}
+   */
+  handleRoapFailure = (error) => {
+    const sendBehavioralMetric = (metricName, error, correlationId) => {
+      const data = {
+        code: error.code,
+        correlation_id: correlationId,
+        reason: error.message,
+        stack: error.stack
+      };
+      const metadata = {
+        type: error.cause?.name || error.name
+      };
+
+      Metrics.sendBehavioralMetric(metricName, data, metadata);
+    };
+
+
+    if (error instanceof MC.Errors.SdpOfferCreationError) {
+      sendBehavioralMetric(BEHAVIORAL_METRICS.PEERCONNECTION_FAILURE, error, this.id);
+
+      Metrics.postEvent({
+        event: eventType.LOCAL_SDP_GENERATED,
+        meetingId: this.id,
+        data: {
+          canProceed: false,
+          errors: [
+            Metrics.generateErrorPayload(2001, true, MetricsError.name.MEDIA_ENGINE, undefined)]
+        }
+      });
+    }
+    else if ((error instanceof MC.Errors.SdpOfferHandlingError) || (error instanceof MC.Errors.SdpAnswerHandlingError)) {
+      sendBehavioralMetric(BEHAVIORAL_METRICS.PEERCONNECTION_FAILURE, error, this.id);
+
+      Metrics.postEvent({
+        event: eventType.REMOTE_SDP_RECEIVED,
+        meetingId: this.id,
+        data: {
+          canProceed: false,
+          errors: [Metrics.generateErrorPayload(2001, true, MetricsError.name.MEDIA_ENGINE, undefined)]
+        }
+      });
+    }
+    else if (error instanceof MC.Errors.SdpError) { // this covers also the case of MC.Errors.IceGatheringError which extends MC.Errors.SdpError
+      sendBehavioralMetric(BEHAVIORAL_METRICS.INVALID_ICE_CANDIDATE, error, this.id);
+
+      Metrics.postEvent({
+        event: eventType.LOCAL_SDP_GENERATED,
+        meetingId: this.id,
+        data: {
+          canProceed: false,
+          errors: [
+            Metrics.generateErrorPayload(2001, true, MetricsError.name.MEDIA_ENGINE, undefined)]
+        }
+      });
+    }
+  };
+
+  setupMediaConnectionListeners = () => {
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.ROAP_STARTED, () => {
+      this.isRoapInProgress = true;
+    });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.ROAP_DONE, () => {
+      this.mediaNegotiatedEvent();
+      this.isRoapInProgress = false;
+      this.processNextQueuedMediaUpdate();
+    });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.ROAP_FAILURE, this.handleRoapFailure);
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.ROAP_MESSAGE_TO_SEND, (event) => {
+      const LOG_HEADER = 'Meeting:index#setupMediaConnectionListeners.ROAP_MESSAGE_TO_SEND -->';
+
+      switch (event.roapMessage.messageType) {
+        case 'OK':
+          Metrics.postEvent({
+            event: eventType.REMOTE_SDP_RECEIVED,
+            meetingId: this.id,
+          });
+
+          logRequest(this.roap.sendRoapOK({
+            seq: event.roapMessage.seq,
+            mediaId: this.mediaId,
+            correlationId: this.correlationId
+          }), {
+            header: `${LOG_HEADER} Send Roap OK`,
+            success: `${LOG_HEADER} Successfully send roap OK`,
+            failure: `${LOG_HEADER} Error joining the call on send roap OK, `
+          });
+          break;
+
+        case 'OFFER':
+          Metrics.postEvent({
+            event: eventType.LOCAL_SDP_GENERATED,
+            meetingId: this.id,
+          });
+
+          logRequest(this.roap
+            .sendRoapMediaRequest({
+              sdp: event.roapMessage.sdp,
+              seq: event.roapMessage.seq,
+              tieBreaker: event.roapMessage.tieBreaker,
+              meeting: this, // or can pass meeting ID
+              reconnect: this.reconnectionManager.isReconnectInProgress()
+            }), {
+            header: `${LOG_HEADER} Send Roap Offer`,
+            success: `${LOG_HEADER} Successfully send roap offer`,
+            failure: `${LOG_HEADER} Error joining the call on send roap offer, `
+          });
+          break;
+
+        case 'ANSWER':
+          Metrics.postEvent({
+            event: eventType.REMOTE_SDP_RECEIVED,
+            meetingId: this.id,
+          });
+
+          logRequest(this.roap.sendRoapAnswer({
+            sdp: event.roapMessage.sdp,
+            seq: event.roapMessage.seq,
+            mediaId: this.mediaId,
+            correlationId: this.correlationId
+          }), {
+            header: `${LOG_HEADER} Send Roap Answer.`,
+            success: `${LOG_HEADER} Successfully send roap answer`,
+            failure: `${LOG_HEADER} Error joining the call on send roap answer, `
+          })
+            .catch((error) => {
+              const metricName = BEHAVIORAL_METRICS.ROAP_ANSWER_FAILURE;
+              const data = {
+                correlation_id: this.correlationId,
+                locus_id: this.locusUrl.split('/').pop(),
+                reason: error.message,
+                stack: error.stack
+              };
+              const metadata = {
+                type: error.name
+              };
+
+              Metrics.sendBehavioralMetric(metricName, data, metadata);
+            });
+          break;
+
+        case 'ERROR':
+          if (event.roapMessage.errorType === MC.ErrorType.CONFLICT || event.roapMessage.errorType === MC.ErrorType.DOUBLECONFLICT) {
+            Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.ROAP_GLARE_CONDITION, {
+              correlation_id: this.correlationId,
+              locus_id: this.locusUrl.split('/').pop(),
+              sequence: event.roapMessage.seq
+            });
+          }
+          logRequest(this.roap.sendRoapError({
+            seq: event.roapMessage.seq,
+            errorType: event.roapMessage.errorType,
+            mediaId: this.mediaId,
+            correlationId: this.correlationId
+          }), {
+            header: `${LOG_HEADER} Send Roap Error.`,
+            success: `${LOG_HEADER} Successfully send roap error`,
+            failure: `${LOG_HEADER} Failed to send roap error, `
+          });
+          break;
+
+        default:
+          LoggerProxy.logger.error(`${LOG_HEADER} Unsupported message type: ${event.roapMessage.messageType}`);
+          break;
+      }
+    });
+
+    // eslint-disable-next-line no-param-reassign
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.REMOTE_TRACK_ADDED, (event) => {
+      LoggerProxy.logger.log(`Meeting:index#setupMediaConnectionListeners --> REMOTE_TRACK_ADDED event received for webrtcMediaConnection: ${JSON.stringify(event)}`);
+
+      const mediaTrack = event.track;
+
+      let eventType;
+
+      switch (event.type) {
+        case MC.RemoteTrackType.AUDIO:
+          eventType = EVENT_TYPES.REMOTE_AUDIO;
+          this.mediaProperties.setRemoteAudioTrack(event.track);
+          break;
+        case MC.RemoteTrackType.VIDEO:
+          eventType = EVENT_TYPES.REMOTE_VIDEO;
+          this.mediaProperties.setRemoteVideoTrack(event.track);
+          break;
+        case MC.RemoteTrackType.SCREENSHARE_VIDEO:
+          if (event.track) {
+            eventType = EVENT_TYPES.REMOTE_SHARE;
+            this.mediaProperties.setRemoteShare(event.track);
+          }
+          break;
+        default: {
+          LoggerProxy.logger.log('Meeting:index#setupMediaConnectionListeners --> unexpected track');
+        }
+      }
+
+      // start stats here the stats are coming null if you dont receive streams
+
+      this.statsAnalyzer.startAnalyzer(this.mediaProperties.webrtcMediaConnection);
+
+      if (eventType && mediaTrack) {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setupRemoteTrackListener:Event.REMOTE_TRACK_ADDED'
+          },
+          EVENT_TRIGGERS.MEDIA_READY,
+          {
+            type: eventType,
+            stream: MediaUtil.createMediaStream([mediaTrack])
+          }
+        );
+      }
+    });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.CONNECTION_STATE_CHANGED, (event) => {
+      const connectionFailed = () => {
+        // we know the media connection failed and browser will not attempt to recover it any more
+        // so reset the timer as it's not needed anymore, we want to reconnect immediately
+        this.reconnectionManager.resetReconnectionTimer();
+
+        this.reconnect({networkDisconnect: true});
+        Metrics.postEvent({
+          event: eventType.ICE_END,
+          meeting: this,
+          data: {
+            canProceed: false,
+            errors: [
+              Metrics.generateErrorPayload(
+                2004, false, MetricsError.name.MEDIA_ENGINE, undefined
+              )]
+          }
+        });
+
+        this.uploadLogs({
+          file: 'peer-connection-manager/index',
+          function: 'connectionFailed'
+        });
+
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.CONNECTION_FAILURE,
+          {
+            correlation_id: this.correlationId,
+            locus_id: this.locusId
+          }
+        );
+      };
+
+      LoggerProxy.logger.info(`Meeting:index#setupMediaConnectionListeners --> connection state changed to ${event.state}`);
+      switch (event.state) {
+        case MC.ConnectionState.Connecting:
+          Metrics.postEvent({event: eventType.ICE_START, meeting: this});
+          break;
+        case MC.ConnectionState.Connected:
+          Metrics.postEvent({event: eventType.ICE_END, meeting: this});
+          Metrics.sendBehavioralMetric(
+            BEHAVIORAL_METRICS.CONNECTION_SUCCESS,
+            {
+              correlation_id: this.correlationId,
+              locus_id: this.locusId
+            }
+          );
+          this.setNetworkStatus(NETWORK_STATUS.CONNECTED);
+          this.reconnectionManager.iceReconnected();
+          break;
+        case MC.ConnectionState.Disconnected:
+          this.setNetworkStatus(NETWORK_STATUS.DISCONNECTED);
+          this.reconnectionManager.waitForIceReconnect()
+            .catch(() => {
+              LoggerProxy.logger.info('Meeting:index#setupMediaConnectionListeners --> state DISCONNECTED, automatic reconnection timed out.');
+
+              connectionFailed();
+            });
+          break;
+        case MC.ConnectionState.Failed:
+          connectionFailed();
+          break;
+        default:
+          break;
+      }
+    });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.ACTIVE_SPEAKERS_CHANGED,
+      (msg) => {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setupMediaConnectionListeners'
+          },
+          EVENT_TRIGGERS.ACTIVE_SPEAKER_CHANGED,
+          {
+            seqNum: msg.seqNum,
+            memberIds: msg.csis.map((csi) => this.members.findMemberByCsi(csi)?.id).filter((item) => (item !== undefined))
+          }
+        );
+      });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.VIDEO_SOURCES_COUNT_CHANGED,
+      (numTotalSources, numLiveSources) => {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setupMediaConnectionListeners'
+          },
+          EVENT_TRIGGERS.REMOTE_VIDEO_SOURCE_COUNT_CHANGED,
+          {
+            numTotalSources,
+            numLiveSources
+          }
+        );
+      });
+
+    this.mediaProperties.webrtcMediaConnection.on(MC.Event.AUDIO_SOURCES_COUNT_CHANGED,
+      (numTotalSources, numLiveSources) => {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setupMediaConnectionListeners'
+          },
+          EVENT_TRIGGERS.REMOTE_AUDIO_SOURCE_COUNT_CHANGED,
+          {
+            numTotalSources,
+            numLiveSources
+          }
+        );
+      });
+  };
+
   /**
    * Registers for all required StatsAnalyzer events
    * @private
@@ -4121,6 +4576,7 @@ export default class Meeting extends StatelessWebexPlugin {
     this.statsAnalyzer.on(StatsAnalyzerEvents.MEDIA_QUALITY, (options) => {
       // TODO:  might have to send the same event to the developer
       // Add ip address info if geo hint is present
+      // @ts-ignore fix type
       options.data.intervalMetadata.peerReflexiveIP = this.webex.meetings.geoHintInfo?.clientAddress || options.data.intervalMetadata.peerReflexiveIP || MQA_STATS.DEFAULT_IP;
       Metrics.postEvent({event: eventType.MEDIA_QUALITY, meeting: this, data: {intervalData: options.data, networkType: options.networkType}});
     });
@@ -4180,6 +4636,52 @@ export default class Meeting extends StatelessWebexPlugin {
     });
   };
 
+  getMediaConnectionDebugId() {
+    return `MC-${this.id.substring(0, 4)}`;
+  }
+
+  createMediaConnection(turnServerInfo) {
+    const mc = Media.createMediaConnection(
+      this.isMultistream,
+      this.getMediaConnectionDebugId(),
+      {
+        mediaProperties: this.mediaProperties,
+        remoteQualityLevel: this.mediaProperties.remoteQualityLevel,
+        // @ts-ignore - config coming from registerPlugin
+        enableRtx: this.config.enableRtx,
+        // @ts-ignore - config coming from registerPlugin
+        enableExtmap: this.config.enableExtmap,
+        turnServerInfo
+      }
+    );
+
+    this.mediaProperties.setMediaPeerConnection(mc);
+    this.setupMediaConnectionListeners();
+
+    return mc;
+  }
+
+  /**
+   * Listens for an event emitted by eventEmitter and emits it from the meeting object
+   *
+   * @private
+   * @param {*} eventEmitter object from which to forward the event
+   * @param {*} eventTypeToForward which event type to listen on and to forward
+   * @param {string} meetingEventType event type to be used in the event emitted from the meeting object
+   * @returns {void}
+   */
+  forwardEvent(eventEmitter, eventTypeToForward, meetingEventType) {
+    eventEmitter.on(eventTypeToForward, (data) => Trigger.trigger(
+      this,
+      {
+        file: 'meetings',
+        function: 'addMedia'
+      },
+      meetingEventType,
+      data
+    ));
+  }
+
   /**
    * Specify joining via audio (option: pstn), video, screenshare
    * @param {Object} options A configurable options object for joining a meeting
@@ -4187,11 +4689,12 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {MediaDirection} options.mediaSettings pass media options
    * @param {MediaStream} options.localStream
    * @param {MediaStream} options.localShare
+   * @param {RemoteMediaManagerConfig} options.remoteMediaManagerConfig only applies if multistream is enabled
    * @returns {Promise}
    * @public
    * @memberof Meeting
    */
-  addMedia(options = {}) {
+  addMedia(options: any = {}) {
     const LOG_HEADER = 'Meeting:index#addMedia -->';
 
     let turnDiscoverySkippedReason;
@@ -4205,11 +4708,14 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(new UserNotJoinedError());
     }
     // If the user is unjoined or guest waiting in lobby dont allow the user to addMedia
+    // @ts-ignore - isUserUnadmitted coming from SelfUtil
     if (this.isUserUnadmitted && !this.wirelessShare) {
       return Promise.reject(new UserInLobbyError());
     }
 
-    const {localStream, localShare, mediaSettings} = options;
+    const {
+      localStream, localShare, mediaSettings, remoteMediaManagerConfig
+    } = options;
 
     LoggerProxy.logger.info(`${LOG_HEADER} Adding Media.`);
 
@@ -4244,145 +4750,112 @@ export default class Meeting extends StatelessWebexPlugin {
 
         const {turnServerInfo} = turnDiscoveryObject;
 
-        this.mediaProperties.setMediaPeerConnection(MediaUtil.createPeerConnection(turnServerInfo));
-        this.setMercuryListener();
-        PeerConnectionManager.setPeerConnectionEvents(this);
+        this.preMedia(localStream, localShare, mediaSettings);
 
-        return this.preMedia(localStream, localShare, mediaSettings);
-      })
-      .then(() => Media.attachMedia(this.mediaProperties, {
-        meetingId: this.id,
-        remoteQualityLevel: this.mediaProperties.remoteQualityLevel,
-        enableRtx: this.config.enableRtx,
-        enableExtmap: this.config.enableExtmap,
-        setStartLocalSDPGenRemoteSDPRecvDelay: this.setStartLocalSDPGenRemoteSDPRecvDelay.bind(this)
-      })
-        .then((peerConnection) => this.getDevices().then((devices) => {
-          MeetingUtil.handleDeviceLogging(devices);
-
-          return peerConnection;
-        }))
-        .then((peerConnection) => {
-          this.handleMediaLogging(this.mediaProperties);
-          LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection Received from attachMedia `);
-
-          this.setRemoteStream(peerConnection);
-          if (this.config.stats.enableStatsAnalyzer) {
-            // TODO: ** Dont re create StatsAnalyzer on reconnect or rejoin
-            this.networkQualityMonitor = new NetworkQualityMonitor(this.config.stats);
-            this.statsAnalyzer = new StatsAnalyzer(this.config.stats, this.networkQualityMonitor);
-            this.setupStatsAnalyzerEventHandlers();
-            this.networkQualityMonitor.on(EVENT_TRIGGERS.NETWORK_QUALITY, this.sendNetworkQualityEvent.bind(this));
-          }
-        })
-        .catch((error) => {
-          LoggerProxy.logger.error(`${LOG_HEADER} Error adding media , setting up peerconnection, `, error);
+        const mc = this.createMediaConnection(turnServerInfo);
 
-          Metrics.sendBehavioralMetric(
-            BEHAVIORAL_METRICS.ADD_MEDIA_FAILURE,
-            {
-              correlation_id: this.correlationId,
-              locus_id: this.locusUrl.split('/').pop(),
-              reason: error.message,
-              stack: error.stack,
-              turnDiscoverySkippedReason,
-              turnServerUsed
-            }
+        if (this.isMultistream) {
+          this.remoteMediaManager = new RemoteMediaManager(
+            this.receiveSlotManager,
+            this.mediaRequestManagers,
+            remoteMediaManagerConfig
           );
 
-          throw error;
-        })
-        .then(() => new Promise((resolve, reject) => {
-          let timerCount = 0;
-
-          // eslint-disable-next-line func-names
-          // eslint-disable-next-line prefer-arrow-callback
-          if (this.type === _CALL_) {
-            resolve();
-          }
-          const joiningTimer = setInterval(() => {
-            timerCount += 1;
-            if (this.meetingState === FULL_STATE.ACTIVE) {
-              clearInterval(joiningTimer);
-              resolve();
-            }
+          this.forwardEvent(this.remoteMediaManager, RemoteMediaManagerEvent.AudioCreated, EVENT_TRIGGERS.REMOTE_MEDIA_AUDIO_CREATED);
+          this.forwardEvent(this.remoteMediaManager, RemoteMediaManagerEvent.ScreenShareAudioCreated, EVENT_TRIGGERS.REMOTE_MEDIA_SCREEN_SHARE_AUDIO_CREATED);
+          this.forwardEvent(this.remoteMediaManager, RemoteMediaManagerEvent.VideoLayoutChanged, EVENT_TRIGGERS.REMOTE_MEDIA_VIDEO_LAYOUT_CHANGED);
 
-            if (timerCount === 4) {
-              clearInterval(joiningTimer);
-              reject(new Error('Meeting is still not active '));
-            }
-          }, 1000);
-        }))
-        .then(() =>
-          logRequest(this.roap
-            .sendRoapMediaRequest({
-              sdp: this.mediaProperties.peerConnection.sdp,
-              roapSeq: this.roapSeq,
-              meeting: this // or can pass meeting ID
-            }), {
-            header: `${LOG_HEADER} Send Roap Media Request.`,
-            success: `${LOG_HEADER} Successfully send roap media request`,
-            failure: `${LOG_HEADER} Error joining the call on send roap media request, `
-          }))
-        .then(() => {
-          const {peerConnection} = this.mediaProperties;
-
-          return new Promise((resolve, reject) => {
-            if (peerConnection.connectionState === CONNECTION_STATE.CONNECTED) {
-              LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
+          return this.remoteMediaManager.start()
+            .then(() => mc.initiateOffer());
+        }
 
-              resolve(peerConnection);
+        return mc.initiateOffer();
+      })
+      .then(() => {
+        this.setMercuryListener();
+      })
+      .then(() => this.getDevices().then((devices) => {
+        MeetingUtil.handleDeviceLogging(devices);
+      }))
+      .then(() => {
+        this.handleMediaLogging(this.mediaProperties);
+        LoggerProxy.logger.info(`${LOG_HEADER} media connection created`);
+
+        // @ts-ignore - config coming from registerPlugin
+        if (this.config.stats.enableStatsAnalyzer) {
+          // @ts-ignore - config coming from registerPlugin
+          this.networkQualityMonitor = new NetworkQualityMonitor(this.config.stats);
+          // @ts-ignore - config coming from registerPlugin
+          this.statsAnalyzer = new StatsAnalyzer(this.config.stats, this.networkQualityMonitor);
+          this.setupStatsAnalyzerEventHandlers();
+          this.networkQualityMonitor.on(EVENT_TRIGGERS.NETWORK_QUALITY, this.sendNetworkQualityEvent.bind(this));
+        }
+      })
+      .catch((error) => {
+        LoggerProxy.logger.error(`${LOG_HEADER} Error adding media , setting up peerconnection, `, error);
 
-              return;
-            }
-            // Check if Peer Connection is STABLE (connected)
-            const stabilityTimeout = setTimeout(() => {
-              if (peerConnection.connectionState !== CONNECTION_STATE.CONNECTED) {
-                // TODO: Fix this after the error code pr goes in
-                reject(createMeetingsError(30202, 'Meeting connection failed'));
-              }
-              else {
-                LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
-                resolve(peerConnection);
-              }
-            }, PC_BAIL_TIMEOUT);
+        throw error;
+      })
+      .then(() => new Promise<void>((resolve, reject) => {
+        let timerCount = 0;
 
-            this.once(EVENT_TRIGGERS.MEDIA_READY, () => {
-              LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED, clearing stability timer.`);
-              clearTimeout(stabilityTimeout);
-              resolve(peerConnection);
-            });
-          });
-        })
-        .then(() => {
-          if (mediaSettings && mediaSettings.sendShare && localShare) {
-            if (this.state === MEETING_STATE.STATES.JOINED) {
-              return this.share();
-            }
+        // eslint-disable-next-line func-names
+        // eslint-disable-next-line prefer-arrow-callback
+        if (this.type === _CALL_) {
+          resolve();
+        }
+        const joiningTimer = setInterval(() => {
+          timerCount += 1;
+          if (this.meetingState === FULL_STATE.ACTIVE) {
+            clearInterval(joiningTimer);
+            resolve();
+          }
 
-            // When the self state changes to JOINED then request the floor
-            this.floorGrantPending = true;
+          if (timerCount === 4) {
+            clearInterval(joiningTimer);
+            reject(new Error('Meeting is still not active '));
+          }
+        }, 1000);
+      }))
+      .then(
+        () => this.mediaProperties.waitForMediaConnectionConnected()
+          .catch(() => {
+            throw createMeetingsError(30202, 'Meeting connection failed');
+          })
+      )
+      .then(() => {
+        LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
+        if (mediaSettings && mediaSettings.sendShare && localShare) {
+          if (this.state === MEETING_STATE.STATES.JOINED) {
+            return this.requestScreenShareFloor();
           }
 
-          Metrics.sendBehavioralMetric(
-            BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS,
-            {
-              correlation_id: this.correlationId,
-              locus_id: this.locusUrl.split('/').pop()
-            }
-          );
+          // When the self state changes to JOINED then request the floor
+          this.floorGrantPending = true;
+        }
 
-          return Promise.resolve();
-        }))
+        return {};
+      })
+      .then(() => this.mediaProperties.getCurrentConnectionType())
+      .then((connectionType) => {
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS,
+          {
+            correlation_id: this.correlationId,
+            locus_id: this.locusUrl.split('/').pop(),
+            connectionType
+          }
+        );
+      })
       .catch((error) => {
         // Clean up stats analyzer, peer connection, and turn off listeners
         const stopStatsAnalyzer = (this.statsAnalyzer) ? this.statsAnalyzer.stopAnalyzer() : Promise.resolve();
 
-        stopStatsAnalyzer
+        return stopStatsAnalyzer
           .then(() => {
             this.statsAnalyzer = null;
 
-            if (this.mediaProperties.peerConnection) {
+            if (this.mediaProperties.webrtcMediaConnection) {
               this.closePeerConnections();
               this.unsetPeerConnections();
             }
@@ -4413,10 +4886,7 @@ export default class Meeting extends StatelessWebexPlugin {
               this
             );
 
-            // If addMedia failes for not establishing connection then
-            // leave the meeting with reson connection failed as meeting anyways will end
-            // and cannot be connected unless network condition is checked for firewall
-            if (error.code === InvalidSdpError.CODE) {
+            if (error instanceof MC.Errors.SdpError) {
               this.leave({reason: MEETING_REMOVED_REASON.MEETING_CONNECTION_FAILED});
             }
 
@@ -4430,7 +4900,10 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {Boolean}
    */
   canUpdateMedia() {
-    return this.mediaProperties.peerConnection.signalingState === SDP.STABLE && !RoapCollection.isBusy(this.correlationId);
+    // in theory we shouldn't need this as RoapMediaConnection handles multiple updates, glare, etc,
+    // but there are some server issues, like https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-248394
+    // so for now it's better to keep queuing any media updates at SDK meeting level
+    return !this.isRoapInProgress;
   }
 
   /**
@@ -4441,7 +4914,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  enqueueMediaUpdate(mediaUpdateType, options) {
+  private enqueueMediaUpdate(mediaUpdateType: string, options: object) {
     return new Promise((resolve, reject) => {
       const queueItem = {
         pendingPromiseResolve: resolve, pendingPromiseReject: reject, mediaUpdateType, options
@@ -4459,6 +4932,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   mediaNegotiatedEvent = () => {
+    // @ts-ignore - config coming from registerPlugin
     if (this.config.experimental.enableMediaNegotiatedEvent) {
       LoggerProxy.logger.info('Meeting:mediaNegotiatedEvent --> Media server negotiated');
       Trigger.trigger(
@@ -4514,11 +4988,16 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {MediaStream} options.localShare
    * @param {MediaDirection} options.mediaSettings
    * @returns {Promise}
-   * @todo fix setRemoteStream for updateMedia
    * @public
    * @memberof Meeting
    */
-  updateMedia(options = {}) {
+  public updateMedia(
+    options: {
+      localStream?: MediaStream;
+      localShare?: MediaStream;
+      mediaSettings?: any;
+    } = {} as any
+  ) {
     const LOG_HEADER = 'Meeting:index#updateMedia -->';
 
     if (!this.canUpdateMedia()) {
@@ -4530,20 +5009,27 @@ export default class Meeting extends StatelessWebexPlugin {
 
     const previousSendShareStatus = this.mediaProperties.mediaDirection.sendShare;
 
+    if (!this.mediaProperties.webrtcMediaConnection) {
+      return Promise.reject(new Error('media connection not established, call addMedia() first'));
+    }
+
     return MeetingUtil.validateOptions(options)
       .then(() => this.preMedia(localStream, localShare, mediaSettings))
-      .then(() => Media.updateMedia(this.mediaProperties, {
-        meetingId: this.id,
-        remoteQualityLevel: this.mediaProperties.remoteQualityLevel,
-        enableRtx: this.config.enableRtx,
-        enableExtmap: this.config.enableExtmap,
+      .then(() => this.mediaProperties.webrtcMediaConnection.updateSendReceiveOptions({
+        send: {
+          audio: this.mediaProperties.mediaDirection.sendAudio ? this.mediaProperties.audioTrack : null,
+          video: this.mediaProperties.mediaDirection.sendVideo ? this.mediaProperties.videoTrack : null,
+          screenShareVideo: this.mediaProperties.mediaDirection.sendShare ? this.mediaProperties.shareTrack : null
+        },
+        receive: {
+          audio: this.mediaProperties.mediaDirection.receiveAudio,
+          video: this.mediaProperties.mediaDirection.receiveVideo,
+          screenShareVideo: this.mediaProperties.mediaDirection.receiveShare,
+          remoteQualityLevel: this.mediaProperties.remoteQualityLevel
+        }
       })
-        .then((peerConnection) => {
-          LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection received from updateMedia, ${peerConnection}`);
-          this.setRemoteStream(peerConnection);
-          if (mediaSettings.receiveShare || localShare) {
-            PeerConnectionManager.setContentSlides(peerConnection);
-          }
+        .then(() => {
+          LoggerProxy.logger.info(`${LOG_HEADER} webrtcMediaConnection.updateSendReceiveOptions done`);
         })
         .catch((error) => {
           LoggerProxy.logger.error(`${LOG_HEADER} Error updatedMedia, `, error);
@@ -4560,25 +5046,17 @@ export default class Meeting extends StatelessWebexPlugin {
 
           throw error;
         })
-        .then(() =>
-          logRequest(this.roap
-            .sendRoapMediaRequest({
-              sdp: this.mediaProperties.peerConnection.sdp,
-              roapSeq: this.roapSeq,
-              meeting: this, // or can pass meeting ID
-            }),
-          {
-            header: `${LOG_HEADER} sendRoapMediaRequest being sent`,
-            success: `${LOG_HEADER} sendRoadMediaRequest successful`,
-            failure: `${LOG_HEADER} Error updateMedia on send roap media request, `
-          }))
+        // todo: the following code used to be called always after sending the roap message with the new SDP
+        // now it's called independently from the roap message (so might be before it), check if that's OK
+        // if not, ensure it's called after (now it's called after roap message is sent out, but we're not
+        // waiting for sendRoapMediaRequest() to be resolved)
         .then(() => this.checkForStopShare(mediaSettings.sendShare, previousSendShareStatus))
         .then((startShare) => {
           // This is a special case if we do an /floor grant followed by /media
           // we actually get a OFFER from the server and a GLAR condition happens
           if (startShare) {
             // We are assuming that the clients are connected when doing an update
-            return this.share();
+            return this.requestScreenShareFloor();
           }
 
           return Promise.resolve();
@@ -4587,6 +5065,9 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Update the main audio track with new parameters
+   *
+   * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
+   *
    * @param {Object} options
    * @param {boolean} options.sendAudio
    * @param {boolean} options.receiveAudio
@@ -4595,21 +5076,21 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  async updateAudio(options) {
+  public async updateAudio(options: { sendAudio: boolean; receiveAudio: boolean; stream: MediaStream }) {
     if (!this.canUpdateMedia()) {
       return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.AUDIO, options);
     }
-    const {
-      sendAudio, receiveAudio, stream
-    } = options;
-
-    const {audioTransceiver} = this.mediaProperties.peerConnection;
+    const {sendAudio, receiveAudio, stream} = options;
     let track = MeetingUtil.getTrack(stream).audioTrack;
 
     if (typeof sendAudio !== 'boolean' || typeof receiveAudio !== 'boolean') {
       return Promise.reject(new ParameterError('Pass sendAudio and receiveAudio parameter'));
     }
 
+    if (!this.mediaProperties.webrtcMediaConnection) {
+      return Promise.reject(new Error('media connection not established, call addMedia() first'));
+    }
+
     if (this.effects && this.effects.state) {
       const bnrEnabled = this.effects.state.bnr.enabled;
 
@@ -4621,38 +5102,18 @@ export default class Meeting extends StatelessWebexPlugin {
     }
 
     return MeetingUtil.validateOptions({sendAudio, localStream: stream})
-      .then(() => {
-        let previousMediaDirection = {};
-
-        if (this.mediaProperties.mediaDirection) {
-          previousMediaDirection = {
-            sendTrack: this.mediaProperties.mediaDirection.sendAudio,
-            receiveTrack: this.mediaProperties.mediaDirection.receiveAudio
-          };
-        }
-        else {
-          this.mediaProperties.mediaDirection = {};
+      .then(() => this.mediaProperties.webrtcMediaConnection.updateSendReceiveOptions({
+        send: {audio: track},
+        receive: {
+          audio: options.receiveAudio,
+          video: this.mediaProperties.mediaDirection.receiveVideo,
+          screenShareVideo: this.mediaProperties.mediaDirection.receiveShare,
+          remoteQualityLevel: this.mediaProperties.remoteQualityLevel
         }
-
-        return MeetingUtil.updateTransceiver(
-          {
-            type: 'audio',
-            sendTrack: options.sendAudio,
-            receiveTrack: options.receiveAudio,
-            track,
-            transceiver: audioTransceiver,
-            peerConnection: this.mediaProperties.peerConnection,
-            previousMediaDirection
-          },
-          {
-            mediaProperties: this.mediaProperties,
-            meeting: this,
-            id: this.id
-          }
-        );
-      })
+      }))
       .then(() => {
         this.setLocalAudioTrack(track);
+        // todo: maybe this.mediaProperties.mediaDirection could be removed? it's duplicating stuff from webrtcMediaConnection
         this.mediaProperties.mediaDirection.sendAudio = sendAudio;
         this.mediaProperties.mediaDirection.receiveAudio = receiveAudio;
 
@@ -4663,6 +5124,9 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Update the main video track with new parameters
+   *
+   * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
+   *
    * @param {Object} options
    * @param {boolean} options.sendVideo
    * @param {boolean} options.receiveVideo
@@ -4671,35 +5135,30 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  updateVideo(options) {
+  public updateVideo(options: { sendVideo: boolean; receiveVideo: boolean; stream: MediaStream }) {
     if (!this.canUpdateMedia()) {
       return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.VIDEO, options);
     }
     const {sendVideo, receiveVideo, stream} = options;
-    const {videoTransceiver} = this.mediaProperties.peerConnection;
     const track = MeetingUtil.getTrack(stream).videoTrack;
 
     if (typeof sendVideo !== 'boolean' || typeof receiveVideo !== 'boolean') {
       return Promise.reject(new ParameterError('Pass sendVideo and receiveVideo parameter'));
     }
 
+    if (!this.mediaProperties.webrtcMediaConnection) {
+      return Promise.reject(new Error('media connection not established, call addMedia() first'));
+    }
+
     return MeetingUtil.validateOptions({sendVideo, localStream: stream})
-      .then(() => MeetingUtil.updateTransceiver({
-        type: 'video',
-        sendTrack: options.sendVideo,
-        receiveTrack: options.receiveVideo,
-        track,
-        transceiver: videoTransceiver,
-        peerConnection: this.mediaProperties.peerConnection,
-        previousMediaDirection: {
-          sendTrack: this.mediaProperties.mediaDirection.sendVideo,
-          receiveTrack: this.mediaProperties.mediaDirection.receiveVideo
+      .then(() => this.mediaProperties.webrtcMediaConnection.updateSendReceiveOptions({
+        send: {video: track},
+        receive: {
+          audio: this.mediaProperties.mediaDirection.receiveAudio,
+          video: options.receiveVideo,
+          screenShareVideo: this.mediaProperties.mediaDirection.receiveShare,
+          remoteQualityLevel: this.mediaProperties.remoteQualityLevel
         }
-      },
-      {
-        mediaProperties: this.mediaProperties,
-        meeting: this,
-        id: this.id
       }))
       .then(() => {
         this.setLocalVideoTrack(track);
@@ -4719,7 +5178,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  checkForStopShare(sendShare, previousShareStatus) {
+  private checkForStopShare(sendShare: boolean, previousShareStatus: boolean) {
     if (sendShare && !previousShareStatus) {
       // When user starts sharing
       return Promise.resolve(true);
@@ -4727,7 +5186,7 @@ export default class Meeting extends StatelessWebexPlugin {
 
     if (!sendShare && previousShareStatus) {
       // When user stops sharing
-      return this.stopFloorRequest()
+      return this.releaseScreenShareFloor()
         .then(() => Promise.resolve(false));
     }
 
@@ -4736,6 +5195,9 @@ export default class Meeting extends StatelessWebexPlugin {
 
   /**
    * Update the share streams, can be used to start sharing
+   *
+   * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
+   *
    * @param {Object} options
    * @param {boolean} options.sendShare
    * @param {boolean} options.receiveShare
@@ -4743,43 +5205,39 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  updateShare(options) {
+  public updateShare(options: { sendShare?: boolean; receiveShare?: boolean, stream?: any, skipSignalingCheck?: boolean }) {
     if (!options.skipSignalingCheck && !this.canUpdateMedia()) {
       return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE, options);
     }
     const {sendShare, receiveShare, stream} = options;
-    const {shareTransceiver} = this.mediaProperties.peerConnection;
     const track = MeetingUtil.getTrack(stream).videoTrack;
 
     if (typeof sendShare !== 'boolean' || typeof receiveShare !== 'boolean') {
       return Promise.reject(new ParameterError('Pass sendShare and receiveShare parameter'));
     }
+
+    if (!this.mediaProperties.webrtcMediaConnection) {
+      return Promise.reject(new Error('media connection not established, call addMedia() first'));
+    }
+
     const previousSendShareStatus = this.mediaProperties.mediaDirection.sendShare;
 
     this.setLocalShareTrack(stream);
 
     return MeetingUtil.validateOptions({sendShare, localShare: stream})
       .then(() => this.checkForStopShare(sendShare, previousSendShareStatus))
-      .then((startShare) => MeetingUtil.updateTransceiver({
-        type: 'video',
-        sendTrack: sendShare,
-        receiveTrack: receiveShare,
-        track,
-        transceiver: shareTransceiver,
-        peerConnection: this.mediaProperties.peerConnection,
-        previousMediaDirection: {
-          sendTrack: this.mediaProperties.mediaDirection.sendShare,
-          receiveTrack: this.mediaProperties.mediaDirection.receiveShare
+      .then((startShare) => this.mediaProperties.webrtcMediaConnection.updateSendReceiveOptions({
+        send: {screenShareVideo: track},
+        receive: {
+          audio: this.mediaProperties.mediaDirection.receiveAudio,
+          video: this.mediaProperties.mediaDirection.receiveVideo,
+          screenShareVideo: options.receiveShare,
+          remoteQualityLevel: this.mediaProperties.remoteQualityLevel
         }
-      },
-      {
-        mediaProperties: this.mediaProperties,
-        meeting: this,
-        id: this.id
       })
         .then(() => {
           if (startShare) {
-            return this.share();
+            return this.requestScreenShareFloor();
           }
 
           return Promise.resolve();
@@ -4789,24 +5247,8 @@ export default class Meeting extends StatelessWebexPlugin {
         this.mediaProperties.mediaDirection.receiveShare = receiveShare;
       })
       .catch((error) => {
-        this.unsetLocalShareTrack(stream);
+        this.unsetLocalShareTrack();
         throw error;
-      })
-      .finally(() => {
-        const delay = 1e3;
-        // Check to see if share was stopped natively before onended was assigned.
-        const sharingModeIsActive = this.mediaProperties.peerConnection.shareTransceiver.direction === SENDRECV;
-        const isSharingOutOfSync = sharingModeIsActive && !this.isLocalShareLive;
-
-        if (isSharingOutOfSync) {
-          // Adding a delay to avoid a 409 from server
-          // which results in user still appearing as if sharing.
-          // Also delay give time for changes to peerConnection.
-          setTimeout(
-            () => this.handleShareTrackEnded(stream),
-            delay
-          );
-        }
       });
   }
 
@@ -4819,9 +5261,10 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  preMedia(localStream, localShare, mediaSettings) {
+  private preMedia(localStream: MediaStream, localShare: MediaStream, mediaSettings: any) {
     // eslint-disable-next-line no-warning-comments
     // TODO wire into default config. There's currently an issue with the stateless plugin or how we register
+    // @ts-ignore - config coming from registerPlugin
     this.mediaProperties.setMediaDirection(Object.assign(this.config.mediaSettings, mediaSettings));
     // add a setup a function move the create and setup media in future
     // TODO: delete old audio and video if stale
@@ -4839,7 +5282,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  acknowledge(type) {
+  public acknowledge(type: string) {
     if (!type) {
       return Promise.reject(new ParameterError('Type must be set to acknowledge the meeting.'));
     }
@@ -4874,7 +5317,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  decline(reason) {
+  public decline(reason: string) {
     return MeetingUtil.declineMeeting(this, reason).then((decline) => {
       this.meetingFiniteStateMachine.decline();
 
@@ -4894,7 +5337,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  leave(options = {}) {
+  public leave(options: { resourceId?: string, reason?: any } = {} as any) {
     Metrics.postEvent({event: eventType.LEAVE, meeting: this, data: {trigger: trigger.USER_INTERACTION, canProceed: false}});
     const leaveReason = options.reason || MEETING_REMOVED_REASON.CLIENT_LEAVE_REQUEST;
 
@@ -4971,7 +5414,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  startWhiteboardShare(channelUrl, resourceToken) {
+  public startWhiteboardShare(channelUrl: string, resourceToken: string) {
     const whiteboard = this.locusInfo.mediaShares.find((element) => element.name === 'whiteboard');
 
     if (!channelUrl) {
@@ -4981,7 +5424,7 @@ export default class Meeting extends StatelessWebexPlugin {
     if (whiteboard) {
       Metrics.postEvent({event: eventType.WHITEBOARD_SHARE_INITIATED, meeting: this});
 
-      const body = {
+      const body: any = {
         disposition: FLOOR_ACTION.GRANTED,
         personUrl: this.locusInfo.self.url,
         deviceUrl: this.deviceUrl,
@@ -5027,7 +5470,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  stopWhiteboardShare(channelUrl) {
+  public stopWhiteboardShare(channelUrl: string) {
     const whiteboard = this.locusInfo.mediaShares.find((element) => element.name === 'whiteboard');
 
     if (whiteboard) {
@@ -5043,6 +5486,7 @@ export default class Meeting extends StatelessWebexPlugin {
           LoggerProxy.logger.error('Meeting:index#stopWhiteboardShare --> Error ', error);
 
           Metrics.sendBehavioralMetric(
+            // @ts-ignore - check if STOP_WHITEBOARD_SHARE_FAILURE exists
             BEHAVIORAL_METRICS.STOP_WHITEBOARD_SHARE_FAILURE,
             {
               correlation_id: this.correlationId,
@@ -5063,12 +5507,12 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * Start sharing content with server
+   * Sends a request to Locus to obtain the screen share floor
    * @returns {Promise} see #meetingRequest.changeMeetingFloor
    * @private
    * @memberof Meeting
    */
-  share() {
+  private requestScreenShareFloor() {
     const content = this.locusInfo.mediaShares.find((element) => element.name === CONTENT);
 
     if (content && (this.shareStatus !== SHARE_STATUS.LOCAL_SHARE_ACTIVE)) {
@@ -5114,7 +5558,7 @@ export default class Meeting extends StatelessWebexPlugin {
    */
   // Internal only, temporarily allows optional params
   // eslint-disable-next-line valid-jsdoc
-  stopShare(options = {}) {
+  public stopShare(options = {}) {
     return this.updateShare({
       sendShare: false,
       receiveShare: this.mediaProperties.mediaDirection.receiveShare,
@@ -5123,12 +5567,12 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
-   * sends stops floor request
+   * Sends a request to Locus to release the screen share floor.
    * @returns {Promise} see #meetingRequest.changeMeetingFloor
    * @private
    * @memberof Meeting
    */
-  stopFloorRequest() {
+  private releaseScreenShareFloor() {
     const content = this.locusInfo.mediaShares.find((element) => element.name === CONTENT);
 
     if (content && (this.mediaProperties.mediaDirection.sendShare)) {
@@ -5150,7 +5594,7 @@ export default class Meeting extends StatelessWebexPlugin {
         resourceUrl: this.resourceUrl
       })
         .catch((error) => {
-          LoggerProxy.logger.error('Meeting:index#stopFloorRequest --> Error ', error);
+          LoggerProxy.logger.error('Meeting:index#releaseScreenShareFloor --> Error ', error);
 
           Metrics.sendBehavioralMetric(
             BEHAVIORAL_METRICS.STOP_FLOOR_REQUEST_FAILURE,
@@ -5178,7 +5622,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  startRecording() {
+  public startRecording() {
     return MeetingUtil.startRecording(this.meetingRequest, this.locusUrl, this.locusInfo);
   }
 
@@ -5188,7 +5632,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  stopRecording() {
+  public stopRecording() {
     return MeetingUtil.stopRecording(this.meetingRequest, this.locusUrl, this.locusInfo);
   }
 
@@ -5198,7 +5642,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  pauseRecording() {
+  public pauseRecording() {
     return MeetingUtil.pauseRecording(this.meetingRequest, this.locusUrl, this.locusInfo);
   }
 
@@ -5208,7 +5652,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  resumeRecording() {
+  public resumeRecording() {
     return MeetingUtil.resumeRecording(this.meetingRequest, this.locusUrl, this.locusInfo);
   }
 
@@ -5218,7 +5662,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  lockMeeting() {
+  public lockMeeting() {
     return MeetingUtil.lockMeeting(this.inMeetingActions, this.meetingRequest, this.locusUrl);
   }
 
@@ -5228,7 +5672,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  unlockMeeting() {
+  public unlockMeeting() {
     return MeetingUtil.unlockMeeting(this.inMeetingActions, this.meetingRequest, this.locusUrl);
   }
 
@@ -5239,7 +5683,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  rejectWithErrorLog(message) {
+  private rejectWithErrorLog(message: string) {
     LoggerProxy.logger.error(message);
 
     return Promise.reject(new Error(message));
@@ -5252,7 +5696,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  sendDTMF(tones) {
+  public sendDTMF(tones: string) {
     if (this.locusInfo && this.locusInfo.self) {
       if (this.locusInfo.self.enableDTMF) {
         return this.meetingRequest
@@ -5283,7 +5727,19 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  changeVideoLayout(layoutType, renderInfo = {}) {
+  public changeVideoLayout(
+    layoutType?: string,
+    renderInfo: {
+      main: {
+        width: number;
+        height: number;
+      };
+      content: {
+        width: number;
+        height: number;
+      };
+    } = {} as any
+  ) {
     const {main, content} = renderInfo;
     const {mediaDirection, remoteShare, remoteVideoTrack} = this.mediaProperties;
 
@@ -5379,7 +5835,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {String} level {LOW|MEDIUM|HIGH}
    * @returns {Promise<MediaStream>} localStream
    */
-  setLocalVideoQuality(level) {
+  setLocalVideoQuality(level: string) {
     LoggerProxy.logger.log(`Meeting:index#setLocalVideoQuality --> Setting quality to ${level}`);
 
     if (!VIDEO_RESOLUTIONS[level]) {
@@ -5429,7 +5885,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {String} level {LOW|MEDIUM|HIGH}
    * @returns {Promise}
    */
-  setRemoteQualityLevel(level) {
+  setRemoteQualityLevel(level: string) {
     LoggerProxy.logger.log(`Meeting:index#setRemoteQualityLevel --> Setting quality to ${level}`);
 
     if (!QUALITY_LEVELS[level]) {
@@ -5459,7 +5915,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @returns {Promise}
    * @deprecated After FHD support
    */
-  setMeetingQuality(level) {
+  setMeetingQuality(level: string) {
     LoggerProxy.logger.log(`Meeting:index#setMeetingQuality --> Setting quality to ${level}`);
 
     if (!QUALITY_LEVELS[level]) {
@@ -5514,6 +5970,9 @@ export default class Meeting extends StatelessWebexPlugin {
   }
 
   /**
+  *
+  * NOTE: this method can only be used with transcoded meetings, for multistream use publishTrack()
+  *
   * @param {Object} options parameter
   * @param {Boolean} options.sendAudio send audio from the display share
   * @param {Boolean} options.sendShare send video from the display share
@@ -5523,7 +5982,13 @@ export default class Meeting extends StatelessWebexPlugin {
   * @param {Boolean} options.sharePreferences.highFrameRate if shareConstraints isn't provided, set default values based off of this boolean
   * @returns {Promise}
   */
-  shareScreen(options = {}) {
+  shareScreen(
+    options: {
+      sendAudio: boolean;
+      sendShare: boolean;
+      sharePreferences: { shareConstraints: MediaTrackConstraints };
+    } = {} as any
+  ) {
     LoggerProxy.logger.log('Meeting:index#shareScreen --> Getting local share');
 
     const shareConstraints = {
@@ -5532,6 +5997,7 @@ export default class Meeting extends StatelessWebexPlugin {
       ...options
     };
 
+    // @ts-ignore - config coming from registerPlugin
     return Media.getDisplayMedia(shareConstraints, this.config)
       .then((shareStream) => this.updateShare({
         sendShare: true,
@@ -5569,7 +6035,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {MediaStream} localShare
    * @returns {undefined}
    */
-  handleShareTrackEnded(localShare) {
+  private handleShareTrackEnded(localShare: MediaStream) {
     if (this.wirelessShare) {
       this.leave({reason: MEETING_REMOVED_REASON.USER_ENDED_SHARE_STREAMS});
     }
@@ -5609,7 +6075,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  sendNetworkQualityEvent(res) {
+  private sendNetworkQualityEvent(res: any) {
     Trigger.trigger(
       this,
       {
@@ -5631,7 +6097,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @returns {undefined}
    */
-  handleMediaLogging({audioTrack, videoTrack}) {
+  private handleMediaLogging({ audioTrack, videoTrack }: any) {
     MeetingUtil.handleVideoLogging(videoTrack);
     MeetingUtil.handleAudioLogging(audioTrack);
   }
@@ -5640,7 +6106,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {undefined}
    */
-  setStartSetupDelay(typeMedia) {
+  setStartSetupDelay(typeMedia: string) {
     this[`startSetupDelay${typeMedia}`] = performance.now();
     this[`endSetupDelay${typeMedia}`] = undefined;
   }
@@ -5649,7 +6115,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {undefined}
    */
-  setEndSetupDelay(typeMedia) {
+  setEndSetupDelay(typeMedia: string) {
     this[`endSetupDelay${typeMedia}`] = performance.now();
   }
 
@@ -5657,7 +6123,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {string} duration between start and end of setup
    */
-  getSetupDelayDuration(typeMedia) {
+  getSetupDelayDuration(typeMedia: string) {
     const start = this[`startSetupDelay${typeMedia}`];
     const end = this[`endSetupDelay${typeMedia}`];
 
@@ -5668,7 +6134,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {undefined}
    */
-  setStartSendingMediaDelay(typeMedia) {
+  setStartSendingMediaDelay(typeMedia: string) {
     this[`startSendingMediaDelay${typeMedia}`] = performance.now();
     this[`endSendingMediaDelay${typeMedia}`] = undefined;
   }
@@ -5677,7 +6143,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {undefined}
    */
-  setEndSendingMediaDelay(typeMedia) {
+  setEndSendingMediaDelay(typeMedia: string) {
     this[`endSendingMediaDelay${typeMedia}`] = performance.now();
   }
 
@@ -5685,7 +6151,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {string} typeMedia 'audio' or 'video'
    * @returns {string} duration between join response and first media tx
    */
-  getSendingMediaDelayDuration(typeMedia) {
+  getSendingMediaDelayDuration(typeMedia: string) {
     const start = this[`startSendingMediaDelay${typeMedia}`];
     const end = this[`endSendingMediaDelay${typeMedia}`];
 
@@ -5696,7 +6162,7 @@ export default class Meeting extends StatelessWebexPlugin {
    *
    * @returns {undefined}
    */
-  setStartLocalSDPGenRemoteSDPRecvDelay() {
+   setStartLocalSDPGenRemoteSDPRecvDelay() {
     if (!this.startLocalSDPGenRemoteSDPRecvDelay) {
       this.startLocalSDPGenRemoteSDPRecvDelay = performance.now();
       this.endLocalSDPGenRemoteSDPRecvDelay = undefined;
@@ -5822,7 +6288,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  endMeetingForAll() {
+  public endMeetingForAll() {
     Metrics.postEvent({event: eventType.LEAVE, meeting: this, data: {trigger: trigger.USER_INTERACTION, canProceed: false}});
 
     LoggerProxy.logger.log('Meeting:index#endMeetingForAll --> End meeting for All');
@@ -5907,7 +6373,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  isBnrEnabled() {
+  public isBnrEnabled() {
     return this.effects && this.effects.isBnrEnabled();
   }
 
@@ -5918,7 +6384,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @param {MedaiStreamTrack} audioTrack from updateAudio
    * @memberof Meeting
    */
-  async internal_enableBNR(audioTrack) {
+  private async internal_enableBNR(audioTrack: any) {
     try {
       LoggerProxy.logger.info('Meeting:index#internal_enableBNR. Internal enable BNR called');
       const bnrAudioTrack = await WebRTCMedia.Effects.BNR.enableBNR(audioTrack);
@@ -5939,7 +6405,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  enableBNR() {
+  public enableBNR() {
     if (typeof this.mediaProperties === 'undefined' || typeof this.mediaProperties.audioTrack === 'undefined') {
       return Promise.reject(new Error("Meeting doesn't have an audioTrack attached"));
     }
@@ -5974,7 +6440,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @public
    * @memberof Meeting
    */
-  disableBNR() {
+  public disableBNR() {
     if (typeof this.mediaProperties === 'undefined' || typeof this.mediaProperties.audioTrack === 'undefined') {
       return Promise.reject(new Error("Meeting doesn't have an audioTrack attached"));
     }