@webex/plugin-meetings 3.12.0-next.9 → 3.12.0-task-refactor.1

package/src/meeting/request.ts

@@ -33,7 +33,6 @@ import {
   ToggleReactionsOptions,
   PostMeetingDataConsentOptions,
   SynchronizeVideoLayout,
-  fetchDataChannelTokenOptions,
 } from './request.type';
 import MeetingUtil from './util';
 import {AnnotationInfo} from '../annotation/annotation.types';
@@ -1127,45 +1126,4 @@ export default class MeetingRequest extends StatelessWebexPlugin {
       throw err;
     }
   }
-
-  /**
-   * Sends a request to retrieve the datachannel authorization token for a participant.
-   *
-   * For regular meeting data channel:
-   *   GET /locus/api/v1/loci/{uuid:lid}/participant/{uuid:pid}/datachannel/token
-   *
-   * For practice session data channel:
-   *   GET /locus/api/v1/loci/{uuid:lid}/participant/{uuid:pid}/practiceSession/datachannel/token
-   *
-   * @param {string} locusUrl - The locus url.
-   * @param {string} requestingParticipantId - The participant UUID.
-   * @param {boolean} [isPracticeSession=false] - Whether to get the practice session token.
-   * @returns {Promise<{datachannelToken: string}>}
-   */
-  public async fetchDatachannelToken({
-    locusUrl,
-    requestingParticipantId,
-    isPracticeSession = false,
-  }: fetchDataChannelTokenOptions) {
-    if (!locusUrl || !requestingParticipantId) {
-      return Promise.reject(new Error('locusUrl and participantId are required'));
-    }
-    const practicePrefix = isPracticeSession ? '/practiceSession' : '';
-
-    const uri = `${locusUrl}/${PARTICIPANT}/${requestingParticipantId}${practicePrefix}/datachannel/token`;
-
-    // @ts-ignore
-    return this.locusDeltaRequest({
-      method: HTTP_VERBS.GET,
-      uri,
-    }).catch((err) => {
-      LoggerProxy.logger.warn(
-        `Meeting:request#fetchDatachannelToken --> Failed to retrieve ${
-          isPracticeSession ? 'practice session ' : ''
-        }datachannel token: ${err?.message || err}`
-      );
-
-      return null;
-    });
-  }
 }

package/src/meeting/request.type.ts

@@ -88,10 +88,4 @@ export type UnsetStageVideoLayout = {
   overrideDefault: false;
 };
 
-export type fetchDataChannelTokenOptions = {
-  locusUrl: string;
-  requestingParticipantId: string;
-  isPracticeSession: boolean;
-};
-
 export type SynchronizeVideoLayout = SetStageVideoLayout | UnsetStageVideoLayout;

package/src/meeting/util.ts

@@ -1,5 +1,4 @@
 import {LocalCameraStream, LocalMicrophoneStream} from '@webex/media-helpers';
-import url from 'url';
 
 import {cloneDeep} from 'lodash';
 import {MeetingNotActiveError, UserNotJoinedError} from '../common/errors/webex-errors';
@@ -25,7 +24,6 @@ import PermissionError from '../common/errors/permission';
 import PasswordError from '../common/errors/password-error';
 import CaptchaError from '../common/errors/captcha-error';
 import Trigger from '../common/events/trigger-proxy';
