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

package/src/webinar/index.ts

@@ -4,21 +4,10 @@
 import {WebexPlugin, config} from '@webex/webex-core';
 import uuid from 'uuid';
 import {get} from 'lodash';
-import {DataChannelTokenType} from '@webex/internal-plugin-llm';
-import {
-  _ID_,
-  HEADERS,
-  HTTP_VERBS,
-  MEETINGS,
-  SELF_ROLES,
-  SHARE_STATUS,
-  DEFAULT_LARGE_SCALE_WEBINAR_ATTENDEE_SEARCH_LIMIT,
-  LLM_PRACTICE_SESSION,
-} from '../constants';
+import {_ID_, HEADERS, HTTP_VERBS, MEETINGS, SELF_ROLES, SHARE_STATUS} from '../constants';
 
 import WebinarCollection from './collection';
 import LoggerProxy from '../common/logs/logger-proxy';
-import {sanitizeParams} from './utils';
 
 /**
  * @class Webinar
@@ -39,14 +28,6 @@ const Webinar = WebexPlugin.extend({
     meetingId: 'string',
   },
 
-  /**
-   * Calls this to clean up listeners
-   * @returns {void}
-   */
-  cleanUp() {
-    this.cleanupPSDataChannel();
-  },
-
   /**
    * Update the current locus url of the webinar
    * @param {string} locusUrl
@@ -115,7 +96,10 @@ const Webinar = WebexPlugin.extend({
       meeting?.locusInfo?.updateMediaShares(meeting?.locusInfo?.mediaShares, true);
     }
 
-    this.updatePSDataChannel();
+    if (this.practiceSessionEnabled) {
+      // may need change data channel in practice session
+      meeting?.updateLLMConnection();
+    }
   },
 
   /**
@@ -126,215 +110,6 @@ const Webinar = WebexPlugin.extend({
     return this.selfIsPanelist && this.practiceSessionEnabled;
   },
 
-  /**
-   * Disconnects the practice session data channel and removes its relay listener.
-   * @returns {Promise<void>}
-   */
-  async cleanupPSDataChannel() {
-    if (this._pendingOnlineListener) {
-      // @ts-ignore - Fix type
-      this.webex.internal.llm.off('online', this._pendingOnlineListener);
-      this._pendingOnlineListener = null;
-    }
-
-    const meeting = this.webex.meetings.getMeetingByType(_ID_, this.meetingId);
-
-    // @ts-ignore - Fix type
-    await this.webex.internal.llm.disconnectLLM(
-      {
-        code: 3050,
-        reason: 'done (permanent)',
-      },
-      LLM_PRACTICE_SESSION
-    );
-    // @ts-ignore - Fix type
-    this.webex.internal.llm.off(
-      `event:relay.event:${LLM_PRACTICE_SESSION}`,
-      meeting?.processRelayEvent
-    );
-  },
-
-  /**
-   * Ensures practice-session token exists before registering the practice LLM channel.
-   * @param {object} meeting
-   * @returns {Promise<string|undefined>}
-   */
-  async ensurePracticeSessionDatachannelToken(meeting) {
-    // @ts-ignore
-    const isDataChannelTokenEnabled = await this.webex.internal.llm.isDataChannelTokenEnabled();
-
-    if (!isDataChannelTokenEnabled) {
-      return undefined;
-    }
-
-    // @ts-ignore
-    const cachedToken = this.webex.internal.llm.getDatachannelToken(
-      DataChannelTokenType.PracticeSession
-    );
-
-    if (cachedToken) {
-      return cachedToken;
-    }
-
-    try {
-      const refreshResponse = await meeting.refreshDataChannelToken();
-      const {datachannelToken, dataChannelTokenType} = refreshResponse?.body ?? {};
-
-      if (!datachannelToken) {
-        return undefined;
-      }
-
-      // @ts-ignore
-      this.webex.internal.llm.setDatachannelToken(
-        datachannelToken,
-        dataChannelTokenType || DataChannelTokenType.PracticeSession
-      );
-
-      return datachannelToken;
-    } catch (error) {
-      LoggerProxy.logger.warn(
-        `Webinar:index#ensurePracticeSessionDatachannelToken --> failed to proactively refresh practice-session token: ${
-          error?.message || String(error)
-        }`
-      );
-
-      return undefined;
-    }
-  },
-
-  /**
-   * Connects to low latency mercury and reconnects if the address has changed
-   * It will also disconnect if called when the meeting has ended
-   * @returns {Promise}
-   */
-  async updatePSDataChannel() {
-    this._updatePSDataChannelSequence = (this._updatePSDataChannelSequence || 0) + 1;
-    const invocationSequence = this._updatePSDataChannelSequence;
-
-    const meeting = this.webex.meetings.getMeetingByType(_ID_, this.meetingId);
-    const isPracticeSession = meeting?.isJoined() && this.isJoinPracticeSessionDataChannel();
-
-    if (!isPracticeSession) {
-      await this.cleanupPSDataChannel();
-
-      return undefined;
-    }
-
-    // @ts-ignore - Fix type
-    const {url = undefined, info: {practiceSessionDatachannelUrl = undefined} = {}} =
-      meeting?.locusInfo || {};
-
-    // @ts-ignore
-    let practiceSessionDatachannelToken = this.webex.internal.llm.getDatachannelToken(
-      DataChannelTokenType.PracticeSession
-    );
-
-    const isCaptionBoxOn = this.webex.internal.voicea.getIsCaptionBoxOn();
-
-    if (!practiceSessionDatachannelUrl) {
-      return undefined;
-    }
-    // @ts-ignore - Fix type
-    if (this.webex.internal.llm.isConnected(LLM_PRACTICE_SESSION)) {
-      if (
-        // @ts-ignore - Fix type
-        url === this.webex.internal.llm.getLocusUrl(LLM_PRACTICE_SESSION) &&
-        // @ts-ignore - Fix type
-        practiceSessionDatachannelUrl ===
-          this.webex.internal.llm.getDatachannelUrl(LLM_PRACTICE_SESSION)
-      ) {
-        return undefined;
-      }
-
-      await this.cleanupPSDataChannel();
-    }
-
-    // Ensure the default session data channel is connected before connecting the practice session.
-    // Subscribe before checking isConnected() to avoid a race where the 'online' event fires
-    // between the check and the subscription — Mercury does not replay missed events.
-    if (!this._pendingOnlineListener) {
-      const onDefaultSessionConnected = () => {
-        this._pendingOnlineListener = null;
-        // @ts-ignore - Fix type
-        this.webex.internal.llm.off('online', onDefaultSessionConnected);
-        this.updatePSDataChannel();
-      };
-      this._pendingOnlineListener = onDefaultSessionConnected;
-      // @ts-ignore - Fix type
-      this.webex.internal.llm.on('online', onDefaultSessionConnected);
-    }
-
-    // @ts-ignore - Fix type
-    if (!this.webex.internal.llm.isConnected()) {
-      LoggerProxy.logger.info(
-        'Webinar:index#updatePSDataChannel --> default session not yet connected, deferring practice session connect.'
-      );
-
-      return undefined;
-    }
-
-    // Default session is already connected — cancel the pending listener and proceed
-    if (this._pendingOnlineListener) {
-      // @ts-ignore - Fix type
-      this.webex.internal.llm.off('online', this._pendingOnlineListener);
-      this._pendingOnlineListener = null;
-    }
-
-    const refreshedPracticeSessionToken = await this.ensurePracticeSessionDatachannelToken(meeting);
-
-    const latestPracticeSessionDatachannelUrl = get(
-      meeting,
-      'locusInfo.info.practiceSessionDatachannelUrl'
-    );
-    const isStillPracticeSession = meeting?.isJoined() && this.isJoinPracticeSessionDataChannel();
-
-    // Skip stale invocations after async refresh to avoid reconnecting a session
-    // that was already updated/cleaned by a newer state transition.
-    if (
-      invocationSequence !== this._updatePSDataChannelSequence ||
-      !isStillPracticeSession ||
-      !latestPracticeSessionDatachannelUrl ||
-      latestPracticeSessionDatachannelUrl !== practiceSessionDatachannelUrl
-    ) {
-      return undefined;
-    }
-
-    if (refreshedPracticeSessionToken) {
-      practiceSessionDatachannelToken = refreshedPracticeSessionToken;
-    }
-
-    // @ts-ignore - Fix type
-    return this.webex.internal.llm
-      .registerAndConnect(
-        url,
-        practiceSessionDatachannelUrl,
-        practiceSessionDatachannelToken,
-        LLM_PRACTICE_SESSION
-      )
-      .then((registerAndConnectResult) => {
-        // @ts-ignore - Fix type
-        this.webex.internal.llm.off(
-          `event:relay.event:${LLM_PRACTICE_SESSION}`,
-          meeting?.processRelayEvent
-        );
-        // @ts-ignore - Fix type
-        this.webex.internal.llm.on(
-          `event:relay.event:${LLM_PRACTICE_SESSION}`,
-          meeting?.processRelayEvent
-        );
-        // @ts-ignore - Fix type
-        this.webex.internal.voicea?.announce?.();
-        if (isCaptionBoxOn) {
-          this.webex.internal.voicea.updateSubchannelSubscriptions({subscribe: ['transcription']});
-        }
-        LoggerProxy.logger.info(
-          `Webinar:index#updatePSDataChannel --> enabled to receive relay events for default session for ${LLM_PRACTICE_SESSION}!`
-        );
-
-        return Promise.resolve(registerAndConnectResult);
-      });
-  },
-
   /**
    * start or stop practice session for webinar
    * @param {boolean} enabled
@@ -362,7 +137,6 @@ const Webinar = WebexPlugin.extend({
    */
   updatePracticeSessionStatus(payload) {
     this.set('practiceSessionEnabled', !!payload?.enabled);
-    this.updatePSDataChannel().then(() => {});
   },
 
   /**
@@ -469,6 +243,7 @@ const Webinar = WebexPlugin.extend({
 
   /**
    * view all webcast attendees
+   * @param {string} queryString
    * @returns {Promise}
    */
   async viewAllWebcastAttendees() {
@@ -522,40 +297,6 @@ const Webinar = WebexPlugin.extend({
       throw error;
     });
   },
