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

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

@@ -49452,7 +49452,12 @@
            * @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 代码
@@ -49496,6 +49501,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', {
@@ -49517,6 +49523,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事件
            */
@@ -50922,7 +50938,12 @@
            * @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 代码
@@ -50966,6 +50987,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', {
@@ -50987,6 +51009,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事件
            */
@@ -51164,6 +51196,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);
+              }
           };
           /**
            * 处理超时
@@ -51290,6 +51325,7 @@
           this._addLiveControllerEventListeners = () => {
               this._controller.on('stateChange', this._handleStateChange);
               this._controller.on('message', this._handleMessage);
+              this._controller.on('reconnected', this._handleReconnected);
           };
           /**
            * 移除带看控制的事件监听
@@ -51297,6 +51333,7 @@
           this._removeLiveControllerEventListeners = () => {
               this._controller.off('stateChange', this._handleStateChange);
               this._controller.off('message', this._handleMessage);
+              this._controller.off('reconnected', this._handleReconnected);
           };
           /**
            * 带看状态变化
@@ -51304,6 +51341,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') {
@@ -51335,6 +51376,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,
@@ -51446,6 +51488,32 @@
                   }
               }
           });
+          /**
+           * 处理重连
+           * @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('加入语音房间失败');
+                  }
+              }
+          });
           /**
            * 清理带看缓存的数据
            */
@@ -51458,12 +51526,12 @@
            * @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)) {
@@ -51505,11 +51573,11 @@
            * @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) {
@@ -51536,10 +51604,10 @@
           });
           // 仅用于用户自己的麦克风控制
           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,
@@ -51554,12 +51622,12 @@
            * @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, {
@@ -51573,12 +51641,12 @@
            * @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);
@@ -51589,12 +51657,12 @@
            * @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, {