@webex/plugin-meetings 3.8.0-next.5 → 3.8.0-next.51

package/dist/types/metrics/constants.d.ts

@@ -45,10 +45,19 @@ declare const BEHAVIORAL_METRICS: {
     UPLOAD_LOGS_FAILURE: string;
     UPLOAD_LOGS_SUCCESS: string;
     RECEIVE_TRANSCRIPTION_FAILURE: string;
+    MEETING_IS_IN_PROGRESS_ERROR: string;
+    STATIC_MEETING_LINK_ALREADY_EXISTS_ERROR: string;
     FETCH_MEETING_INFO_V1_SUCCESS: string;
     FETCH_MEETING_INFO_V1_FAILURE: string;
+    ENABLE_STATIC_METTING_LINK_SUCCESS: string;
+    ENABLE_STATIC_METTING_LINK_FAILURE: string;
+    DISABLE_STATIC_MEETING_LINK_SUCCESS: string;
+    DISABLE_STATIC_MEETING_LINK_FAILURE: string;
     ADHOC_MEETING_SUCCESS: string;
     ADHOC_MEETING_FAILURE: string;
+    FETCH_STATIC_MEETING_LINK_SUCCESS: string;
+    FETCH_STATIC_MEETING_LINK_FAILURE: string;
+    MEETING_LINK_DOES_NOT_EXIST_ERROR: string;
     VERIFY_PASSWORD_SUCCESS: string;
     VERIFY_PASSWORD_ERROR: string;
     VERIFY_CAPTCHA_ERROR: string;

package/dist/types/reachability/clusterReachability.d.ts

@@ -1,7 +1,7 @@
 import { ClusterNode } from './request';
 import EventsScope from '../common/events/events-scope';
 import { Enum } from '../constants';
-import { ClusterReachabilityResult } from './reachability.types';
+import { ClusterReachabilityResult, NatType } from './reachability.types';
 export type ResultEventData = {
     protocol: 'udp' | 'tcp' | 'xtls';
     result: 'reachable' | 'unreachable' | 'untested';
@@ -12,9 +12,13 @@ export type ClientMediaIpsUpdatedEventData = {
     protocol: 'udp' | 'tcp' | 'xtls';
     clientMediaIPs: string[];
 };
+export type NatTypeUpdatedEventData = {
+    natType: NatType;
+};
 export declare const Events: {
     readonly resultReady: "resultReady";
     readonly clientMediaIpsUpdated: "clientMediaIpsUpdated";
+    readonly natTypeUpdated: "natTypeUpdated";
 };
 export type Events = Enum<typeof Events>;
 /**
@@ -29,8 +33,10 @@ export declare class ClusterReachability extends EventsScope {
     private pc?;
     private defer;
     private startTimestamp;
+    private srflxIceCandidates;
     readonly isVideoMesh: boolean;
     readonly name: any;
+    readonly reachedSubnets: Set<string>;
     /**
      * Constructor for ClusterReachability
      * @param {string} name cluster name
@@ -89,12 +95,6 @@ export declare class ClusterReachability extends EventsScope {
      * @returns {void}
      */
     private registerIceGatheringStateChangeListener;
-    /**
-     * Checks if we have the results for all the protocols (UDP and TCP)
-     *
-     * @returns {boolean} true if we have all results, false otherwise
-     */
-    private haveWeGotAllResults;
     /**
      * Saves the latency in the result for the given protocol and marks it as reachable,
      * emits the "resultReady" event if this is the first result for that protocol,
@@ -104,9 +104,17 @@ export declare class ClusterReachability extends EventsScope {
      * @param {string} protocol
      * @param {number} latency
      * @param {string|null} [publicIp]
+     * @param {string|null} [serverIp]
      * @returns {void}
      */
     private saveResult;
+    /**
+     * Determines NAT Type.
+     *
+     * @param {RTCIceCandidate} candidate
+     * @returns {void}
+     */
+    private determineNatType;
     /**
      * Registers a listener for the icecandidate event
      *

package/dist/types/reachability/index.d.ts

@@ -4,7 +4,7 @@
 import { Defer } from '@webex/common';
 import { IP_VERSION } from '../constants';
 import ReachabilityRequest, { ClusterList } from './request';
-import { ClusterReachabilityResult, ClientMediaPreferences, ReachabilityMetrics, ReachabilityReportV0, ReachabilityReportV1, ReachabilityResults, ReachabilityResultsForBackend, GetClustersTrigger } from './reachability.types';
+import { ClusterReachabilityResult, ClientMediaPreferences, ReachabilityMetrics, ReachabilityReportV0, ReachabilityReportV1, ReachabilityResults, ReachabilityResultsForBackend, GetClustersTrigger, NatType } from './reachability.types';
 import { ClusterReachability } from './clusterReachability';
 import EventsScope from '../common/events/events-scope';
 /**
@@ -46,6 +46,7 @@ export default class Reachability extends EventsScope {
     };
     startTime: any;
     totalDuration: any;
+    natType: NatType;
     protected lastTrigger?: string;
     /**
      * Creates an instance of Reachability.
@@ -65,6 +66,14 @@ export default class Reachability extends EventsScope {
         clusters: ClusterList;
         joinCookie: any;
     }>;
+    /**
+     * Checks if the given subnet is reachable
+     * @param {string} mediaServerIp - media server ip
+     * @returns {boolean | null} true if reachable, false if not reachable, null if mediaServerIp is not provided
+     * @public
+     * @memberof Reachability
+     */
+    isSubnetReachable(mediaServerIp?: string): boolean | null;
     /**
      * Gets a list of media clusters from the backend and performs reachability checks on all the clusters
      * @param {string} trigger - explains the reason for starting reachability

package/dist/types/reachability/reachability.types.d.ts

@@ -4,6 +4,10 @@ export type TransportResult = {
     latencyInMilliseconds?: number;
     clientMediaIPs?: string[];
 };
+export declare enum NatType {
+    Unknown = "unknown",
+    SymmetricNat = "symmetric-nat"
+}
 export type ClusterReachabilityResult = {
     udp: TransportResult;
     tcp: TransportResult;
@@ -22,6 +26,7 @@ export type ReachabilityMetrics = {
     reachability_vmn_tcp_failed: number;
     reachability_vmn_xtls_success: number;
     reachability_vmn_xtls_failed: number;
+    natType: NatType;
 };
 /**
  * This is the type that matches what backend expects us to send to them. It is a bit weird, because

package/dist/types/roap/index.d.ts

@@ -1,7 +1,8 @@
 import { StatelessWebexPlugin } from '@webex/webex-core';
-import TurnDiscovery, { TurnDiscoveryResult } from './turnDiscovery';
+import TurnDiscovery from './turnDiscovery';
+import { TurnDiscoveryResult } from './types';
 import Meeting from '../meeting';
-export { type TurnDiscoveryResult, type TurnServerInfo, type TurnDiscoverySkipReason, } from './turnDiscovery';
+export { type TurnDiscoveryResult, type TurnServerInfo, type TurnDiscoverySkipReason } from './types';
 /**
  * Roap options
  * @typedef {Object} RoapOptions

package/dist/types/roap/turnDiscovery.d.ts

@@ -1,21 +1,6 @@
-import { Enum } from '../constants';
 import RoapRequest from './request';
 import Meeting from '../meeting';
-declare const TurnDiscoverySkipReason: {
-    readonly missingHttpResponse: "missing http response";
-    readonly reachability: "reachability";
-    readonly alreadyInProgress: "already in progress";
-};
-export type TurnDiscoverySkipReason = Enum<typeof TurnDiscoverySkipReason> | string | undefined;
-export type TurnServerInfo = {
-    url: string;
-    username: string;
-    password: string;
-};
-export type TurnDiscoveryResult = {
-    turnServerInfo?: TurnServerInfo;
-    turnDiscoverySkippedReason: TurnDiscoverySkipReason;
-};
+import { TurnDiscoverySkipReason, TurnDiscoveryResult } from './types';
 /**
  * Handles the process of finding out TURN server information from Linus.
  * This is achieved by sending a TURN_DISCOVERY_REQUEST.
@@ -25,6 +10,10 @@ export default class TurnDiscovery {
     private defer?;
     private turnInfo;
     private responseTimer?;
+    /** Resets the turnInfo structure to the defaults
+     * @returns {void}
+     */
+    private resetTurnInfo;
     /**
      * Constructor
      *
@@ -152,4 +141,3 @@ export default class TurnDiscovery {
      */
     doTurnDiscovery(meeting: Meeting, isReconnecting?: boolean, isForced?: boolean): Promise<TurnDiscoveryResult>;
 }
-export {};

package/dist/types/roap/types.d.ts

@@ -0,0 +1,16 @@
+import { Enum } from '../constants';
+export declare const TurnDiscoverySkipReason: {
+    readonly missingHttpResponse: "missing http response";
+    readonly reachability: "reachability";
+    readonly alreadyInProgress: "already in progress";
+};
+export type TurnDiscoverySkipReason = Enum<typeof TurnDiscoverySkipReason> | string | undefined;
+export type TurnServerInfo = {
+    urls: string[];
+    username: string;
+    password: string;
+};
+export type TurnDiscoveryResult = {
+    turnServerInfo?: TurnServerInfo;
+    turnDiscoverySkippedReason: TurnDiscoverySkipReason;
+};

package/dist/webinar/index.js

@@ -458,7 +458,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee7);
     }))();
   },
