@webex/web-client-media-engine 1.41.1 → 2.0.0

package/dist/types/index.d.ts

@@ -1,9 +1,9 @@
-import { ConnectionState, LocalTrack } from '@webex/webrtc-core';
+import { LocalTrack, ConnectionState } from '@webex/webrtc-core';
 export { AudioDeviceConstraints, ConnectionState, LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack, LocalTrack, LocalTrackEvents, MediaStreamTrackKind, PeerConnection, TrackEndEvent, TrackMuteEvent, TrackPublishEvent, VideoDeviceConstraints, WcmeError, createCameraTrack, createDisplayTrack, createMicrophoneTrack, getAudioInputDevices, getAudioOutputDevices, getDevices, getVideoInputDevices, setOnDeviceChangeHandler } from '@webex/webrtc-core';
-import { StreamId, SourceState, Policy, PolicySpecificInfo, CodecInfo, JmpScrRequest, ActiveSpeakerNotificationMsg, MediaContent, MediaType, Source, VideoContentHint } from '@webex/json-multistream';
-export { Logger as JMPLogger, SourceState } from '@webex/json-multistream';
-import TypedEmitter, { EventMap } from 'typed-emitter';
+import { StreamId, StreamState, ActiveSpeakerNotificationMsg, MediaContent, MediaType, StreamRequest } from '@webex/json-multistream';
+export { Logger as JMPLogger, StreamRequest, StreamState } from '@webex/json-multistream';
 import { LogData } from '@webex/rtcstats';
+import TypedEmitter, { EventMap } from 'typed-emitter';
 import * as js_logger from 'js-logger';
 import { ILogLevel, ILogHandler } from 'js-logger';
 export { ILogHandler, default as Logger } from 'js-logger';
@@ -30,6 +30,13 @@ declare const EventEmitter_base: new <TT extends EventMap>() => TypedEmitter<TT>
 declare class EventEmitter<T extends EventMap> extends EventEmitter_base<T> {
 }
 
