rc-lib-ui 1.2.14 → 1.2.15

package/dist/socket.js

@@ -2,7 +2,7 @@ import './socket.css';var J = Object.defineProperty;
 var z = (n, e, t) => e in n ? J(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
 var r = (n, e, t) => z(n, typeof e != "symbol" ? e + "" : e, t);
 import { jsx as D } from "react/jsx-runtime";
-import q, { useState as F, useRef as x, useCallback as E, useEffect as y } from "react";
+import q, { useState as F, useRef as x, useCallback as E, useEffect as I } from "react";
 import { c as U } from "./react-CLnE01WS.js";
 import { styled as M, Collapse as G } from "@mui/material";
 import B from "classnames";
@@ -76,11 +76,11 @@ const L = {
     height: "100%"
   }
 })), Z = ({ text: n = "Происходит подключение к серверу", className: e, ...t }) => {
-  const i = g(b.getStatusConnectSocket) === "pending";
+  const o = g(b.getStatusConnectSocket), i = g(b.getStatusIsReConnectSocket);
   return /* @__PURE__ */ D(
     Y,
     {
-      in: i,
+      in: o === "pending" || i,
       collapsedSize: "1px",
       className: B(X["connect-server-anim"], e),
       unmountOnExit: !0,
@@ -100,26 +100,26 @@ class ee {
       }, i = (u) => {
         t != null && t.controlAction && (t == null || t.controlAction(u));
       };
-      let a = !0, c, l, S;
+      let c = !0, a, l, S;
       const f = (u = !0) => {
         const C = "Ручное завершение startActionEvery";
-        a = !1, clearInterval(c), o(null), u ? l && l({ status: u, msg: C + ": (true)" }) : S && S({ status: u, msg: C + ": (false)" });
+        c = !1, clearInterval(a), o(null), u ? l && l({ status: u, msg: C + ": (true)" }) : S && S({ status: u, msg: C + ": (false)" });
       };
       return {
         promise: new Promise((u, C) => {
           l = u, S = C;
           let O = 0, d = 0;
-          c = setInterval(
+          a = setInterval(
             () => {
               if (O += t.interval, d += 1, t != null && t.cutoffTime && O > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < d) {
-                a = !1, clearInterval(c), o(null), C({ status: !1, msg: Error("Время загрузки истекло") });
+                c = !1, clearInterval(a), o(null), C({ status: !1, msg: Error("Время загрузки истекло") });
                 return;
               }
-              e() && (a = !1, clearInterval(c), o(null), u({ status: !0, msg: "cb вернул true" }));
+              e() && (c = !1, clearInterval(a), o(null), u({ status: !0, msg: "cb вернул true" }));
             },
             t.interval < 200 ? 200 : t.interval
-          ), o(c), i({
-            getIsActiveEvent: () => a,
+          ), o(a), i({
+            getIsActiveEvent: () => c,
             stop: f
           });
         }),
@@ -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);
       }, o * 1e3);
     });
-    r(this, "oneOfPromise", (e, t, { second: o }) => new Promise((i, a) => {
-      let c = 1, l = { status: !1, msg: "" };
+    r(this, "oneOfPromise", (e, t, { second: o }) => new Promise((i, c) => {
+      let a = 1, l = { status: !1, msg: "" };
       e().then((f) => {
-        c === 1 && (c = 0, i(f));
+        a === 1 && (a = 0, i(f));
       }).catch((f) => {
-        c === 1 && (c = 0, l.msg = f, a(f));
+        a === 1 && (a = 0, l.msg = f, c(f));
       });
       let S = setInterval(() => {
-        if (c === 1) {
-          if (c = 0, typeof t == "function") {
-            a({ status: !1, msg: "", ...t(l) });
+        if (a === 1) {
+          if (a = 0, typeof t == "function") {
+            c({ status: !1, msg: "", ...t(l) });
             return;
           }
-          a({ status: !1, msg: "oneOfPromise reject" });
+          c({ status: !1, msg: "oneOfPromise reject" });
         }
         clearInterval(S);
       }, o * 1e3);
@@ -207,9 +207,9 @@ class te {
         ["message", this.msgHandler],
         ["error", this.errHandler]
       ];
-      for (let a = 0; a < t.length; a++) {
-        const [c, l] = t[a];
-        e === "add" ? (o = this.state.ws) == null || o.addEventListener(c, l) : (i = this.state.ws) == null || i.removeEventListener(c, l);
+      for (let c = 0; c < t.length; c++) {
+        const [a, l] = t[c];
+        e === "add" ? (o = this.state.ws) == null || o.addEventListener(a, l) : (i = this.state.ws) == null || i.removeEventListener(a, l);
       }
     });
     r(this, "openHandler", () => {
@@ -223,7 +223,7 @@ class te {
       try {
         const { action: o } = t, i = this.findDataRequestByAction(o);
         if (i) {
-          const { cb: a, ...c } = i, { payload: l, ...S } = c;
+          const { cb: c, ...a } = i, { payload: l, ...S } = a;
           this.events.publish("msg", { ...t, request: { ...S, ...l } });
         } else
           this.events.publish("msg", 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(), o = [];
     for (let i = 0; i < t.length; i++) {
-      const a = t[i];
-      a.payload.action !== e.action ? o.push(a) : a.cb && a.cb(e);
+      const c = t[i];
+      c.payload.action !== e.action ? o.push(c) : c.cb && c.cb(e);
     }
     this.state.arrSaveReq = o;
   }
@@ -334,11 +334,11 @@ const s = class s {
     s.state.isDisconnect || (s.setState({ isDisconnect: !0 }), console.log("DISCONNECT WS"), s.wsApi.disconnect(), s.resetState(), s.events.resetSubscribers());
   }
   static send(e, t) {
-    const { action: o, ...i } = e, a = i != null && i.request_id ? i.request_id : W(), c = Date.now();
+    const { action: o, ...i } = e, c = i != null && i.request_id ? i.request_id : W(), a = Date.now();
     s.wsApi.setRequestSave({
       requestAction: o,
-      request_id: a,
-      requestTime: c,
+      request_id: c,
+      requestTime: a,
       payload: { action: o, ...i },
       cb: t
     });
@@ -359,10 +359,10 @@ const s = class s {
         i(new DOMException("Aborted", "AbortError"));
         return;
       }
-      const a = e.action, c = e.request_id ? e.request_id : W(), l = Date.now();
+      const c = e.action, a = e.request_id ? e.request_id : W(), l = Date.now();
       s.wsApi.setRequestSave({
-        requestAction: a,
-        request_id: c,
+        requestAction: c,
+        request_id: a,
         requestTime: l,
         payload: e,
         cb: void 0
@@ -375,8 +375,8 @@ const s = class s {
         C(), i(v);
       }, p = (v) => {
         var A;
-        const I = this.wsApi.findDataRequestByAction(a);
-        !I || ((A = v == null ? void 0 : v.request) == null ? void 0 : A.requestAction) !== I.requestAction || (C(), o({ ...v }));
+        const y = this.wsApi.findDataRequestByAction(c);
+        !y || ((A = v == null ? void 0 : v.request) == null ? void 0 : A.requestAction) !== y.requestAction || (C(), o({ ...v }));
       }, u = () => {
         C(), i(new DOMException("Aborted", "AbortError"));
       }, C = () => {
@@ -416,8 +416,8 @@ r(s, "state", {
   s.state.isActiveReConnect && s.stopReConnect(!1);
 }), r(s, "splitOptions", (e) => Object.entries(e).reduce(
   (t, [o, i]) => {
-    const a = s.wsApi.getOptions();
-    return o in a ? { ...t, WsOptions: { ...t.WsOptions, [o]: i } } : { ...t, SocketApiOptions: { ...t.SocketApiOptions, [o]: i } };
+    const c = s.wsApi.getOptions();
+    return o in c ? { ...t, WsOptions: { ...t.WsOptions, [o]: i } } : { ...t, SocketApiOptions: { ...t.SocketApiOptions, [o]: i } };
   },
   { WsOptions: {}, SocketApiOptions: {} }
 )), /*---------------------------------------------------------------------------------------------------------------------------*/
@@ -450,27 +450,27 @@ r(s, "socketReConnect", () => {
         {
           interval: e,
           countAction: i,
-          watchIdInterval: (c) => {
-            s.saveID.idReConnect = c;
+          watchIdInterval: (a) => {
+            s.saveID.idReConnect = a;
           },
-          controlAction: ({ stop: c, getIsActiveEvent: l }) => {
-            s.stopReConnect = c;
+          controlAction: ({ stop: a, getIsActiveEvent: l }) => {
+            s.stopReConnect = a;
           }
         }
-      ).promise.then((c) => {
-        s.setInfoConnect(c);
-      }).catch((c) => {
+      ).promise.then((a) => {
+        s.setInfoConnect(a);
+      }).catch((a) => {
         if (s.wsApi.getStatusSocket() === "ready") {
           console.log("Сокет успел подключиться, игнорируем ошибку таймаута"), s.setInfoConnect({ status: !0, msg: "Подключено (восстановлено)" });
           return;
         }
-        s.setInfoConnect(c);
+        s.setInfoConnect(a);
       });
     }
 });
 let m = s;
 const se = (n, e = {}) => {
-  const t = n.action, { skip: o = !1, timeout: i = 5e3 } = e, [a, c] = F({
+  const t = n.action, { skip: o = !1, timeout: i = 5e3 } = e, [c, a] = F({
     data: null,
     error: "",
     isLoading: !1,
@@ -479,9 +479,9 @@ const se = (n, e = {}) => {
   }), l = g(b.getStatusReady), S = g(b.getStatusConnectSocket), f = x(null), p = x(e);
   p.current = e;
   const u = E(async () => {
-    var k, v, I, A;
+    var k, v, y, A;
     if (o) return;
-    c((w) => ({
+    a((w) => ({
       ...w,
       isLoading: !0,
       isError: !1,
@@ -493,7 +493,7 @@ const se = (n, e = {}) => {
     try {
       const w = await m.request(n, { timeout: i, signal: d });
       if (d.aborted) return;
-      c((N) => ({
+      a((N) => ({
         ...N,
         data: w,
         isSuccess: !0,
@@ -502,19 +502,19 @@ const se = (n, e = {}) => {
     } catch (w) {
       if (d.aborted) return;
       const N = w instanceof Error ? w.message : String(w);
-      c((H) => ({
+      a((H) => ({
         ...H,
         error: N,
         isError: !0,
         isLoading: !1
-      })), (A = (I = p.current).onError) == null || A.call(I, N);
+      })), (A = (y = p.current).onError) == null || A.call(y, N);
     }
   }, [o, t, n, i]);
-  y(() => (!o && l && u(), () => {
+  I(() => (!o && l && u(), () => {
     var d;
     (d = f.current) == null || d.abort();
-  }), [u, o, l]), y(() => {
-    !l && S === "pending" && c((d) => ({
+  }), [u, o, l]), I(() => {
+    !l && S === "pending" && a((d) => ({
       ...d,
       isError: !1,
       isSuccess: !1,
@@ -526,16 +526,16 @@ const se = (n, e = {}) => {
     return (d = f.current) == null || d.abort(), u();
   }, [u]), O = E(() => {
     var d;
-    (d = f.current) == null || d.abort(), c((k) => ({ ...k, isLoading: !1 }));
+    (d = f.current) == null || d.abort(), a((k) => ({ ...k, isLoading: !1 }));
   }, []);
   return {
-    ...a,
+    ...c,
     refetch: C,
     abort: O
   };
 }, be = (n, e) => se(n, e), ne = (n) => {
-  const { isNetwork: e, typeNetwork: t } = n, { isModal: o } = g(b.getInfoNoConnectServer), i = g(b.getStatusIsReConnectSocket), a = g(b.getIsDisableConnectSocket), c = g(b.getStatusConnectSocket);
-  return y(() => (m.init(n.init), typeof n.onMount == "function" && n.onMount(), m.on("status", (l) => {
+  const { isNetwork: e, typeNetwork: t } = n, { isModal: o } = g(b.getInfoNoConnectServer), i = g(b.getStatusIsReConnectSocket), c = g(b.getIsDisableConnectSocket), a = g(b.getStatusConnectSocket);
+  return I(() => (m.init(n.init), typeof n.onMount == "function" && n.onMount(), m.on("status", (l) => {
     const S = R.getState(), { isReadySocket: f, infoNoConnectServer: { isModal: p }, isOfflineSocket: u } = S;
     l !== "ready" && f && h.setStatusReady({ isReadySocket: !1 }), !f && l === "ready" && (h.setStatusReady({ isReadySocket: !0 }), p && u && (console.log("Вырубаем модалку т.к. сокет законектился после окончания timeOffReConnect"), h.setInfoNoConnectServer({ isModal: !1 }), h.setIsOfflineSocket({ isOfflineSocket: !1 }))), h.setStatusConnectSocket({ statusConnect: l });
   }), m.on("error", (l) => {
@@ -552,13 +552,13 @@ const se = (n, e = {}) => {
     }
   }), m.connect(), () => {
     typeof n.onUnmount == "function" && n.onUnmount(), console.dir("disconnect"), m.disconnect();
-  }), []), y(() => {
-    e && !a && !o && !i && ["close"].includes(c) && t !== "none" && (console.log("Запущен socketReConnect"), m.socketReConnect());
-  }, [a, o, i, c, t, e]), y(() => {
-    i && (!e || c === "ready") && (console.log("Запущен stopReConnect"), m.stopReConnect());
-  }, [i, e, c]), y(() => {
-    a && (console.log("isDisableConnectSocket: ", a), h.setIsOfflineSocket({ isOfflineSocket: !0 }), m.close());
-  }, [a]), null;
+  }), []), I(() => {
+    e && !c && !o && !i && ["close"].includes(a) && t !== "none" && (console.log("Запущен socketReConnect"), m.socketReConnect());
+  }, [c, o, i, a, t, e]), I(() => {
+    i && (!e || a === "ready") && (console.log("Запущен stopReConnect"), m.stopReConnect());
+  }, [i, e, a]), I(() => {
+    c && (console.log("isDisableConnectSocket: ", c), h.setIsOfflineSocket({ isOfflineSocket: !0 }), m.close());
+  }, [c]), null;
 }, oe = q.memo(ne), ie = M(T, {
   shouldForwardProp: (n) => ![""].includes(n)
 })(({ theme: n }) => ({
@@ -570,14 +570,14 @@ const se = (n, e = {}) => {
     padding: "1px 10px"
   }
 })), re = ({ children: n, className: e, isNetwork: t, ...o }) => {
-  const i = g(b.getIsOfflineSocket), a = g(b.getIsDisableConnectSocket), c = i || !t, l = "Оффлайн";
+  const i = g(b.getIsOfflineSocket), c = g(b.getIsDisableConnectSocket), a = i || !t, l = "Оффлайн";
   return /* @__PURE__ */ D(
     ie,
     {
-      in: c,
+      in: a,
       className: B("socket-offline", e),
       ...o,
-      children: typeof n == "function" ? n({ isDisableConnectSocket: a }) : a ? `Режим ${l}` : l
+      children: typeof n == "function" ? n({ isDisableConnectSocket: c }) : c ? `Режим ${l}` : l
     }
   );
 }, ce = q.memo(re), ae = ({ children: n }) => {

package/package.json

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