wenay-common 1.0.111 → 1.0.112

package/lib/Common/commonsServer.d.ts

@@ -3,13 +3,12 @@ type tSocket = {
     on: (marker: string, callback: (a: any) => any) => any;
 };
 export type tRequestScreenerT<T> = {
-    key: keyof T;
+    key: string[];
     callbacksId?: string[];
     request: any[];
 };
 export declare function funcPromiseServer<T extends object>(data: screenerSoc<tSocketData<tRequestScreenerT<T>>>, obj: T): void;
 export declare function funcPromiseServer2<T extends object>(sendMessage: screenerSoc222<tSocketData<tRequestScreenerT<T>>>, obj: T): (datum: any) => Promise<void>;
-export declare function funcPromiseServerPost<T extends object>(data: screenerPost<tRequestScreenerT<T>>, obj: T): void;
 type tSocketData<T> = ({
     data: T;
     error?: undefined;
@@ -28,15 +27,7 @@ type screenerSoc<T> = {
     }) => void;
 };
 type screenerSoc222<T> = (data: T) => void;
-type screenerPost<T> = {
-    api: (data: {
-        onMessage: (data: T) => any | Promise<any>;
-    }) => void;
-};
 export declare function funcForWebSocket<T>(data: screenerSoc<tSocketData<tRequestScreenerT<T>>>): screenerSoc2<T>;