-
-  /**
-   * search large scale webinar attendees
-   * @param {object} payload
-   * @param {string} payload.queryString
-   * @param {number} payload.limit
-   * @param {string} payload.next
-   * @returns {Promise}
-   */
-  async searchLargeScaleWebinarAttendees(payload) {
-    const meeting = this.webex.meetings.getMeetingByType(_ID_, this.meetingId);
-    const rawParams = {
-      search_text: payload?.queryString,
-      limit: payload?.limit ?? DEFAULT_LARGE_SCALE_WEBINAR_ATTENDEE_SEARCH_LIMIT,
-      next: payload?.next,
-    };
-    const attendeeSearchUrl = meeting?.locusInfo?.links?.resources?.attendeeSearch?.url;
-    if (!attendeeSearchUrl) {
-      LoggerProxy.logger.error(`Meeting:webinar5k#searchLargeScaleWebinarAttendees failed`);
-      throw new Error('Meeting:webinar5k#Attendee search url is not available');
-    }
-
-    return this.request({
-      method: HTTP_VERBS.GET,
-      uri: `${attendeeSearchUrl}?${new URLSearchParams(sanitizeParams(rawParams)).toString()}`,
-      headers: {
-        authorization: await this.webex.credentials.getUserToken(),
-        trackingId: `${config.trackingIdPrefix}_${uuid.v4().toString()}`,
-      },
-    }).catch((error) => {
-      LoggerProxy.logger.error('Meeting:webinar5k#searchLargeScaleWebinarAttendees failed', error);
-      throw error;
-    });
-  },
 });
 
 export default Webinar;

