dev-classes 1.0.12 → 1.0.13

package/dist/_types/index.d.js

@@ -0,0 +1 @@
+

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

@@ -1,4 +1,4 @@
-import { ConnectOptions_P, EventNameType, SubscriberType } from './deps/WsApi';
+import { ConnectOptions_P, EventNames_OR, GetCbByKeyNameEvent } from './deps/WsApi';
 
 interface WatchI {
     watchTimeOffReConnect(info: {
@@ -17,8 +17,8 @@ export declare class SocketApi {
     };
     private static saveID;
     private static stateDefault;
-    static on<T>(eventName: EventNameType, cb: SubscriberType<T>): () => void;
-    static off<T>(eventName: EventNameType, cb: SubscriberType<T>): void;
+    static on<K extends EventNames_OR>(eventName: K, cb: GetCbByKeyNameEvent<K>): () => void;
+    static off<K extends EventNames_OR>(eventName: K, cb: GetCbByKeyNameEvent<K>): void;
     static setOptions: (option?: ConnectOptions_P) => void;
     static close(): void;
     static disconnect(): void;

package/dist/classes/SocketApi/SocketApi.js

@@ -1,17 +1,17 @@
 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 a = (n, e, s) => (u(n, typeof e != "symbol" ? e + "" : e, s), 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);
 }
-function o() {
+function i() {
   var n = URL.createObjectURL(new Blob()), e = n.toString();
   return URL.revokeObjectURL(n), e.split(/[:\/]/g).pop().toLowerCase();
 }
-o.valid = A;
-class d {
+i.valid = A;
+class v {
   watchTimeOffReConnect(e) {
   }
   watchReConnect(e) {
@@ -28,19 +28,18 @@ const t = class t {
     t.resetSocket(), t.wsApi.setStatus("close");
   }
   static disconnect() {
-    console.trace(), 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());
+    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 i;
-      console.log("send: ", e);
-      let { action: w, ...v } = e;
+      var a;
+      let { action: w, ...d } = e;
       if (!t.wsApi.state.ws || t.wsApi.state.ws.readyState !== 1) {
-        t.wsApi.state.arrSaveReq.some((f) => f.action === e.action) || (t.wsApi.state.arrSaveReq.push(e), console.log("сохранили запрос в arrSaveReq: ", t.wsApi.state.arrSaveReq));
+        t.wsApi.state.arrSaveReq.some((f) => f.action === e.action) || t.wsApi.state.arrSaveReq.push(e);
         return;
       }
-      const l = o();
-      t.wsApi.totalInfoReqPromise.push({ action: w, reqId: l, resolve: s, reject: r }), (i = t.wsApi.state.ws) == null || i.send(JSON.stringify(e)), t.wsApi.state.arrSaveReq.length && !t.wsApi.state.isRequestArrSaveReq && (t.wsApi.state.isRequestArrSaveReq = !0);
+      const l = i();
+      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);
     });
   }
   static connect() {
@@ -70,19 +69,19 @@ const t = class t {
     (e = t.wsApi.state.ws) == null || e.close(), t.wsApi.removeEvents();
   }
   static createConnect() {
-    console.dir("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();
+    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();
   }
 };
-a(t, "wsApi", new C()), a(t, "watch", new d()), a(t, "state", {
+c(t, "wsApi", new C()), c(t, "watch", new v()), c(t, "state", {
   isDisconnect: !0,
   initConnect: !1,
   isReConnect: !1
-}), a(t, "saveID", {
+}), c(t, "saveID", {
   idConnect: null,
   checkConnect: null
-}), a(t, "stateDefault", t.copyState(t.state)), a(t, "setOptions", (e = t.wsApi.configWs) => {
+}), c(t, "stateDefault", t.copyState(t.state)), c(t, "setOptions", (e = t.wsApi.configWs) => {
   t.state.initConnect || (t.wsApi.configWs = e, t.wsApi.internet.addWatcherInternet());
-}), a(t, "getEndReq", () => t.wsApi.state.arrSaveReq), a(t, "socketReConnect", () => {
+}), c(t, "getEndReq", () => t.wsApi.state.arrSaveReq), 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),
     {
@@ -92,17 +91,16 @@ a(t, "wsApi", new C()), a(t, "watch", new d()), a(t, "state", {
         t.saveID.idConnect = e;
       },
       controlAction: ({ stop: e, getIsActiveEvent: s }) => {
-        console.dir("Вызван controlAction"), t.stopReConnect = () => {
+        console.group("Вызван controlAction"), console.log("getIsActiveEvent не используется"), console.groupEnd(), t.stopReConnect = () => {
           e();
         };
       }
     }
   ).then(t.setInfoConnect).catch(t.setInfoConnect));
-}), a(t, "setInfoConnect", (e) => {
+}), c(t, "setInfoConnect", (e) => {
   e.status || t.close(), t.watch.watchTimeOffReConnect(e), t.watch.watchReConnect(!1), t.state.isReConnect = !1;
 });
-let c = t;
-window.SocketApi = c;
+let o = t;
 export {
-  c as SocketApi
+  o as SocketApi
 };

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

@@ -1,16 +1,16 @@
 var i = Object.defineProperty;
 var e = (n, o, t) => o in n ? i(n, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[o] = t;
 var s = (n, o, t) => (e(n, typeof o != "symbol" ? o + "" : o, t), t);
-class l {
+class C {
   constructor() {
     s(this, "options", {
       stop: !1
     });
     s(this, "setConditionReConnect", (o) => {
-      console.log("Переданные параметры (setConditionReConnect)", o), console.log("this.options", this.options), this.options = { ...this.options, ...o };
+      this.options = { ...this.options, ...o };
     });
   }
 }
 export {
-  l as ConfigInfoConnect
+  C as ConfigInfoConnect
 };

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

@@ -1,4 +1,4 @@
-import { ConnectOptions_P, EventNameType, StatusConnectWsAPI, SubscriberType, WsApiStateDefaultI, WsApiStateSaveDefaultI } from './WsApi.types';
+import { ConnectOptions_P, EventNames_OR, StatusConnect_OR, WsApiStateDefaultI, WsApiStateSaveDefaultI, GetCbByKeyNameEvent } from './WsApi.types';
 import { InternetWatcher } from '../InternetWatcher/InternetWatcher';
 import { DelaysPromise } from '../../../Delay/Delay';
 
@@ -13,13 +13,13 @@ export declare class WsApi extends DelaysPromise {
         reject: any;
     }[];
     private stateDefault;
-    setStatus: (status: StatusConnectWsAPI) => void;
+    setStatus: (status: StatusConnect_OR) => void;
     removeEvents: () => void;
     addEvents: () => void;
     openHandler: () => void;
     closeHandler: () => void;
-    on<T>(eventName: EventNameType, cb: SubscriberType<T>): () => void;
-    off<T>(eventName: EventNameType, cb: SubscriberType<T>): void;
+    on<K extends EventNames_OR>(eventName: K, cb: GetCbByKeyNameEvent<K>): () => void;
+    off<K extends EventNames_OR>(eventName: K, cb: GetCbByKeyNameEvent<K>): void;
     msgHandler: (e: any) => void;
     errHandler: (err: any) => void;
     private copyState;

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

@@ -1,17 +1,30 @@
 export interface ConnectOptions_P {
     timeReConnect: number;
 }
-export type EventNameType = "msg" | "status";
-export type SubscribersEventsType = Record<EventNameType, any[]>;
-export type SubscriberType<T> = (msg: T) => void;
-export type StatusConnectWsAPI = "pending" | "ready" | "error" | "close" | "disconnect";
+export type EventNames_OR = "msg" | "status";
+export type StatusConnect_OR = "pending" | "ready" | "error" | "close" | "disconnect";
+interface EventByStatus {
+    event: 'status';
+    cb(status: StatusConnect_OR): void;
+}
+interface EventByMSG {
+    event: 'msg';
+    cb(payload: any): void;
+}
+interface EventsInfoByName_P {
+    status: EventByStatus;
+    msg: EventByMSG;
+}
+export type GetCbByKeyNameEvent<K extends EventNames_OR> = EventsInfoByName_P[K]['cb'];
+export type SubscribersEvents_P = Record<EventNames_OR, any[]>;
 export interface WsApiStateDefaultI {
-    statusConnect: StatusConnectWsAPI;
+    statusConnect: StatusConnect_OR;
     ws: null | WebSocket;
     url: string;
 }
 export interface WsApiStateSaveDefaultI {
     isRequestArrSaveReq: boolean;
     arrSaveReq: any[];
-    subscribersEvents: SubscribersEventsType;
+    subscribersEvents: SubscribersEvents_P;
 }
+export {};

package/package.json

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