-  version: "3.8.0-next.5"
+  version: "3.8.0-next.51"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -43,13 +43,13 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-meetings": "3.8.0-next.5",
-    "@webex/plugin-rooms": "3.8.0-next.1",
-    "@webex/test-helper-chai": "3.8.0-next.1",
-    "@webex/test-helper-mocha": "3.8.0-next.1",
-    "@webex/test-helper-mock-webex": "3.8.0-next.1",
-    "@webex/test-helper-retry": "3.8.0-next.1",
-    "@webex/test-helper-test-users": "3.8.0-next.1",
+    "@webex/plugin-meetings": "3.8.0-next.51",
+    "@webex/plugin-rooms": "3.8.0-next.19",
+    "@webex/test-helper-chai": "3.8.0-next.15",
+    "@webex/test-helper-mocha": "3.8.0-next.15",
+    "@webex/test-helper-mock-webex": "3.8.0-next.15",
+    "@webex/test-helper-retry": "3.8.0-next.15",
+    "@webex/test-helper-test-users": "3.8.0-next.15",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -61,22 +61,22 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.8.0-next.1",
+    "@webex/common": "3.8.0-next.15",
     "@webex/event-dictionary-ts": "^1.0.1688",
-    "@webex/internal-media-core": "2.14.4",
-    "@webex/internal-plugin-conversation": "3.8.0-next.1",
-    "@webex/internal-plugin-device": "3.8.0-next.1",
-    "@webex/internal-plugin-llm": "3.8.0-next.2",
-    "@webex/internal-plugin-mercury": "3.8.0-next.1",
-    "@webex/internal-plugin-metrics": "3.8.0-next.1",
-    "@webex/internal-plugin-support": "3.8.0-next.1",
-    "@webex/internal-plugin-user": "3.8.0-next.1",
-    "@webex/internal-plugin-voicea": "3.8.0-next.5",
-    "@webex/media-helpers": "3.8.0-next.1",
-    "@webex/plugin-people": "3.8.0-next.1",
-    "@webex/plugin-rooms": "3.8.0-next.1",
+    "@webex/internal-media-core": "2.14.7",
+    "@webex/internal-plugin-conversation": "3.8.0-next.19",
+    "@webex/internal-plugin-device": "3.8.0-next.15",
+    "@webex/internal-plugin-llm": "3.8.0-next.18",
+    "@webex/internal-plugin-mercury": "3.8.0-next.17",
+    "@webex/internal-plugin-metrics": "3.8.0-next.15",
+    "@webex/internal-plugin-support": "3.8.0-next.19",
+    "@webex/internal-plugin-user": "3.8.0-next.15",
+    "@webex/internal-plugin-voicea": "3.8.0-next.51",
+    "@webex/media-helpers": "3.8.0-next.16",
+    "@webex/plugin-people": "3.8.0-next.17",
+    "@webex/plugin-rooms": "3.8.0-next.19",
     "@webex/web-capabilities": "^1.4.0",
