@realsee/live 0.5.0-alpha.1 → 0.5.0-alpha.12

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() {
@@ -48689,6 +48704,23 @@
       }
   }
 
+  exports.LiveState = void 0;
+  (function (LiveState) {
+      LiveState[LiveState["NOTINITIALIZED"] = -1] = "NOTINITIALIZED";
+      /**
+       * 正在链接中
+       */
+      LiveState[LiveState["CONNECTING"] = 0] = "CONNECTING";
+      /**
+       * 已经链接并且可以通讯
+       */
+      LiveState[LiveState["OPEN"] = 1] = "OPEN";
+      /**
+       * 连接已关闭或者链接失败
+       */
+      LiveState[LiveState["CLOSED"] = 3] = "CLOSED";
+  })(exports.LiveState || (exports.LiveState = {}));
+
   /**
    * 用户当前状态枚举。
    */
@@ -49435,7 +49467,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 代码
@@ -49479,6 +49516,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', {
@@ -49500,6 +49538,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事件
            */
@@ -50636,23 +50684,6 @@
       }
   }
 
-  var LiveState;
-  (function (LiveState) {
-      LiveState[LiveState["NOTINITIALIZED"] = -1] = "NOTINITIALIZED";
-      /**
-       * 正在链接中
-       */
-      LiveState[LiveState["CONNECTING"] = 0] = "CONNECTING";
-      /**
-       * 已经链接并且可以通讯
-       */
-      LiveState[LiveState["OPEN"] = 1] = "OPEN";
-      /**
-       * 连接已关闭或者链接失败
-       */
-      LiveState[LiveState["CLOSED"] = 3] = "CLOSED";
-  })(LiveState || (LiveState = {}));
-
   function appendUri(uri, query) {
       const hasQuery = uri.indexOf('?') !== -1;
       const newQuery = Object.keys(query).reduce((accu, curr, idx) => `${accu}${(idx === 0 && !hasQuery) ? '?' : '&'}${curr}=${query[curr]}`, '');
@@ -50854,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) => {
@@ -50870,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();
+          };
           /**
            * 清理连接中的请求
            */
@@ -50895,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');
           };
           /**
            * 解除网络监听事件
@@ -50922,7 +50991,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 +51040,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 +51062,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事件
            */
@@ -51010,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 } }));
           };
           /**
@@ -51019,6 +51105,7 @@
            */
           this._webSocketCloseHandler = (event) => {
               this._reconnect(event);
+              this._stopHealthCheck();
               return this.emit('close', event);
           };
           /**
@@ -51040,6 +51127,7 @@
           if (options) {
               this.setOptions(options);
           }
+          this._startHealthCheck();
       }
       get attempts() {
           return this._attempts;
@@ -51090,16 +51178,20 @@
           /**
            * ws代理器
            */
-          this._ws = new RobustWebSocket();
+          this._ws = new RobustWebSocket({
+              url: '',
+              robustOptions: { timeout: 180000 },
+          });
           /**
            * 带看连接状态
            */
-          this._state = LiveState.NOTINITIALIZED;
+          this._state = exports.LiveState.NOTINITIALIZED;
           /**
            * 添加事件监听
            */
           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);
