@webex/plugin-meetings 2.60.1-next.14 → 2.60.1-next.16

package/src/meeting/index.ts

@@ -37,7 +37,7 @@ import {
   EVENT_TRIGGERS as VOICEAEVENTS,
   TURN_ON_CAPTION_STATUS,
 } from '@webex/internal-plugin-voicea';
-import {processNewCaptions, processHighlightCreated} from './voicea-meeting';
+import {processNewCaptions} from './voicea-meeting';
 
 import {
   MeetingNotActiveError,
@@ -187,7 +187,6 @@ export type Transcription = {
   isListening: boolean;
   commandText: string;
   captions: Array<CaptionData>;
-  highlights: Array<any>;
   showCaptionBox: boolean;
   transcribingRequestStatus: string;
   isCaptioning: boolean;
@@ -664,9 +663,6 @@ export default class Meeting extends StatelessWebexPlugin {
         }
       );
     },
-    [VOICEAEVENTS.HIGHLIGHT_CREATED]: (data) => {
-      processHighlightCreated({data, meeting: this});
-    },
   };
 
   private retriedWithTurnServer: boolean;
@@ -1269,7 +1265,6 @@ export default class Meeting extends StatelessWebexPlugin {
      */
     this.transcription = {
       captions: [],
-      highlights: [],
       isListening: false,
       commandText: '',
       languageOptions: {},
@@ -2056,12 +2051,6 @@ export default class Meeting extends StatelessWebexPlugin {
       this.voiceaListenerCallbacks[VOICEAEVENTS.NEW_CAPTION]
     );
 
-    // @ts-ignore
-    this.webex.internal.voicea.on(
-      VOICEAEVENTS.HIGHLIGHT_CREATED,
-      this.voiceaListenerCallbacks[VOICEAEVENTS.HIGHLIGHT_CREATED]
-    );
-
     this.areVoiceaEventsSetup = true;
   }
 
@@ -4710,11 +4699,13 @@ export default class Meeting extends StatelessWebexPlugin {
             reject(payload);
           }
         };
+
         // @ts-ignore
         this.webex.internal.voicea.on(
           VOICEAEVENTS.SPOKEN_LANGUAGE_UPDATE,
           voiceaListenerLanguageUpdate
         );
+
         // @ts-ignore
         this.webex.internal.voicea.setSpokenLanguage(language);
       } catch (error) {
@@ -4830,12 +4821,6 @@ export default class Meeting extends StatelessWebexPlugin {
         this.voiceaListenerCallbacks[VOICEAEVENTS.NEW_CAPTION]
       );
 
-      // @ts-ignore
-      this.webex.internal.voicea.off(
-        VOICEAEVENTS.HIGHLIGHT_CREATED,
-        this.voiceaListenerCallbacks[VOICEAEVENTS.HIGHLIGHT_CREATED]
-      );
-
       this.areVoiceaEventsSetup = false;
       this.triggerStopReceivingTranscriptionEvent();
     }

package/src/meeting/util.ts

@@ -202,7 +202,11 @@ const MeetingUtil = {
         meeting.reconnectionManager.cleanUp();
       })
       .then(() => meeting.stopKeepAlive())
