dev-classes 1.3.10 → 1.3.12

package/README.md

@@ -29,6 +29,18 @@ HTTPSApi.init();
 HTTPSApi.on('fetch', (info) => { })
 HTTPSApi.request({keyAction: 'action1', request: {url: '...'}})
 
+```
+<h3 align="center">NetworkInformation</h3>
+
+```ts
+import { NetworkInformation, NetworkInformationCordova, NetworkInformationPC } from 'dev-classes';
+
+const internet = new NetworkInformation([new NetworkInformationPC(), new NetworkInformationCordova()]);
+
+internet.run((status, textStatus) => {
+  status ? online() : offline();
+});
+
 ```
 <h3 align="center">Color</h3>
 
@@ -132,6 +144,7 @@ interface OneOfPromiseReject{
   msg: string;
 }
 
+
 interface DelaysPromiseProps{
   startActionEvery: (cb: () => boolean, config: StartActionEveryConfigI) => Promise<{status: boolean, msg: string}>
   oneOf: (watchPromise: () => Promise<any>, potentialCaseCB: () => void, config: {second: number}) => void
@@ -150,18 +163,7 @@ interface NumbersProps {
 }
 
 ```
-<h3 align="center">Number</h3>
-
-```ts
-
-interface NumbersProps {
-  randomNumber: () => number;
-  getOnlyTheStringNumbers(dirtyString: string): string;
-  isNumber(charStr: string | number): boolean;
-}
-
-```
-<h3 align="center">Number</h3>
+<h3 align="center">File</h3>
 
 ```ts
 

package/dist/classes/DelaysPromise/DelaysPromise.js

@@ -1,55 +1,55 @@
 var i = Object.defineProperty;
-var o = (v, e, t) => e in v ? i(v, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : v[e] = t;
-var I = (v, e, t) => (o(v, typeof e != "symbol" ? e + "" : e, t), t);
+var o = (u, e, t) => e in u ? i(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t;
+var I = (u, e, t) => (o(u, typeof e != "symbol" ? e + "" : e, t), t);
 class h {
   constructor() {
     I(this, "defaultProps", {
       interval: 5e3
     });
     I(this, "startActionEvery", (e, t = this.defaultProps) => {
-      const r = (s) => {
+      const a = (s) => {
         t != null && t.watchIdInterval && (t == null || t.watchIdInterval(s));
-      }, u = (s) => {
+      }, v = (s) => {
         t != null && t.controlAction && (t == null || t.controlAction(s));
       };
       return new Promise((s, l) => {
         let n = 0, m = 0;
-        const a = {
+        const r = {
           isActive: !0
         }, A = setInterval(
           () => {
             if (n += t.interval, m += 1, t != null && t.cutoffTime && n > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < m) {
-              a.isActive = !1, clearInterval(A), r(null), l({ status: !1, msg: Error("Время загрузки истекло") });
+              r.isActive = !1, clearInterval(A), a(null), l({ status: !1, msg: Error("Время загрузки истекло") });
               return;
             }
-            e() && (a.isActive = !1, clearInterval(A), r(null), s({ status: !0, msg: "cb вернул true" }));
+            e() && (r.isActive = !1, clearInterval(A), a(null), s({ status: !0, msg: "cb вернул true" }));
           },
           t.interval < 200 ? 200 : t.interval
         );
-        r(A), u({
-          getIsActiveEvent: () => a.isActive,
+        a(A), v({
+          getIsActiveEvent: () => r.isActive,
           stop: (p) => {
             const d = "Ручное завершение startActionEvery";
-            a.isActive = !1, clearInterval(A), r(null), p === !1 ? l({ status: !1, msg: d + ": (false)" }) : s({ status: !0, msg: d + ": (true)" });
+            r.isActive = !1, clearInterval(A), a(null), p ? s({ status: p, msg: d + ": (true)" }) : l({ status: p, msg: d + ": (false)" });
           }
         });
       });
     });
-    I(this, "oneOf", (e, t, { second: r }) => {
-      let u = 1;
+    I(this, "oneOf", (e, t, { second: a }) => {
+      let v = 1;
       e().then(() => {
-        u === 1 && (u = 0);
+        v === 1 && (v = 0);
       });
       let s = setInterval(() => {
-        u === 1 && t(), clearInterval(s);
-      }, r * 1e3);
+        v === 1 && t(), clearInterval(s);
+      }, a * 1e3);
     });
-    I(this, "oneOfPromise", (e, t, { second: r }) => new Promise((u, s) => {
+    I(this, "oneOfPromise", (e, t, { second: a }) => new Promise((v, s) => {
       let l = 1, n = { status: !1, msg: "" };
-      e().then((a) => {
-        l === 1 && (l = 0, u(a));
-      }).catch((a) => {
-        l === 1 && (l = 0, n.msg = a, s(a));
+      e().then((r) => {
+        l === 1 && (l = 0, v(r));
+      }).catch((r) => {
+        l === 1 && (l = 0, n.msg = r, s(r));
       });
       let m = setInterval(() => {
         if (l === 1) {
@@ -60,7 +60,7 @@ class h {
           s({ status: !1, msg: "oneOfPromise reject" });
         }
         clearInterval(m);
-      }, r * 1e3);
+      }, a * 1e3);
     }));
   }
 }

package/dist/classes/HTTPSApi/HTTPSApi.js

@@ -17,10 +17,9 @@ const t = class t {
     return t.state.isNetworkStatus;
   }
   static request({ keyAction: e, request: r }) {
-    const { url: f, ...w } = r;
-    return new Promise((I, u) => {
-      if (!t.getIsInit())
-        throw new Error("Не вызван HTTPSApi.init()");
+    const { url: f, ...I } = r;
+    return new Promise((w, u) => {
+      t.getIsInit() || t.init();
       const o = t.getIsNetwork(), a = {
         url: f,
         keyAction: e,
@@ -31,7 +30,7 @@ const t = class t {
         isReload: !1
       };
       if (t.events.publish("fetch", a), o) {
-        l.requestInServer(f, w).then((c) => {
+        l.requestInServer(f, I).then((c) => {
           const n = {
             isReq: !1,
             isReload: !0,
@@ -40,7 +39,7 @@ const t = class t {
             msg: "",
             ...c
           };
-          t.events.publish("fetch", n), I(n);
+          t.events.publish("fetch", n), w(n);
         }).catch((c) => {
           const n = {
             isReq: !1,

package/dist/classes/SocketApi/SocketApi.js

@@ -110,10 +110,10 @@ n(t, "socketReConnect", () => {
     if (console.log("reconnect"), t.saveID.idReConnect)
       console.groupCollapsed("Процесс socketReConnect уже запущен"), console.log("SocketApi.saveID: ", t.saveID), console.groupEnd();
     else {
-      t.setStatusReConnect(!0);
+      t.setStatusReConnect(!0), t.connect();
       const { timeReConnect: e, numberOfRepit: s } = t.wsApi.getOptions();
       t.delay.startActionEvery(
-        () => (console.log("reconnect:>>delay"), t.wsApi.getStatusSocket() === "ready" ? (console.dir("Подключение установлено"), !0) : !1),
+        () => (console.log("reconnect:>>delay"), t.wsApi.getStatusSocket() === "ready" ? (console.dir("Подключение установлено"), !0) : (t.connect(), !1)),
         {
           interval: e,
           countAction: s,
@@ -121,9 +121,7 @@ n(t, "socketReConnect", () => {
             t.saveID.idReConnect = o;
           },
           controlAction: ({ stop: o, getIsActiveEvent: c }) => {
-            t.stopReConnect = (a) => {
-              o(a);
-            };
+            t.stopReConnect = o;
           }
         }
       ).then(t.setInfoConnect).catch(t.setInfoConnect);

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

@@ -14,20 +14,11 @@ export declare class WsApi {
     private msgHandler;
     private errHandler;
     private copyState;
-    private setResponceInReqSave;
-    private removeRequestItemSave;
+    private filterSaveItemsByResponse;
     private errorInitSocket;
-    getRegisteredEvents: () => string[];
-    send(data: any): void;
-    getIsInitWS: () => boolean;
+    private setStatus;
     getSocket: () => WebSocket | null;
-    getOptions: () => WsApi_Options_P;
-    init: (options: typeof this.options) => void;
     getStatusSocket: () => WsApiE_StatusConnect_OR;
-    private setStatus;
-    on: <K extends keyof WsApi_Events>(name: K, cb: WsApi_Events[K]) => void;
-    off: <K extends keyof WsApi_Events>(name: K, cb: WsApi_Events[K]) => void;
-    setRequestSave(reqInfo: (typeof this.state.arrSaveReq)[number]): void;
     getRequestSave: () => {
         payload: {
             [key: string]: any;
@@ -36,7 +27,15 @@ export declare class WsApi {
         reqId: string;
         cb: any;
     }[];
+    getOptions: () => WsApi_Options_P;
+    getRegisteredEvents: () => string[];
+    on: <K extends keyof WsApi_Events>(name: K, cb: WsApi_Events[K]) => void;
+    off: <K extends keyof WsApi_Events>(name: K, cb: WsApi_Events[K]) => void;
+    init: (options: typeof this.options) => void;
+    getIsInitWS: () => boolean;
     connect(): void;
     close(): void;
     disconnect(): void;
+    send(data: any): void;
+    setRequestSave(reqInfo: (typeof this.state.arrSaveReq)[number]): void;
 }

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

@@ -1,74 +1,74 @@
 var c = Object.defineProperty;
-var S = (r, t, e) => t in r ? c(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var s = (r, t, e) => (S(r, typeof t != "symbol" ? t + "" : t, e), e);
-import { EventSubscribers as l } from "../../../Utils/EventSubscribers/EventSubscribers.js";
-class u {
+var l = (a, t, s) => t in a ? c(a, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : a[t] = s;
+var e = (a, t, s) => (l(a, typeof t != "symbol" ? t + "" : t, s), s);
+import { EventSubscribers as S } from "../../../Utils/EventSubscribers/EventSubscribers.js";
+class v {
   constructor() {
-    s(this, "options", {
+    e(this, "options", {
       timeReConnect: 5e3,
       numberOfRepit: 5,
       url: ""
     });
-    s(this, "state", {
+    e(this, "state", {
       statusConnect: "disconnect",
       ws: null,
       arrSaveReq: []
     });
-    s(this, "initOptions", !1);
-    s(this, "events", new l(["status", "msg"]));
-    s(this, "stateDefault", this.copyState(this.state));
-    s(this, "eventListener", (t) => {
-      var i, a;
-      const e = [
+    e(this, "initOptions", !1);
+    e(this, "events", new S(["status", "msg"]));
+    e(this, "stateDefault", this.copyState(this.state));
+    e(this, "eventListener", (t) => {
+      var i, r;
+      const s = [
         ["open", this.openHandler],
         ["close", this.closeHandler],
         ["message", this.msgHandler],
         ["error", this.errHandler]
       ];
-      for (let n = 0; n < e.length; n++) {
-        const [o, h] = e[n];
-        t === "add" ? (i = this.state.ws) == null || i.addEventListener(o, h) : (a = this.state.ws) == null || a.removeEventListener(o, h);
+      for (let n = 0; n < s.length; n++) {
+        const [o, h] = s[n];
+        t === "add" ? (i = this.state.ws) == null || i.addEventListener(o, h) : (r = this.state.ws) == null || r.removeEventListener(o, h);
       }
     });
-    s(this, "openHandler", () => {
+    e(this, "openHandler", () => {
       this.setStatus("ready");
     });
-    s(this, "closeHandler", () => {
+    e(this, "closeHandler", () => {
       this.setStatus("close");
     });
-    s(this, "msgHandler", (t) => {
-      const e = JSON.parse(t.data ? t.data : "{}");
+    e(this, "msgHandler", (t) => {
+      const s = JSON.parse(t.data ? t.data : "{}");
       try {
-        const { action: i } = e;
-        i && this.setResponceInReqSave(e), this.events.publish("msg", e);
+        const { action: i } = s;
+        i && this.filterSaveItemsByResponse(s), this.events.publish("msg", s);
       } catch {
         this.events.publish("msg", JSON.parse("{}"));
       }
     });
-    s(this, "errHandler", (t) => {
+    e(this, "errHandler", (t) => {
       this.setStatus("error");
     });
-    s(this, "errorInitSocket", () => {
+    e(this, "errorInitSocket", () => {
       console.error("Вы не установили опции");
     });
-    /*----------------------------------------------------------------------------------------------------------*/
-    s(this, "getRegisteredEvents", () => this.events.getListNameEvents());
-    s(this, "getIsInitWS", () => {
-      const t = this.initOptions;
-      return t || this.errorInitSocket(), t;
+    e(this, "setStatus", (t) => {
+      this.events.publish("status", t), this.setState({ statusConnect: t });
     });
-    s(this, "getSocket", () => this.state.ws);
-    s(this, "getOptions", () => this.options);
-    s(this, "init", (t) => {
+    /*----------------------------------------------------------------------------------------------------------*/
+    e(this, "getSocket", () => this.state.ws);
+    e(this, "getStatusSocket", () => this.state.statusConnect);
+    e(this, "getRequestSave", () => this.state.arrSaveReq);
+    e(this, "getOptions", () => this.options);
+    e(this, "getRegisteredEvents", this.events.getListNameEvents);
+    e(this, "on", this.events.subscribe);
+    e(this, "off", this.events.unsubscribe);
+    e(this, "init", (t) => {
       this.initOptions = !0, this.options = { ...this.options, ...t };
     });
-    s(this, "getStatusSocket", () => this.state.statusConnect);
-    s(this, "setStatus", (t) => {
-      this.events.publish("status", t), this.setState({ statusConnect: t });
+    e(this, "getIsInitWS", () => {
+      const t = this.initOptions;
+      return t || this.errorInitSocket(), t;
     });
-    s(this, "on", this.events.subscribe);
-    s(this, "off", this.events.unsubscribe);
-    s(this, "getRequestSave", () => this.state.arrSaveReq);
   }
   resetState() {
     this.state = this.copyState(this.stateDefault);
@@ -79,32 +79,14 @@ class u {
   copyState(t) {
     return JSON.parse(JSON.stringify(t));
   }
-  setResponceInReqSave(t) {
-    const e = this.getRequestSave(), i = [];
-    for (let a = 0; a < e.length; a++) {
-      const n = e[a];
+  filterSaveItemsByResponse(t) {
+    const s = this.getRequestSave(), i = [];
+    for (let r = 0; r < s.length; r++) {
+      const n = s[r];
       n.payload.action !== t.action ? i.push(n) : n.cb && n.cb(t);
     }
     this.state.arrSaveReq = i;
   }
-  removeRequestItemSave(t) {
-    const e = this.state.arrSaveReq.filter((i) => {
-      var a;
-      return ((a = i.payload) == null ? void 0 : a.action) !== t;
-    });
-    this.state.arrSaveReq = e;
-  }
-  send(t) {
-    var i;
-    const e = JSON.stringify(t);
-    (i = this.state.ws) == null || i.send(e);
-  }
-  setRequestSave(t) {
-    if ("action" in t.payload) {
-      const e = this.state.arrSaveReq.findIndex((i) => i.payload.action === t.payload.action);
-      ~e ? this.state.arrSaveReq[e] = t : this.state.arrSaveReq.push(t);
-    }
-  }
   connect() {
     this.initOptions && (this.close(), this.setState({
       ws: new WebSocket(this.options.url)
@@ -117,7 +99,18 @@ class u {
   disconnect() {
     this.close(), this.resetState();
   }
+  send(t) {
+    var i;
+    const s = JSON.stringify(t);
+    (i = this.state.ws) == null || i.send(s);
+  }
+  setRequestSave(t) {
+    if ("action" in t.payload) {
+      const s = this.state.arrSaveReq.findIndex((i) => i.payload.action === t.payload.action);
+      ~s ? this.state.arrSaveReq[s] = t : this.state.arrSaveReq.push(t);
+    }
+  }
 }
 export {
-  u as WsApi
+  v as WsApi
 };

package/dist/classes/Utils/NetworkInformation/classes/InternetWatchers.d.ts

@@ -1,6 +1,8 @@
+import { WatcherCB } from './types/types.abscruct';
+
 export declare class InternetWatchers {
     private state;
     private resetState;
-    addWatchers(cb: (status: boolean) => void): void;
+    addWatchers(cb: WatcherCB): void;
     removeWatchers(): void;
 }

package/dist/classes/Utils/NetworkInformation/classes/InternetWatchers.js

@@ -1,12 +1,12 @@
-var h = Object.defineProperty;
-var c = (e, t, s) => t in e ? h(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s;
-var i = (e, t, s) => (c(e, typeof t != "symbol" ? t + "" : t, s), s);
+var c = Object.defineProperty;
+var u = (e, t, s) => t in e ? c(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s;
+var i = (e, t, s) => (u(e, typeof t != "symbol" ? t + "" : t, s), s);
 const l = {
   isNetworkStatus: window.navigator.onLine,
   listCloseSignals: [],
   isWatcher: !1
 };
-class g {
+class f {
   constructor() {
     i(this, "state", l);
     i(this, "resetState", () => this.state = l);
@@ -15,12 +15,12 @@ class g {
     if (!this.state.isWatcher) {
       this.state.isWatcher = !0;
       const s = [
-        { event: "online", status: !0 },
-        { event: "offline", status: !1 }
+        { event: "online", status: !0, textStatus: "network" },
+        { event: "offline", status: !1, textStatus: "none" }
       ];
       for (let a = 0; a < s.length; a++) {
-        const n = new AbortController(), { event: o, status: r } = s[a];
-        this.state.listCloseSignals.push(n), window.addEventListener(o, () => t(r), { signal: n.signal });
+        const n = new AbortController(), { event: o, status: r, textStatus: h } = s[a];
+        this.state.listCloseSignals.push(n), window.addEventListener(o, () => t(r, h), { signal: n.signal });
       }
     }
   }
@@ -35,5 +35,5 @@ class g {
   }
 }
 export {
-  g as InternetWatchers
+  f as InternetWatchers
 };

package/dist/classes/Utils/NetworkInformation/classes/NetworkInformationCordova.js

@@ -1,19 +1,19 @@
 var s = Object.defineProperty;
-var h = (t, o, r) => o in t ? s(t, o, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[o] = r;
-var n = (t, o, r) => (h(t, typeof o != "symbol" ? o + "" : o, r), r);
+var h = (e, o, r) => o in e ? s(e, o, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[o] = r;
+var t = (e, o, r) => (h(e, typeof o != "symbol" ? o + "" : o, r), r);
 import { NetworkInformationAbstract as i } from "./types/types.abscruct.js";
 class d extends i {
   constructor() {
     super(...arguments);
-    n(this, "watchers", (r) => {
-      const c = (e) => {
-        console.error(e);
-      }, a = (e) => {
-        r(!(e === "unknown" || e === "none"));
+    t(this, "watchers", (r) => {
+      const c = (n) => {
+        console.error(n);
+      }, a = (n) => {
+        r(!(n === "unknown" || n === "none"), n);
       };
       navigator == null || navigator.connection.getInfo(a, c);
     });
-    n(this, "getControls", () => ({
+    t(this, "getControls", () => ({
       system: "cordova",
       addWatchers: this.watchers,
       removeWatchers: () => {

package/dist/classes/Utils/NetworkInformation/classes/NetworkInformationPC.js

@@ -1,14 +1,14 @@
-var s = Object.defineProperty;
-var a = (r, e, t) => e in r ? s(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var o = (r, e, t) => (a(r, typeof e != "symbol" ? e + "" : e, t), t);
-import { InternetWatchers as n } from "./InternetWatchers.js";
+var n = Object.defineProperty;
+var s = (r, e, t) => e in r ? n(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var o = (r, e, t) => (s(r, typeof e != "symbol" ? e + "" : e, t), t);
+import { InternetWatchers as a } from "./InternetWatchers.js";
 import { NetworkInformationAbstract as h } from "./types/types.abscruct.js";
-class w extends h {
+class c extends h {
   constructor() {
     super(...arguments);
-    o(this, "network", new n());
+    o(this, "network", new a());
     o(this, "watchers", (t) => {
-      navigator.onLine ? t(!0) : t(!1), this.network.addWatchers(t);
+      navigator.onLine ? t(!0, "network") : t(!1, "none"), this.network.addWatchers(t);
     });
     o(this, "getControls", () => ({
       system: "pc",
@@ -18,5 +18,5 @@ class w extends h {
   }
 }
 export {
-  w as NetworkInformationPC
+  c as NetworkInformationPC
 };

package/dist/classes/Utils/NetworkInformation/classes/types/types.abscruct.d.ts

@@ -1,5 +1,5 @@
 export type SystemType = 'pc' | 'cordova';
-export type WatcherCB = (status: boolean) => void;
+export type WatcherCB = (status: boolean, textStatus: string) => void;
 export declare abstract class NetworkInformationAbstract {
     protected abstract watchers(cb: WatcherCB): void;
     abstract getControls(): {

package/package.json

@@ -11,7 +11,7 @@
   },
   "homepage": "https://github.com/SinGlEBW/dev-classes#readme",
   "license": "MIT",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "type": "module",
   "module": "./dist/index.js",
   "main": "./dist/index.js",