@webex/plugin-meetings 3.0.0-beta.4 → 3.0.0-beta.40

package/test/unit/spec/stats-analyzer/index.js

@@ -2,7 +2,7 @@ import 'jsdom-global/register';
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinon from 'sinon';
-import {MediaConnection as MC} from '@webex/internal-media-core';
+import {ConnectionState} from '@webex/internal-media-core';
 
 import {StatsAnalyzer, EVENTS} from '../../../../src/statsAnalyzer';
 import NetworkQualityMonitor from '../../../../src/networkQualityMonitor';
@@ -20,31 +20,32 @@ describe('plugin-meetings', () => {
       let sandBoxSpy;
 
       const initialConfig = {
-        videoPacketLossRatioThreshold: 9
+        videoPacketLossRatioThreshold: 9,
       };
 
       const defaultStats = {
+        resolutions: {},
         internal: {
-          video: {
+          'video-send-1': {
             send: {
-              totalPacketsLostOnReceiver: 10
-            }
-          }
+              totalPacketsLostOnReceiver: 10,
+            },
+          },
         },
-        video: {
+        'video-send-1': {
           send: {
             packetsSent: 2,
             meanRemoteJitter: [],
-            meanRoundTripTime: []
-          }
-        }
+            meanRoundTripTime: [],
+          },
+        },
       };
 
       const statusResult = {
         type: 'remote-inbound-rtp',
         packetsLost: 11,
         rttThreshold: 501,
-        jitterThreshold: 501
+        jitterThreshold: 501,
       };
 
       const sandbox = sinon.createSandbox();
@@ -54,7 +55,10 @@ describe('plugin-meetings', () => {
 
         statsAnalyzer = new StatsAnalyzer(initialConfig, networkQualityMonitor, defaultStats);
 
-        sandBoxSpy = sandbox.spy(statsAnalyzer.networkQualityMonitor, 'determineUplinkNetworkQuality');
+        sandBoxSpy = sandbox.spy(
+          statsAnalyzer.networkQualityMonitor,
+          'determineUplinkNetworkQuality'
+        );
       });
 
       afterEach(() => {
@@ -62,14 +66,16 @@ describe('plugin-meetings', () => {
       });
 
       it('should trigger determineUplinkNetworkQuality with specific arguments', async () => {
-        await statsAnalyzer.parseGetStatsResult(statusResult, 'video');
+        await statsAnalyzer.parseGetStatsResult(statusResult, 'video-send-1', true);
 
         assert.calledOnce(statsAnalyzer.networkQualityMonitor.determineUplinkNetworkQuality);
-        assert(sandBoxSpy.calledWith({
-          mediaType: 'video',
-          remoteRtpResults: statusResult,
-          statsAnalyzerCurrentStats: statsAnalyzer.statsResults
-        }));
+        assert(
+          sandBoxSpy.calledWith({
+            mediaType: 'video-send-1',
+            remoteRtpResults: statusResult,
+            statsAnalyzerCurrentStats: statsAnalyzer.statsResults,
+          })
+        );
       });
     });
 
