larksr_websdk 3.2.344 → 3.2.401

package/dist/types/utils/ios-inner-height.d.ts

@@ -0,0 +1,4 @@
+declare module "ios-inner-height" {
+    function innerHeight(): number;
+    export = innerHeight;
+}

package/package.json

@@ -1,71 +1,71 @@
-{
-  "name": "larksr_websdk",
-  "version": "3.2.344",
-  "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",
-    "larksr",
-    "cloudrendeing",
-    "webrtc",
-    "cloudxr",
-    "pixelstreaming"
-  ],
-  "main": "./dist/larksr-web-sdk.min.js",
-  "types": "./types/index.d.ts",
-  "files": [
-    "dist",
-    "types",
-    "doc,"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "webpack-dev-server --config webpack.config.dev.js",
-    "build": "webpack --config webpack.config.js",
-    "build:typings": "tsc --build tsconfig.type.json",
-    "copy-dts": "copyfiles -u 1 \"src/**/*.d.ts\" dist/types/",
-    "dist": "webpack --config webpack.config.js && copyfiles -u 1 \"src/**/*.d.ts\" ./types/ && copyfiles -u 1 \"doc/*\" dist/doc/ && copyfiles -u 1 \"types/**/*.d.ts\" ./dist/types/ && copyfiles -u 1 \"dist/*\" ./sample-plain-html/source/dist/"
-  },
-  "author": "fcx@pingxingyun.com",
-  "license": "ISC",
-  "dependencies": {
-    "axios": "^0.24.0",
-    "bowser": "^2.11.0",
-    "core-js": "^3.18.1",
-    "crypto-js": "^4.1.1",
-    "ios-inner-height": "^1.1.1",
-    "protobufjs": "^6.11.2",
-    "webrtc-adapter": "^8.1.0",
-    "weixin-js-sdk": "^1.6.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@tsconfig/svelte": "^2.0.1",
-    "@types/crypto-js": "^4.0.2",
-    "@types/webrtc": "^0.0.30",
-    "babel-loader": "^8.2.2",
-    "clean-webpack-plugin": "^4.0.0",
-    "css-loader": "^6.3.0",
-    "fork-ts-checker-webpack-plugin": "^6.3.3",
-    "html-loader": "^3.0.1",
-    "html-webpack-plugin": "^5.3.2",
-    "less-loader": "^10.0.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "sass": "^1.43.4",
-    "scss": "^0.2.4",
-    "style-loader": "^3.3.0",
-    "svelte": "^3.44.1",
-    "svelte-check": "^2.2.10",
-    "svelte-loader": "^3.1.2",
-    "svelte-preprocess": "^4.9.8",
-    "terser-webpack-plugin": "^5.2.5",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.4.3",
-    "typescript-svelte-plugin": "^0.2.5",
-    "url-loader": "^4.1.1",
-    "vconsole": "^3.12.1",
-    "webpack": "^5.54.0",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.3.0"
-  }
-}
+{
+  "name": "larksr_websdk",
+  "version": "3.2.401",
+  "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",
+    "larksr",
+    "cloudrendeing",
+    "webrtc",
+    "cloudxr",
+    "pixelstreaming"
+  ],
+  "main": "./dist/larksr-web-sdk.min.js",
+  "types": "./types/index.d.ts",
+  "files": [
+    "dist",
+    "types",
+    "doc,"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "webpack-dev-server --config webpack.config.dev.js",
+    "build": "webpack --config webpack.config.js",
+    "build:typings": "tsc --build tsconfig.type.json",
+    "copy-dts": "copyfiles -u 1 \"src/**/*.d.ts\" dist/types/",
+    "dist": "webpack --config webpack.config.js && copyfiles -u 1 \"src/**/*.d.ts\" ./types/ && copyfiles -u 1 \"doc/*\" dist/doc/ && copyfiles -u 1 \"types/**/*.d.ts\" ./dist/types/ && copyfiles -u 1 \"dist/*\" ./sample-plain-html/source/dist/"
+  },
+  "author": "fcx@pingxingyun.com",
+  "license": "ISC",
+  "dependencies": {
+    "axios": "^0.24.0",
+    "bowser": "^2.11.0",
+    "core-js": "^3.18.1",
+    "crypto-js": "^4.1.1",
+    "ios-inner-height": "^1.1.1",
+    "protobufjs": "^6.11.2",
+    "webrtc-adapter": "^8.1.0",
+    "weixin-js-sdk": "^1.6.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.15.5",
+    "@tsconfig/svelte": "^2.0.1",
+    "@types/crypto-js": "^4.0.2",
+    "@types/webrtc": "^0.0.30",
+    "babel-loader": "^8.2.2",
+    "clean-webpack-plugin": "^4.0.0",
+    "css-loader": "^6.3.0",
+    "fork-ts-checker-webpack-plugin": "^6.3.3",
+    "html-loader": "^3.0.1",
+    "html-webpack-plugin": "^5.3.2",
+    "less-loader": "^10.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "sass": "^1.43.4",
+    "scss": "^0.2.4",
+    "style-loader": "^3.3.0",
+    "svelte": "^3.44.1",
+    "svelte-check": "^2.2.10",
+    "svelte-loader": "^3.1.2",
+    "svelte-preprocess": "^4.9.8",
+    "terser-webpack-plugin": "^5.2.5",
+    "ts-loader": "^9.2.6",
+    "typescript": "^4.4.3",
+    "typescript-svelte-plugin": "^0.2.5",
+    "url-loader": "^4.1.1",
+    "vconsole": "^3.12.1",
+    "webpack": "^5.54.0",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.3.0"
+  }
+}

