@realsee/live 0.5.2-dev.1 → 0.5.2-dev.3

package/dist/live/controller.d.ts

@@ -2,7 +2,7 @@ import { LiveMsg } from '../typings';
 import { LiveState } from '../typings/live/LiveState';
 import { RobustWebSocketEventDetail } from '../utils/RobustWebSocket';
 import { Subscribe } from '../utils/subscribe';
-export declare type LiveControllerEventMap = {
+export type LiveControllerEventMap = {
     stateChange: (state: LiveState, prevState: LiveState) => void;
     message: (message: LiveMsg) => void;
     reconnected: (detail: RobustWebSocketEventDetail) => void;

package/dist/live/createLiveReact.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { BuiltinActionType, BuiltinEventType, KeyframeTypes, LiveConnectOptions, LiveEventType, LiveOptions, MicroStatus, RTCEventType, RTCType, UserInfo } from '../typings';
 import { LiveState } from '../typings/live/LiveState';
 import { Live } from './live';
-export declare type LiveProviderPropTypes<KeyframesSnapshot extends Record<string, any>> = {
+export type LiveProviderPropTypes<KeyframesSnapshot extends Record<string, any>> = {
     children?: React.ReactNode;
     live?: Live<KeyframesSnapshot>;
 };

package/dist/live/live.d.ts

@@ -3,7 +3,7 @@ import { RTCProtocol } from '../rtc';
 import { EventType, KeyframeTypes, LiveOptions, RoomInfo, RTCType, UserInfo, BuiltinEventType, BuiltinActionType, MicroStatus, LiveConnectOptions } from '../typings';
 import { LiveState } from '../typings/live/LiveState';
 import { Subscribe } from '../utils/subscribe';
-export declare type LiveBuiltInData<KeyframesSnapshot> = {
+export type LiveBuiltInData<KeyframesSnapshot> = {
     selfInfo?: UserInfo;
     userList?: UserInfo[];
     roomInfo?: RoomInfo;

package/dist/realsee-live.cjs.development.js

@@ -171,6 +171,54 @@ exports.BuiltInRTCType = void 0;
     BuiltInRTCType["RealseeXChimeRTC"] = "chime";
 })(exports.BuiltInRTCType || (exports.BuiltInRTCType = {}));
 
+/**
+ * 输出格式化日志
+ */
+// 获取当前时间
+const getTime = () => {
+    const date = new Date();
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0'); //月份是从0开始的
+    const day = date.getDate().toString().padStart(2, '0');
+    const hour = date.getHours().toString().padStart(2, '0');
+    const min = date.getMinutes().toString().padStart(2, '0');
+    const sec = date.getSeconds().toString().padStart(2, '0');
+    const ms = date.getMilliseconds();
+    return `[${year}-${month}-${day} ${hour}:${min}:${sec}.${ms}]`;
+};
+var LOG_LEVEL;
+(function (LOG_LEVEL) {
+    LOG_LEVEL["info"] = "INFO";
+    LOG_LEVEL["log"] = "LOG";
+    LOG_LEVEL["error"] = "ERROR";
+    LOG_LEVEL["warn"] = "WARN";
+})(LOG_LEVEL || (LOG_LEVEL = {}));
+// 输出日志
+const echo = (logLevel, args = []) => {
+    args.unshift(`Realsee Live ${getTime()} <${logLevel}> `);
+    switch (logLevel) {
+        case LOG_LEVEL.info:
+            return console.info(...args);
+        case LOG_LEVEL.error:
+            return console.error(...args);
+        case LOG_LEVEL.warn:
+            return console.warn(...args);
+        default:
+            return console.log(...args);
+    }
+};
+const log = (...args) => echo(LOG_LEVEL.log, args);
+const info = (...args) => echo(LOG_LEVEL.info, args);
+const error = (...args) => echo(LOG_LEVEL.error, args);
+const warn = (...args) => echo(LOG_LEVEL.warn, args);
+const logger = {
+    log,
+    info,
+    error,
+    warn,
+};
+var logger$1 = logger;
+
 // uuid
 function S4() {
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
@@ -298,7 +346,10 @@ class BrowserRTC extends CoreRTC {
                 navigator.mediaDevices
                     .getUserMedia(rule)
                     .then(() => resolve(true))
-                    .catch(() => resolve(false));
+                    .catch((e) => {
+                    logger$1.error(e.message);
+                    resolve(false);
+                });
             }
             catch (e) {
                 console.error(e);
@@ -613,6 +664,9 @@ exports.RTCJoinedInfoCodeEnum = void 0;
 })(exports.RTCJoinedInfoCodeEnum || (exports.RTCJoinedInfoCodeEnum = {}));
 
 class VRWebViewRTC extends CoreRTC {
+    get jsBridge() {
+        return this.options.jsBridge;
+    }
     constructor({ jsBridge, getVoiceSign }) {
         super();
         this.type = exports.RTCType.RealseeVRWebViewRTC;
@@ -631,9 +685,6 @@ class VRWebViewRTC extends CoreRTC {
                 this.emit('weakNetwork');
         });
     }
-    get jsBridge() {
-        return this.options.jsBridge;
-    }
     join(options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -986,7 +1037,7 @@ exports.default = LogLevel;
 
 var LogLevel = /*@__PURE__*/getDefaultExportFromCjs(LogLevel_1);
 
-function appendUri(uri, query) {
+function appendUri(uri, query = {}) {
     const hasQuery = uri.indexOf('?') !== -1;
     const newQuery = Object.keys(query).reduce((accu, curr, idx) => `${accu}${(idx === 0 && !hasQuery) ? '?' : '&'}${curr}=${query[curr]}`, '');
     return uri + newQuery;
@@ -1124,66 +1175,21 @@ function objEqualDeep(value, other) {
  * @param options 可选参数，可选项：`deep` 是否深比较。
  * @returns {boolean} 是否相等。
  */
-function equal(value, other, opt) {
+function equal(value, other, opt = { deep: false }) {
     if (!opt.deep)
         return isShallowEqual(value, other);
     return isDeepEqual(value, other);
 }
 
-/**
- * 输出格式化日志
- */
-// 获取当前时间
-const getTime = () => {
-    const date = new Date();
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0'); //月份是从0开始的
-    const day = date.getDate().toString().padStart(2, '0');
-    const hour = date.getHours().toString().padStart(2, '0');
-    const min = date.getMinutes().toString().padStart(2, '0');
-    const sec = date.getSeconds().toString().padStart(2, '0');
-    const ms = date.getMilliseconds();
-    return `[${year}-${month}-${day} ${hour}:${min}:${sec}.${ms}]`;
-};
-var LOG_LEVEL;
-(function (LOG_LEVEL) {
-    LOG_LEVEL["info"] = "INFO";
-    LOG_LEVEL["log"] = "LOG";
-    LOG_LEVEL["error"] = "ERROR";
-    LOG_LEVEL["warn"] = "WARN";
-})(LOG_LEVEL || (LOG_LEVEL = {}));
-// 输出日志
-const echo = (logLevel, args = []) => {
-    args.unshift(`Realsee Live ${getTime()} <${logLevel}> `);
-    switch (logLevel) {
-        case LOG_LEVEL.info:
-            return console.info(...args);
-        case LOG_LEVEL.error:
-            return console.error(...args);
-        case LOG_LEVEL.warn:
-            return console.warn(...args);
-        default:
-            return console.log(...args);
-    }
-};
-const log = (...args) => echo(LOG_LEVEL.log, args);
-const info = (...args) => echo(LOG_LEVEL.info, args);
-const error = (...args) => echo(LOG_LEVEL.error, args);
-const warn = (...args) => echo(LOG_LEVEL.warn, args);
-const logger = {
-    log,
-    info,
-    error,
-    warn,
-};
-var logger$1 = logger;
-
 /**
  * 具有鲁棒性的WebSocket封装
  * 1、自动重连
  * 2、可根据网络情况进行重连
  */
 class RobustWebSocket extends Subscribe {
+    get attempts() {
+        return this._attempts;
+    }
     constructor(options) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         super();
@@ -1431,9 +1437,6 @@ class RobustWebSocket extends Subscribe {
         }
         this._startHealthCheck();
     }
-    get attempts() {
-        return this._attempts;
-    }
     setOptions(options) {
         if (!options)
             return;
@@ -1475,6 +1478,14 @@ class RobustWebSocket extends Subscribe {
 }
 
 class LiveController extends Subscribe {
+    set state(state) {
+        const prevState = JSON.parse(JSON.stringify(this._state));
+        this._state = state;
+        this.emit('stateChange', this.state, prevState);
+    }
+    get state() {
+        return this._state;
+    }
     constructor() {
         super();
         /**
@@ -1604,14 +1615,6 @@ class LiveController extends Subscribe {
         });
         this._addWebSocketEventListeners();
     }
-    set state(state) {
-        const prevState = JSON.parse(JSON.stringify(this._state));
-        this._state = state;
-        this.emit('stateChange', this.state, prevState);
-    }
-    get state() {
-        return this._state;
-    }
     /**
      * 发送数据
      * @param data
@@ -1643,6 +1646,65 @@ const _clearLiveInstanceIfNeed = () => {
     }
 };
 class Live extends Subscribe {
+    get options() {
+        return Object.freeze(this._options || {});
+    }
+    /**
+     * 带看状态
+     */
+    get state() {
+        return this._controller.state;
+    }
+    /**
+     * 兼容老逻辑
+     * @deprecated 请直接读取 state 属性字段，未来将移除该属性
+     */
+    get readyState() {
+        return this._controller.state;
+    }
+    /**
+     * 获取当前WebSocket连接的URL。(注意：这个是WebSocket连接的完整连接，附带一些query参数)。
+     * @deprecated 带看不需要关注底层ws的相关信息，未来将移除
+     */
+    get url() {
+        return this.options.url;
+    }
+    /**
+     * 获取当前live使用的RTC实例
+     */
+    get $RTC() {
+        return this._options.rtc;
+    }
+    /**
+     * 获取当前live使用的jsBridge实例
+     */
+    get jsBridge() {
+        return this._options.jsBridge;
+    }
+    /**
+     * 当前帧数据快照
+     */
+    get snapshot() {
+        return this._buildInData.keyframes;
+    }
+    /**
+     * 当前用户信息
+     */
+    get selfInfo() {
+        return this._buildInData.selfInfo;
+    }
+    /**
+     * 当前用户列表
+     */
+    get userList() {
+        return this._buildInData.userList || [];
+    }
+    /**
+     * 当前带看房间信息
+     */
+    get roomInfo() {
+        return this._buildInData.roomInfo;
+    }
     constructor(opts) {
         var _a;
         super();
@@ -1715,7 +1777,7 @@ class Live extends Subscribe {
          * @param liveMsg
          */
         this._handleMessage = (liveMsg) => __awaiter(this, void 0, void 0, function* () {
-            var _b, _c, _d, _e, _f, _g;
+            var _b, _c, _d, _e, _f;
             if (typeof liveMsg === 'object') {
                 const { command, data = {}, frontRequestId, code, message } = liveMsg;
                 if (code === 'SUCCESS') {
@@ -1755,7 +1817,7 @@ class Live extends Subscribe {
                                 }));
                                 if (result) {
                                     const status = (_f = this._options.initialMicroStatus) !== null && _f !== void 0 ? _f : exports.MicroStatus.OPEN;
-                                    yield ((_g = this.$RTC) === null || _g === void 0 ? void 0 : _g.toggleMicro(status === exports.MicroStatus.OPEN));
+                                    yield this.toggleMicro(status === exports.MicroStatus.OPEN);
                                 }
                                 else {
                                     logger$1.error('加入语音房间失败');
@@ -1869,12 +1931,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.connect = (options = {}) => __awaiter(this, void 0, void 0, function* () {
-            var _h, _j, _k, _l;
+            var _g, _h, _j, _k;
             // 检查 url 和 票据获取接口实现
-            this._options.url = (_j = (_h = options.url) !== null && _h !== void 0 ? _h : this._options.url) !== null && _j !== void 0 ? _j : '';
-            this._options.getTicket = (_k = options.getTicket) !== null && _k !== void 0 ? _k : this._options.getTicket;
+            this._options.url = (_h = (_g = options.url) !== null && _g !== void 0 ? _g : this._options.url) !== null && _h !== void 0 ? _h : '';
+            this._options.getTicket = (_j = options.getTicket) !== null && _j !== void 0 ? _j : this._options.getTicket;
             this._options.initialMicroStatus =
-                (_l = options.rtcMicStatus) !== null && _l !== void 0 ? _l : this._options.initialMicroStatus;
+                (_k = options.rtcMicStatus) !== null && _k !== void 0 ? _k : this._options.initialMicroStatus;
             if (!/^ws(s):\/\//.test(this._options.url) ||
                 typeof this._options.getTicket !== 'function') {
                 if (!/^ws(s):\/\//.test(this._options.url)) {
@@ -1923,11 +1985,11 @@ class Live extends Subscribe {
          * @returns
          */
         this.exit = () => __awaiter(this, void 0, void 0, function* () {
-            var _m;
+            var _l;
             this._clearLiveData();
             try {
                 /** 退出强制关闭语音 */
-                (_m = this.$RTC) === null || _m === void 0 ? void 0 : _m.quit();
+                (_l = this.$RTC) === null || _l === void 0 ? void 0 : _l.quit();
                 yield this.updateStatus(exports.BuiltinEventType.RoomChange, exports.BuiltinActionType.RoomClose, {});
             }
             catch (e) {
@@ -1954,10 +2016,10 @@ class Live extends Subscribe {
         });
         // 仅用于用户自己的麦克风控制
         this.toggleMicro = (microStatus) => __awaiter(this, void 0, void 0, function* () {
-            var _o, _p, _q;
-            if (!((_p = (_o = this.selfInfo) === null || _o === void 0 ? void 0 : _o.permission) === null || _p === void 0 ? void 0 : _p.control_own_micro))
+            var _m, _o, _p;
+            if (!((_o = (_m = this.selfInfo) === null || _m === void 0 ? void 0 : _m.permission) === null || _o === void 0 ? void 0 : _o.control_own_micro))
                 return false;
-            const result = yield ((_q = this.$RTC) === null || _q === void 0 ? void 0 : _q.toggleMicro(microStatus));
+            const result = yield ((_p = this.$RTC) === null || _p === void 0 ? void 0 : _p.toggleMicro(microStatus));
             if (result) {
                 yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
                     status: microStatus ? exports.MicroStatus.OPEN : exports.MicroStatus.CLOSE,
@@ -1972,12 +2034,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.forbidMicro = (microStatus, toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _r, _s;
+            var _q, _r;
             if (typeof this._options.canForbidUserMicro === 'function' &&
                 !this._options.canForbidUserMicro(toUserIds)) {
                 return false;
             }
-            if (!((_s = (_r = this.selfInfo) === null || _r === void 0 ? void 0 : _r.permission) === null || _s === void 0 ? void 0 : _s.control_other_micro)) {
+            if (!((_r = (_q = this.selfInfo) === null || _q === void 0 ? void 0 : _q.permission) === null || _r === void 0 ? void 0 : _r.control_other_micro)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
@@ -1991,12 +2053,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.forbidSync = (sync, toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _t, _u;
+            var _s, _t;
             if (typeof this._options.canForbidUserSync === 'function' &&
                 !this._options.canForbidUserSync(toUserIds)) {
                 return false;
             }
-            if (!((_u = (_t = this.selfInfo) === null || _t === void 0 ? void 0 : _t.permission) === null || _u === void 0 ? void 0 : _u.control_other_sync)) {
+            if (!((_t = (_s = this.selfInfo) === null || _s === void 0 ? void 0 : _s.permission) === null || _t === void 0 ? void 0 : _t.control_other_sync)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserPermission, { sync_frame: sync }, toUserIds);
@@ -2007,12 +2069,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.kick = (toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _v, _w;
+            var _u, _v;
             if (typeof this._options.canForbidUserKick === 'function' &&
                 !this._options.canForbidUserKick(toUserIds)) {
                 return false;
             }
-            if (!((_w = (_v = this.selfInfo) === null || _v === void 0 ? void 0 : _v.permission) === null || _w === void 0 ? void 0 : _w.change_other_status)) {
+            if (!((_v = (_u = this.selfInfo) === null || _u === void 0 ? void 0 : _u.permission) === null || _v === void 0 ? void 0 : _v.change_other_status)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserStatus, {
@@ -2113,65 +2175,6 @@ class Live extends Subscribe {
             Object.assign(window, { $liveController: this._controller, $live: this });
         }
     }
-    get options() {
-        return Object.freeze(this._options || {});
-    }
-    /**
-     * 带看状态
-     */
-    get state() {
-        return this._controller.state;
-    }
-    /**
-     * 兼容老逻辑
-     * @deprecated 请直接读取 state 属性字段，未来将移除该属性
-     */
-    get readyState() {
-        return this._controller.state;
-    }
-    /**
-     * 获取当前WebSocket连接的URL。(注意：这个是WebSocket连接的完整连接，附带一些query参数)。
-     * @deprecated 带看不需要关注底层ws的相关信息，未来将移除
-     */
-    get url() {
-        return this.options.url;
-    }
-    /**
-     * 获取当前live使用的RTC实例
-     */
-    get $RTC() {
-        return this._options.rtc;
-    }
-    /**
-     * 获取当前live使用的jsBridge实例
-     */
-    get jsBridge() {
-        return this._options.jsBridge;
-    }
-    /**
-     * 当前帧数据快照
-     */
-    get snapshot() {
-        return this._buildInData.keyframes;
-    }
-    /**
-     * 当前用户信息
-     */
-    get selfInfo() {
-        return this._buildInData.selfInfo;
-    }
-    /**
-     * 当前用户列表
-     */
-    get userList() {
-        return this._buildInData.userList || [];
-    }
-    /**
-     * 当前带看房间信息
-     */
-    get roomInfo() {
-        return this._buildInData.roomInfo;
-    }
     /**
      * 修改状态
      * @param evtType