Feat(webinar 5k)- keep both data channels of main session and practice session

packages/@webex/internal-plugin-voicea/src/constants.ts

@@ -44,6 +44,7 @@ export const TRANSCRIPTION_TYPE = {
 
 export const VOICEA = 'voicea';
 export const DEFAULT_SPOKEN_LANGUAGE = 'en';
+export const LLM_PRACTICE_SESSION = 'llm-practice-session';
 
 export const ANNOUNCE_STATUS = {
   IDLE: 'idle',

packages/@webex/internal-plugin-voicea/src/voicea.ts

@@ -6,6 +6,7 @@ import {
   AIBRIDGE_RELAY_TYPES,
   TRANSCRIPTION_TYPE,
   VOICEA,
+  LLM_PRACTICE_SESSION,
   ANNOUNCE_STATUS,
   TURN_ON_CAPTION_STATUS,
   TOGGLE_MANUAL_CAPTION_STATUS,
@@ -89,6 +90,8 @@ export class VoiceaChannel extends WebexPlugin implements IVoiceaChannel {
     if (!this.hasSubscribedToEvents) {
       // @ts-ignore
       this.webex.internal.llm.on('event:relay.event', this.eventProcessor);
+      // @ts-ignore
+      this.webex.internal.llm.on(`event:relay.event:${LLM_PRACTICE_SESSION}`, this.eventProcessor);
       this.hasSubscribedToEvents = true;
     }
   }
@@ -102,6 +105,8 @@ export class VoiceaChannel extends WebexPlugin implements IVoiceaChannel {
     this.captionServiceId = undefined;
     // @ts-ignore
     this.webex.internal.llm.off('event:relay.event', this.eventProcessor);
+    // @ts-ignore
+    this.webex.internal.llm.off(`event:relay.event:${LLM_PRACTICE_SESSION}`, this.eventProcessor);
     this.hasSubscribedToEvents = false;
     this.announceStatus = ANNOUNCE_STATUS.IDLE;
     this.captionStatus = TURN_ON_CAPTION_STATUS.IDLE;
@@ -264,13 +269,20 @@ export class VoiceaChannel extends WebexPlugin implements IVoiceaChannel {
   private sendAnnouncement = (): void => {
     this.announceStatus = ANNOUNCE_STATUS.JOINING;
     this.listenToEvents();
-    // @ts-ignore
-    this.webex.internal.llm.socket.send({
+    const socket =
+      // @ts-ignore
+      this.webex.internal.llm.getSocket(LLM_PRACTICE_SESSION) || this.webex.internal.llm.socket;
+    const binding =
+      // @ts-ignore
+      this.webex.internal.llm.getBinding(LLM_PRACTICE_SESSION) ||
+      // @ts-ignore
+      this.webex.internal.llm.getBinding();
+    socket.send({
       id: `${this.seqNum}`,
       type: 'publishRequest',
       recipients: {
         // @ts-ignore
-        route: this.webex.internal.llm.getBinding(),
+        route: binding,
       },
       // If captionServiceId exists, send it as the 'to' header; otherwise keep headers empty.
       headers: this.captionServiceId ? {to: this.captionServiceId} : {},
@@ -320,13 +332,20 @@ export class VoiceaChannel extends WebexPlugin implements IVoiceaChannel {
   public requestLanguage = (languageCode: string): void => {
     // @ts-ignore
     if (!this.webex.internal.llm.isConnected()) return;
-    // @ts-ignore
-    this.webex.internal.llm.socket.send({
+    const socket =
+      // @ts-ignore
+      this.webex.internal.llm.getSocket(LLM_PRACTICE_SESSION) || this.webex.internal.llm.socket;
+    const binding =
+      // @ts-ignore
+      this.webex.internal.llm.getBinding(LLM_PRACTICE_SESSION) ||
+      // @ts-ignore
+      this.webex.internal.llm.getBinding();
+    socket.send({
       id: `${this.seqNum}`,
       type: 'publishRequest',
       recipients: {
         // @ts-ignore
-        route: this.webex.internal.llm.getBinding(),
+        route: binding,
       },
       headers: {
         to: this.captionServiceId,
@@ -363,8 +382,16 @@ export class VoiceaChannel extends WebexPlugin implements IVoiceaChannel {
     // @ts-ignore
     if (!this.webex.internal.llm.isConnected()) return;
 
-    // @ts-ignore
-    this.webex.internal.llm.socket.send({
+    const socket =
+      // @ts-ignore
+      this.webex.internal.llm.getSocket(LLM_PRACTICE_SESSION) || this.webex.internal.llm.socket;
+    const binding =
+      // @ts-ignore
+      this.webex.internal.llm.getBinding(LLM_PRACTICE_SESSION) ||
+      // @ts-ignore
+      this.webex.internal.llm.getBinding();
+
+    socket?.send({
       id: `${this.seqNum}`,
       type: 'publishRequest',
       recipients: {

packages/@webex/internal-plugin-voicea/test/unit/spec/voicea.js

@@ -7,7 +7,11 @@ import Mercury from '@webex/internal-plugin-mercury';
 import LLMChannel from '@webex/internal-plugin-llm';
 
 import VoiceaService from '../../../src/index';
-import {EVENT_TRIGGERS, TOGGLE_MANUAL_CAPTION_STATUS} from '../../../src/constants';
+import {
+  EVENT_TRIGGERS,
+  LLM_PRACTICE_SESSION,
+  TOGGLE_MANUAL_CAPTION_STATUS,
+} from '../../../src/constants';
 
 describe('plugin-voicea', () => {
   const locusUrl = 'locusUrl';
@@ -28,6 +32,7 @@ describe('plugin-voicea', () => {
       voiceaService.connect = sinon.stub().resolves(true);
       voiceaService.webex.internal.llm.isConnected = sinon.stub().returns(true);
       voiceaService.webex.internal.llm.getBinding = sinon.stub().returns(undefined);
+      voiceaService.webex.internal.llm.getSocket = sinon.stub().returns(undefined);
       voiceaService.webex.internal.llm.getLocusUrl = sinon.stub().returns(locusUrl);
 
       voiceaService.request = sinon.stub().resolves({
@@ -87,7 +92,9 @@ describe('plugin-voicea', () => {
 
         voiceaService.sendAnnouncement();
 
-        assert.calledOnceWithExactly(spy, 'event:relay.event', sinon.match.func);
+        assert.calledTwice(spy);
+        assert.calledWith(spy, 'event:relay.event', sinon.match.func);
+        assert.calledWith(spy, `event:relay.event:${LLM_PRACTICE_SESSION}`, sinon.match.func);
       });
 
       it('includes captionServiceId in headers when set', () => {
@@ -1205,5 +1212,69 @@ describe('plugin-voicea', () => {
       });
     });
 
+    describe('#multiple llm connections', () => {
+      let defaultSocket;
+      let practiceSocket;
+
+      beforeEach(() => {
+        defaultSocket = new MockWebSocket();
+        practiceSocket = new MockWebSocket();
+
+        voiceaService.webex.internal.llm.socket = defaultSocket;
+        voiceaService.webex.internal.llm.getSocket.callsFake((channel) =>
+          channel === LLM_PRACTICE_SESSION ? practiceSocket : undefined
+        );
+        voiceaService.webex.internal.llm.getBinding.callsFake((channel) =>
+          channel === LLM_PRACTICE_SESSION ? 'practice-binding' : 'default-binding'
+        );
+        voiceaService.seqNum = 1;
+      });
+
+      it('sendAnnouncement uses the practice session socket and binding when available', () => {
+        voiceaService.announceStatus = 'idle';
+
+        voiceaService.sendAnnouncement();
+
+        assert.calledOnce(practiceSocket.send);
+        assert.notCalled(defaultSocket.send);
+
+        const sent = practiceSocket.send.getCall(0).args[0];
+        expect(sent).to.have.nested.property('recipients.route', 'practice-binding');
+      });
+
+      it('requestLanguage uses the practice session socket and binding when available', () => {
+        voiceaService.requestLanguage('fr');
+
+        assert.calledOnce(practiceSocket.send);
+        assert.notCalled(defaultSocket.send);
+
+        const sent = practiceSocket.send.getCall(0).args[0];
+        expect(sent).to.have.nested.property('recipients.route', 'practice-binding');
+        expect(sent).to.have.nested.property('data.clientPayload.translationLanguage', 'fr');
+      });
+
+      it('processes relay events from the practice session channel', async () => {
+        const announcementSpy = sinon.spy(voiceaService, 'processAnnouncementMessage');
+
+        voiceaService.listenToEvents();
+
+        // eslint-disable-next-line no-underscore-dangle
+        await voiceaService.webex.internal.llm._emit(`event:relay.event:${LLM_PRACTICE_SESSION}`, {
+          headers: {from: 'svc-practice'},
+          data: {
+            relayType: 'voicea.annc',
+            voiceaPayload: {
+              translation: {allowed_languages: ['en'], max_languages: 1},
+              ASR: {spoken_languages: ['en']},
+            },
+          },
+          sequenceNumber: 10,
+        });
+
+        assert.calledOnce(announcementSpy);
+        assert.equal(voiceaService.captionServiceId, 'svc-practice');
+      });
+    });
+
   });
 });

packages/@webex/plugin-meetings/src/annotation/index.ts

@@ -13,7 +13,7 @@ import {
 } from './constants';
 
 import {StrokeData, RequestData, IAnnotationChannel, CommandRequestBody} from './annotation.types';
-import {HTTP_VERBS, LOCUSEVENT} from '../constants';
+import {HTTP_VERBS, LOCUSEVENT, LLM_PRACTICE_SESSION} from '../constants';
 
 /**
  * @description Annotation to handle LLM and Mercury message and locus API
@@ -116,6 +116,12 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
       );
       // @ts-ignore
       this.webex.internal.llm.on('event:relay.event', this.eventDataProcessor, this);
+      // @ts-ignore
+      this.webex.internal.llm.on(
+        `event:relay.event:${LLM_PRACTICE_SESSION}`,
+        this.eventDataProcessor,
+        this
+      );
       this.hasSubscribedToEvents = true;
     }
   }
@@ -134,7 +140,11 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
 
       // @ts-ignore
       this.webex.internal.llm.off('event:relay.event', this.eventDataProcessor);
-
+      // @ts-ignore
+      this.webex.internal.llm.off(
+        `event:relay.event:${LLM_PRACTICE_SESSION}`,
+        this.eventDataProcessor
+      );
       this.hasSubscribedToEvents = false;
     }
   }
@@ -306,12 +316,20 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
    * @returns {void}
    */
   private publishEncrypted(encryptedContent: string, strokeData: StrokeData) {
+    const socket =
+      // @ts-ignore
+      this.webex.internal.llm.getSocket(LLM_PRACTICE_SESSION) || this.webex.internal.llm.socket;
+    const binding =
+      // @ts-ignore
+      this.webex.internal.llm.getBinding(LLM_PRACTICE_SESSION) ||
+      // @ts-ignore
+      this.webex.internal.llm.getBinding();
     const data = {
       id: `${this.seqNum}`,
       type: 'publishRequest',
       recipients: {
         // @ts-ignore
-        route: this.webex.internal.llm.getBinding(),
+        route: binding,
       },
       headers: {
         to: strokeData.toUserId,
@@ -339,7 +357,7 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
     };
 
     // @ts-ignore
-    this.webex.internal.llm.socket.send(data);
+    socket.send(data);
     this.seqNum += 1;
   }
 }

packages/@webex/plugin-meetings/src/constants.ts

@@ -44,6 +44,7 @@ export const LOCAL = 'local';
 export const LOCI = 'loci';
 export const LOCUS_URL = 'locusUrl';
 export const END = 'end';
+export const LLM_PRACTICE_SESSION = 'llm-practice-session';
 
 export const MAX_RANDOM_DELAY_FOR_MEETING_INFO = 3 * 60 * 1000;
 export const MEETINGINFO = 'meetingInfo';

packages/@webex/plugin-meetings/src/meeting/index.ts

@@ -6228,31 +6228,24 @@ export default class Meeting extends StatelessWebexPlugin {
     // @ts-ignore - Fix type
     const {
       url = undefined,
-      info: {datachannelUrl = undefined, practiceSessionDatachannelUrl = undefined} = {},
-      self: {datachannelToken = undefined, practiceSessionDatachannelToken = undefined} = {},
+      info: {datachannelUrl = undefined} = {},
+      self: {datachannelToken = undefined} = {},
     } = this.locusInfo || {};
 
     const isJoined = this.isJoined();
 
-    const dataChannelTokenType = this.getDataChannelTokenType();
-    const isPracticeSession = dataChannelTokenType === DataChannelTokenType.PracticeSession;
     // @ts-ignore
-    const currentToken = this.webex.internal.llm.getDatachannelToken(dataChannelTokenType);
-
-    const locusToken = isPracticeSession ? practiceSessionDatachannelToken : datachannelToken;
+    const currentToken = this.webex.internal.llm.getDatachannelToken(DataChannelTokenType.Default);
 
-    const finalToken = currentToken ?? locusToken;
+    const finalToken = currentToken ?? datachannelToken;
 
-    if (!currentToken && locusToken) {
+    if (!currentToken && datachannelToken) {
       // @ts-ignore
-      this.webex.internal.llm.setDatachannelToken(locusToken, dataChannelTokenType);
+      this.webex.internal.llm.setDatachannelToken(datachannelToken, DataChannelTokenType.Default);
     }
 
     // webinar panelist should use new data channel in practice session
-    const dataChannelUrl =
-      isPracticeSession && practiceSessionDatachannelUrl
-        ? practiceSessionDatachannelUrl
-        : datachannelUrl;
+    const dataChannelUrl = datachannelUrl;
 
     // @ts-ignore - Fix type
     if (this.webex.internal.llm.isConnected()) {

packages/@webex/plugin-meetings/src/meeting/util.ts

@@ -369,6 +369,7 @@ const MeetingUtil = {
     meeting.stopPeriodicLogUpload();
 
     meeting.breakouts.cleanUp();
+    meeting.webinar.cleanUp();
     meeting.simultaneousInterpretation.cleanUp();
     meeting.locusMediaRequest = undefined;