@realsee/live 0.5.0-alpha.3 → 0.5.0-alpha.6

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> {
     /**
@@ -30,6 +32,10 @@ export declare class LiveController extends Subscribe<LiveControllerEventMap> {
      * @param event
      */
     private _handleCloseEvent;
+    /**
+     * 处理房间正在关闭事件（这个时候可能是断网了）
+     */
+    private _handleClosingEvent;
     /**
      * 连接中
      * @param event

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,6 +98,10 @@ export declare class Live<KeyframesSnapshot extends Record<string, any>> extends
      * @returns
      */
     private _handleStateChange;
+    /**
+     * 消息接收
+     * @param liveMsg
+     */
     private _handleMessage;
     /**
      * 清理带看缓存的数据

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

@@ -618,9 +618,12 @@ class VRWebViewRTC extends CoreRTC {
         this.micro = false;
         this.voiceId = '';
         this.options = { jsBridge, getVoiceSign };
-        this.jsBridge.callAndListen('live/userVolumes', (userVolumes) => {
-            this.emit('userVolumes', userVolumes);
-        });
+        // TO-DO: 在微信小程序下有个音量上报的BUG会导致消息体过大从而jsbridge异常断开
+        if (this.jsBridge.webViewType !== "WxMiniProgramWebView") {
+            this.jsBridge.callAndListen('live/userVolumes', (userVolumes) => {
+                this.emit('userVolumes', userVolumes);
+            });
+        }
         this.jsBridge.callAndListen('live/weakNetwork', (weakNetwork) => {
             if (weakNetwork)
                 this.emit('weakNetwork');
@@ -1170,6 +1173,7 @@ class RobustWebSocket extends Subscribe {
     constructor(options) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         super();
+        this._readyState = exports.WebSocketState.NOTINITIALIZED;
         this._options = {
             timeout: 10000,
             shouldReconnect: (event, ws) => {
@@ -1186,6 +1190,43 @@ class RobustWebSocket extends Subscribe {
         this._reconnectWhenOnlineAgain = false;
         this._explicitlyClosed = false;
         this._connectivityEventsAttached = false;
+        /**
+         * 做一个健康检查
+         */
+        this._healthCheck = () => __awaiter(this, void 0, void 0, function* () {
+            if (this._realWebSocket &&
+                this._realWebSocket.readyState !== this._readyState) {
+                this._readyState = this._realWebSocket.readyState;
+                // 太惨了，断网的时候，ws不会直接closed，而是处于closing的状态
+                if (this._readyState === exports.WebSocketState.CLOSING) {
+                    this.emit('closing');
+                }
+            }
+            yield new Promise((resolve) => setTimeout(resolve, 2000));
+            this._heathCheckTimer = requestAnimationFrame(this._healthCheck);
+        });
+        /**
+         * 清理健康检查
+         */
+        this._clearHeathCheckIfNeed = () => {
+            if (this._heathCheckTimer) {
+                cancelAnimationFrame(this._heathCheckTimer);
+                this._heathCheckTimer = undefined;
+            }
+        };
+        /**
+         * 开启健康检查
+         */
+        this._startHealthCheck = () => {
+            this._clearHeathCheckIfNeed();
+            this._heathCheckTimer = requestAnimationFrame(this._healthCheck);
+        };
+        /**
+         * 停止健康检查
+         */
+        this._stopHealthCheck = () => {
+            this._clearHeathCheckIfNeed();
+        };
         /**
          * 清理连接中的请求
          */
@@ -1211,7 +1252,7 @@ class RobustWebSocket extends Subscribe {
         this._offline = () => {
             var _a;
             this._reconnectWhenOnlineAgain = true;
-            (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.close(1000);
+            (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.close(1000, 'offline');
         };
         /**
          * 解除网络监听事件
@@ -1287,6 +1328,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', {
@@ -1308,6 +1350,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事件
          */
@@ -1331,6 +1383,7 @@ class RobustWebSocket extends Subscribe {
             const attempts = this._attempts;
             this._attempts = 0;
             this._reconnectWhenOnlineAgain = false;
+            this._startHealthCheck();
             return this.emit('open', Object.assign(event, { detail: { reconnects, attempts } }));
         };
         /**
@@ -1340,6 +1393,7 @@ class RobustWebSocket extends Subscribe {
          */
         this._webSocketCloseHandler = (event) => {
             this._reconnect(event);
+            this._stopHealthCheck();
             return this.emit('close', event);
         };
         /**
@@ -1361,6 +1415,7 @@ class RobustWebSocket extends Subscribe {
         if (options) {
             this.setOptions(options);
         }
+        this._startHealthCheck();
     }
     get attempts() {
         return this._attempts;
@@ -1421,6 +1476,7 @@ class LiveController extends Subscribe {
          */
         this._addWebSocketEventListeners = () => {
             this._ws.on('close', this._handleCloseEvent);
+            this._ws.on('closing', this._handleClosingEvent);
             this._ws.on('connecting', this._handleConnectingEvent);
             this._ws.on('error', this._handleErrorEvent);
             this._ws.on('message', this._handleMessageEvent);
@@ -1432,6 +1488,7 @@ class LiveController extends Subscribe {
          */
         this._removeWebSocketEventListeners = () => {
             this._ws.off('close', this._handleCloseEvent);
+            this._ws.off('closing', this._handleClosingEvent);
             this._ws.off('connecting', this._handleConnectingEvent);
             this._ws.off('error', this._handleErrorEvent);
             this._ws.off('message', this._handleMessageEvent);
@@ -1446,12 +1503,20 @@ class LiveController extends Subscribe {
             logger$1.info(`live room closed bacause of ${event.code}-${event.reason || parseWSClsErr(event.code)}`);
             this.state = exports.LiveState.CLOSED;
         };
+        /**
+         * 处理房间正在关闭事件（这个时候可能是断网了）
+         */
+        this._handleClosingEvent = () => {
+            var _a;
+            logger$1.info(`live room is closing, onLine:`, (_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.navigator) === null || _a === void 0 ? void 0 : _a.onLine);
+            this.state = exports.LiveState.CLOSED;
+        };
         /**
          * 连接中
          * @param event
          */
-        this._handleConnectingEvent = (event) => {
-            logger$1.info(`live room is connecting`, event.detail);
+        this._handleConnectingEvent = () => {
+            logger$1.info(`live room is connecting`);
             this.state = exports.LiveState.CONNECTING;
         };
         /**
@@ -1485,6 +1550,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);
+            }
         };
         /**
          * 处理超时
@@ -1625,6 +1693,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') {
@@ -1656,6 +1728,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,