rc-lib-ui 1.1.28 → 1.1.46

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

@@ -1,18 +1,17 @@
-import { NetworkInfo } from './deps/NetworkControls';
 import { WsApi_Options_P } from './deps/WsApi';
 import { WsApi_Events } from './deps/WsApi/WsApi.types';
-import { SocketApi_Options_P, SocketApi_StateProps_P, SocketApiOptionsRequest } from './SocketApi.types';
+import { BasePayloadSocket, SocketApi_Options_P, SocketApi_StateProps_P, SocketApiOptionsRequest } from './SocketApi.types';
+import { NetworkStatusInfoTracker } from './deps/NetworkStatusTracker/NetworkStatusTracker.types';
 interface SocketApi_Events {
     timeOffReConnect(info: {
         status: boolean;
         msg: string;
     }): void;
     reConnect(status: boolean): void;
-    network(info: NetworkInfo): void;
+    network(info: NetworkStatusInfoTracker): void;
 }
 type CommonEvents = SocketApi_Events & WsApi_Events;
 export declare class SocketApi {
-    #private;
     private static state;
     private static options;
     private static wsApi;
@@ -47,7 +46,7 @@ export declare class SocketApi {
             action: string;
             [key: string]: any;
         };
-        reqId: string;
+        request_id: string;
         cb: any;
     }[];
     static getStatusSocket: () => import('./deps/WsApi').WsApiE_StatusConnect_OR;
@@ -56,9 +55,9 @@ export declare class SocketApi {
     static init: (options: WsApi_Options_P & SocketApi_Options_P) => void;
     static connect(): Promise<void>;
     static disconnect(): void;
-    static send<P = any, Data = any>(payload: P, cb?: (data: Data) => void): void;
+    static send<P extends BasePayloadSocket, Data extends BasePayloadSocket>(payload: P, cb?: (data: Data) => void): void;
     static stopReConnect(status?: boolean): void;
     static socketReConnect: () => void;
-    static request<P = any, Data = any>(keyRequest: string, payload: P, options?: SocketApiOptionsRequest): Promise<Data>;
+    static request<P extends BasePayloadSocket, Data extends BasePayloadSocket>(payload: P, options?: SocketApiOptionsRequest): Promise<Data>;
 }
 export {};

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

@@ -4,13 +4,15 @@ export interface SocketApi_Options_P {
     isReConnectNetworkOnline?: boolean;
     listUrlsCheckConnectNetwork?: string[];
 }
-type SocketApi_StateProps_OR = 'isDisconnect' | 'isActiveReConnect' | 'isOfflineSocket' | 'isReady' | 'isGotWasFirstConnection' | 'isStartCheckNetwork';
+type SocketApi_StateProps_OR = 'isDisconnect' | 'isActiveReConnect' | 'isOfflineSocket' | 'isGotWasFirstConnection' | 'isStartCheckNetwork';
 export type SocketApi_StateProps_P = Record<SocketApi_StateProps_OR, boolean>;
 export type SocketApi_StatusConnect_OR = WsApiE_StatusConnect_OR;
-export interface SocketRequest {
+export type BasePayloadSocket = {
     action: string;
+    request_id?: string;
+} & {
     [key: string]: any;
-}
+};
 export type SocketResponse<P = any, Data = any> = WsApi_Response<P, Data>;
 export interface SocketApiOptionsRequest {
     timeout?: number;

package/dist/NetworkAndSocket/Socket/api/deps/NetworkStatusTracker/NetworkStatusTracker.d.ts

@@ -6,7 +6,6 @@ export declare class NetworkStatusTracker {
     private setState;
     private getState;
     constructor(listUrls: string[]);
-    private getFetchOptions;
     private getConnection;
     private getIsNetwork;
     private getTypeNetwork;

package/dist/NetworkAndSocket/Socket/api/deps/WsApi/WsApi.d.ts

@@ -27,7 +27,7 @@ export declare class WsApi {
             action: string;
             [key: string]: any;
         };
-        reqId: string;
+        request_id: string;
         cb: any;
     }[];
     getOptions: () => WsApi_Options_P;
@@ -46,7 +46,7 @@ export declare class WsApi {
             action: string;
             [key: string]: any;
         };
-        reqId: string;
+        request_id: string;
         cb: any;
     };
 }

package/dist/NetworkAndSocket/Socket/api/deps/WsApi/WsApi.types.d.ts

@@ -16,7 +16,7 @@ export interface WsApi_RequestMeta<P> {
     requestAction: string;
     requestTime: number;
     payload: P;
-    reqId: string;
+    request_id: string;
 }
 export type WsApi_Response<P, D> = D & {
     request: WsApi_RequestMeta<P>;
@@ -34,7 +34,7 @@ export interface WsApi_StateProps {
             action: string;
             [key: string]: any;
         };
-        reqId: string;
+        request_id: string;
         cb: any;
     }[];
 }

package/dist/NetworkAndSocket/Socket/api/helpers/createRequestSocket/createRequestSocket.d.ts

@@ -1,2 +1,3 @@
+import { BasePayloadSocket } from './../../SocketApi.types';
 import { CreateRequestSocketProps } from './createRequestSocket.types';
-export declare const createRequestSocket: <ResponseSocket = any>(cb: (data: ResponseSocket) => void, { payload, socketAction, signal }: CreateRequestSocketProps) => void;
+export declare const createRequestSocket: <RequestSocket, ResponseSocket extends BasePayloadSocket & { [key in string]: any; }>(cb: (data: ResponseSocket) => void, { payload, signal }: CreateRequestSocketProps<RequestSocket>) => void;

package/dist/NetworkAndSocket/Socket/api/helpers/createRequestSocket/createRequestSocket.types.d.ts

