larksr_websdk 3.2.331 → 3.2.332

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larksr_websdk",
-  "version": "3.2.331",
+  "version": "3.2.332",
   "description": "Larksr websdk. Easy to build a cloud render client for larksr system or ue4 pixelstreaming.docs: https://pingxingyun.github.io/webclient_sdk/",
   "keywords": [
     "pingxingyun",

package/types/lark/application.d.ts

@@ -56,14 +56,19 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
     private websocketProxy;
     private testPixelStreaming;
     private peerConnection;
+    private sharePeerConnection;
     get peerConnectionCreated(): boolean;
     get state(): APP_STATE;
     set state(state: APP_STATE);
     private _state;
     get audioDeviceId(): string | undefined;
-    get audioTrack(): MediaStreamTrack | undefined;
+    get audioTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    } | undefined;
     get videoDeviceId(): string | undefined;
-    get videoTrack(): MediaStreamTrack | undefined;
+    get videoTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    } | undefined;
     private retryTime;
     private larksr;
     get voiceId(): number;
@@ -71,8 +76,10 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
     private recoder;
     constructor(larksr: LarkSR);
     init(): void;
+    initSharePc(): void;
     initPc(): void;
     releasePc(): void;
+    releaseSharePc(): void;
     clear(): void;
     changeOperater(uid: number): void;
     inputText(text: string): void;
@@ -124,18 +131,21 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
     setAudioEnable(enable: boolean): void | undefined;
     setVideoEnable(enable: boolean): void | undefined;
     setShareEnable(enable: boolean): void | undefined;
-    closeAudio(): boolean | undefined;
-    closeVideo(): boolean | undefined;
-    closeShare(): boolean | undefined;
+    closeAudio(): RTCMediaTrackBinding[] | undefined;
+    closeVideo(): RTCMediaTrackBinding[] | undefined;
+    closeShare(): RTCMediaTrackBinding[] | undefined;
     openAudio(deviceId?: string): Promise<{
         streams: MediaStream;
         rtcRtpSenders: RTCMediaTrackBinding[];
     } | undefined>;
-    openVideo(audio?: boolean, cameraId?: string): Promise<{
+    openVideo(audio?: boolean, cameraId?: string, width?: number, height?: number): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    } | undefined>;
+    openDefaultMedia(video?: boolean, audio?: boolean): Promise<{
         streams: MediaStream;
         rtcRtpSenders: RTCMediaTrackBinding[];
     } | undefined>;
-    openDefaultMedia(video?: boolean, audio?: boolean): Promise<void | undefined>;
     openShareMediaDevice(): Promise<void | undefined>;
     getConnectedAudioinputDevices(): Promise<MediaDeviceInfo[] | undefined>;
     getConnectedAudioOutputDevices(): Promise<MediaDeviceInfo[] | undefined>;
@@ -149,7 +159,7 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
         streams: MediaStream;
         rtcRtpSenders: RTCMediaTrackBinding[];
     } | undefined>;
-    openUserMeida(constraints?: MediaStreamConstraints): Promise<{
+    openUserMeida(constraints?: MediaStreamConstraints, reset?: boolean): Promise<{
         streams: MediaStream;
         rtcRtpSenders: RTCMediaTrackBinding[];
     } | undefined>;

package/types/lark/message.d.ts

@@ -10,6 +10,8 @@ export default class Message {
     static startMonitorStreamReqeuest(request: Msg.CloudLark.IVrMonitorRequest): Msg.CloudLark.ToServerMessage;
     static rtcOfferMsg(type: string, sdp: string): Msg.CloudLark.ToServerMessage;
     static iceMsg(sdpmid: string, sdpMlineindex: number, candidate: string): Msg.CloudLark.ToServerMessage;
+    static mediaShareRtcOfferMsg(type: string, sdp: string): Msg.CloudLark.ToServerMessage;
+    static mediaShareIceMsg(sdpmid: string, sdpMlineindex: number, candidate: string): Msg.CloudLark.ToServerMessage;
     static restartApp(): Msg.CloudLark.ToServerMessage;
     static getTaskResponseMsg(ressponse: Msg.CloudLark.TaskResponse.Response): string;
     static getStartStreamResponseMsg(ressponse: Msg.CloudLark.StartStreamResponse.Response): string;

package/types/lark/peer_connection_media_share.d.ts

@@ -0,0 +1,89 @@
+import { EventBase, LocalEvent } from '../event/event_base';
+import { LarkSR } from '../larksr';
+import { RTCMediaTrackBinding } from './peer_connection';
+export declare enum WEBRTC_MEDIA_SHARE_EVENT_TYPE {
+    RTC_SDP = 0,
+    RTC_ICECANDIDATE = 1,
+    ICE_STATE_CHANGE = 2,
+    ERROR = 3,
+    INFO = 4
+}
+export interface WebRTCMediaShareEvent extends LocalEvent<WEBRTC_MEDIA_SHARE_EVENT_TYPE> {
+    data?: any;
+}
+export interface WebRTCConfig {
+    serverIP: string;
+    preferPubOutIp: string;
+}
+export default class PeerConnectionMediaShare extends EventBase<WEBRTC_MEDIA_SHARE_EVENT_TYPE, WebRTCMediaShareEvent> {
+    get audioDeviceId(): string;
+    get audioTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    };
+    get videoDeviceId(): string;
+    get videoTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    };
+    private larksr;
+    private offerOptions;
+    private pcConfig;
+    private pc;
+    private sdpCreateSuccess;
+    private rtcRtpSenders;
+    constructor(larksr: LarkSR);
+    create(): Promise<void>;
+    createOffer(): void;
+    close(): void;
+    setAudioEnable(enable: boolean): void;
+    setVideoEnable(enable: boolean): void;
+    setShareEnable(enable: boolean): void;
+    closeAudio(): RTCMediaTrackBinding[];
+    closeVideo(): RTCMediaTrackBinding[];
+    closeShare(): RTCMediaTrackBinding[];
+    private stopLocalTrackBing;
+    openAudio(deviceId?: string): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    openVideo(audio?: boolean, cameraId?: string, width?: number, height?: number): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    openDefaultMedia(video?: boolean, audio?: boolean): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    openShareMediaDevice(): Promise<void>;
+    getConnectedAudioinputDevices(): Promise<MediaDeviceInfo[]>;
+    getConnectedAudioOutputDevices(): Promise<MediaDeviceInfo[]>;
+    getConnectedVideoinputDevices(): Promise<MediaDeviceInfo[]>;
+    getConnectedDevices(type: MediaDeviceKind): Promise<MediaDeviceInfo[]>;
+    openAudioDevice(deviceId: string, kind?: "audioinput" | "audiooutput"): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    openCamera(cameraId: string, width?: number, height?: number, audio?: boolean): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    openUserMeida(constraints?: MediaStreamConstraints, reset?: boolean): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: RTCMediaTrackBinding[];
+    }>;
+    addMediaTrack(track: MediaStreamTrack, ...streams: MediaStream[]): boolean;
+    removeMediaTrack(track: RTCRtpSender): boolean;
+    requestUserMediaPermission(constraints?: MediaStreamConstraints): Promise<MediaStream>;
+    /**
+     * 接收到sdp
+     * @param des sdp
+     */
+    onRemoteDescription(des: RTCSessionDescriptionInit): void;
+    onReceiveCandidate(candateInit: RTCIceCandidateInit): void;
+    private addIceCandidate;
+    private onCreateOfferSuccess;
+    private onIceCandidate;
+    private onIceStateChange;
+    private iceStateChange;
+    private $emit;
+    private createEvent;
+}

