@realsee/live 0.6.8-dev.1 → 0.6.8-dev.3

package/dist/index.es.js

@@ -633,7 +633,7 @@ class mr extends ue {
       timeout: 1e4,
       shouldReconnect: (e, i) => {
         if (!(e.code === 1008 || e.code === 1011))
-          return [3e3, 6e3, 1e4][i.attempts % 3];
+          return [0, 3e3, 1e4][i.attempts % 3];
       },
       should1000Reconnect: !1,
       ignoreConnectivityEvents: !1,
@@ -737,7 +737,7 @@ class mr extends ue {
       const e = typeof this._url == "string" ? this._url : (n = this._url) == null ? void 0 : n.call(this, this);
       if (!e)
         return;
-      this._clearPendingReconnectIfNeeded(), this._removeWebSocketEvent(), this._realWebSocket = new WebSocket(e, this._protocols || void 0), this._attempts = this._attempts + 1, this.emit(
+      this._pendingReconnect = void 0, this._removeWebSocketEvent(), this._realWebSocket = new WebSocket(e, this._protocols || void 0), this._attempts = this._attempts + 1, this.emit(
         "connecting",
         new CustomEvent("connecting", {
           detail: { attempts: this._attempts, reconnects: this._reconnects }
@@ -746,13 +746,13 @@ class mr extends ue {
       const i = () => {
         this._connectTimeout = void 0, this._detachConnectivityEvents(), this.emit(
           "timeout",
-          new CustomEvent("timeout", {
+          new CustomEvent("connecting", {
             detail: {
               attempts: this._attempts,
               reconnects: this._reconnects
             }
           })
-        ), this.open(this._url);
+        );
       };
       this._connectTimeout = setTimeout(i, (c = this._options) == null ? void 0 : c.timeout), this._dispatchWebSocketEvent(), (u = this._options) != null && u.ignoreConnectivityEvents || this._attachConnectivityEvents();
     });
@@ -761,23 +761,41 @@ class mr extends ue {
      */
     o(this, "_removeWebSocketEvent", () => {
       var e, i, n, c;
-      (e = this._realWebSocket) == null || e.removeEventListener("open", this._webSocketOpenHandler), (i = this._realWebSocket) == null || i.removeEventListener("close", this._webSocketCloseHandler), (n = this._realWebSocket) == null || n.removeEventListener("error", this._webSocketErrorHandler), (c = this._realWebSocket) == null || c.removeEventListener("message", this._webSocketMessageHandler);
+      (e = this._realWebSocket) == null || e.removeEventListener(
+        "open",
+        this._webSocketOpenHandler
+      ), (i = this._realWebSocket) == null || i.removeEventListener(
+        "close",
+        this._webSocketCloseHandler
+      ), (n = this._realWebSocket) == null || n.removeEventListener(
+        "error",
+        this._webSocketErrorHandler
+      ), (c = this._realWebSocket) == null || c.removeEventListener(
+        "message",
+        this._webSocketMessageHandler
+      );
     });
     /**
      * 分发ws事件
      */
     o(this, "_dispatchWebSocketEvent", () => {
       var e, i, n, c;
-      (e = this._realWebSocket) == null || e.addEventListener("open", this._webSocketOpenHandler), (i = this._realWebSocket) == null || i.addEventListener("close", this._webSocketCloseHandler), (n = this._realWebSocket) == null || n.addEventListener("error", this._webSocketErrorHandler), (c = this._realWebSocket) == null || c.addEventListener("message", this._webSocketMessageHandler);
+      (e = this._realWebSocket) == null || e.addEventListener("open", this._webSocketOpenHandler), (i = this._realWebSocket) == null || i.addEventListener("close", this._webSocketCloseHandler), (n = this._realWebSocket) == null || n.addEventListener("error", this._webSocketErrorHandler), (c = this._realWebSocket) == null || c.addEventListener(
+        "message",
+        this._webSocketMessageHandler
+      );
     });
     /**
      * ws连接事件
      * @returns
      */
     o(this, "_webSocketOpenHandler", (e) => {
-      this._clearPendingReconnectIfNeeded(), this._connectTimeout && (clearTimeout(this._connectTimeout), this._connectTimeout = void 0);
+      this._connectTimeout && (clearTimeout(this._connectTimeout), this._connectTimeout = void 0);
       const i = ++this._reconnects, n = this._attempts;
-      return this._attempts = 0, this._reconnectWhenOnlineAgain = !1, this._startHealthCheck(), this.emit("open", Object.assign(e, { detail: { reconnects: i, attempts: n } }));
+      return this._attempts = 0, this._reconnectWhenOnlineAgain = !1, this._startHealthCheck(), this.emit(
+        "open",
+        Object.assign(e, { detail: { reconnects: i, attempts: n } })
+      );
     });
     /**
      * ws 关闭事件
@@ -790,7 +808,10 @@ class mr extends ue {
      * @param event
      * @returns
      */
-    o(this, "_webSocketErrorHandler", (e) => this.emit("error", new CustomEvent("error", { detail: { error: e } })));
+    o(this, "_webSocketErrorHandler", (e) => this.emit(
+      "error",
+      new CustomEvent("error", { detail: { error: e } })
+    ));
     /**
      * ws消息
      * @param event
@@ -808,7 +829,9 @@ class mr extends ue {
     this._url = e.url, this._protocols = e.protocols;
     const i = Object.assign(this._options, e.robustOptions || {});
     if (typeof (i == null ? void 0 : i.timeout) != "number")
-      throw new Error("timeout must be the number of milliseconds to timeout a connection attempt");
+      throw new Error(
+        "timeout must be the number of milliseconds to timeout a connection attempt"
+      );
     if (typeof (i == null ? void 0 : i.shouldReconnect) != "function")
       throw new Error(
         "shouldReconnect must be a function that returns the number of milliseconds to wait for a reconnect attempt, or null or undefined to not reconnect."
@@ -841,7 +864,8 @@ class vr extends ue {
      * ws代理器
      */
     o(this, "_ws", new mr({
-      url: ""
+      url: "",
+      robustOptions: { timeout: 1e4, should1000Reconnect: !0 }
     }));
     /**
      * 带看连接状态
@@ -864,7 +888,9 @@ class vr extends ue {
      * @param event
      */
     o(this, "_handleCloseEvent", (e) => {
-      O.info(`live room closed bacause of ${e.code}-${e.reason || nr(e.code)}`), this.state = x.CLOSED;
+      O.info(
+        `live room closed bacause of ${e.code}-${e.reason || nr(e.code)}`
+      ), this.state = x.CLOSED;
     });
     /**
      * 处理房间正在关闭事件（这个时候可能是断网了）