-export declare function FFuncMyF<T extends object>(object: T): {
-    send: (data: tRequestScreenerT<T>) => Promise<any>;
-};
 type tFunc = (a: any) => any;
 export type screenerSoc2<T> = {
     send: (data: tRequestScreenerT<T>, wait?: boolean, callbacksId?: tFunc[]) => Promise<any>;
@@ -51,9 +42,8 @@ export type screenerSocApi<T> = {
     callbackDelete: (func: tFunc) => void;
 };
 export type tMethodToPromise2<T extends object> = {
-    [P in keyof T]: T[P] extends ((...args: infer Z) => infer X) ? (...args: Z) => (X extends Promise<any> ? X : Promise<X>) : Promise<T[P]>;
+    [P in keyof T]: T[P] extends ((...args: infer Z) => infer X) ? (...args: Z) => (X extends Promise<any> ? X : Promise<X>) : T[P] extends object ? tMethodToPromise2<T[P]> : never;
 };
-export declare function funcScreenerClient2<T extends object>(data: screenerSoc2<T>, wait?: boolean): tMethodToPromise2<T>;
 type tAndB<T> = {
     data: T;
     void: () => void;
@@ -64,7 +54,6 @@ export type screenerSoc3<T> = {
 export type tMethodToPromise3<T extends object> = {
     [P in keyof T]: T[P] extends ((...args: infer Z) => infer X) ? (...args: Z) => (X extends Promise<any> ? tAndB<X> : tAndB<Promise<X>>) : tAndB<Promise<T[P]>>;
 };
-export declare function funcScreenerClient3<T extends object>(data: screenerSoc3<T>): tMethodToPromise3<T>;
 export type typeVoid2<T> = {
     [P in Exclude<keyof T, {
         [P in keyof T]: T[P] extends (any: any) => any ? ReturnType<T[P]> extends void ? P : never : never;

package/lib/Common/commonsServer.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CTestWeb = exports.fMiniTest = exports.CreatAPIFacadeServer = exports.CreatAPIFacadeClient = exports.funcScreenerClient3 = exports.funcScreenerClient2 = exports.FFuncMyF = exports.funcForWebSocket = exports.funcPromiseServerPost = exports.funcPromiseServer2 = exports.funcPromiseServer = void 0;
+exports.CTestWeb = exports.fMiniTest = exports.CreatAPIFacadeServer = exports.CreatAPIFacadeClient = exports.funcForWebSocket = exports.funcPromiseServer2 = exports.funcPromiseServer = void 0;
 const common_1 = require("./common");
 function funcPromiseServer(data, obj) {
     const buf = data;
     data.api({
         onMessage: async (datum) => {
             const { key, request } = datum.data;
-            const buf = obj[key];
+            const buf = key.reduce((o, k) => o?.[k], obj);
             if (!buf)
                 return;
             if (typeof buf == "function") {
@@ -66,28 +66,6 @@ function funcPromiseServer2(sendMessage, obj) {
     };
 }
 exports.funcPromiseServer2 = funcPromiseServer2;
-function funcPromiseServerPost(data, obj) {
-    data.api({
-        onMessage: async (datum) => {
-            console.log(datum);
-            if (!datum)
-                return;
-            const { key, request } = datum;
-            if (!key)
-                return;
-            const buf = obj[key];
-            if (!buf)
-                return;
-            if (typeof buf == "function") {
-                const a = await (async () => buf(...request))();
-                return { data: a ?? undefined };
-            }
-            else
-                throw "это не функция";
-        }
-    });
-}
-exports.funcPromiseServerPost = funcPromiseServerPost;
 function funcForWebSocket(data) {
     const sendMessage = data.sendMessage;
     const free = (() => {
@@ -161,7 +139,12 @@ function funcForWebSocket(data) {
     return {
         api,
         send: (data, wait, callbacksId) => new Promise((resolve, reject) => {
-            const send = { mapId: free.next(), data, wait: wait, callbacksId: [] };
+            const send = {
+                mapId: free.next(),
+                data,
+                wait: wait,
+                callbacksId: []
+            };
             for (const el of callbacksId ?? []) {
                 const id = free.next();
                 send.callbacksId?.push(id);
@@ -185,49 +168,33 @@ function funcForWebSocket(data) {
     };
 }
 exports.funcForWebSocket = funcForWebSocket;
-function FFuncMyF(object) {
-    return {
-        send: async (data) => {
-            const buf = object[data.key];
-            if (!buf)
-                throw "такого метода нет";
-            if (typeof buf == "function")
-                return buf(...data.request);
-            else
-                throw "это не функция";
-        }
-    };
-}
-exports.FFuncMyF = FFuncMyF;
 function funcScreenerClient2(data, wait) {
-    return new Proxy({}, {
+    const tr = (address) => new Proxy((() => { }), {
         get(target, p, receiver) {
-            const key = String(p);
-            return async (...argArray) => {
-                const callback = [];
-                const callback2 = [];
-                argArray.forEach((el, i) => {
-                    if (typeof el == "function") {
-                        callback.push({ func: el, poz: i });
-                        callback2.push(el);
-                        argArray[i] = "___FUNC";
-                    }
-                });
-                return data.send({ key, request: argArray }, wait, callback2);
-            };
+            address.push(p);
+            return tr(address);
+        },
+        apply(target, thisArg, argArray) {
+            console.log(address, argArray);
+            const callback = [];
+            const callback2 = [];
+            argArray.forEach((el, i) => {
+                if (typeof el == "function") {
+                    callback.push({ func: el, poz: i });
+                    callback2.push(el);
+                    argArray[i] = "___FUNC";
+                }
+            });
+            return data.send({ key: address, request: argArray }, wait, callback2);
         }
     });
-}
-exports.funcScreenerClient2 = funcScreenerClient2;
-function funcScreenerClient3(data) {
-    return new Proxy({}, {
+    const tr2 = () => new Proxy({}, {
         get(target, p, receiver) {
-            const key = String(p);
-            return (...argArray) => data.send({ key, request: argArray });
-        }
+            return tr([String(p)]);
+        },
     });
+    return tr2();
 }
-exports.funcScreenerClient3 = funcScreenerClient3;
 function CreatAPIFacadeClient({ socketKey, socket }) {
     const tr = funcForWebSocket({
         sendMessage: (data) => socket.emit(socketKey, data),

package/lib/Exchange/ConnectData/Binance/signatureCoder.d.ts

@@ -1,6 +1,6 @@
 export type MilliSec = number;
 type tInputBaseR = {
-    [key: string]: number | string | string[];
+    [key: string]: boolean | number | string | string[];
 };
 export type tInputBase = {
     timestamp?: MilliSec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",