@webex/plugin-meetings 3.0.0-beta.13 → 3.0.0-beta.130

package/src/media/index.ts

@@ -3,21 +3,23 @@
  */
 /* globals navigator */
 
+import {RoapMediaConnection, MultistreamRoapMediaConnection} from '@webex/internal-media-core';
+import {LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack} from '@webex/media-helpers';
 import LoggerProxy from '../common/logs/logger-proxy';
-import {
-  AUDIO_INPUT,
-  VIDEO_INPUT,
-  MEDIA_TRACK_CONSTRAINT,
-} from '../constants';
+import {AUDIO_INPUT, VIDEO_INPUT, MEDIA_TRACK_CONSTRAINT} from '../constants';
 import Config from '../config';
 import StaticConfig from '../common/config';
 import MediaError from '../common/errors/media';
 import BrowserDetection from '../common/browser-detection';
 
-import {RoapMediaConnection, MultistreamRoapMediaConnection} from './internal-media-core-wrapper';
-
 const {isBrowser} = BrowserDetection();
 
+type MultistreamConnectionConfig = ConstructorParameters<typeof MultistreamRoapMediaConnection>[0];
+
+export type BundlePolicy = ConstructorParameters<
+  typeof MultistreamRoapMediaConnection
+>[0]['bundlePolicy'];
+
 /**
  * MediaDirection
  * @typedef {Object} MediaDirection
@@ -48,45 +50,6 @@ const {isBrowser} = BrowserDetection();
  */
 const Media: any = {};
 
