dev-classes 1.0.14 → 1.0.16

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.
Files changed (6) hide show
  1. package/dist/classes/SocketApi/SocketApi.js +13 -13
  2. package/dist/classes/SocketApi/deps/WsApi/WsApi.js +28 -27
  3. package/dist/classes/SocketApi/deps/WsApi/WsApi.types.d.ts +2 -1
  4. package/dist/classes/Utils/Utils.d.ts +1 -0
  5. package/dist/classes/Utils/Utils.js +24 -16
  6. package/package.json +1 -1
package/dist/classes/SocketApi/SocketApi.js CHANGED
@@ -1,16 +1,16 @@
1
- var p = Object.defineProperty;
2
- var u = (n, e, s) => e in n ? p(n, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[e] = s;
1
+ var l = Object.defineProperty;
2
+ var u = (n, e, s) => e in n ? l(n, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[e] = s;
3
3
  var c = (n, e, s) => (u(n, typeof e != "symbol" ? e + "" : e, s), s);
4
4
  import { WsApi as C } from "./deps/WsApi/WsApi.js";
5
5
  const R = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
6
6
  function A(n) {
7
7
  return R.test(n);
8
8
  }
9
- function i() {
9
+ function o() {
10
10
  var n = URL.createObjectURL(new Blob()), e = n.toString();
11
11
  return URL.revokeObjectURL(n), e.split(/[:\/]/g).pop().toLowerCase();
12
12
  }
13
- i.valid = A;
13
+ o.valid = A;
14
14
  class v {
15
15
  watchTimeOffReConnect(e) {
16
16
  }
@@ -33,13 +33,13 @@ const t = class t {
33
33
  static send(e) {
34
34
  return new Promise((s, r) => {
35
35
  var a;
36
- let { action: w, ...d } = e;
36
+ const { action: w, ...d } = e;
37
37
  if (!t.wsApi.state.ws || t.wsApi.state.ws.readyState !== 1) {
38
- t.wsApi.state.arrSaveReq.some((f) => f.action === e.action) || t.wsApi.state.arrSaveReq.push(e);
38
+ t.wsApi.state.arrSaveReq.some((p) => p.action === e.action) || t.wsApi.state.arrSaveReq.push(e);
39
39
  return;
40
40
  }
41
- const l = i();
42
- t.wsApi.totalInfoReqPromise.push({ action: w, reqId: l, resolve: s, reject: r }), (a = t.wsApi.state.ws) == null || a.send(JSON.stringify(e)), t.wsApi.state.arrSaveReq.length && !t.wsApi.state.isRequestArrSaveReq && (t.wsApi.state.isRequestArrSaveReq = !0);
41
+ const f = o();
42
+ t.wsApi.totalInfoReqPromise.push({ action: w, reqId: f, resolve: s, reject: r }), (a = t.wsApi.state.ws) == null || a.send(JSON.stringify(e)), t.wsApi.state.arrSaveReq.length && !t.wsApi.state.isRequestArrSaveReq && (t.wsApi.state.isRequestArrSaveReq = !0);
43
43
  });
44
44
  }
45
45
  static connect() {
@@ -69,7 +69,7 @@ const t = class t {
69
69
  (e = t.wsApi.state.ws) == null || e.close(), t.wsApi.removeEvents();
70
70
  }
71
71
  static createConnect() {
72
- console.log("CONNECT WS"), t.resetSocket(), t.state.isDisconnect = !1, t.wsApi.state.ws = new WebSocket(t.wsApi.state.url), t.wsApi.setStatus("pending"), t.wsApi.addEvents();
72
+ console.log("CONNECT WS"), t.resetSocket(), t.state.isDisconnect = !1, t.wsApi.state.ws = new WebSocket(t.wsApi.configWs.url), t.wsApi.setStatus("pending"), t.wsApi.addEvents();
73
73
  }
74
74
  };
75
75
  c(t, "wsApi", new C()), c(t, "watch", new v()), c(t, "state", {
@@ -80,13 +80,13 @@ c(t, "wsApi", new C()), c(t, "watch", new v()), c(t, "state", {
80
80
  idConnect: null,
81
81
  checkConnect: null
82
82
  }), c(t, "stateDefault", t.copyState(t.state)), c(t, "setOptions", (e = t.wsApi.configWs) => {
83
- t.state.initConnect || (t.wsApi.configWs = e, t.wsApi.internet.addWatcherInternet());
83
+ t.state.initConnect || (t.wsApi.configWs = { ...t.wsApi.configWs, ...e }, t.wsApi.internet.addWatcherInternet());
84
84
  }), c(t, "getEndReq", () => t.wsApi.state.arrSaveReq), c(t, "socketReConnect", () => {
85
85
  t.saveID.idConnect ? (console.groupCollapsed("Процесс idConnect уже запущен"), console.log("SocketApi.saveID: ", t.saveID), console.groupEnd()) : (t.state.isReConnect = !0, t.watch.watchReConnect(!0), t.createConnect(), t.wsApi.startActionEvery(
86
86
  () => t.wsApi.state.statusConnect === "ready" ? !0 : (t.createConnect(), !1),
87
87
  {
88
88
  interval: t.wsApi.configWs.timeReConnect,
89
- countAction: 5,
89
+ countAction: t.wsApi.configWs.numberOfRepit,
90
90
  watchIdInterval: (e) => {
91
91
  t.saveID.idConnect = e;
92
92
  },
@@ -100,7 +100,7 @@ c(t, "wsApi", new C()), c(t, "watch", new v()), c(t, "state", {
100
100
  }), c(t, "setInfoConnect", (e) => {
101
101
  e.status || t.close(), t.watch.watchTimeOffReConnect(e), t.watch.watchReConnect(!1), t.state.isReConnect = !1;
102
102
  });
103
- let o = t;
103
+ let i = t;
104
104
  export {
105
- o as SocketApi
105
+ i as SocketApi
106
106
  };
package/dist/classes/SocketApi/deps/WsApi/WsApi.js CHANGED
@@ -1,19 +1,20 @@
1
1
  var l = Object.defineProperty;
2
- var c = (n, a, e) => a in n ? l(n, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[a] = e;
3
- var r = (n, a, e) => (c(n, typeof a != "symbol" ? a + "" : a, e), e);
2
+ var c = (a, i, t) => i in a ? l(a, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[i] = t;
3
+ var r = (a, i, t) => (c(a, typeof i != "symbol" ? i + "" : i, t), t);
4
4
  import { DelaysPromise as d } from "../../../Delay/Delay.js";
5
5
  import { InternetWatcher as v } from "../InternetWatcher/InternetWatcher.js";
6
6
  class E extends d {
7
7
  constructor() {
8
8
  super(...arguments);
9
9
  r(this, "configWs", {
10
- timeReConnect: 5e3
10
+ timeReConnect: 5e3,
11
+ numberOfRepit: 5,
12
+ url: ""
11
13
  });
12
14
  r(this, "internet", new v());
13
15
  r(this, "state", {
14
16
  statusConnect: "disconnect",
15
17
  ws: null,
16
- url: "",
17
18
  isRequestArrSaveReq: !1,
18
19
  arrSaveReq: [],
19
20
  subscribersEvents: {
@@ -25,16 +26,16 @@ class E extends d {
25
26
  // };
26
27
  r(this, "totalInfoReqPromise", []);
27
28
  r(this, "stateDefault", this.copyState(this.state));
28
- r(this, "setStatus", (e) => {
29
- this.sendInformationToTheEvent("status", e), this.state.statusConnect = e;
29
+ r(this, "setStatus", (t) => {
30
+ this.sendInformationToTheEvent("status", t), this.state.statusConnect = t;
30
31
  });
31
32
  r(this, "removeEvents", () => {
32
- var e, t, s, i;
33
- (e = this.state.ws) == null || e.removeEventListener("open", this.openHandler), (t = this.state.ws) == null || t.removeEventListener("close", this.closeHandler), (s = this.state.ws) == null || s.removeEventListener("message", this.msgHandler), (i = this.state.ws) == null || i.removeEventListener("error", this.errHandler);
33
+ var t, e, s, n;
34
+ (t = this.state.ws) == null || t.removeEventListener("open", this.openHandler), (e = this.state.ws) == null || e.removeEventListener("close", this.closeHandler), (s = this.state.ws) == null || s.removeEventListener("message", this.msgHandler), (n = this.state.ws) == null || n.removeEventListener("error", this.errHandler);
34
35
  });
35
36
  r(this, "addEvents", () => {
36
- var e, t, s, i;
37
- (e = this.state.ws) == null || e.addEventListener("open", this.openHandler), (t = this.state.ws) == null || t.addEventListener("close", this.closeHandler), (s = this.state.ws) == null || s.addEventListener("message", this.msgHandler), (i = this.state.ws) == null || i.addEventListener("error", this.errHandler);
37
+ var t, e, s, n;
38
+ (t = this.state.ws) == null || t.addEventListener("open", this.openHandler), (e = this.state.ws) == null || e.addEventListener("close", this.closeHandler), (s = this.state.ws) == null || s.addEventListener("message", this.msgHandler), (n = this.state.ws) == null || n.addEventListener("error", this.errHandler);
38
39
  });
39
40
  r(this, "openHandler", () => {
40
41
  console.log("this >> open"), this.setStatus("ready");
@@ -42,42 +43,42 @@ class E extends d {
42
43
  r(this, "closeHandler", () => {
43
44
  console.log("this >> close"), this.setStatus("close");
44
45
  });
45
- r(this, "msgHandler", (e) => {
46
- let t = JSON.parse(e.data ? e.data : "{}");
47
- if ("action" in t && this.state.arrSaveReq.length) {
48
- let s = this.state.arrSaveReq.findIndex((i) => i.action === t.action);
46
+ r(this, "msgHandler", (t) => {
47
+ const e = JSON.parse(t.data ? t.data : "{}");
48
+ if ("action" in e && this.state.arrSaveReq.length) {
49
+ const s = this.state.arrSaveReq.findIndex((n) => n.action === e.action);
49
50
  ~s && this.state.arrSaveReq.splice(s, 1);
50
51
  }
51
52
  !this.state.arrSaveReq.length && this.state.isRequestArrSaveReq && (this.state.isRequestArrSaveReq = !1);
52
53
  try {
53
- let { action: s } = t, i = [];
54
+ const { action: s } = e, n = [];
54
55
  for (let h = 0; h < this.totalInfoReqPromise.length; h++) {
55
56
  const o = this.totalInfoReqPromise[h];
56
- o.action !== s ? i.push(o) : o.resolve && o.resolve(t);
57
+ o.action !== s ? n.push(o) : o.resolve && o.resolve(e);
57
58
  }
58
- this.totalInfoReqPromise = i, this.sendInformationToTheEvent("msg", t);
59
+ this.totalInfoReqPromise = n, this.sendInformationToTheEvent("msg", e);
59
60
  } catch {
60
61
  this.sendInformationToTheEvent("msg", JSON.parse("{}"));
61
62
  }
62
63
  });
63
- r(this, "errHandler", (e) => {
64
+ r(this, "errHandler", (t) => {
64
65
  console.log("this >> err"), this.setStatus("error");
65
66
  });
66
- r(this, "sendInformationToTheEvent", (e, t) => {
67
+ r(this, "sendInformationToTheEvent", (t, e) => {
67
68
  var s;
68
- (s = this.state.subscribersEvents[e]) == null || s.forEach((i) => i(t));
69
+ (s = this.state.subscribersEvents[t]) == null || s.forEach((n) => n(e));
69
70
  });
70
71
  }
71
- on(e, t) {
72
- return this.state.subscribersEvents[e].push(t), () => {
73
- this.state.subscribersEvents[e] = this.state.subscribersEvents[e].filter((s) => s !== t);
72
+ on(t, e) {
73
+ return this.state.subscribersEvents[t].push(e), () => {
74
+ this.state.subscribersEvents[t] = this.state.subscribersEvents[t].filter((s) => s !== e);
74
75
  };
75
76
  }
76
- off(e, t) {
77
- this.state.subscribersEvents[e] = this.state.subscribersEvents[e].filter((s) => s !== t);
77
+ off(t, e) {
78
+ this.state.subscribersEvents[t] = this.state.subscribersEvents[t].filter((s) => s !== e);
78
79
  }
79
- copyState(e) {
80
- return JSON.parse(JSON.stringify(e));
80
+ copyState(t) {
81
+ return JSON.parse(JSON.stringify(t));
81
82
  }
82
83
  resetState() {
83
84
  this.state = this.copyState(this.stateDefault);
package/dist/classes/SocketApi/deps/WsApi/WsApi.types.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  export interface ConnectOptions_P {
2
+ url: string;
2
3
  timeReConnect: number;
4
+ numberOfRepit?: number;
3
5
  }
4
6
  export type EventNames_OR = "msg" | "status";
5
7
  export type StatusConnect_OR = "pending" | "ready" | "error" | "close" | "disconnect";
@@ -20,7 +22,6 @@ export type SubscribersEvents_P = Record<EventNames_OR, any[]>;
20
22
  export interface WsApiStateDefaultI {
21
23
  statusConnect: StatusConnect_OR;
22
24
  ws: null | WebSocket;
23
- url: string;
24
25
  }
25
26
  export interface WsApiStateSaveDefaultI {
26
27
  isRequestArrSaveReq: boolean;
package/dist/classes/Utils/Utils.d.ts CHANGED
@@ -12,4 +12,5 @@ export declare class Utils {
12
12
  dateMinMax: '<=' | '>=' | '<' | '>';
13
13
  }) => boolean | undefined;
14
14
  static getEndsWithArr: (arr: any[], countEnd: any) => any[];
15
+ static deepMerge: <T extends object = object>(...itemsOb: T[]) => T;
15
16
  }
package/dist/classes/Utils/Utils.js CHANGED
@@ -1,24 +1,24 @@
1
1
  var M = Object.defineProperty;
2
- var v = (n, t, e) => t in n ? M(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
3
- var s = (n, t, e) => (v(n, typeof t != "symbol" ? t + "" : t, e), e);
2
+ var v = (l, t, e) => t in l ? M(l, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[t] = e;
3
+ var c = (l, t, e) => (v(l, typeof t != "symbol" ? t + "" : t, e), e);
4
4
  const a = class a {
5
- static events(t, e, r, c = "") {
6
- return console.log(`##########--------<{ ${t === "add" ? "Создаём" : "Удаляем"} пачку ивентов ${c}}>---------#########`), new Promise((d, u) => {
7
- let f = 0;
8
- for (let [D, l] of r)
9
- f++, t === "add" ? e.addEventListener ? e.addEventListener(D, l) : e.on ? e.on(D, l) : console.log("Utils.events:>> ", 'Отсутствует метод "addEventListener"') : e.removeEventListener ? e.removeEventListener(D, l) : e.off ? e.off(D, l) : console.log("Utils.events:>> ", 'Отсутствует метод "removeEventListener"'), f === r.length && d("");
5
+ static events(t, e, r, s = "") {
6
+ return console.log(`##########--------<{ ${t === "add" ? "Создаём" : "Удаляем"} пачку ивентов ${s}}>---------#########`), new Promise((n, u) => {
7
+ let d = 0;
8
+ for (let [f, D] of r)
9
+ d++, t === "add" ? e.addEventListener ? e.addEventListener(f, D) : e.on ? e.on(f, D) : console.log("Utils.events:>> ", 'Отсутствует метод "addEventListener"') : e.removeEventListener ? e.removeEventListener(f, D) : e.off ? e.off(f, D) : console.log("Utils.events:>> ", 'Отсутствует метод "removeEventListener"'), d === r.length && n("");
10
10
  });
11
11
  }
12
12
  };
13
- s(a, "sortDataByAlphabet", (t, e) => {
14
- t.sort((r, c) => c[e].trim() < r[e].trim() ? 1 : -1);
15
- }), s(a, "sortDataByDate", (t, e) => {
16
- t.sort((r, c) => a.hasDateLessPeriod(c[e], r[e]) ? 1 : -1);
17
- }), s(a, "sortDataByDateAndTime", (t, e) => {
18
- }), s(a, "splitDateFromTime", (t) => t.split(" ")), s(a, "reverseDate", (t) => {
13
+ c(a, "sortDataByAlphabet", (t, e) => {
14
+ t.sort((r, s) => s[e].trim() < r[e].trim() ? 1 : -1);
15
+ }), c(a, "sortDataByDate", (t, e) => {
16
+ t.sort((r, s) => a.hasDateLessPeriod(s[e], r[e]) ? 1 : -1);
17
+ }), c(a, "sortDataByDateAndTime", (t, e) => {
18
+ }), c(a, "splitDateFromTime", (t) => t.split(" ")), c(a, "reverseDate", (t) => {
19
19
  let [e, r] = a.splitDateFromTime(t);
20
20
  return e.split(".").reverse().join("-");
21
- }), s(a, "correctionDataISO8601", (t) => {
21
+ }), c(a, "correctionDataISO8601", (t) => {
22
22
  let e = "";
23
23
  if (/^\d{2}\.\d{2}\.\d{4}$/.test(t) || /^\d{2}\.\d{2}\.\d{4}\s\d{2}:\d{2}$/.test(t))
24
24
  e = a.reverseDate(t);
@@ -27,7 +27,7 @@ s(a, "sortDataByAlphabet", (t, e) => {
27
27
  else
28
28
  throw new Error(`функция correctionDataISO8601 >> date не корректна: ${t}. Требуется один из форматов: дд.мм.гггг | дд.мм.гггг мм:чч | гггг-мм-дд `);
29
29
  return e;
30
- }), s(a, "hasDateLessPeriod", (t, e, r) => {
30
+ }), c(a, "hasDateLessPeriod", (t, e, r) => {
31
31
  if (t = a.correctionDataISO8601(t), e = a.correctionDataISO8601(e), !r || r && !r.dateMinMax || (r == null ? void 0 : r.dateMinMax) === "<=")
32
32
  return Math.floor(Number(new Date(t))) <= Math.floor(Number(new Date(e)));
33
33
  if (r && (r == null ? void 0 : r.dateMinMax) === ">=")
@@ -36,7 +36,15 @@ s(a, "sortDataByAlphabet", (t, e) => {
36
36
  return Math.floor(Number(new Date(t))) < Math.floor(Number(new Date(e)));
37
37
  if (r && (r == null ? void 0 : r.dateMinMax) === ">")
38
38
  return Math.floor(Number(new Date(t))) > Math.floor(Number(new Date(e)));
39
- }), s(a, "getEndsWithArr", (t, e) => t.slice(-e));
39
+ }), c(a, "getEndsWithArr", (t, e) => t.slice(-e)), c(a, "deepMerge", (...t) => {
40
+ const e = {}, r = (s) => {
41
+ for (const n in s)
42
+ Object.prototype.hasOwnProperty.call(s, n) && (Object.prototype.toString.call(s[n]) === "[object Object]" ? e[n] = a.deepMerge(e[n], s[n]) : e[n] = s[n]);
43
+ };
44
+ for (let s = 0; s < t.length; s++)
45
+ r(t[s]);
46
+ return e;
47
+ });
40
48
  let m = a;
41
49
  export {
42
50
  m as Utils
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "url": "git+https://github.com/SinGlEBW/dev-classes.git"
8
8
  },
9
9
  "license": "MIT",
10
- "version": "1.0.14",
10
+ "version": "1.0.16",
11
11
  "type": "module",
12
12
  "module": "./dist/index.js",
13
13
  "main": "./dist/index.js",