-      .then(() => meeting.updateLLMConnection());
+      .then(() => {
+        if (meeting.config?.enableAutomaticLLM) {
+          meeting.updateLLMConnection();
+        }
+      });
   },
 
   disconnectPhoneAudio: (meeting, phoneUrl) => {

package/src/meeting/voicea-meeting.ts

@@ -15,21 +15,18 @@ export const getSpeakerFromProxyOrStore = ({csisKey, meetingMembers, transcriptD
 
   if (csisKey && transcriptData.speakerProxy[csisKey]) {
     speaker = transcriptData.speakerProxy[csisKey];
+
+    return {speaker, needsCaching};
   }
+
   const meetingMember: any = getSpeaker(meetingMembers, [csisKey]);
 
-  const speakerInStore = {
+  speaker = {
     speakerId: meetingMember?.participant.person.id ?? '',
     name: meetingMember?.participant.person.name ?? '',
   };
 
-  if (
-    meetingMember &&
-    (speakerInStore.speakerId !== speaker.speakerId || speakerInStore.name !== speaker.name)
-  ) {
-    needsCaching = true;
-    speaker = speakerInStore;
-  }
+  needsCaching = true;
 
   return {speaker, needsCaching};
 };
@@ -39,20 +36,16 @@ export const processNewCaptions = ({data, meeting}) => {
   const transcriptData = meeting.transcription;
 
   if (data.isFinal) {
-    const doesInterimTranscriptionExist = transcriptId in transcriptData.interimCaptions;
-
-    if (doesInterimTranscriptionExist) {
-      transcriptData.interimCaptions[transcriptId].forEach((fakeId) => {
-        const fakeTranscriptIndex = transcriptData.captions.findIndex(
-          (transcript) => transcript.id === fakeId
-        );
-
-        if (fakeTranscriptIndex !== -1) {
-          transcriptData.captions.splice(fakeTranscriptIndex, 1);
-        }
-      });
-      delete transcriptData.interimCaptions[transcriptId];
-    }
+    transcriptData.interimCaptions[transcriptId].forEach((interimId) => {
+      const interimTranscriptIndex = transcriptData.captions.findIndex(
+        (transcript) => transcript.id === interimId
+      );
+
+      if (interimTranscriptIndex !== -1) {
+        transcriptData.captions.splice(interimTranscriptIndex, 1);
+      }
+    });
+    delete transcriptData.interimCaptions[transcriptId];
     const csisKey = data.transcript?.csis[0];
 
     const {needsCaching, speaker} = getSpeakerFromProxyOrStore({
@@ -69,7 +62,7 @@ export const processNewCaptions = ({data, meeting}) => {
       isFinal: data.isFinal,
       translations: data.translations,
       text: data.transcript?.text,
-      currentSpokenLanguage: data.transcript?.transcriptLanguageCode,
+      currentSpokenLanguage: data.transcript?.transcript_language_code,
       timestamp: data.timestamp,
       speaker,
     };
@@ -85,12 +78,12 @@ export const processNewCaptions = ({data, meeting}) => {
       csis: [csisMember],
     } = transcript;
 
-    const newCaption = `${transcriptsPerCsis.get(csisMember)?.text ?? ''} ${text}`;
+    const newCaption = `${transcriptsPerCsis.get(csisMember)?.text ?? ''} ${text}`.trim();
 
     // eslint-disable-next-line camelcase
     transcriptsPerCsis.set(csisMember, {text: newCaption, currentSpokenLanguage});
   }
-  const fakeTranscriptionIds = [];
+  const interimTranscriptionIds = [];
 
   for (const [key, value] of transcriptsPerCsis) {
     const {needsCaching, speaker} = getSpeakerFromProxyOrStore({
@@ -103,9 +96,9 @@ export const processNewCaptions = ({data, meeting}) => {
       transcriptData.speakerProxy[key] = speaker;
     }
     const {speakerId} = speaker;
-    const fakeId = `${transcriptId}_${speakerId}`;
+    const interimId = `${transcriptId}_${speakerId}`;
     const captionData = {
-      id: fakeId,
+      id: interimId,
       isFinal: data.isFinal,
       translations: value.translations,
       text: value.text,
@@ -114,48 +107,16 @@ export const processNewCaptions = ({data, meeting}) => {
       speaker,
     };
 
-    const fakeTranscriptIndex = transcriptData.captions.findIndex(
-      (transcript) => transcript.id === fakeId
+    const interimTranscriptIndex = transcriptData.captions.findIndex(
+      (transcript) => transcript.id === interimId
     );
 
-    if (fakeTranscriptIndex !== -1) {
-      transcriptData.captions.splice(fakeTranscriptIndex, 1);
+    if (interimTranscriptIndex !== -1) {
+      transcriptData.captions.splice(interimTranscriptIndex, 1);
     }
 
-    fakeTranscriptionIds.push(fakeId);
+    interimTranscriptionIds.push(interimId);
     transcriptData.captions.push(captionData);
   }
-  transcriptData.interimCaptions[transcriptId] = fakeTranscriptionIds;
-};
-
-export const processHighlightCreated = ({data, meeting}) => {
-  const transcriptData = meeting.transcription;
-
-  if (!transcriptData.highlights) {
-    transcriptData.highlights = [];
-  }
-
-  const csisKey = data.csis && data.csis.length > 0 ? data.csis[0] : undefined;
-  const {needsCaching, speaker} = getSpeakerFromProxyOrStore({
-    meetingMembers: meeting.members.membersCollection.members,
-    transcriptData,
-    csisKey,
-  });
-
-  if (needsCaching) {
-    transcriptData.speakerProxy[csisKey] = speaker;
-  }
-
-  const highlightCreated = {
-    id: data.highlightId,
-    meta: {
-      label: data.highlightLabel,
-      source: data.highlightSource,
-    },
-    text: data.text,
-    timestamp: data.timestamp,
-    speaker,
-  };
-
-  meeting.transcription.highlights.push(highlightCreated);
+  transcriptData.interimCaptions[transcriptId] = interimTranscriptionIds;
 };

package/test/unit/spec/meeting/index.js

@@ -676,7 +676,7 @@ describe('plugin-meetings', () => {
 
           await meeting.startTranscription();
 
-          assert.equal(webex.internal.voicea.on.callCount, 5);
+          assert.equal(webex.internal.voicea.on.callCount, 4);
           assert.equal(meeting.areVoiceaEventsSetup, true);
           assert.equal(webex.internal.voicea.listenToEvents.callCount, 1);
           assert.calledWith(
@@ -685,7 +685,7 @@ describe('plugin-meetings', () => {
           );
 
           await meeting.startTranscription();
-          assert.equal(webex.internal.voicea.on.callCount, 5);
+          assert.equal(webex.internal.voicea.on.callCount, 4);
           assert.equal(meeting.areVoiceaEventsSetup, true);
           assert.equal(webex.internal.voicea.listenToEvents.callCount, 1);
           assert.calledTwice(
@@ -706,7 +706,7 @@ describe('plugin-meetings', () => {
 
           await meeting.startTranscription();
 
-          assert.equal(webex.internal.voicea.on.callCount, 5);
+          assert.equal(webex.internal.voicea.on.callCount, 4);
           assert.equal(meeting.areVoiceaEventsSetup, true);
           assert.equal(webex.internal.voicea.listenToEvents.callCount, 1);
           assert.notCalled(
@@ -735,7 +735,7 @@ describe('plugin-meetings', () => {
 
         it('should stop listening to voicea events and also trigger a stop event', () => {
           meeting.stopTranscription();
-          assert.equal(webex.internal.voicea.off.callCount, 5);
+          assert.equal(webex.internal.voicea.off.callCount, 4);
           assert.equal(meeting.areVoiceaEventsSetup, false);
           assert.calledWith(
             TriggerProxy.trigger,
@@ -749,6 +749,150 @@ describe('plugin-meetings', () => {
         });
       });
 
+      describe('#setCaptionLanguage', () => {
+        beforeEach(() => {
+          meeting.isTranscriptionSupported = sinon.stub();
+          meeting.transcription = { languageOptions: {} };
+          webex.internal.voicea.on = sinon.stub();
+          webex.internal.voicea.off = sinon.stub();
+          webex.internal.voicea.setCaptionLanguage = sinon.stub();
+          webex.internal.voicea.requestLanguage = sinon.stub();
+        });
+
+        afterEach(() => {
+          // Restore the original methods after each test
+          sinon.restore();
+        });
+
+        it('should reject if transcription is not supported', (done) => {
+          meeting.isTranscriptionSupported.returns(false);
+
+          meeting.setCaptionLanguage('fr').catch((error) => {
+            assert.equal(error.message, 'Webex Assistant is not enabled/supported');
+            done();
+          });
+        });
+
+        it('should resolve with the language code on successful language update', (done) => {
+          meeting.isTranscriptionSupported.returns(true);
+          const languageCode = 'fr';
+
+          meeting.setCaptionLanguage(languageCode).then((resolvedLanguageCode) => {
+            assert.calledWith(
+              webex.internal.voicea.requestLanguage,
+              languageCode
+            );
+            assert.equal(resolvedLanguageCode, languageCode);
+            assert.equal(meeting.transcription.languageOptions.currentCaptionLanguage, languageCode);
+            done();
+          });
+
+          assert.calledOnceWithMatch(
+            webex.internal.voicea.on,
+            VOICEAEVENTS.CAPTION_LANGUAGE_UPDATE,
+          );
+
+          // Trigger the event
+          const voiceaListenerLangugeUpdate = webex.internal.voicea.on.getCall(0).args[1];
+          voiceaListenerLangugeUpdate({ statusCode: 200, languageCode });
+        });
+
+        it('should reject if the statusCode in payload is not 200', (done) => {
+          meeting.isTranscriptionSupported.returns(true);
+          const languageCode = 'fr';
+          const rejectPayload = {
+            statusCode: 400,
+            message: 'some error message'
+          }
+
+          meeting.setCaptionLanguage(languageCode).catch((payload) => {
+            assert.equal(payload, rejectPayload);
+            done();
+          });
+
+          assert.calledOnceWithMatch(
+            webex.internal.voicea.on,
+            VOICEAEVENTS.CAPTION_LANGUAGE_UPDATE,
+          );
+
+          // Trigger the event
+          const voiceaListenerLangugeUpdate = webex.internal.voicea.on.getCall(0).args[1];
+          voiceaListenerLangugeUpdate(rejectPayload);
+        });
+
+      });
+
+      describe('#setSpokenLanguage', () => {
+        beforeEach(() => {
+          meeting.isTranscriptionSupported = sinon.stub();
+          meeting.transcription = { languageOptions: {} };
+          webex.internal.voicea.on = sinon.stub();
+          webex.internal.voicea.off = sinon.stub();
+          webex.internal.voicea.setSpokenLanguage = sinon.stub();
+        });
+
+        afterEach(() => {
+          // Restore the original methods after each test
+          sinon.restore();
+        });
+
+        it('should reject if transcription is not supported', (done) => {
+          meeting.isTranscriptionSupported.returns(false);
+
+          meeting.setSpokenLanguage('fr').catch((error) => {
+            assert.equal(error.message, 'Webex Assistant is not enabled/supported');
+            done();
+          });
+        });
+
+        it('should resolve with the language code on successful language update', (done) => {
+          meeting.isTranscriptionSupported.returns(true);
+          const languageCode = 'fr';
+
+          meeting.setSpokenLanguage(languageCode).then((resolvedLanguageCode) => {
+            assert.calledWith(
+              webex.internal.voicea.setSpokenLanguage,
+              languageCode
+            );
+            assert.equal(resolvedLanguageCode, languageCode);
+            assert.equal(meeting.transcription.languageOptions.currentSpokenLanguage, languageCode);
+            done();
+          });
+
+          assert.calledOnceWithMatch(
+            webex.internal.voicea.on,
+            VOICEAEVENTS.SPOKEN_LANGUAGE_UPDATE,
+          );
+
+          // Trigger the event
+          const voiceaListenerLangugeUpdate = webex.internal.voicea.on.getCall(0).args[1];
+          voiceaListenerLangugeUpdate({ languageCode });
+        });
+
+        it('should reject if the language code does not exist in payload', (done) => {
+          meeting.isTranscriptionSupported.returns(true);
+          const languageCode = 'fr';
+          const rejectPayload = {
+            'message': 'some error message'
+          }
+
+          meeting.setSpokenLanguage(languageCode).catch((payload) => {
+            assert.equal(payload, rejectPayload);
+            done();
+          });
+
+          assert.calledOnceWithMatch(
+            webex.internal.voicea.on,
+            VOICEAEVENTS.SPOKEN_LANGUAGE_UPDATE,
+          );
+
+          // Trigger the event
+          const voiceaListenerLangugeUpdate = webex.internal.voicea.on.getCall(0).args[1];
+          voiceaListenerLangugeUpdate(rejectPayload);
+        });
+
+      });
+
       describe('transcription events', () => {
         it('should trigger meeting:caption-received event', () => {
           meeting.voiceaListenerCallbacks[VOICEAEVENTS.NEW_CAPTION]({});
@@ -789,6 +933,7 @@ describe('plugin-meetings', () => {
           );
         });
       });
+
       describe('#isReactionsSupported', () => {
         it('should return false if the feature is not supported for the meeting', () => {
           meeting.locusInfo.controls = {reactions: {enabled: false}};

package/test/unit/spec/meeting/utils.js

@@ -57,7 +57,8 @@ describe('plugin-meetings', () => {
     });
 
     describe('#cleanup', () => {
-      it('do clean up on meeting object', async () => {
+      it('do clean up on meeting object with LLM enabled', async () => {
+        meeting.config = {enableAutomaticLLM : true};
         await MeetingUtil.cleanUp(meeting);
         assert.calledOnce(meeting.cleanupLocalStreams);
         assert.calledOnce(meeting.closeRemoteStreams);
@@ -71,6 +72,37 @@ describe('plugin-meetings', () => {
         assert.calledOnce(meeting.breakouts.cleanUp);
         assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
       });
+
+      it('do clean up on meeting object with LLM disabled', async () => {
+        meeting.config = {enableAutomaticLLM : false};
+        await MeetingUtil.cleanUp(meeting);
+        assert.calledOnce(meeting.cleanupLocalStreams);
+        assert.calledOnce(meeting.closeRemoteStreams);
+        assert.calledOnce(meeting.closePeerConnections);
+
+        assert.calledOnce(meeting.unsetRemoteStreams);
+        assert.calledOnce(meeting.unsetPeerConnections);
+        assert.calledOnce(meeting.reconnectionManager.cleanUp);
+        assert.calledOnce(meeting.stopKeepAlive);
+        assert.notCalled(meeting.updateLLMConnection);
+        assert.calledOnce(meeting.breakouts.cleanUp);
+        assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
+      });
+
+      it('do clean up on meeting object with no config', async () => {
+        await MeetingUtil.cleanUp(meeting);
+        assert.calledOnce(meeting.cleanupLocalStreams);
+        assert.calledOnce(meeting.closeRemoteStreams);
+        assert.calledOnce(meeting.closePeerConnections);
+
+        assert.calledOnce(meeting.unsetRemoteStreams);
+        assert.calledOnce(meeting.unsetPeerConnections);
+        assert.calledOnce(meeting.reconnectionManager.cleanUp);
+        assert.calledOnce(meeting.stopKeepAlive);
+        assert.notCalled(meeting.updateLLMConnection);
+        assert.calledOnce(meeting.breakouts.cleanUp);
+        assert.calledOnce(meeting.simultaneousInterpretation.cleanUp);
+      });
     });
 
     describe('logging', () => {