@webex/plugin-meetings 3.0.0-beta.332 → 3.0.0-beta.334

package/dist/types/locus-info/parser.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import SortedQueue from '../common/queue';
 type LocusDeltaDto = {
     url: string;
@@ -34,7 +33,7 @@ export default class Parser {
     };
     queue: SortedQueue<LocusDeltaDto>;
     workingCopy: any;
-    syncTimer: null | number | NodeJS.Timeout;
+    syncTimer?: ReturnType<typeof setTimeout>;
     /**
      * @constructs Parser
      */

package/dist/types/meeting/index.d.ts

@@ -868,7 +868,7 @@ export default class Meeting extends StatelessWebexPlugin {
      * @returns {undefined}
      * @memberof Meeting
      */
-    closeRemoteStreams(): Promise<[any, any, any, any]>;
+    closeRemoteStreams(): Promise<[any, any, any]>;
     /**
      * Stores the reference to a new microphone stream, sets up the required event listeners
      * on it, cleans up previous stream, etc.

package/dist/webinar/index.js

@@ -62,7 +62,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
   updateCanManageWebcast: function updateCanManageWebcast(canManageWebcast) {
     this.set('canManageWebcast', canManageWebcast);
   },
-  version: "3.0.0-beta.332"
+  version: "3.0.0-beta.334"
 });
 var _default = Webinar;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.332",
+  "version": "3.0.0-beta.334",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -33,12 +33,12 @@
   },
   "devDependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@webex/plugin-meetings": "3.0.0-beta.332",
-    "@webex/test-helper-chai": "3.0.0-beta.332",
-    "@webex/test-helper-mocha": "3.0.0-beta.332",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.332",
-    "@webex/test-helper-retry": "3.0.0-beta.332",
-    "@webex/test-helper-test-users": "3.0.0-beta.332",
+    "@webex/plugin-meetings": "3.0.0-beta.334",
+    "@webex/test-helper-chai": "3.0.0-beta.334",
+    "@webex/test-helper-mocha": "3.0.0-beta.334",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.334",
+    "@webex/test-helper-retry": "3.0.0-beta.334",
+    "@webex/test-helper-test-users": "3.0.0-beta.334",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -47,19 +47,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.332",
-    "@webex/internal-media-core": "2.2.2",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.332",
-    "@webex/internal-plugin-device": "3.0.0-beta.332",
-    "@webex/internal-plugin-llm": "3.0.0-beta.332",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.332",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.332",
-    "@webex/internal-plugin-support": "3.0.0-beta.332",
-    "@webex/internal-plugin-user": "3.0.0-beta.332",
-    "@webex/media-helpers": "3.0.0-beta.332",
-    "@webex/plugin-people": "3.0.0-beta.332",
-    "@webex/plugin-rooms": "3.0.0-beta.332",
-    "@webex/webex-core": "3.0.0-beta.332",
+    "@webex/common": "3.0.0-beta.334",
+    "@webex/internal-media-core": "2.2.3",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.334",
+    "@webex/internal-plugin-device": "3.0.0-beta.334",
+    "@webex/internal-plugin-llm": "3.0.0-beta.334",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.334",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.334",
+    "@webex/internal-plugin-support": "3.0.0-beta.334",
+    "@webex/internal-plugin-user": "3.0.0-beta.334",
+    "@webex/media-helpers": "3.0.0-beta.334",
+    "@webex/plugin-people": "3.0.0-beta.334",
+    "@webex/plugin-rooms": "3.0.0-beta.334",
+    "@webex/webex-core": "3.0.0-beta.334",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/locus-info/parser.ts

@@ -53,7 +53,7 @@ export default class Parser {
 
   queue: SortedQueue<LocusDeltaDto>;
   workingCopy: any;
-  syncTimer: null | number | NodeJS.Timeout;
+  syncTimer?: ReturnType<typeof setTimeout>;
 
   /**
    * @constructs Parser
@@ -85,7 +85,7 @@ export default class Parser {
     this.status = 'IDLE';
     this.onDeltaAction = null;
     this.workingCopy = null;
-    this.syncTimer = null;
+    this.syncTimer = undefined;
   }
 
   /**
@@ -673,11 +673,11 @@ export default class Parser {
    * @returns {undefined}
    */
   private startSyncTimer() {
-    if (this.syncTimer === null) {
+    if (this.syncTimer === undefined) {
       const timeout = OOO_DELTA_WAIT_TIME + Math.random() * OOO_DELTA_WAIT_TIME_RANDOM_DELAY;
 
       this.syncTimer = setTimeout(() => {
-        this.syncTimer = null;
+        this.syncTimer = undefined;
         this.triggerSync('timer expired, blocked on out-of-order delta');
       }, timeout);
     }
@@ -689,9 +689,9 @@ export default class Parser {
    * @returns {undefined}
    */
   private stopSyncTimer() {
-    if (this.syncTimer !== null) {
+    if (this.syncTimer !== undefined) {
       clearTimeout(this.syncTimer);
-      this.syncTimer = null;
+      this.syncTimer = undefined;
     }
   }
 

package/src/media/index.ts

@@ -217,10 +217,10 @@ Media.createMediaConnection = (
     {
       // TODO: RoapMediaConnection is not ready to use stream classes yet, so we pass the raw MediaStreamTrack for now SPARK-460530
       localTracks: {
-        audio: audioStream?.outputTrack,
-        video: videoStream?.outputTrack,
-        screenShareVideo: shareVideoStream?.outputTrack,
-        screenShareAudio: shareAudioStream?.outputTrack, // TODO: add type for screenShareAudio in internal-media-core SPARK-446923
+        audio: audioStream?.outputStream?.getTracks()[0],
+        video: videoStream?.outputStream?.getTracks()[0],
+        screenShareVideo: shareVideoStream?.outputStream?.getTracks()[0],
+        screenShareAudio: shareAudioStream?.outputStream?.getTracks()[0], // TODO: add type for screenShareAudio in internal-media-core SPARK-446923
       } as unknown,
       direction: {
         audio: Media.getDirection(true, mediaDirection.receiveAudio, mediaDirection.sendAudio),
@@ -399,7 +399,7 @@ Media.stopStream = (stream: LocalStream) => {
       stream.stop();
     } catch (e) {
       LoggerProxy.logger.error(
-        `Media:index#stopStream --> Unable to stop the stream with ready state of the output track => ${stream.outputTrack.readyState} & input track => ${stream.inputTrack.readyState}, error: ${e}`
+        `Media:index#stopStream --> Unable to stop the stream with ready state => ${stream.readyState}, error: ${e}`
       );
     }
   });

package/src/meeting/index.ts

@@ -3633,8 +3633,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   closeRemoteStreams() {
-    const {remoteAudioStream, remoteVideoStream, remoteShareStream, shareAudioStream} =
-      this.mediaProperties;
+    const {remoteAudioStream, remoteVideoStream, remoteShareStream} = this.mediaProperties;
 
     /**
      * Triggers an event to the developer
@@ -3675,7 +3674,6 @@ export default class Meeting extends StatelessWebexPlugin {
       stopStream(remoteAudioStream, EVENT_TYPES.REMOTE_AUDIO),
       stopStream(remoteVideoStream, EVENT_TYPES.REMOTE_VIDEO),
       stopStream(remoteShareStream, EVENT_TYPES.REMOTE_SHARE),
-      stopStream(shareAudioStream, EVENT_TYPES.REMOTE_SHARE_AUDIO),
     ]);
   }
 
@@ -7776,10 +7774,12 @@ export default class Meeting extends StatelessWebexPlugin {
       .update({
         // TODO: RoapMediaConnection is not ready to use stream classes yet, so we pass the raw MediaStreamTrack for now
         localTracks: {
-          audio: this.mediaProperties.audioStream?.outputTrack || null,
-          video: this.mediaProperties.videoStream?.outputTrack || null,
-          screenShareVideo: this.mediaProperties.shareVideoStream?.outputTrack || null,
-          screenShareAudio: this.mediaProperties.shareAudioStream?.outputTrack || null,
+          audio: this.mediaProperties.audioStream?.outputStream?.getTracks()[0] || null,
+          video: this.mediaProperties.videoStream?.outputStream?.getTracks()[0] || null,
+          screenShareVideo:
+            this.mediaProperties.shareVideoStream?.outputStream?.getTracks()[0] || null,
+          screenShareAudio:
+            this.mediaProperties.shareAudioStream?.outputStream?.getTracks()[0] || null,
         },
         direction: {
           audio: Media.getDirection(

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

@@ -16,16 +16,32 @@ describe('createMediaConnection', () => {
     id: 'any fake track'
   }
   const fakeAudioStream = {
-    outputTrack: fakeTrack,
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
   const fakeVideoStream = {
-    outputTrack: fakeTrack,
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
   const fakeShareVideoStream = {
-    outputTrack: fakeTrack,
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
   const fakeShareAudioStream = {
-    outputTrack: fakeTrack,
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
   afterEach(() => {
     sinon.restore();

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

@@ -2616,8 +2616,12 @@ describe('plugin-meetings', () => {
             setUnmuteAllowed: sinon.stub(),
             setMuted: sinon.stub(),
             setServerMuted: sinon.stub(),
-            outputTrack: {
-              id: 'fake mic'
+            outputStream: {
+              getTracks: () => {
+                return [{
+                  id: 'fake mic'
+                }];
+              }
             }
           }
 
@@ -2828,10 +2832,10 @@ describe('plugin-meetings', () => {
             assert.calledOnceWithExactly(roapMediaConnectionConstructorStub, mediaConnectionConfig,
               {
                 localTracks: {
-                  audio: localStreams.audio?.outputTrack,
-                  video: localStreams.video?.outputTrack,
-                  screenShareVideo: localStreams.screenShareVideo?.outputTrack,
-                  screenShareAudio: localStreams.screenShareAudio?.outputTrack,
+                  audio: localStreams.audio?.outputStream?.getTracks()[0],
+                  video: localStreams.video?.outputStream?.getTracks()[0],
+                  screenShareVideo: localStreams.screenShareVideo?.outputStream?.getTracks()[0],
+                  screenShareAudio: localStreams.screenShareAudio?.outputStream?.getTracks()[0],
                 },
                 direction: {audio: direction.audio, video: direction.video, screenShareVideo: direction.screenShare},
                 remoteQualityLevel,
@@ -3106,7 +3110,7 @@ describe('plugin-meetings', () => {
                   assert.calledOnceWithExactly(meeting.sendSlotManager.getSlot(MediaType.AudioMain).publishStream, fakeMicrophoneStream);
                 } else {
                   assert.calledOnceWithExactly(fakeRoapMediaConnection.update, {
-                    localTracks: { audio: fakeMicrophoneStream.outputTrack, video: null, screenShareVideo: null, screenShareAudio: null },
+                    localTracks: { audio: fakeMicrophoneStream.outputStream.getTracks()[0], video: null, screenShareVideo: null, screenShareAudio: null },
                     direction: {
                       audio: expected.direction,
                       video: 'sendrecv',
@@ -3132,8 +3136,12 @@ describe('plugin-meetings', () => {
                   muted: false,
                   setUnmuteAllowed: sinon.stub(),
                   setMuted: sinon.stub(),
-                  outputTrack:{
-                    id: 'fake mic 2',
+                  outputStream: {
+                    getTracks: () => {
+                      return [{
+                        id: 'fake mic 2',
+                      }];
+                    }
                   }
                 }
 
@@ -3145,7 +3153,7 @@ describe('plugin-meetings', () => {
                   assert.calledOnceWithExactly(meeting.sendSlotManager.getSlot(MediaType.AudioMain).publishStream, fakeMicrophoneStream2);
                 } else {
                   assert.calledOnceWithExactly(fakeRoapMediaConnection.update, {
-                    localTracks: { audio: fakeMicrophoneStream2.outputTrack, video: null, screenShareVideo: null, screenShareAudio: null },
+                    localTracks: { audio: fakeMicrophoneStream2.outputStream.getTracks()[0], video: null, screenShareVideo: null, screenShareAudio: null },
                     direction: {
                       audio: expected.direction,
                       video: 'sendrecv',
@@ -3216,7 +3224,7 @@ describe('plugin-meetings', () => {
               assert.equal(meeting.sendSlotManager.getSlot(MediaType.AudioMain).active, expectedDirection !== 'inactive');
             } else {
               assert.calledOnceWithExactly(fakeRoapMediaConnection.update, {
-                localTracks: { audio: expectedStream?.outputTrack ?? null, video: null, screenShareVideo: null, screenShareAudio: null },
+                localTracks: { audio: expectedStream?.outputStream.getTracks()[0] ?? null, video: null, screenShareVideo: null, screenShareAudio: null },
                 direction: {
                   audio: expectedDirection,
                   video: 'sendrecv',
@@ -3666,7 +3674,11 @@ describe('plugin-meetings', () => {
         let sandbox;
 
         const createFakeLocalStream = () => ({
-          outputTrack: {id: 'fake underlying track'},
+          outputStream: {
+            getTracks: () => {
+              return [{id: 'fake underlying track'}];
+            }
+          }
         });
         beforeEach(() => {
           sandbox = sinon.createSandbox();
@@ -3749,10 +3761,10 @@ describe('plugin-meetings', () => {
             meeting.mediaProperties.webrtcMediaConnection.update,
             {
               localTracks: {
-                audio: meeting.mediaProperties.audioStream.outputTrack,
-                video: meeting.mediaProperties.videoStream.outputTrack,
-                screenShareVideo: meeting.mediaProperties.shareVideoStream.outputTrack,
-                screenShareAudio: meeting.mediaProperties.shareVideoStream.outputTrack,
+                audio: meeting.mediaProperties.audioStream.outputStream.getTracks()[0],
+                video: meeting.mediaProperties.videoStream.outputStream.getTracks()[0],
+                screenShareVideo: meeting.mediaProperties.shareVideoStream.outputStream.getTracks()[0],
+                screenShareAudio: meeting.mediaProperties.shareVideoStream.outputStream.getTracks()[0],
               },
               direction: {
                 audio: 'inactive',
@@ -3781,7 +3793,13 @@ describe('plugin-meetings', () => {
             meeting.mediaProperties.mediaDirection = mediaDirection;
             meeting.mediaProperties.remoteVideoStream = sinon
               .stub()
-              .returns({outputTrack: {id: 'some mock id'}});
+              .returns({
+                outputStream: {
+                  getTracks: () => {
+                    id: 'some mock id'
+                  }
+                }
+              });
 
             meeting.meetingRequest.changeVideoLayoutDebounced = sinon
               .stub()
@@ -5779,7 +5797,7 @@ describe('plugin-meetings', () => {
         it('should stop remote tracks, and trigger a media:stopped event when the remote tracks are stopped', async () => {
           await meeting.closeRemoteStreams();
 
-          assert.equal(TriggerProxy.trigger.callCount, 6);
+          assert.equal(TriggerProxy.trigger.callCount, 5);
           assert.calledWith(
             TriggerProxy.trigger,
             sinon.match.instanceOf(Meeting),