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

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');
@@ -48525,25 +48528,37 @@
       }
       join(options) {
           return __awaiter$$(this, void 0, void 0, function* () {
-              this.emit('joinWillStart');
-              const { sdkAppId, userId, userSig } = yield this.options.getVoiceSign(options);
-              this.type = options.type;
-              const [res, error] = yield this.jsBridge.callAndBackfeed(`live/join?sdkAppID=${sdkAppId}&userID=${userId}&roomID=${Number(options.voiceId)}&userSig=${userSig}`);
-              if (!res) {
-                  this.emit('error', error ? error : new Error('加入房间失败：未知异常。'));
-                  this.joined = false;
-              }
-              else {
-                  if (res.code === exports.RTCJoinedInfoCodeEnum.Success) {
-                      this.emit('joined');
-                      this.joined = true;
+              try {
+                  this.emit('joinWillStart');
+                  const { sdkAppId, userId, userSig } = yield this.options.getVoiceSign(options);
+                  if (!(Boolean(sdkAppId) && Boolean(userId) && Boolean(userSig))) {
+                      this.emit('error', new Error('加入房间失败：rtc 签名请求异常'));
+                      this.joined = false;
+                      return this.joined;
                   }
-                  else {
-                      this.emit('error', res);
+                  this.type = options.type;
+                  const [res, error] = yield this.jsBridge.callAndBackfeed(`live/join?sdkAppID=${sdkAppId}&userID=${userId}&roomID=${Number(options.voiceId)}&userSig=${userSig}`);
+                  if (!res) {
+                      this.emit('error', error ? error : new Error('加入房间失败：未知异常。'));
                       this.joined = false;
                   }
+                  else {
+                      if (res.code === exports.RTCJoinedInfoCodeEnum.Success) {
+                          this.emit('joined');
+                          this.joined = true;
+                      }
+                      else {
+                          this.emit('error', res);
+                          this.joined = false;
+                      }
+                  }
+                  return this.joined;
+              }
+              catch (e) {
+                  this.emit('error', new Error('加入房间失败：' + e.message));
+                  this.joined = false;
+                  return this.joined;
               }
-              return this.joined;
           });
       }
       quit() {
@@ -50870,6 +50885,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) => {
@@ -50886,6 +50902,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();
+          };
           /**
            * 清理连接中的请求
            */
@@ -50911,7 +50964,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');
           };
           /**
            * 解除网络监听事件
@@ -51042,6 +51095,7 @@
               const attempts = this._attempts;
               this._attempts = 0;
               this._reconnectWhenOnlineAgain = false;
+              this._startHealthCheck();
               return this.emit('open', Object.assign(event, { detail: { reconnects, attempts } }));
           };
           /**
@@ -51051,6 +51105,7 @@
            */
           this._webSocketCloseHandler = (event) => {
               this._reconnect(event);
+              this._stopHealthCheck();
               return this.emit('close', event);
           };
           /**
@@ -51072,6 +51127,7 @@
           if (options) {
               this.setOptions(options);
           }
+          this._startHealthCheck();
       }
       get attempts() {
           return this._attempts;
@@ -51122,7 +51178,10 @@
           /**
            * ws代理器
            */
-          this._ws = new RobustWebSocket();
+          this._ws = new RobustWebSocket({
+              url: '',
+              robustOptions: { timeout: 180000 },
+          });
           /**
            * 带看连接状态
            */
@@ -51132,6 +51191,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);
@@ -51143,6 +51203,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);
@@ -51157,12 +51218,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;
           };
           /**
@@ -51325,7 +51394,6 @@
           this._addLiveControllerEventListeners = () => {
               this._controller.on('stateChange', this._handleStateChange);
               this._controller.on('message', this._handleMessage);
-              this._controller.on('reconnected', this._handleReconnected);
           };
           /**
            * 移除带看控制的事件监听
@@ -51333,7 +51401,6 @@
           this._removeLiveControllerEventListeners = () => {
               this._controller.off('stateChange', this._handleStateChange);
               this._controller.off('message', this._handleMessage);
-              this._controller.off('reconnected', this._handleReconnected);
           };
           /**
            * 带看状态变化
@@ -51488,32 +51555,6 @@
                   }
               }
           });
-          /**
-           * 处理重连
-           * @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('加入语音房间失败');
-                  }
-              }
-          });
           /**
            * 清理带看缓存的数据
            */