@@ -51111,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);
@@ -51123,15 +51216,23 @@
            */
           this._handleCloseEvent = (event) => {
               logger$1.info(`live room closed bacause of ${event.code}-${event.reason || parseWSClsErr(event.code)}`);
-              this.state = LiveState.CLOSED;
+              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.state = LiveState.CONNECTING;
+          this._handleConnectingEvent = () => {
+              logger$1.info(`live room is connecting`);
+              this.state = exports.LiveState.CONNECTING;
           };
           /**
            * 连接发送异常
@@ -51139,7 +51240,7 @@
            */
           this._handleErrorEvent = (event) => {
               logger$1.error(`live room error`, event);
-              this.state = LiveState.CLOSED;
+              this.state = exports.LiveState.CLOSED;
           };
           /**
            * 接收到消息
@@ -51163,7 +51264,10 @@
            */
           this._handleOpenEvent = (event) => {
               logger$1.info('live room open', event.detail);
-              this.state = LiveState.OPEN;
+              this.state = exports.LiveState.OPEN;
+              if (event.detail.reconnects > 0) {
+                  this.emit('reconnected', event.detail);
+              }
           };
           /**
            * 处理超时
@@ -51171,7 +51275,7 @@
            */
           this._handleTimeoutEvent = (event) => {
               logger$1.error('live room connect timeout!', event.detail);
-              this.state = LiveState.CLOSED;
+              this.state = exports.LiveState.CLOSED;
           };
           /**
            * 释放资源，释放之后需要重新实例化
@@ -51214,7 +51318,7 @@
           if (data === undefined || data === null || data === '') {
               throw new Error('live message is empty!');
           }
-          if (this.state === LiveState.OPEN) {
+          if (this.state === exports.LiveState.OPEN) {
               return this._ws.send(JSON.stringify(data));
           }
           else {
@@ -51267,7 +51371,7 @@
            * @returns
            */
           this.sendKeyframe = (key, frame) => {
-              if (this.state !== LiveState.OPEN)
+              if (this.state !== exports.LiveState.OPEN)
                   return false;
               this._buildInData.keyframes = Object.assign(Object.assign({}, this._buildInData.keyframes), { [key]: frame });
               const liveMsg = createLiveMsg(exports.Command.KeyframeSync, this.snapshot);
@@ -51304,6 +51408,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 +51443,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,
@@ -51475,10 +51584,17 @@
                   return false;
               }
               const { force = false } = options;
+              // 检测一下麦克风权限，hack
+              if (this._options.rtc && this._options.jsBridge) {
+                  const res = yield this._options.jsBridge.detectMicro();
+                  if (!res) {
+                      return new Error('Failed to obtain microphone authorization');
+                  }
+              }
               // 检查是否已有实例在使用
               const currentState = this.state;
-              if (currentState === LiveState.CONNECTING ||
-                  currentState === LiveState.OPEN) {
+              if (currentState === exports.LiveState.CONNECTING ||
+                  currentState === exports.LiveState.OPEN) {
                   if (force) {
                       try {
                           yield this._controller.close('force close by connect');
@@ -51764,7 +51880,7 @@
        */
       updateStatus(evtType, atnType, status, toUserIds) {
           return __awaiter$$(this, void 0, void 0, function* () {
-              if (this.state !== LiveState.OPEN)
+              if (this.state !== exports.LiveState.OPEN)
                   return false;
               const data = Object.assign({ event_type: evtType, action: atnType }, { data: status });
               const liveMsg = createLiveMsg(exports.Command.BuiltinMsg, data, toUserIds);
@@ -51786,7 +51902,7 @@
        * @returns
        */
       broadcast(request, toUserIds, timeout) {
-          if (this.state !== LiveState.OPEN)
+          if (this.state !== exports.LiveState.OPEN)
               return false;
           return new Promise((resolve, reject) => {
               const customEvent = createLiveMsg(exports.Command.CustomEvent, request, toUserIds);
@@ -54276,21 +54392,21 @@
        * @deprecated
        * @returns
        */
-      const unsafe__useLiveInstance = react.useCallback(() => useLiveInstance(), [useLiveInstance]);
+      const unsafe__useLiveInstance = () => useLiveInstance();
       /**
        * 使用rtc实例
        */
-      const useRTCInstance = react.useCallback(() => useLiveInstance().$RTC, [useLiveInstance]);
+      const useRTCInstance = () => useLiveInstance().$RTC;
       /**
        * 不建议这样使用
        * @deprecated
        * @returns
        */
-      const unsafe__useRTCInstance = react.useCallback(() => useRTCInstance(), [useRTCInstance]);
+      const unsafe__useRTCInstance = () => useRTCInstance();
       /**
        * 带看连接操作
        */
-      const useConnect = react.useCallback((options) => __awaiter$$(this, void 0, void 0, function* () { return yield useLiveInstance().connect(options); }), []);
+      const useConnect = () => (options) => __awaiter$$(this, void 0, void 0, function* () { return yield useLiveInstance().connect(options); });
       /**
        *
        * @param name
@@ -54314,17 +54430,17 @@
        */
       function useLiveAction() {
           const live = useLiveInstance();
-          const connect = React.useCallback((options) => __awaiter$$(this, void 0, void 0, function* () { return yield live.connect(options); }), [live]);
-          const toggleMicro = React.useCallback((microStatus) => live.toggleMicro(microStatus), [live]);
-          const broadcast = React.useCallback((data, toUserIds, timeout = 0) => __awaiter$$(this, void 0, void 0, function* () { return yield live.broadcast(data, toUserIds, timeout); }), [live]);
-          const exit = React.useCallback(() => __awaiter$$(this, void 0, void 0, function* () { return yield live.exit(); }), [live]);
-          const kick = React.useCallback((toUserIds) => __awaiter$$(this, void 0, void 0, function* () { return yield live.kick(toUserIds); }), [live]);
-          const forbidMicro = React.useCallback((micro, toUserIds = []) => __awaiter$$(this, void 0, void 0, function* () { return yield live.forbidMicro(micro, toUserIds); }), [live]);
-          const forbidSync = React.useCallback((sync, toUserIds = []) => live.forbidSync(sync, toUserIds), [live]);
-          const getFramesByKey = React.useCallback((key) => live.getFramesByKey(key), [live]);
-          const sendKeyframe = React.useCallback((key, frame) => live.sendKeyframe(key, frame), [live]);
-          const setSelfInfo = React.useCallback((userInfo) => live.setSelfInfo(userInfo), [live]);
-          const updateStatus = React.useCallback((evtType, atnType, status, toUserIds) => live.updateStatus(evtType, atnType, status, toUserIds), [live]);
+          const connect = (options) => __awaiter$$(this, void 0, void 0, function* () { return yield live.connect(options); });
+          const toggleMicro = (microStatus) => live.toggleMicro(microStatus);
+          const broadcast = (data, toUserIds, timeout = 0) => __awaiter$$(this, void 0, void 0, function* () { return yield live.broadcast(data, toUserIds, timeout); });
+          const exit = () => __awaiter$$(this, void 0, void 0, function* () { return yield live.exit(); });
+          const kick = (toUserIds) => __awaiter$$(this, void 0, void 0, function* () { return yield live.kick(toUserIds); });
+          const forbidMicro = (micro, toUserIds = []) => __awaiter$$(this, void 0, void 0, function* () { return yield live.forbidMicro(micro, toUserIds); });
+          const forbidSync = (sync, toUserIds = []) => live.forbidSync(sync, toUserIds);
+          const getFramesByKey = (key) => live.getFramesByKey(key);
+          const sendKeyframe = (key, frame) => live.sendKeyframe(key, frame);
+          const setSelfInfo = (userInfo) => live.setSelfInfo(userInfo);
+          const updateStatus = (evtType, atnType, status, toUserIds) => live.updateStatus(evtType, atnType, status, toUserIds);
           return {
               connect,
               broadcast,
@@ -54378,11 +54494,11 @@
       }
       function useRTCAction() {
           const live = useLiveInstance();
-          const join = React.useCallback((options) => live.$RTC.join(options), [live]);
-          const quit = React.useCallback(() => live.$RTC.quit(), [live]);
-          const shock = React.useCallback(() => { var _a, _b; return (_b = (_a = live.$RTC).shock) === null || _b === void 0 ? void 0 : _b.call(_a); }, [live]);
-          const toggleMicro = React.useCallback((flag) => live.$RTC.toggleMicro(flag), [live]);
-          const detectMicro = React.useCallback(() => live.$RTC.detectMicro(), [live]);
+          const join = (options) => live.$RTC.join(options);
+          const quit = () => live.$RTC.quit();
+          const shock = () => { var _a, _b; return (_b = (_a = live.$RTC).shock) === null || _b === void 0 ? void 0 : _b.call(_a); };
+          const toggleMicro = (flag) => live.$RTC.toggleMicro(flag);
+          const detectMicro = () => live.$RTC.detectMicro();
           return {
               join,
               quit,