@@ -105,52 +111,75 @@ describe('plugin-meetings', () => {
         // bytesReceived and bytesSent need to be non-zero in order for StatsAnalyzer to parse any other values
         fakeStats = {
           audio: {
-            receiver: {
-              type: 'inbound-rtp',
-              packetsReceived: 0,
-              bytesReceived: 1,
-            },
-            sender: {
-              type: 'outbound-rtp',
-              packetsSent: 0,
-              bytesSent: 1,
-            }
+            senders: [
+              {
+                report: [
+                  {
+                    type: 'outbound-rtp',
+                    packetsSent: 0,
+                    bytesSent: 1,
+                  },
+                ],
+              },
+            ],
+            receivers: [
+              {
+                report: [
+                  {
+                    type: 'inbound-rtp',
+                    packetsReceived: 0,
+                    bytesReceived: 1,
+                  },
+                ],
+              },
+            ],
           },
           video: {
-            receiver: {
-              type: 'inbound-rtp',
-              framesDecoded: 0,
-              bytesReceived: 1,
-            },
-            sender: {
-              type: 'outbound-rtp',
-              framesSent: 0,
-              bytesSent: 1,
-            }
-          }
+            senders: [
+              {
+                report: [
+                  {
+                    type: 'outbound-rtp',
+                    framesSent: 0,
+                    bytesSent: 1,
+                  },
+                ],
+              },
+            ],
+            receivers: [
+              {
+                report: [
+                  {
+                    type: 'inbound-rtp',
+                    framesDecoded: 0,
+                    bytesReceived: 1,
+                  },
+                ],
+              },
+            ],
+          },
         };
 
         pc = {
-          getConnectionState: sinon.stub().returns(MC.ConnectionState.Connected),
+          getConnectionState: sinon.stub().returns(ConnectionState.Connected),
           getTransceiverStats: sinon.stub().resolves({
             audio: {
-              sender: [fakeStats.audio.sender],
-              receiver: [fakeStats.audio.receiver],
-              currentDirection: 'sendrecv',
-              localTrackLabel: 'fake mic',
+              senders: [fakeStats.audio.senders[0]],
+              receivers: [fakeStats.audio.receivers[0]],
             },
             video: {
-              sender: [fakeStats.video.sender],
-              receiver: [fakeStats.video.receiver],
-              currentDirection: 'sendrecv',
-              localTrackLabel: 'fake camera',
+              senders: [fakeStats.video.senders[0]],
+              receivers: [fakeStats.video.receivers[0]],
+            },
+            screenShareAudio: {
+              senders: [],
+              receivers: [],
             },
             screenShareVideo: {
-              sender: [],
-              receiver: [],
-              currentDirection: 'sendrecv'
-            }
-          })
+              senders: [],
+              receivers: [],
+            },
+          }),
         };
 
         networkQualityMonitor = new NetworkQualityMonitor(initialConfig);
