wenay-common 1.0.250 → 1.0.252

package/lib/Common/Listen.d.ts

@@ -25,7 +25,7 @@ export declare function funcListenCallbackFast<T>(a: (e: (Listener<NormalizeTupl
     addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
     removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
 };
 export declare function funcListenCallback<T>(a: (e: (Listener<NormalizeTuple<T>> | null)) => (void | (() => void)), event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<T>>) => void, fast?: boolean): {
     func: Listener<NormalizeTuple<T>>;
@@ -37,7 +37,7 @@ export declare function funcListenCallback<T>(a: (e: (Listener<NormalizeTuple<T>
     addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
     removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
 };
 export declare function UseListen<T>(data?: Parameters<typeof funcListenCallbackBase<T>>[1]): readonly [(...a: NormalizeTuple<T>) => void, {
     func: Listener<NormalizeTuple<T>>;
@@ -49,7 +49,7 @@ export declare function UseListen<T>(data?: Parameters<typeof funcListenCallback
     addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
     removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
 }];
 export declare function isListenCallback(obj: any): obj is ReturnType<typeof funcListenCallbackBase>;
 export {};

package/lib/Common/Listen.js

@@ -113,7 +113,6 @@ function UseListen(data = { fast: true }) {
     return [t, a];
 }
 function isListenCallback(obj) {
-    console.log(obj);
     if (obj == null || typeof obj !== "object")
         return false;
     const obj2 = obj;

package/lib/Common/SocketBuffer.d.ts

@@ -31,7 +31,7 @@ export declare function funcListenCallbackSnapshot<T extends realSocket2<any | a
         addListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>, cbClose?: (() => void) | undefined) => () => void;
         removeListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<T_1 extends any[] ? T_1 : [T_1]>[];
+        readonly getAllKeys: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>[];
     };
     connect: () => void;
     readonly disconnect: ((a: Omit<Parameters<T>[0], "callback"> & {

package/lib/Common/SocketServerHook.d.ts

@@ -14,7 +14,7 @@ export declare function SocketServerHook(opt?: {
             addListen: (cb: import("./Listen").Listener<[unknown]>, cbClose?: (() => void) | undefined) => () => void;
             removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
             count: () => number;
-            readonly getAllKeys: import("./Listen").Listener<T extends any[] ? T : [T]>[];
+            readonly getAllKeys: import("./Listen").Listener<[unknown]>[];
         }];
     };
     get(tag: string): readonly [(a_0: unknown) => void, {
@@ -27,7 +27,7 @@ export declare function SocketServerHook(opt?: {
         addListen: (cb: import("./Listen").Listener<[unknown]>, cbClose?: (() => void) | undefined) => () => void;
         removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<T extends any[] ? T : [T]>[];
+        readonly getAllKeys: import("./Listen").Listener<[unknown]>[];
     }];
     provider: (tag: string, data: any) => void;
 };

package/lib/Common/commonsServerMini2.js

@@ -103,22 +103,26 @@ function createServer(socket, key, target, hooks, limits) {
     const contexts = [];
     const routeMap = {};
     function transformTree(obj) {
-        if (obj == null || typeof obj != "object" || (0, isProxy_1.isProxy)(obj))
-            return obj;
+        let current = obj;
+        if (hooks?.resolveTransform && !(0, isProxy_1.isProxy)(current)) {
+            current = hooks.resolveTransform(current);
+        }
+        if (current == null || typeof current != "object" || (0, isProxy_1.isProxy)(current))
+            return current;
         const out = {};
-        for (const k of Object.keys(obj)) {
+        for (const k of Object.keys(current)) {
             if (!isSafeKey(k))
                 continue;
-            const v = obj[k];
+            const v = current[k];
             if ((0, isProxy_1.isProxy)(v)) {
-                obj[k] = v;
+                out[k] = v;
                 continue;
             }
             out[k] = typeof v == "function" ? v : v != null && typeof v == "object" ? transformTree(v) : v;
         }
         return out;
     }
-    const resolved = hooks?.resolveTransform ? transformTree(target) : target;
+    const resolved = transformTree(target);
     function index(obj, prefix) {
         for (const k of Object.keys(obj)) {
             if (!isSafeKey(k))
@@ -141,6 +145,7 @@ function createServer(socket, key, target, hooks, limits) {
             if (!isSafeKey(k))
                 continue;
             const v = obj[k];
+            console.log(k);
             switch (true) {
                 case v == null:
                     out[k] = "null";
@@ -171,6 +176,7 @@ function createServer(socket, key, target, hooks, limits) {
         }
         if (!Array.isArray(msg) || msg[0] !== Pkt.CALL)
             return;
+        console.log(msg);
         const [, reqId, ref, rawArgs, w] = msg;
         const wait = w !== false;
         if (typeof reqId !== "number" || !Number.isFinite(reqId)) {
@@ -211,18 +217,21 @@ function createServer(socket, key, target, hooks, limits) {
                     let curr = target;
                     for (let i = 0; i < ref.length - 1; i++) {
                         const seg = ref[i];
-                        if (curr == null || typeof curr !== "object" || !hasOwn(curr, seg)) {
+                        console.log(seg, !(seg in curr));
+                        if (curr == null || typeof curr !== "object" || !(seg in curr)) {
                             curr = undefined;
                             break;
                         }
                         curr = curr[seg];
+                        console.log(111);
                         if (hooks?.resolveTransform && !(0, isProxy_1.isProxy)(curr))
                             curr = hooks.resolveTransform(curr);
                     }
                     const last = ref[ref.length - 1];
                     if (curr != null && typeof curr == "object") {
                         ctx = curr;
-                        fn = hasOwn(curr, last) ? curr[last] : undefined;
+                        fn = last in curr ? curr[last] : undefined;
+                        console.log(fn, last);
                     }
                 }
             }
@@ -355,6 +364,8 @@ function createClient(socket, key, opts) {
                     return undefined;
                 if (p == "call" && tgt == "func")
                     return (_, ...args) => sendCall(path, args, wait);
+                if (tgt === "func")
+                    return undefined;
                 const child = tgt?.[String(p)];
                 return child == "null" || child == undefined ? undefined : buildStrict([...path, String(p)], wait);
             },

package/package.json

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

package/lib/Common/node_test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/Common/node_test.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-console.log("=== ОБЫЧНЫЙ ERROR.STACK ===");
-console.log(new Error().stack);
-console.log("=== PREPARE STACK TRACE ===");
-const originalPrepareStackTrace = Error.prepareStackTrace;
-Error.prepareStackTrace = (_, stack) => stack;
-const stack = new Error().stack;
-Error.prepareStackTrace = originalPrepareStackTrace;
-console.log("Stack frames:");
-for (let i = 0; i < Math.min(stack.length, 3); i++) {
-    const frame = stack[i];
-    console.log(`Frame[${i}]: ${frame.getFileName()}:${frame.getLineNumber()}:${frame.getColumnNumber()}`);
-}

package/lib/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonJS",
-    "target": "esnext"
-  }
-}