rc-lib-ui 1.1.21 → 1.1.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/NetworkAndSocket/Socket/components/Buttons/OfflineButton.d.ts +9 -0
- package/dist/NetworkAndSocket/Socket/components/Buttons/ReConnect.d.ts +9 -0
- package/dist/NetworkAndSocket/Socket/components/index.d.ts +6 -2
- package/dist/socket.js +68 -60
- package/package.json +1 -1
- package/dist/NetworkAndSocket/Socket/components/ReConnectButton/ReConnectButton.d.ts +0 -8
package/README.md
CHANGED
|
@@ -171,6 +171,7 @@ import { Socket } from "rc-lib-ui/socket";
|
|
|
171
171
|
}}
|
|
172
172
|
/>
|
|
173
173
|
//Воздействие на сокет
|
|
174
|
-
<Socket.
|
|
174
|
+
<Socket.Buttons.OfflineActive chidlren={({offlineActive}) => <Button onClick={offlineActive}/> } />,
|
|
175
|
+
<Socket.Buttons.ReConnect chidlren={({reConnect}) => <Button onClick={reConnect}/> } />,
|
|
175
176
|
|
|
176
177
|
```
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { default as React } from 'react';
|
|
2
|
+
interface ButtonActionsProps {
|
|
3
|
+
offlineActive: () => void;
|
|
4
|
+
}
|
|
5
|
+
export interface OfflineButtonProps {
|
|
6
|
+
children: (actions: ButtonActionsProps) => React.ReactNode;
|
|
7
|
+
}
|
|
8
|
+
export declare const OfflineButton: React.NamedExoticComponent<OfflineButtonProps>;
|
|
9
|
+
export {};
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { default as React } from 'react';
|
|
2
|
+
interface ButtonActionsProps {
|
|
3
|
+
reConnect: () => void;
|
|
4
|
+
}
|
|
5
|
+
export interface ReConnectButtonProps {
|
|
6
|
+
children: (actions: ButtonActionsProps) => React.ReactNode;
|
|
7
|
+
}
|
|
8
|
+
export declare const ReConnect: React.NamedExoticComponent<ReConnectButtonProps>;
|
|
9
|
+
export {};
|
|
@@ -2,11 +2,15 @@ import { default as React } from 'react';
|
|
|
2
2
|
import { SocketConnectDetectionProps } from './ConnectDetection/ConnectDetection';
|
|
3
3
|
import { InitializationSocketProps } from './Initialization/Initialization';
|
|
4
4
|
import { SocketOfflineDetectionPayloadProps, SocketOfflineDetectionProps } from './OfflineDetection/OfflineDetection';
|
|
5
|
-
import { ReConnectButtonProps } from './
|
|
5
|
+
import { ReConnectButtonProps } from './Buttons/ReConnect';
|
|
6
|
+
import { OfflineButtonProps } from './Buttons/OfflineButton';
|
|
6
7
|
export declare const Socket: {
|
|
7
8
|
ConnectDetection: React.NamedExoticComponent<SocketConnectDetectionProps>;
|
|
8
9
|
OfflineDetection: React.NamedExoticComponent<SocketOfflineDetectionProps>;
|
|
9
|
-
|
|
10
|
+
Buttons: {
|
|
11
|
+
OfflineActive: React.NamedExoticComponent<OfflineButtonProps>;
|
|
12
|
+
ReConnect: React.NamedExoticComponent<ReConnectButtonProps>;
|
|
13
|
+
};
|
|
10
14
|
Initialization: React.NamedExoticComponent<InitializationSocketProps>;
|
|
11
15
|
};
|
|
12
16
|
export { type InitializationSocketProps, type SocketConnectDetectionProps, type SocketOfflineDetectionPayloadProps, type SocketOfflineDetectionProps };
|
package/dist/socket.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import './socket.css';var
|
|
2
|
-
var
|
|
1
|
+
import './socket.css';var U = Object.defineProperty;
|
|
2
|
+
var H = (o) => {
|
|
3
3
|
throw TypeError(o);
|
|
4
4
|
};
|
|
5
|
-
var
|
|
6
|
-
var r = (o, t, e) =>
|
|
7
|
-
var N = (o, t, e) => t.has(o) ?
|
|
8
|
-
import { jsx as
|
|
9
|
-
import
|
|
10
|
-
import { styled as
|
|
11
|
-
import
|
|
5
|
+
var P = (o, t, e) => t in o ? U(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
|
|
6
|
+
var r = (o, t, e) => P(o, typeof t != "symbol" ? t + "" : t, e);
|
|
7
|
+
var N = (o, t, e) => t.has(o) ? H("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(o) : t.set(o, e);
|
|
8
|
+
import { jsx as R } from "react/jsx-runtime";
|
|
9
|
+
import w, { useEffect as I, useCallback as M } from "react";
|
|
10
|
+
import { styled as x, Collapse as j } from "@mui/material";
|
|
11
|
+
import T from "classnames";
|
|
12
12
|
const q = (o) => {
|
|
13
13
|
let t;
|
|
14
14
|
const e = /* @__PURE__ */ new Set(), n = (u, h) => {
|
|
@@ -19,19 +19,19 @@ const q = (o) => {
|
|
|
19
19
|
}
|
|
20
20
|
}, i = () => t, a = { setState: n, getState: i, getInitialState: () => S, subscribe: (u) => (e.add(u), () => e.delete(u)) }, S = t = o(n, i, a);
|
|
21
21
|
return a;
|
|
22
|
-
},
|
|
22
|
+
}, F = (o) => o ? q(o) : q, J = (o) => o;
|
|
23
23
|
function z(o, t = J) {
|
|
24
|
-
const e =
|
|
24
|
+
const e = w.useSyncExternalStore(
|
|
25
25
|
o.subscribe,
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
w.useCallback(() => t(o.getState()), [o, t]),
|
|
27
|
+
w.useCallback(() => t(o.getInitialState()), [o, t])
|
|
28
28
|
);
|
|
29
|
-
return
|
|
29
|
+
return w.useDebugValue(e), e;
|
|
30
30
|
}
|
|
31
31
|
const D = (o) => {
|
|
32
|
-
const t =
|
|
32
|
+
const t = F(o), e = (n) => z(t, n);
|
|
33
33
|
return Object.assign(e, t), e;
|
|
34
|
-
}, $ = (o) => o ? D(o) : D,
|
|
34
|
+
}, $ = (o) => o ? D(o) : D, B = {
|
|
35
35
|
statusConnect: "disconnect",
|
|
36
36
|
isOfflineSocket: !1,
|
|
37
37
|
//Текущее состояние сокета. Зависит от события timeOffReConnect и если задаёться isDisableConnectSocket: true
|
|
@@ -42,28 +42,28 @@ const D = (o) => {
|
|
|
42
42
|
isSelectOffline: !1
|
|
43
43
|
//Для того что бы 2й раз окно не показывать
|
|
44
44
|
}
|
|
45
|
-
}, G = JSON.parse(JSON.stringify(
|
|
45
|
+
}, G = JSON.parse(JSON.stringify(B)), C = $(() => B), b = {
|
|
46
46
|
resetState: () => C.setState(G),
|
|
47
47
|
setStatusConnectSocket: ({ statusConnect: o }) => C.setState({ statusConnect: o }),
|
|
48
48
|
setStatusIsReConnectSocket: ({ isReConnectSocket: o }) => C.setState({ isReConnectSocket: o }),
|
|
49
49
|
setIsOfflineSocket: ({ isOfflineSocket: o }) => C.setState({ isOfflineSocket: o }),
|
|
50
50
|
setInfoNoConnectServer: (o) => C.setState((t) => ({ infoNoConnectServer: { ...t.infoNoConnectServer, ...o } })),
|
|
51
51
|
setIsDisableConnectSocket: ({ isDisableConnectSocket: o }) => C.setState({ isDisableConnectSocket: o })
|
|
52
|
-
},
|
|
52
|
+
}, m = {
|
|
53
53
|
getStatusConnectSocket: (o) => o.statusConnect,
|
|
54
54
|
getStatusIsReConnectSocket: (o) => o.isReConnectSocket,
|
|
55
55
|
getIsOfflineSocket: (o) => o.isOfflineSocket,
|
|
56
56
|
getInfoNoConnectServer: (o) => o.infoNoConnectServer,
|
|
57
57
|
getIsDisableConnectSocket: (o) => o.isDisableConnectSocket
|
|
58
|
-
},
|
|
58
|
+
}, k = (o) => C(o), V = x("span")({
|
|
59
59
|
backgroundColor: "rgba(0,0,0,0.3)",
|
|
60
60
|
color: "#fff",
|
|
61
61
|
display: "flex",
|
|
62
62
|
alignItems: "center",
|
|
63
63
|
padding: "1px 10px",
|
|
64
64
|
borderRadius: "3px 3px 3px 3px"
|
|
65
|
-
}),
|
|
66
|
-
({ children: o, itemSpan: t, ...e }) => /* @__PURE__ */
|
|
65
|
+
}), L = x(
|
|
66
|
+
({ children: o, itemSpan: t, ...e }) => /* @__PURE__ */ R(j, { ...e, unmountOnExit: !0, children: /* @__PURE__ */ R(V, { ...t, children: o }) })
|
|
67
67
|
)(({ theme: o }) => ({
|
|
68
68
|
fontSize: 10,
|
|
69
69
|
position: "absolute",
|
|
@@ -93,20 +93,20 @@ const D = (o) => {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
}, Z = ({ text: o = "Происходит подключение к серверу", className: t }) => {
|
|
96
|
-
const n = m
|
|
97
|
-
return /* @__PURE__ */
|
|
98
|
-
|
|
96
|
+
const n = k(m.getStatusConnectSocket) === "pending";
|
|
97
|
+
return /* @__PURE__ */ R(
|
|
98
|
+
L,
|
|
99
99
|
{
|
|
100
100
|
in: n,
|
|
101
101
|
sx: Y.callapse,
|
|
102
102
|
collapsedSize: "1px",
|
|
103
|
-
className:
|
|
103
|
+
className: T(X["connect-server-anim"], t),
|
|
104
104
|
unmountOnExit: !0,
|
|
105
105
|
itemSpan: { sx: { height: "100%" } },
|
|
106
106
|
children: o
|
|
107
107
|
}
|
|
108
108
|
);
|
|
109
|
-
}, _ =
|
|
109
|
+
}, _ = w.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;
|
|
110
110
|
function et(o) {
|
|
111
111
|
return tt.test(o);
|
|
112
112
|
}
|
|
@@ -181,7 +181,7 @@ class st {
|
|
|
181
181
|
}));
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
|
-
class
|
|
184
|
+
class W {
|
|
185
185
|
constructor(t) {
|
|
186
186
|
r(this, "subscribersEvents", {});
|
|
187
187
|
r(this, "getListNameEvents", () => Object.keys(this.subscribersEvents));
|
|
@@ -374,7 +374,7 @@ class ot {
|
|
|
374
374
|
arrSaveReq: []
|
|
375
375
|
});
|
|
376
376
|
r(this, "initOptions", !1);
|
|
377
|
-
r(this, "events", new
|
|
377
|
+
r(this, "events", new W(["status", "msg", "error"]));
|
|
378
378
|
r(this, "stateDefault", this.copyState(this.state));
|
|
379
379
|
r(this, "eventListener", (t) => {
|
|
380
380
|
var n, i;
|
|
@@ -488,7 +488,7 @@ class ot {
|
|
|
488
488
|
});
|
|
489
489
|
}
|
|
490
490
|
}
|
|
491
|
-
var
|
|
491
|
+
var O, it;
|
|
492
492
|
const s = class s {
|
|
493
493
|
static copyState(t) {
|
|
494
494
|
return JSON.parse(JSON.stringify(t));
|
|
@@ -553,8 +553,8 @@ const s = class s {
|
|
|
553
553
|
s.off("msg", h), s.off("error", u), c(g);
|
|
554
554
|
}, h = (g) => {
|
|
555
555
|
var A;
|
|
556
|
-
const
|
|
557
|
-
((A = g == null ? void 0 : g.request) == null ? void 0 : A.requestAction) ===
|
|
556
|
+
const E = this.wsApi.findDataRequestByAction(t);
|
|
557
|
+
((A = g == null ? void 0 : g.request) == null ? void 0 : A.requestAction) === E.requestAction && (s.off("msg", h), s.off("error", u), i({ ...g }));
|
|
558
558
|
};
|
|
559
559
|
s.on("msg", h), s.on("error", u), (p = n == null ? void 0 : n.signal) == null || p.addEventListener("abort", () => {
|
|
560
560
|
debugger;
|
|
@@ -569,8 +569,8 @@ const s = class s {
|
|
|
569
569
|
});
|
|
570
570
|
}
|
|
571
571
|
};
|
|
572
|
-
|
|
573
|
-
}, N(s,
|
|
572
|
+
O = new WeakSet(), it = function() {
|
|
573
|
+
}, N(s, O), r(s, "state", {
|
|
574
574
|
isDisconnect: !0,
|
|
575
575
|
isActiveReConnect: !1,
|
|
576
576
|
isOfflineSocket: !0,
|
|
@@ -581,7 +581,7 @@ E = new WeakSet(), it = function() {
|
|
|
581
581
|
isReConnectNetworkOnline: !1,
|
|
582
582
|
listUrlsCheckConnectNetwork: ["https://jsonplaceholder.typicode.com/posts/1"]
|
|
583
583
|
}), r(s, "wsApi", new ot()), r(s, "delay", new st()), // private static internetControl:NetworkControls | null = null
|
|
584
|
-
r(s, "networkTicker", null), r(s, "events", new
|
|
584
|
+
r(s, "networkTicker", null), r(s, "events", new W(["timeOffReConnect", "reConnect", "network"])), r(s, "saveID", {
|
|
585
585
|
idReConnect: null,
|
|
586
586
|
checkConnect: null
|
|
587
587
|
}), r(s, "stateDefault", s.copyState(s.state)), r(s, "setInfoConnect", (t) => {
|
|
@@ -640,31 +640,31 @@ r(s, "socketReConnect", () => {
|
|
|
640
640
|
});
|
|
641
641
|
let d = s;
|
|
642
642
|
const rt = (o) => {
|
|
643
|
-
const { isNetwork: t, typeNetwork: e } = o, { isModal: n } = m
|
|
644
|
-
return
|
|
645
|
-
console.log("status", a),
|
|
643
|
+
const { isNetwork: t, typeNetwork: e } = o, { isModal: n } = k(m.getInfoNoConnectServer), i = k(m.getStatusIsReConnectSocket), c = k(m.getIsDisableConnectSocket), l = k(m.getStatusConnectSocket);
|
|
644
|
+
return I(() => (d.init(o.init), typeof o.onMount == "function" && o.onMount(), d.on("status", (a) => {
|
|
645
|
+
console.log("status", a), b.setStatusConnectSocket({ statusConnect: a });
|
|
646
646
|
}), d.on("error", (a) => {
|
|
647
647
|
console.log("error: ", a);
|
|
648
648
|
}), d.on("reConnect", (a) => {
|
|
649
649
|
console.log("reConnect", a);
|
|
650
650
|
const S = C.getState(), { isReConnectSocket: u, infoNoConnectServer: { isModal: h } } = S;
|
|
651
|
-
u !== a &&
|
|
651
|
+
u !== a && b.setStatusIsReConnectSocket({ isReConnectSocket: a }), h && a && b.setInfoNoConnectServer({ isModal: !1 });
|
|
652
652
|
}), d.on("timeOffReConnect", (a) => {
|
|
653
|
-
if (console.log("timeOffReConnect: ", a),
|
|
653
|
+
if (console.log("timeOffReConnect: ", a), b.setIsOfflineSocket({ isOfflineSocket: !a.status }), !a.status) {
|
|
654
654
|
const S = C.getState(), { infoNoConnectServer: { isModal: u, isSelectOffline: h } } = S;
|
|
655
655
|
let f = !1;
|
|
656
|
-
!u && !h && (f = !0), f &&
|
|
656
|
+
!u && !h && (f = !0), f && b.setInfoNoConnectServer({ isModal: f });
|
|
657
657
|
}
|
|
658
658
|
}), d.connect(), () => {
|
|
659
659
|
typeof o.onUnmount == "function" && o.onUnmount(), console.dir("disconnect"), d.disconnect();
|
|
660
|
-
}), []),
|
|
660
|
+
}), []), I(() => {
|
|
661
661
|
t && !c && !n && !i && ["close"].includes(l) && e !== "none" && (console.log("Запущен socketReConnect"), d.socketReConnect());
|
|
662
|
-
}, [c, n, i, l, e, t]),
|
|
662
|
+
}, [c, n, i, l, e, t]), I(() => {
|
|
663
663
|
i && (!t || l === "ready") && (console.log("Запущен stopReConnect"), d.stopReConnect());
|
|
664
|
-
}, [i, t, l]),
|
|
665
|
-
c && (console.log("isDisableConnectSocket: ", c),
|
|
664
|
+
}, [i, t, l]), I(() => {
|
|
665
|
+
c && (console.log("isDisableConnectSocket: ", c), b.setIsOfflineSocket({ isOfflineSocket: !0 }), d.close());
|
|
666
666
|
}, [c]), null;
|
|
667
|
-
}, ct =
|
|
667
|
+
}, ct = w.memo(rt), at = {
|
|
668
668
|
callapse: {
|
|
669
669
|
// top: '100%',
|
|
670
670
|
bottom: "100%",
|
|
@@ -672,13 +672,13 @@ const rt = (o) => {
|
|
|
672
672
|
"& .MuiCollapse-wrapper": {}
|
|
673
673
|
}
|
|
674
674
|
}, lt = ({ children: o, className: t, isNetwork: e }) => {
|
|
675
|
-
const n = m
|
|
676
|
-
return /* @__PURE__ */
|
|
677
|
-
|
|
675
|
+
const n = k(m.getIsOfflineSocket), i = k(m.getIsDisableConnectSocket), c = n || !e, l = "Оффлайн";
|
|
676
|
+
return /* @__PURE__ */ R(
|
|
677
|
+
L,
|
|
678
678
|
{
|
|
679
679
|
in: c,
|
|
680
680
|
sx: { ...at.callapse },
|
|
681
|
-
className:
|
|
681
|
+
className: T("socket-offline bg-gradient bg-danger", t),
|
|
682
682
|
itemSpan: {
|
|
683
683
|
sx: {
|
|
684
684
|
padding: "1px 10px"
|
|
@@ -691,22 +691,30 @@ const rt = (o) => {
|
|
|
691
691
|
children: typeof o == "function" ? o({ isDisableConnectSocket: i }) : i ? `Режим ${l}` : l
|
|
692
692
|
}
|
|
693
693
|
);
|
|
694
|
-
}, ut =
|
|
695
|
-
const t =
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
}, St =
|
|
694
|
+
}, ut = w.memo(lt), ft = ({ children: o }) => {
|
|
695
|
+
const t = M(() => {
|
|
696
|
+
b.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !1 });
|
|
697
|
+
}, []);
|
|
698
|
+
return o({ reConnect: t });
|
|
699
|
+
}, St = w.memo(ft), ht = ({ children: o }) => {
|
|
700
|
+
const t = M(() => {
|
|
701
|
+
b.setInfoNoConnectServer({ isModal: !1, isSelectOffline: !0 }), b.setIsDisableConnectSocket({ isDisableConnectSocket: !0 });
|
|
702
|
+
}, []);
|
|
703
|
+
return o({ offlineActive: t });
|
|
704
|
+
}, vt = w.memo(ht), wt = {
|
|
700
705
|
ConnectDetection: _,
|
|
701
706
|
OfflineDetection: ut,
|
|
702
|
-
|
|
707
|
+
Buttons: {
|
|
708
|
+
OfflineActive: vt,
|
|
709
|
+
ReConnect: St
|
|
710
|
+
},
|
|
703
711
|
Initialization: ct
|
|
704
712
|
};
|
|
705
713
|
export {
|
|
706
|
-
|
|
714
|
+
wt as Socket,
|
|
707
715
|
d as SocketApi,
|
|
708
|
-
|
|
709
|
-
|
|
716
|
+
b as socketActions,
|
|
717
|
+
m as socketSelectors,
|
|
710
718
|
C as socketStore,
|
|
711
|
-
|
|
719
|
+
k as useSocketSelector
|
|
712
720
|
};
|
package/package.json
CHANGED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { default as React } from 'react';
|
|
2
|
-
export interface ButtonActionsProps {
|
|
3
|
-
setDisableConnectSocket: () => void;
|
|
4
|
-
}
|
|
5
|
-
export interface ReConnectButtonProps {
|
|
6
|
-
children: (actions: ButtonActionsProps) => React.ReactNode;
|
|
7
|
-
}
|
|
8
|
-
export declare const ReConnectButton: React.NamedExoticComponent<ReConnectButtonProps>;
|