@webex/plugin-meetings 3.0.0-beta.391 → 3.0.0-beta.393

package/src/meeting/voicea-meeting.ts

@@ -0,0 +1,122 @@
+export const getSpeaker = (members, csis = []) =>
+  Object.values(members).find((member: any) => {
+    const memberCSIs = member.participant.status.csis ?? [];
+
+    return csis.some((csi) => memberCSIs.includes(csi));
+  });
+
+export const getSpeakerFromProxyOrStore = ({csisKey, meetingMembers, transcriptData}) => {
+  let speaker = {
+    speakerId: '',
+    name: '',
+  };
+
+  let needsCaching = false;
+
+  if (csisKey && transcriptData.speakerProxy[csisKey]) {
+    speaker = transcriptData.speakerProxy[csisKey];
+
+    return {speaker, needsCaching};
+  }
+
+  const meetingMember: any = getSpeaker(meetingMembers, [csisKey]);
+
+  speaker = {
+    speakerId: meetingMember?.participant.person.id ?? '',
+    name: meetingMember?.participant.person.name ?? '',
+  };
+
+  needsCaching = true;
+
+  return {speaker, needsCaching};
+};
+
+export const processNewCaptions = ({data, meeting}) => {
+  const {transcriptId} = data;
+  const transcriptData = meeting.transcription;
+
+  if (data.isFinal) {
+    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({
+      meetingMembers: meeting.members.membersCollection.members,
+      transcriptData,
+      csisKey,
+    });
+
+    if (needsCaching) {
+      transcriptData.speakerProxy[csisKey] = speaker;
+    }
+    const captionData = {
+      id: transcriptId,
+      isFinal: data.isFinal,
+      translations: data.translations,
+      text: data.transcript?.text,
+      currentSpokenLanguage: data.transcript?.transcript_language_code,
+      timestamp: data.timestamp,
+      speaker,
+    };
+    transcriptData.captions.push(captionData);
+  }
+  const {transcripts = []} = data;
+  const transcriptsPerCsis = new Map();
+
+  for (const transcript of transcripts) {
+    const {
+      text,
+      transcript_language_code: currentSpokenLanguage,
+      csis: [csisMember],
+    } = transcript;
+
+    const newCaption = `${transcriptsPerCsis.get(csisMember)?.text ?? ''} ${text}`.trim();
+
+    // eslint-disable-next-line camelcase
+    transcriptsPerCsis.set(csisMember, {text: newCaption, currentSpokenLanguage});
+  }
+  const interimTranscriptionIds = [];
+
+  for (const [key, value] of transcriptsPerCsis) {
+    const {needsCaching, speaker} = getSpeakerFromProxyOrStore({
+      meetingMembers: meeting.members.membersCollection.members,
+      transcriptData,
+      csisKey: key,
+    });
+
+    if (needsCaching) {
+      transcriptData.speakerProxy[key] = speaker;
+    }
+    const {speakerId} = speaker;
+    const interimId = `${transcriptId}_${speakerId}`;
+    const captionData = {
+      id: interimId,
+      isFinal: data.isFinal,
+      translations: value.translations,
+      text: value.text,
+      currentCaptionLanguage: value.currentSpokenLanguage,
+      timestamp: value?.timestamp,
+      speaker,
+    };
+
+    const interimTranscriptIndex = transcriptData.captions.findIndex(
+      (transcript) => transcript.id === interimId
+    );
+
+    if (interimTranscriptIndex !== -1) {
+      transcriptData.captions.splice(interimTranscriptIndex, 1);
+    }
+
+    interimTranscriptionIds.push(interimId);
+    transcriptData.captions.push(captionData);
+  }
+  transcriptData.interimCaptions[transcriptId] = interimTranscriptionIds;
+};

package/src/meeting-info/meeting-info-v2.ts

@@ -204,22 +204,16 @@ export default class MeetingInfoV2 {
       return invitees;
     };
 
