@realsee/live 0.6.10 → 0.6.12

package/dist/index.es.js

@@ -619,7 +619,7 @@ class mr extends ue {
       timeout: 1e4,
       shouldReconnect: (e, i) => {
         if (!(e.code === 1008 || e.code === 1011))
-          return [1e3, 3e3, 6e3][i.attempts % 3];
+          return [0, 1e3, 2e3][i.attempts % 3];
       },
       should1000Reconnect: !1,
       ignoreConnectivityEvents: !1,
@@ -949,6 +949,12 @@ class vr extends ue {
       return this._ws.send(JSON.stringify(e));
     throw new Error("live has not yet been initialized!");
   }
+  /**
+   * 准备关闭带看
+   */
+  readyClose() {
+    this._ws && (this._ws._explicitlyClosed = !0);
+  }
 }
 const pr = (r) => Promise.reject("unimplemented method GetVoiceSign"), je = (r, s = {}, e = []) => ({
   command: r,
@@ -1039,19 +1045,12 @@ class yr extends ue {
           switch (g) {
             case K.SelfUserInfo: {
               const _ = v;
-              ot(this.selfInfo, _, { deep: !0 }) || (this._buildInData.selfInfo = _, this.emit(
-                "selfInfoUpdate",
-                this._buildInData.selfInfo,
-                E
-              ));
+              ot(this.selfInfo, _, { deep: !0 }) || (this._buildInData.selfInfo = _, this.emit("selfInfoUpdate", this._buildInData.selfInfo, E));
               break;
             }
             case K.RoomInfo: {
               const _ = v;
-              this._buildInData.roomInfo = Object.assign({}, _), this.emit(
-                "readyKeyframeSync",
-                _.last_frame || {}
-              );
+              this._buildInData.roomInfo = Object.assign({}, _), this.emit("readyKeyframeSync", _.last_frame || {});
               break;
             }
             case K.RTCInfo: {
@@ -1081,23 +1080,13 @@ class yr extends ue {
               break;
             }
             case K.KeyframeSync: {
-              const _ = v, V = Object.keys(
-                _
-              ).reduce(
+              const _ = v, V = Object.keys(_).reduce(
                 (C, k) => {
-                  if (ot(
-                    _[k],
-                    this._buildInData.keyframes[k],
-                    {
-                      deep: !0
-                    }
-                  ))
+                  if (ot(_[k], this._buildInData.keyframes[k], {
+                    deep: !0
+                  }))
                     return C;
-                  const U = [
-                    _[k],
-                    this._buildInData.keyframes[k],
-                    E
-                  ], P = k;
+                  const U = [_[k], this._buildInData.keyframes[k], E], P = k;
                   return this.keyframes.emit(
                     P,
                     ...U
@@ -1110,9 +1099,7 @@ class yr extends ue {
             }
             case K.BuiltinMsg: {
               const _ = v;
-              this.emit("builtinEvent", _), _.event_type === q.UserChange && this.emit("userChange", _), _.event_type === q.RoomChange && this.emit("roomChange", _), _.event_type === q.UserChange && _.action === H.UserMicroStatus && await this.toggleMicro(
-                _.data.status === Z.OPEN
-              ), _.event_type === q.RoomChange && _.action === H.RoomClose && await this.exit();
+              this.emit("builtinEvent", _), _.event_type === q.UserChange && this.emit("userChange", _), _.event_type === q.RoomChange && this.emit("roomChange", _), _.event_type === q.UserChange && _.action === H.UserMicroStatus && await this.toggleMicro(_.data.status === Z.OPEN), _.event_type === q.RoomChange && _.action === H.RoomClose && await this.exit();
               break;
             }
             case K.UserKickOut: {
@@ -1167,14 +1154,13 @@ class yr extends ue {
      */
     o(this, "exit", async () => {
       var e;
-      if (this._clearLiveData(), this.state !== x.OPEN)
-        return !0;
+      this._clearLiveData();
       try {
         await ((e = this.$RTC) == null ? void 0 : e.quit());
       } catch (i) {
         O.warn(i);
       }
-      return await this._controller.close();
+      return this.state !== x.OPEN ? !0 : await this._controller.close();
     });
     /**
      * 关闭带看房间
@@ -1182,11 +1168,9 @@ class yr extends ue {
      * @param reason
      * @returns
      */
-    o(this, "close", async () => await this.updateStatus(
-      q.RoomChange,
-      H.RoomClose,
-      {}
-    ));
+    o(this, "close", async () => {
+      await this._controller.readyClose(), await this.updateStatus(q.RoomChange, H.RoomClose, {});
+    });
     /**
      * 销毁带看
      * @returns
@@ -1197,11 +1181,7 @@ class yr extends ue {
      * @param userInfo
      * @returns
      */
-    o(this, "setSelfInfo", async (e) => await this.updateStatus(
-      q.UserChange,
-      H.UserInfo,
-      e
-    ));
+    o(this, "setSelfInfo", async (e) => await this.updateStatus(q.UserChange, H.UserInfo, e));
     // 仅用于用户自己的麦克风控制
     o(this, "toggleMicro", async (e) => {
       var n, c, u;
@@ -1265,10 +1245,7 @@ class yr extends ue {
         e
       );
     });
-    this._addLiveControllerEventListeners(), this._options = Object.assign(
-      { initialMicroStatus: Z.OPEN },
-      e
-    ), this._options.jsBridge = (() => {
+    this._addLiveControllerEventListeners(), this._options = Object.assign({ initialMicroStatus: Z.OPEN }, e), this._options.jsBridge = (() => {
       if (e.jsBridge)
         return e.jsBridge;
       if (e.useBuiltInJsBridge)
@@ -1277,18 +1254,14 @@ class yr extends ue {
       if (e.rtc)
         return e.rtc;
       if (e.rtcType)
-        switch (e.getVoiceSign || O.error(
-          "GetVoiceSign method must be passed when using built-in RTC instances"
-        ), e.rtcType) {
+        switch (e.getVoiceSign || O.error("GetVoiceSign method must be passed when using built-in RTC instances"), e.rtcType) {
           case Q.RealseeVRWebViewRTC: {
             if (this._options.jsBridge)
               return new nt({
                 jsBridge: this._options.jsBridge,
                 getVoiceSign: this._options.getVoiceSign
               });
-            O.error(
-              "JsBridge instance must be passed when using built-in VRWebViewRTC instances"
-            );
+            O.error("JsBridge instance must be passed when using built-in VRWebViewRTC instances");
             return;
           }
           case Q.RealseeBrowserChimeRTC:
@@ -1297,9 +1270,7 @@ class yr extends ue {
               logLevel: e.__debug__ ? st.DEBUG : st.INFO
             });
           case Q.RealseeBrowserRTC:
-            return this._options.autoPlayConfirm || O.error(
-              "autoPlayConfirm method must be passed when using built-in RealseeBrowserRTC instances"
-            ), new rt({
+            return this._options.autoPlayConfirm || O.error("autoPlayConfirm method must be passed when using built-in RealseeBrowserRTC instances"), new rt({
               getVoiceSign: this._options.getVoiceSign,
               autoPlayConfirm: this._options.autoPlayConfirm
             });
@@ -1309,9 +1280,7 @@ class yr extends ue {
           }
         }
       if (e.useBuiltInRTC) {
-        if (e.getVoiceSign || O.error(
-          "GetVoiceSign method must be passed when using built-in RTC instances"
-        ), this._options.jsBridge)
+        if (e.getVoiceSign || O.error("GetVoiceSign method must be passed when using built-in RTC instances"), this._options.jsBridge)
           return lr && (ar || cr) || ur ? new nt({
             jsBridge: this._options.jsBridge,
             getVoiceSign: this._options.getVoiceSign
@@ -1321,9 +1290,7 @@ class yr extends ue {
             getVoiceSign: this._options.getVoiceSign,
             autoPlayConfirm: this._options.autoPlayConfirm
           });
-        O.error(
-          "jsBridge instance must be passed when using built-in RTC instances"
-        );
+        O.error("jsBridge instance must be passed when using built-in RTC instances");
         return;
       }
     })(), this._options.rtc || O.warn("unused rtc"), this._options.url && this._options.getTicket && this.connect(), this._options.__debug__ && Object.assign(window, { $liveController: this._controller, $live: this });
@@ -1398,10 +1365,7 @@ class yr extends ue {
   async updateStatus(e, i, n, c) {
     if (this.state !== x.OPEN)
       return !1;
-    const u = Object.assign(
-      { event_type: e, action: i },
-      { data: n }
-    ), d = je(K.BuiltinMsg, u, c);
+    const u = Object.assign({ event_type: e, action: i }, { data: n }), d = je(K.BuiltinMsg, u, c);
     try {
       return this._controller.sendMessage(d), !0;
     } catch (g) {
@@ -1417,11 +1381,7 @@ class yr extends ue {
    */
   broadcast(e, i, n) {
     return this.state !== x.OPEN ? !1 : new Promise((c, u) => {
-      const d = je(
-        K.CustomEvent,
-        e,
-        i
-      ), g = d.front_request_id, v = n ? setTimeout(() => {
+      const d = je(K.CustomEvent, e, i), g = d.front_request_id, v = n ? setTimeout(() => {
         u(new Error("RESPONSE TIMEOUT")), this.off("broadcast", E);
       }, n) : void 0, E = (y, I) => {
         I === g && (v && clearTimeout(v), this.off("broadcast", E), c(y));