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

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

@@ -48512,9 +48512,12 @@
           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');
@@ -49501,6 +49504,7 @@
               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', {
@@ -49522,6 +49526,16 @@
                   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事件
            */
@@ -50859,6 +50873,7 @@
       constructor(options) {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-call
           super();
+          this._readyState = exports.WebSocketState.NOTINITIALIZED;
           this._options = {
               timeout: 10000,
               shouldReconnect: (event, ws) => {
@@ -50875,6 +50890,43 @@
           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();
+          };
           /**
            * 清理连接中的请求
            */
@@ -50900,7 +50952,7 @@
           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');
           };
           /**
            * 解除网络监听事件
@@ -50976,6 +51028,7 @@
               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', {
@@ -50997,6 +51050,16 @@
                   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事件
            */
@@ -51020,6 +51083,7 @@
               const attempts = this._attempts;
               this._attempts = 0;
               this._reconnectWhenOnlineAgain = false;
+              this._startHealthCheck();
               return this.emit('open', Object.assign(event, { detail: { reconnects, attempts } }));
           };
           /**
@@ -51029,6 +51093,7 @@
            */
           this._webSocketCloseHandler = (event) => {
               this._reconnect(event);
+              this._stopHealthCheck();
               return this.emit('close', event);
           };
           /**
@@ -51050,6 +51115,7 @@
           if (options) {
               this.setOptions(options);
           }
+          this._startHealthCheck();
       }
       get attempts() {
           return this._attempts;
@@ -51110,6 +51176,7 @@
            */
           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);
@@ -51121,6 +51188,7 @@
            */
           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);
@@ -51135,12 +51203,20 @@
               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;
           };
           /**
@@ -51174,6 +51250,9 @@
           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);
+              }
           };
           /**
            * 处理超时
@@ -51314,6 +51393,10 @@
            * @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') {
@@ -51345,6 +51428,7 @@
                            */
                           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,