@@ -202,7 +231,7 @@ describe('plugin-meetings', () => {
         checkReceivedEvent({expected: {}});
 
         // setup a mock to return some values higher the previous ones
-        fakeStats.audio.sender.packetsSent += 10;
+        fakeStats.audio.senders[0].report[0].packetsSent += 10;
 
         await progressTime();
 
@@ -222,7 +251,7 @@ describe('plugin-meetings', () => {
         checkReceivedEvent({expected: {}});
 
         // setup a mock to return some values higher the previous ones
-        fakeStats.video.sender.framesSent += 1;
+        fakeStats.video.senders[0].report[0].framesSent += 1;
 
         await progressTime();
 
@@ -242,7 +271,7 @@ describe('plugin-meetings', () => {
         checkReceivedEvent({expected: {}});
 
         // setup a mock to return some values higher the previous ones
-        fakeStats.audio.receiver.packetsReceived += 5;
+        fakeStats.audio.receivers[0].report[0].packetsReceived += 5;
 
         await progressTime();
         // check that we got the REMOTE_MEDIA_STARTED event for audio
@@ -262,7 +291,7 @@ describe('plugin-meetings', () => {
         checkReceivedEvent({expected: {}});
 
         // setup a mock to return some values higher the previous ones
-        fakeStats.video.receiver.framesDecoded += 1;
+        fakeStats.video.receivers[0].report[0].framesDecoded += 1;
 
         await progressTime();
         // check that we got the REMOTE_MEDIA_STARTED event for video

package/test/utils/cmr.js

@@ -1,4 +1,3 @@
-
 import uuid from 'uuid';
 import retry from '@webex/test-helper-retry';
 
@@ -23,16 +22,16 @@ CMR.reserve = (webex, claimed) => {
       authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
       'cisco-no-http-redirect': null,
       'spark-user-agent': null,
-      trackingid: `ITCLIENT_${uuid.v4()}_0_imi:true`
+      trackingid: `ITCLIENT_${uuid.v4()}_0_imi:true`,
     },
     body: {
       resourceType,
       requestMetaData: {
         emailAddress: `test${uuid.v4()}@wx2.example.com`,
-        loginType: 'loginGuest'
+        loginType: 'loginGuest',
       },
-      reservedBy: 'Webex JavaScript SDK Test Suite'
-    }
+      reservedBy: 'Webex JavaScript SDK Test Suite',
+    },
   };
 
   if (claimed) {
@@ -40,7 +39,8 @@ CMR.reserve = (webex, claimed) => {
   }
   console.log('USER ID ', webex.internal.device.userId);
 
-  return webex.request(requestBody)
+  return webex
+    .request(requestBody)
     .then((response) => {
       const cmr = response.body;
 
@@ -56,47 +56,49 @@ CMR.reserve = (webex, claimed) => {
 CMR.release = (webex, reservationUrl) => {
   console.log('releasing cmr');
 
-  return webex.request({
-    method: 'DELETE',
-    uri: reservationUrl,
-    headers: {
-      authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
-      'cisco-no-http-redirect': null,
-      'spark-user-agent': null
-    }
-  })
+  return webex
+    .request({
+      method: 'DELETE',
+      uri: reservationUrl,
+      headers: {
+        authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
+        'cisco-no-http-redirect': null,
+        'spark-user-agent': null,
+      },
+    })
     .then(() => console.log('released cmr'));
 };
 
-CMR.waitForHostToJoin = (webex, resourceUrl) => retry(() => {
-  console.log('checking if the host has joined');
-
-  return webex.request({
-    method: 'GET',
-    uri: resourceUrl,
-    headers: {
-      authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
-      'cisco-no-http-redirect': null,
-      'spark-user-agent': null
-    }
+CMR.waitForHostToJoin = (webex, resourceUrl) =>
+  retry(() => {
+    console.log('checking if the host has joined');
+
+    return webex
+      .request({
+        method: 'GET',
+        uri: resourceUrl,
+        headers: {
+          authorization: `Bearer ${webex.credentials.supertoken.access_token}`,
+          'cisco-no-http-redirect': null,
+          'spark-user-agent': null,
+        },
+      })
+      .then((res) => {
+        if (res.body && res.body.meeting.hostPresent) {
+          console.log('the host has joined');
+
+          return;
+        }
+
+        console.log('the host has not joined');
+        throw new Error('Meeting host has not yet joined');
+      });
   })
-    .then((res) => {
-      if (res.body && res.body.meeting.hostPresent) {
-        console.log('the host has joined');
+    .then(() => true)
+    .catch((reason) => {
+      console.warn(reason);
 
-        return;
-      }
-
-      console.log('the host has not joined');
-      throw new Error('Meeting host has not yet joined');
+      return false;
     });
-})
-  .then(() => true)
-  .catch((reason) => {
-    console.warn(reason);
-
-    return false;
-  });
-
 
 export default CMR;

package/test/utils/constants.js

@@ -0,0 +1,9 @@
+// MOVE TO TEST CONSTANTS
+export const MEDIA_SERVERS = {
+  // The homer media server for converged multistream meetings.
+  HOMER: 'homer',
+  // The linus media server
+  LINUS: 'linus',
+  // The calliope media server for transcoded meetings
+  CALLIOPE: 'calliope',
+};

package/test/utils/testUtils.js

@@ -19,7 +19,7 @@ const waitForSpy = (spy, event) => {
           resolve(spy.args[0][0]);
         }
       }, 1000);
-    })
+    }),
   ]);
 };
 
@@ -40,7 +40,7 @@ const waitForStateChange = (meeting, state) => {
           resolve(meeting.locusInfo.parsedLocus.states);
         }
       }, 1000);
-    })
+    }),
   ]);
 };
 
@@ -59,44 +59,46 @@ const waitForCallEnded = (user, email) => {
           clearTimeout(timer);
           clearInterval(interval);
           resolve();
-        }
-        else {
+        } else {
           console.log('MEETING STILL EXISTS!', user.webex.meetings.getAllMeetings());
         }
       }, 3000);
