rc-lib-ui 1.1.7 → 1.1.10
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/dist/socket.js +26 -26
- package/package.json +3 -2
package/dist/socket.js
CHANGED
|
@@ -5,13 +5,13 @@ import { c as P } from "./index-CCq3Ke1g.js";
|
|
|
5
5
|
import './socket.css';const E = (s) => {
|
|
6
6
|
let t;
|
|
7
7
|
const e = /* @__PURE__ */ new Set(), o = (f, p) => {
|
|
8
|
-
const
|
|
9
|
-
if (!Object.is(
|
|
8
|
+
const v = typeof f == "function" ? f(t) : f;
|
|
9
|
+
if (!Object.is(v, t)) {
|
|
10
10
|
const O = t;
|
|
11
|
-
t = p ?? (typeof
|
|
11
|
+
t = p ?? (typeof v != "object" || v === null) ? v : Object.assign({}, t, v), e.forEach((y) => y(t, O));
|
|
12
12
|
}
|
|
13
|
-
}, i = () => t,
|
|
14
|
-
return
|
|
13
|
+
}, i = () => t, h = { setState: o, getState: i, getInitialState: () => r, subscribe: (f) => (e.add(f), () => e.delete(f)) }, r = t = s(o, i, h);
|
|
14
|
+
return h;
|
|
15
15
|
}, G = (s) => s ? E(s) : E, K = (s) => s;
|
|
16
16
|
function Q(s, t = K) {
|
|
17
17
|
const e = C.useSyncExternalStore(
|
|
@@ -142,7 +142,7 @@ const ot = q(() => B), it = {
|
|
|
142
142
|
}) });
|
|
143
143
|
}, St = C.memo(ut);
|
|
144
144
|
var ft = Object.defineProperty, pt = (s, t, e) => t in s ? ft(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, N = (s, t, e) => (pt(s, typeof t != "symbol" ? t + "" : t, e), e);
|
|
145
|
-
class
|
|
145
|
+
class vt {
|
|
146
146
|
constructor() {
|
|
147
147
|
N(this, "defaultProps", {
|
|
148
148
|
interval: 5e3
|
|
@@ -152,19 +152,19 @@ class ht {
|
|
|
152
152
|
}, i = (p) => {
|
|
153
153
|
e != null && e.controlAction && (e == null || e.controlAction(p));
|
|
154
154
|
};
|
|
155
|
-
let c = !0, a,
|
|
155
|
+
let c = !0, a, h, r;
|
|
156
156
|
const f = (p = !0) => {
|
|
157
|
-
const
|
|
158
|
-
c = !1, clearInterval(a), o(null), p ?
|
|
157
|
+
const v = "Ручное завершение startActionEvery";
|
|
158
|
+
c = !1, clearInterval(a), o(null), p ? h && h({ status: p, msg: v + ": (true)" }) : r && r({ status: p, msg: v + ": (false)" });
|
|
159
159
|
};
|
|
160
160
|
return {
|
|
161
|
-
promise: new Promise((p,
|
|
162
|
-
|
|
161
|
+
promise: new Promise((p, v) => {
|
|
162
|
+
h = p, r = v;
|
|
163
163
|
let O = 0, y = 0;
|
|
164
164
|
a = setInterval(
|
|
165
165
|
() => {
|
|
166
166
|
if (O += e.interval, y += 1, e != null && e.cutoffTime && O > e.cutoffTime || e != null && e.countAction && (e == null ? void 0 : e.countAction) < y) {
|
|
167
|
-
c = !1, clearInterval(a), o(null),
|
|
167
|
+
c = !1, clearInterval(a), o(null), v({ status: !1, msg: Error("Время загрузки истекло") });
|
|
168
168
|
return;
|
|
169
169
|
}
|
|
170
170
|
t() && (c = !1, clearInterval(a), o(null), p({ status: !0, msg: "cb вернул true" }));
|
|
@@ -186,16 +186,16 @@ class ht {
|
|
|
186
186
|
i === 1 && e(), clearInterval(c);
|
|
187
187
|
}, o * 1e3);
|
|
188
188
|
}), N(this, "oneOfPromise", (t, e, { second: o }) => new Promise((i, c) => {
|
|
189
|
-
let a = 1,
|
|
189
|
+
let a = 1, h = { status: !1, msg: "" };
|
|
190
190
|
t().then((f) => {
|
|
191
191
|
a === 1 && (a = 0, i(f));
|
|
192
192
|
}).catch((f) => {
|
|
193
|
-
a === 1 && (a = 0,
|
|
193
|
+
a === 1 && (a = 0, h.msg = f, c(f));
|
|
194
194
|
});
|
|
195
195
|
let r = setInterval(() => {
|
|
196
196
|
if (a === 1) {
|
|
197
197
|
if (a = 0, typeof e == "function") {
|
|
198
|
-
c({ status: !1, msg: "", ...e(
|
|
198
|
+
c({ status: !1, msg: "", ...e(h) });
|
|
199
199
|
return;
|
|
200
200
|
}
|
|
201
201
|
c({ status: !1, msg: "oneOfPromise reject" });
|
|
@@ -205,7 +205,7 @@ class ht {
|
|
|
205
205
|
}));
|
|
206
206
|
}
|
|
207
207
|
}
|
|
208
|
-
var
|
|
208
|
+
var ht = Object.defineProperty, dt = (s, t, e) => t in s ? ht(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, m = (s, t, e) => (dt(s, typeof t != "symbol" ? t + "" : t, e), e);
|
|
209
209
|
let T = class {
|
|
210
210
|
constructor(t) {
|
|
211
211
|
m(this, "subscribersEvents", {}), m(this, "getListNameEvents", () => Object.keys(this.subscribersEvents)), m(this, "getSubscribers", () => this.subscribersEvents), m(this, "subscribe", (e, o) => {
|
|
@@ -322,8 +322,8 @@ class Dt {
|
|
|
322
322
|
["error", this.errHandler]
|
|
323
323
|
];
|
|
324
324
|
for (let c = 0; c < i.length; c++) {
|
|
325
|
-
const [a,
|
|
326
|
-
t === "add" ? (e = this.state.ws) == null || e.addEventListener(a,
|
|
325
|
+
const [a, h] = i[c];
|
|
326
|
+
t === "add" ? (e = this.state.ws) == null || e.addEventListener(a, h) : (o = this.state.ws) == null || o.removeEventListener(a, h);
|
|
327
327
|
}
|
|
328
328
|
}), l(this, "openHandler", () => {
|
|
329
329
|
this.setStatus("ready");
|
|
@@ -454,7 +454,7 @@ j = /* @__PURE__ */ new WeakSet(), Lt(n, j), S(n, "state", {
|
|
|
454
454
|
isNetworkStatus: navigator.onLine
|
|
455
455
|
}), S(n, "options", {
|
|
456
456
|
isReConnectNetworkOnline: !1
|
|
457
|
-
}), S(n, "wsApi", new Dt()), S(n, "delay", new
|
|
457
|
+
}), S(n, "wsApi", new Dt()), S(n, "delay", new vt()), S(n, "internet", new Nt([new It(), new kt()])), S(n, "events", new T(["timeOffReConnect", "reConnect", "network"])), S(n, "saveID", {
|
|
458
458
|
idReConnect: null,
|
|
459
459
|
checkConnect: null
|
|
460
460
|
}), S(n, "stateDefault", n.copyState(n.state)), S(n, "setInfoConnect", (s) => {
|
|
@@ -471,7 +471,7 @@ j = /* @__PURE__ */ new WeakSet(), Lt(n, j), S(n, "state", {
|
|
|
471
471
|
{ WsOptions: {}, SocketApiOptions: {} }
|
|
472
472
|
)), /*---------------------------------------------------------------------------------------------------------------------------*/
|
|
473
473
|
S(n, "getState", () => n.state), S(n, "on", (s, t) => {
|
|
474
|
-
n.wsApi.getRegisteredEvents().includes(s) ? n.wsApi.on(s, t) : n.events.subscribe(s, t);
|
|
474
|
+
n.wsApi.getRegisteredEvents().includes(s) ? n.wsApi.on(s, t) : (console.dir("on () ", n.events.getListNameEvents()), n.events.subscribe(s, t));
|
|
475
475
|
}), S(n, "off", (s, t) => {
|
|
476
476
|
n.wsApi.getRegisteredEvents().includes(s) ? n.wsApi.off(s, t) : n.events.unsubscribe(s, t);
|
|
477
477
|
}), S(n, "getRequestSave", n.wsApi.getRequestSave), S(n, "getStatusSocket", n.wsApi.getStatusSocket), S(n, "close", () => {
|
|
@@ -512,11 +512,11 @@ const Pt = (s) => {
|
|
|
512
512
|
const { isModal: t } = k(d.getInfoNoConnectServer), e = k(d.getStatusIsReConnectSocket), o = k(d.getIsDisableConnectSocket), i = k(d.getStatusConnectSocket), [c, a] = F({
|
|
513
513
|
isNetwork: !1,
|
|
514
514
|
typeNetwork: ""
|
|
515
|
-
}),
|
|
516
|
-
return R(() => (g.
|
|
515
|
+
}), h = Mt(c, a);
|
|
516
|
+
return R(() => (g.on("network", (r) => {
|
|
517
|
+
console.log("network: ", r), h(r);
|
|
518
|
+
}), g.init(s.init), g.on("status", (r) => {
|
|
517
519
|
w.setStatusConnectSocket({ statusConnect: r });
|
|
518
|
-
}), g.on("network", (r) => {
|
|
519
|
-
console.log("network: ", r), v(r);
|
|
520
520
|
}), g.on("reConnect", (r) => {
|
|
521
521
|
console.log("reConnect", r);
|
|
522
522
|
const f = b(d.getStatusIsReConnectSocket), { isModal: p } = b(d.getInfoNoConnectServer);
|
|
@@ -524,8 +524,8 @@ const Pt = (s) => {
|
|
|
524
524
|
}), g.on("timeOffReConnect", (r) => {
|
|
525
525
|
if (console.log("timeOffReConnect: ", r), w.setIsOfflineSocket({ isOfflineSocket: !r.status }), !r.status) {
|
|
526
526
|
const { isModal: f, isSelectOffline: p } = b(d.getInfoNoConnectServer);
|
|
527
|
-
let
|
|
528
|
-
!f && !p && (
|
|
527
|
+
let v = !1;
|
|
528
|
+
!f && !p && (v = !0), v && w.setInfoNoConnectServer({ isModal: v });
|
|
529
529
|
}
|
|
530
530
|
}), g.connect(), () => {
|
|
531
531
|
g.disconnect();
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rc-lib-ui",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.1.
|
|
4
|
+
"version": "1.1.10",
|
|
5
5
|
"author": "SinGlEBW",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"type": "module",
|
|
@@ -39,8 +39,9 @@
|
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"classnames": "^2.5.1",
|
|
42
|
-
"lib-socket-api": "^1.3.
|
|
42
|
+
"lib-socket-api": "^1.3.42",
|
|
43
43
|
"react-transition-group": "^4.4.5",
|
|
44
|
+
"uuid4": "^2.0.3",
|
|
44
45
|
"zustand": "^5.0.7"
|
|
45
46
|
},
|
|
46
47
|
"peerDependencies": {
|