@webex/plugin-meetings 3.0.0-beta.34 → 3.0.0-beta.340

package/src/statsAnalyzer/mqaUtil.ts

@@ -23,7 +23,8 @@ export const getAudioReceiverMqa = ({audioReceiver, statsResults, lastMqaDataSen
   }
 
   audioReceiver.common.common.direction = statsResults[mediaType].direction;
-  audioReceiver.common.transportType = statsResults.connectionType.remote.transport[0];
+  audioReceiver.common.common.isMain = !mediaType.includes('-share');
+  audioReceiver.common.transportType = statsResults.connectionType.local.transport;
 
   // add rtpPacket info inside common as also for call analyzer
   audioReceiver.common.rtpPackets =
@@ -83,7 +84,8 @@ export const getAudioSenderMqa = ({audioSender, statsResults, lastMqaDataSent, m
   }
 
   audioSender.common.common.direction = statsResults[mediaType].direction;
-  audioSender.common.transportType = statsResults.connectionType.local.transport[0];
+  audioSender.common.common.isMain = !mediaType.includes('-share');
+  audioSender.common.transportType = statsResults.connectionType.local.transport;
 
   audioSender.common.maxRemoteJitter =
     // @ts-ignore
@@ -146,7 +148,9 @@ export const getVideoReceiverMqa = ({videoReceiver, statsResults, lastMqaDataSen
   }
 
   videoReceiver.common.common.direction = statsResults[mediaType].direction;
-  videoReceiver.common.transportType = statsResults.connectionType.remote.transport[0];
+  videoReceiver.common.common.isMain = !mediaType.includes('-share');
+  videoReceiver.common.transportType = statsResults.connectionType.local.transport;
+
   // collect the packets received for the last min
   videoReceiver.common.rtpPackets =
     statsResults[mediaType][sendrecvType].totalPacketsReceived - lastPacketsReceived || 0;
@@ -172,7 +176,6 @@ export const getVideoReceiverMqa = ({videoReceiver, statsResults, lastMqaDataSen
     mean(statsResults[mediaType][sendrecvType].meanRemoteJitter) * 1000 || 0;
 
   videoReceiver.streams[0].common.rtpJitter = videoReceiver.common.maxRemoteJitter;
-  // videoReceiver.streams[0].common.rtpJitter = (statsResults.resolutions[mediaType][sendrecvType].jitterBufferDelay - lastMqaDataSent.resolutions[mediaType]?.[sendrecvType].jitterBufferDelay) / (statsResults.resolutions[mediaType][sendrecvType].jitterBufferEmittedCount - lastMqaDataSent.resolutions[mediaType]?.[sendrecvType].jitterBufferEmittedCount) * 1000 || 0;
 
   // Calculate the outgoing bitrate
   const totalBytesReceivedInaMin =
@@ -185,26 +188,23 @@ export const getVideoReceiverMqa = ({videoReceiver, statsResults, lastMqaDataSen
 
   // From tracks //TODO: calculate a proper one
   const totalFrameReceivedInaMin =
-    statsResults.resolutions[mediaType][sendrecvType].framesReceived - lastFramesReceived;
+    statsResults[mediaType][sendrecvType].framesReceived - lastFramesReceived;
   const totalFrameDecodedInaMin =
-    statsResults.resolutions[mediaType][sendrecvType].framesDecoded - lastFramesDecoded;
+    statsResults[mediaType][sendrecvType].framesDecoded - lastFramesDecoded;
 
-  videoReceiver.streams[0].common.receivedFrameRate = totalFrameReceivedInaMin
-    ? (totalFrameReceivedInaMin * 100) / 60
-    : 0;
-  videoReceiver.streams[0].common.renderedFrameRate = totalFrameDecodedInaMin
-    ? (totalFrameDecodedInaMin * 100) / 60
-    : 0;
+  videoReceiver.streams[0].common.receivedFrameRate = Math.round(
+    totalFrameReceivedInaMin ? totalFrameReceivedInaMin / 60 : 0
+  );
+  videoReceiver.streams[0].common.renderedFrameRate = Math.round(
+    totalFrameDecodedInaMin ? totalFrameDecodedInaMin / 60 : 0
+  );
 
   videoReceiver.streams[0].common.framesDropped =
-    statsResults.resolutions[mediaType][sendrecvType].framesDropped - lastFramesDropped;
-  videoReceiver.streams[0].receivedHeight =
-    statsResults.resolutions[mediaType][sendrecvType].height;
-  videoReceiver.streams[0].receivedWidth = statsResults.resolutions[mediaType][sendrecvType].width;
+    statsResults[mediaType][sendrecvType].framesDropped - lastFramesDropped;
+  videoReceiver.streams[0].receivedHeight = statsResults[mediaType][sendrecvType].height || 0;
+  videoReceiver.streams[0].receivedWidth = statsResults[mediaType][sendrecvType].width || 0;
   videoReceiver.streams[0].receivedFrameSize =
-    (statsResults.resolutions[mediaType][sendrecvType].height *
-      statsResults.resolutions[mediaType][sendrecvType].height) /
-    256;
+    (videoReceiver.streams[0].receivedHeight * videoReceiver.streams[0].receivedWidth) / 256;
 
   videoReceiver.streams[0].receivedKeyFrames =
     statsResults[mediaType][sendrecvType].keyFramesDecoded - lastKeyFramesDecoded || 0;
@@ -229,7 +229,8 @@ export const getVideoSenderMqa = ({videoSender, statsResults, lastMqaDataSent, m
   }
 
   videoSender.common.common.direction = statsResults[mediaType].direction;
-  videoSender.common.transportType = statsResults.connectionType.local.transport[0];
+  videoSender.common.common.isMain = !mediaType.includes('-share');
+  videoSender.common.transportType = statsResults.connectionType.local.transport;
 
   // @ts-ignore
   videoSender.common.maxRemoteJitter =
@@ -278,16 +279,13 @@ export const getVideoSenderMqa = ({videoSender, statsResults, lastMqaDataSent, m
 
   // From tracks //TODO: calculate a proper one
   const totalFrameSentInaMin =
-    statsResults.resolutions[mediaType][sendrecvType].framesSent - (lastFramesSent || 0);
+    statsResults[mediaType][sendrecvType].framesSent - (lastFramesSent || 0);
 
-  videoSender.streams[0].common.transmittedFrameRate = totalFrameSentInaMin
-    ? (totalFrameSentInaMin * 100) / 60
-    : 0;
-  videoSender.streams[0].transmittedHeight =
-    statsResults.resolutions[mediaType][sendrecvType].height;
-  videoSender.streams[0].transmittedWidth = statsResults.resolutions[mediaType][sendrecvType].width;
+  videoSender.streams[0].common.transmittedFrameRate = Math.round(
+    totalFrameSentInaMin ? totalFrameSentInaMin / 60 : 0
+  );
+  videoSender.streams[0].transmittedHeight = statsResults[mediaType][sendrecvType].height || 0;
+  videoSender.streams[0].transmittedWidth = statsResults[mediaType][sendrecvType].width || 0;
   videoSender.streams[0].transmittedFrameSize =
-    (statsResults.resolutions[mediaType][sendrecvType].height *
-      statsResults.resolutions[mediaType][sendrecvType].width) /
-    254;
+    (videoSender.streams[0].transmittedHeight * videoSender.streams[0].transmittedWidth) / 256;
 };

package/src/webinar/collection.ts

@@ -0,0 +1,31 @@
+/*!
+ * Copyright (c) 2015-2023 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {MEETINGS} from '../constants';
+
+class WebinarCollection {
+  webinarInfo: any;
+
+  namespace = MEETINGS;
+
+  mainIndex = 'sessionId';
+
+  constructor() {
+    this.webinarInfo = {};
+  }
+
+  set(id, info) {
+    this.webinarInfo[id] = info;
+  }
+
+  /**
+   * @param {String} id
+   * @returns {Member}
+   */
+  get(id: string) {
+    return this.webinarInfo[id];
+  }
+}
+
+export default WebinarCollection;

package/src/webinar/index.ts

@@ -0,0 +1,62 @@
+/*!
+ * Copyright (c) 2015-2023 Cisco Systems, Inc. See LICENSE file.
+ */
+import {WebexPlugin} from '@webex/webex-core';
+import {MEETINGS} from '../constants';
+
+import WebinarCollection from './collection';
+
+/**
+ * @class Webinar
+ */
+const Webinar = WebexPlugin.extend({
+  namespace: MEETINGS,
+  collections: {
+    webinar: WebinarCollection,
+  },
+
+  props: {
+    locusUrl: 'string', // appears current webinar's locus url
+    webcastUrl: 'string', // current webinar's webcast url
+    webinarAttendeesSearchingUrl: 'string', // current webinarAttendeesSearching url
+    canManageWebcast: 'boolean', // appears the ability to manage webcast
+  },
+
+  /**
+   * Update the current locus url of the webinar
+   * @param {string} locusUrl // locus url
+   * @returns {void}
+   */
+  locusUrlUpdate(locusUrl) {
+    this.set('locusUrl', locusUrl);
+  },
+
+  /**
+   * Update the current webcast url of the meeting
+   * @param {string} webcastUrl // webcast url
+   * @returns {void}
+   */
+  webcastUrlUpdate(webcastUrl) {
+    this.set('webcastUrl', webcastUrl);
+  },
+
+  /**
+   * Update the current webinarAttendeesSearching url of the meeting
+   * @param {string} webinarAttendeesSearchingUrl // webinarAttendeesSearching url
+   * @returns {void}
+   */
+  webinarAttendeesSearchingUrlUpdate(webinarAttendeesSearchingUrl) {
+    this.set('webinarAttendeesSearchingUrl', webinarAttendeesSearchingUrl);
+  },
+
+  /**
+   * Update whether self has capability to manage start/stop webcast (only host can manage it)
+   * @param {boolean} canManageWebcast
+   * @returns {void}
+   */
+  updateCanManageWebcast(canManageWebcast) {
+    this.set('canManageWebcast', canManageWebcast);
+  },
+});
+
+export default Webinar;

package/test/integration/spec/converged-space-meetings.js

@@ -3,13 +3,30 @@ import 'jsdom-global/register';
 import {assert} from '@webex/test-helper-chai';
 import {skipInNode} from '@webex/test-helper-mocha';
 import BrowserDetection from '@webex/plugin-meetings/dist/common/browser-detection';
+import {createCameraStream, createMicrophoneStream} from '@webex/plugin-meetings';
 
 import {MEDIA_SERVERS} from '../../utils/constants';
 import testUtils from '../../utils/testUtils';
+import integrationTestUtils from '../../utils/integrationTestUtils';
 import webexTestUsers from '../../utils/webex-test-users';
 
 config();
 
+const localTracks = {
+  alice: {
+    microphone: undefined,
+    camera: undefined,
+  },
+  bob: {
+    microphone: undefined,
+    camera: undefined,
+  },
+  chris: {
+    microphone: undefined,
+    camera: undefined,
+  },
+};
+
 skipInNode(describe)('plugin-meetings', () => {
   const {isBrowser} = BrowserDetection();
 
@@ -135,6 +152,17 @@ skipInNode(describe)('plugin-meetings', () => {
         assert.exists(chris.meeting.joinedWith);
       });
 
+      it('users "alice", "bob", and "chris" create local tracks', async () => {
+        localTracks.alice.microphone = await createMicrophoneStream();
+        localTracks.alice.camera = await createCameraStream();
+
+        localTracks.bob.microphone = await createMicrophoneStream();
+        localTracks.bob.camera = await createCameraStream();
+
+        localTracks.chris.microphone = await createMicrophoneStream();
+        localTracks.chris.camera = await createCameraStream();
+      });
+
       it('users "alice", "bob", and "chris" add media', async () => {
         mediaReadyListener = testUtils.waitForEvents([
           {scope: alice.meeting, event: 'media:negotiated'},
@@ -142,9 +170,9 @@ skipInNode(describe)('plugin-meetings', () => {
           {scope: chris.meeting, event: 'media:negotiated'},
         ]);
 
-        const addMediaAlice = testUtils.addMedia(alice, {expectedMediaReadyTypes: ['local']});
-        const addMediaBob = testUtils.addMedia(bob, {expectedMediaReadyTypes: ['local']});
-        const addMediaChris = testUtils.addMedia(chris, {expectedMediaReadyTypes: ['local']});
+        const addMediaAlice = integrationTestUtils.addMedia(alice, {multistream: true, microphone: localTracks.alice.microphone, camera: localTracks.alice.camera});
+        const addMediaBob = integrationTestUtils.addMedia(bob, {multistream: true, microphone: localTracks.bob.microphone, camera: localTracks.bob.camera});
+        const addMediaChris = integrationTestUtils.addMedia(chris, {multistream: true, microphone: localTracks.chris.microphone, camera: localTracks.chris.camera});
 
         await addMediaAlice;
         await addMediaBob;
@@ -171,6 +199,35 @@ skipInNode(describe)('plugin-meetings', () => {
         assert.equal(bob.meeting.mediaProperties.webrtcMediaConnection.mediaServer, MEDIA_SERVERS.HOMER);
         assert.equal(chris.meeting.mediaProperties.webrtcMediaConnection.mediaServer, MEDIA_SERVERS.HOMER);
       });
+
+      it('users "alice", "bob", and "chris" stop their local tracks', () => {
+        if (localTracks.alice.microphone) {
+          localTracks.alice.microphone.stop();
+          localTracks.alice.microphone = undefined;
+        }
+        if (localTracks.alice.camera) {
+          localTracks.alice.camera.stop();
+          localTracks.alice.camera = undefined;
+        }
+
+        if (localTracks.bob.microphone) {
+          localTracks.bob.microphone.stop();
+          localTracks.bob.microphone = undefined;
+        }
+        if (localTracks.bob.camera) {
+          localTracks.bob.camera.stop();
+          localTracks.bob.camera = undefined;
+        }
+
+        if (localTracks.chris.microphone) {
+          localTracks.chris.microphone.stop();
+          localTracks.chris.microphone = undefined;
+        }
+        if (localTracks.chris.camera) {
+          localTracks.chris.camera.stop();
+          localTracks.chris.camera = undefined;
+        }
+      });
     });
   }
 });