-    })
+    }),
   ]);
 };
 
-const syncAndEndMeeting = (user) => user.webex.meetings.syncMeetings()
-  .then(() => {
-    const promise = [];
-    const meetings = user.webex.meetings.getAllMeetings();
+const syncAndEndMeeting = (user) =>
+  user.webex.meetings
+    .syncMeetings()
+    .then(() => {
+      const promise = [];
+      const meetings = user.webex.meetings.getAllMeetings();
 
-    if (Object.keys(meetings).length === 0) {
-      return Promise.resolve();
-    }
-    Object.keys(meetings)
-      .forEach((key) => {
+      if (Object.keys(meetings).length === 0) {
+        return Promise.resolve();
+      }
+      Object.keys(meetings).forEach((key) => {
         promise.push(meetings[key].leave());
       });
 
-    return Promise.all(promise);
-  })
-  .then(() => new Promise((resolve) => {
-    const interval = setInterval(() => {
-      if (Object.keys(user.webex.meetings.getAllMeetings()).length === 0) {
-        clearInterval(interval);
-        resolve();
-      }
-      else {
-        console.log('End Meetings before test failed');
-      }
-    }, 3000);
-  }))
-  .catch((e) => {
-    console.log('ERROR on syncMeeting', e);
-  });
+      return Promise.all(promise);
+    })
+    .then(
+      () =>
+        new Promise((resolve) => {
+          const interval = setInterval(() => {
+            if (Object.keys(user.webex.meetings.getAllMeetings()).length === 0) {
+              clearInterval(interval);
+              resolve();
+            } else {
+              console.log('End Meetings before test failed');
+            }
+          }, 3000);
+        })
+    )
+    .catch((e) => {
+      console.log('ERROR on syncMeeting', e);
+    });
 
 //
 const waitForEvents = (scopeEvents, timeout = max) => {
@@ -125,11 +127,12 @@ const waitForEvents = (scopeEvents, timeout = max) => {
               obj.user.memberId = value.meeting.locusInfo.parsedLocus.selfId;
             }
             if (obj.event === 'meeting:removed') {
-              console.log(`MEETING:REMOVED ${obj.user.name} ID ${obj.user.meeting.id} correlationID ${obj.user.meeting.correlationId}`);
+              console.log(
+                `MEETING:REMOVED ${obj.user.name} ID ${obj.user.meeting.id} correlationID ${obj.user.meeting.correlationId}`
+              );
               if (obj.user.meeting.id === value.meetingId) {
                 obj.user.meeting = null;
-              }
-              else {
+              } else {
                 console.log('MEETING EXISTING ', obj.user.webex.meetings.getAllMeetings());
                 reject(new Error(`Different Meeting Object ${value}`));
               }
@@ -142,8 +145,7 @@ const waitForEvents = (scopeEvents, timeout = max) => {
 
                 resolve(result);
               }
-            }
-            else if (result.length === scopeEvents.length) {
+            } else if (result.length === scopeEvents.length) {
               resolve(result);
               obj.scope.off(obj.event, handler);
               clearTimeout(timer);
@@ -152,12 +154,11 @@ const waitForEvents = (scopeEvents, timeout = max) => {
 
           obj.scope.on(obj.event, handler);
         });
-      }
-      catch (e) {
+      } catch (e) {
         console.error('waitForEvents', e);
         reject(e);
       }
-    })
+    }),
   ]);
 };
 
@@ -172,32 +173,41 @@ const delayedPromise = (promise) => {
     }),
     new Promise((resolve, reject) => {
       setTimeout(() => {
-        promise.then((res) => {
-          resolve(res);
-          clearTimeout(timer);
-        })
+        promise
+          .then((res) => {
+            resolve(res);
+            clearTimeout(timer);
+          })
           .catch((e) => {
             console.error('delayedPromise', e);
             reject(e);
           });
       }, 2000);
-    })
+    }),
   ]);
 };
 