package/types/appli_params.d.ts

@@ -30,6 +30,7 @@ export interface IAppliParams {
      * taskid
      */
     taskid: string;
+    taskId: string;
     /**
      * 当前应用名称
      */
@@ -176,7 +177,7 @@ export interface IAppliParams {
     /**
      * 优先使用的解码器
      */
-    preferDecoder: 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1x';
+    preferDecoder: 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1' | 'av1x';
     /**
      * 触摸操作对应的操作方式，触摸屏还是鼠标
      */
@@ -222,6 +223,7 @@ export declare class AppliParams implements IAppliParams {
     wsProxy: boolean;
     preferPubOutIp: string;
     taskid: string;
+    get taskId(): string;
     appliName: string;
     width: number;
     height: number;
@@ -253,7 +255,7 @@ export declare class AppliParams implements IAppliParams {
     mobileVirtualJoystick: boolean;
     mouseZoomDirection: number;
     showPlayerList: boolean;
-    preferDecoder: 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1x';
+    preferDecoder: 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1' | 'av1x';
     touchOperateMode: 'touchScreen' | 'mouse';
     appliId: string;
     syncLocalToCloudClipboard: boolean;

package/types/lark/application.d.ts

@@ -5,6 +5,7 @@ import WebsocketProxy from './websocket_proxy';
 import { LarkSR } from '../larksr';
 import PixelStreamingWebsocketChannel from './test_pixel_streaming';
 import { RECORDER_STATE } from './recoder';
+import PeerConnectionMediaShare from './peer_connection_media_share';
 export declare enum APP_STATE {
     BEFORE_CREATE = 0,
     INITED = 1,
@@ -52,10 +53,12 @@ export interface AppEvent extends LocalEvent<APP_EVENT_TYPE> {
     state: APP_STATE;
 }
 export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
+    MAX_MEDIA_SHARE_PEERCONNECTION: number;
     private websocketChannel;
     private websocketProxy;
     private testPixelStreaming;
     private peerConnection;
+    getMediaSharePeerConnection(index: number): PeerConnectionMediaShare;
     private mediaSharePeerConnectionImp;
     get peerConnectionCreated(): boolean;
     get state(): APP_STATE;
@@ -68,6 +71,7 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
     get audioPaused(): boolean | undefined;
     get videoPaused(): boolean | undefined;
     get serverFeatures(): Msg.CloudLark.INotifyFeatures | null | undefined;
+    get serverStatics(): Msg.CloudLark.IServerStatics | null | undefined;
     private get sharePeerConnection();
     private retryTime;
     private larksr;
@@ -87,6 +91,7 @@ export default class Application extends EventBase<APP_EVENT_TYPE, AppEvent> {
     inputText(text: string): void;
     sendTextToDataChannel(text: string): void;
     sendBinaryToDataChannel(binary: Uint8Array): void;
+    sendVideoBitrateKbps(bitrateKbps: number): void;
     aiDmTextInput(text: string): number;
     startAiDmVoiceInput(): Promise<number>;
     stopAiDmVoiceInput(): number;

package/types/lark/custom.d.ts

@@ -0,0 +1,7 @@
+// declare module "worker-loader!*" {
+//   class WebpackWorker extends Worker {
+//     constructor();
+//   }
+
+//   export = WebpackWorker;
+// }

package/types/lark/media_share_interface.d.ts

@@ -8,6 +8,7 @@ export interface RTCShareMediaTrackBinding {
     track: MediaStreamTrack;
     transceiver: RTCRtpTransceiver | undefined;
     paused: boolean;
+    peerid: number;
 }
 export interface MediaShareInterface {
     audioDeviceId: string | undefined | null;

package/types/lark/message.d.ts

@@ -10,8 +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, username: string | null | undefined): Msg.CloudLark.ToServerMessage;
-    static mediaShareRtcOfferMsg(type: string, sdp: string): Msg.CloudLark.ToServerMessage;
-    static mediaShareIceMsg(sdpmid: string, sdpMlineindex: number, candidate: string): Msg.CloudLark.ToServerMessage;
+    static mediaShareRtcOfferMsg(type: string, sdp: string, index: number): Msg.CloudLark.ToServerMessage;
+    static mediaShareIceMsg(sdpmid: string, sdpMlineindex: number, candidate: string, index: number): 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.d.ts

@@ -81,6 +81,9 @@ export interface AggregatedStats {
     frameWidthStart: number;
     currentRoundTripTime: number;
     packetsLostPerc: number;
+    avgDecodeDelay: number;
+    avgProcessDelay: number;
+    serverStatics: Input.CloudLark.IServerStatics | null;
 }
 export default class PeerConnection extends EventBase<WEBRTC_EVENT_TYPE, WebRTCEvent> implements MediaShareInterface {
     private config;
@@ -109,6 +112,8 @@ export default class PeerConnection extends EventBase<WEBRTC_EVENT_TYPE, WebRTCE
     private canvasRender;
     get serverFeatures(): CloudLark.INotifyFeatures | null;
     private _serverFeatures;
+    get serverStatics(): CloudLark.IServerStatics | null;
+    private _serverStatics;
     constructor(larksr: LarkSR, config: WebRTCConfig);
     create(streams?: MediaStream | undefined | null, config?: CloudLark.IRTCConfiguration | null | undefined): Promise<void>;
     createOffer(): void;

package/types/lark/peer_connection_media_share.d.ts

@@ -2,20 +2,46 @@ import { EventBase, LocalEvent } from '../event/event_base';
 import { LarkSR } from '../larksr';
 import { MediaShareInterface, RTCMediaTrackBinding } from './media_share_interface';
 import { CloudLark } from '@/protobuf/cloudlark';
+import CanvasRender from './canvas_render';
 export declare enum WEBRTC_MEDIA_SHARE_EVENT_TYPE {
-    RTC_SDP = 0,
-    RTC_ICECANDIDATE = 1,
-    ICE_STATE_CHANGE = 2,
-    ERROR = 3,
-    INFO = 4
+    RTC_SDP = "rtc_sdp",
+    RTC_ICECANDIDATE = "rtc_icecandidate",
+    ICE_STATE_CHANGE = "rtc_state_change",
+    ERROR = "rtc_error",
+    INFO = "rtc_info"
 }
 export interface WebRTCMediaShareEvent extends LocalEvent<WEBRTC_MEDIA_SHARE_EVENT_TYPE> {
     data?: any;
+    id: number;
 }
 export interface WebRTCConfig {
     serverIP: string;
     preferPubOutIp: string;
 }
+export interface AggregatedSendStats {
+    timestamp: number;
+    bytesSent: number;
+    framesEncoded: number;
+    packetsLost: number;
+    bytesSentStart: number;
+    framesEncodedStart: number;
+    timestampStart: number;
+    bitrate: number;
+    lowBitrate: number;
+    highBitrate: number;
+    avgBitrate: number;
+    framerate: number;
+    lowFramerate: number;
+    highFramerate: number;
+    avgframerate: number;
+    framesSent: number;
+    frameHeight: number;
+    frameWidth: number;
+    frameHeightStart: number;
+    frameWidthStart: number;
+    currentRoundTripTime: number;
+    packetsLostPerc: number;
+}
 export default class PeerConnectionMediaShare extends EventBase<WEBRTC_MEDIA_SHARE_EVENT_TYPE, WebRTCMediaShareEvent> implements MediaShareInterface {
     get audioDeviceId(): string | undefined;
     get audioTrack(): MediaStreamTrack | undefined;
@@ -33,11 +59,40 @@ export default class PeerConnectionMediaShare extends EventBase<WEBRTC_MEDIA_SHA
     private videoBinding;
     private sdpCreateSuccess;
     private readonly sendStream;
-    private canvasRender;
-    constructor(larksr: LarkSR);
+    get canvasRender(): CanvasRender;
+    private _canvasRender;
+    private netTestTimeout;
+    get aggregatedStats(): AggregatedSendStats | null;
+    private set aggregatedStats(value);
+    private _aggregatedStats;
+    private lastThrowBadNetork;
+    private lastPacktetsLost;
+    private lastPacktetsReceived;
+    set preferVideoCode(code: 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1x');
+    get preferVideoCode(): 'auto' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'hevc' | 'av1x';
+    private _preferDecoder;
+    set codeRate(codeRate: {
+        start: number;
+        min: number;
+        max: number;
+    });
+    get codeRate(): {
+        start: number;
+        min: number;
+        max: number;
+    };
+    private _codeRate;
+    get id(): number;
+    private _id;
+    set forceRenderToCanvas(force: boolean);
+    get forceRenderToCanvas(): boolean;
+    private _forceRenderToCanvas;
+    constructor(larksr: LarkSR, id: number);
     create(config?: CloudLark.IRTCConfiguration | null | undefined): Promise<void>;
     createOffer(): void;
     close(): void;
+    getStats(): Promise<AggregatedSendStats>;
+    getStateChrome(): Promise<AggregatedSendStats>;
     setAudioEnable(enable: boolean): void;
     setVideoEnable(enable: boolean): void;
     setShareEnable(enable: boolean): void;

package/types/lark/sdp_util.d.ts

@@ -3,32 +3,35 @@ export default class SdpUtil {
     private static vp9;
     private static h264;
     private static av1x;
+    private static av1;
     private static h265;
     private static hevc;
     private static svac;
     private static tail;
     private static config;
     static isLoopIpAddress(ip: string): boolean;
-    static getRtpmapRegByMode(mode: 'VP8' | 'VP9' | 'H264' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): RegExp;
+    static getRtpmapRegByMode(mode: 'VP8' | 'VP9' | 'H264' | 'AV1' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): RegExp;
     static hasVp8(sdp: string): boolean;
     static hasVp9(sdp: string): boolean;
     static hasH264(sdp: string): boolean;
+    static hasAV1(sdp: string): boolean;
     static hasAV1X(sdp: string): boolean;
     static hasH265(sdp: string): boolean;
     static hasHEVC(sdp: string): boolean;
     static hasSVAC(sdp: string): boolean;
-    static hasMode(sdp: string, mode: 'VP8' | 'VP9' | 'H264' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): boolean;
+    static hasMode(sdp: string, mode: 'VP8' | 'VP9' | 'H264' | 'AV1' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): boolean;
     static setAudioBitrate(sdp: string, bitrate: number): string;
     static setBitRate(sdp: string, startBitrate: number, maxBitrate: number, minBitrate: number): string;
-    static setModeBitRate(sdp: string, startBitrate: number, maxBitrate: number, minBitrate: number, mode: 'VP8' | 'VP9' | 'H264' | 'AV1X'): string;
+    static setModeBitRate(sdp: string, startBitrate: number, maxBitrate: number, minBitrate: number, mode: 'VP8' | 'VP9' | 'H264' | 'AV1' | 'AV1X'): string;
     static removeVp8(sdp: string): string;
     static removeVp9(sdp: string): string;
     static removeH264(sdp: string): string;
+    static removeAV1(sdp: string): string;
     static removeAV1X(sdp: string): string;
     static removeH265(sdp: string): string;
     static removeHEVC(sdp: string): string;
     static removeSVAC(sdp: string): string;
-    static sdpFilter(sdp: string, mode: 'VP8' | 'VP9' | 'H264' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): string;
+    static sdpFilter(sdp: string, mode: 'VP8' | 'VP9' | 'H264' | 'AV1' | 'AV1X' | 'H265' | 'HEVC' | 'SVAC'): string;
     static sdpGooAttrLine(...attrs: string[]): string;
     static sdpBlankAttrLine(...attrs: string[]): string;
     static getBlankAttrs(sdpLine: string): string[];

package/types/larksr.d.ts

@@ -656,10 +656,23 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 视频通道是否暂停
      */
     get videoPaused(): boolean | undefined;
+    /**
+     * 获取媒体通道，后续可以调用媒体通道的相关接口，如打开摄像头等
+     * 原有 larksr 对象中的媒体通道相当于序号 0
+     * @param index 媒体上传通道序号 0 - 5
+     * @returns
+     */
+    getMediaSharePeerConnection(index: number): import("./lark/peer_connection_media_share").default;
     /**
      * 服务器支持的功能列表
      */
     get serverFeatures(): CloudLark.INotifyFeatures | null | undefined;
+    get serverStatics(): CloudLark.IServerStatics | null | undefined;
+    /**
+     * 动态设置码率 单位 kbps
+     * @param bitrateKbps
+     */
+    setVideoBitrateKbps(bitrateKbps: number): void;
     /**
      * LarkSR 客户端。所有操作和事件通过该类传递
      * @param config 本地配置，优先级最高