@realsee/live 0.5.0-alpha.2 → 0.5.0-alpha.5

package/dist/live/controller.d.ts

@@ -1,9 +1,11 @@
 import { LiveMsg } from '../typings';
 import { LiveState } from '../typings/live/LiveState';
+import { RobustWebSocketEventDetail } from '../utils/RobustWebSocket';
 import { Subscribe } from '../utils/subscribe';
 export declare type LiveControllerEventMap = {
     stateChange: (state: LiveState, prevState: LiveState) => void;
     message: (message: LiveMsg) => void;
+    reconnected: (detail: RobustWebSocketEventDetail) => void;
 };
 export declare class LiveController extends Subscribe<LiveControllerEventMap> {
     /**

package/dist/live/live.d.ts

@@ -1,12 +1,16 @@
 import { JSBridgeProtocol } from '@realsee/jsbridge-x';
 import { RTCProtocol } from '../rtc';
-import { EventType, KeyframeTypes, LiveOptions, RoomInfo, UserInfo, BuiltinEventType, BuiltinActionType, MicroStatus, LiveConnectOptions } from '../typings';
+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> = {
     selfInfo?: UserInfo;
     userList?: UserInfo[];
     roomInfo?: RoomInfo;
+    rtcInfo?: {
+        voiceId: string;
+        type: RTCType;
+    };
     keyframes: Partial<KeyframesSnapshot>;
 };
 export declare const _clearLiveInstanceIfNeed: () => void;
@@ -94,7 +98,16 @@ export declare class Live<KeyframesSnapshot extends Record<string, any>> extends
      * @returns
      */
     private _handleStateChange;
+    /**
+     * 消息接收
+     * @param liveMsg
+     */
     private _handleMessage;
+    /**
+     * 处理重连
+     * @param detail
+     */
+    private _handleReconnected;
     /**
      * 清理带看缓存的数据
      */

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

@@ -1238,7 +1238,12 @@ class RobustWebSocket extends Subscribe {
          * @param data
          * @returns
          */
-        this.send = (data) => { var _a; return (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.send(data); };
+        this.send = (data) => {
+            var _a, _b, _c;
+            if (((_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ((_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.OPEN)) {
+                (_c = this._realWebSocket) === null || _c === void 0 ? void 0 : _c.send(data);
+            }
+        };
         /**
          * 关闭连接
          * @param code 代码
@@ -1282,6 +1287,7 @@ class RobustWebSocket extends Subscribe {
             if (!newUrl)
                 return;
             this._pendingReconnect = undefined;
+            this._removeWebSocketEvent();
             this._realWebSocket = new WebSocket(newUrl, this._protocols || undefined);
             this._attempts = this._attempts + 1;
             this.emit('connecting', new CustomEvent('connecting', {
@@ -1303,6 +1309,16 @@ class RobustWebSocket extends Subscribe {
                 this._attachConnectivityEvents();
             }
         };
+        /**
+         * 断开ws事件
+         */
+        this._removeWebSocketEvent = () => {
+            var _a, _b, _c, _d;
+            (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.removeEventListener('open', this._webSocketOpenHandler);
+            (_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.removeEventListener('close', this._webSocketCloseHandler);
+            (_c = this._realWebSocket) === null || _c === void 0 ? void 0 : _c.removeEventListener('error', this._webSocketErrorHandler);
+            (_d = this._realWebSocket) === null || _d === void 0 ? void 0 : _d.removeEventListener('message', this._webSocketMessageHandler);
+        };
         /**
          * 分发ws事件
          */
@@ -1480,6 +1496,9 @@ class LiveController extends Subscribe {
         this._handleOpenEvent = (event) => {
             logger$1.info('live room open', event.detail);
             this.state = exports.LiveState.OPEN;
+            if (event.detail.reconnects > 0) {
+                this.emit('reconnected', event.detail);
+            }
         };
         /**
          * 处理超时
@@ -1606,6 +1625,7 @@ class Live extends Subscribe {
         this._addLiveControllerEventListeners = () => {
             this._controller.on('stateChange', this._handleStateChange);
             this._controller.on('message', this._handleMessage);
+            this._controller.on('reconnected', this._handleReconnected);
         };
         /**
          * 移除带看控制的事件监听
@@ -1613,6 +1633,7 @@ class Live extends Subscribe {
         this._removeLiveControllerEventListeners = () => {
             this._controller.off('stateChange', this._handleStateChange);
             this._controller.off('message', this._handleMessage);
+            this._controller.off('reconnected', this._handleReconnected);
         };
         /**
          * 带看状态变化
@@ -1620,6 +1641,10 @@ class Live extends Subscribe {
          * @returns
          */
         this._handleStateChange = (state, prevState) => this.emit('stateChange', state, prevState);
+        /**
+         * 消息接收
+         * @param liveMsg
+         */
         this._handleMessage = (liveMsg) => __awaiter(this, void 0, void 0, function* () {
             var _b, _c, _d, _e, _f, _g;
             if (typeof liveMsg === 'object') {
@@ -1651,6 +1676,7 @@ class Live extends Subscribe {
                          */
                         case exports.Command.RTCInfo: {
                             const { voice_id: voiceId, type } = data;
+                            this._buildInData.rtcInfo = { voiceId, type };
                             if (!((_b = this.$RTC) === null || _b === void 0 ? void 0 : _b.joined)) {
                                 const result = yield ((_c = this.$RTC) === null || _c === void 0 ? void 0 : _c.join({
                                     voiceId,
@@ -1762,6 +1788,32 @@ class Live extends Subscribe {
                 }
             }
         });
+        /**
+         * 处理重连
+         * @param detail
+         */
+        this._handleReconnected = (detail) => __awaiter(this, void 0, void 0, function* () {
+            var _h, _j, _k, _l, _m, _o, _p;
+            // 已经重连上ws，尝试重连语音
+            this.$RTC.joined = false;
+            const { rtcInfo } = this._buildInData;
+            if (rtcInfo) {
+                const { voiceId, type } = rtcInfo;
+                const result = yield ((_h = this.$RTC) === null || _h === void 0 ? void 0 : _h.join({
+                    voiceId,
+                    userId: ((_j = this.selfInfo) === null || _j === void 0 ? void 0 : _j.id) || '',
+                    roomId: (_k = this.roomInfo) === null || _k === void 0 ? void 0 : _k.info.room_code,
+                    type,
+                }));
+                if (result) {
+                    const status = (_o = (_m = (_l = this.selfInfo) === null || _l === void 0 ? void 0 : _l.micro_status) !== null && _m !== void 0 ? _m : this._options.initialMicroStatus) !== null && _o !== void 0 ? _o : exports.MicroStatus.OPEN;
+                    yield ((_p = this.$RTC) === null || _p === void 0 ? void 0 : _p.toggleMicro(status === exports.MicroStatus.OPEN));
+                }
+                else {
+                    logger$1.error('加入语音房间失败');
+                }
+            }
+        });
         /**
          * 清理带看缓存的数据
          */
@@ -1774,12 +1826,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.connect = (options = {}) => __awaiter(this, void 0, void 0, function* () {
-            var _h, _j, _k, _l;
+            var _q, _r, _s, _t;
             // 检查 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 = (_r = (_q = options.url) !== null && _q !== void 0 ? _q : this._options.url) !== null && _r !== void 0 ? _r : '';
+            this._options.getTicket = (_s = options.getTicket) !== null && _s !== void 0 ? _s : this._options.getTicket;
             this._options.initialMicroStatus =
-                (_l = options.rtcMicStatus) !== null && _l !== void 0 ? _l : this._options.initialMicroStatus;
+                (_t = options.rtcMicStatus) !== null && _t !== void 0 ? _t : this._options.initialMicroStatus;
             if (!/^ws(s):\/\//.test(this._options.url) ||
                 typeof this._options.getTicket !== 'function') {
                 if (!/^ws(s):\/\//.test(this._options.url)) {
@@ -1821,11 +1873,11 @@ class Live extends Subscribe {
          * @returns
          */
         this.exit = () => __awaiter(this, void 0, void 0, function* () {
-            var _m;
+            var _u;
             this._clearLiveData();
             try {
                 /** 退出强制关闭语音 */
-                (_m = this.$RTC) === null || _m === void 0 ? void 0 : _m.quit();
+                (_u = this.$RTC) === null || _u === void 0 ? void 0 : _u.quit();
                 yield this.updateStatus(exports.BuiltinEventType.RoomChange, exports.BuiltinActionType.RoomClose, {});
             }
             catch (e) {
@@ -1852,10 +1904,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 _v, _w, _x;
+            if (!((_w = (_v = this.selfInfo) === null || _v === void 0 ? void 0 : _v.permission) === null || _w === void 0 ? void 0 : _w.control_own_micro))
                 return false;
-            const result = yield ((_q = this.$RTC) === null || _q === void 0 ? void 0 : _q.toggleMicro(microStatus));
+            const result = yield ((_x = this.$RTC) === null || _x === void 0 ? void 0 : _x.toggleMicro(microStatus));
             if (result) {
                 yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
                     status: microStatus ? exports.MicroStatus.OPEN : exports.MicroStatus.CLOSE,
@@ -1870,12 +1922,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.forbidMicro = (microStatus, toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _r, _s;
+            var _y, _z;
             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 (!((_z = (_y = this.selfInfo) === null || _y === void 0 ? void 0 : _y.permission) === null || _z === void 0 ? void 0 : _z.control_other_micro)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
@@ -1889,12 +1941,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.forbidSync = (sync, toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _t, _u;
+            var _0, _1;
             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 (!((_1 = (_0 = this.selfInfo) === null || _0 === void 0 ? void 0 : _0.permission) === null || _1 === void 0 ? void 0 : _1.control_other_sync)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserPermission, { sync_frame: sync }, toUserIds);
@@ -1905,12 +1957,12 @@ class Live extends Subscribe {
          * @returns
          */
         this.kick = (toUserIds) => __awaiter(this, void 0, void 0, function* () {
-            var _v, _w;
+            var _2, _3;
             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 (!((_3 = (_2 = this.selfInfo) === null || _2 === void 0 ? void 0 : _2.permission) === null || _3 === void 0 ? void 0 : _3.change_other_status)) {
                 return false;
             }
             return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserStatus, {