package/types/larksr.d.ts

@@ -615,7 +615,9 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
     /**
      * 当前打开音频的track对象，未打开状态为空
      */
-    get audioTrack(): MediaStreamTrack | undefined;
+    get audioTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    } | undefined;
     /**
      * 当前打开视频设备 ID，如果打开时没指定特设备id为空
      */
@@ -623,7 +625,9 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
     /**
      * 当前打开视频track对象，未打开状态为空
      */
-    get videoTrack(): MediaStreamTrack | undefined;
+    get videoTrack(): MediaStreamTrack | {
+        enabled: boolean;
+    } | undefined;
     /**
      * LarkSR 客户端。所有操作和事件通过该类传递
      * @param config 本地配置，优先级最高
@@ -1004,9 +1008,9 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 关闭当前的音频设备
      * @returns
      */
-    closeAudio(): boolean | undefined;
-    closeVideo(): boolean | undefined;
-    closeShare(): boolean | undefined;
+    closeAudio(): import("./lark/peer_connection").RTCMediaTrackBinding[] | undefined;
+    closeVideo(): import("./lark/peer_connection").RTCMediaTrackBinding[] | undefined;
+    closeShare(): import("./lark/peer_connection").RTCMediaTrackBinding[] | undefined;
     /**
      * 打开一个音频设备，要注意浏览器限制在 https 或者 localhost 下才能打开音频
      * @param deviceId 音频设备id，如果不传将打开默认设备。@see getConnectedAudioinputDevices
@@ -1022,7 +1026,7 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * @param cameraId 视频设备id，如果不传将打开默认设备。@see getConnectedVideoinputDevices
      * @returns Promise
      */
-    openVideo(audio?: boolean, cameraId?: string): Promise<{
+    openVideo(audio?: boolean, cameraId?: string, width?: number, height?: number): Promise<{
         streams: MediaStream;
         rtcRtpSenders: import("./lark/peer_connection").RTCMediaTrackBinding[];
     } | undefined>;
@@ -1033,7 +1037,10 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * @param audio 是否包含音频
      * @returns Promise
      */
-    openDefaultMedia(video?: boolean, audio?: boolean): Promise<void | undefined>;
+    openDefaultMedia(video?: boolean, audio?: boolean): Promise<{
+        streams: MediaStream;
+        rtcRtpSenders: import("./lark/peer_connection").RTCMediaTrackBinding[];
+    } | undefined>;
     openShareMediaDevice(): Promise<void | undefined>;
     /**
      * 返回已连接的音频设备列表，设备列表中的设备的 deviceId 可用来打开某个音频设备
@@ -1055,7 +1062,7 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
         streams: MediaStream;
         rtcRtpSenders: import("./lark/peer_connection").RTCMediaTrackBinding[];
     } | undefined>;
-    openUserMeida(constraints?: MediaStreamConstraints): Promise<{
+    openUserMeida(constraints?: MediaStreamConstraints, reset?: boolean): Promise<{
         streams: MediaStream;
         rtcRtpSenders: import("./lark/peer_connection").RTCMediaTrackBinding[];
     } | undefined>;