dev-classes 1.3.27 → 1.3.29

package/README.md

@@ -146,7 +146,10 @@ interface OneOfPromiseReject{
 
 
 interface DelaysPromiseProps{
-  startActionEvery: (cb: () => boolean, config: StartActionEveryConfigI) => Promise<{status: boolean, msg: string}>
+   startActionEvery: (cb: () => boolean, config: StartActionEveryConfigI) => {
+    stop: ControlAction['stop'],
+    promise: Promise<{status: boolean, msg: string}>
+  }
   oneOf: (watchPromise: () => Promise<any>, potentialCaseCB: () => void, config: {second: number}) => void
   oneOfPromise:(watchPromise: () => Promise<any>, cbPotentialReject: (p:OneOfPromiseReject) => OneOfPromiseReject, config: {second: number}) => Promise<any>
 }

package/dist/classes/DelaysPromise/DelaysPromise.js

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

package/dist/classes/DelaysPromise/DelaysPromise.types.d.ts

@@ -14,10 +14,13 @@ interface OneOfPromiseReject {
     msg: string;
 }
 export interface DelaysPromiseProps {
-    startActionEvery: (cb: () => boolean, config: StartActionEveryConfigI) => Promise<{
-        status: boolean;
-        msg: string;
-    }>;
+    startActionEvery: (cb: () => boolean, config: StartActionEveryConfigI) => {
+        stop: ControlAction['stop'];
+        promise: Promise<{
+            status: boolean;
+            msg: string;
+        }>;
+    };
     oneOf: (watchPromise: () => Promise<any>, potentialCaseCB: () => void, config: {
         second: number;
     }) => void;

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

@@ -1,5 +1,5 @@
 import { WsApi_Options_P } from './deps/WsApi';
-import { SocketApi_Options_P, SocketApi_State_P } from './SocketApi.types';
+import { SocketApi_Options_P, SocketApi_StateProps_P } from './SocketApi.types';
 
 export declare class SocketApi {
     #private;
@@ -20,9 +20,17 @@ export declare class SocketApi {
     private static online;
     private static offline;
     private static splitOptions;
-    static getState: () => SocketApi_State_P;
+    static getState: () => SocketApi_StateProps_P;
     static on: typeof SocketApi.wsApi.on & typeof SocketApi.events.subscribe;
     static off: typeof SocketApi.wsApi.on & typeof SocketApi.events.subscribe;
+    static getRequestSave: () => {
+        payload: {
+            [key: string]: any;
+            action: string;
+        };
+        reqId: string;
+        cb: any;
+    }[];
     static getStatusSocket: () => import('./deps/WsApi').WsApiE_StatusConnect_OR;
     static close: () => void;
     static init: (options: WsApi_Options_P & SocketApi_Options_P) => void;

package/dist/classes/SocketApi/SocketApi.js

@@ -1,24 +1,24 @@
 var w = Object.defineProperty;
-var C = (i, e, s) => e in i ? w(i, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[e] = s;
-var n = (i, e, s) => (C(i, typeof e != "symbol" ? e + "" : e, s), s);
-var f = (i, e, s) => {
-  if (e.has(i))
+var C = (o, e, s) => e in o ? w(o, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : o[e] = s;
+var n = (o, e, s) => (C(o, typeof e != "symbol" ? e + "" : e, s), s);
+var f = (o, e, s) => {
+  if (e.has(o))
     throw TypeError("Cannot add the same private member more than once");
-  e instanceof WeakSet ? e.add(i) : e.set(i, s);
+  e instanceof WeakSet ? e.add(o) : e.set(o, s);
 };
 import { DelaysPromise as R } from "../DelaysPromise/DelaysPromise.js";
-import { NetworkInformationCordova as d } from "../Utils/NetworkInformation/classes/NetworkInformationCordova.js";
-import { NetworkInformationPC as v } from "../Utils/NetworkInformation/classes/NetworkInformationPC.js";
+import { NetworkInformationCordova as v } from "../Utils/NetworkInformation/classes/NetworkInformationCordova.js";
+import { NetworkInformationPC as d } from "../Utils/NetworkInformation/classes/NetworkInformationPC.js";
 import { EventSubscribers as g } from "../Utils/EventSubscribers/EventSubscribers.js";
 import { NetworkInformation as O } from "../Utils/NetworkInformation/NetworkInformation.js";
 import { WsApi as S } from "./deps/WsApi/WsApi.js";
 const I = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-function m(i) {
-  return I.test(i);
+function m(o) {
+  return I.test(o);
 }
 function u() {
-  var i = URL.createObjectURL(new Blob()), e = i.toString();
-  return URL.revokeObjectURL(i), e.split(/[:\/]/g).pop().toLowerCase();
+  var o = URL.createObjectURL(new Blob()), e = o.toString();
+  return URL.revokeObjectURL(o), e.split(/[:\/]/g).pop().toLowerCase();
 }
 u.valid = m;
 var r, A;
@@ -45,10 +45,10 @@ const t = class t {
     t.state.isDisconnect || (t.setState({ isDisconnect: !0 }), console.log("DISCONNECT WS"), t.wsApi.disconnect(), t.resetState());
   }
   static send(e, s) {
-    const { action: o, ...c } = e, a = u();
+    const { action: i, ...c } = e, a = u();
     t.wsApi.setRequestSave({
       reqId: a,
-      payload: { action: o, ...c },
+      payload: { action: i, ...c },
       cb: s
     });
     const l = t.wsApi.getSocket();
@@ -71,7 +71,7 @@ r = new WeakSet(), A = function() {
   isNetworkStatus: navigator.onLine
 }), n(t, "options", {
   isReConnectNetworkOnline: !1
-}), n(t, "wsApi", new S()), n(t, "delay", new R()), n(t, "internet", new O([new v(), new d()])), n(t, "events", new g(["timeOffReConnect", "reConnect"])), n(t, "saveID", {
+}), n(t, "wsApi", new S()), n(t, "delay", new R()), n(t, "internet", new O([new d(), new v()])), n(t, "events", new g(["timeOffReConnect", "reConnect"])), n(t, "saveID", {
   idReConnect: null,
   checkConnect: null
 }), n(t, "stateDefault", t.copyState(t.state)), n(t, "setInfoConnect", (e) => {
@@ -81,9 +81,9 @@ r = new WeakSet(), A = function() {
 }), n(t, "offline", () => {
   t.setState({ isNetworkStatus: !1 }), t.state.isActiveReConnect && t.stopReConnect(!1);
 }), n(t, "splitOptions", (e) => Object.entries(e).reduce(
-  (s, [o, c]) => {
+  (s, [i, c]) => {
     const a = t.wsApi.getOptions();
-    return o in a ? { ...s, WsOptions: { ...s.WsOptions, [o]: c } } : { ...s, SocketApiOptions: { ...s.SocketApiOptions, [o]: c } };
+    return i in a ? { ...s, WsOptions: { ...s.WsOptions, [i]: c } } : { ...s, SocketApiOptions: { ...s.SocketApiOptions, [i]: c } };
   },
   { WsOptions: {}, SocketApiOptions: {} }
 )), /*---------------------------------------------------------------------------------------------------------------------------*/
@@ -91,20 +91,14 @@ n(t, "getState", () => t.state), n(t, "on", (e, s) => {
   t.wsApi.getRegisteredEvents().includes(e) ? t.wsApi.on(e, s) : t.events.subscribe(e, s);
 }), n(t, "off", (e, s) => {
   t.wsApi.getRegisteredEvents().includes(e) ? t.wsApi.off(e, s) : t.events.unsubscribe(e, s);
-}), // static getRequestSave = SocketApi.wsApi.getRequestSave;
-n(t, "getStatusSocket", t.wsApi.getStatusSocket), n(t, "close", () => {
+}), n(t, "getRequestSave", t.wsApi.getRequestSave), n(t, "getStatusSocket", t.wsApi.getStatusSocket), n(t, "close", () => {
   t.state.isActiveReConnect ? t.stopReConnect(!1) : t.wsApi.close();
 }), n(t, "init", (e) => {
-  const { WsOptions: s, SocketApiOptions: o } = t.splitOptions(e);
+  const { WsOptions: s, SocketApiOptions: i } = t.splitOptions(e);
   t.internet.run((c) => {
     c ? t.online() : t.offline();
-  }), t.setOptions(o), t.wsApi.init(s);
+  }), t.setOptions(i), t.wsApi.init(s);
 }), /*------------------------------------------------------------------------------------------------------*/
-// useEffect(() => {
-//   if((isReConnectSocket && (!isNetworkStatus || statusWS === 'ready'))){
-//     SocketApi.stopReConnect();
-//   }
-// },[isReConnectSocket, isNetworkStatus, statusWS]);
 n(t, "socketReConnect", () => {
   if (t.wsApi.getIsInitWS())
     if (console.log("reconnect"), t.saveID.idReConnect)
@@ -117,14 +111,14 @@ n(t, "socketReConnect", () => {
         {
           interval: e,
           countAction: s,
-          watchIdInterval: (o) => {
-            t.saveID.idReConnect = o;
+          watchIdInterval: (c) => {
+            t.saveID.idReConnect = c;
           },
-          controlAction: ({ stop: o, getIsActiveEvent: c }) => {
-            t.stopReConnect = o;
+          controlAction: ({ stop: c, getIsActiveEvent: a }) => {
+            t.stopReConnect = c;
           }
         }
-      ).then(t.setInfoConnect).catch(t.setInfoConnect);
+      ).promise.then(t.setInfoConnect).catch(t.setInfoConnect);
     }
 });
 let p = t;

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

@@ -1,6 +1,9 @@
+import { WsApiE_StatusConnect_OR } from './deps/WsApi';
+
 export interface SocketApi_Options_P {
     isReConnectNetworkOnline?: boolean;
 }
-type SocketApi_State_OR = 'isDisconnect' | 'isActiveReConnect' | 'isOfflineSocket' | 'isReady' | 'isNetworkStatus';
-export type SocketApi_State_P = Record<SocketApi_State_OR, boolean>;
+type SocketApi_StateProps_OR = 'isDisconnect' | 'isActiveReConnect' | 'isOfflineSocket' | 'isReady' | 'isNetworkStatus';
+export type SocketApi_StateProps_P = Record<SocketApi_StateProps_OR, boolean>;
+export type SocketApi_StatusConnect_OR = WsApiE_StatusConnect_OR;
 export {};

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

@@ -1,2 +1,2 @@
 export * from './SocketApi';
-export { type SocketApi_State_P } from './SocketApi.types';
+export { type SocketApi_StateProps_P, type SocketApi_StatusConnect_OR } from './SocketApi.types';

package/package.json

@@ -2,16 +2,16 @@
   "name": "dev-classes",
   "private": false,
   "author": "SinGlEBW",
+  "homepage": "https://github.com/SinGlEBW/dev-classes#readme",
+  "bugs": {
+    "url": "https://github.com/SinGlEBW/dev-classes/issues"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/SinGlEBW/dev-classes.git"
   },
-  "bugs": {
-    "url": "https://github.com/SinGlEBW/dev-classes/issues"
-  },
-  "homepage": "https://github.com/SinGlEBW/dev-classes#readme",
   "license": "MIT",
-  "version": "1.3.27",
+  "version": "1.3.29",
   "type": "module",
   "module": "./dist/index.js",
   "main": "./dist/index.js",
@@ -38,7 +38,8 @@
   "scripts": {
     "start": "vite",
     "build": "tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "publish": "node publishVersion.js"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",