@endge/utils 0.26.0 → 0.27.0

package/dist/events/EventBus.d.ts

@@ -5,6 +5,10 @@ import { OneOrMany } from '../tools/tools.types';
  */
 export type EventCallback<T = any> = (payload: T) => void;
 export type EventList = Record<string, any>;
+export interface EventBusOptions {
+    /** При наличии изолирует ошибки подписчиков, включая rejected Promise. */
+    onListenerError?: (error: unknown, event: string) => void;
+}
 /**
  * EventBus реализует паттерн подписки на события.
  *
@@ -36,11 +40,12 @@ export type EventList = Record<string, any>;
  * ```
  */
 export declare class EventBus<StaticEvents extends Record<string, any>, CustomEventMap extends Record<string, any> = Record<string, any>> {
+    private readonly _options;
     private _listeners;
     /**
      * Создает экземпляр EventBus и подготавливает базовое состояние.
      */
-    constructor(predefinedEvents?: Array<keyof StaticEvents>);
+    constructor(predefinedEvents?: Array<keyof StaticEvents>, _options?: EventBusOptions);
     /**
      * Обрабатывает входящее событие EventBus.
      */
@@ -93,6 +98,7 @@ export declare class EventBus<StaticEvents extends Record<string, any>, CustomEv
      * Публикует событие во внутренний event bus EventBus.
      */
     private _emit;
+    private _reportListenerError;
     /**
      * Выполняет действие hasListeners в рамках ответственности EventBus.
      */

package/dist/updates/SSEManager.d.ts

@@ -18,6 +18,7 @@ export declare class SSEManager {
     constructor(options: SSEManagerOptions);
     start(): void;
     stop(): void;
+    private _isCurrent;
     private _scheduleReconnect;
     private _clearReconnect;
     private _buildHeaders;

package/dist/utils.js

@@ -1,23 +1,23 @@
 var V = Object.defineProperty;
 var G = (r, t, e) => t in r ? V(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
 var o = (r, t, e) => G(r, typeof t != "symbol" ? t + "" : t, e);
-import { Transform as f, TransformationType as _, plainToInstance as b, instanceToPlain as T, Expose as J } from "class-transformer";
+import { Transform as h, TransformationType as _, plainToInstance as b, instanceToPlain as T, Expose as J } from "class-transformer";
 import { IsOptional as Z } from "class-validator";
 import "reflect-metadata";
 import { v4 as W } from "uuid";
 import { DateTime as Y } from "ts-luxon";
-import { differenceInSeconds as N, format as g, differenceInCalendarDays as q, isAfter as D, isEqual as Q, isBefore as z, startOfDay as p, endOfDay as X } from "date-fns";
-import { utcToZonedTime as I, getTimezoneOffset as x, zonedTimeToUtc as v } from "date-fns-tz";
+import { differenceInSeconds as z, format as g, differenceInCalendarDays as q, isAfter as D, isEqual as Q, isBefore as P, startOfDay as p, endOfDay as X } from "date-fns";
+import { utcToZonedTime as I, getTimezoneOffset as w, zonedTimeToUtc as v } from "date-fns-tz";
 import { fetchEventSource as tt, EventStreamContentType as et } from "@microsoft/fetch-event-source";
 var m = /* @__PURE__ */ ((r) => (r.Add = "add", r.Remove = "remove", r.Update = "update", r.IndexCreate = "indexCreate", r))(m || {});
-class P {
+class H {
   /**
    * Создает экземпляр EventBus и подготавливает базовое состояние.
    */
-  constructor(t = []) {
+  constructor(t = [], e = {}) {
     o(this, "_listeners", /* @__PURE__ */ new Map());
-    t.forEach((e) => {
-      this._listeners.set(e, /* @__PURE__ */ new Set());
+    this._options = e, t.forEach((n) => {
+      this._listeners.set(n, /* @__PURE__ */ new Set());
     });
   }
   // ---- Типизированные события ----
@@ -43,8 +43,7 @@ class P {
    * Выполняет действие offAll в рамках ответственности EventBus.
    */
   offAll() {
-    for (const t of this._listeners.values())
-      t.clear();
+    this._listeners.clear();
   }
   /**
    * Публикует событие во внутренний event bus EventBus.
@@ -101,10 +100,11 @@ class P {
    * Выполняет внутренний шаг _off для EventBus.
    */
   _off(t, e) {
-    var i;
     const n = Array.isArray(t) ? t : [t];
-    for (const s of n)
-      (i = this._listeners.get(s)) == null || i.delete(e);
+    for (const i of n) {
+      const s = this._listeners.get(i);
+      s == null || s.delete(e), (s == null ? void 0 : s.size) === 0 && this._listeners.delete(i);
+    }
   }
   /**
    * Публикует событие во внутренний event bus EventBus.
@@ -112,8 +112,25 @@ class P {
   _emit(t, e) {
     const n = this._listeners.get(t);
     if (n)
-      for (const i of n)
-        i(e);
+      for (const i of [...n]) {
+        if (!this._options.onListenerError) {
+          i(e);
+          continue;
+        }
+        try {
+          const s = i(e);
+          s && typeof s.then == "function" && Promise.resolve(s).catch((a) => this._reportListenerError(a, t));
+        } catch (s) {
+          this._reportListenerError(s, t);
+        }
+      }
+  }
+  _reportListenerError(t, e) {
+    var n, i;
+    try {
+      (i = (n = this._options).onListenerError) == null || i.call(n, t, e);
+    } catch {
+    }
   }
   /**
    * Выполняет действие hasListeners в рамках ответственности EventBus.
@@ -132,12 +149,11 @@ class P {
    * Очищает накопленное состояние EventBus.
    */
   clear(t) {
-    var e;
-    t ? (e = this._listeners.get(t)) == null || e.clear() : this._listeners.clear();
+    t ? this._listeners.delete(t) : this._listeners.clear();
   }
 }
-const xt = new P(Object.keys({}));
-class H {
+const wt = new H(Object.keys({}));
+class U {
   constructor() {
     o(this, "_subscribers", /* @__PURE__ */ new Set());
   }
@@ -153,7 +169,7 @@ class H {
       t();
   }
 }
-class wt extends H {
+class xt extends U {
   /**
    * Создает экземпляр Collection и подготавливает базовое состояние.
    */
@@ -163,7 +179,7 @@ class wt extends H {
     o(this, "_indices", /* @__PURE__ */ new Map());
     o(this, "_rootIds", /* @__PURE__ */ new Set());
     o(this, "_bus");
-    this._bus = new P(Object.values(m)), e.length && this.add(e), this._createIndex("id");
+    this._bus = new H(Object.values(m)), e.length && this.add(e), this._createIndex("id");
   }
   /**
    * Выполняет действие add в рамках ответственности Collection.
@@ -185,8 +201,8 @@ class wt extends H {
       const a = typeof s == "string" ? s : s.id, l = this._items.findIndex((u) => u.id === a);
       if (l !== -1) {
         const [u] = this._items.splice(l, 1);
-        this._indices.forEach((c, h) => {
-          c.delete(u[h]);
+        this._indices.forEach((c, f) => {
+          c.delete(u[f]);
         }), u.parentId || this._rootIds.delete(u.id), i.push(u);
       }
     }), i.length && (this._bus.emit(m.Remove, i), this.notify());
@@ -251,7 +267,7 @@ class wt extends H {
     this._bus.off(e, n);
   }
 }
-class Dt {
+class Et {
   /**
    * Создает экземпляр IndexedCollection и подготавливает базовое состояние.
    */
@@ -488,7 +504,7 @@ class Dt {
     this._list.pop(), this._indexById.delete(t);
   }
 }
-class It {
+class Dt {
   constructor(t) {
     o(this, "_cap");
     o(this, "_buf");
@@ -519,7 +535,7 @@ class It {
     return t;
   }
 }
-class Et {
+class It {
   constructor(t) {
     o(this, "_baseUrl");
     this._baseUrl = t.baseUrl.replace(/\/+$/, "");
@@ -591,7 +607,7 @@ class Et {
     return await n.json().catch(() => ({}));
   }
 }
-class At {
+class Ct {
   /**
    * Создает экземпляр DelayedExecutor и подготавливает базовое состояние.
    */
@@ -631,14 +647,14 @@ class At {
     this._delayTimer && clearTimeout(this._delayTimer), this._maxTimer && clearTimeout(this._maxTimer), this._delayTimer = null, this._maxTimer = null;
   }
 }
-function w(r) {
+function x(r) {
   var t;
   return r == null ? String(r) : typeof r == "string" ? `string(${r.length})` : typeof r != "object" ? `${typeof r}(${String(r)})` : Array.isArray(r) ? `Array(${r.length})` : r instanceof Map ? `Map(${r.size})` : r instanceof Set ? `Set(${r.size})` : ((t = r.constructor) == null ? void 0 : t.name) || "Object";
 }
-function U(r) {
-  return r instanceof Error ? `${r.name}: ${r.message}` : w(r);
+function E(r) {
+  return r instanceof Error ? `${r.name}: ${r.message}` : x(r);
 }
-class Ot {
+class At {
   /**
    * Создает экземпляр NamedExecutor и подготавливает базовое состояние.
    */
@@ -675,7 +691,7 @@ class Ot {
       const e = this._callbacks.get(t);
       e && e();
     } catch (e) {
-      console.error(`[NamedExecutor] flush error: ${U(e)}`);
+      console.error(`[NamedExecutor] flush error: ${E(e)}`);
     }
     this._clear(t);
   }
@@ -699,9 +715,9 @@ class Ot {
     clearTimeout(this._delayTimers.get(t)), clearTimeout(this._maxTimers.get(t)), this._delayTimers.delete(t), this._maxTimers.delete(t), this._callbacks.delete(t), this._firstCallTime.delete(t);
   }
 }
-function Ct() {
+function Ot() {
   return function(r, t) {
-    f(
+    h(
       ({ value: e }) => {
         if (typeof e == "string")
           try {
@@ -712,7 +728,7 @@ function Ct() {
         return e;
       },
       { toClassOnly: !0 }
-    )(r, t), f(
+    )(r, t), h(
       ({ value: e }) => {
         try {
           return JSON.stringify(e);
@@ -726,7 +742,7 @@ function Ct() {
 }
 function Mt() {
   return function(r, t) {
-    f(
+    h(
       ({ value: e }) => {
         if (e == null)
           return "{}";
@@ -739,7 +755,7 @@ function Mt() {
         return e;
       },
       { toClassOnly: !0 }
-    )(r, t), f(
+    )(r, t), h(
       ({ value: e }) => {
         if (!e)
           return {};
@@ -756,7 +772,7 @@ function Mt() {
   };
 }
 const K = Symbol("onDeserialized");
-function $t() {
+function Lt() {
   return function(r, t) {
     Reflect.defineMetadata(K, t, r);
   };
@@ -768,19 +784,19 @@ function rt(r) {
   );
   return t ? r[t].bind(r) : null;
 }
-function Ft() {
+function $t() {
   return function(r, t) {
-    f(
+    h(
       ({ value: e }) => typeof e == "string" ? e.trim() : String(e ?? ""),
       { toClassOnly: !0 }
-    )(r, t), f(
+    )(r, t), h(
       ({ value: e }) => typeof e == "string" ? e : String(e ?? ""),
       { toPlainOnly: !0 }
     )(r, t);
   };
 }
-function Lt(r, t) {
-  return f(({ value: e, type: n }) => {
+function Ft(r, t) {
+  return h(({ value: e, type: n }) => {
     if (!e)
       return /* @__PURE__ */ new Map();
     if (n === _.PLAIN_TO_CLASS) {
@@ -802,13 +818,13 @@ function Lt(r, t) {
           })
         );
       }
-      return console.warn(`[TypeMap] Expected object or array, got ${w(e)}`), /* @__PURE__ */ new Map();
+      return console.warn(`[TypeMap] Expected object or array, got ${x(e)}`), /* @__PURE__ */ new Map();
     }
-    return n === _.CLASS_TO_PLAIN ? e instanceof Map ? Array.from(e.values()).map((i) => T(i)) : (console.warn(`[TypeMap] Expected Map, got ${w(e)}`), t ? [] : {}) : (console.warn(`[TypeMap] Unexpected transformation type: ${String(n)}`), e);
+    return n === _.CLASS_TO_PLAIN ? e instanceof Map ? Array.from(e.values()).map((i) => T(i)) : (console.warn(`[TypeMap] Expected Map, got ${x(e)}`), t ? [] : {}) : (console.warn(`[TypeMap] Unexpected transformation type: ${String(n)}`), e);
   });
 }
 function kt(r) {
-  return f(({ value: t, type: e }) => {
+  return h(({ value: t, type: e }) => {
     if (!t || typeof t != "object")
       return {};
     if (e === _.PLAIN_TO_CLASS) {
@@ -863,23 +879,23 @@ function Ht(r, t, e) {
 }
 function Ut(r) {
   return function(t, e) {
-    f(({ value: n }) => n === null ? void 0 : n, { toPlainOnly: !0 })(t, e), Z(r)(t, e);
+    h(({ value: n }) => n === null ? void 0 : n, { toPlainOnly: !0 })(t, e), Z(r)(t, e);
   };
 }
 function Kt() {
-  return f(({ value: r, type: t }) => t === _.PLAIN_TO_CLASS ? r == null ? void 0 : r.id : r);
+  return h(({ value: r, type: t }) => t === _.PLAIN_TO_CLASS ? r == null ? void 0 : r.id : r);
 }
 function Rt(r) {
-  return f(({ value: t, type: e }) => e === _.PLAIN_TO_CLASS ? t == null ? void 0 : t.map((n) => n == null ? void 0 : n[r]) : t);
+  return h(({ value: t, type: e }) => e === _.PLAIN_TO_CLASS ? t == null ? void 0 : t.map((n) => n == null ? void 0 : n[r]) : t);
 }
 function jt() {
-  return f(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN && (r == null ? void 0 : r.id) || r);
+  return h(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN && (r == null ? void 0 : r.id) || r);
 }
 function Bt() {
-  return f(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN ? r.map((e) => e.id) : r);
+  return h(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN ? r.map((e) => e.id) : r);
 }
 function Vt() {
-  return f(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN ? void 0 : r, { toPlainOnly: !0 });
+  return h(({ value: r, type: t }) => t === _.CLASS_TO_PLAIN ? void 0 : r, { toPlainOnly: !0 });
 }
 function Gt(r, t) {
   return b(r, t, {
@@ -902,11 +918,11 @@ const Yt = !1;
 function qt(r, t) {
   return t();
 }
-const Qt = () => W(), M = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+const Qt = () => W(), L = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 function Xt(r) {
   let t = "";
   for (let e = 0; e < r; ++e)
-    t += M[Math.floor(M.length * Math.random())];
+    t += L[Math.floor(L.length * Math.random())];
   return t;
 }
 class vt {
@@ -1016,11 +1032,11 @@ const $ = /* @__PURE__ */ new WeakMap(), it = /* @__PURE__ */ new Set([
   "SymbolLock"
 ]);
 function ee(r) {
-  return E(R(r).snapshot);
+  return C(R(r).snapshot);
 }
 function re(r, t) {
   const e = R(r);
-  return e.subscribers.add(t), t(E(e.snapshot)), () => e.subscribers.delete(t);
+  return e.subscribers.add(t), t(C(e.snapshot)), () => e.subscribers.delete(t);
 }
 function R(r) {
   var a, l, u;
@@ -1032,17 +1048,17 @@ function R(r) {
     entries: /* @__PURE__ */ new Map(),
     subscribers: /* @__PURE__ */ new Set()
   }, i = (c) => {
-    var C;
-    const h = c ? {
+    var M;
+    const f = c ? {
       ctrl: c.ctrlKey,
       shift: c.shiftKey,
       alt: c.altKey,
       meta: c.metaKey,
       mod: e === "macos" ? c.metaKey : e === "windows" || e === "linux" ? c.ctrlKey : c.ctrlKey || c.metaKey,
-      altGraph: ((C = c.getModifierState) == null ? void 0 : C.call(c, "AltGraph")) === !0
+      altGraph: ((M = c.getModifierState) == null ? void 0 : M.call(c, "AltGraph")) === !0
     } : F(e).modifiers, O = [...n.entries.values()], S = {
       platform: e,
-      modifiers: h,
+      modifiers: f,
       held: {
         key: [...new Set(O.map((y) => y.key))].sort(),
         code: [...new Set(O.map((y) => y.code).filter(Boolean))].sort()
@@ -1051,20 +1067,20 @@ function R(r) {
     if (!ot(n.snapshot, S)) {
       n.snapshot = S;
       for (const y of n.subscribers)
-        y(E(S));
+        y(C(S));
     }
   }, s = () => {
     n.entries.clear(), i();
   };
   return r.addEventListener("keydown", (c) => {
     if (!it.has(c.key)) {
-      const h = c.key.toLowerCase();
-      n.entries.set(c.code || `key:${h}`, { key: h, code: c.code });
+      const f = c.key.toLowerCase();
+      n.entries.set(c.code || `key:${f}`, { key: f, code: c.code });
     }
     i(c);
   }, !0), r.addEventListener("keyup", (c) => {
-    const h = c.key.toLowerCase();
-    n.entries.delete(c.code || `key:${h}`), i(c);
+    const f = c.key.toLowerCase();
+    n.entries.delete(c.code || `key:${f}`), i(c);
   }, !0), r.addEventListener("visibilitychange", () => {
     r.visibilityState === "hidden" && s();
   }), (l = r.defaultView) == null || l.addEventListener("blur", s), (u = r.defaultView) == null || u.addEventListener("pagehide", s), $.set(r, n), n;
@@ -1089,19 +1105,19 @@ function st(r) {
   return e.includes("mac") || e.includes("darwin") || e.includes("iphone") || e.includes("ipad") ? "macos" : e.includes("win") ? "windows" : e.includes("linux") || e.includes("x11") || e.includes("cros") ? "linux" : "unknown";
 }
 function ot(r, t) {
-  return r.platform === t.platform && r.modifiers.ctrl === t.modifiers.ctrl && r.modifiers.shift === t.modifiers.shift && r.modifiers.alt === t.modifiers.alt && r.modifiers.meta === t.modifiers.meta && r.modifiers.mod === t.modifiers.mod && r.modifiers.altGraph === t.modifiers.altGraph && L(r.held.key, t.held.key) && L(r.held.code, t.held.code);
+  return r.platform === t.platform && r.modifiers.ctrl === t.modifiers.ctrl && r.modifiers.shift === t.modifiers.shift && r.modifiers.alt === t.modifiers.alt && r.modifiers.meta === t.modifiers.meta && r.modifiers.mod === t.modifiers.mod && r.modifiers.altGraph === t.modifiers.altGraph && k(r.held.key, t.held.key) && k(r.held.code, t.held.code);
 }
-function L(r, t) {
+function k(r, t) {
   return r.length === t.length && r.every((e, n) => e === t[n]);
 }
-function E(r) {
+function C(r) {
   return {
     platform: r.platform,
     modifiers: { ...r.modifiers },
     held: { key: [...r.held.key], code: [...r.held.code] }
   };
 }
-class ne extends H {
+class ne extends U {
   constructor() {
     super(...arguments);
     /** Массив всех логов */
@@ -1309,13 +1325,13 @@ function ce(r, t) {
 }
 function le(r, t, e, n) {
   const i = p(r), s = p(t), a = p(e), l = p(n);
-  return !z(s, a) && !D(i, l);
+  return !P(s, a) && !D(i, l);
 }
 function ue(r, t, e) {
-  return !z(r, p(t)) && !D(r, X(e));
+  return !P(r, p(t)) && !D(r, X(e));
 }
 const fe = (r) => r && new Date(r);
-function de(r, t = "HH:mm dd.MM.yyyy", e = {}) {
+function he(r, t = "HH:mm dd.MM.yyyy", e = {}) {
   return r && g(r, t, e);
 }
 function ut(r, t = "HH:mm dd.MM.yyyy", e = {}, n = !0) {
@@ -1330,7 +1346,7 @@ function ut(r, t = "HH:mm dd.MM.yyyy", e = {}, n = !0) {
     r = new Date(r.toString());
   return n ? g(r, t, e) : g(I(r, "utc"), t, e);
 }
-function he(r) {
+function de(r) {
   const t = { weekday: "short" }, e = new Intl.DateTimeFormat("ru-RU", t).format(r);
   return e.charAt(0).toUpperCase() + e.slice(1);
 }
@@ -1349,18 +1365,18 @@ function ye(r) {
   };
 }
 function pe(r, t) {
-  const e = N(r, t), { hours: n, minutes: i } = A(e);
+  const e = z(r, t), { hours: n, minutes: i } = A(e);
   return n || i ? `${e > 0 ? "-" : "+"}${d(n)}:${d(i)}` : "";
 }
 function ge(r, t) {
-  const e = N(r, t), { hours: n, minutes: i } = A(e);
+  const e = z(r, t), { hours: n, minutes: i } = A(e);
   return n || i ? `${e > 0 ? "-" : ""}${d(n)}:${d(i)}` : "";
 }
-function k(r = /* @__PURE__ */ new Date()) {
+function N(r = /* @__PURE__ */ new Date()) {
   return new Date(r.getFullYear(), r.getMonth(), r.getDate());
 }
 function be(r, t) {
-  const e = q(k(r), k(t));
+  const e = q(N(r), N(t));
   return e ? e > 7 ? {
     variant: "red",
     value: ">7"
@@ -1388,17 +1404,17 @@ function Se(r) {
     return null;
   const e = t.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/);
   if (e) {
-    const i = Number(e[1]), s = Number(e[2]) - 1, a = Number(e[3]), l = Number(e[4]), u = Number(e[5]), c = e[6] != null ? Number(e[6]) : 0, h = new Date(i, s, a, l, u, c, 0);
-    return Number.isNaN(h.getTime()) ? null : h.toISOString();
+    const i = Number(e[1]), s = Number(e[2]) - 1, a = Number(e[3]), l = Number(e[4]), u = Number(e[5]), c = e[6] != null ? Number(e[6]) : 0, f = new Date(i, s, a, l, u, c, 0);
+    return Number.isNaN(f.getTime()) ? null : f.toISOString();
   }
   const n = new Date(t);
   return Number.isNaN(n.getTime()) ? null : n.toISOString();
 }
-function xe(r) {
+function we(r) {
   const t = String(r ?? "").trim();
   return t ? t.slice(0, 10) : "";
 }
-function we(r) {
+function xe(r) {
   const t = String(r ?? "").trim();
   if (!t)
     return "";
@@ -1408,7 +1424,7 @@ function we(r) {
   const n = e.getFullYear(), i = d(e.getMonth() + 1), s = d(e.getDate()), a = d(e.getHours()), l = d(e.getMinutes());
   return `${n}-${i}-${s}T${a}:${l}`;
 }
-function De(r, t) {
+function Ee(r, t) {
   const e = j(r);
   if (e)
     return e;
@@ -1418,7 +1434,7 @@ function De(r, t) {
   const i = B(t), s = i ? I(n, i) : n;
   return `${d(s.getHours())}:${d(s.getMinutes())}`;
 }
-function Ie(r, t, e) {
+function De(r, t, e) {
   const n = j(t).match(/^(\d{2}):(\d{2})$/);
   if (!n)
     return null;
@@ -1456,7 +1472,7 @@ function B(r) {
     return null;
   }
 }
-function Ee(r) {
+function Ie(r) {
   if (r == null)
     return null;
   const t = String(r).trim();
@@ -1468,11 +1484,11 @@ function Ee(r) {
   const n = t.match(/^(\d{2}):(\d{2})$/);
   return n ? `${n[1]}:${n[2]}:00` : null;
 }
-function Ae(r) {
-  const t = dt(r), e = Math.sign(t) >= 0 ? "" : "-", { hours: n, minutes: i } = A(t);
+function Ce(r) {
+  const t = ht(r), e = Math.sign(t) >= 0 ? "" : "-", { hours: n, minutes: i } = A(t);
   return `${e}${d(n)}:${d(i)}`;
 }
-function Oe(r = null, t = "dd", e = {}) {
+function Ae(r = null, t = "dd", e = {}) {
   const n = ft(r);
   if (!n)
     return "";
@@ -1492,7 +1508,7 @@ function A(r) {
     minutes: Math.floor(t / 60) % 60
   };
 }
-function dt(r) {
+function ht(r) {
   const t = String(r ?? "").trim();
   if (!t)
     return 0;
@@ -1509,12 +1525,12 @@ function dt(r) {
 function d(r) {
   return String(r).padStart(2, "0");
 }
-function Ce(r) {
+function Oe(r) {
   const t = /* @__PURE__ */ new Date();
   try {
-    const e = x(r, t), n = Intl.supportedValuesOf("timeZone");
+    const e = w(r, t), n = Intl.supportedValuesOf("timeZone");
     for (const i of n)
-      if (x(i, t) === e)
+      if (w(i, t) === e)
         return i;
   } catch {
     return null;
@@ -1522,9 +1538,9 @@ function Ce(r) {
   return null;
 }
 function Me(r) {
-  return x(r, /* @__PURE__ */ new Date());
+  return w(r, /* @__PURE__ */ new Date());
 }
-class $e {
+class Le {
   constructor(t) {
     o(this, "_url");
     o(this, "_retryInterval");
@@ -1535,14 +1551,23 @@ class $e {
     this._url = t.url, this._retryInterval = t.retryInterval ?? 3e3, this._options = t;
   }
   start() {
-    this._abortController = new AbortController(), this._connect();
+    if (this._abortController)
+      return;
+    const t = new AbortController();
+    this._abortController = t, this._connect(t);
   }
   stop() {
-    var t;
-    this._clearReconnect(), this._isConnected = !1, (t = this._abortController) == null || t.abort(), this._abortController = null;
+    this._clearReconnect(), this._isConnected = !1;
+    const t = this._abortController;
+    this._abortController = null, t == null || t.abort();
+  }
+  _isCurrent(t) {
+    return this._abortController === t && !t.signal.aborted;
   }
-  _scheduleReconnect() {
-    this._clearReconnect(), this._reconnectTimeout = setTimeout(() => this.start(), this._retryInterval);
+  _scheduleReconnect(t) {
+    this._isCurrent(t) && (this._clearReconnect(), this._reconnectTimeout = setTimeout(() => {
+      this._isCurrent(t) && (this.stop(), this.start());
+    }, this._retryInterval));
   }
   _clearReconnect() {
     this._reconnectTimeout && (clearTimeout(this._reconnectTimeout), this._reconnectTimeout = null);
@@ -1552,48 +1577,62 @@ class $e {
     const t = { ...this._options.headers }, e = await ((i = (n = this._options).getToken) == null ? void 0 : i.call(n));
     return e && (t.Authorization = `Bearer ${e}`), t;
   }
-  async _connect() {
-    var t, e, n;
+  async _connect(t) {
+    var e, n;
     try {
+      const i = await this._buildHeaders();
+      if (!this._isCurrent(t))
+        return;
       await tt(this._url, {
         method: "GET",
-        headers: await this._buildHeaders(),
-        signal: (t = this._abortController) == null ? void 0 : t.signal,
+        headers: i,
+        signal: t.signal,
         openWhenHidden: !0,
-        onopen: async (i) => {
-          var a, l;
-          if (i.ok && i.headers.get("content-type") === et) {
-            this._isConnected = !0, (l = (a = this._options).onOpen) == null || l.call(a);
+        onopen: async (s) => {
+          var l, u, c, f;
+          if (!this._isCurrent(t))
+            throw new Error("[SSEManager] Connection was stopped.");
+          if (s.ok && ((u = (l = s.headers.get("content-type")) == null ? void 0 : l.split(";")[0]) == null ? void 0 : u.trim()) === et) {
+            this._isConnected = !0, (f = (c = this._options).onOpen) == null || f.call(c);
             return;
           }
-          throw new Error(`Unexpected response: ${i.status}`);
+          throw new Error(`Unexpected response: ${s.status}`);
         },
-        onmessage: (i) => {
-          try {
-            this._options.onEvent(JSON.parse(i.data));
-          } catch (s) {
-            console.warn(`[SSEManager] Failed to parse message: ${U(s)}`);
-          }
+        onmessage: (s) => {
+          if (this._isCurrent(t))
+            try {
+              this._options.onEvent(JSON.parse(s.data));
+            } catch (a) {
+              console.warn(`[SSEManager] Failed to parse message: ${E(a)}`);
+            }
         },
         onclose: () => {
-          var i, s;
-          this._isConnected = !1, (s = (i = this._options).onClose) == null || s.call(i), this._scheduleReconnect();
-        },
-        onerror: (i) => {
           var s, a;
-          this._isConnected = !1, (a = (s = this._options).onError) == null || a.call(s, i instanceof Error ? i : new Error(String(i))), this._scheduleReconnect();
+          this._isCurrent(t) && (this._isConnected = !1, (a = (s = this._options).onClose) == null || a.call(s));
+        },
+        // Retry belongs to this manager. Throwing disables the library's retry loop.
+        onerror: (s) => {
+          throw s;
         }
       });
     } catch (i) {
-      const s = i instanceof Error ? i : new Error(String(i));
-      console.error("[SSEManager] Fatal error:", s.message), this._isConnected = !1, (n = (e = this._options).onError) == null || n.call(e, s), this._scheduleReconnect();
+      if (this._isCurrent(t)) {
+        this._isConnected = !1;
+        try {
+          (n = (e = this._options).onError) == null || n.call(e, i instanceof Error ? i : new Error(String(i)));
+        } catch (s) {
+          console.warn(`[SSEManager] Error callback failed: ${E(s)}`);
+        }
+      }
+    } finally {
+      this._isCurrent(t) && (this._isConnected = !1, this._scheduleReconnect(t));
     }
   }
   get isConnected() {
     return this._isConnected;
   }
 }
-class Fe {
+class $e {
   constructor() {
     o(this, "_currentCount", 0);
     o(this, "_lastResetTime", Date.now());
@@ -1612,40 +1651,40 @@ class Fe {
 }
 export {
   Ht as AfterDeserialize,
-  xt as AppBus,
+  wt as AppBus,
   Pt as BeforeSerialize,
-  wt as Collection,
-  At as DelayedExecutor,
+  xt as Collection,
+  Ct as DelayedExecutor,
   Rt as DeserializeArrayField,
   Kt as DeserializeId,
-  P as EventBus,
+  H as EventBus,
   m as Events,
   zt as GenericExpose,
   vt as HotkeyManager,
   Yt as IS_DEBUG,
   Vt as IgnoreToPlain,
-  Dt as IndexedCollection,
+  Et as IndexedCollection,
   Ut as IsOptionalTransformed,
-  Ct as Json,
+  Ot as Json,
   Mt as JsonString,
-  Ot as NamedExecutor,
-  Et as PayloadHttpClient,
-  It as RingBuffer,
-  $e as SSEManager,
-  Ft as Script,
+  At as NamedExecutor,
+  It as PayloadHttpClient,
+  Dt as RingBuffer,
+  Le as SSEManager,
+  $t as Script,
   Nt as Serialize,
   jt as SerializeId,
   Bt as SerializeIds,
   ne as StructuredLogger,
-  H as Subscribable,
+  U as Subscribable,
   lt as SystemClock,
-  Lt as TypeMap,
+  Ft as TypeMap,
   kt as TypeRecord,
-  Fe as UPSMeter_Service,
+  $e as UPSMeter_Service,
   ae as capitalize,
   Wt as compareNumber,
-  U as consoleErrorSummary,
-  w as consoleValueSummary,
+  E as consoleErrorSummary,
+  x as consoleValueSummary,
   ie as createInstance,
   pe as diffDuration,
   ge as diffDurationTable,
@@ -1653,12 +1692,12 @@ export {
   me as extractTime,
   ye as findMinMaxDates,
   _e as formatDateToMSK,
-  de as formatDatetime,
+  he as formatDatetime,
   ut as formatDatetimeTZ,
-  Oe as formatDatetimeTZSpecial,
+  Ae as formatDatetimeTZSpecial,
   Qt as generateUUID,
   be as getDateOnlyDiffFactor,
-  he as getDayOfWeek,
+  de as getDayOfWeek,
   ee as getKeyboardStateSnapshot,
   rt as getOnDeserializedMethod,
   Me as getTimezoneOffsetMs,
@@ -1669,22 +1708,22 @@ export {
   ue as isDateInRange,
   le as isDateRangeOverlap,
   Zt as isNullOrUndefined,
-  De as isoDateTimeToTimeInput,
-  xe as isoToDateInput,
-  we as isoToDateTimeLocalInput,
-  Ie as mergeTimeIntoDateTime,
-  $t as onDeserialized,
+  Ee as isoDateTimeToTimeInput,
+  we as isoToDateInput,
+  xe as isoToDateTimeLocalInput,
+  De as mergeTimeIntoDateTime,
+  Lt as onDeserialized,
   fe as parseDate,
-  Ae as parseDuration,
-  Ce as parseOffsetToTimezone,
+  Ce as parseDuration,
+  Oe as parseOffsetToTimezone,
   qt as profile,
   Xt as randomString,
-  k as removeTime,
+  N as removeTime,
   re as subscribeKeyboardState,
   j as timeToTimeInput,
   Gt as toInstance,
   Te as toIsoZDate,
   Se as toIsoZDateTime,
   Jt as toPlain,
-  Ee as toTimeHHMMSS
+  Ie as toTimeHHMMSS
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@endge/utils",
   "type": "module",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "private": false,
   "sideEffects": false,
   "exports": {