-/**
- * @param {boolean} enabled
- * @param {MediaStreamTrack} track
- * @returns {Boolean}
- * @public
- */
-Media.setLocalTrack = (enabled: boolean, track: MediaStreamTrack) => {
-  if (track) {
-    track.enabled = enabled;
-
-    return true;
-  }
-
-  return false;
-};
-
-/**
- * format the media array for send
- * @param {String} mediaId
- * @param {Boolean} audioMuted
- * @param {Boolean} videoMuted
- * @returns {Array} medias
- */
-Media.generateLocalMedias = (mediaId: string, audioMuted: boolean, videoMuted: boolean) => {
-  if (mediaId) {
-    return [
-      {
-        localSdp: JSON.stringify({
-          audioMuted,
-          videoMuted
-        }),
-        mediaId
-      }
-    ];
-  }
-
-  return [];
-};
-
 /**
  * make a browser call to get the media
  * @param {SendOptions} options
@@ -94,9 +57,7 @@ Media.generateLocalMedias = (mediaId: string, audioMuted: boolean, videoMuted: b
  * @returns {Promise}
  */
 Media.getLocalMedia = (options: any, config: object) => {
-  const {
-    sendAudio, sendVideo, sendShare, sharePreferences, isSharing
-  } = options;
+  const {sendAudio, sendVideo, sendShare, sharePreferences, isSharing} = options;
 
   if (sendAudio || sendVideo) {
     return Media.getMedia(sendAudio, sendVideo, config);
@@ -107,7 +68,7 @@ Media.getLocalMedia = (options: any, config: object) => {
       {
         sendAudio: false,
         sendShare: true,
-        sharePreferences
+        sharePreferences,
       },
       config
     );
@@ -122,36 +83,41 @@ 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
  * @param {boolean} [options.enableExtmap] applicable only to non-multistream connections
  * @param {Object} [options.turnServerInfo]
- * @returns {RoapMediaConnection}
+ * @param {BundlePolicy} [options.bundlePolicy]
+ * @returns {RoapMediaConnection | MultistreamRoapMediaConnection}
  */
 Media.createMediaConnection = (
   isMultistream: boolean,
   debugId: string,
   options: {
-    mediaProperties?: {
+    mediaProperties: {
       mediaDirection?: {
-        receiveAudio: boolean,
-        receiveVideo: boolean,
-        receiveShare: boolean,
-      },
-      audioTrack?: MediaStreamTrack,
-      videoTrack?: MediaStreamTrack,
-      shareTrack?: MediaStreamTrack
-    },
-    remoteQualityLevel?: 'LOW'|'MEDIUM'|'HIGH',
-    enableRtx?: boolean,
-    enableExtmap?: boolean,
+        receiveAudio: boolean;
+        receiveVideo: boolean;
+        receiveShare: boolean;
+        sendAudio: boolean;
+        sendVideo: boolean;
+        sendShare: boolean;
+      };
+      audioTrack?: LocalMicrophoneTrack;
+      videoTrack?: LocalCameraTrack;
+      shareTrack?: LocalDisplayTrack;
+    };
+    remoteQualityLevel?: 'LOW' | 'MEDIUM' | 'HIGH';
+    enableRtx?: boolean;
+    enableExtmap?: boolean;
     turnServerInfo?: {
-      url: string,
-      username: string,
-      password: string
-    }
+      url: string;
+      username: string;
+      password: string;
+    };
+    bundlePolicy?: BundlePolicy;
   }
 ) => {
   const {
@@ -159,7 +125,8 @@ Media.createMediaConnection = (
     remoteQualityLevel,
     enableRtx,
     enableExtmap,
-    turnServerInfo
+    turnServerInfo,
+    bundlePolicy,
   } = options;
 
   const iceServers = [];
@@ -168,57 +135,65 @@ Media.createMediaConnection = (
     iceServers.push({
       urls: turnServerInfo.url,
       username: turnServerInfo.username || '',
-      credential: turnServerInfo.password || ''
+      credential: turnServerInfo.password || '',
     });
   }
 
   if (isMultistream) {
-    return new MultistreamRoapMediaConnection({
+    const config: MultistreamConnectionConfig = {
       iceServers,
-    }, debugId);
+      enableMainAudio:
+        mediaProperties.mediaDirection?.sendAudio || mediaProperties.mediaDirection?.receiveAudio,
+      enableMainVideo:
+        mediaProperties.mediaDirection?.sendVideo || mediaProperties.mediaDirection?.receiveVideo,
+    };
+
+    if (bundlePolicy) {
+      config.bundlePolicy = bundlePolicy;
+    }
+
+    return new MultistreamRoapMediaConnection(config, debugId);
   }
 
   if (!mediaProperties) {
     throw new Error('mediaProperties have to be provided for non-multistream media connections');
   }
 
-  const {
-    mediaDirection,
-    audioTrack,
-    videoTrack,
-    shareTrack
-  } = mediaProperties;
-
-
-  return new RoapMediaConnection({
-    iceServers,
-    skipInactiveTransceivers: false,
-    requireH264: true,
-    sdpMunging: {
-      convertPort9to0: false,
-      addContentSlides: true,
-      bandwidthLimits: {
-        audio: StaticConfig.meetings.bandwidth.audio,
-        video: StaticConfig.meetings.bandwidth.video,
+  const {mediaDirection, audioTrack, videoTrack, shareTrack} = mediaProperties;
+
+  return new RoapMediaConnection(
+    {
+      iceServers,
+      skipInactiveTransceivers: false,
+      requireH264: true,
+      sdpMunging: {
+        convertPort9to0: false,
+        addContentSlides: true,
+        bandwidthLimits: {
+          audio: StaticConfig.meetings.bandwidth.audio,
+          video: StaticConfig.meetings.bandwidth.video,
+        },
+        startBitrate: StaticConfig.meetings.bandwidth.startBitrate,
+        periodicKeyframes: 20, // it's always been hardcoded in SDK so for now keeping it that way
+        disableExtmap: !enableExtmap,
+        disableRtx: !enableRtx, // see https://bugs.chromium.org/p/chromium/issues/detail?id=1020642 why we might want to remove RTX from SDP
       },
-      startBitrate: StaticConfig.meetings.bandwidth.startBitrate,
-      periodicKeyframes: 20, // it's always been hardcoded in SDK so for now keeping it that way
-      disableExtmap: !enableExtmap,
-      disableRtx: !enableRtx, // see https://bugs.chromium.org/p/chromium/issues/detail?id=1020642 why we might want to remove RTX from SDP
-    }
-  }, {
-    send: {
-      audio: audioTrack,
-      video: videoTrack,
-      screenShareVideo: shareTrack
     },
-    receive: {
-      audio: mediaDirection.receiveAudio,
-      video: mediaDirection.receiveVideo,
-      screenShareVideo: mediaDirection.receiveShare,
-      remoteQualityLevel
-    }
-  }, debugId);
+    {
+      send: {
+        audio: audioTrack?.underlyingTrack,
+        video: videoTrack?.underlyingTrack,
+        screenShareVideo: shareTrack?.underlyingTrack,
+      },
+      receive: {
+        audio: mediaDirection.receiveAudio,
+        video: mediaDirection.receiveVideo,
+        screenShareVideo: mediaDirection.receiveShare,
+        remoteQualityLevel,
+      },
+    },
+    debugId
+  );
 };
 
 /**
@@ -252,38 +227,31 @@ Media.getDisplayMedia = (
   const hasSharePreferences = options.sharePreferences;
   const hasCustomConstraints = hasSharePreferences && hasSharePreferences.shareConstraints;
   const hasHighFrameRate = hasSharePreferences && hasSharePreferences.highFrameRate;
-  const {
-    screenResolution,
-    resolution,
-    videoShareFrameRate,
-    screenFrameRate,
-    aspectRatio
-  } = Config.meetings;
+  const {screenResolution, resolution, videoShareFrameRate, screenFrameRate, aspectRatio} =
+    Config.meetings;
 
   let shareConstraints: any = {
     cursor: MEDIA_TRACK_CONSTRAINT.CURSOR.AWLAYS,
-    aspectRatio
+    aspectRatio,
   };
 
   if (hasCustomConstraints) {
     shareConstraints = hasSharePreferences.shareConstraints;
-  }
-  else if (hasHighFrameRate) {
+  } else if (hasHighFrameRate) {
     shareConstraints = {
       ...shareConstraints,
       frameRate: videoShareFrameRate,
       height: resolution.idealHeight,
       width: resolution.idealWidth,
-      ...config.resolution
+      ...config.resolution,
     };
-  }
-  else {
+  } else {
     shareConstraints = {
       ...shareConstraints,
       frameRate: customShareFrameRate || screenFrameRate,
       height: customResolution.idealHeight || screenResolution.idealHeight,
       width: customResolution.idealWidth || screenResolution.idealWidth,
-      ...config.screenResolution
+      ...config.screenResolution,
     };
   }
 
@@ -294,15 +262,14 @@ Media.getDisplayMedia = (
   // to have higher quality, and for developers to control the values
   // eventually we may have to add the same functionality to chrome, OR conversely, get to with firefox
 
-
   if (isBrowser('firefox')) {
     const mediaConfig: any = {
       audio: options.sendAudio,
-      video: options.sendShare
+      video: options.sendShare,
     };
 
-
-    return navigator.mediaDevices.getDisplayMedia({audio: options.sendAudio, video: mediaConfig})
+    return navigator.mediaDevices
+      .getDisplayMedia({audio: options.sendAudio, video: mediaConfig})
       .then((stream) => {
         if (options.sendShare && stream.getVideoTracks().length > 0) {
           // Firefox has a bug with the spec where changing in the height and width only happens
@@ -311,7 +278,6 @@ Media.getDisplayMedia = (
           stream.getVideoTracks()[0].applyConstraints(shareConstraints);
         }
 
-
         return stream;
       });
   }
@@ -341,34 +307,32 @@ Media.getMedia = (audio: any | boolean, video: any | boolean, config: any) => {
     audio,
     // TODO: Remove temporary workaround once Firefox fixes low constraint issues
     // eslint-disable-next-line no-nested-ternary
-    video: video ?
-      isBrowser('firefox') && video.width && video.width.max === 320 ?
-        {
-          deviceId: video.deviceId ? video.deviceId : undefined,
-          width: 320,
-          height: 180,
-          frameRate: video.frameRate ? video.frameRate : undefined,
-          facingMode: video.facingMode ? video.facingMode : undefined,
-        } :
-        {
-          deviceId: video.deviceId ? video.deviceId : undefined,
-          width: video.width ? video.width : defaultWidth,
-          height: video.height ? video.height : defaultHeight,
-          frameRate: video.frameRate ? video.frameRate : undefined,
-          facingMode: video.facingMode ? video.facingMode : undefined,
-        } :
-      false,
-    fake: process.env.NODE_ENV === 'test' // Special case to get fake media for Firefox browser for testing
+    video: video
+      ? isBrowser('firefox') && video.width && video.width.max === 320
+        ? {
+            deviceId: video.deviceId ? video.deviceId : undefined,
+            width: 320,
+            height: 180,
+            frameRate: video.frameRate ? video.frameRate : undefined,
+            facingMode: video.facingMode ? video.facingMode : undefined,
+          }
+        : {
+            deviceId: video.deviceId ? video.deviceId : undefined,
+            width: video.width ? video.width : defaultWidth,
+            height: video.height ? video.height : defaultHeight,
+            frameRate: video.frameRate ? video.frameRate : undefined,
+            facingMode: video.facingMode ? video.facingMode : undefined,
+          }
+      : false,
+    fake: process.env.NODE_ENV === 'test', // Special case to get fake media for Firefox browser for testing
   };
 
-  return navigator.mediaDevices
-    .getUserMedia(mediaConfig)
-    .catch((err) => {
-      const logPath = 'Media:index#getMedia --> navigator.mediaDevices.getUserMedia';
+  return navigator.mediaDevices.getUserMedia(mediaConfig).catch((err) => {
+    const logPath = 'Media:index#getMedia --> navigator.mediaDevices.getUserMedia';
 
-      LoggerProxy.logger.error(`${logPath} failed - ${err} (${err.constraint})`);
-      throw err;
-    });
+    LoggerProxy.logger.error(`${logPath} failed - ${err} (${err.constraint})`);
+    throw err;
+  });
 };
 
 /**
@@ -383,24 +347,24 @@ Media.getMedia = (audio: any | boolean, video: any | boolean, config: any) => {
  *    sendVideo: true/false
  *}
  */
-Media.getSupportedDevice = ({ sendAudio, sendVideo }: { sendAudio: boolean; sendVideo: boolean }) =>
+Media.getSupportedDevice = ({sendAudio, sendVideo}: {sendAudio: boolean; sendVideo: boolean}) =>
   Promise.resolve().then(() => {
     if (!navigator.mediaDevices || navigator.mediaDevices.enumerateDevices === undefined) {
       return {
         sendAudio: false,
-        sendVideo: false
+        sendVideo: false,
       };
     }
 
     return navigator.mediaDevices.enumerateDevices().then((devices) => {
       const supported = {
         audio: devices.filter((device) => device.kind === AUDIO_INPUT).length > 0,
-        video: devices.filter((device) => device.kind === VIDEO_INPUT).length > 0
+        video: devices.filter((device) => device.kind === VIDEO_INPUT).length > 0,
       };
 
       return {
         sendAudio: supported.audio && sendAudio,
-        sendVideo: supported.video && sendVideo
+        sendVideo: supported.video && sendVideo,
       };
     });
   });
@@ -439,40 +403,11 @@ Media.stopTracks = (track: any) => {
     if (track && track.stop) {
       try {
         track.stop();
+      } catch (e) {
+        LoggerProxy.logger.error(
+          `Media:index#stopTracks --> Unable to stop the track with state ${track.readyState}, error: ${e}`
+        );
       }
-      catch (e) {
-        LoggerProxy.logger.error(`Media:index#stopTracks --> Unable to stop the track with state ${track.readyState}, error: ${e}`);
-      }
-    }
-  });
-};
-
-/**
- *
- * Stop input stream
- * @param {Stream} stream A media stream
- * @returns {null}
- * @deprecated after v1.89.3
- */
-Media.stopStream = (stream: any) => {
-  LoggerProxy.logger.warn('Media:index#stopStream --> [DEPRECATION WARNING]: stopStream has been deprecated after v1.89.3');
-  if (!stream) {
-    return Promise.resolve();
-  }
-
-  /*
-   * To release local media
-   * 1) Chrome requires all tracks to be stopped (stream.stop got deprecated)
-   * 2) Firefox requires the stream to be stopped
-   */
-  return Promise.resolve().then(() => {
-    if (stream.getTracks) {
-      stream.getTracks().forEach((track) => {
-        track.stop();
-      });
-    }
-    else if (stream.stop) {
-      stream.stop();
     }
   });
 };
@@ -510,13 +445,21 @@ Media.getUserMedia = (
   },
   config: object
 ) =>
-Media.getLocalMedia({
-  sendAudio: mediaSetting.sendAudio ? audioVideo.audio || mediaSetting.sendAudio : false,
-  sendVideo: mediaSetting.sendVideo ? audioVideo.video || mediaSetting.sendVideo : false
-}, config).then((localStream) => Media.getLocalMedia({
-  sendShare: mediaSetting.sendShare,
-  isSharing: mediaSetting.isSharing,
-  sharePreferences
-}, config).then((shareStream) => [localStream, shareStream]));
+  Media.getLocalMedia(
+    {
+      sendAudio: mediaSetting.sendAudio ? audioVideo.audio || mediaSetting.sendAudio : false,
+      sendVideo: mediaSetting.sendVideo ? audioVideo.video || mediaSetting.sendVideo : false,
+    },
+    config
+  ).then((localStream) =>
+    Media.getLocalMedia(
+      {
+        sendShare: mediaSetting.sendShare,
+        isSharing: mediaSetting.isSharing,
+        sharePreferences,
+      },
+      config
+    ).then((shareStream) => [localStream, shareStream])
+  );
 
 export default Media;