@webex/plugin-meetings 3.0.0-beta.170 → 3.0.0-beta.172

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

@@ -1,4 +1,4 @@
-import { IExternalRoles } from './types';
+import { IExternalRoles, IMediaStatus } from './types';
 /**
  * @class Member
  */
@@ -23,6 +23,7 @@ export default class Member {
     isUser: any;
     isVideoMuted: any;
     roles: IExternalRoles;
+    mediaStatus: IMediaStatus;
     name: any;
     participant: any;
     status: any;

package/dist/types/member/types.d.ts

@@ -19,3 +19,14 @@ export type ParticipantWithRoles = {
         };
     };
 };
+export declare enum MediaStatus {
+    RECVONLY = "RECVONLY",
+    SENDONLY = "SENDONLY",
+    SENDRECV = "SENDRECV",
+    INACTIVE = "INACTIVE",
+    UNKNOWN = "UNKNOWN"
+}
+export interface IMediaStatus {
+    audio: MediaStatus;
+    video: MediaStatus;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.170",
+  "version": "3.0.0-beta.172",
   "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.170",
-    "@webex/test-helper-chai": "3.0.0-beta.170",
-    "@webex/test-helper-mocha": "3.0.0-beta.170",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.170",
-    "@webex/test-helper-retry": "3.0.0-beta.170",
-    "@webex/test-helper-test-users": "3.0.0-beta.170",
+    "@webex/plugin-meetings": "3.0.0-beta.172",
+    "@webex/test-helper-chai": "3.0.0-beta.172",
+    "@webex/test-helper-mocha": "3.0.0-beta.172",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.172",
+    "@webex/test-helper-retry": "3.0.0-beta.172",
+    "@webex/test-helper-test-users": "3.0.0-beta.172",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.170",
-    "@webex/internal-media-core": "1.38.6",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.170",
-    "@webex/internal-plugin-device": "3.0.0-beta.170",
-    "@webex/internal-plugin-llm": "3.0.0-beta.170",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.170",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.170",
-    "@webex/internal-plugin-support": "3.0.0-beta.170",
-    "@webex/internal-plugin-user": "3.0.0-beta.170",
-    "@webex/media-helpers": "3.0.0-beta.170",
-    "@webex/plugin-people": "3.0.0-beta.170",
-    "@webex/plugin-rooms": "3.0.0-beta.170",
-    "@webex/webex-core": "3.0.0-beta.170",
+    "@webex/common": "3.0.0-beta.172",
+    "@webex/internal-media-core": "1.39.1",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.172",
+    "@webex/internal-plugin-device": "3.0.0-beta.172",
+    "@webex/internal-plugin-llm": "3.0.0-beta.172",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.172",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.172",
+    "@webex/internal-plugin-support": "3.0.0-beta.172",
+    "@webex/internal-plugin-user": "3.0.0-beta.172",
+    "@webex/media-helpers": "3.0.0-beta.172",
+    "@webex/plugin-people": "3.0.0-beta.172",
+    "@webex/plugin-rooms": "3.0.0-beta.172",
+    "@webex/webex-core": "3.0.0-beta.172",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/index.ts

@@ -12,6 +12,7 @@ export {
   getDevices,
   LocalTrack,
   LocalDisplayTrack,
+  LocalSystemAudioTrack,
   LocalTrackEvents,
   type TrackMuteEvent,
   type ServerMuteReason,
@@ -22,6 +23,7 @@ export {
   createMicrophoneTrack,
   createCameraTrack,
   createDisplayTrack,
+  createDisplayTrackWithAudio,
   FacingMode,
   DisplaySurface,
   PresetCameraConstraints,

package/src/media/index.ts

@@ -4,7 +4,12 @@
 /* globals navigator */
 
 import {RoapMediaConnection, MultistreamRoapMediaConnection} from '@webex/internal-media-core';
-import {LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack} from '@webex/media-helpers';
+import {
+  LocalCameraTrack,
+  LocalDisplayTrack,
+  LocalSystemAudioTrack,
+  LocalMicrophoneTrack,
+} from '@webex/media-helpers';
 import LoggerProxy from '../common/logs/logger-proxy';
 import {MEDIA_TRACK_CONSTRAINT} from '../constants';
 import Config from '../config';
@@ -99,7 +104,7 @@ Media.getDirection = (forceSendRecv: boolean, receive: boolean, send: boolean) =
  * @param {string} debugId string useful for debugging (will appear in media connection logs)
  * @param {Object} options
  * @param {Object} [options.mediaProperties] contains mediaDirection and local tracks:
- *                                 audioTrack, videoTrack and shareTrack
+ *                                 audioTrack, videoTrack, shareVideoTrack, and shareAudioTrack
  * @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
@@ -122,7 +127,8 @@ Media.createMediaConnection = (
       };
       audioTrack?: LocalMicrophoneTrack;
       videoTrack?: LocalCameraTrack;
-      shareTrack?: LocalDisplayTrack;
+      shareVideoTrack?: LocalDisplayTrack;
+      shareAudioTrack?: LocalSystemAudioTrack;
     };
     remoteQualityLevel?: 'LOW' | 'MEDIUM' | 'HIGH';
     enableRtx?: boolean;
@@ -174,7 +180,7 @@ Media.createMediaConnection = (
     throw new Error('mediaProperties have to be provided for non-multistream media connections');
   }
 
-  const {mediaDirection, audioTrack, videoTrack, shareTrack} = mediaProperties;
+  const {mediaDirection, audioTrack, videoTrack, shareVideoTrack} = mediaProperties;
 
   return new RoapMediaConnection(
     {
@@ -198,7 +204,7 @@ Media.createMediaConnection = (
       localTracks: {
         audio: audioTrack?.underlyingTrack,
         video: videoTrack?.underlyingTrack,
-        screenShareVideo: shareTrack?.underlyingTrack,
+        screenShareVideo: shareVideoTrack?.underlyingTrack,
       },
       direction: {
         audio: Media.getDirection(true, mediaDirection.receiveAudio, mediaDirection.sendAudio),

package/src/media/properties.ts

@@ -1,6 +1,11 @@
 import {ConnectionState, Event} from '@webex/internal-media-core';
 
-import {LocalCameraTrack, LocalMicrophoneTrack, LocalDisplayTrack} from '@webex/media-helpers';
+import {
+  LocalCameraTrack,
+  LocalMicrophoneTrack,
+  LocalDisplayTrack,
+  LocalSystemAudioTrack,
+} from '@webex/media-helpers';
 
 import {MEETINGS, PC_BAIL_TIMEOUT, QUALITY_LEVELS} from '../constants';
 import LoggerProxy from '../common/logs/logger-proxy';
@@ -26,7 +31,8 @@ export default class MediaProperties {
   remoteQualityLevel: any;
   remoteShare: any;
   remoteVideoTrack: any;
-  shareTrack?: LocalDisplayTrack;
+  shareVideoTrack?: LocalDisplayTrack;
+  shareAudioTrack?: LocalSystemAudioTrack;
   videoDeviceId: any;
   videoTrack?: LocalCameraTrack;
   namespace = MEETINGS;
@@ -47,7 +53,8 @@ export default class MediaProperties {
     };
     this.videoTrack = null;
     this.audioTrack = null;
-    this.shareTrack = null;
+    this.shareVideoTrack = null;
+    this.shareAudioTrack = null;
     this.remoteShare = undefined;
     this.remoteAudioTrack = undefined;
     this.remoteVideoTrack = undefined;
@@ -84,8 +91,12 @@ export default class MediaProperties {
     this.audioTrack = audioTrack;
   }
 
-  setLocalShareTrack(shareTrack?: LocalDisplayTrack) {
-    this.shareTrack = shareTrack;
+  setLocalShareVideoTrack(shareVideoTrack?: LocalDisplayTrack) {
+    this.shareVideoTrack = shareVideoTrack;
+  }
+
+  setLocalShareAudioTrack(shareAudioTrack?: LocalSystemAudioTrack) {
+    this.shareAudioTrack = shareAudioTrack;
   }
 
   setRemoteQualityLevel(remoteQualityLevel) {
@@ -149,6 +160,14 @@ export default class MediaProperties {
     this.unsetRemoteShare();
   }
 
+  /**
+   * Returns if we have at least one local share track or not.
+   * @returns {Boolean}
+   */
+  hasLocalShareTrack() {
+    return !!(this.shareAudioTrack || this.shareVideoTrack);
+  }
+
   /**
    * Waits for the webrtc media connection to be connected.
    *