dingrtc 3.8.20 → 3.9.1

package/dist/index.d.ts

@@ -1660,6 +1660,31 @@ declare class PeerConnectionMonitor extends Monitor {
     getStats(): Promise<PeerConnectionMetrics>;
 }
 
+declare class MixedLocalAudioTrack extends EventEmitter<ITrackEvent> {
+    private audioContext;
+    private _micAudioTrack;
+    private _screenAudioTrack;
+    private mixedAudioTrackResult;
+    private publication;
+    private _trackId;
+    private logger;
+    trackMediaType: string;
+    constructor(reporter: Reporter);
+    getTrackId(): string;
+    getScreenAudioTrack(): LocalAudioTrack;
+    setScreenAudioTrack(newScreenAudioTrack: LocalAudioTrack): void;
+    getMicAudioTrack(): LocalAudioTrack;
+    setMicAudioTrack(newMicAudioTrack: LocalAudioTrack): void;
+    isPublished: () => boolean;
+    setPublication: (publication?: Publication) => void;
+    getPublication: () => Publication;
+    private updateMicTrackHandler;
+    updateMixedAudioTrackToPub: () => void;
+    private mixAudioTracks;
+    clear: () => void;
+    getMediaStreamTrack: () => MediaStreamTrack;
+}
+
 interface IPublishEvents {
     ended(): void;
     exception(error: DingRTCError): void;
@@ -1670,6 +1695,8 @@ interface PublicationOptions {
     connection: PeerConnection;
     uid?: string;
     labels?: string[];
+    existedPublications?: Publication[];
+    mixedLocalAudioTrack?: MixedLocalAudioTrack;
 }
 /**
  * @internal
@@ -1723,6 +1750,7 @@ declare class SessionManager extends EventEmitter<SessionManagerEvent> {
     serviceManager: ServiceManager;
     reporter: Reporter;
     logger: ILogger;
+    mixedLocalAudioTrack: MixedLocalAudioTrack;
     constructor(client: DingRTCClient, serviceManager: ServiceManager);
     private getOrCreatePeerConnection;
     /**
@@ -1888,6 +1916,10 @@ declare class Subscription extends EventEmitter<ISubscribeEvents> {
     reset(): void;
     clear(): void;
     addTransceiver(transceiver: RTCRtpTransceiver): void;
+    updateTransceiverListeners: () => void;
+    private _onDtlsError;
+    private _onDtlsStateChange;
+    private _onSelectedCandidatePairChange;
     addTransceivers(transceivers: RTCRtpTransceiver[]): void;
     handleVideoFirstFrame(): void;
     private handleMetrics;
@@ -2275,6 +2307,14 @@ declare class DingRTCClient extends EventEmitter<IClientEvents> {
     unsubscribeGroup(groupId: string): Promise<void>;
     /**
      * 混音音频轨道到指定分组
+     *
+     */
+    /**
+     * 混音音频轨道到指定分组
+     * @param track 当有mic audio和 screen audio的时候，任意一个都可以生效，表示对两个audio track 的混流操作
+     * @param mixed true表示混流到group，false表示不再混流到group
+     * @param groupId 目标group
+     * @returns
      */
     mixAudioToGroup(track: LocalAudioTrack, mixed: boolean, groupId?: string): Promise<void>;
     /**
@@ -2390,8 +2430,14 @@ declare class ServiceManager extends EventEmitter<ChannelEvens> {
     subscribedAudioStream: string;
     micMixedGroups: Set<string>;
     iceConfig: ICEConfig;
+    /**
+     * 正在处理的订阅参数，防止订阅重复
+     */
+    private processingSubParamsMap;
+    private static subAcc;
     constructor(client: DingRTCClient, reporter: Reporter);
-    get localTracks(): LocalTrack[];
+    private getSubTraceId;
+    get publishedLocalTracks(): LocalTrack[];
     get groups(): Group[];
     handleStreamEvent(action: StreamEventAction, payload: StreamEventPlayload): void;
     handleGroupEvent(action: GroupEventAction, group: Group | string, extraPayload?: GroupUser | signal_msg.IGroupProperty | string | signal_msg.IGroupAudioInfo): void;
@@ -2403,6 +2449,10 @@ declare class ServiceManager extends EventEmitter<ChannelEvens> {
     private setIceConfig;
     clear(): void;
     leave(): void;
+    /**
+     * @param tracks 必须已经确认track不重复，都可以发布
+     * @returns
+     */
     publish(tracks: LocalTrack[]): Promise<void>;
     unpublish(tracks: LocalTrack[]): Promise<void>;
     private getRemoteTrack;
@@ -3084,7 +3134,7 @@ declare class Track extends EventEmitter<ITrackEvent> {
                     cycleStatsTimer: number;
                     cycleStatsInterval: number;
                     eventTriggedInterval: number;
-                    readonly securityToken: string;
+                    get securityToken(): string;
                     stopUpdateToken(): void;
                     send(param: any): void;
                     sendStats(param: any): void;
@@ -3103,7 +3153,7 @@ declare class Track extends EventEmitter<ITrackEvent> {
             started: boolean;
             start(slsConfig: _dingrtc_shared.SLSClientConfig): void;
             stop(): void;
-            readonly securityToken: string;
+            get securityToken(): string;
             updateSecurityToken(securityToken: _dingrtc_shared.SecurityTokenDTO): void;
             sendMetric(param: any): void;
             sendEvent(param: any): void;
@@ -3455,7 +3505,7 @@ declare class LocalTrack extends Track {
      * - true: 启用该轨道。
      * - false: 禁用该轨道。
      */
-    setEnabled(enabled: boolean): Promise<void>;
+    setEnabled(enabled: boolean): Promise<any>;
     /**
      * 关闭本地轨道，并释放相关采集设备。
      *
@@ -3478,7 +3528,7 @@ declare class LocalTrack extends Track {
      * 更新设置轨道使用的媒体设备, 移动端时可通过设置为user、environment来切换前置、后置摄像头
      * @param deviceIdOrFacingMode 设备 id
      */
-    setDevice(deviceIdOrFacingMode: string): Promise<void>;
+    setDevice(deviceIdOrFacingMode: string): Promise<boolean | void>;
     /**
      * 获取本地轨道的来源描述
      * @returns 音频或视频轨道描述
@@ -3745,6 +3795,12 @@ declare class DingRTC extends EventEmitter<IGlobalEvent> {
      * @returns 如果 config.withAudio 为 'enable'，则返回一个数组，第一个元素是屏幕共享的视频轨道，第二个元素是屏幕共享的音频轨道。否则返回一个数组，只有一个元素，即屏幕共享的视频轨道。
      */
     createScreenVideoTrack(config: ScreenVideoTrackConfig): Promise<(LocalVideoTrack | LocalAudioTrack)[]>;
+    /**
+     * 创建用于屏幕共享的视频轨道和音频轨道。
+     * @param config 屏幕共享的视频配置，包括编码配置、采集配置等。
+     * @returns 返回一个数组，第一个元素是屏幕共享的视频轨道，第二个元素是屏幕共享的音频轨道，第二个可能因为用户不勾选音频而返回空。
+     */
+    createScreenVideoAndAudioTrack(config: ScreenVideoTrackConfig): Promise<(LocalVideoTrack | LocalAudioTrack)[]>;
     /**
      * 同时创建麦克风音频轨道和摄像头视频轨道。
      * 通过麦克风采集的音频创建一个音频轨道，同时通过摄像头采集的视频创建一个视频轨道。
@@ -3793,4 +3849,5 @@ declare class DingRTC extends EventEmitter<IGlobalEvent> {
 }
 declare const _default: DingRTC;
 
-export { AudioSourceInfo, AudioSourceState, type BufferSourceAudioTrackConfig, CameraVideoTrack, type CameraVideoTrackConfig, type ChannelEvens, type ConnectionState, type CustomAudioTrackConfig, type CustomVideoTrackConfig, type DeviceInfo, DingRTCClient, type DisconnectedReason, FALLBACK_SUB_VIDEO_PROFILE, type GlobalClientConfigInfo, type Group, type GroupAudioRoute, type GroupPropertyUpdateTypes, type GroupUser, type IClientEvents, type ICommonExceptionEvent, type IGlobalEvent, type ISharedChannelInstance, type JoinGroupConfig, type JoinParam, type LeaveGroupConfig, type LocalAudioStates, LocalAudioTrack, LocalTrack, type LocalVideoStates, type LocalVideoStatesMap, LocalVideoTrack, type LogLevel, MicrophoneAudioTrack, type MicrophoneAudioTrackConfig, type NetworkQuality, type OptimizationMode, type RemoteAudioStates, RemoteAudioTrack, type RemoteStreamType, RemoteTrack, User as RemoteUser, type RemoteVideoStates, type RemoteVideoStatesMap, RemoteVideoTrack, type ScreenVideoTrackConfig, type SubscribeParam, type SubscribeResult, Track, type TrackMediaType, type UnsubscribeParam, type VideoDimension, type VideoEncoderConfiguration, type VideoPlayerConfig, VideoSourceInfo, _default as default };
+export { AudioSourceInfo, AudioSourceState, CameraVideoTrack, DingRTCClient, FALLBACK_SUB_VIDEO_PROFILE, LocalAudioTrack, LocalTrack, LocalVideoTrack, MicrophoneAudioTrack, RemoteAudioTrack, RemoteTrack, User as RemoteUser, RemoteVideoTrack, Track, VideoSourceInfo, _default as default };
+export type { BufferSourceAudioTrackConfig, CameraVideoTrackConfig, ChannelEvens, ConnectionState, CustomAudioTrackConfig, CustomVideoTrackConfig, DeviceInfo, DisconnectedReason, GlobalClientConfigInfo, Group, GroupAudioRoute, GroupPropertyUpdateTypes, GroupUser, IClientEvents, ICommonExceptionEvent, IGlobalEvent, ISharedChannelInstance, JoinGroupConfig, JoinParam, LeaveGroupConfig, LocalAudioStates, LocalVideoStates, LocalVideoStatesMap, LogLevel, MicrophoneAudioTrackConfig, NetworkQuality, OptimizationMode, RemoteAudioStates, RemoteStreamType, RemoteVideoStates, RemoteVideoStatesMap, ScreenVideoTrackConfig, SubscribeParam, SubscribeResult, TrackMediaType, UnsubscribeParam, VideoDimension, VideoEncoderConfiguration, VideoPlayerConfig };