larksr_websdk 3.2.6 → 3.2.10

package/dist/types/api.d.ts

@@ -65,19 +65,46 @@ export interface StartAppInfo {
     playerMode?: number;
     userType?: number;
     roomCode?: string;
+    nickName?: string;
     nickname?: string;
+    appKey?: string;
+    groupId?: string;
 }
 export default class API {
     static CheckUTLockInfoPath: string;
     static GetTaskPATH: string;
     static ClientLogErrorPath: string;
     static GetStartInfoPath: string;
+    private static PocHostApplGetUrl;
+    static HostAppliGetUrl(params: {
+        appliId: string;
+        playerMode?: number;
+        userType?: number;
+        roomCode?: string;
+        taskId?: string;
+    }): Promise<{
+        host: string;
+        origin: string;
+        params: {
+            appliId: string;
+            appKey: string;
+            timestamp: string;
+            signature: string;
+        };
+    }>;
     static GetStartInfo(serverAddress: string, params: {
         appliId: string;
         playerMode?: number;
         userType?: number;
         roomCode?: string;
         taskId?: string;
+        clientMac?: string;
+        groupId?: string;
+        regionId?: string;
+        targetServerIp?: string;
+        appKey?: string;
+        timestamp?: string;
+        signature?: string;
     }): Promise<StartAppInfo>;
     static CheckUTLockInfo(config: ILarkSRConfig): Promise<UTLockInfo>;
     static GetTask(config: ILarkSRConfig, taskid: string): Promise<GetTaskResult>;

package/dist/types/appli_params.d.ts

@@ -1,5 +1,6 @@
 import ScaleMode from './utils/scale_mode';
 import { StartAppInfo } from './api';
+import { ILarkSRConfig } from './larksr';
 export interface IAppliParams {
     /**
      * appserver 的ip地址
@@ -187,6 +188,8 @@ export interface IAppliParams {
     enableRttIcon: boolean;
     enableSoundRequire: boolean;
     toastLevel: number;
+    appKey: string;
+    groupId: string;
 }
 export declare enum AppliType {
     DESKTOP = 1,
@@ -244,6 +247,10 @@ export declare class AppliParams implements IAppliParams {
     enableRttIcon: boolean;
     enableSoundRequire: boolean;
     toastLevel: number;
+    appKey: string;
+    groupId: string;
+    static copyAndCreate(params?: IAppliParams): AppliParams;
+    static setUpWithSDKConfig(params: IAppliParams, config: ILarkSRConfig): AppliParams;
 }
 export declare function CreateAppliParams(): IAppliParams;
 export declare class AppliParamsUtils {

package/dist/types/index.d.ts

@@ -1,7 +1,8 @@
 import 'core-js/stable/symbol';
-import { LarkSR, CreateLarkSRClientFromeAPI, CreateLarkSRClientFromeUrl, LarkEventType, LarkSRClientEvent, AppliParams, LoadAppliParamsFromUrl, AppliParamsUtils, LoadAppliParamsStartAppInfo, EventBase, API, Operation, Capabilities, ScaleMode, CloudLark, FullScreen, LockPointer, ILarkSRConfig, PlayerModeType, UserType, LarkSREvent } from "./larksr";
+import { LarkSR, CreateLarkSRClientFromePXYHost, CreateLarkSRClientFromeAPI, CreateLarkSRClientFromeUrl, LarkEventType, LarkSRClientEvent, AppliParams, LoadAppliParamsFromUrl, AppliParamsUtils, LoadAppliParamsStartAppInfo, EventBase, API, Operation, Capabilities, ScaleMode, CloudLark, FullScreen, LockPointer, ILarkSRConfig, PlayerModeType, UserType, LarkSREvent } from "./larksr";
 declare const _default: {
     LarkSR: typeof LarkSR;
+    CreateLarkSRClientFromePXYHost: typeof CreateLarkSRClientFromePXYHost;
     CreateLarkSRClientFromeAPI: typeof CreateLarkSRClientFromeAPI;
     CreateLarkSRClientFromeUrl: typeof CreateLarkSRClientFromeUrl;
     API: typeof API;

package/dist/types/larksr.d.ts

@@ -15,7 +15,7 @@ import FullScreen from './utils/full_screen';
 import LockPointer from './utils/lock_pointer';
 import ScaleMode from './utils/scale_mode';
 import Capabilities from './utils/capabilities';
-declare const enum PlayerModeType {
+declare enum PlayerModeType {
     /**
      * 普通模式
      */
@@ -32,7 +32,7 @@ declare const enum PlayerModeType {
 /**
  * 当前用户的身份
  */
-declare const enum UserType {
+declare enum UserType {
     /**
      * 观看者
      */
@@ -69,7 +69,11 @@ declare enum LarkSRClientEvent {
     /**
      * 获取到远端视频流 .
      */
-    GOT_REMOTE_STREAM = "gotremotesteam",
+    GOT_REMOTE_STREAM = "gotremotestream",
+    /**
+     * 获取到远端音频流 .
+     */
+    GOT_REMOTE_AUDIO_STREAM = "gotremoteaudiostream",
     /**
      * 视频加载成功，等待播放 .
      */
@@ -173,10 +177,12 @@ interface ILarkSRConfig {
      */
     rootElement: HTMLElement;
     /**
-     * 必选项 服务器地址. LarkServer 前台访问的地址
+     * 可选项 服务器地址. LarkServer 前台访问的地址
      * 如： http://192.168.0.55:8181/
+     * 当使用托管服务时服务器地址自动分配,可留空。
+     * 使用托管服务时@see CreateLarkSRClientFromePXYHost @see larksr.connectWithPxyHost
      */
-    serverAddress: string;
+    serverAddress?: string;
     /**
      * 可选项。 sdk 授权码。如果不在此处填，则必须在后续的实例里调用 initSDKAuthCode 初始化。
      */
@@ -266,6 +272,20 @@ interface ILarkSRConfig {
      */
     initCursorMode?: boolean;
 }
+/**
+ * 通过平行云托管平台创建客户端并启动应用
+ * @param config 传入 config @see ILarkSRConfig
+ * @param params 进入应用接口参数。appliId 为必填项
+ * @returns Promise 创建 larksr client 是否成功
+ */
+export declare function CreateLarkSRClientFromePXYHost(config: ILarkSRConfig, params: {
+    appliId: string;
+    playerMode?: number;
+    userType?: number;
+    roomCode?: string;
+    taskId?: string;
+    nickname?: string;
+}): Promise<LarkSR>;
 /**
  * 通过调用后台接口获取云端应用参数
  * @param config 传入 config @see ILarkSRConfig
@@ -278,6 +298,13 @@ export declare function CreateLarkSRClientFromeAPI(config: ILarkSRConfig, params
     userType?: number;
     roomCode?: string;
     taskId?: string;
+    clientMac?: string;
+    groupId?: string;
+    regionId?: string;
+    targetServerIp?: string;
+    appKey?: string;
+    timestamp?: string;
+    signature?: string;
 }): Promise<LarkSR>;
 /**
  * 通过从url参数中获取云端应用相关参数
@@ -289,7 +316,7 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
     /**
      * 应用参数，构建时传入
      */
-    get params(): IAppliParams;
+    get params(): AppliParams;
     private _params;
     /**
      * 当前的玩家模式，
@@ -351,6 +378,14 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 视频显示组件
      */
     get videoComponent(): any;
+    /**
+     * 音频元素
+     */
+    get audioElement(): HTMLAudioElement;
+    /**
+     * 是否有单独的音频流
+     */
+    get isSeprateAudioTrack(): any;
     /**
      * 视频显示组件的父容器
      */
@@ -362,7 +397,6 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
     get rootElement(): HTMLElement;
     private _rootElement;
     get serverAddress(): string;
-    private _serverAddress;
     get serverIp(): string;
     get config(): ILarkSRConfig;
     private _config;
@@ -383,17 +417,53 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 注意，如果手动创建该类，要清楚参数的意义，一般只有调试等特殊情况才手动创建该类
      * @see CreateLarkSRClientFromeAPI, CreateLarkSRClientFromeUrl
      * @param config 本地配置，如果有 IAppliParams 相同的配置项，优先级最高
-     * @param params 云端应用参数等，通过后台接口或者url参数获取。
+     * @param params [可选参数] 云端应用参数等，通过后台接口或者url参数获取。
      */
-    constructor(config: ILarkSRConfig, params: IAppliParams);
+    constructor(config: ILarkSRConfig, params?: IAppliParams);
     /**
      *
      * @param id sdk id 初始化sdkid
      * @returns
      */
     initSDKAuthCode(id: string): Promise<void>;
+    connectWithPxyHost(params: {
+        appliId: string;
+        playerMode?: number;
+        userType?: number;
+        roomCode?: string;
+        taskId?: string;
+    }): Promise<void>;
+    /**
+     * 连接云端渲染资源
+     * @params appID 云端资源的 ID
+     * @returns Promise 调用接口并校验授权通过返回成功并自动开始连接
+     */
+    connect(params: {
+        appliId: string;
+        playerMode?: number;
+        userType?: number;
+        roomCode?: string;
+        taskId?: string;
+        clientMac?: string;
+        groupId?: string;
+        regionId?: string;
+        targetServerIp?: string;
+        appKey?: string;
+        timestamp?: string;
+        signature?: string;
+    }): Promise<void>;
+    /**
+     * 用户手动填昵称，需要在 start 或 connect 设置才能生效。
+     */
+    setNickname(nickname: string): void;
+    /**
+     * 手动重设进入应用参数
+     * @param params
+     */
+    setAppliParams(params: IAppliParams): void;
     /**
      * 开始云渲染流程
+     * 启动时应用参数不能为空，包括 taskID，appServer，appPort
      * @returns 是否成功。主要校验授权码是否成功
      */
     start(): Promise<void>;
@@ -405,6 +475,10 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 重新启动云端应用
      */
     restartApp(): void;
+    /**
+     * 主动关闭连接
+     */
+    close(): void;
     /**
      * 切换当前操作者
      * @param uid 用户id
@@ -441,6 +515,7 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
      * 可以不使用该方法退出页面
      */
     quit(): void;
+    resetAppMouseLockState(): void;
     /**
      * 操作相关事件
      * 所有事件坐标相对于云端应用，不相对于网页
@@ -466,10 +541,12 @@ declare class LarkSR extends EventBase<LarkSRClientEvent, LarkSREvent> {
     $emitError(message?: string, code?: number): void;
     $emitInfo(message?: string, code?: number): void;
     private createEvent;
+    private setupListener;
     private taskProcess;
     private startProcess;
     private onAppStateChange;
     private onGotRemoteStream;
+    private onGotRemoteAudioStream;
     private onCursorStyle;
     private onAppResize;
     private onAppMouseMode;

package/dist/types/screen_state.d.ts

@@ -3,6 +3,7 @@ import { IAppliParams } from "./appli_params";
 import { CloudLark } from "./protobuf/cloudlark";
 import ScaleMode from "./utils/scale_mode";
 import { LocalEvent, EventBase } from './event/event_base';
+import { LarkSR } from "./larksr";
 export interface ContainerSize {
     marginTop: number;
     marginLeft: number;
@@ -83,7 +84,9 @@ export default class ScreenState extends EventBase<SCREEN_EVENT_TYPE, ScreenEven
     get isLockMouse(): boolean;
     private _isLockMouse;
     get cursorStyle(): SyncCursorStyle;
+    set cursorStyle(style: SyncCursorStyle);
     private _cursorStyle;
+    private get cursorCSSStyle();
     get appMouseMode(): CloudLark.IAppMouseMode;
     set appMouseMode(mode: CloudLark.IAppMouseMode);
     private _appMouseMode;
@@ -103,6 +106,8 @@ export default class ScreenState extends EventBase<SCREEN_EVENT_TYPE, ScreenEven
     private mobileForceLandScape;
     private bgColor;
     private handelRootElementSize;
-    constructor(rootElement: HTMLElement, params: IAppliParams, handelRootElementSize?: boolean);
+    private larksr;
+    constructor(rootElement: HTMLElement, params: IAppliParams, larksr: LarkSR, handelRootElementSize?: boolean);
+    reset(params: IAppliParams): void;
     resize(): void;
 }

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "larksr_websdk",
-  "version": "3.2.6",
-  "description": "larksr websdk. http://www.pingxingyun.com",
+  "version": "3.2.10",
+  "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"
+    "cloudxr",
+    "pixelstreaming"
   ],
   "main": "./dist/larksr-web-sdk.min.js",
-  "types": "./dist/types/index.d.ts",
+  "types": "./types/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "types",
+    "doc,"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -20,7 +23,7 @@
     "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\" dist/types/ && copyfiles -u 1 \"doc/*\" dist/doc/"
+    "dist": "webpack --config webpack.config.js && copyfiles -u 1 \"src/**/*.d.ts\" ./types/ && copyfiles -u 1 \"doc/*\" dist/doc/ && copyfiles -u 1 \"types/*\" ./dist/types/"
   },
   "author": "fcx@pingxingyun.com",
   "license": "ISC",

package/types/api.d.ts

@@ -0,0 +1,114 @@
+import { ILarkSRConfig } from './larksr';
+import { AppliParams } from './appli_params';
+export interface UTLockInfo {
+    checkUtLockMessage: string;
+    checkUtLockResult: boolean;
+    remainMinutes: number;
+}
+export interface GetTaskResult {
+    adminViewer: number;
+    appKey: string;
+    appliId: string;
+    appliType: number;
+    city: string;
+    clientIp: string;
+    country: string;
+    createDate: string;
+    dcs: number;
+    limitMaxFps: number;
+    offScreen: number;
+    playerListToggle: number;
+    playerMode: number;
+    province: string;
+    publicIp: string;
+    reserveFlag: number;
+    serverId: string;
+    serverIp: string;
+    shareUrl: string;
+    startAt: string;
+    startParam: string;
+    startProcType: number;
+    status: number;
+    taskId: string;
+    updateDate: string;
+    useGamepad: number;
+    wm: number;
+}
+export interface StartAppInfo {
+    appliId: string;
+    appliType: number;
+    appliName: string;
+    taskId: string;
+    renderServerIp: string;
+    wsProxy: string;
+    preferPublicIp: string;
+    renderServerPort: number;
+    initCursorMode: number;
+    rttLimit: string;
+    touchOperateMode: string;
+    fullScreenMode: number;
+    mobileForceLandscape: number;
+    mobileFullScreenMode: number;
+    language: string;
+    noOperationTimeout: string;
+    serverId: string;
+    network: string;
+    playerListToggle: number;
+    bgColor: string;
+    logLevel: string;
+    mobileVirtualJoystick: number;
+    initWinSize: number;
+    taskStatus: number;
+    mouseZoomDirection: number;
+    useGamepad: number;
+    rttLimitInterval: string;
+    playerMode?: number;
+    userType?: number;
+    roomCode?: string;
+    nickName?: string;
+    nickname?: string;
+    appKey?: string;
+    groupId?: string;
+}
+export default class API {
+    static CheckUTLockInfoPath: string;
+    static GetTaskPATH: string;
+    static ClientLogErrorPath: string;
+    static GetStartInfoPath: string;
+    private static PocHostApplGetUrl;
+    static HostAppliGetUrl(params: {
+        appliId: string;
+        playerMode?: number;
+        userType?: number;
+        roomCode?: string;
+        taskId?: string;
+    }): Promise<{
+        host: string;
+        origin: string;
+        params: {
+            appliId: string;
+            appKey: string;
+            timestamp: string;
+            signature: string;
+        };
+    }>;
+    static GetStartInfo(serverAddress: string, params: {
+        appliId: string;
+        playerMode?: number;
+        userType?: number;
+        roomCode?: string;
+        taskId?: string;
+        clientMac?: string;
+        groupId?: string;
+        regionId?: string;
+        targetServerIp?: string;
+        appKey?: string;
+        timestamp?: string;
+        signature?: string;
+    }): Promise<StartAppInfo>;
+    static CheckUTLockInfo(config: ILarkSRConfig): Promise<UTLockInfo>;
+    static GetTask(config: ILarkSRConfig, taskid: string): Promise<GetTaskResult>;
+    static LogError(errorCode: number, errorMsg: string, params: string, config: ILarkSRConfig): void;
+    static ClientInfo(config: ILarkSRConfig, params: AppliParams): void;
+    static joinParam(params: any): string;
+}