@webex/web-client-media-engine 2.1.7 → 3.0.0

package/dist/types/index.d.ts

@@ -1,11 +1,12 @@
-import { LocalTrack, ConnectionState } from '@webex/webrtc-core';
-export { AudioDeviceConstraints, ConnectionState, LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack, LocalSystemAudioTrack, LocalTrack, LocalTrackEvents, MediaStreamTrackKind, PeerConnection, TrackEndEvent, TrackMuteEvent, TrackPublishEvent, VideoDeviceConstraints, WcmeError, createCameraTrack, createDisplayTrack, createDisplayTrackWithAudio, createMicrophoneTrack, getAudioInputDevices, getAudioOutputDevices, getDevices, getVideoInputDevices, setOnDeviceChangeHandler } from '@webex/webrtc-core';
-import { StreamId, StreamState, Policy, PolicySpecificInfo, CodecInfo, StreamRequest as StreamRequest$1, ActiveSpeakerNotificationMsg, MediaContent, MediaType } from '@webex/json-multistream';
-export { Logger as JMPLogger, StreamState } from '@webex/json-multistream';
+import { LocalStream, ConnectionState } from '@webex/webrtc-core';
+export { AudioDeviceConstraints, ConnectionState, LocalCameraStream, LocalDisplayStream, LocalMicrophoneStream, LocalStream, LocalStreamEventNames, LocalSystemAudioStream, MediaStreamTrackKind, PeerConnection, RemoteStream, StreamEventNames, VideoDeviceConstraints, WcmeError, createCameraStream, createDisplayStream, createDisplayStreamWithAudio, createMicrophoneStream, getAudioInputDevices, getAudioOutputDevices, getDevices, getVideoInputDevices, setOnDeviceChangeHandler } from '@webex/webrtc-core';
+import { StreamId, StreamState, MediaType, Policy, PolicySpecificInfo, CodecInfo, StreamRequest as StreamRequest$1, MediaContent } from '@webex/json-multistream';
+export { ActiveSpeakerInfo, CodecInfo, H264Codec, Logger as JMPLogger, MediaContent, MediaFamily, MediaType, Policy, PolicySpecificInfo, ReceiverSelectedInfo, StreamState, getMediaContent, getMediaFamily, getMediaType } from '@webex/json-multistream';
 import { LogData } from '@webex/rtcstats';
 import TypedEmitter, { EventMap } from 'typed-emitter';
-import { ReceiveSlot as ReceiveSlot$1 } from 'receive-slot';
+import { TypedEvent } from '@webex/ts-events';
 import { AvMediaDescription } from '@webex/ts-sdp';
+import { ReceiveSlot as ReceiveSlot$1 } from 'receive-slot';
 import * as js_logger from 'js-logger';
 import { ILogLevel, ILogHandler } from 'js-logger';
 export { ILogHandler, default as Logger } from 'js-logger';
@@ -46,14 +47,15 @@ declare function compareReceiveSlotIds(id1: ReceiveSlotId, id2: ReceiveSlotId):
 declare enum ReceiveSlotEvents {
     MediaStarted = "media-started",
     MediaStopped = "media-stopped",
+    MediaEnded = "media-ended",
     SourceUpdate = "source-update"
 }
 interface ReceiverEvents extends EventMap {
     [ReceiveSlotEvents.MediaStarted]: () => void;
     [ReceiveSlotEvents.MediaStopped]: () => void;
+    [ReceiveSlotEvents.MediaEnded]: () => void;
     [ReceiveSlotEvents.SourceUpdate]: (state: StreamState, csi?: number) => void;
 }