@@ -1,5 +1,5 @@
-export interface CreateRequestSocketProps<D = any> {
-    payload: D;
-    socketAction: string;
+import { BasePayloadSocket } from '../../SocketApi.types';
+export interface CreateRequestSocketProps<D> {
+    payload: D & BasePayloadSocket;
     signal?: AbortSignal;
 }

package/dist/NetworkAndSocket/Socket/api/hooks/index.d.ts

@@ -0,0 +1 @@
+export * from './useRequestSocketApi';

package/dist/NetworkAndSocket/Socket/api/hooks/useRequestSocketApi/generators/generator1.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/NetworkAndSocket/Socket/api/hooks/useRequestSocketApi/generators/generator2.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/NetworkAndSocket/Socket/api/hooks/useRequestSocketApi/useRequestSocketApi.d.ts

@@ -1,5 +1,6 @@
 import { UseRequestSocketOptions } from './useRequestSocketApi.types';
-export declare const useRequestSocketApi: <P = any, Data = any>(keyRequest: string, payload: P, options?: UseRequestSocketOptions<Data>) => {
+import { BasePayloadSocket } from '../../SocketApi.types';
+export declare const useRequestSocketApi: <P extends BasePayloadSocket, Data extends BasePayloadSocket>(payload: P, options?: UseRequestSocketOptions<Data>) => {
     data: Data | null;
     error: Error | null;
     isLoading: boolean;
@@ -8,3 +9,12 @@ export declare const useRequestSocketApi: <P = any, Data = any>(keyRequest: stri
     refetch: () => Promise<void>;
     abort: () => void;
 };
+export declare const createRequestSocketApi: <P extends BasePayloadSocket, D extends BasePayloadSocket>(p: P, d?: UseRequestSocketOptions<D>) => {
+    data: D | null;
+    error: Error | null;
+    isLoading: boolean;
+    isError: boolean;
+    isSuccess: boolean;
+    refetch: () => Promise<void>;
+    abort: () => void;
+};

package/dist/NetworkAndSocket/Socket/api/hooks/useRequestSocketApi/useRequestSocketApi.types.d.ts

@@ -4,3 +4,12 @@ export interface UseRequestSocketOptions<Data = any> {
     onSuccess?: (data: Data) => void;
     onError?: (error: Error) => void;
 }
+export interface ResultUseRequestSocketApi<Data = any> {
+    data: Data | null;
+    error: Error | null;
+    isLoading: boolean;
+    isError: boolean;
+    isSuccess: boolean;
+    refetch: () => Promise<void>;
+    abort: () => void;
+}

package/dist/NetworkAndSocket/Socket/api/index.d.ts

@@ -1,2 +1,3 @@
 export * from './SocketApi';
-export { type SocketApi_StateProps_P, type SocketApi_StatusConnect_OR } from './SocketApi.types';
+export * from './hooks';
+export { type SocketApi_StateProps_P, type SocketApi_StatusConnect_OR, type BasePayloadSocket } from './SocketApi.types';

package/dist/NetworkAndSocket/Socket/components/index.d.ts

@@ -2,14 +2,12 @@ import { default as React } from 'react';
 import { SocketConnectDetectionProps } from './ConnectDetection/ConnectDetection';
 import { InitializationSocketProps } from './Initialization/Initialization';
 import { SocketOfflineDetectionPayloadProps, SocketOfflineDetectionProps } from './OfflineDetection/OfflineDetection';
-import { ReConnectButtonProps } from './Buttons/ReConnect';
-import { OfflineButtonProps } from './Buttons/OfflineButton';
 export declare const Socket: {
     ConnectDetection: React.NamedExoticComponent<SocketConnectDetectionProps>;
     OfflineDetection: React.NamedExoticComponent<SocketOfflineDetectionProps>;
     Buttons: {
-        OfflineActive: React.NamedExoticComponent<OfflineButtonProps>;
-        ReConnect: React.NamedExoticComponent<ReConnectButtonProps>;
+        OfflineActive: React.NamedExoticComponent<import('./Buttons/OfflineButton').OfflineButtonProps>;
+        ReConnect: React.NamedExoticComponent<import('./Buttons/ReConnect').ReConnectButtonProps>;
     };
     Initialization: React.NamedExoticComponent<InitializationSocketProps>;
 };

package/dist/NetworkAndSocket/Socket/components/ui/CollapseCustom.d.ts

@@ -1,3 +1,2 @@
 import { CollapseProps } from '@mui/material';
-import { Theme } from '@mui/material/styles';
-export declare const SocketCollapse: import('@emotion/styled').StyledComponent<CollapseProps & import('@mui/system').MUIStyledCommonProps<Theme>, {}, {}>;
+export declare const SocketCollapse: import('@emotion/styled').StyledComponent<CollapseProps & import('@mui/system').MUIStyledCommonProps<import('@mui/material').Theme>, {}, {}>;

package/dist/NetworkAndSocket/Socket/store/socket.store.d.ts

@@ -4,6 +4,7 @@ export declare const socketActions: SocketActions;
 export declare const socketSelectors: {
     getStatusConnectSocket: (state: InitialStatePropsSocket) => "ready" | "close" | "error" | "pending" | "disconnect";
     getStatusIsReConnectSocket: (state: InitialStatePropsSocket) => boolean;
+    getStatusReady: (state: InitialStatePropsSocket) => boolean;
     getIsOfflineSocket: (state: InitialStatePropsSocket) => boolean;
     getInfoNoConnectServer: (state: InitialStatePropsSocket) => {
         isModal: boolean;

package/dist/NetworkAndSocket/Socket/store/socket.types.d.ts

@@ -4,6 +4,7 @@ export interface InitialStatePropsSocket {
     isReConnectSocket: boolean;
     isOfflineSocket: boolean;
     isDisableConnectSocket: boolean;
+    isReadySocket: boolean;
     infoNoConnectServer: {
         isModal: boolean;
         isSelectOffline: boolean;
@@ -13,6 +14,7 @@ export interface SocketActions {
     resetState: () => void;
     setStatusConnectSocket: (payload: Pick<InitialStatePropsSocket, 'statusConnect'>) => void;
     setStatusIsReConnectSocket: (payload: Pick<InitialStatePropsSocket, 'isReConnectSocket'>) => void;
+    setStatusReady: (payload: Pick<InitialStatePropsSocket, 'isReadySocket'>) => void;
     setIsOfflineSocket: (payload: Pick<InitialStatePropsSocket, 'isOfflineSocket'>) => void;
     setInfoNoConnectServer: (payload: Partial<InitialStatePropsSocket['infoNoConnectServer']>) => void;
     setIsDisableConnectSocket: (payload: Pick<InitialStatePropsSocket, 'isDisableConnectSocket'>) => void;

package/dist/socket.js

@@ -1,69 +1,68 @@
-import './socket.css';var U = Object.defineProperty;
-var P = (o) => {
-  throw TypeError(o);
-};
-var F = (o, t, e) => t in o ? U(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var r = (o, t, e) => F(o, typeof t != "symbol" ? t + "" : t, e);
-var q = (o, t, e) => t.has(o) ? P("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(o) : t.set(o, e);
-import { jsx as R } from "react/jsx-runtime";
-import b, { useEffect as I, useCallback as x } from "react";
-import { styled as y, Collapse as H } from "@mui/material";
-import T from "classnames";
-const D = (o) => {
+import './socket.css';var z = Object.defineProperty;
+var G = (o, t, e) => t in o ? z(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var r = (o, t, e) => G(o, typeof t != "symbol" ? t + "" : t, e);
+import { jsx as M } from "react/jsx-runtime";
+import w, { useState as O, useRef as $, useCallback as A, useEffect as E } from "react";
+import { styled as x, Collapse as V } from "@mui/material";
+import U from "classnames";
+const T = (o) => {
   let t;
-  const e = /* @__PURE__ */ new Set(), n = (u, h) => {
+  const e = /* @__PURE__ */ new Set(), n = (u, d) => {
     const f = typeof u == "function" ? u(t) : u;
     if (!Object.is(f, t)) {
-      const d = t;
-      t = h ?? (typeof f != "object" || f === null) ? f : Object.assign({}, t, f), e.forEach((p) => p(t, d));
+      const h = t;
+      t = d ?? (typeof f != "object" || f === null) ? f : Object.assign({}, t, f), e.forEach((g) => g(t, h));
     }
-  }, i = () => t, a = { setState: n, getState: i, getInitialState: () => S, subscribe: (u) => (e.add(u), () => e.delete(u)) }, S = t = o(n, i, a);
-  return a;
-}, j = (o) => o ? D(o) : D, J = (o) => o;
-function z(o, t = J) {
-  const e = b.useSyncExternalStore(
+  }, i = () => t, l = { setState: n, getState: i, getInitialState: () => S, subscribe: (u) => (e.add(u), () => e.delete(u)) }, S = t = o(n, i, l);
+  return l;
+}, K = (o) => o ? T(o) : T, Q = (o) => o;
+function X(o, t = Q) {
+  const e = w.useSyncExternalStore(
     o.subscribe,
-    b.useCallback(() => t(o.getState()), [o, t]),
-    b.useCallback(() => t(o.getInitialState()), [o, t])
+    w.useCallback(() => t(o.getState()), [o, t]),
+    w.useCallback(() => t(o.getInitialState()), [o, t])
   );
-  return b.useDebugValue(e), e;
+  return w.useDebugValue(e), e;
 }
-const M = (o) => {
-  const t = j(o), e = (n) => z(t, n);
+const W = (o) => {
+  const t = K(o), e = (n) => X(t, n);
   return Object.assign(e, t), e;
-}, G = (o) => o ? M(o) : M, B = {
+}, Y = (o) => o ? W(o) : W, P = {
   statusConnect: "disconnect",
   isOfflineSocket: !1,
   //Текущее состояние сокета. Зависит от события timeOffReConnect и если задаёться isDisableConnectSocket: true
-  isDisableConnectSocket: !1,
   isReConnectSocket: !1,
+  isDisableConnectSocket: !1,
+  isReadySocket: !1,
   infoNoConnectServer: {
     isModal: !1,
     isSelectOffline: !1
     //Для того что бы 2й раз окно не показывать
   }
-}, $ = JSON.parse(JSON.stringify(B)), C = G(() => B), w = {
-  resetState: () => C.setState($),
-  setStatusConnectSocket: ({ statusConnect: o }) => C.setState({ statusConnect: o }),
-  setStatusIsReConnectSocket: ({ isReConnectSocket: o }) => C.setState({ isReConnectSocket: o }),
-  setIsOfflineSocket: ({ isOfflineSocket: o }) => C.setState({ isOfflineSocket: o }),
-  setInfoNoConnectServer: (o) => C.setState((t) => ({ infoNoConnectServer: { ...t.infoNoConnectServer, ...o } })),
-  setIsDisableConnectSocket: ({ isDisableConnectSocket: o }) => C.setState({ isDisableConnectSocket: o })
+}, Z = JSON.parse(JSON.stringify(P)), b = Y(() => P), C = {
+  resetState: () => b.setState(Z),
+  setStatusConnectSocket: ({ statusConnect: o }) => b.setState({ statusConnect: o }),
+  setStatusIsReConnectSocket: ({ isReConnectSocket: o }) => b.setState({ isReConnectSocket: o }),
+  setStatusReady: ({ isReadySocket: o }) => b.setState({ isReadySocket: o }),
+  setIsOfflineSocket: ({ isOfflineSocket: o }) => b.setState({ isOfflineSocket: o }),
+  setInfoNoConnectServer: (o) => b.setState((t) => ({ infoNoConnectServer: { ...t.infoNoConnectServer, ...o } })),
+  setIsDisableConnectSocket: ({ isDisableConnectSocket: o }) => b.setState({ isDisableConnectSocket: o })
 }, m = {
   getStatusConnectSocket: (o) => o.statusConnect,
   getStatusIsReConnectSocket: (o) => o.isReConnectSocket,
+  getStatusReady: (o) => o.isReadySocket,
   getIsOfflineSocket: (o) => o.isOfflineSocket,
   getInfoNoConnectServer: (o) => o.infoNoConnectServer,
   getIsDisableConnectSocket: (o) => o.isDisableConnectSocket
-}, k = (o) => C(o), V = y("span")({
+}, R = (o) => b(o), _ = x("span")({
   backgroundColor: "rgba(0,0,0,0.3)",
   color: "#fff",
   display: "flex",
   alignItems: "center",
   padding: "1px 10px",
   borderRadius: "3px 3px 3px 3px"
-}), L = y(
-  ({ children: o, ...t }) => /* @__PURE__ */ R(H, { ...t, unmountOnExit: !0, children: /* @__PURE__ */ R(V, { children: o }) })
+}), F = x(
+  ({ children: o, ...t }) => /* @__PURE__ */ M(V, { ...t, unmountOnExit: !0, children: /* @__PURE__ */ M(_, { children: o }) })
 )(({ theme: o }) => ({
   fontSize: 10,
   position: "absolute",
@@ -80,12 +79,12 @@ const M = (o) => {
     color: "#151616",
     letterSpacing: 1
   }
-})), K = "_connect-server-anim_1lp7f_1", Q = "_loading-stripes_1lp7f_1", X = {
+})), tt = "_connect-server-anim_1lp7f_1", et = "_loading-stripes_1lp7f_1", st = {
   "connect-server-anim": "_connect-server-anim_1lp7f_1",
-  connectServerAnim: K,
+  connectServerAnim: tt,
   "loading-stripes": "_loading-stripes_1lp7f_1",
-  loadingStripes: Q
-}, Y = y(L, {
+  loadingStripes: et
+}, nt = x(F, {
   shouldForwardProp: (o) => ![""].includes(o)
 })(({ theme: o }) => ({
   top: "100%",
@@ -95,29 +94,29 @@ const M = (o) => {
   "& span": {
     height: "100%"
   }
-})), Z = ({ text: o = "Происходит подключение к серверу", className: t, ...e }) => {
-  const i = k(m.getStatusConnectSocket) === "pending";
-  return /* @__PURE__ */ R(
-    Y,
+})), ot = ({ text: o = "Происходит подключение к серверу", className: t, ...e }) => {
+  const i = R(m.getStatusConnectSocket) === "pending";
+  return /* @__PURE__ */ M(
+    nt,
     {
       in: i,
       collapsedSize: "1px",
-      className: T(X["connect-server-anim"], t),
+      className: U(st["connect-server-anim"], t),
       unmountOnExit: !0,
       ...e,
       children: o
     }
   );
-}, _ = b.memo(Z), tt = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-function et(o) {
-  return tt.test(o);
+}, it = w.memo(ot), rt = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function ct(o) {
+  return rt.test(o);
 }
-function O() {
+function L() {
   var o = URL.createObjectURL(new Blob()), t = o.toString();
   return URL.revokeObjectURL(o), t.split(/[:\/]/g).pop().toLowerCase();
 }
-O.valid = et;
-class st {
+L.valid = ct;
+class at {
   constructor() {
     r(this, "defaultProps", {
       interval: 5e3
@@ -128,25 +127,25 @@ class st {
       }, i = (f) => {
         e != null && e.controlAction && (e == null || e.controlAction(f));
       };
-      let c = !0, l, a, S;
+      let c = !0, a, l, S;
       const u = (f = !0) => {
-        const d = "Ручное завершение startActionEvery";
-        c = !1, clearInterval(l), n(null), f ? a && a({ status: f, msg: d + ": (true)" }) : S && S({ status: f, msg: d + ": (false)" });
+        const h = "Ручное завершение startActionEvery";
+        c = !1, clearInterval(a), n(null), f ? l && l({ status: f, msg: h + ": (true)" }) : S && S({ status: f, msg: h + ": (false)" });
       };
       return {
-        promise: new Promise((f, d) => {
-          a = f, S = d;
-          let p = 0, g = 0;
-          l = setInterval(
+        promise: new Promise((f, h) => {
+          l = f, S = h;
+          let g = 0, v = 0;
+          a = setInterval(
             () => {
-              if (p += e.interval, g += 1, e != null && e.cutoffTime && p > e.cutoffTime || e != null && e.countAction && (e == null ? void 0 : e.countAction) < g) {
-                c = !1, clearInterval(l), n(null), d({ status: !1, msg: Error("Время загрузки истекло") });
+              if (g += e.interval, v += 1, e != null && e.cutoffTime && g > e.cutoffTime || e != null && e.countAction && (e == null ? void 0 : e.countAction) < v) {
+                c = !1, clearInterval(a), n(null), h({ status: !1, msg: Error("Время загрузки истекло") });
                 return;
               }
-              t() && (c = !1, clearInterval(l), n(null), f({ status: !0, msg: "cb вернул true" }));
+              t() && (c = !1, clearInterval(a), n(null), f({ status: !0, msg: "cb вернул true" }));
             },
             e.interval < 200 ? 200 : e.interval
-          ), n(l), i({
+          ), n(a), i({
             getIsActiveEvent: () => c,
             stop: u
           });
@@ -164,16 +163,16 @@ class st {
       }, n * 1e3);
     });
     r(this, "oneOfPromise", (t, e, { second: n }) => new Promise((i, c) => {
-      let l = 1, a = { status: !1, msg: "" };
+      let a = 1, l = { status: !1, msg: "" };
       t().then((u) => {
-        l === 1 && (l = 0, i(u));
+        a === 1 && (a = 0, i(u));
       }).catch((u) => {
-        l === 1 && (l = 0, a.msg = u, c(u));
+        a === 1 && (a = 0, l.msg = u, c(u));
       });
       let S = setInterval(() => {
-        if (l === 1) {
-          if (l = 0, typeof e == "function") {
-            c({ status: !1, msg: "", ...e(a) });
+        if (a === 1) {
+          if (a = 0, typeof e == "function") {
+            c({ status: !1, msg: "", ...e(l) });
             return;
           }
           c({ status: !1, msg: "oneOfPromise reject" });
@@ -183,7 +182,7 @@ class st {
     }));
   }
 }
-class W {
+class H {
   constructor(t) {
     r(this, "subscribersEvents", {});
     r(this, "getListNameEvents", () => Object.keys(this.subscribersEvents));
@@ -204,7 +203,7 @@ class W {
     });
     r(this, "resetSubscribers", () => {
       const t = Object.entries(this.subscribersEvents);
-      for (const [e, n] of t)
+      for (const [e] of t)
         this.subscribersEvents[e] = [];
     });
     t.forEach((e) => {
@@ -212,7 +211,7 @@ class W {
     });
   }
 }
-class nt {
+class lt {
   constructor(t) {
     r(this, "networkInfo");
     r(this, "listUrls", []);
@@ -221,16 +220,6 @@ class nt {
       isMonitoring: !1,
       checkIntervalId: null
     });
-    r(this, "getFetchOptions", (t) => ({
-      method: "HEAD",
-      cache: "no-store",
-      signal: t.signal,
-      headers: {
-        "Cache-Control": "no-cache, no-store, must-revalidate",
-        Pragma: "no-cache",
-        Expires: "0"
-      }
-    }));
     r(this, "getIsNetwork", (t) => !["unknown", "none"].includes(t));
     r(this, "getTypeNetwork", ({ effectiveType: t, type: e }, n) => (n || n === null) && (t || e) || "none");
     /*-----------------------------------------------------------------------------*/
@@ -257,6 +246,16 @@ class nt {
   getState() {
     return this.state;
   }
+  // private getFetchOptions = (controller: AbortController) => ({
+  //   method: 'HEAD',
+  //   cache: 'no-store',
+  //   signal: controller.signal,
+  //   headers: {
+  //     'Cache-Control': 'no-cache, no-store, must-revalidate',
+  //     'Pragma': 'no-cache',
+  //     'Expires': '0'
+  //   }
+  // } as const);
   getConnection() {
     var t;
     return (t = window == null ? void 0 : window.navigator) == null ? void 0 : t.connection;
@@ -275,7 +274,7 @@ class nt {
     this.controllersEvents = { ...this.controllersEvents, ...t };
   }
   startEvents(t) {
-    var a, S, u, h;
+    var l, S, u, d;
     const { isActiveEvents: e } = this.getState();
     if (e)
       return;
@@ -286,15 +285,15 @@ class nt {
       change: new AbortController()
     };
     this.setControllersEvents(n);
-    const i = this.getConnection(), c = this.getTypeNetwork(i, window.navigator.onLine), l = this.getIsNetwork(c);
-    this.updateState(l, t), window.addEventListener("online", () => {
+    const i = this.getConnection(), c = this.getTypeNetwork(i, window.navigator.onLine), a = this.getIsNetwork(c);
+    this.updateState(a, t), window.addEventListener("online", () => {
       this.updateState(!0, t);
-    }, { signal: (a = n.online) == null ? void 0 : a.signal }), window.addEventListener("offline", () => {
+    }, { signal: (l = n.online) == null ? void 0 : l.signal }), window.addEventListener("offline", () => {
       this.updateState(!1, t);
     }, { signal: (S = n.offline) == null ? void 0 : S.signal }), (u = this.getConnection()) != null && u.addEventListener && this.getConnection().addEventListener("change", () => {
-      const f = this.getConnection(), d = this.getTypeNetwork(f, null), p = this.getIsNetwork(d);
-      this.updateState(p, t);
-    }, { signal: (h = n.change) == null ? void 0 : h.signal });
+      const f = this.getConnection(), h = this.getTypeNetwork(f, null), g = this.getIsNetwork(h);
+      this.updateState(g, t);
+    }, { signal: (d = n.change) == null ? void 0 : d.signal });
   }
   stopEvents() {
     const { isActiveEvents: t } = this.getState();
@@ -363,7 +362,7 @@ class nt {
     return this.networkInfo;
   }
 }
-class ot {
+class ut {
   constructor() {
     r(this, "options", {
       timeReConnect: 5e3,
@@ -376,7 +375,7 @@ class ot {
       arrSaveReq: []
     });
     r(this, "initOptions", !1);
-    r(this, "events", new W(["status", "msg", "error"]));
+    r(this, "events", new H(["status", "msg", "error"]));
     r(this, "stateDefault", this.copyState(this.state));
     r(this, "eventListener", (t) => {
       var n, i;
@@ -387,8 +386,8 @@ class ot {
         ["error", this.errHandler]
       ];
       for (let c = 0; c < e.length; c++) {
-        const [l, a] = e[c];
-        t === "add" ? (n = this.state.ws) == null || n.addEventListener(l, a) : (i = this.state.ws) == null || i.removeEventListener(l, a);
+        const [a, l] = e[c];
+        t === "add" ? (n = this.state.ws) == null || n.addEventListener(a, l) : (i = this.state.ws) == null || i.removeEventListener(a, l);
       }
     });
     r(this, "openHandler", () => {
@@ -402,8 +401,8 @@ class ot {
       try {
         const { action: n } = e, i = this.findDataRequestByAction(n);
         if (i) {
-          const { cb: c, ...l } = i, { payload: a, ...S } = l;
-          this.events.publish("msg", { ...e, request: { ...S, ...a } });
+          const { cb: c, ...a } = i, { payload: l, ...S } = a;
+          this.events.publish("msg", { ...e, request: { ...S, ...l } });
         } else
           this.events.publish("msg", e);
         n && this.filterSaveItemsByResponse(e);
@@ -490,7 +489,6 @@ class ot {
     });
   }
 }
-var E, it;
 const s = class s {
   static copyState(t) {
     return JSON.parse(JSON.stringify(t));
@@ -514,17 +512,17 @@ 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(t, e) {
-    const { action: n, ...i } = t, c = O(), l = Date.now();
+    const { action: n, ...i } = t, c = i != null && i.request_id ? i.request_id : L(), a = Date.now();
     s.wsApi.setRequestSave({
       requestAction: n,
-      reqId: c,
-      requestTime: l,
+      request_id: c,
+      requestTime: a,
       payload: { action: n, ...i },
       cb: e
     });
-    const a = s.wsApi.getSocket();
-    if (!a || a.readyState !== 1) {
-      console.log("Нет подключения к сокету");
+    const l = s.wsApi.getSocket();
+    if (!l || l.readyState !== 1) {
+      console.log("Нет подключения к сокету. Запрос сохранён в getRequestSave");
       return;
     }
     s.wsApi.send(t);
@@ -532,58 +530,58 @@ const s = class s {
   static stopReConnect(t) {
     console.dir("функция stop не присвоена к stopReConnect");
   }
-  static async request(t, e, n = {}) {
-    return new Promise((i, c) => {
-      var d, p;
-      if ((d = n == null ? void 0 : n.signal) != null && d.aborted) {
-        c(new DOMException("Aborted", "AbortError"));
+  static async request(t, e = {}) {
+    return new Promise((n, i) => {
+      var h, g;
+      if ((h = e == null ? void 0 : e.signal) != null && h.aborted) {
+        i(new DOMException("Aborted", "AbortError"));
         return;
       }
-      const l = O(), a = Date.now();
+      const c = t.action, a = t.request_id ? t.request_id : L(), l = Date.now();
       s.wsApi.setRequestSave({
-        requestAction: t,
-        reqId: l,
-        requestTime: a,
-        payload: e,
+        requestAction: c,
+        request_id: a,
+        requestTime: l,
+        payload: t,
         cb: void 0
       });
       let S;
-      n != null && n.timeout && (S = setTimeout(() => {
-        s.off("msg", h), s.off("error", u), c(new Error("Request timeout"));
-      }, n == null ? void 0 : n.timeout));
-      const u = (g) => {
-        s.off("msg", h), s.off("error", u), c(g);
-      }, h = (g) => {
-        var N;
-        const A = this.wsApi.findDataRequestByAction(t);
-        ((N = g == null ? void 0 : g.request) == null ? void 0 : N.requestAction) === A.requestAction && (s.off("msg", h), s.off("error", u), i({ ...g }));
+      e != null && e.timeout && (S = setTimeout(() => {
+        s.off("msg", d), s.off("error", u), i(new Error("Request timeout"));
+      }, e == null ? void 0 : e.timeout));
+      const u = (v) => {
+        s.off("msg", d), s.off("error", u), i(v);
+      }, d = (v) => {
+        var y;
+        const N = this.wsApi.findDataRequestByAction(c);
+        ((y = v == null ? void 0 : v.request) == null ? void 0 : y.requestAction) === N.requestAction && (s.off("msg", d), s.off("error", u), n({ ...v }));
       };
-      s.on("msg", h), s.on("error", u), (p = n == null ? void 0 : n.signal) == null || p.addEventListener("abort", () => {
+      s.on("msg", d), s.on("error", u), (g = e == null ? void 0 : e.signal) == null || g.addEventListener("abort", () => {
         debugger;
-        S && clearTimeout(S), s.off("msg", h), s.off("error", u), c(new DOMException("Aborted", "AbortError"));
+        S && clearTimeout(S), s.off("msg", d), s.off("error", u), i(new DOMException("Aborted", "AbortError"));
       });
       const f = s.wsApi.getSocket();
       if (!f || f.readyState !== 1) {
-        console.log("Нет подключения к сокету");
+        const v = "Нет подключения к сокету";
+        console.error(v), i(new Error(v));
         return;
       }
-      s.wsApi.send(e);
+      s.wsApi.send(t);
     });
   }
 };
-E = new WeakSet(), it = function() {
-}, q(s, E), r(s, "state", {
+r(s, "state", {
   isDisconnect: !0,
   isActiveReConnect: !1,
   isOfflineSocket: !0,
-  isReady: !1,
   isGotWasFirstConnection: !1,
   isStartCheckNetwork: !1
+  //не используеться
 }), r(s, "options", {
   isReConnectNetworkOnline: !1,
   listUrlsCheckConnectNetwork: ["https://jsonplaceholder.typicode.com/posts/1"]
-}), r(s, "wsApi", new ot()), r(s, "delay", new st()), // private static internetControl:NetworkControls | null = null
-r(s, "networkTicker", null), r(s, "events", new W(["timeOffReConnect", "reConnect", "network"])), r(s, "saveID", {
+}), r(s, "wsApi", new ut()), r(s, "delay", new at()), // private static internetControl:NetworkControls | null = null
+r(s, "networkTicker", null), r(s, "events", new H(["timeOffReConnect", "reConnect", "network"])), r(s, "saveID", {
   idReConnect: null,
   checkConnect: null
 }), r(s, "stateDefault", s.copyState(s.state)), r(s, "setInfoConnect", (t) => {
@@ -610,63 +608,91 @@ r(s, "setNetworkStatus", (t) => {
   s.events.publish("network", t), t.isNetwork ? s.online() : s.offline();
 }), r(s, "init", (t) => {
   const { WsOptions: e, SocketApiOptions: n } = s.splitOptions(t);
-  s.networkTicker = new nt(n.listUrlsCheckConnectNetwork ?? []), s.networkTicker.startEvents((i) => {
+  s.networkTicker = new lt(n.listUrlsCheckConnectNetwork ?? []), s.networkTicker.startEvents((i) => {
     s.setNetworkStatus(i);
   }), s.setOptions(n), s.wsApi.init(e);
 }), /*------------------------------------------------------------------------------------------------------*/
 r(s, "socketReConnect", () => {
   if (s.wsApi.getIsInitWS())
-    if (console.log("reconnect"), s.saveID.idReConnect)
+    if (console.log("reConnect"), s.saveID.idReConnect)
       console.groupCollapsed("Процесс socketReConnect уже запущен"), console.log("SocketApi.saveID: ", s.saveID), console.groupEnd();
     else {
       s.setStatusReConnect(!0), s.connect();
-      const { timeReConnect: t, numberOfRepit: e } = s.wsApi.getOptions();
+      const { timeReConnect: t, numberOfRepit: e } = s.wsApi.getOptions(), i = e && e > 1 ? e - 1 : 3;
       s.delay.startActionEvery(
         () => (console.log("reconnect:>>delay"), s.wsApi.getStatusSocket() === "ready" ? (console.dir("Подключение установлено"), !0) : (s.connect(), !1)),
         {
           interval: t,
-          countAction: e,
-          watchIdInterval: (i) => {
-            s.saveID.idReConnect = i;
+          countAction: i,
+          watchIdInterval: (a) => {
+            s.saveID.idReConnect = a;
           },
-          controlAction: ({ stop: i, getIsActiveEvent: c }) => {
-            s.stopReConnect = i;
+          controlAction: ({ stop: a, getIsActiveEvent: l }) => {
+            s.stopReConnect = a;
           }
         }
-      ).promise.then((i) => {
-        s.setInfoConnect(i);
-      }).catch((i) => {
-        s.setInfoConnect(i);
+      ).promise.then((a) => {
+        s.setInfoConnect(a);
+      }).catch((a) => {
+        s.setInfoConnect(a);
       });
     }
 });
-let v = s;
-const rt = (o) => {
-  const { isNetwork: t, typeNetwork: e } = o, { isModal: n } = k(m.getInfoNoConnectServer), i = k(m.getStatusIsReConnectSocket), c = k(m.getIsDisableConnectSocket), l = k(m.getStatusConnectSocket);
-  return I(() => (v.init(o.init), typeof o.onMount == "function" && o.onMount(), v.on("status", (a) => {
-    console.log("status", a), w.setStatusConnectSocket({ statusConnect: a });
-  }), v.on("error", (a) => {
-    console.log("error: ", a);
-  }), v.on("reConnect", (a) => {
-    console.log("reConnect", a);
-    const S = C.getState(), { isReConnectSocket: u, infoNoConnectServer: { isModal: h } } = S;
-    u !== a && w.setStatusIsReConnectSocket({ isReConnectSocket: a }), h && a && w.setInfoNoConnectServer({ isModal: !1 });
-  }), v.on("timeOffReConnect", (a) => {
-    if (console.log("timeOffReConnect: ", a), w.setIsOfflineSocket({ isOfflineSocket: !a.status }), !a.status) {
-      const S = C.getState(), { infoNoConnectServer: { isModal: u, isSelectOffline: h } } = S;
+let p = s;
+const ft = (o, t = {}) => {
+  const e = o.action, { skip: n = !1, timeout: i = 5e3, onSuccess: c, onError: a } = t, [l, S] = O(null), [u, d] = O(null), [f, h] = O(!1), [g, v] = O(!1), [N, y] = O(!1), k = $(null), q = A(async () => {
+    if (n) return;
+    h(!0), v(!1), y(!1), d(null), S(null), k.current = new AbortController();
+    const D = k.current.signal;
+    try {
+      const I = await p.request(
+        o,
+        { timeout: i, signal: D }
+      );
+      if (D.aborted) return;
+      S(I), y(!0), c == null || c(I);
+    } catch (I) {
+      if (D.aborted) return;
+      const B = I instanceof Error ? I : new Error(String(I));
+      d(B), v(!0), a == null || a(B);
+    } finally {
+      D.aborted || h(!1);
+    }
+  }, [n, e, o, i, c, a]);
+  E(() => (n || q(), () => {
+    k.current && k.current.abort();
+  }), [q, n]);
+  const j = A(() => (k.current && k.current.abort(), q()), [q]), J = A(() => {
+    k.current && (k.current.abort(), h(!1));
+  }, []);
+  return { data: l, error: u, isLoading: f, isError: g, isSuccess: N, refetch: j, abort: J };
+}, Ot = (o, t) => ft(o, t), St = (o) => {
+  const { isNetwork: t, typeNetwork: e } = o, { isModal: n } = R(m.getInfoNoConnectServer), i = R(m.getStatusIsReConnectSocket), c = R(m.getIsDisableConnectSocket), a = R(m.getStatusConnectSocket);
+  return E(() => (p.init(o.init), typeof o.onMount == "function" && o.onMount(), p.on("status", (l) => {
+    const S = b.getState(), { isReadySocket: u } = S;
+    l !== "ready" && u && C.setStatusReady({ isReadySocket: !1 }), !u && l === "ready" && C.setStatusReady({ isReadySocket: !0 }), C.setStatusConnectSocket({ statusConnect: l });
+  }), p.on("error", (l) => {
+    console.log("error: ", l);
+  }), p.on("reConnect", (l) => {
+    console.log('on"reConnect" (status): ', l);
+    const S = b.getState(), { isReConnectSocket: u, infoNoConnectServer: { isModal: d } } = S;
+    u !== l && C.setStatusIsReConnectSocket({ isReConnectSocket: l }), d && l && C.setInfoNoConnectServer({ isModal: !1 });
+  }), p.on("timeOffReConnect", (l) => {
+    if (console.log("timeOffReConnect: ", l), C.setIsOfflineSocket({ isOfflineSocket: !l.status }), !l.status) {
+      const S = b.getState(), { infoNoConnectServer: { isModal: u, isSelectOffline: d } } = S;
       let f = !1;
-      !u && !h && (f = !0), f && w.setInfoNoConnectServer({ isModal: f });
+      !u && !d && (f = !0), f && C.setInfoNoConnectServer({ isModal: f });
     }
-  }), v.connect(), () => {
-    typeof o.onUnmount == "function" && o.onUnmount(), console.dir("disconnect"), v.disconnect();
-  }), []), I(() => {
-    t && !c && !n && !i && ["close"].includes(l) && e !== "none" && (console.log("Запущен socketReConnect"), v.socketReConnect());
-  }, [c, n, i, l, e, t]), I(() => {
-    i && (!t || l === "ready") && (console.log("Запущен stopReConnect"), v.stopReConnect());
-  }, [i, t, l]), I(() => {
-    c && (console.log("isDisableConnectSocket: ", c), w.setIsOfflineSocket({ isOfflineSocket: !0 }), v.close());
+  }), p.connect(), () => {
+    typeof o.onUnmount == "function" && o.onUnmount(), console.dir("disconnect"), p.disconnect();
+  }), []), E(() => {
+    t && !c && !n && !i && ["close"].includes(a) && e !== "none" && (console.log("Запущен socketReConnect"), p.socketReConnect());
+  }, [c, n, i, a, e, t]), E(() => {
+    i && (!t || a === "ready") && (console.log("Запущен stopReConnect"), p.stopReConnect());
+  }, [i, t, a]), E(() => {
+    c && (console.log("isDisableConnectSocket: ", c), C.setIsOfflineSocket({ isOfflineSocket: !0 }), p.close());
   }, [c]), null;
-}, ct = b.memo(rt), at = y(L, {
+}, dt = w.memo(St), ht = x(F, {
   shouldForwardProp: (o) => ![""].includes(o)
 })(({ theme: o }) => ({
   bottom: "100%",
@@ -676,41 +702,43 @@ const rt = (o) => {
   "& span": {
     padding: "1px 10px"
   }
-})), lt = ({ children: o, className: t, isNetwork: e, ...n }) => {
-  const i = k(m.getIsOfflineSocket), c = k(m.getIsDisableConnectSocket), l = i || !e, a = "Оффлайн";
-  return /* @__PURE__ */ R(
-    at,
+})), vt = ({ children: o, className: t, isNetwork: e, ...n }) => {
+  const i = R(m.getIsOfflineSocket), c = R(m.getIsDisableConnectSocket), a = i || !e, l = "Оффлайн";
+  return /* @__PURE__ */ M(
+    ht,
     {
-      in: l,
-      className: T("socket-offline", t),
+      in: a,
+      className: U("socket-offline", t),
       ...n,
-      children: typeof o == "function" ? o({ isDisableConnectSocket: c }) : c ? `Режим ${a}` : a
+      children: typeof o == "function" ? o({ isDisableConnectSocket: c }) : c ? `Режим ${l}` : l
     }
   );
-}, ut = b.memo(lt), ft = ({ children: o }) => {
-  const t = x(() => {
-    w.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !1 });
+}, pt = w.memo(vt), gt = ({ children: o }) => {
+  const t = A(() => {
+    C.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !1 });
   }, []);
   return o({ reConnect: t });
-}, St = b.memo(ft), ht = ({ children: o }) => {
-  const t = x(() => {
-    w.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !0 }), w.setIsDisableConnectSocket({ isDisableConnectSocket: !0 });
+}, Ct = w.memo(gt), bt = ({ children: o }) => {
+  const t = A(() => {
+    C.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !0 }), C.setIsDisableConnectSocket({ isDisableConnectSocket: !0 });
   }, []);
   return o({ offlineActive: t });
-}, dt = b.memo(ht), bt = {
-  ConnectDetection: _,
-  OfflineDetection: ut,
+}, wt = w.memo(bt), Et = {
+  ConnectDetection: it,
+  OfflineDetection: pt,
   Buttons: {
-    OfflineActive: dt,
-    ReConnect: St
+    OfflineActive: wt,
+    ReConnect: Ct
   },
-  Initialization: ct
+  Initialization: dt
 };
 export {
-  bt as Socket,
-  v as SocketApi,
-  w as socketActions,
+  Et as Socket,
+  p as SocketApi,
+  Ot as createRequestSocketApi,
+  C as socketActions,
   m as socketSelectors,
-  C as socketStore,
-  k as useSocketSelector
+  b as socketStore,
+  ft as useRequestSocketApi,
+  R as useSocketSelector
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rc-lib-ui",
   "private": false,
-  "version": "1.1.28",
+  "version": "1.1.46",
   "author": "SinGlEBW",
   "license": "MIT",
   "type": "module",
@@ -40,7 +40,7 @@
   ],
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "tsc --project tsconfig.prod.json && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
     "send": "node publishVersion.js"

package/dist/NetworkAndSocket/index.d.ts

@@ -1,2 +0,0 @@
-export * from './Network';
-export * from './Socket';