package/test/unit/spec/annotation/index.ts

@@ -7,7 +7,6 @@ import LLMChannel from '@webex/internal-plugin-llm';
 
 import AnnotationService from '../../../../src/annotation/index';
 import {ANNOTATION_RELAY_TYPES, ANNOTATION_REQUEST_TYPE, EVENT_TRIGGERS} from '../../../../src/annotation/constants';
-import {LLM_PRACTICE_SESSION} from '../../../../src/constants';
 
 
 describe('live-annotation', () => {
@@ -29,7 +28,6 @@ describe('live-annotation', () => {
       annotationService = webex.internal.annotation;
       annotationService.connect = sinon.stub().resolves(true);
       annotationService.webex.internal.llm.isConnected = sinon.stub().returns(true);
-      annotationService.webex.internal.llm.getSocket = sinon.stub().returns(undefined);
       annotationService.webex.internal.llm.getBinding = sinon.stub().returns(undefined);
       annotationService.webex.internal.llm.getLocusUrl = sinon.stub().returns(locusUrl);
       annotationService.approvalUrl = 'url/approval';
@@ -185,13 +183,7 @@ describe('live-annotation', () => {
 
         annotationService.listenToEvents();
 
-        assert.calledWithExactly(spy.firstCall, 'event:relay.event', sinon.match.func, sinon.match.object);
-        assert.calledWithExactly(
-          spy.secondCall,
-          `event:relay.event:${LLM_PRACTICE_SESSION}`,
-          sinon.match.func,
-          sinon.match.object
-        );
+        assert.calledOnceWithExactly(spy, 'event:relay.event', sinon.match.func,sinon.match.object);
       });
 
     });
@@ -234,11 +226,14 @@ describe('live-annotation', () => {
     });
 
     describe('sendStrokeData', () => {
-      let strokeData;
 
       beforeEach(async () => {
         annotationService.webex.internal.llm.socket = new MockWebSocket();
-        strokeData = {
+      });
+
+
+      it('works on publish Stroke Data', async () => {
+        const strokeData = {
           content: {
             "contentsBuffer": [{
               "contentArray": [{
@@ -254,11 +249,8 @@ describe('live-annotation', () => {
           shareInstanceId: '7fa6fe07-dcb1-41ad-973d-7bcf65fab55d',
           encryptionKeyUrl: "encryptionKeyUrl",
           version: '1',
-        };
-      });
-
+        } ;
 
-      it('works on publish Stroke Data', async () => {
         annotationService.publishEncrypted(strokeData.content, strokeData);
 
         const sendObject = {
@@ -291,49 +283,6 @@ describe('live-annotation', () => {
         assert.calledOnceWithExactly(annotationService.webex.internal.llm.socket.send, sendObject);
       });
 
-      it('uses the practice-session socket and binding only when the practice-session session is connected', () => {
-        const practiceSocket = new MockWebSocket();
-
-        annotationService.webex.internal.llm.isConnected.callsFake((sessionId) =>
-          sessionId === LLM_PRACTICE_SESSION
-        );
-        annotationService.webex.internal.llm.getSocket
-          .withArgs(LLM_PRACTICE_SESSION)
-          .returns(practiceSocket);
-        annotationService.webex.internal.llm.getBinding
-          .withArgs(LLM_PRACTICE_SESSION)
-          .returns('practice-binding');
-
-        annotationService.publishEncrypted(strokeData.content, strokeData);
-
-        assert.calledOnce(practiceSocket.send);
-        assert.notCalled(annotationService.webex.internal.llm.socket.send);
-
-        const sent = practiceSocket.send.getCall(0).args[0];
-        assert.equal(sent.recipients.route, 'practice-binding');
-      });
-
-      it('falls back to the default socket and binding when the practice-session socket exists but is not connected', () => {
-        const practiceSocket = new MockWebSocket();
-
-        annotationService.webex.internal.llm.isConnected.callsFake((sessionId) => !sessionId);
-        annotationService.webex.internal.llm.getSocket
-          .withArgs(LLM_PRACTICE_SESSION)
-          .returns(practiceSocket);
-        annotationService.webex.internal.llm.getBinding
-          .withArgs(LLM_PRACTICE_SESSION)
-          .returns('practice-binding');
-        annotationService.webex.internal.llm.getBinding.returns('default-binding');
-
-        annotationService.publishEncrypted(strokeData.content, strokeData);
-
-        assert.notCalled(practiceSocket.send);
-        assert.calledOnce(annotationService.webex.internal.llm.socket.send);
-
-        const sent = annotationService.webex.internal.llm.socket.send.getCall(0).args[0];
-        assert.equal(sent.recipients.route, 'default-binding');
-      });
-
     });
 
 
@@ -492,21 +441,10 @@ describe('live-annotation', () => {
           annotationService.eventDataProcessor,
           annotationService
         );
-        assert.calledWith(
-          llmOn,
-          `event:relay.event:${LLM_PRACTICE_SESSION}`,
-          annotationService.eventDataProcessor,
-          annotationService
-        );
         assert.match(annotationService.hasSubscribedToEvents, true);
 
         annotationService.deregisterEvents();
         assert.calledWith(llmOff, 'event:relay.event', annotationService.eventDataProcessor);
-        assert.calledWith(
-          llmOff,
-          `event:relay.event:${LLM_PRACTICE_SESSION}`,
-          annotationService.eventDataProcessor
-        );
         assert.calledWith(
           mercuryOff,
           'event:locus.approval_request',

package/test/unit/spec/interceptors/locusRouteToken.ts

@@ -54,40 +54,6 @@ describe('LocusRouteTokenInterceptor', () => {
     assert.equal(interceptor.getToken(TEST_LOCUS_ID), 'test-token');
   });
 
-  it('onResponse should store route token when body exists', async () => {
-    const response = {
-      headers: {
-        [X_CISCO_PART_ROUTE_TOKEN]: 'test-token',
-      },
-      body: {
-        locus: {
-          url: `https://locus-test.webex.com/locus/api/v1/loci/${TEST_LOCUS_ID}`,
-        },
-      },
-    };
-
-    const result = await interceptor.onResponse({},response);
-    assert.equal(result, response);
-    assert.equal(interceptor.getToken(TEST_LOCUS_ID), 'test-token');
-  });
-
-  it('get route token case insensitively ', async () => {
-    const response = {
-      headers: {
-        ['x-cisco-part-route-token']: 'test-token',
-      },
-    };
-
-    const result = await interceptor.onResponse(
-      {
-        uri: `https://locus-test.webex.com/locus/api/v1/loci/${TEST_LOCUS_ID}/foo`,
-      },
-      response
-    );
-    assert.equal(result, response);
-    assert.equal(interceptor.getToken(TEST_LOCUS_ID), 'test-token');
-  });
-
   it('onResponse should not store token when header missing', async () => {
     interceptor.updateToken(TEST_LOCUS_ID);
     const response = {headers: {}};
@@ -118,14 +84,4 @@ describe('LocusRouteTokenInterceptor', () => {
     interceptor.updateToken(TEST_LOCUS_ID, 'abc456');
     assert.equal(interceptor.getToken(TEST_LOCUS_ID), 'abc456');
   });
-
-  it('should delete token when updateToken called with "null"', () => {
-    interceptor.updateToken(TEST_LOCUS_ID, 'null');
-    assert.isUndefined(interceptor.getToken(TEST_LOCUS_ID));
-  });
-
-  it('should delete token when updateToken called with null', () => {
-    interceptor.updateToken(TEST_LOCUS_ID, null);
-    assert.isUndefined(interceptor.getToken(TEST_LOCUS_ID));
-  });
 });

package/test/unit/spec/locus-info/controlsUtils.js

@@ -164,7 +164,7 @@ describe('plugin-meetings', () => {
 
         assert.equal(parsedControls.rdcControl.enabled, newControls.rdcControl.enabled);
       });
-
+      
       it('should parse the pollingQAControl control', () => {
         const newControls = {pollingQAControl: {enabled: true}};
 
@@ -173,14 +173,6 @@ describe('plugin-meetings', () => {
         assert.equal(parsedControls.pollingQAControl.enabled, newControls.pollingQAControl.enabled);
       });
 
-      it('should parse the hesiodLlmId in transcribe control', () => {
-        const newControls = {transcribe: {hesiodLlmId: 'llm-123', transcribing: true, caption: true, spokenLanguage: 'en-US'}};
-
-        const parsedControls = ControlsUtils.parse(newControls);
-
-        assert.equal(parsedControls.transcribe.hesiodLlmId, newControls.transcribe.hesiodLlmId);
-      });
-
       describe('videoEnabled', () => {
         it('returns expected', () => {
           const result = ControlsUtils.parse({video: {enabled: true}});
@@ -471,53 +463,6 @@ describe('plugin-meetings', () => {
         assert.equal(updates.hasTranscribeSpokenLanguageChanged, true);
       });
 
-      it('returns false when previous hesiodLlmId is undefined and current is a invalid value', () => {
-        const previous = { transcribe: undefined };
-        const current = { transcribe: { hesiodLlmId: null } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasHesiodLLMIdChanged, false);
-      });
-
-      it('detects hesiodLlmId change when previous is undefined and current is a valid value', () => {
-        const previous = { transcribe: undefined };
-        const current = { transcribe: { hesiodLlmId: '123a-456b' } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasHesiodLLMIdChanged, true);
-      });
-
-      describe('hasAiSummaryNotificationChanged', () => {
-        it('returns false when aiSummaryNotification has not changed', () => {
-          const previous = {transcribe: {aiSummaryNotification: false}};
-          const current = {transcribe: {aiSummaryNotification: false}};
-          const {updates} = ControlsUtils.getControls(previous, current);
-          assert.equal(updates.hasAiSummaryNotificationChanged, false);
-        });
-
-        it('returns true when aiSummaryNotification changes from false to true', () => {
-          const previous = {transcribe: {aiSummaryNotification: false}};
-          const current = {transcribe: {aiSummaryNotification: true}};
-          const {updates} = ControlsUtils.getControls(previous, current);
-          assert.equal(updates.hasAiSummaryNotificationChanged, true);
-        });
-
-        it('returns true when aiSummaryNotification changes from undefined to true', () => {
-          const previous = {transcribe: undefined};
-          const current = {transcribe: {aiSummaryNotification: true}};
-          const {updates} = ControlsUtils.getControls(previous, current);
-          assert.equal(updates.hasAiSummaryNotificationChanged, true);
-        });
-
-        it('parses aiSummaryNotification into the transcribe block', () => {
-          const controls = {transcribe: {transcribing: false, caption: false, aiSummaryNotification: true}};
-          const parsed = ControlsUtils.parse(controls);
-          assert.equal(parsed.transcribe.aiSummaryNotification, true);
-        });
-      });
-
       describe('videoEnabled', () => {
         const testVideoEnabled = (oldControls, newControls, updatedProperty) => {
           const result = ControlsUtils.getControls(oldControls, newControls);