-    return this.webex.internal.conversation
-      .get({url: conversationUrl}, {includeParticipants: true, disableTransform: true})
-      .then((conversation) => {
-        const body: {
-          title: string;
-          spaceUrl: string;
-          keyUrl: string;
-          kroUrl: string;
-          invitees: any[];
-          installedOrgID?: string;
-        } = {
+    return this.webex
+      .request({uri: conversationUrl, qs: {includeParticipants: true}, disableTransform: true})
+      .then(({body: conversation}) => {
+        const body = {
           title: conversation.displayName,
           spaceUrl: conversation.url,
           keyUrl: conversation.encryptionKeyUrl,
           kroUrl: conversation.kmsResourceObjectUrl,
           invitees: getInvitees(conversation.participants?.items),
+          installedOrgID,
         };
 
         if (installedOrgID) {

package/src/meeting-info/util.ts

@@ -1,13 +1,12 @@
 import url from 'url';
 
 import btoa from 'btoa';
-import {
-  // @ts-ignore
-  deconstructHydraId,
-} from '@webex/common';
+// @ts-ignore
+import {deconstructHydraId} from '@webex/common';
 
 import ParameterError from '../common/errors/parameter';
 import LoggerProxy from '../common/logs/logger-proxy';
+
 import {
   _SIP_URI_,
   _PERSONAL_ROOM_,
@@ -221,12 +220,16 @@ MeetingInfoUtil.generateOptions = async (from) => {
     try {
       await webex.internal.services.waitForCatalog('postauth');
 
-      const conversationUrl = webex.internal.conversation.getUrlFromClusterId({
-        cluster: hydraId.cluster,
-        id: hydraId.destination,
-      });
+      const serviceUrl = webex.internal.services.getServiceUrlFromClusterId(
+        {
+          cluster: hydraId.cluster,
+        },
+        webex
+      );
 
-      options.destination = conversationUrl;
+      options.destination = hydraId.destination
+        ? `${serviceUrl}/conversations/${hydraId.destination}`
+        : serviceUrl;
     } catch (e) {
       LoggerProxy.logger.error(`Meeting-info:util#generateOptions --> ${e}`);
       throw e;

package/src/meeting-info/utilv2.ts

@@ -1,9 +1,7 @@
 import url from 'url';
 
-import {
-  // @ts-ignore
-  deconstructHydraId,
-} from '@webex/common';
+// @ts-ignore
+import {deconstructHydraId} from '@webex/common';
 
 import {
   _SIP_URI_,
@@ -21,6 +19,8 @@ import {
   JOIN,
   MEET,
   MEET_M,
+  MEET_CISCO,
+  MEET_CO,
   HTTPS_PROTOCOL,
   UUID_REG,
   VALID_EMAIL_ADDRESS,
@@ -68,6 +68,8 @@ MeetingInfoUtil.isMeetingLink = (value: string) => {
     parsedUrl.pathname &&
     (parsedUrl.pathname.includes(`/${MEET}`) ||
       parsedUrl.pathname.includes(`/${MEET_M}`) ||
+      parsedUrl.pathname.includes(`/${MEET_CISCO}`) ||
+      parsedUrl.pathname.includes(`/${MEET_CO}`) ||
       parsedUrl.pathname.includes(`/${JOIN}`));
 
   return hostNameBool && pathNameBool;
@@ -162,7 +164,13 @@ MeetingInfoUtil.getDestinationType = async (from) => {
     };
   }
   const options: any = {};
-  const hydraId = MeetingInfoUtil.getHydraId(destination);
+  let hydraId;
+
+  if (webex && webex.config && webex.config.meetings && webex.config.meetings.disableHydraId) {
+    hydraId = null;
+  } else {
+    hydraId = MeetingInfoUtil.getHydraId(destination);
+  }
 
   if (MeetingInfoUtil.isMeetingLink(destination)) {
     LoggerProxy.logger.warn(
@@ -180,19 +188,21 @@ MeetingInfoUtil.getDestinationType = async (from) => {
   } else if (MeetingInfoUtil.isConversationUrl(destination, webex)) {
     options.type = _CONVERSATION_URL_;
     options.destination = destination;
-  } else if (hydraId.people) {
+  } else if (hydraId && hydraId.people) {
     options.type = _SIP_URI_;
 
-    return MeetingInfoUtil.getSipUriFromHydraPersonId(hydraId.destination, webex).then((res) => {
-      options.destination = res;
+    return MeetingInfoUtil.getSipUriFromHydraPersonId(hydraId && hydraId.destination, webex).then(
+      (res) => {
+        options.destination = res;
 
-      // Since hydra person ids require a unique case in which they are
-      // entirely converted to a SIP URI, we need to set a flag for detecting
-      // this type of destination.
-      options.wasHydraPerson = true;
+        // Since hydra person ids require a unique case in which they are
+        // entirely converted to a SIP URI, we need to set a flag for detecting
+        // this type of destination.
+        options.wasHydraPerson = true;
 
-      return Promise.resolve(options);
-    });
+        return Promise.resolve(options);
+      }
+    );
   } else if (hydraId.room) {
     LoggerProxy.logger.error(
       `Meeting-info:util#getDestinationType --> Using the space ID as a destination is no longer supported. Please refer to the [migration guide](https://github.com/webex/webex-js-sdk/wiki/Migration-to-Unified-Space-Meetings) to migrate to use the meeting ID or SIP address.`

package/src/member/index.ts

@@ -268,7 +268,6 @@ export default class Member {
       audio: null,
       video: null,
     };
-
     // TODO: more participant types
     // such as native client, web client, is a device, what type of phone, etc
     this.processParticipant(participant);

package/test/integration/spec/journey.js

@@ -10,7 +10,7 @@ import {createCameraStream, createDisplayStream, createMicrophoneStream, LocalTr
 
 import testUtils from '../../utils/testUtils';
 import integrationTestUtils from '../../utils/integrationTestUtils';
-import {EVENT_TRIGGERS} from '../../../src/constants';
+import {EVENT_TRIGGERS} from '../../../dist/constants';
 
 require('dotenv').config();
 
@@ -239,7 +239,7 @@ skipInNode(describe)('plugin-meetings', () => {
 
     // Enabled when config.enableUnifiedMeetings = true
     xdescribe('Conversation URL', () => {
-      describe('Successful 1:1 meeting', () => {
+      describe('Successful 1:1 meeting',  () => {
         it('Fetch meeting information with a conversation URL for a 1:1 space', async () => {
           assert.equal(Object.keys(bob.webex.meetings.getAllMeetings()), 0);
           assert.equal(Object.keys(chris.webex.meetings.getAllMeetings()), 0);

package/test/unit/spec/breakouts/breakout.ts

@@ -89,7 +89,7 @@ describe('plugin-meetings', () => {
         })
         };
 
-        sinon.stub(webex.internal.newMetrics.submitClientEvent, 'bind').returns(webex.internal.newMetrics.submitClientEvent);
+        const submitClientEventStub = sinon.stub(webex.internal.newMetrics.submitClientEvent, 'bind').returns(webex.internal.newMetrics.submitClientEvent);
 
         let onBreakoutMoveRequestStub = sinon.stub(breakoutEvent, 'onBreakoutMoveRequest');
         let onBreakoutMoveResponseStub = sinon.stub(breakoutEvent, 'onBreakoutMoveResponse');
@@ -105,6 +105,7 @@ describe('plugin-meetings', () => {
 
         onBreakoutMoveRequestStub.restore();
         onBreakoutMoveResponseStub.restore();
+        submitClientEventStub.restore()
       });
     });
 

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

@@ -381,7 +381,7 @@ describe('plugin-meetings', () => {
             id: 'meeting-id'
           })
         };
-        breakoutEvent.onBreakoutJoinResponse = sinon.stub();
+        const onBreakoutJoinResponseSpy = sinon.stub(breakoutEvent,'onBreakoutJoinResponse')
         breakouts.currentBreakoutSession.sessionId = "sessionId-old";
         breakouts.updateBreakout({
           sessionId: 'sessionId-new',
@@ -398,7 +398,9 @@ describe('plugin-meetings', () => {
           breakoutMoveId: 'breakoutMoveId',
         });
 
-        assert.calledOnce(breakoutEvent.onBreakoutJoinResponse);
+        assert.calledOnce(onBreakoutJoinResponseSpy);
+
+        onBreakoutJoinResponseSpy.restore()
 
       });
 
@@ -408,7 +410,7 @@ describe('plugin-meetings', () => {
             id: 'meeting-id'
           })
         };
-        breakoutEvent.onBreakoutJoinResponse = sinon.stub();
+        const onBreakoutJoinResponseSpy = sinon.stub(breakoutEvent, 'onBreakoutJoinResponse');
         breakouts.currentBreakoutSession.sessionId = "sessionId";
         breakouts.currentBreakoutSession.groupId = "groupId";
         breakouts.updateBreakout({
@@ -426,7 +428,8 @@ describe('plugin-meetings', () => {
           breakoutMoveId: 'breakoutMoveId',
         });
 
-        assert.notCalled(breakoutEvent.onBreakoutJoinResponse);
+        assert.notCalled(onBreakoutJoinResponseSpy);
+        onBreakoutJoinResponseSpy.restore()
 
       });
     });

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

@@ -1385,7 +1385,7 @@ describe('plugin-meetings', () => {
             function: 'updateMeetingInfo',
           },
           LOCUSINFO.EVENTS.MEETING_INFO_UPDATED,
-          payload
+          payload,
         ];
 
         if (expected) {
@@ -1404,7 +1404,7 @@ describe('plugin-meetings', () => {
             function: 'updateMeetingInfo',
           },
           LOCUSINFO.EVENTS.MEETING_INFO_UPDATED,
-          payload
+          payload,
         ];
 
         if (expected) {
@@ -1426,8 +1426,7 @@ describe('plugin-meetings', () => {
         */
         sinon.stub(locusInfo, 'emitScoped').callsFake(() => {
           assert.deepEqual(mockMeeting, expectedMeeting);
-        })
-
+        });
 
         // set the info initially as locusInfo.info starts as undefined
         expectedMeeting = {
@@ -1907,7 +1906,7 @@ describe('plugin-meetings', () => {
         locusInfo.locusParser.workingCopy = {
           syncUrl: 'current sync url',
         };
-  
+
         locusInfo.applyLocusDeltaData(LOCUS_URL_CHANGED, fakeLocus, meeting);
         assert.calledOnceWithExactly(meeting.meetingRequest.getLocusDTO, {url: 'current sync url'});
       });
@@ -1970,8 +1969,12 @@ describe('plugin-meetings', () => {
           }).then(() => {
             assert.calledTwice(meeting.meetingRequest.getLocusDTO);
 
-            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[0].args, [{url: 'deltaSyncUrl'}]);
-            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[1].args, [{url: 'fullSyncUrl'}]);
+            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[0].args, [
+              {url: 'deltaSyncUrl'},
+            ]);
+            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[1].args, [
+              {url: 'fullSyncUrl'},
+            ]);
 
             assert.calledWith(sendBehavioralMetricStub, 'js_sdk_locus_delta_sync_failed', {
               correlationId: meeting.correlationId,
@@ -1999,8 +2002,12 @@ describe('plugin-meetings', () => {
           }).then(() => {
             assert.calledTwice(meeting.meetingRequest.getLocusDTO);
 
-            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[0].args, [{url: 'deltaSyncUrl'}]);
-            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[1].args, [{url: 'fullSyncUrl'}]);
+            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[0].args, [
+              {url: 'deltaSyncUrl'},
+            ]);
+            assert.deepEqual(meeting.meetingRequest.getLocusDTO.getCalls()[1].args, [
+              {url: 'fullSyncUrl'},
+            ]);
 
             assert.calledWith(sendBehavioralMetricStub, 'js_sdk_locus_delta_sync_failed', {
               correlationId: meeting.correlationId,
@@ -2084,7 +2091,7 @@ describe('plugin-meetings', () => {
 
         locusInfo.clearMainSessionLocusCache = sinon.stub();
         locusInfo.getTheLocusToUpdate(newLocus);
-        assert.notCalled(locusInfo.clearMainSessionLocusCache)
+        assert.notCalled(locusInfo.clearMainSessionLocusCache);
       });
 
       it('return the new locus if return to main session but no cache and do not clear main session cache', () => {
@@ -2106,7 +2113,7 @@ describe('plugin-meetings', () => {
 
         locusInfo.clearMainSessionLocusCache = sinon.stub();
         locusInfo.getTheLocusToUpdate(newLocus);
-        assert.notCalled(locusInfo.clearMainSessionLocusCache)
+        assert.notCalled(locusInfo.clearMainSessionLocusCache);
       });
 
       it('return the new locus if not return to main session and clear main session cache', () => {
@@ -2116,9 +2123,9 @@ describe('plugin-meetings', () => {
               sessionType: 'MAIN',
             },
           },
-          self: {removed: true}
+          self: {removed: true},
         };
-        locusInfo.fullState = {state: 'ACTIVE'}
+        locusInfo.fullState = {state: 'ACTIVE'};
         locusInfo.controls = {
           breakout: {
             sessionType: 'MAIN',
@@ -2134,7 +2141,7 @@ describe('plugin-meetings', () => {
 
         locusInfo.clearMainSessionLocusCache = sinon.stub();
         const result = locusInfo.getTheLocusToUpdate(newLocus);
-        assert.calledOnce(locusInfo.clearMainSessionLocusCache)
+        assert.calledOnce(locusInfo.clearMainSessionLocusCache);
 
         assert.deepEqual(result, newLocus);
       });
@@ -2146,9 +2153,9 @@ describe('plugin-meetings', () => {
               sessionType: 'MAIN',
             },
           },
-          self: {removed: undefined}
+          self: {removed: undefined},
         };
-        locusInfo.fullState = {state: 'ACTIVE'}
+        locusInfo.fullState = {state: 'ACTIVE'};
         locusInfo.controls = {
           breakout: {
             sessionType: 'MAIN',
@@ -2164,7 +2171,7 @@ describe('plugin-meetings', () => {
 
         locusInfo.clearMainSessionLocusCache = sinon.stub();
         locusInfo.getTheLocusToUpdate(newLocus);
-        assert.notCalled(locusInfo.clearMainSessionLocusCache)
+        assert.notCalled(locusInfo.clearMainSessionLocusCache);
       });
     });
 
@@ -2611,7 +2618,9 @@ describe('plugin-meetings', () => {
         // send an out-of-order delta
         locusInfo.handleLocusDelta(oooDelta, mockMeeting);
 
-        assert.calledOnceWithExactly(sendBehavioralMetricStub, 'js_sdk_locus_delta_ooo', { stack: sinon.match.any})
+        assert.calledOnceWithExactly(sendBehavioralMetricStub, 'js_sdk_locus_delta_ooo', {
+          stack: sinon.match.any,
+        });
 
         await clock.tickAsync(12499);
         await testUtils.flushPromises();

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

@@ -150,8 +150,7 @@ describe('plugin-meetings', () => {
 
       it('should return false if no breakouts in current', () => {
         const current = {
-          breakoutSessions: {
-          },
+          breakoutSessions: {},
         };
         const previous = {
           breakoutSessions: {
@@ -293,7 +292,7 @@ describe('plugin-meetings', () => {
           const clonedSelf = cloneDeep(self);
 
           clonedSelf.controls.audio.requestedToUnmute = true;
-          clonedSelf.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z'
+          clonedSelf.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z';
 
           const {updates} = SelfUtils.getSelves(self, clonedSelf);
 
@@ -371,23 +370,18 @@ describe('plugin-meetings', () => {
     const clonedSelf = cloneDeep(self);
 
     it('get breakoutMoveId works', () => {
-
       assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(self, deviceId), breakoutMoveId);
-
     });
 
     it('replaces is empty', () => {
-
       clonedSelf.devices[0].replaces = undefined;
       assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(clonedSelf, deviceId), null);
-
     });
 
     it('no self or self.devices is not array', () => {
-
       assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(undefined, deviceId), null);
 
-      clonedSelf.devices =     {
+      clonedSelf.devices = {
         url: 'https://wdm-a.wbx2.com/wdm/api/v1/devices/20eabde3-4254-48da-9a24',
         deviceType: 'WEB',
         mediaSessionsExternal: false,
@@ -395,10 +389,11 @@ describe('plugin-meetings', () => {
           {
             breakoutMoveId: 'e5caeb2c-ffcc-4e06-a08a-1122e7710398',
             lastActive: '2023-05-04T07:14:32.068Z',
-            locusUrl: 'https://locus-alpha-apdx.prod.meetapi.webex.com/locus/api/v1/loci/495061ca-7b3c-3b77-85ff-4e1bd58600d1',
+            locusUrl:
+              'https://locus-alpha-apdx.prod.meetapi.webex.com/locus/api/v1/loci/495061ca-7b3c-3b77-85ff-4e1bd58600d1',
             replacedAt: '2023-05-04T07:16:04.905Z',
             sessionId: 'be3147d4-c318-86d8-7611-8d24beaaca8d',
-          }
+          },
         ],
         state: 'JOINED',
       };

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

@@ -7,6 +7,10 @@ import {forEach} from 'lodash';
 import MockWebex from '@webex/test-helper-mock-webex';
 
 describe('createMediaConnection', () => {
+  let clock;
+  beforeEach(() => {
+    clock = sinon.useFakeTimers();
+  });
   const webex = MockWebex();
 
   const fakeRoapMediaConnection = {
@@ -45,6 +49,7 @@ describe('createMediaConnection', () => {
   };
   afterEach(() => {
     sinon.restore();
+    clock.uninstall()
   });
 
   it('creates a RoapMediaConnection when multistream is disabled', () => {