@das-fed/upf-utils 6.4.0-dev.290 → 6.4.0-dev.292

package/realtime-connection/index.js

@@ -1,15 +1,15 @@
-import { getConfig as c } from "@das-fed/upf-utils/config";
-import { objectToUrlparams as h } from "@das-fed/upf-utils/common-tools";
-const l = 3e3, u = 3e4, m = () => {
-  const i = c(), t = i.wsBaseURL || i.baseURL || location.origin;
-  return String(t || "").replace(/^https:/i, "wss:").replace(/^http:/i, "ws:").replace(/\/+$/, "");
-}, d = (i) => /^wss?:\/\//i.test(i), f = (i) => /^https?:\/\//i.test(i), p = (i, t) => {
-  const e = String(i || "").trim(), s = d(e) ? e : f(e) ? e.replace(/^https:/i, "wss:").replace(/^http:/i, "ws:") : `${m()}${e.startsWith("/") ? e : `/${e}`}`, r = h(t);
-  return r ? `${s}${s.includes("?") ? "&" : "?"}${r}` : s;
-}, T = (i, t) => t ? (Array.isArray(t) ? t : [t]).includes(String(i ?? "")) : !1, b = (i) => typeof i.data == "string" ? JSON.parse(i.data) : i.data;
-class S {
-  constructor(t) {
-    this.ws = null, this.state = "idle", this.heartbeatTimer = null, this.heartbeatTimeoutTimer = null, this.reconnectTimer = null, this.reconnectAttempts = 0, this.manualClosed = !1, this.started = !1, this.lastHeartbeatAck = !0, this.options = t, this.handleOnline = this.handleOnline.bind(this), this.handleOffline = this.handleOffline.bind(this);
+import { getConfig as l } from "@das-fed/upf-utils/config";
+import { objectToUrlparams as u } from "@das-fed/upf-utils/common-tools";
+const m = 3e3, d = 3e4, f = 2147483647, p = () => {
+  const n = l(), e = n.wsBaseURL || n.baseURL || location.origin;
+  return String(e || "").replace(/^https:/i, "wss:").replace(/^http:/i, "ws:").replace(/\/+$/, "");
+}, T = (n) => /^wss?:\/\//i.test(n), S = (n) => /^https?:\/\//i.test(n), g = (n, e) => {
+  const t = String(n || "").trim(), s = T(t) ? t : S(t) ? t.replace(/^https:/i, "wss:").replace(/^http:/i, "ws:") : `${p()}${t.startsWith("/") ? t : `/${t}`}`, i = u(e);
+  return i ? `${s}${s.includes("?") ? "&" : "?"}${i}` : s;
+}, b = (n, e) => e ? (Array.isArray(e) ? e : [e]).includes(String(n ?? "")) : !1, w = (n) => (Array.isArray(n) || typeof n == "string") && n.length > 0, c = (n) => Number.isFinite(n) && n >= 1 && n <= f, k = (n) => typeof n.data == "string" ? JSON.parse(n.data) : n.data;
+class y {
+  constructor(e) {
+    this.ws = null, this.state = "idle", this.heartbeatTimer = null, this.heartbeatTimeoutTimer = null, this.reconnectTimer = null, this.reconnectAttempts = 0, this.manualClosed = !1, this.started = !1, this.opening = !1, this.openVersion = 0, this.heartbeatSequence = 0, this.options = e, this.handleOnline = this.handleOnline.bind(this), this.handleOffline = this.handleOffline.bind(this);
   }
   /** 获取当前连接状态，供业务显示或调试兜底使用。 */
   getState() {
@@ -17,7 +17,7 @@ class S {
   }
   /** 建立连接；重复调用不会创建多个活动 WebSocket。 */
   async connect() {
-    if (!(this.started && (this.state === "connecting" || this.state === "open" || this.state === "reconnecting"))) {
+    if (!(this.started && (this.state === "waiting-token" || this.state === "connecting" || this.state === "open" || this.state === "reconnecting"))) {
       if (this.started = !0, this.manualClosed = !1, typeof WebSocket > "u") {
         this.setState("unsupported");
         return;
@@ -26,29 +26,47 @@ class S {
     }
   }
   /** 仅在连接已打开时发送消息，失败时返回 false。 */
-  send(t) {
-    var e;
-    return ((e = this.ws) == null ? void 0 : e.readyState) !== WebSocket.OPEN ? !1 : (this.ws.send(t), !0);
+  send(e) {
+    const t = this.ws;
+    if (!t || t.readyState !== WebSocket.OPEN) return !1;
+    try {
+      return t.send(e), !0;
+    } catch {
+      return !1;
+    }
   }
   /** 主动关闭连接，并清理心跳、重连和网络监听。 */
   close() {
-    this.manualClosed = !0, this.started = !1, this.clearTimers(), this.removeNetworkListeners(), this.closeSocket(), this.setState("closed");
+    this.manualClosed = !0, this.started = !1, this.cancelPendingOpen(), this.clearTimers(), this.removeNetworkListeners(), this.closeSocket(), this.setState("closed");
   }
   async openSocket() {
-    var s, r;
-    if (this.manualClosed) return;
-    this.clearReconnectTimer(), this.closeSocket(), this.setState(this.reconnectAttempts > 0 ? "reconnecting" : "connecting");
-    const t = { ...this.options.params || {} }, e = await this.resolveToken();
-    if (this.options.tokenProvider && !e) {
-      this.scheduleReconnect("waiting-token");
+    var i, o;
+    if (!this.started || this.manualClosed || this.opening) return;
+    if (typeof navigator < "u" && navigator.onLine === !1) {
+      this.setState(this.reconnectAttempts > 0 ? "reconnecting" : "waiting-token");
       return;
     }
-    e && (t[this.options.tokenParamName || "access_token"] = e);
-    try {
-      const n = new WebSocket(p(this.options.url, t));
-      this.ws = n, n.onopen = (o) => this.handleOpen(o), n.onmessage = (o) => this.handleMessage(o), n.onclose = (o) => this.handleClose(o), n.onerror = (o) => this.handleError(o);
-    } catch (n) {
-      (r = (s = this.options).onInvalidMessage) == null || r.call(s, n, {}), this.scheduleReconnect();
+    const e = ++this.openVersion;
+    this.opening = !0, this.clearReconnectTimer(), this.clearHeartbeatTimers(), this.closeSocket(), this.setState(this.reconnectAttempts > 0 ? "reconnecting" : "connecting");
+    const t = { ...this.options.params || {} }, s = await this.resolveToken();
+    if (this.isCurrentOpen(e)) {
+      if (this.options.tokenProvider && !s) {
+        this.opening = !1, this.scheduleReconnect("waiting-token");
+        return;
+      }
+      s && (t[this.options.tokenParamName || "access_token"] = s);
+      try {
+        const r = new WebSocket(g(this.options.url, t));
+        if (!this.isCurrentOpen(e)) {
+          r.close();
+          return;
+        }
+        this.ws = r, r.onopen = (a) => this.handleOpen(r, a), r.onmessage = (a) => this.handleMessage(r, a), r.onclose = (a) => this.handleClose(r, a), r.onerror = (a) => this.handleError(r, a);
+      } catch (r) {
+        this.isCurrentOpen(e) && ((o = (i = this.options).onInvalidMessage) == null || o.call(i, r, {}), this.scheduleReconnect());
+      } finally {
+        this.openVersion === e && (this.opening = !1);
+      }
     }
   }
   async resolveToken() {
@@ -59,100 +77,130 @@ class S {
       return "";
     }
   }
-  handleOpen(t) {
-    var e, s;
-    this.reconnectAttempts = 0, this.lastHeartbeatAck = !0, this.setState("open"), (s = (e = this.options).onOpen) == null || s.call(e, t), this.startHeartbeat();
+  handleOpen(e, t) {
+    var s, i;
+    this.isCurrentSocket(e) && (this.reconnectAttempts = 0, this.setState("open"), (i = (s = this.options).onOpen) == null || i.call(s, t), this.startHeartbeat());
   }
-  handleMessage(t) {
-    var e, s, r, n, o;
-    if (T(t.data, (e = this.options.heartbeat) == null ? void 0 : e.response)) {
-      this.lastHeartbeatAck = !0, this.clearHeartbeatTimeoutTimer();
-      return;
-    }
-    try {
-      const a = this.options.parser || b;
-      (r = (s = this.options).onMessage) == null || r.call(s, a(t), t);
-    } catch (a) {
-      (o = (n = this.options).onInvalidMessage) == null || o.call(n, a, t);
+  handleMessage(e, t) {
+    var s, i, o, r, a;
+    if (this.isCurrentSocket(e)) {
+      if (b(t.data, (s = this.options.heartbeat) == null ? void 0 : s.response)) {
+        this.clearHeartbeatTimeoutTimer();
+        return;
+      }
+      try {
+        const h = this.options.parser || k;
+        (o = (i = this.options).onMessage) == null || o.call(i, h(t), t);
+      } catch (h) {
+        (a = (r = this.options).onInvalidMessage) == null || a.call(r, h, t);
+      }
     }
   }
-  handleClose(t) {
-    var e, s;
-    if (this.clearHeartbeatTimers(), (s = (e = this.options).onClose) == null || s.call(e, t), this.manualClosed) {
-      this.setState("closed");
-      return;
+  handleClose(e, t) {
+    var s, i;
+    if (this.isCurrentSocket(e)) {
+      if (this.clearHeartbeatTimers(), this.ws = null, (i = (s = this.options).onClose) == null || i.call(s, t), this.manualClosed) {
+        this.setState("closed");
+        return;
+      }
+      this.scheduleReconnect();
     }
-    this.scheduleReconnect();
   }
-  handleError(t) {
-    var e, s;
-    (s = (e = this.options).onError) == null || s.call(e, t);
+  handleError(e, t) {
+    var s, i;
+    this.isCurrentSocket(e) && ((i = (s = this.options).onError) == null || i.call(s, t));
   }
+  /** 启动单实例心跳；等待应答期间不重复发送，避免 interval 与 timeout 竞争。 */
   startHeartbeat() {
-    const t = this.options.heartbeat;
-    !(t != null && t.message) || !t.interval || (this.clearHeartbeatTimers(), this.heartbeatTimer = setInterval(() => {
-      if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
-      if (t.timeout && !this.lastHeartbeatAck) {
-        this.closeSocket(), this.scheduleReconnect();
+    const e = this.options.heartbeat, t = Number(e == null ? void 0 : e.interval);
+    if (!(e != null && e.message) || !c(t)) return;
+    const s = Number(e.timeout), i = w(e.response) && c(s);
+    this.clearHeartbeatTimers(), this.heartbeatTimer = setInterval(() => {
+      const o = this.ws;
+      if (!o || o.readyState !== WebSocket.OPEN || i && this.heartbeatTimeoutTimer !== null) return;
+      let r;
+      try {
+        r = typeof e.message == "function" ? e.message() : e.message;
+      } catch {
+        this.handleHeartbeatFailure(o);
         return;
       }
-      const e = typeof t.message == "function" ? t.message() : t.message;
-      this.lastHeartbeatAck = !1, this.send(e), t.timeout && (this.clearHeartbeatTimeoutTimer(), this.heartbeatTimeoutTimer = setTimeout(() => {
-        this.lastHeartbeatAck || this.manualClosed || (this.closeSocket(), this.scheduleReconnect());
-      }, t.timeout));
-    }, t.interval));
-  }
-  scheduleReconnect(t = "reconnecting") {
-    var n;
-    if (this.manualClosed || !((n = this.options.reconnect) != null && n.enabled)) {
+      if (!this.send(r)) {
+        this.handleHeartbeatFailure(o);
+        return;
+      }
+      if (!i) return;
+      this.clearHeartbeatTimeoutTimer();
+      const a = this.heartbeatSequence;
+      this.heartbeatTimeoutTimer = setTimeout(() => {
+        this.heartbeatSequence !== a || this.manualClosed || !this.isCurrentSocket(o) || this.handleHeartbeatFailure(o);
+      }, s);
+    }, t);
+  }
+  /** 心跳发送或应答超时后，仅关闭当前连接并进入既有重连流程。 */
+  handleHeartbeatFailure(e) {
+    this.manualClosed || !this.isCurrentSocket(e) || (this.clearHeartbeatTimers(), this.closeSocket(), this.scheduleReconnect());
+  }
+  scheduleReconnect(e = "reconnecting") {
+    var o;
+    if (this.manualClosed || !((o = this.options.reconnect) != null && o.enabled)) {
       this.setState("closed");
       return;
     }
     if (typeof navigator < "u" && navigator.onLine === !1) {
-      this.setState(t);
+      this.setState(e);
+      return;
+    }
+    if (this.reconnectTimer) {
+      this.setState(e);
       return;
     }
-    const { maxAttempts: e, jitter: s } = this.options.reconnect;
-    if (typeof e == "number" && e >= 0 && this.reconnectAttempts >= e) {
+    const { maxAttempts: t, jitter: s } = this.options.reconnect;
+    if (typeof t == "number" && t >= 0 && this.reconnectAttempts >= t) {
       this.setState("closed");
       return;
     }
     this.reconnectAttempts += 1;
-    const r = this.getReconnectDelay();
-    this.setState(t), this.clearReconnectTimer(), this.reconnectTimer = setTimeout(() => {
-      if (s) {
-        setTimeout(() => this.openSocket(), Math.floor(Math.random() * 300));
-        return;
-      }
-      this.openSocket();
-    }, r);
+    const i = this.getReconnectDelay();
+    this.setState(e), this.clearReconnectTimer(), this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null, this.openSocket();
+    }, i + (s ? Math.floor(Math.random() * 300) : 0));
   }
   getReconnectDelay() {
-    const t = this.options.reconnect || { enabled: !1 }, e = t.delay || l, s = t.maxDelay || u;
-    return Math.min(e * Math.pow(2, Math.max(0, this.reconnectAttempts - 1)), s);
+    const e = this.options.reconnect || { enabled: !1 }, t = e.delay || m, s = e.maxDelay || d;
+    return Math.min(t * Math.pow(2, Math.max(0, this.reconnectAttempts - 1)), s);
   }
   handleOnline() {
-    !this.started || this.manualClosed || this.state === "open" || this.state === "connecting" || this.openSocket();
+    !this.started || this.manualClosed || this.opening || this.state === "open" || this.state === "connecting" || this.openSocket();
   }
   handleOffline() {
-    this.manualClosed || (this.clearReconnectTimer(), this.closeSocket(), this.setState("reconnecting"));
+    this.manualClosed || (this.cancelPendingOpen(), this.clearTimers(), this.closeSocket(), this.setState("reconnecting"));
   }
-  setState(t) {
-    var e, s;
-    this.state !== t && (this.state = t, (s = (e = this.options).onStateChange) == null || s.call(e, t));
+  setState(e) {
+    var t, s;
+    this.state !== e && (this.state = e, (s = (t = this.options).onStateChange) == null || s.call(t, e));
   }
   closeSocket() {
-    const t = this.ws;
-    t && (t.onopen = null, t.onmessage = null, t.onclose = null, t.onerror = null, (t.readyState === WebSocket.OPEN || t.readyState === WebSocket.CONNECTING) && t.close(), this.ws = null);
+    const e = this.ws;
+    e && (e.onopen = null, e.onmessage = null, e.onclose = null, e.onerror = null, (e.readyState === WebSocket.OPEN || e.readyState === WebSocket.CONNECTING) && e.close(), this.ws = null);
+  }
+  cancelPendingOpen() {
+    this.openVersion += 1, this.opening = !1;
+  }
+  isCurrentOpen(e) {
+    return this.started && !this.manualClosed && this.openVersion === e;
+  }
+  isCurrentSocket(e) {
+    return this.ws === e;
   }
   clearTimers() {
     this.clearHeartbeatTimers(), this.clearReconnectTimer();
   }
   clearHeartbeatTimers() {
-    this.heartbeatTimer && clearInterval(this.heartbeatTimer), this.heartbeatTimer = null, this.clearHeartbeatTimeoutTimer();
+    this.heartbeatTimer !== null && clearInterval(this.heartbeatTimer), this.heartbeatTimer = null, this.clearHeartbeatTimeoutTimer();
   }
   clearHeartbeatTimeoutTimer() {
-    this.heartbeatTimeoutTimer && clearTimeout(this.heartbeatTimeoutTimer), this.heartbeatTimeoutTimer = null;
+    this.heartbeatSequence += 1, this.heartbeatTimeoutTimer !== null && clearTimeout(this.heartbeatTimeoutTimer), this.heartbeatTimeoutTimer = null;
   }
   clearReconnectTimer() {
     this.reconnectTimer && clearTimeout(this.reconnectTimer), this.reconnectTimer = null;
@@ -161,8 +209,8 @@ class S {
     typeof window > "u" || (window.removeEventListener("online", this.handleOnline), window.removeEventListener("offline", this.handleOffline));
   }
 }
-const g = (i) => new S(i);
+const A = (n) => new y(n);
 export {
-  S as RealtimeSocketClient,
-  g as createRealtimeSocketClient
+  y as RealtimeSocketClient,
+  A as createRealtimeSocketClient
 };

package/release-meta.json

@@ -1,12 +1,12 @@
 {
   "packageName": "@das-fed/upf-utils",
-  "releaseVersion": "6.4.0-dev.290",
+  "releaseVersion": "6.4.0-dev.292",
   "distTag": "dev",
   "releaseType": "publish",
-  "publishedAt": "2026-07-09T03:00:15.744Z",
+  "publishedAt": "2026-07-14T06:46:37.761Z",
   "sourceBranch": "dev",
-  "sourceCommit": "35dd6e1ad7cc4a7a90b7c6e0018d58b993abc811",
-  "gitTag": "upf-release/v6.4.0-dev.290",
+  "sourceCommit": "9766fa3af4bca90be90632cab0c7653f16f56bfe",
+  "gitTag": "upf-release/v6.4.0-dev.292",
   "gitRemote": "origin",
   "gitRemoteUrl": "http://gitlab.dasiot.cn/foundation/frontend/framework.git",
   "releaseStatus": "success"