-    "@webex/webex-core": "3.8.0-next.1",
+    "@webex/webex-core": "3.8.0-next.15",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -92,5 +92,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.8.0-next.5"
+  "version": "3.8.0-next.51"
 }

package/src/config.ts

@@ -95,6 +95,7 @@ export default {
     // This only applies to non-multistream meetings
     iceCandidatesGatheringTimeout: undefined,
     backendIpv6NativeSupport: false,
+    enableReachabilityChecks: true,
     reachabilityGetClusterTimeout: 5000,
     logUploadIntervalMultiplicationFactor: 0, // if set to 0 or undefined, logs won't be uploaded periodically, if you want periodic logs, recommended value is 1
   },

package/src/constants.ts

@@ -369,6 +369,9 @@ export const EVENT_TRIGGERS = {
   MEETING_CONTROLS_MEETING_FULL_UPDATED: 'meeting:controls:meeting-full:updated',
   MEETING_CONTROLS_PRACTICE_SESSION_STATUS_UPDATED:
     'meeting:controls:practice-session-status:updated',
+  MEETING_CONTROLS_ANNOTATION_UPDATED: 'meeting:controls:annotation:updated',
+  MEETING_CONTROLS_REMOTE_DESKTOP_CONTROL_UPDATED:
+    'meeting:controls:remote-desktop-control:updated',
   // Locus URL changed
   MEETING_LOCUS_URL_UPDATE: 'meeting:locus:locusUrl:update',
   MEETING_STREAM_PUBLISH_STATE_CHANGED: 'meeting:streamPublishStateChanged',
@@ -711,6 +714,8 @@ export const LOCUSINFO = {
     CONTROLS_PRACTICE_SESSION_STATUS_UPDATED: 'CONTROLS_PRACTICE_SESSION_STATUS_UPDATED',
     CONTROLS_VIDEO_CHANGED: 'CONTROLS_VIDEO_CHANGED',
     CONTROLS_STAGE_VIEW_UPDATED: 'CONTROLS_STAGE_VIEW_UPDATED',
+    CONTROLS_ANNOTATION_CHANGED: 'CONTROLS_ANNOTATION_CHANGED',
+    CONTROLS_REMOTE_DESKTOP_CONTROL_CHANGED: 'CONTROLS_REMOTE_DESKTOP_CONTROL_CHANGED',
     SELF_UNADMITTED_GUEST: 'SELF_UNADMITTED_GUEST',
     SELF_ADMITTED_GUEST: 'SELF_ADMITTED_GUEST',
     SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED: 'SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED',
@@ -904,6 +909,7 @@ export enum SELF_POLICY {
   ENFORCE_VIRTUAL_BACKGROUND = 'enforceVirtualBackground',
   SUPPORT_LOCAL_RECORD = 'supportLocalRecord',
   SUPPORT_NETWORK_BASED_RECORD = 'supportNetworkBasedRecord',
+  SUPPORT_PREMISE_RECORD = 'supportPremiseRecord',
   SUPPORT_REALTIME_CLOSE_CAPTION = 'supportRealtimeCloseCaption',
   SUPPORT_CHAT = 'supportChat',
   SUPPORT_DESKTOP_SHARE_REMOTE = 'supportDesktopShareRemote',
@@ -1025,6 +1031,17 @@ export const DISPLAY_HINTS = {
   PRACTICE_SESSION_OFF: 'PRACTICE_SESSION_OFF',
   SHOW_PRACTICE_SESSION_START: 'SHOW_PRACTICE_SESSION_START',
   SHOW_PRACTICE_SESSION_STOP: 'SHOW_PRACTICE_SESSION_STOP',
+
+  // Explicit consent for post meeting data
+  SHOW_POST_MEETING_DATA_CONSENT_PROMPT: 'SHOW_POST_MEETING_DATA_CONSENT_PROMPT',
+
+  // Annotations
+  ENABLE_ANNOTATION_MEETING_OPTION: 'ENABLE_ANNOTATION_MEETING_OPTION',
+  DISABLE_ANNOTATION_MEETING_OPTION: 'DISABLE_ANNOTATION_MEETING_OPTION',
+
+  // Remote Desktop Control
+  ENABLE_RDC_MEETING_OPTION: 'ENABLE_RDC_MEETING_OPTION',
+  DISABLE_RDC_MEETING_OPTION: 'DISABLE_RDC_MEETING_OPTION',
 };
 
 export const INTERSTITIAL_DISPLAY_HINTS = [DISPLAY_HINTS.VOIP_IS_ENABLED];

package/src/controls-options-manager/enums.ts

@@ -12,6 +12,8 @@ enum Control {
   shareControl = 'shareControl',
   video = 'video',
   viewTheParticipantList = 'viewTheParticipantList',
+  annotation = 'annotation',
+  rdc = 'rdc',
 }
 
 export {Control, Setting};

package/src/controls-options-manager/types.ts

@@ -40,13 +40,23 @@ export interface ViewTheParticipantListProperties {
   attendeeCount?: boolean;
 }
 
+export interface AnnotationProperties {
+  enabled?: boolean;
+}
+
+export interface RemoteDesktopControlProperties {
+  enabled?: boolean;
+}
+
 export type Properties =
   | AudioProperties
   | RaiseHandProperties
   | ReactionsProperties
   | ShareControlProperties
   | VideoProperties
-  | ViewTheParticipantListProperties;
+  | ViewTheParticipantListProperties
+  | AnnotationProperties
+  | RemoteDesktopControlProperties;
 
 export interface ControlConfig<Props = Properties> {
   /**

package/src/controls-options-manager/util.ts

@@ -7,6 +7,8 @@ import {
   ReactionsProperties,
   ViewTheParticipantListProperties,
   VideoProperties,
+  type RemoteDesktopControlProperties,
+  type AnnotationProperties,
 } from './types';
 
 /**
@@ -256,6 +258,52 @@ class Utils {
     return Utils.hasHints({requiredHints, displayHints});
   }
 
+  /**
+   * Validate if a annotation-scoped control is allowed to be sent to the service.
+   *
+   * @param {ControlConfig<AnnotationProperties>} control - Annotation control config to validate
+   * @param {Array<string>} displayHints - All available hints
+   * @returns {boolean} - True if all of the actions are allowed.
+   */
+  public static canUpdateAnnotation(
+    control: ControlConfig<AnnotationProperties>,
+    displayHints: Array<string>
+  ): boolean {
+    const requiredHints = [];
+
+    if (control.properties.enabled === true) {
+      requiredHints.push(DISPLAY_HINTS.ENABLE_ANNOTATION_MEETING_OPTION);
+    }
+    if (control.properties.enabled === false) {
+      requiredHints.push(DISPLAY_HINTS.DISABLE_ANNOTATION_MEETING_OPTION);
+    }
+
+    return Utils.hasHints({requiredHints, displayHints});
+  }
+
+  /**
+   * Validate if a rdc-scoped control is allowed to be sent to the service.
+   *
+   * @param {ControlConfig<RemoteDesktopControlProperties>} control - Remote Desktop Control config to validate
+   * @param {Array<string>} displayHints - All available hints
+   * @returns {boolean} - True if all of the actions are allowed.
+   */
+  public static canUpdateRemoteDesktopControl(
+    control: ControlConfig<RemoteDesktopControlProperties>,
+    displayHints: Array<string>
+  ): boolean {
+    const requiredHints = [];
+
+    if (control.properties.enabled === true) {
+      requiredHints.push(DISPLAY_HINTS.ENABLE_RDC_MEETING_OPTION);
+    }
+    if (control.properties.enabled === false) {
+      requiredHints.push(DISPLAY_HINTS.DISABLE_RDC_MEETING_OPTION);
+    }
+
+    return Utils.hasHints({requiredHints, displayHints});
+  }
+
   /**
    * Validate that a control can be sent to the service based on the provided
    * display hints.
@@ -301,6 +349,20 @@ class Utils {
         );
         break;
 
+      case Control.annotation:
+        determinant = Utils.canUpdateAnnotation(
+          control as ControlConfig<AnnotationProperties>,
+          displayHints
+        );
+        break;
+
+      case Control.rdc:
+        determinant = Utils.canUpdateRemoteDesktopControl(
+          control as ControlConfig<RemoteDesktopControlProperties>,
+          displayHints
+        );
+        break;
+
       default:
         determinant = false;
     }

package/src/locus-info/controlsUtils.ts

@@ -1,5 +1,5 @@
 import {isEqual} from 'lodash';
-import {BREAKOUTS} from '../constants';
+import {BREAKOUTS, MEETING_STATE} from '../constants';
 
 const ControlsUtils: any = {};
 
@@ -111,6 +111,18 @@ ControlsUtils.parse = (controls: any) => {
     };
   }
 
+  if (controls?.annotationControl) {
+    parsedControls.annotationControl = {
+      enabled: controls.annotationControl.enabled,
+    };
+  }
+
+  if (controls?.rdcControl) {
+    parsedControls.rdcControl = {
+      enabled: controls.rdcControl.enabled,
+    };
+  }
+
   return parsedControls;
 };
 
@@ -206,11 +218,17 @@ ControlsUtils.getControls = (oldControls: any, newControls: any) => {
         ),
 
       hasPracticeSessionEnabledChanged: !isEqual(
-        previous?.practiceSession?.enabled,
-        current?.practiceSession?.enabled
+        !!previous?.practiceSession?.enabled,
+        !!current?.practiceSession?.enabled
       ),
 
       hasStageViewChanged: !isEqual(previous?.videoLayout, current?.videoLayout),
+
+      hasAnnotationControlChanged:
+        current?.annotationControl?.enabled !== previous?.annotationControl?.enabled,
+
+      hasRemoteDesktopControlChanged:
+        current?.rdcControl?.enabled !== previous?.rdcControl?.enabled,
     },
   };
 };
@@ -242,30 +260,42 @@ ControlsUtils.isNeedReplaceMembers = (oldControls: any, controls: any) => {
   }
 
   return (
-    oldControls.breakout.groupId !== controls.breakout.groupId ||
-    oldControls.breakout.sessionId !== controls.breakout.sessionId
+    oldControls?.breakout?.groupId !== controls?.breakout?.groupId ||
+    oldControls?.breakout?.sessionId !== controls?.breakout?.sessionId
   );
 };
 
 /**
  * determine the switch status between breakout session and main session.
- * @param {LocusControls} oldControls
- * @param {LocusControls} controls
+ * @param {LocusInfo} oldLocus
+ * @param {LocusInfo} newLocus
  * @returns {Object}
  */
-ControlsUtils.getSessionSwitchStatus = (oldControls: any, controls: any) => {
+ControlsUtils.getSessionSwitchStatus = (oldLocus: any, newLocus: any) => {
   const status = {isReturnToMain: false, isJoinToBreakout: false};
   // no breakout case
-  if (!oldControls?.breakout || !controls?.breakout) {
+  if (!oldLocus.controls?.breakout || !newLocus.controls?.breakout) {
     return status;
   }
 
-  status.isReturnToMain =
-    oldControls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.BREAKOUT &&
-    controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.MAIN;
+  // It is used to fix the timing issue triggered when the creator leaves session to ensure that the member list is complete
+  const needUseCache = !!(
+    oldLocus.self?.isCreator &&
+    newLocus.participants?.length === 1 &&
+    newLocus.participants?.[0].isCreator &&
+    newLocus.participants?.[0].state === MEETING_STATE.STATES.JOINED &&
+    newLocus.controls?.breakout?.sessionType === BREAKOUTS.SESSION_TYPES.MAIN &&
+    newLocus.controls?.breakout?.groups?.length
+  );
+
+  const isReturnToMain =
+    oldLocus.controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.BREAKOUT &&
+    newLocus.controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.MAIN;
+
+  status.isReturnToMain = needUseCache || isReturnToMain;
   status.isJoinToBreakout =
-    oldControls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.MAIN &&
-    controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.BREAKOUT;
+    oldLocus.controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.MAIN &&
+    newLocus.controls.breakout.sessionType === BREAKOUTS.SESSION_TYPES.BREAKOUT;
 
   return status;
 };

package/src/locus-info/index.ts

@@ -17,7 +17,9 @@ import {
   MEETING_REMOVED_REASON,
   CALL_REMOVED_REASON,
   RECORDING_STATE,
+  BREAKOUTS,
 } from '../constants';
+
 import InfoUtils from './infoUtils';
 import FullState from './fullState';
 import SelfUtils from './selfUtils';
@@ -67,6 +69,7 @@ export default class LocusInfo extends EventsScope {
   services: any;
   resources: any;
   mainSessionLocusCache: any;
+  self: any;
   /**
    * Constructor
    * @param {function} updateMeeting callback to update the meeting object from an object
@@ -814,6 +817,8 @@ export default class LocusInfo extends EventsScope {
           hasMeetingFullChanged,
           hasPracticeSessionEnabledChanged,
           hasStageViewChanged,
+          hasAnnotationControlChanged,
+          hasRemoteDesktopControlChanged,
         },
         current,
       } = ControlsUtils.getControls(this.controls, controls);
@@ -1049,6 +1054,22 @@ export default class LocusInfo extends EventsScope {
         );
       }
 
+      if (hasAnnotationControlChanged) {
+        this.emitScoped(
+          {file: 'locus-info', function: 'updateControls'},
+          LOCUSINFO.EVENTS.CONTROLS_ANNOTATION_CHANGED,
+          {state: current.annotationControl}
+        );
+      }
+
+      if (hasRemoteDesktopControlChanged) {
+        this.emitScoped(
+          {file: 'locus-info', function: 'updateControls'},
+          LOCUSINFO.EVENTS.CONTROLS_REMOTE_DESKTOP_CONTROL_CHANGED,
+          {state: current.rdcControl}
+        );
+      }
+
       this.controls = controls;
     }
   }
@@ -1706,7 +1727,8 @@ export default class LocusInfo extends EventsScope {
    * @memberof LocusInfo
    */
   getTheLocusToUpdate(newLocus: any) {
-    const switchStatus = ControlsUtils.getSessionSwitchStatus(this.controls, newLocus?.controls);
+    const switchStatus = ControlsUtils.getSessionSwitchStatus(this, newLocus);
+
     if (switchStatus.isReturnToMain && this.mainSessionLocusCache) {
       return cloneDeep(this.mainSessionLocusCache);
     }

package/src/media/index.ts

@@ -21,6 +21,7 @@ import {MEDIA_TRACK_CONSTRAINT} from '../constants';
 import Config from '../config';
 import StaticConfig from '../common/config';
 import BrowserDetection from '../common/browser-detection';
+import {TurnServerInfo} from '../roap/types';
 
 const {isBrowser} = BrowserDetection();
 
@@ -138,11 +139,7 @@ Media.createMediaConnection = (
     remoteQualityLevel?: 'LOW' | 'MEDIUM' | 'HIGH';
     enableRtx?: boolean;
     enableExtmap?: boolean;
-    turnServerInfo?: {
-      url: string;
-      username: string;
-      password: string;
-    };
+    turnServerInfo?: TurnServerInfo;
     bundlePolicy?: BundlePolicy;
     iceCandidatesTimeout?: number;
   }
@@ -160,24 +157,11 @@ Media.createMediaConnection = (
 
   const iceServers = [];
 
-  // we might not have any TURN server if TURN discovery failed or wasn't done or
-  // we might get an empty TURN url if we land on a video mesh node
-  if (turnServerInfo?.url) {
-    if (!isBrowser('firefox')) {
-      let bareTurnServer = turnServerInfo.url;
-      bareTurnServer = bareTurnServer.replace('turns:', 'turn:');
-      bareTurnServer = bareTurnServer.replace('443', '5004');
-
-      iceServers.push({
-        urls: bareTurnServer,
-        username: turnServerInfo.username || '',
-        credential: turnServerInfo.password || '',
-      });
-    }
-
+  // we might not have any TURN server if TURN discovery failed or wasn't done or we land on a video mesh node
+  if (turnServerInfo?.urls.length > 0) {
     // TURN-TLS server
     iceServers.push({
-      urls: turnServerInfo.url,
+      urls: turnServerInfo.urls,
       username: turnServerInfo.username || '',
       credential: turnServerInfo.password || '',
     });