wenay-common 1.0.90 → 1.0.91

package/lib/Common/commonsServer.d.ts

@@ -3,11 +3,7 @@ export type tRequestScreenerT<T> = {
     callbacksId?: string[];
     request: any[];
 };
-export declare function funcPromiseServer<T extends object>(data: screenerSoc<tSocketData<tRequestScreenerT<T>>>, obj: T, myCatch?: (r: {
-    data: string | any;
-    key: keyof T;
-    arguments: any[];
-}) => void): void;
+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> = ({
@@ -87,15 +83,10 @@ export declare function CreatAPIFacadeClient<T extends object>({ socketKey, sock
     space: tMethodToPromise2<typeNoVoid2<T>>;
     all: tMethodToPromise2<T>;
 };
-export declare function CreatAPIFacadeServer<T extends object>({ object, socket, socketKey, myCatch }: {
+export declare function CreatAPIFacadeServer<T extends object>({ object, socket, socketKey }: {
     socket: any;
     object: T;
     socketKey: string;
-    myCatch?: (r: {
-        data: string | any;
-        key: keyof T;
-        arguments: any[];
-    }) => void;
 }): void;
 export declare function fMiniTest(): void;
 export declare class CTestWeb {

package/lib/Common/commonsServer.js

@@ -2,7 +2,7 @@
 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;
 const common_1 = require("./common");
-function funcPromiseServer(data, obj, myCatch) {
+function funcPromiseServer(data, obj) {
     const buf = data;
     data.api({
         onMessage: async (datum) => {
@@ -33,13 +33,20 @@ function funcPromiseServer(data, obj, myCatch) {
                 const a = await (async () => buf(...request))()
                     .catch((e) => {
                     data.sendMessage({ mapId: datum.mapId, error: e });
-                    throw { data: e, key: key, arguments: request };
+                    console.error({ data: e, key: key, arguments: request });
+                })
+                    .then(a => {
+                    if (datum.wait !== false)
+                        data.sendMessage({ mapId: datum.mapId, data: a ?? undefined });
                 });
-                if (datum.wait !== false)
-                    data.sendMessage({ mapId: datum.mapId, data: a ?? undefined });
             }
-            else
-                throw myCatch?.({ data: "это не функция", key: key, arguments: request });
+            else {
+                data.sendMessage({
+                    mapId: datum.mapId,
+                    error: JSON.stringify({ data: "это не функция", key: key, arguments: request })
+                });
+                console.error({ data: "это не функция", key: key, arguments: request });
+            }
         }
     });
 }
@@ -236,14 +243,11 @@ function CreatAPIFacadeClient({ socketKey, socket }) {
     };
 }
 exports.CreatAPIFacadeClient = CreatAPIFacadeClient;
-function CreatAPIFacadeServer({ object, socket, socketKey, myCatch }) {
+function CreatAPIFacadeServer({ object, socket, socketKey }) {
     funcPromiseServer({
         sendMessage: (data) => socket.emit(socketKey, data),
         api: (api) => {
-            socket.on(socketKey, (d) => (async () => api.onMessage(d))()
-                .catch((e) => {
-                myCatch?.(e);
-            }));
+            socket.on(socketKey, (d) => api.onMessage(d));
         }
     }, object);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.90",
+  "version": "1.0.91",
   "description": "math math math",
   "strict": true,
   "main": "lib/index.js",