+declare enum OveruseState {
+    NOT_OVERUSED = 0,
+    OVERUSED = 1
+}
+
+declare type OveruseUpdateCallback = (state: OveruseState) => void;
+
 declare type ReceiveSlotId = StreamId;
 declare function compareReceiveSlotIds(id1: ReceiveSlotId, id2: ReceiveSlotId): boolean;
 declare enum ReceiveSlotEvents {
@@ -40,7 +47,7 @@ declare enum ReceiveSlotEvents {
 interface ReceiverEvents extends EventMap {
     [ReceiveSlotEvents.MediaStarted]: () => void;
     [ReceiveSlotEvents.MediaStopped]: () => void;
-    [ReceiveSlotEvents.SourceUpdate]: (state: SourceState, csi?: number) => void;
+    [ReceiveSlotEvents.SourceUpdate]: (state: StreamState, csi?: number) => void;
 }
 
 declare class ReceiveSlot extends EventEmitter<ReceiverEvents> {
@@ -55,34 +62,44 @@ declare class ReceiveSlot extends EventEmitter<ReceiverEvents> {
     private handleTrackUnmuted;
     private removeTrackHandlers;
     replaceTrack(newTrack: MediaStreamTrack): void;
-    _updateSource(state: SourceState, csi?: number): void;
+    _updateSource(state: StreamState, csi?: number): void;
     close(): void;
     get id(): ReceiveSlotId | null;
     get stream(): MediaStream;
     get currentRxCsi(): number | undefined;
 }
 
-declare class MediaRequest {
-    policy: Policy;
-    policySpecificInfo: PolicySpecificInfo;
-    receiveSlots: ReceiveSlot[];
-    maxPayloadBitsPerSecond: number;
-    codecInfos: CodecInfo[];
-    constructor(policy: Policy, policySpecificInfo: PolicySpecificInfo, receiveSlots: ReceiveSlot[], maxPayloadBitsPerSecond: number, codecInfos?: CodecInfo[]);
-    _toJmpScrRequest(): JmpScrRequest;
-}
-
-declare enum OveruseState {
-    NOT_OVERUSED = 0,
-    OVERUSED = 1
-}
-
-declare type OveruseUpdateCallback = (state: OveruseState) => void;
-
 declare type StreamSignalingMode = 'MID-RID' | 'SSRC';
 
 declare type BundlePolicy = 'max-bundle' | 'max-compat';
 
+declare abstract class Transceiver {
+    protected _rtcRtpTransceiver: RTCRtpTransceiver;
+    constructor(rtcRtpTransceiver: RTCRtpTransceiver);
+    replaceTransceiver(newRtcRtpTransceiver: RTCRtpTransceiver): void;
+    protected get receiver(): RTCRtpReceiver;
+    protected get sender(): RTCRtpSender;
+    get mid(): string | null;
+    close(): void;
+}
+
+declare class SendOnlyTransceiver extends Transceiver {
+    publishedTrack?: LocalTrack;
+    csi: number;
+    private direction;
+    private requested;
+    constructor(rtcpRtpTransceiver: RTCRtpTransceiver, csi: number);
+    private handleTrackChange;
+    replaceTransceiver(newRtcRtpTransceiver: RTCRtpTransceiver): Promise<void>;
+    private replacePublishedTrack;
+    setTrackRequested(requested: boolean): Promise<void>;
+    publishTrack(track: LocalTrack): Promise<void>;
+    unpublishTrack(): Promise<void>;
+    setActive(enabled: boolean): boolean;
+    getStats(): Promise<RTCStatsReport>;
+    updateSendParameters(requestedIdEncodingParamsMap: Map<number, EncodingParams>): Promise<void>;
+}
+
 interface TransceiverStatItem {
     report: RTCStatsReport;
     currentDirection: RTCRtpTransceiverDirection;
@@ -159,16 +176,15 @@ declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEv
     private getVideoEncodingOptions;
     private createSendTransceiver;
     private createJmpSession;
-    private sendSourceWarnings;
     private updateRequestedStreams;
     private createDataChannel;
     close(): void;
-    private maybeSendSourceIndication;
-    sendSourceIndication(mediaType: MediaType, numLiveSources: number, sources?: Source[], videoContentHint?: VideoContentHint | undefined): void;
+    private sendMediaRequestStatus;
+    sendSourceAdvertisement(mediaType: MediaType): void;
     publishTrack(track: LocalTrack): Promise<void>;
     unpublishTrack(track: LocalTrack): Promise<void>;
     private addTrackListeners;
-    private getVideoSources;
+    private getVideoStreamStates;
     createReceiveSlot(mediaType: MediaType): Promise<ReceiveSlot>;
     getIngressPayloadType(mediaType: MediaType, mimeType: MediaCodecMimeType): number;
     createOffer(): Promise<RTCSessionDescriptionInit>;
@@ -184,7 +200,7 @@ declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEv
         [key: string]: string | undefined;
     }): Promise<void>;
     deleteCodecParameters(mediaType: MediaType, parameters: string[]): Promise<void>;
-    requestMedia(mediaType: MediaType, mediaRequests: MediaRequest[]): void;
+    requestMedia(mediaType: MediaType, streamRequests: StreamRequest[]): void;
     renewPeerConnection(userOptions?: Partial<MultistreamConnectionOptions>): void;
     private getReceiveSlotById;
     getStats(): Promise<RTCStatsReport>;
@@ -197,36 +213,9 @@ declare class MultistreamConnection extends EventEmitter<MultistreamConnectionEv
     getAllCsis(): Record<string, number | undefined>;
 }
 
-declare abstract class Transceiver {
-    protected _rtcRtpTransceiver: RTCRtpTransceiver;
-    constructor(rtcRtpTransceiver: RTCRtpTransceiver);
-    replaceTransceiver(newRtcRtpTransceiver: RTCRtpTransceiver): void;
-    protected get receiver(): RTCRtpReceiver;
-    protected get sender(): RTCRtpSender;
-    get mid(): string | null;
-    close(): void;
-}
-
-declare class SendOnlyTransceiver extends Transceiver {
-    publishedTrack?: LocalTrack;
-    csi: number;
-    private direction;
-    private requested;
-    constructor(rtcpRtpTransceiver: RTCRtpTransceiver, csi: number);
-    private handleTrackChange;
-    replaceTransceiver(newRtcRtpTransceiver: RTCRtpTransceiver): Promise<void>;
-    private replacePublishedTrack;
-    setTrackRequested(requested: boolean): Promise<void>;
-    publishTrack(track: LocalTrack): Promise<void>;
-    unpublishTrack(): Promise<void>;
-    setActive(enabled: boolean): boolean;
-    getStats(): Promise<RTCStatsReport>;
-    updateSendParameters(requestedIdEncodingParamsMap: Map<number, EncodingParams>): Promise<void>;
-}
-
 declare const logger: js_logger.ILogger;
 declare function setLogLevel(level: ILogLevel): void;
 declare function getLogLevel(): ILogLevel;
 declare function setLogHandler(logHandler: ILogHandler): void;
 
-export { MediaCodecMimeType, MediaRequest, MultistreamConnection, MultistreamConnectionEventNames, MultistreamConnectionEvents, ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId, ReceiverEvents, RecommendedOpusBitrates, SendOnlyTransceiver, TransceiverStats, compareReceiveSlotIds, getLogLevel, getRecommendedMaxBitrateForFrameSize, logger, setLogHandler, setLogLevel };
+export { MediaCodecMimeType, MultistreamConnection, MultistreamConnectionEventNames, MultistreamConnectionEvents, ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId, ReceiverEvents, RecommendedOpusBitrates, SendOnlyTransceiver, TransceiverStats, compareReceiveSlotIds, getLogLevel, getRecommendedMaxBitrateForFrameSize, logger, setLogHandler, setLogLevel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/web-client-media-engine",
-  "version": "1.41.1",
+  "version": "2.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",
@@ -14,7 +14,6 @@
     "fix": "run-s fix:*",
     "fix:prettier": "prettier \"src/**/*.ts\" --write",
     "fix:lint": "eslint src --ext .ts --fix",
-    "prepare": "husky install",
     "release": "semantic-release",
     "test": "run-s build test:*",
     "test:coverage": "jest --coverage",
@@ -55,8 +54,9 @@
     "yarn": ">=1.19.1"
   },
   "dependencies": {
-    "@webex/json-multistream": "^1.22.0",
+    "@webex/json-multistream": "^2.0.1",
     "@webex/rtcstats": "^1.0.1",
+    "@webex/ts-events": "^1.0.1",
     "@webex/ts-sdp": "1.3.1",
     "@webex/webrtc-core": "^1.6.0",
     "async": "^3.2.4",
@@ -66,8 +66,6 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.0.2",
-    "@commitlint/config-conventional": "^16.0.0",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@semantic-release/changelog": "^6.0.1",
@@ -86,11 +84,9 @@
     "eslint-plugin-jest": "^25.3.4",
     "eslint-plugin-jsdoc": "^37.6.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.4",
     "jest": "^27.4.7",
     "jest-canvas-mock": "^2.4.0",
     "jest-fetch-mock": "^3.0.3",
-    "lint-staged": "^12.1.7",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",