-import {ServerRoles} from '../member/types';
 
 const MeetingUtil = {
   parseLocusJoin: (response) => {
@@ -34,7 +32,6 @@ const MeetingUtil = {
     // First todo: add check for existance
     parsed.locus = response.body.locus;
     parsed.dataSets = response.body.dataSets;
-    parsed.metadata = response.body.metaData;
     parsed.mediaConnections = response.body.mediaConnections;
     parsed.locusUrl = parsed.locus.url;
     parsed.locusId = parsed.locus.url.split('/').pop();
@@ -50,124 +47,6 @@ const MeetingUtil = {
     return parsed;
   },
 
-  /**
-   * Sanitizes a WebSocket URL by extracting only protocol, host, and pathname
-   * Returns concatenated protocol + host + pathname for safe logging
-   * Note: This is used for logging only; URL matching uses partial matching via _urlsPartiallyMatch
-   * @param {string} urlString - The URL to sanitize
-   * @returns {string} Sanitized URL or empty string if parsing fails
-   */
-  sanitizeWebSocketUrl: (urlString: string): string => {
-    if (!urlString || typeof urlString !== 'string') {
-      return '';
-    }
-
-    try {
-      const parsedUrl = url.parse(urlString);
-      const protocol = parsedUrl.protocol || '';
-      const host = parsedUrl.host || '';
-
-      // If we don't have at least protocol and host, it's not a valid URL
-      if (!protocol || !host) {
-        return '';
-      }
-
-      const pathname = parsedUrl.pathname || '';
-
-      // Strip trailing slash if pathname is just '/'
-      const normalizedPathname = pathname === '/' ? '' : pathname;
-
-      return `${protocol}//${host}${normalizedPathname}`;
-    } catch (error) {
-      LoggerProxy.logger.warn(
-        `Meeting:util#sanitizeWebSocketUrl --> unable to parse URL: ${error}`
-      );
-
-      return '';
-    }
-  },
-
-  /**
-   * Checks if two URLs partially match using an endsWith approach
-   * Combines host and pathname, then checks if one ends with the other
-   * This handles cases where one URL goes through a proxy (e.g., /webproxy/) while the other is direct
-   * @param {string} url1 - First URL to compare
-   * @param {string} url2 - Second URL to compare
-   * @returns {boolean} True if one URL path ends with the other (partial match), false otherwise
-   */
-  _urlsPartiallyMatch: (url1: string, url2: string): boolean => {
-    if (!url1 || !url2) {
-      return false;
-    }
-
-    try {
-      const parsedUrl1 = url.parse(url1);
-      const parsedUrl2 = url.parse(url2);
-
-      const host1 = parsedUrl1.host || '';
-      const host2 = parsedUrl2.host || '';
-      const pathname1 = parsedUrl1.pathname || '';
-      const pathname2 = parsedUrl2.pathname || '';
-
-      // If either failed to parse, they don't match
-      if (!host1 || !host2 || !pathname1 || !pathname2) {
-        return false;
-      }
-
-      // Combine host and pathname for comparison
-      const combined1 = host1 + pathname1;
-      const combined2 = host2 + pathname2;
-
-      // Check if one combined path ends with the other (handles proxy URLs)
-      return combined1.endsWith(combined2) || combined2.endsWith(combined1);
-    } catch (e) {
-      LoggerProxy.logger.warn('Meeting:util#_urlsPartiallyMatch --> error comparing URLs', e);
-
-      return false;
-    }
-  },
-
-  /**
-   * Gets socket URL information for metrics, including whether the socket URLs match
-   * Uses partial matching to handle proxy URLs (e.g., URLs with /webproxy/ prefix)
-   * @param {Object} webex - The webex instance
-   * @returns {Object} Object with hasMismatchedSocket, mercurySocketUrl, and deviceSocketUrl properties
-   */
-  getSocketUrlInfo: (
-    webex: any
-  ): {hasMismatchedSocket: boolean; mercurySocketUrl: string; deviceSocketUrl: string} => {
-    try {
-      const mercuryUrl = webex?.internal?.mercury?.socket?.url;
-      const deviceUrl = webex?.internal?.device?.webSocketUrl;
-
-      const sanitizedMercuryUrl = MeetingUtil.sanitizeWebSocketUrl(mercuryUrl);
-      const sanitizedDeviceUrl = MeetingUtil.sanitizeWebSocketUrl(deviceUrl);
-
-      // Only report a mismatch if both URLs are present and they don't match
-      // If either URL is missing, we can't determine if there's a mismatch, so return false
-      let hasMismatchedSocket = false;
-      if (sanitizedMercuryUrl && sanitizedDeviceUrl) {
-        hasMismatchedSocket = !MeetingUtil._urlsPartiallyMatch(mercuryUrl, deviceUrl);
-      }
-
-      return {
-        hasMismatchedSocket,
-        mercurySocketUrl: sanitizedMercuryUrl,
-        deviceSocketUrl: sanitizedDeviceUrl,
-      };
-    } catch (error) {
-      LoggerProxy.logger.warn(
-        `Meeting:util#getSocketUrlInfo --> error getting socket URL info: ${error}`
-      );
-
-      return {
-        hasMismatchedSocket: false,
-        mercurySocketUrl: '',
-        deviceSocketUrl: '',
-      };
-    }
-  },
-
   remoteUpdateAudioVideo: (meeting, audioMuted?: boolean, videoMuted?: boolean) => {
     if (!meeting) {
       return Promise.reject(new ParameterError('You need a meeting object.'));
@@ -324,7 +203,6 @@ const MeetingUtil = {
         const parsed = MeetingUtil.parseLocusJoin(res);
         meeting.setLocus(parsed);
         meeting.isoLocalClientMeetingJoinTime = res?.headers?.date; // read from header if exist, else fall back to system clock : https://jira-eng-gpk2.cisco.com/jira/browse/SPARK-555657
-        const socketUrlInfo = MeetingUtil.getSocketUrlInfo(webex);
         webex.internal.newMetrics.submitClientEvent({
           name: 'client.locus.join.response',
           payload: {
@@ -332,9 +210,6 @@ const MeetingUtil = {
             identifiers: {
               trackingId: res.headers.trackingid,
             },
-            eventData: {
-              ...socketUrlInfo,
-            },
           },
           options: {
             meetingId: meeting.id,
@@ -345,19 +220,12 @@ const MeetingUtil = {
         return parsed;
       })
       .catch((err) => {
-        const socketUrlInfo = MeetingUtil.getSocketUrlInfo(webex);
         webex.internal.newMetrics.submitClientEvent({
           name: 'client.locus.join.response',
           payload: {
             identifiers: {meetingLookupUrl: meeting.meetingInfo?.meetingLookupUrl},
-            eventData: {
-              ...socketUrlInfo,
-            },
-          },
-          options: {
-            meetingId: meeting.id,
-            rawError: err,
           },
+          options: {meetingId: meeting.id, rawError: err},
         });
 
         throw err;
@@ -369,7 +237,6 @@ const MeetingUtil = {
     meeting.stopPeriodicLogUpload();
 
     meeting.breakouts.cleanUp();
-    meeting.webinar.cleanUp();
     meeting.simultaneousInterpretation.cleanUp();
     meeting.locusMediaRequest = undefined;
 
@@ -394,10 +261,8 @@ const MeetingUtil = {
       .then(() => meeting.stopKeepAlive())
       .then(() => {
         if (meeting.config?.enableAutomaticLLM) {
-          return meeting.cleanupLLMConneciton({throwOnError: false});
+          meeting.updateLLMConnection();
         }
-
-        return undefined;
       });
   },
 
@@ -663,11 +528,6 @@ const MeetingUtil = {
     displayHints.includes(DISPLAY_HINTS.LEAVE_TRANSFER_HOST_END_MEETING) ||
     displayHints.includes(DISPLAY_HINTS.LEAVE_END_MEETING),
 
-  requireHostEndMeetingBeforeLeave: (displayHints) =>
-    displayHints.includes(DISPLAY_HINTS.REQUIRE_HOST_END_MEETING_BEFORE_LEAVE) ||
-    (!displayHints.includes(DISPLAY_HINTS.LEAVE_TRANSFER_HOST_END_MEETING) &&
-      displayHints.includes(DISPLAY_HINTS.END_MEETING)),
-
   canManageBreakout: (displayHints) => displayHints.includes(DISPLAY_HINTS.BREAKOUT_MANAGEMENT),
 
   canStartBreakout: (displayHints) => !displayHints.includes(DISPLAY_HINTS.DISABLE_BREAKOUT_START),
@@ -912,24 +772,6 @@ const MeetingUtil = {
     return locusDeltaRequest;
   },
 
-  canAttendeeRequestAiAssistantEnabled: (displayHints = [], roles: any[] = []) => {
-    const isHostOrCoHost =
-      roles.includes(ServerRoles.Cohost) || roles.includes(ServerRoles.Moderator);
-
-    if (isHostOrCoHost) {
-      return false;
-    }
-
-    if (displayHints.includes(DISPLAY_HINTS.ATTENDEE_REQUEST_AI_ASSISTANT_ENABLED)) {
-      return true;
-    }
-
-    return false;
-  },
-
-  attendeeRequestAiAssistantDeclinedAll: (displayHints = []) =>
-    displayHints.includes(DISPLAY_HINTS.ATTENDEE_REQUEST_AI_ASSISTANT_DECLINED_ALL),
-
   selfSupportsFeature: (feature: SELF_POLICY, userPolicies: Record<SELF_POLICY, boolean>) => {
     if (!userPolicies) {
       return true;

package/src/meetings/index.ts

@@ -47,7 +47,7 @@ import {
 import BEHAVIORAL_METRICS from '../metrics/constants';
 import MeetingInfo from '../meeting-info';
 import MeetingInfoV2 from '../meeting-info/meeting-info-v2';
-import Meeting, {CallStateForMetrics, storeEventForDebugging} from '../meeting';
+import Meeting, {CallStateForMetrics} from '../meeting';
 import PersonalMeetingRoom from '../personal-meeting-room';
 import Reachability from '../reachability';
 import Request from './request';
@@ -67,9 +67,6 @@ import {SpaceIDDeprecatedError} from '../common/errors/webex-errors';
 import NoMeetingInfoError from '../common/errors/no-meeting-info';
 import JoinForbiddenError from '../common/errors/join-forbidden-error';
 import {HashTreeMessage} from '../hashTree/hashTreeParser';
-import {HashTreeObject} from '../hashTree/types';
-import {isSelf} from '../hashTree/utils';
-import {createLocusFromHashTreeMessage, findMeetingForHashTreeMessage} from '../locus-info';
 
 let mediaLogger;
 
@@ -196,8 +193,6 @@ export default class Meetings extends WebexPlugin {
   preferredWebexSite: any;
   reachability: Reachability;
   registered: any;
-  registrationPromise: Promise<void>;
-  unregistrationPromise: Promise<void>;
   request: any;
   geoHintInfo: any;
   meetingInfo: any;
@@ -425,50 +420,31 @@ export default class Meetings extends WebexPlugin {
    * @memberof Meetings
    */
   getCorrespondingMeetingByLocus(data: LocusEvent) {
-    const locusUrl =
-      data.stateElementsMessage?.locusUrl || // hash tree event
-      data.locusUrl; // classic event
-
-    // first try to find by locusUrl - that's the simplest and quickest way
-    const existingMeeting = this.meetingCollection.getByKey(MEETING_KEY.LOCUS_URL, locusUrl);
-
-    if (existingMeeting) {
-      return existingMeeting;
-    }
-
-    if (data.eventType === LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
-      // need to check if maybe this event indicates a move to/from breakout
-      const meetingForHashTreeMessage = findMeetingForHashTreeMessage(
-        data.stateElementsMessage,
-        this.meetingCollection,
-        // @ts-ignore
-        this.webex.internal.device.url
+    if (
+      data.eventType === LOCUSEVENT.HASH_TREE_DATA_UPDATED &&
+      data.stateElementsMessage?.locusUrl
+    ) {
+      return this.meetingCollection.getByKey(
+        MEETING_KEY.LOCUS_URL,
+        data.stateElementsMessage.locusUrl
       );
-
-      if (meetingForHashTreeMessage) {
-        return meetingForHashTreeMessage;
-      }
     }
 
-    // if that didn't work, fallback to other fields like correlationId, sipUri, etc
-
-    // If the event is a hash tree event, we need to extract "self" object from it
-    // We don't care about the version, just need to find the meeting this event is for,
-    // so any hash tree object of type "self" will do
-    const hashTreeEventSelf = data.stateElementsMessage?.locusStateElements?.find(
-      (obj: HashTreeObject) => isSelf(obj)
-    )?.data;
-
-    const self = hashTreeEventSelf || data.locus?.self;
-
+    // getting meeting by correlationId. This will happen for the new event
+    // Either the locus
+    // TODO : Add check for the callBack Address
     return (
+      this.meetingCollection.getByKey(MEETING_KEY.LOCUS_URL, data.locusUrl) ||
       // @ts-ignore
       this.meetingCollection.getByKey(
         MEETING_KEY.CORRELATION_ID,
         // @ts-ignore
-        MeetingsUtil.getCorrelationIdForDevice(this.webex.internal.device.url, self)
+        MeetingsUtil.checkForCorrelationId(this.webex.internal.device.url, data.locus)
+      ) ||
+      this.meetingCollection.getByKey(
+        MEETING_KEY.SIP_URI,
+        data.locus?.self?.callbackInfo?.callbackAddress
       ) ||
-      this.meetingCollection.getByKey(MEETING_KEY.SIP_URI, self?.callbackInfo?.callbackAddress) ||
       (data.locus?.info?.isUnifiedSpaceMeeting
         ? undefined
         : this.meetingCollection.getByKey(
@@ -493,11 +469,6 @@ export default class Meetings extends WebexPlugin {
   private handleLocusEvent(data: LocusEvent, useRandomDelayForInfo = false) {
     let meeting = this.getCorrespondingMeetingByLocus(data);
 
-    // @ts-ignore
-    if (this.config.experimental.storeLocusHashTreeEventsForDebugging) {
-      storeEventForDebugging('mercury', data);
-    }
-
     // Special case when locus has got replaced, This only happend once if a replace locus exists
     // https://sqbu-github.cisco.com/WebExSquared/locus/wiki/Locus-changing-mid-call
 
@@ -511,7 +482,7 @@ export default class Meetings extends WebexPlugin {
       }
 
       if (meeting && !MeetingsUtil.isBreakoutLocusDTO(data.locus)) {
-        meeting.locusInfo.updateMainSessionLocusCache(data.locus); // here data.locus will never be a complete locus
+        meeting.locusInfo.updateMainSessionLocusCache(data.locus);
       }
       if (!this.isNeedHandleLocusDTO(meeting, data.locus)) {
         LoggerProxy.logger.log(
@@ -542,45 +513,41 @@ export default class Meetings extends WebexPlugin {
       // };
       // rather then locus object change to locus url
 
-      if (data.eventType === LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
-        // We're about to create a new meeting object from this hash tree message.
-        // There is some existing (pre-hash trees) SDK logic here that requires a locus object
-        // (at the very minimum we need locus.url to be set)
-        // so we try to create locus from the received hash tree message
-        // it will not be complete, in most cases it will only have the self part, but that's still better than nothing
-        const {locus} = createLocusFromHashTreeMessage(data.stateElementsMessage);
-
-        data.locus = locus;
-      }
-
-      if (
-        data.locus &&
-        data.locus.fullState &&
-        data.locus.fullState.state === LOCUS.STATE.INACTIVE
-      ) {
-        // just ignore the event as its already ended and not active
-        LoggerProxy.logger.warn(
-          'Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.'
-        );
+      if (data.eventType !== LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
+        if (
+          data.locus &&
+          data.locus.fullState &&
+          data.locus.fullState.state === LOCUS.STATE.INACTIVE
+        ) {
+          // just ignore the event as its already ended and not active
+          LoggerProxy.logger.warn(
+            'Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.'
+          );
 
-        return;
-      }
+          return;
+        }
 
-      // When its wireless share or guest and user leaves the meeting we dont have to keep the meeting object
-      // Any future events will be neglected
+        // When its wireless share or guest and user leaves the meeting we dont have to keep the meeting object
+        // Any future events will be neglected
+
+        if (
+          data.locus &&
+          data.locus.self &&
+          data.locus.self.state === _LEFT_ &&
+          data.locus.self.removed === true
+        ) {
+          // just ignore the event as its already ended and not active
+          LoggerProxy.logger.warn(
+            'Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.'
+          );
 
-      if (
-        data.locus &&
-        data.locus.self &&
-        data.locus.self.state === _LEFT_ &&
-        data.locus.self.removed === true
-      ) {
-        // just ignore the event as its already ended and not active
-        LoggerProxy.logger.warn(
-          'Meetings:index#handleLocusEvent --> Locus event received for meeting, after it was ended.'
-        );
+          return;
+        }
+      }
 
-        return;
+      if (data.eventType === LOCUSEVENT.HASH_TREE_DATA_UPDATED) {
+        // in hash tree messages we don't ge the locus object, but the meeting constructor needs at least locus.url
+        set(data, 'locus.url', data.stateElementsMessage.locusUrl);
       }
 
       this.create(data.locus, DESTINATION_TYPE.LOCUS_ID, useRandomDelayForInfo)
@@ -650,7 +617,7 @@ export default class Meetings extends WebexPlugin {
   }
 
   /**
-   * handles locus events through mercury that are not roap or approval request events
+   * handles locus events through mercury that are not roap
    * @param {Object} envelope
    * @param {Object} envelope.data
    * @param {String} envelope.data.eventType
@@ -663,11 +630,7 @@ export default class Meetings extends WebexPlugin {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const {eventType} = data;
 
-    if (
-      eventType &&
-      eventType !== LOCUSEVENT.MESSAGE_ROAP &&
-      eventType !== LOCUSEVENT.APPROVAL_REQUEST
-    ) {
+    if (eventType && eventType !== LOCUSEVENT.MESSAGE_ROAP) {
       this.handleLocusEvent(data, true);
     }
   }
@@ -959,20 +922,9 @@ export default class Meetings extends WebexPlugin {
    * @returns {Promise} A promise that resolves when the step is completed.
    */
   executeRegistrationStep(step: () => Promise<any>, stepName: string) {
-    return step()
-      .then(() => {
-        LoggerProxy.logger.info(
-          `Meetings:index#executeRegistrationStep --> INFO, ${stepName} completed`
-        );
-        this.registrationStatus[stepName] = true;
-      })
-      .catch((error) => {
-        LoggerProxy.logger.error(
-          `Meetings:index#executeRegistrationStep --> ERROR, ${stepName} failed: ${error.message}`
-        );
-
-        return Promise.reject(error);
-      });
+    return step().then(() => {
+      this.registrationStatus[stepName] = true;
+    });
   }
 
   /**
@@ -985,33 +937,7 @@ export default class Meetings extends WebexPlugin {
    * @memberof Meetings
    */
   public register(deviceRegistrationOptions?: DeviceRegistrationOptions): Promise<any> {
-    if (this.unregistrationPromise) {
-      LoggerProxy.logger.info(
-        'Meetings:index#register --> INFO, Meetings plugin unregistration in progress, waiting to register'
-      );
-
-      this.registrationPromise = this.unregistrationPromise
-        .catch(() => {}) // It doesn't matter what happened during unregistration
-        .finally(() => {
-          LoggerProxy.logger.info(
-            'Meetings:index#register --> INFO, Meetings plugin unregistration completed, proceeding to register'
-          );
-
-          this.registrationPromise = null;
-
-          return this.register(deviceRegistrationOptions);
-        });
-
-      return this.registrationPromise;
-    }
-
-    if (this.registrationPromise) {
-      LoggerProxy.logger.info(
-        'Meetings:index#register --> INFO, Meetings plugin registration in progress, returning existing promise'
-      );
-
-      return this.registrationPromise;
-    }
+    this.registrationStatus = clone(INITIAL_REGISTRATION_STATUS);
 
     // @ts-ignore
     if (!this.webex.canAuthorize) {
@@ -1030,11 +956,7 @@ export default class Meetings extends WebexPlugin {
       return Promise.resolve();
     }
 
-    LoggerProxy.logger.info('Meetings:index#register --> INFO, Registering Meetings plugin');
-
-    this.registrationStatus = clone(INITIAL_REGISTRATION_STATUS);
-
-    this.registrationPromise = Promise.all([
+    return Promise.all([
       this.executeRegistrationStep(() => this.fetchUserPreferredWebexSite(), 'fetchWebexSite'),
       this.executeRegistrationStep(() => this.getGeoHint(), 'getGeoHint'),
       this.executeRegistrationStep(
@@ -1093,12 +1015,7 @@ export default class Meetings extends WebexPlugin {
         });
 
         return Promise.reject(error);
-      })
-      .finally(() => {
-        this.registrationPromise = null;
       });
-
-    return this.registrationPromise;
   }
 
   /**
@@ -1110,35 +1027,6 @@ export default class Meetings extends WebexPlugin {
    * @memberof Meetings
    */
   unregister() {
-    if (this.unregistrationPromise) {
-      LoggerProxy.logger.info(
-        'Meetings:index#unregister --> INFO, Meetings plugin unregistration in progress, returning existing promise'
-      );
-
-      return this.unregistrationPromise;
-    }
-
-    if (this.registrationPromise) {
-      LoggerProxy.logger.info(
-        'Meetings:index#unregister --> INFO, Meetings plugin registration in progress, waiting to unregister'
-      );
-
-      // Wait for registration to complete (success or failure), then call unregister again
-      this.unregistrationPromise = this.registrationPromise
-        .catch(() => {}) // It doesn't matter what happened during registration
-        .finally(() => {
-          LoggerProxy.logger.info(
-            'Meetings:index#unregister --> INFO, Meetings plugin registration completed, proceeding to unregister'
-          );
-
-          this.unregistrationPromise = null;
-
-          return this.unregister();
-        });
-
-      return this.unregistrationPromise;
-    }
-
     if (!this.registered) {
       LoggerProxy.logger.info(
         'Meetings:index#unregister --> INFO, Meetings plugin already unregistered'
@@ -1149,14 +1037,10 @@ export default class Meetings extends WebexPlugin {
 
     this.stopListeningForEvents();
 
-    this.unregistrationPromise =
+    return (
       // @ts-ignore
       this.webex.internal.mercury
-        // Use code 3050 with a non-reconnecting reason to prevent Mercury auto-reconnect
-        // during unregister. Without this, disconnect() defaults to code 1000/"Done" which
-        // force-closes as "Done (forced)" - a normalReconnectReason that triggers auto-reconnect,
-        // causing a race condition with device.unregister().
-        .disconnect({code: 3050, reason: 'meetings unregister'})
+        .disconnect()
         // @ts-ignore
         .then(() => this.webex.internal.device.unregister())
         .catch((error) => {
@@ -1186,11 +1070,7 @@ export default class Meetings extends WebexPlugin {
           this.registered = false;
           this.registrationStatus = clone(INITIAL_REGISTRATION_STATUS);
         })
-        .finally(() => {
-          this.unregistrationPromise = null;
-        });
-
-    return this.unregistrationPromise;
+    );
   }
 
   /**
@@ -2001,7 +1881,7 @@ export default class Meetings extends WebexPlugin {
 
     const associateBreakoutLocus = this.breakoutLocusForHandleLater[existIndex];
     this.handleLocusEvent({
-      eventType: LOCUSEVENT.SDK_LOCUS_FROM_SYNC_MEETINGS,
+      eventType: LOCUSEVENT.SDK_NO_EVENT,
       locus: associateBreakoutLocus,
       locusUrl: associateBreakoutLocus.url,
     });