@webex/plugin-meetings 3.0.0-beta.48 → 3.0.0-beta.49

package/dist/types/constants.d.ts

@@ -436,7 +436,6 @@ export declare const LOCUSINFO: {
         CONTROLS_MEETING_BREAKOUT_UPDATED: string;
         CONTROLS_MEETING_CONTAINER_UPDATED: string;
         CONTROLS_ENTRY_EXIT_TONE_UPDATED: string;
-        CONTROLS_VIDEO_ENABLED_UPDATED: string;
         SELF_UNADMITTED_GUEST: string;
         SELF_ADMITTED_GUEST: string;
         SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.48",
+  "version": "3.0.0-beta.49",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.48",
-    "@webex/test-helper-chai": "3.0.0-beta.48",
-    "@webex/test-helper-mocha": "3.0.0-beta.48",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.48",
-    "@webex/test-helper-retry": "3.0.0-beta.48",
-    "@webex/test-helper-test-users": "3.0.0-beta.48",
+    "@webex/plugin-meetings": "3.0.0-beta.49",
+    "@webex/test-helper-chai": "3.0.0-beta.49",
+    "@webex/test-helper-mocha": "3.0.0-beta.49",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.49",
+    "@webex/test-helper-retry": "3.0.0-beta.49",
+    "@webex/test-helper-test-users": "3.0.0-beta.49",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,18 +46,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.48",
-    "@webex/internal-media-core": "1.35.2",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.48",
-    "@webex/internal-plugin-device": "3.0.0-beta.48",
-    "@webex/internal-plugin-llm": "3.0.0-beta.48",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.48",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.48",
-    "@webex/internal-plugin-support": "3.0.0-beta.48",
-    "@webex/internal-plugin-user": "3.0.0-beta.48",
-    "@webex/plugin-people": "3.0.0-beta.48",
-    "@webex/plugin-rooms": "3.0.0-beta.48",
-    "@webex/webex-core": "3.0.0-beta.48",
+    "@webex/common": "3.0.0-beta.49",
+    "@webex/internal-media-core": "1.35.3",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.49",
+    "@webex/internal-plugin-device": "3.0.0-beta.49",
+    "@webex/internal-plugin-llm": "3.0.0-beta.49",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.49",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.49",
+    "@webex/internal-plugin-support": "3.0.0-beta.49",
+    "@webex/internal-plugin-user": "3.0.0-beta.49",
+    "@webex/plugin-people": "3.0.0-beta.49",
+    "@webex/plugin-rooms": "3.0.0-beta.49",
+    "@webex/webex-core": "3.0.0-beta.49",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/constants.ts

@@ -568,7 +568,6 @@ export const LOCUSINFO = {
     CONTROLS_MEETING_BREAKOUT_UPDATED: 'CONTROLS_MEETING_BREAKOUT_UPDATED',
     CONTROLS_MEETING_CONTAINER_UPDATED: 'CONTROLS_MEETING_CONTAINER_UPDATED',
     CONTROLS_ENTRY_EXIT_TONE_UPDATED: 'CONTROLS_ENTRY_EXIT_TONE_UPDATED',
-    CONTROLS_VIDEO_ENABLED_UPDATED: 'CONTROLS_VIDEO_ENABLED_UPDATED',
     SELF_UNADMITTED_GUEST: 'SELF_UNADMITTED_GUEST',
     SELF_ADMITTED_GUEST: 'SELF_ADMITTED_GUEST',
     SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED: 'SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED',

package/src/locus-info/index.ts

@@ -800,7 +800,7 @@ export default class LocusInfo extends EventsScope {
             file: 'locus-info',
             function: 'updateControls',
           },
-          LOCUSINFO.EVENTS.CONTROLS_VIDEO_ENABLED_UPDATED,
+          LOCUSINFO.EVENTS.SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED,
           {
             // muted: not part of locus.controls
             unmuteAllowed: videoEnabled,

package/src/media/index.ts

@@ -105,7 +105,7 @@ Media.getLocalMedia = (options: any, config: object) => {
  * @param {boolean} isMultistream
  * @param {string} debugId string useful for debugging (will appear in media connection logs)
  * @param {Object} options
- * @param {Object} [options.mediaProperties] only applicable to non-multistream connections, contains mediaDirection and local tracks:
+ * @param {Object} [options.mediaProperties] contains mediaDirection and local tracks:
  *                                 audioTrack, videoTrack and shareTrack
  * @param {string} [options.remoteQualityLevel] LOW|MEDIUM|HIGH applicable only to non-multistream connections
  * @param {boolean} [options.enableRtx] applicable only to non-multistream connections
@@ -117,11 +117,14 @@ Media.createMediaConnection = (
   isMultistream: boolean,
   debugId: string,
   options: {
-    mediaProperties?: {
+    mediaProperties: {
       mediaDirection?: {
         receiveAudio: boolean;
         receiveVideo: boolean;
         receiveShare: boolean;
+        sendAudio: boolean;
+        sendVideo: boolean;
+        sendShare: boolean;
       };
       audioTrack?: LocalMicrophoneTrack;
       videoTrack?: LocalCameraTrack;
@@ -153,6 +156,10 @@ Media.createMediaConnection = (
     return new MultistreamRoapMediaConnection(
       {
         iceServers,
+        enableMainAudio:
+          mediaProperties.mediaDirection?.sendAudio || mediaProperties.mediaDirection?.receiveAudio,
+        enableMainVideo:
+          mediaProperties.mediaDirection?.sendVideo || mediaProperties.mediaDirection?.receiveVideo,
       },
       debugId
     );

package/src/meeting/index.ts

@@ -5571,14 +5571,16 @@ export default class Meeting extends StatelessWebexPlugin {
   ) {
     const LOG_HEADER = 'Meeting:index#updateMedia -->';
 
-    if (this.isMultistream) {
-      throw new Error(
-        'updateMedia() is not supported with multistream, use publishTracks/unpublishTracks instead'
-      );
-    }
     if (!this.canUpdateMedia()) {
       return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.ALL, options);
     }
+
+    if (this.isMultistream) {
+      const audioEnabled = options.mediaSettings?.sendAudio || options.mediaSettings?.receiveAudio;
+
+      return this.mediaProperties.webrtcMediaConnection.enableMultistreamAudio(audioEnabled);
+    }
+
     const {localStream, localShare, mediaSettings} = options;
 
     const previousSendShareStatus = this.mediaProperties.mediaDirection.sendShare;

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

@@ -431,7 +431,7 @@ describe('plugin-meetings', () => {
             file: 'locus-info',
             function: 'updateControls',
           },
-          LOCUSINFO.EVENTS.CONTROLS_VIDEO_ENABLED_UPDATED,
+          LOCUSINFO.EVENTS.SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED,
           {unmuteAllowed: true}
         );
 
@@ -445,8 +445,8 @@ describe('plugin-meetings', () => {
         locusInfo.updateControls(newControls);
 
         locusInfo.emitScoped.getCalls().forEach((x) => {
-          // check that no calls in emitScoped are for CONTROLS_VIDEO_ENABLED_UPDATED
-          assert.notEqual(x.args[1], LOCUSINFO.EVENTS.CONTROLS_VIDEO_ENABLED_UPDATED);
+          // check that no calls in emitScoped are for SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED
+          assert.notEqual(x.args[1], LOCUSINFO.EVENTS.SELF_REMOTE_VIDEO_MUTE_STATUS_UPDATED);
         });
 
         assert.equal(mockMeeting.unmuteVideoAllowed, undefined);

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

@@ -3,6 +3,7 @@ import Media from '@webex/plugin-meetings/src/media/index';
 import {assert} from '@webex/test-helper-chai';
 import sinon from 'sinon';
 import StaticConfig from '@webex/plugin-meetings/src/common/config';
+import { forEach } from 'lodash';
 
 describe('createMediaConnection', () => {
   const fakeRoapMediaConnection = {
@@ -103,6 +104,16 @@ describe('createMediaConnection', () => {
       .returns(fakeRoapMediaConnection);
 
     Media.createMediaConnection(true, 'some debug id', {
+      mediaProperties: {
+        mediaDirection: {
+          sendAudio: true,
+          sendVideo: true,
+          sendShare: false,
+          receiveAudio: true,
+          receiveVideo: true,
+          receiveShare: true,
+        }
+      },
       turnServerInfo: {
         url: 'turn server url',
         username: 'turn username',
@@ -120,22 +131,73 @@ describe('createMediaConnection', () => {
             credential: 'turn password',
           },
         ],
+        enableMainAudio: true,
+        enableMainVideo: true,
       },
       'some debug id'
     );
   });
 
+  forEach([
+    {sendAudio: true, receiveAudio: true, sendVideo: true, receiveVideo: true, enableMainAudio: true, enableMainVideo: true,},
+    {sendAudio: true, receiveAudio: false, sendVideo: true, receiveVideo: false, enableMainAudio: true, enableMainVideo: true,},
+    {sendAudio: false, receiveAudio: true, sendVideo: false, receiveVideo: true, enableMainAudio: true, enableMainVideo: true,},
+    {sendAudio: false, receiveAudio: false, sendVideo: false, receiveVideo: false, enableMainAudio: false, enableMainVideo: false,},
+  ], ({sendAudio, sendVideo, receiveAudio, receiveVideo, enableMainAudio, enableMainVideo}) => {
+    it(`sets enableMainVideo to ${enableMainVideo} and enableMainAudio to ${enableMainAudio} when sendAudio: ${sendAudio} sendVideo: ${sendVideo} receiveAudio: ${receiveAudio} receiveVideo: ${receiveVideo}`, () => {
+      const multistreamRoapMediaConnectionConstructorStub = sinon
+        .stub(internalMediaModule, 'MultistreamRoapMediaConnection')
+        .returns(fakeRoapMediaConnection);
+
+      Media.createMediaConnection(true, 'some debug id', {
+        mediaProperties: {
+          mediaDirection: {
+            sendAudio,
+            sendVideo,
+            sendShare: false,
+            receiveAudio,
+            receiveVideo,
+            receiveShare: true,
+          },
+        },
+      });
+      assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
+      assert.calledWith(
+        multistreamRoapMediaConnectionConstructorStub,
+        {
+          iceServers: [],
+          enableMainAudio,
+          enableMainVideo,
+        },
+        'some debug id'
+      );
+    });
+  });
+
   it('passes empty ICE servers array to MultistreamRoapMediaConnection if turnServerInfo is undefined (multistream enabled)', () => {
     const multistreamRoapMediaConnectionConstructorStub = sinon
       .stub(internalMediaModule, 'MultistreamRoapMediaConnection')
       .returns(fakeRoapMediaConnection);
 
-    Media.createMediaConnection(true, 'debug string', {});
+    Media.createMediaConnection(true, 'debug string', {
+      mediaProperties: {
+        mediaDirection: {
+          sendAudio: true,
+          sendVideo: true,
+          sendShare: false,
+          receiveAudio: true,
+          receiveVideo: true,
+          receiveShare: true,
+        },
+      },
+    });
     assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
     assert.calledWith(
       multistreamRoapMediaConnectionConstructorStub,
       {
         iceServers: [],
+        enableMainAudio: true,
+        enableMainVideo: true,
       },
       'debug string'
     );

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

@@ -2,7 +2,7 @@
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 import 'jsdom-global/register';
-import {cloneDeep, isEqual} from 'lodash';
+import {cloneDeep, forEach, isEqual} from 'lodash';
 import sinon from 'sinon';
 import StateMachine from 'javascript-state-machine';
 import uuid from 'uuid';
@@ -2195,6 +2195,43 @@ describe('plugin-meetings', () => {
           sandbox = null;
         });
 
+        forEach(
+          [
+            {receiveAudio: true, sendAudio: true, enableMultistreamAudio: true},
+            {receiveAudio: true, sendAudio: false, enableMultistreamAudio: true},
+            {receiveAudio: false, sendAudio: true, enableMultistreamAudio: true},
+            {receiveAudio: false, sendAudio: false, enableMultistreamAudio: false},
+          ],
+          ({receiveAudio, sendAudio, enableMultistreamAudio}) => {
+            it(`should call enableMultistreamAudio with ${enableMultistreamAudio} if it is a multistream connection and receiveAudio: ${receiveAudio} sendAudio: ${sendAudio}`, async () => {
+              const mediaSettings = {
+                sendAudio,
+                receiveAudio,
+                sendVideo: true,
+                receiveVideo: true,
+                sendShare: true,
+                receiveShare: true,
+                isSharing: true,
+              };
+
+              meeting.mediaProperties.webrtcMediaConnection = {
+                enableMultistreamAudio: sinon.stub().resolves('some value'),
+              };
+              meeting.isMultistream = true;
+
+              const result = await meeting.updateMedia({
+                  mediaSettings,
+              });
+
+              assert.calledOnceWithExactly(
+                meeting.mediaProperties.webrtcMediaConnection.enableMultistreamAudio,
+                enableMultistreamAudio
+              );
+              assert.equal(result, 'some value');
+            });
+          }
+        );
+
         it('should use a queue if currently busy', async () => {
           const mediaSettings = {
             sendAudio: true,