dev-classes 1.1.20 → 1.2.0

package/dist/classes/SocketApi/SocketApi.d.ts

@@ -22,12 +22,20 @@ export declare class SocketApi {
     static setOptions: (option?: ConnectOptions_P) => void;
     static close(): void;
     static disconnect(): void;
-    static send<ResType>(data: object): Promise<ResType>;
+    static send<ResType>(data: object, cbSyccess?: (data: ResType) => void, cbError?: (err: Error) => void): void;
     static connect(): void;
     static stopReConnect(): void;
     static resetState(): void;
     static getTimeRequest(): void;
-    static getEndReq: () => any[];
+    static getRequestSave: () => {
+        payload: {
+            [key: string]: any;
+            action: string;
+        };
+        reqId: string;
+        resolve: any;
+        reject: any;
+    }[];
     static watchReConnect(cb: WatchI["watchReConnect"]): void;
     static watchTimeOffReConnect(cb: WatchI["watchTimeOffReConnect"]): void;
     private static copyState;

package/dist/classes/SocketApi/SocketApi.js

@@ -2,15 +2,15 @@ var p = Object.defineProperty;
 var u = (n, e, s) => e in n ? p(n, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[e] = s;
 var c = (n, e, s) => (u(n, typeof e != "symbol" ? e + "" : e, s), s);
 import { WsApi as C } from "./deps/WsApi/WsApi.js";
-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;
-function A(n) {
-  return R.test(n);
+const d = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function R(n) {
+  return d.test(n);
 }
 function i() {
   var n = URL.createObjectURL(new Blob()), e = n.toString();
   return URL.revokeObjectURL(n), e.split(/[:\/]/g).pop().toLowerCase();
 }
-i.valid = A;
+i.valid = R;
 class v {
   watchTimeOffReConnect(e) {
   }
@@ -30,17 +30,19 @@ const t = class t {
   static disconnect() {
     t.state.isDisconnect || (t.state.isDisconnect = !0, console.log("DISCONNECT WS"), t.wsApi.internet.removeWatcherInternet(), t.wsApi.setStatus("disconnect"), t.resetSocket(), t.resetState(), t.wsApi.resetState());
   }
-  static send(e) {
-    return new Promise((s, r) => {
-      var a;
-      const { action: w, ...d } = e;
-      if (!t.wsApi.state.ws || t.wsApi.state.ws.readyState !== 1) {
-        t.wsApi.state.arrSaveReq.some((l) => l.action === e.action) || (t.wsApi.state.arrSaveReq.push(e), console.log("Нет подключения к сокету. Данные запроса сохранены", t.wsApi.state.arrSaveReq));
-        return;
-      }
-      const f = i();
-      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);
-    });
+  static send(e, s, r) {
+    var a;
+    const { action: w, ...l } = e, f = i();
+    if (t.wsApi.setRequestSave({
+      reqId: f,
+      payload: { action: w, ...l },
+      resolve: s,
+      reject: r
+    }), !t.wsApi.state.ws || t.wsApi.state.ws.readyState !== 1) {
+      console.log("Нет подключения к сокету. Данные запроса сохранены", t.wsApi.state.arrSaveReq);
+      return;
+    }
+    (a = t.wsApi.state.ws) == null || a.send(JSON.stringify(e));
   }
   static connect() {
     t.createConnect();
@@ -81,9 +83,9 @@ c(t, "wsApi", new C()), c(t, "watch", new v()), c(t, "state", {
   checkConnect: null
 }), c(t, "stateDefault", t.copyState(t.state)), c(t, "setOptions", (e = t.wsApi.configWs) => {
   t.state.initConnect || (t.state.initConnect = !0, t.wsApi.configWs = { ...t.wsApi.configWs, ...e }, t.wsApi.internet.addWatcherInternet());
-}), c(t, "getEndReq", () => t.wsApi.state.arrSaveReq), c(t, "socketReConnect", () => {
+}), c(t, "getRequestSave", t.wsApi.getRequestSave), c(t, "socketReConnect", () => {
   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(
-    () => t.wsApi.state.statusConnect === "ready" ? !0 : (t.createConnect(), !1),
+    () => t.wsApi.state.statusConnect === "ready" ? (console.dir("Подключение установлено"), !0) : (t.createConnect(), !1),
     {
       interval: t.wsApi.configWs.timeReConnect,
       countAction: t.wsApi.configWs.numberOfRepit,

package/dist/classes/SocketApi/deps/WsApi/WsApi.d.ts

@@ -6,12 +6,6 @@ export declare class WsApi extends DelaysPromise {
     configWs: ConnectOptions_P;
     internet: InternetWatcher;
     state: WsApiStateDefaultI & WsApiStateSaveDefaultI;
-    totalInfoReqPromise: {
-        action: string;
-        reqId: string;
-        resolve: any;
-        reject: any;
-    }[];
     private stateDefault;
     setStatus: (status: StatusConnect_OR) => void;
     removeEvents: () => void;
@@ -25,4 +19,18 @@ export declare class WsApi extends DelaysPromise {
     private copyState;
     resetState(): void;
     private sendInformationToTheEvent;
+    setRequestSave(reqInfo: typeof this.state.arrSaveReq[number]): void;
+    getRequestSave(): {
+        payload: {
+            [key: string]: any;
+            action: string;
+        };
+        reqId: string;
+        resolve: any;
+        reject: any;
+    }[];
+    setResponceInReqSave(responce: {
+        action: string;
+        [key: string]: any;
+    }): void;
 }

package/dist/classes/SocketApi/deps/WsApi/WsApi.js

@@ -1,9 +1,9 @@
-var l = Object.defineProperty;
-var c = (a, i, t) => i in a ? l(a, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[i] = t;
-var r = (a, i, t) => (c(a, typeof i != "symbol" ? i + "" : i, t), t);
-import { DelaysPromise as d } from "../../../Delay/Delay.js";
+var h = Object.defineProperty;
+var l = (i, n, e) => n in i ? h(i, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[n] = e;
+var r = (i, n, e) => (l(i, typeof n != "symbol" ? n + "" : n, e), e);
+import { DelaysPromise as c } from "../../../Delay/Delay.js";
 import { InternetWatcher as v } from "../InternetWatcher/InternetWatcher.js";
-class E extends d {
+class p extends c {
   constructor() {
     super(...arguments);
     r(this, "configWs", {
@@ -22,68 +22,84 @@ class E extends d {
         status: []
       }
     });
-    // saveState: WsApiStateSaveDefaultI = {
-    // };
-    r(this, "totalInfoReqPromise", []);
     r(this, "stateDefault", this.copyState(this.state));
-    r(this, "setStatus", (t) => {
-      this.sendInformationToTheEvent("status", t), this.state.statusConnect = t;
+    r(this, "setStatus", (e) => {
+      this.sendInformationToTheEvent("status", e), this.state.statusConnect = e;
     });
     r(this, "removeEvents", () => {
-      var t, e, s, n;
-      (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);
+      var e, t, s, a;
+      (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), (a = this.state.ws) == null || a.removeEventListener("error", this.errHandler);
     });
     r(this, "addEvents", () => {
-      var t, e, s, n;
-      (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);
+      var e, t, s, a;
+      (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), (a = this.state.ws) == null || a.addEventListener("error", this.errHandler);
     });
     r(this, "openHandler", () => {
+      var t;
       console.log("this >> open"), this.setStatus("ready");
+      const e = this.getRequestSave();
+      if (e.length)
+        for (let s = 0; s < e.length; s++) {
+          const a = e[s];
+          (t = this.state.ws) == null || t.send(JSON.stringify(a.payload));
+        }
     });
     r(this, "closeHandler", () => {
       console.log("this >> close"), this.setStatus("close");
     });
-    r(this, "msgHandler", (t) => {
-      const e = JSON.parse(t.data ? t.data : "{}");
-      if ("action" in e && this.state.arrSaveReq.length) {
-        const s = this.state.arrSaveReq.findIndex((n) => n.action === e.action);
-        ~s && this.state.arrSaveReq.splice(s, 1);
-      }
-      !this.state.arrSaveReq.length && this.state.isRequestArrSaveReq && (this.state.isRequestArrSaveReq = !1);
+    r(this, "msgHandler", (e) => {
+      const t = JSON.parse(e.data ? e.data : "{}");
       try {
-        const { action: s } = e, n = [];
-        for (let h = 0; h < this.totalInfoReqPromise.length; h++) {
-          const o = this.totalInfoReqPromise[h];
-          o.action !== s ? n.push(o) : o.resolve && o.resolve(e);
-        }
-        this.totalInfoReqPromise = n, this.sendInformationToTheEvent("msg", e);
+        const { action: s } = t;
+        s && this.setResponceInReqSave(t), this.sendInformationToTheEvent("msg", t);
       } catch {
         this.sendInformationToTheEvent("msg", JSON.parse("{}"));
       }
     });
-    r(this, "errHandler", (t) => {
+    r(this, "errHandler", (e) => {
       console.log("this >> err"), this.setStatus("error");
     });
-    r(this, "sendInformationToTheEvent", (t, e) => {
+    r(this, "sendInformationToTheEvent", (e, t) => {
       var s;
-      (s = this.state.subscribersEvents[t]) == null || s.forEach((n) => n(e));
+      (s = this.state.subscribersEvents[e]) == null || s.forEach((a) => a(t));
     });
   }
-  on(t, e) {
-    return this.state.subscribersEvents[t].push(e), () => {
-      this.state.subscribersEvents[t] = this.state.subscribersEvents[t].filter((s) => s !== e);
+  on(e, t) {
+    return this.state.subscribersEvents[e].push(t), () => {
+      this.state.subscribersEvents[e] = this.state.subscribersEvents[e].filter((s) => s !== t);
     };
   }
-  off(t, e) {
-    this.state.subscribersEvents[t] = this.state.subscribersEvents[t].filter((s) => s !== e);
+  off(e, t) {
+    this.state.subscribersEvents[e] = this.state.subscribersEvents[e].filter((s) => s !== t);
   }
-  copyState(t) {
-    return JSON.parse(JSON.stringify(t));
+  copyState(e) {
+    return JSON.parse(JSON.stringify(e));
   }
   resetState() {
     this.state = this.copyState(this.stateDefault);
   }
+  setRequestSave(e) {
+    if ("action" in e.payload) {
+      const t = this.state.arrSaveReq.findIndex((s) => s.payload.action === e.payload.action);
+      ~t ? this.state.arrSaveReq[t] = e : this.state.arrSaveReq.push(e);
+    }
+  }
+  // removeItemRequestSave(action: string) {
+  //   const newTotalRequestSave = this.state.arrSaveReq.filter((item) => item.payload?.action !== action);
+  //   this.state.arrSaveReq = newTotalRequestSave
+  // }
+  getRequestSave() {
+    return this.state.arrSaveReq;
+  }
+  setResponceInReqSave(e) {
+    const t = this.getRequestSave(), s = [];
+    for (let a = 0; a < t.length; a++) {
+      const o = t[a];
+      o.payload.action !== e.action ? s.push(o) : o.resolve && o.resolve(e);
+    }
+    this.state.arrSaveReq = s, console.log("filterArrSaveReq", s);
+  }
 }
 export {
-  E as WsApi
+  p as WsApi
 };

package/dist/classes/SocketApi/deps/WsApi/WsApi.types.d.ts

@@ -25,7 +25,15 @@ export interface WsApiStateDefaultI {
 }
 export interface WsApiStateSaveDefaultI {
     isRequestArrSaveReq: boolean;
-    arrSaveReq: any[];
+    arrSaveReq: {
+        payload: {
+            action: string;
+            [key: string]: any;
+        };
+        reqId: string;
+        resolve: any;
+        reject: any;
+    }[];
     subscribersEvents: SubscribersEvents_P;
 }
 export {};

package/package.json

@@ -7,7 +7,7 @@
     "url": "git+https://github.com/SinGlEBW/dev-classes.git"
   },
   "license": "MIT",
-  "version": "1.1.20",
+  "version": "1.2.0",
   "type": "module",
   "module": "./dist/index.js",
   "main": "./dist/index.js",