-
 declare class ReceiveSlot extends EventEmitter<ReceiverEvents> {
     static Events: typeof ReceiveSlotEvents;
     private _idGetter;
@@ -61,11 +63,9 @@ declare class ReceiveSlot extends EventEmitter<ReceiverEvents> {
     private _sourceState;
     private _currentRxCsi?;
     constructor(idGetter: () => ReceiveSlotId | null, track: MediaStreamTrack);
-    private addTrackHandlers;
-    private handleTrackMuted;
-    private handleTrackUnmuted;
-    private removeTrackHandlers;
-    replaceTrack(newTrack: MediaStreamTrack): void;
+    private handleStreamMuteStateChange;
+    private handleStreamEnded;
+    _replaceTrack(newTrack: MediaStreamTrack): void;
     _updateSource(state: StreamState, csi?: number): void;
     close(): void;
     get id(): ReceiveSlotId | null;
@@ -77,14 +77,15 @@ declare type StreamSignalingMode = 'MID-RID' | 'SSRC';
 
 declare type BundlePolicy = 'max-bundle' | 'max-compat';
 
-declare class StreamRequest {
-    policy: Policy;
-    policySpecificInfo: PolicySpecificInfo;
-    receiveSlots: ReceiveSlot$1[];
-    maxPayloadBitsPerSecond: number;
-    codecInfos: CodecInfo[];
-    constructor(policy: Policy, policySpecificInfo: PolicySpecificInfo, receiveSlots: ReceiveSlot$1[], maxPayloadBitsPerSecond: number, codecInfos?: CodecInfo[]);
-    _toJmpStreamRequest(): StreamRequest$1;
+interface EgressStreamSignaler {
+    signalStreams(simulcastEnabled: boolean, rtxEnabled: boolean, mLine: AvMediaDescription): void;
+    getSenderIds(): StreamId[];
+    getEncodingIndexForStreamId(streamId: StreamId): number;
+    reset(): void;
+    setCodecParameters(parameters: {
+        [key: string]: string | undefined;
+    }): void;
+    deleteCodecParameters(parameters: string[]): void;
 }
 
 declare abstract class Transceiver {
@@ -98,37 +99,33 @@ declare abstract class Transceiver {
     abstract resetStreamSignaler(): void;
 }
 
-interface EgressStreamSignaler {
-    signalStreams(simulcastEnabled: boolean, rtxEnabled: boolean, mLine: AvMediaDescription): void;
-    getSenderIds(): StreamId[];
-    getEncodingIndexForStreamId(streamId: StreamId): number;
-    reset(): void;
-    setCodecParameters(parameters: {
-        [key: string]: string | undefined;
-    }): void;
-    deleteCodecParameters(parameters: string[]): void;
-}
-
 declare class SendOnlyTransceiver extends Transceiver {
-    publishedTrack?: LocalTrack;
+    publishedStream?: LocalStream;
     csi: number;
     private direction;
     private streamSignaler;
     rtxEnabled: boolean;
+    streamMuteStateChange: TypedEvent<() => void>;
+    streamPublishStateChange: TypedEvent<() => void>;
+    private mediaType;
     private requested;
-    constructor(rtcpRtpTransceiver: RTCRtpTransceiver, mid: string, csi: number, signaler: EgressStreamSignaler);
+    private requestedIdEncodingParamsMap;
+    constructor(rtcRtpTransceiver: RTCRtpTransceiver, mid: string, csi: number, signaler: EgressStreamSignaler, mediaType: MediaType);
     private handleTrackChange;
+    private handleStreamConstraintsChange;
+    private handleStreamMuteStateChange;
     replaceTransceiver(newRtcRtpTransceiver: RTCRtpTransceiver): Promise<void>;
-    private replacePublishedTrack;
-    setTrackRequested(requested: boolean): Promise<void>;
-    publishTrack(track: LocalTrack): Promise<void>;
-    unpublishTrack(): Promise<void>;
+    private replacePublishedStream;
+    setStreamRequested(requested: boolean): Promise<void>;
+    publishStream(stream: LocalStream): Promise<void>;
+    unpublishStream(): Promise<void>;
     setActive(enabled: boolean): boolean;
     getStats(): Promise<RTCStatsReport>;
     updateSendParameters(requestedIdEncodingParamsMap: Map<number, EncodingParams>): Promise<void>;
     private isSimulcastEnabled;
     signalStreams(mLine: AvMediaDescription): void;
     get senderIds(): StreamId[];
+    get numActiveSimulcastLayers(): number | undefined;
     getEncodingIndexForStreamId(id: StreamId): number;
     resetStreamSignaler(): void;
     setCodecParameters(parameters: {
@@ -137,6 +134,24 @@ declare class SendOnlyTransceiver extends Transceiver {
     deleteCodecParameters(parameters: string[]): void;
 }
 
+declare class SendSlot {
+    private sendTransceiver;
+    constructor(sendTransceiver: SendOnlyTransceiver);
+    publishStream(stream: LocalStream): Promise<void>;
+    unpublishStream(): Promise<void>;
+    set active(active: boolean);
+}
+
+declare class StreamRequest {
+    policy: Policy;
+    policySpecificInfo: PolicySpecificInfo;
+    receiveSlots: ReceiveSlot$1[];
+    maxPayloadBitsPerSecond: number;
+    codecInfos: CodecInfo[];
+    constructor(policy: Policy, policySpecificInfo: PolicySpecificInfo, receiveSlots: ReceiveSlot$1[], maxPayloadBitsPerSecond: number, codecInfos?: CodecInfo[]);
+    _toJmpStreamRequest(): StreamRequest$1;
+}
+
 interface TransceiverStatItem {
     report: RTCStatsReport;
     currentDirection: RTCRtpTransceiverDirection;
@@ -164,7 +179,6 @@ interface TransceiverStats {
 }
 
 declare type MetricsCallback = (logData: LogData) => void;
-
 declare enum MultistreamConnectionEventNames {
     VideoSourceCountUpdate = "video-source-count-update",
     AudioSourceCountUpdate = "audio-source-count-update",
@@ -172,20 +186,17 @@ declare enum MultistreamConnectionEventNames {
     ConnectionStateUpdate = "connection-state-update"
 }
 interface MultistreamConnectionEvents extends EventMap {
-    [MultistreamConnectionEventNames.ActiveSpeakerNotification]: (msg: ActiveSpeakerNotificationMsg) => void;
+    [MultistreamConnectionEventNames.ActiveSpeakerNotification]: (csis: number[]) => void;
     [MultistreamConnectionEventNames.VideoSourceCountUpdate]: (numTotalSources: number, numLiveSources: number, mediaContent: MediaContent) => void;
     [MultistreamConnectionEventNames.AudioSourceCountUpdate]: (numTotalSources: number, numLiveSources: number, mediaContent: MediaContent) => void;
     [MultistreamConnectionEventNames.ConnectionStateUpdate]: (state: ConnectionState) => void;
 }
 declare type MultistreamConnectionOptions = {
-    floorControlledPresentation: boolean;
     disableSimulcast: boolean;
     streamSignalingMode: StreamSignalingMode;
     bundlePolicy: BundlePolicy;
     iceServers: RTCIceServer[] | undefined;
     disableContentSimulcast: boolean;
-    enableMainAudio: boolean;
-    enableMainVideo: boolean;
 };
 declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEvents> {
     private pc;
@@ -201,22 +212,19 @@ declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEv
     private options;
     private midPredictor;
     private offerAnswerQueue;
-    private requestedIdEncodingParamsMap;
     private setAnswerResolve?;
     constructor(userOptions?: Partial<MultistreamConnectionOptions>);
     private initializePeerConnection;
     getConnectionState(): ConnectionState;
     private getVideoEncodingOptions;
     private createSendTransceiver;
+    createSendSlot(mediaType: MediaType): SendSlot;
     private createJmpSession;
     private updateRequestedStreams;
     private createDataChannel;
     close(): void;
     private sendMediaRequestStatus;
     sendSourceAdvertisement(mediaType: MediaType): void;
-    publishTrack(track: LocalTrack): Promise<void>;
-    unpublishTrack(track: LocalTrack): Promise<void>;
-    private addTrackListeners;
     private getVideoStreamStates;
     createReceiveSlot(mediaType: MediaType): Promise<ReceiveSlot>;
     getIngressPayloadType(mediaType: MediaType, mimeType: MediaCodecMimeType): number;
@@ -224,14 +232,12 @@ declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEv
     setAnswer(answer: string): Promise<void>;
     private doLocalOfferAnswer;
     private queueLocalOfferAnswer;
-    enableMultistreamAudio(enabled: boolean): boolean;
     private preProcessLocalOffer;
     private prepareLocalOfferForRemoteServer;
     private preProcessRemoteAnswer;
     private getSendTransceiverOrThrow;
     private getSendTransceiverByMidOrThrow;
     private getRecvTransceiverByMidOrThrow;
-    getPublishedTracks(): LocalTrack[];
     setCodecParameters(mediaType: MediaType, parameters: {
         [key: string]: string | undefined;
     }): Promise<void>;
@@ -254,4 +260,4 @@ declare function setLogLevel(level: ILogLevel): void;
 declare function getLogLevel(): ILogLevel;
 declare function setLogHandler(logHandler: ILogHandler): void;
 
-export { MediaCodecMimeType, MetricsCallback, MultistreamConnection, MultistreamConnectionEventNames, MultistreamConnectionEvents, ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId, ReceiverEvents, RecommendedOpusBitrates, SendOnlyTransceiver, StreamRequest, TransceiverStats, compareReceiveSlotIds, getLogLevel, getRecommendedMaxBitrateForFrameSize, logger, setLogHandler, setLogLevel };
+export { MediaCodecMimeType, MetricsCallback, MultistreamConnection, MultistreamConnectionEventNames, MultistreamConnectionEvents, ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId, ReceiverEvents, RecommendedOpusBitrates, SendSlot, StreamRequest, TransceiverStats, compareReceiveSlotIds, getLogLevel, getRecommendedMaxBitrateForFrameSize, logger, setLogHandler, setLogLevel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/web-client-media-engine",
-  "version": "2.1.7",
+  "version": "3.0.0",
   "description": "Web Client Media Engine is common web code for interacting with the multistream media server.",
   "source": "src/index.ts",
   "main": "dist/cjs/index.js",
@@ -58,7 +58,7 @@
     "@webex/rtcstats": "^1.0.2",
     "@webex/ts-events": "^1.0.1",
     "@webex/ts-sdp": "1.3.1",
-    "@webex/webrtc-core": "1.7.1",
+    "@webex/webrtc-core": "2.0.0",
     "async": "^3.2.4",
     "bowser": "^2.11.0",
     "js-logger": "^1.6.1",