-const delayedTest = (callback, timeout) => new Promise((resolve) => {
-  setTimeout(() => {
-    callback();
-    resolve();
-  }, timeout);
-});
-
-const addMedia = (user) => {
-  const mediaReadyPromises = {
-    local: new Defer(),
-    remoteAudio: new Defer(),
-    remoteVideo: new Defer(),
-  };
+const delayedTest = (callback, timeout) =>
+  new Promise((resolve) => {
+    setTimeout(() => {
+      callback();
+      resolve();
+    }, timeout);
+  });
+
+const addMedia = async (user, options = {}) => {
+  const mediaReadyPromises = Array.isArray(options.expectedMediaReadyTypes)
+    ? options.expectedMediaReadyTypes.reduce((output, expectedMediaReadyType) => {
+      if (typeof expectedMediaReadyType !== 'string') {
+        return output;
+      }
+
+      output[expectedMediaReadyType] = new Defer();
+
+      return output;
+    }, {})
+    : {local: new Defer(), remoteAudio: new Defer(), remoteVideo: new Defer()};
+
   const mediaReady = (media) => {
     if (!media) {
       return;
@@ -209,35 +219,44 @@ const addMedia = (user) => {
 
   user.meeting.on('media:ready', mediaReady);
 
-  return user.meeting.getMediaStreams({
-    sendAudio: true,
-    sendVideo: true,
-    sendShare: false
-  })
-    .then(([localStream, localShare]) => user.meeting.addMedia({
+  const [localStream, localShare] = await user.meeting
+      .getMediaStreams({
+        sendAudio: true,
+        sendVideo: true,
+        sendShare: false,
+      });
+
+  if (options.multistream) {
+    await user.meeting.addMedia({});
+
+    await user.meeting.publishTracks({microphone: localStream.getAudioTracks()[0], camera: localStream.getVideoTracks()[0]})
+  } else {
+    await user.meeting.addMedia({
       mediaSettings: {
         sendAudio: true,
         sendVideo: true,
         sendShare: false,
         receiveShare: true,
         receiveAudio: true,
-        receiveVideo: true
+        receiveVideo: true,
       },
       localShare,
-      localStream
-    }))
-    .then(() => Promise.all(Object.values(mediaReadyPromises).map((defer) => defer.promise)))
-    .then(() => {
-      assert.exists(user.meeting.mediaProperties.audioTrack, 'audioTrack not present');
-      assert.exists(user.meeting.mediaProperties.videoTrack, 'videoTrack not present');
+      localStream,
     });
+  }
+
+  await Promise.all(Object.values(mediaReadyPromises).map((defer) => defer.promise));
+
+  assert.exists(user.meeting.mediaProperties.audioTrack, 'audioTrack not present');
+  assert.exists(user.meeting.mediaProperties.videoTrack, 'videoTrack not present');
 };
 
-const waitUntil = (waitTime) => new Promise((resolve) => {
-  setTimeout(() => {
-    resolve();
-  }, waitTime);
-});
+const waitUntil = (waitTime) =>
+  new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, waitTime);
+  });
 
 const flushPromises = () => new Promise(setImmediate);
 
@@ -259,7 +278,10 @@ const getCircularReplacer = () => {
 
 // this function is meant to be used as the "match" callback with waitForEvents()
 // when you want to wait for a particular users's status to reach a certain value
-const checkParticipantUpdatedStatus = (user, expectedStatus) => (event) => !!event.delta.updated.find((member) => user.meeting.members.selfId === member.id && member.status === expectedStatus);
+const checkParticipantUpdatedStatus = (user, expectedStatus) => (event) =>
+  !!event.delta.updated.find(
+    (member) => user.meeting.members.selfId === member.id && member.status === expectedStatus
+  );
 
 export default {
   waitForSpy,
@@ -273,6 +295,5 @@ export default {
   waitUntil,
   delayedTest,
   flushPromises,
-  getCircularReplacer
+  getCircularReplacer,
 };
-