@realsee/live 0.6.8-dev.5 → 0.6.8-dev.6

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 [0, 3e3, 1e4][i.attempts % 3];
+          return [1e3, 3e3, 6e3][i.attempts % 3];
       },
       should1000Reconnect: !1,
       ignoreConnectivityEvents: !1,
@@ -653,6 +653,12 @@ class mr extends ue {
     o(this, "_healthCheck", async () => {
       this._realWebSocket && this._realWebSocket.readyState !== this._readyState && (this._readyState = this._realWebSocket.readyState, this._readyState === Le.CLOSING && this.emit("closing")), await new Promise((e) => setTimeout(e, 2e3)), this._heathCheckTimer = requestAnimationFrame(this._healthCheck);
     });
+    /**
+     * 清理超时计时器
+     */
+    o(this, "_clearConnectTimeoutIfNeed", () => {
+      this._connectTimeout && (clearTimeout(this._connectTimeout), this._connectTimeout = void 0);
+    });
     /**
      * 清理健康检查
      */
@@ -737,7 +743,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._pendingReconnect = void 0, this._removeWebSocketEvent(), this._realWebSocket = new WebSocket(e, this._protocols || void 0), this._attempts = this._attempts + 1, this.emit(
+      this._clearConnectTimeoutIfNeed(), this._clearPendingReconnectIfNeeded(), 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 }
@@ -761,29 +767,14 @@ 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连接事件
@@ -792,10 +783,7 @@ class mr extends ue {
     o(this, "_webSocketOpenHandler", (e) => {
       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 关闭事件
@@ -808,10 +796,7 @@ 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
@@ -829,9 +814,7 @@ 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."