@@ -51526,12 +51567,12 @@
            * @returns
            */
           this.connect = (options = {}) => __awaiter$$(this, void 0, void 0, function* () {
-              var _q, _r, _s, _t;
+              var _h, _j, _k, _l;
               // 检查 url 和 票据获取接口实现
-              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.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.initialMicroStatus =
-                  (_t = options.rtcMicStatus) !== null && _t !== void 0 ? _t : this._options.initialMicroStatus;
+                  (_l = options.rtcMicStatus) !== null && _l !== void 0 ? _l : this._options.initialMicroStatus;
               if (!/^ws(s):\/\//.test(this._options.url) ||
                   typeof this._options.getTicket !== 'function') {
                   if (!/^ws(s):\/\//.test(this._options.url)) {
@@ -51573,11 +51614,11 @@
            * @returns
            */
           this.exit = () => __awaiter$$(this, void 0, void 0, function* () {
-              var _u;
+              var _m;
               this._clearLiveData();
               try {
                   /** 退出强制关闭语音 */
-                  (_u = this.$RTC) === null || _u === void 0 ? void 0 : _u.quit();
+                  (_m = this.$RTC) === null || _m === void 0 ? void 0 : _m.quit();
                   yield this.updateStatus(exports.BuiltinEventType.RoomChange, exports.BuiltinActionType.RoomClose, {});
               }
               catch (e) {
@@ -51604,10 +51645,10 @@
           });
           // 仅用于用户自己的麦克风控制
           this.toggleMicro = (microStatus) => __awaiter$$(this, void 0, void 0, function* () {
-              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))
+              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))
                   return false;
-              const result = yield ((_x = this.$RTC) === null || _x === void 0 ? void 0 : _x.toggleMicro(microStatus));
+              const result = yield ((_q = this.$RTC) === null || _q === void 0 ? void 0 : _q.toggleMicro(microStatus));
               if (result) {
                   yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
                       status: microStatus ? exports.MicroStatus.OPEN : exports.MicroStatus.CLOSE,
@@ -51622,12 +51663,12 @@
            * @returns
            */
           this.forbidMicro = (microStatus, toUserIds) => __awaiter$$(this, void 0, void 0, function* () {
-              var _y, _z;
+              var _r, _s;
               if (typeof this._options.canForbidUserMicro === 'function' &&
                   !this._options.canForbidUserMicro(toUserIds)) {
                   return false;
               }
-              if (!((_z = (_y = this.selfInfo) === null || _y === void 0 ? void 0 : _y.permission) === null || _z === void 0 ? void 0 : _z.control_other_micro)) {
+              if (!((_s = (_r = this.selfInfo) === null || _r === void 0 ? void 0 : _r.permission) === null || _s === void 0 ? void 0 : _s.control_other_micro)) {
                   return false;
               }
               return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserMicroStatus, {
@@ -51641,12 +51682,12 @@
            * @returns
            */
           this.forbidSync = (sync, toUserIds) => __awaiter$$(this, void 0, void 0, function* () {
-              var _0, _1;
+              var _t, _u;
               if (typeof this._options.canForbidUserSync === 'function' &&
                   !this._options.canForbidUserSync(toUserIds)) {
                   return false;
               }
-              if (!((_1 = (_0 = this.selfInfo) === null || _0 === void 0 ? void 0 : _0.permission) === null || _1 === void 0 ? void 0 : _1.control_other_sync)) {
+              if (!((_u = (_t = this.selfInfo) === null || _t === void 0 ? void 0 : _t.permission) === null || _u === void 0 ? void 0 : _u.control_other_sync)) {
                   return false;
               }
               return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserPermission, { sync_frame: sync }, toUserIds);
@@ -51657,12 +51698,12 @@
            * @returns
            */
           this.kick = (toUserIds) => __awaiter$$(this, void 0, void 0, function* () {
-              var _2, _3;
+              var _v, _w;
               if (typeof this._options.canForbidUserKick === 'function' &&
                   !this._options.canForbidUserKick(toUserIds)) {
                   return false;
               }
-              if (!((_3 = (_2 = this.selfInfo) === null || _2 === void 0 ? void 0 : _2.permission) === null || _3 === void 0 ? void 0 : _3.change_other_status)) {
+              if (!((_w = (_v = this.selfInfo) === null || _v === void 0 ? void 0 : _v.permission) === null || _w === void 0 ? void 0 : _w.change_other_status)) {
                   return false;
               }
               return yield this.updateStatus(exports.BuiltinEventType.UserChange, exports.BuiltinActionType.UserStatus, {