rc-lib-ui 1.3.6 → 1.3.7

package/dist/NetworkAndSocket/Socket/api/SocketApi.types.d.ts

@@ -1,3 +1,4 @@
+import { NetworkStatusInfoTracker } from 'dev-classes';
 import { WsApiE_StatusConnect_OR } from './deps/WsApi';
 import { WsApi_Response } from './deps/WsApi/WsApi.types';
 export interface SocketApi_Options_P {
@@ -5,7 +6,9 @@ export interface SocketApi_Options_P {
     listUrlsCheckConnectNetwork?: string[];
 }
 type SocketApi_StateProps_OR = 'isDisconnect' | 'isActiveReConnect' | 'isOfflineSocket' | 'isGotWasFirstConnection' | 'isStartCheckNetwork';
-export type SocketApi_StateProps_P = Record<SocketApi_StateProps_OR, boolean>;
+export type SocketApi_StateProps_P = Record<SocketApi_StateProps_OR, boolean> & {
+    infoNetwork: NetworkStatusInfoTracker;
+};
 export type SocketApi_StatusConnect_OR = WsApiE_StatusConnect_OR;
 export type BasePayloadSocket = {
     action: string;

package/dist/socket.js

@@ -35,7 +35,7 @@ const T = {
   getIsOfflineSocket: (o) => o.isOfflineSocket,
   getInfoNoConnectServer: (o) => o.infoNoConnectServer,
   getIsDisableConnectSocket: (o) => o.isDisableConnectSocket
-}, b = (o) => m(o), Q = M("span")({
+}, w = (o) => m(o), Q = M("span")({
   backgroundColor: "rgba(0,0,0,0.3)",
   color: "#fff",
   display: "flex",
@@ -76,7 +76,7 @@ const T = {
     height: "100%"
   }
 })), j = ({ text: o = "Происходит подключение к серверу", className: e, ...t }) => {
-  const n = b(R.getStatusConnectSocket), i = b(R.getStatusIsReConnectSocket);
+  const n = w(R.getStatusConnectSocket), i = w(R.getStatusIsReConnectSocket);
   return /* @__PURE__ */ D(
     Z,
     {
@@ -100,26 +100,26 @@ class ee {
       }, i = (u) => {
         t != null && t.controlAction && (t == null || t.controlAction(u));
       };
-      let a = !0, l, c, f;
+      let c = !0, l, a, f;
       const S = (u = !0) => {
         const h = "Ручное завершение startActionEvery";
-        a = !1, clearInterval(l), n(null), u ? c && c({ status: u, msg: h + ": (true)" }) : f && f({ status: u, msg: h + ": (false)" });
+        c = !1, clearInterval(l), n(null), u ? a && a({ status: u, msg: h + ": (true)" }) : f && f({ status: u, msg: h + ": (false)" });
       };
       return {
         promise: new Promise((u, h) => {
-          c = u, f = h;
+          a = u, f = h;
           let y = 0, d = 0;
           l = setInterval(
             () => {
               if (y += t.interval, d += 1, t != null && t.cutoffTime && y > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < d) {
-                a = !1, clearInterval(l), n(null), h({ status: !1, msg: Error("Время загрузки истекло") });
+                c = !1, clearInterval(l), n(null), h({ status: !1, msg: Error("Время загрузки истекло") });
                 return;
               }
-              e() && (a = !1, clearInterval(l), n(null), u({ status: !0, msg: "cb вернул true" }));
+              e() && (c = !1, clearInterval(l), n(null), u({ status: !0, msg: "cb вернул true" }));
             },
             t.interval < 200 ? 200 : t.interval
           ), n(l), i({
-            getIsActiveEvent: () => a,
+            getIsActiveEvent: () => c,
             stop: S
           });
         }),
@@ -131,24 +131,24 @@ class ee {
       e().then(() => {
         i === 1 && (i = 0);
       });
-      let a = setInterval(() => {
-        i === 1 && t(), clearInterval(a);
+      let c = setInterval(() => {
+        i === 1 && t(), clearInterval(c);
       }, n * 1e3);
     });
-    r(this, "oneOfPromise", (e, t, { second: n }) => new Promise((i, a) => {
-      let l = 1, c = { status: !1, msg: "" };
+    r(this, "oneOfPromise", (e, t, { second: n }) => new Promise((i, c) => {
+      let l = 1, a = { status: !1, msg: "" };
       e().then((S) => {
         l === 1 && (l = 0, i(S));
       }).catch((S) => {
-        l === 1 && (l = 0, c.msg = S, a(S));
+        l === 1 && (l = 0, a.msg = S, c(S));
       });
       let f = setInterval(() => {
         if (l === 1) {
           if (l = 0, typeof t == "function") {
-            a({ status: !1, msg: "", ...t(c) });
+            c({ status: !1, msg: "", ...t(a) });
             return;
           }
-          a({ status: !1, msg: "oneOfPromise reject" });
+          c({ status: !1, msg: "oneOfPromise reject" });
         }
         clearInterval(f);
       }, n * 1e3);
@@ -207,9 +207,9 @@ class te {
         ["message", this.msgHandler],
         ["error", this.errHandler]
       ];
-      for (let a = 0; a < t.length; a++) {
-        const [l, c] = t[a];
-        e === "add" ? (n = this.state.ws) == null || n.addEventListener(l, c) : (i = this.state.ws) == null || i.removeEventListener(l, c);
+      for (let c = 0; c < t.length; c++) {
+        const [l, a] = t[c];
+        e === "add" ? (n = this.state.ws) == null || n.addEventListener(l, a) : (i = this.state.ws) == null || i.removeEventListener(l, a);
       }
     });
     r(this, "openHandler", () => {
@@ -223,8 +223,8 @@ class te {
       try {
         const { action: n } = t, i = this.findDataRequestByAction(n);
         if (i) {
-          const { cb: a, ...l } = i, { payload: c, ...f } = l;
-          this.events.publish("msg", { ...t, request: { ...f, ...c } });
+          const { cb: c, ...l } = i, { payload: a, ...f } = l;
+          this.events.publish("msg", { ...t, request: { ...f, ...a } });
         } else
           this.events.publish("msg", t);
         n && this.filterSaveItemsByResponse(t);
@@ -261,7 +261,7 @@ class te {
       const e = this.initOptions;
       return e || this.errorInitSocket(), e;
     });
-    r(this, "findDataRequestByAction", (e) => this.getItemsRequestSaveByAction(e).sort((i, a) => a.requestTime - i.requestTime)[0]);
+    r(this, "findDataRequestByAction", (e) => this.getItemsRequestSaveByAction(e).sort((i, c) => c.requestTime - i.requestTime)[0]);
   }
   resetState() {
     this.state = this.copyState(this.stateDefault);
@@ -275,8 +275,8 @@ class te {
   filterSaveItemsByResponse(e) {
     const t = this.getRequestSave(), n = [];
     for (let i = 0; i < t.length; i++) {
-      const a = t[i];
-      a.payload.action !== e.action ? n.push(a) : a.cb && a.cb(e);
+      const c = t[i];
+      c.payload.action !== e.action ? n.push(c) : c.cb && c.cb(e);
     }
     this.state.arrSaveReq = n;
   }
@@ -335,16 +335,16 @@ const s = class s {
     s.state.isDisconnect || (s.setState({ isDisconnect: !0 }), console.log("DISCONNECT WS"), s.wsApi.disconnect(), s.resetState(), s.events.resetSubscribers(), (e = this.networkTicker) == null || e.destroy());
   }
   static send(e, t) {
-    const { action: n, ...i } = e, a = i != null && i.request_id ? i.request_id : W(), l = Date.now();
+    const { action: n, ...i } = e, c = i != null && i.request_id ? i.request_id : W(), l = Date.now();
     s.wsApi.setRequestSave({
       requestAction: n,
-      request_id: a,
+      request_id: c,
       requestTime: l,
       payload: { action: n, ...i },
       cb: t
     });
-    const c = s.wsApi.getSocket();
-    if (!c || c.readyState !== 1) {
+    const a = s.wsApi.getSocket();
+    if (!a || a.readyState !== 1) {
       console.log("Нет подключения к сокету. Запрос сохранён в setRequestSave");
       return;
     }
@@ -355,16 +355,16 @@ const s = class s {
   }
   static async request(e, t = {}) {
     return new Promise((n, i) => {
-      var d, g;
+      var d, b;
       if ((d = t == null ? void 0 : t.signal) != null && d.aborted) {
         i(new DOMException("Aborted", "AbortError"));
         return;
       }
-      const a = e.action, l = e.request_id ? e.request_id : W(), c = Date.now();
+      const c = e.action, l = e.request_id ? e.request_id : W(), a = Date.now();
       s.wsApi.setRequestSave({
-        requestAction: a,
+        requestAction: c,
         request_id: l,
-        requestTime: c,
+        requestTime: a,
         payload: e,
         cb: void 0
       });
@@ -372,23 +372,23 @@ const s = class s {
       t != null && t.timeout && (f = setTimeout(() => {
         h(), i(new Error("Request timeout"));
       }, t.timeout));
-      const S = (v) => {
-        h(), i(v);
-      }, C = (v) => {
+      const S = (p) => {
+        h(), i(p);
+      }, C = (p) => {
         var N;
-        const I = this.wsApi.findDataRequestByAction(a);
-        !I || ((N = v == null ? void 0 : v.request) == null ? void 0 : N.requestAction) !== I.requestAction || (h(), n({ ...v }));
+        const I = this.wsApi.findDataRequestByAction(c);
+        !I || ((N = p == null ? void 0 : p.request) == null ? void 0 : N.requestAction) !== I.requestAction || (h(), n({ ...p }));
       }, u = () => {
         h(), i(new DOMException("Aborted", "AbortError"));
       }, h = () => {
-        var v;
-        s.off("msg", C), s.off("error", S), f && clearTimeout(f), (v = t == null ? void 0 : t.signal) == null || v.removeEventListener("abort", u);
+        var p;
+        s.off("msg", C), s.off("error", S), f && clearTimeout(f), (p = t == null ? void 0 : t.signal) == null || p.removeEventListener("abort", u);
       };
-      s.on("msg", C), s.on("error", S), (g = t == null ? void 0 : t.signal) == null || g.addEventListener("abort", u);
+      s.on("msg", C), s.on("error", S), (b = t == null ? void 0 : t.signal) == null || b.addEventListener("abort", u);
       const y = s.wsApi.getSocket();
       if (!y || y.readyState !== 1) {
-        const v = "Нет подключения к сокету";
-        console.error(v), h(), i(new Error(v));
+        const p = "Нет подключения к сокету";
+        console.error(p), h(), i(new Error(p));
         return;
       }
       s.wsApi.send(e);
@@ -400,8 +400,12 @@ r(s, "state", {
   isActiveReConnect: !1,
   isOfflineSocket: !0,
   isGotWasFirstConnection: !1,
-  isStartCheckNetwork: !1
+  isStartCheckNetwork: !1,
   //не используеться
+  infoNetwork: {
+    isNetwork: !1,
+    typeNetwork: ""
+  }
 }), r(s, "options", {
   isReConnectNetworkOnline: !1,
   listUrlsCheckConnectNetwork: []
@@ -417,8 +421,8 @@ r(s, "state", {
   s.state.isActiveReConnect && s.stopReConnect(!1);
 }), r(s, "splitOptions", (e) => Object.entries(e).reduce(
   (t, [n, i]) => {
-    const a = s.wsApi.getOptions();
-    return n in a ? { ...t, WsOptions: { ...t.WsOptions, [n]: i } } : { ...t, SocketApiOptions: { ...t.SocketApiOptions, [n]: i } };
+    const c = s.wsApi.getOptions();
+    return n in c ? { ...t, WsOptions: { ...t.WsOptions, [n]: i } } : { ...t, SocketApiOptions: { ...t.SocketApiOptions, [n]: i } };
   },
   { WsOptions: {}, SocketApiOptions: {} }
 )), /*---------------------------------------------------------------------------------------------------------------------------*/
@@ -434,7 +438,8 @@ r(s, "setNetworkStatus", (e) => {
 }), r(s, "init", (e) => {
   const { WsOptions: t, SocketApiOptions: n } = s.splitOptions(e);
   s.networkTicker = new $(n.listUrlsCheckConnectNetwork ?? []), s.networkTicker.startEvents((i) => {
-    s.setNetworkStatus(i);
+    const c = s.getState();
+    i.typeNetwork == c.infoNetwork.typeNetwork && i.isNetwork == c.infoNetwork.isNetwork || (s.setNetworkStatus(i), s.setState({ infoNetwork: i }));
   }), s.setOptions(n), s.wsApi.init(t), s.wsApi.events.subscribe("status", (i) => {
     s.setState({ isOfflineSocket: i !== "ready" });
   });
@@ -454,7 +459,7 @@ r(s, "socketReConnect", () => {
           watchIdInterval: (l) => {
             s.saveID.idReConnect = l;
           },
-          controlAction: ({ stop: l, getIsActiveEvent: c }) => {
+          controlAction: ({ stop: l, getIsActiveEvent: a }) => {
             s.stopReConnect = l;
           }
         }
@@ -469,21 +474,21 @@ r(s, "socketReConnect", () => {
       });
     }
 });
-let p = s;
+let v = s;
 const se = (o, e = {}) => {
-  const t = o.action, { skip: n = !1, timeout: i = 5e3 } = e, [a, l] = B({
+  const t = o.action, { skip: n = !1, timeout: i = 5e3 } = e, [c, l] = B({
     data: null,
     error: "",
     isLoading: !1,
     isError: !1,
     isSuccess: !1
-  }), c = b(R.getStatusReady), f = b(R.getStatusConnectSocket), S = x(null), C = x(e);
+  }), a = w(R.getStatusReady), f = w(R.getStatusConnectSocket), S = x(null), C = x(e);
   C.current = e;
   const u = A(async () => {
-    var g, v, I, N;
+    var b, p, I, N;
     if (n) return;
-    l((w) => ({
-      ...w,
+    l((g) => ({
+      ...g,
       isLoading: !0,
       isError: !1,
       isSuccess: !1,
@@ -492,17 +497,17 @@ const se = (o, e = {}) => {
     })), S.current = new AbortController();
     const d = S.current.signal;
     try {
-      const w = await p.request(o, { timeout: i, signal: d });
+      const g = await v.request(o, { timeout: i, signal: d });
       if (d.aborted) return;
       l((q) => ({
         ...q,
-        data: w,
+        data: g,
         isSuccess: !0,
         isLoading: !1
-      })), (v = (g = C.current).onSuccess) == null || v.call(g, w);
-    } catch (w) {
+      })), (p = (b = C.current).onSuccess) == null || p.call(b, g);
+    } catch (g) {
       if (d.aborted) return;
-      const q = w instanceof Error ? w.message : String(w);
+      const q = g instanceof Error ? g.message : String(g);
       l((J) => ({
         ...J,
         error: q,
@@ -511,59 +516,59 @@ const se = (o, e = {}) => {
       })), (N = (I = C.current).onError) == null || N.call(I, q);
     }
   }, [n, t, o, i]);
-  O(() => (!n && c && u(), () => {
+  O(() => (!n && a && u(), () => {
     var d;
     (d = S.current) == null || d.abort();
-  }), [u, n, c]), O(() => {
-    !c && f === "pending" && l((d) => ({
+  }), [u, n, a]), O(() => {
+    !a && f === "pending" && l((d) => ({
       ...d,
       isError: !1,
       isSuccess: !1,
       error: "Потеряно соединение с сервером"
     }));
-  }, [c, f]);
+  }, [a, f]);
   const h = A(() => {
     var d;
     return (d = S.current) == null || d.abort(), u();
   }, [u]), y = A(() => {
     var d;
-    (d = S.current) == null || d.abort(), l((g) => ({ ...g, isLoading: !1 }));
+    (d = S.current) == null || d.abort(), l((b) => ({ ...b, isLoading: !1 }));
   }, []);
   return {
-    ...a,
+    ...c,
     refetch: h,
     abort: y
   };
 }, Re = (o, e) => se(o, e), ne = (o) => {
-  const { isModal: e } = b(R.getInfoNoConnectServer), t = b(R.getStatusIsReConnectSocket), n = b(R.getIsDisableConnectSocket), i = b(R.getStatusConnectSocket), [a, l] = B({
+  const { isModal: e } = w(R.getInfoNoConnectServer), t = w(R.getStatusIsReConnectSocket), n = w(R.getIsDisableConnectSocket), i = w(R.getStatusConnectSocket), [c, l] = B({
     isNetwork: !1,
     typeNetwork: ""
   });
-  return O(() => (p.on("network", (c) => {
-    console.log("network: ", c), l((f) => ({ ...f, isNetwork: c.isNetwork, typeNetwork: c.typeNetwork }));
-  }), p.init(o.init), typeof o.onMount == "function" && o.onMount(), p.on("status", (c) => {
+  return O(() => (v.on("network", (a) => {
+    console.log("network: ", a), l((f) => ({ ...f, isNetwork: a.isNetwork, typeNetwork: a.typeNetwork }));
+  }), v.init(o.init), typeof o.onMount == "function" && o.onMount(), v.on("status", (a) => {
     const f = m.getState(), { isReadySocket: S, infoNoConnectServer: { isModal: C }, isOfflineSocket: u } = f;
-    c !== "ready" && S && k.setStatusReady({ isReadySocket: !1 }), !S && c === "ready" && (k.setStatusReady({ isReadySocket: !0 }), C && u && (console.log("Вырубаем модалку т.к. сокет законектился после окончания timeOffReConnect"), k.setInfoNoConnectServer({ isModal: !1 }), k.setIsOfflineSocket({ isOfflineSocket: !1 }))), k.setStatusConnectSocket({ statusConnect: c });
-  }), p.on("error", (c) => {
-    console.log("error: ", c);
-  }), p.on("reConnect", (c) => {
-    console.log('on"reConnect" (status): ', c);
+    a !== "ready" && S && k.setStatusReady({ isReadySocket: !1 }), !S && a === "ready" && (k.setStatusReady({ isReadySocket: !0 }), C && u && (console.log("Вырубаем модалку т.к. сокет законектился после окончания timeOffReConnect"), k.setInfoNoConnectServer({ isModal: !1 }), k.setIsOfflineSocket({ isOfflineSocket: !1 }))), k.setStatusConnectSocket({ statusConnect: a });
+  }), v.on("error", (a) => {
+    console.log("error: ", a);
+  }), v.on("reConnect", (a) => {
+    console.log('on"reConnect" (status): ', a);
     const f = m.getState(), { isReConnectSocket: S, infoNoConnectServer: { isModal: C } } = f;
-    S !== c && k.setStatusIsReConnectSocket({ isReConnectSocket: c }), C && c && k.setInfoNoConnectServer({ isModal: !1 });
-  }), p.on("timeOffReConnect", (c) => {
-    if (console.log("timeOffReConnect: ", c), k.setIsOfflineSocket({ isOfflineSocket: !c.status }), !c.status) {
+    S !== a && k.setStatusIsReConnectSocket({ isReConnectSocket: a }), C && a && k.setInfoNoConnectServer({ isModal: !1 });
+  }), v.on("timeOffReConnect", (a) => {
+    if (console.log("timeOffReConnect: ", a), k.setIsOfflineSocket({ isOfflineSocket: !a.status }), !a.status) {
       const f = m.getState(), { infoNoConnectServer: { isModal: S, isSelectOffline: C } } = f;
       let u = !1;
       !S && !C && (u = !0), u && k.setInfoNoConnectServer({ isModal: u });
     }
-  }), p.connect(), () => {
-    typeof o.onUnmount == "function" && o.onUnmount(), console.dir("disconnect"), p.disconnect();
+  }), v.connect(), () => {
+    typeof o.onUnmount == "function" && o.onUnmount(), console.dir("disconnect"), v.disconnect();
   }), []), O(() => {
-    a.isNetwork && !n && !e && !t && ["close"].includes(i) && a.typeNetwork !== "none" && (console.log("Запущен socketReConnect"), p.socketReConnect());
-  }, [n, e, t, i, a.typeNetwork, a.isNetwork]), O(() => {
-    t && (!a.isNetwork || i === "ready") && (console.log("Запущен stopReConnect"), p.stopReConnect());
-  }, [t, a.isNetwork, i]), O(() => {
-    n && (console.log("isDisableConnectSocket: ", n), k.setIsOfflineSocket({ isOfflineSocket: !0 }), p.close());
+    c.isNetwork && !n && !e && !t && ["close"].includes(i) && c.typeNetwork !== "none" && (console.log("Запущен socketReConnect"), v.socketReConnect());
+  }, [n, e, t, i, c.typeNetwork, c.isNetwork]), O(() => {
+    t && (!c.isNetwork || i === "ready") && (console.log("Запущен stopReConnect"), v.stopReConnect());
+  }, [t, c.isNetwork, i]), O(() => {
+    n && (console.log("isDisableConnectSocket: ", n), k.setIsOfflineSocket({ isOfflineSocket: !0 }), v.close());
   }, [n]), null;
 }, oe = E.memo(ne), ie = M(P, {
   shouldForwardProp: (o) => ![""].includes(o)
@@ -576,14 +581,14 @@ const se = (o, e = {}) => {
     padding: "1px 10px"
   }
 })), re = ({ children: o, className: e, isNetwork: t, ...n }) => {
-  const i = b(R.getIsOfflineSocket), a = b(R.getIsDisableConnectSocket), l = i || !t, c = "Оффлайн";
+  const i = w(R.getIsOfflineSocket), c = w(R.getIsDisableConnectSocket), l = i || !t, a = "Оффлайн";
   return /* @__PURE__ */ D(
     ie,
     {
       in: l,
       className: L("socket-offline", e),
       ...n,
-      children: typeof o == "function" ? o({ isDisableConnectSocket: a }) : a ? `Режим ${c}` : c
+      children: typeof o == "function" ? o({ isDisableConnectSocket: c }) : c ? `Режим ${a}` : a
     }
   );
 }, ce = E.memo(re), ae = ({ children: o }) => {
@@ -596,7 +601,7 @@ const se = (o, e = {}) => {
     k.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !0 }), k.setIsDisableConnectSocket({ isDisableConnectSocket: !0 });
   }, []);
   return o({ offlineActive: e });
-}, Se = E.memo(ue), be = {
+}, Se = E.memo(ue), we = {
   ConnectDetection: _,
   OfflineDetection: ce,
   Buttons: {
@@ -606,12 +611,12 @@ const se = (o, e = {}) => {
   Initialization: oe
 };
 export {
-  be as Socket,
-  p as SocketApi,
+  we as Socket,
+  v as SocketApi,
   Re as createRequestSocketApi,
   k as socketActions,
   R as socketSelectors,
   m as socketStore,
   se as useRequestSocketApi,
-  b as useSocketSelector
+  w as useSocketSelector
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rc-lib-ui",
   "private": false,
-  "version": "1.3.6",
+  "version": "1.3.7",
   "author": "SinGlEBW",
   "license": "MIT",
   "type": "module",