wenay-common2 1.0.33 → 1.0.34

package/lib/Common/rcp/createRpcServerAutoWithProtocolDetection.d.ts

@@ -3,6 +3,15 @@ import { type PromiseServerHooks, type RpcLimits } from "./rpc-server";
 import { DeepSocketListen } from "./listen-deep";
 import { type SocketTmpl } from "./rpc-protocol";
 type ListenCallbackBase<T extends any[] = any[]> = ReturnType<typeof funcListenCallbackBase<T>>;
+export declare function createRpcServerAuto<T extends object>({ socket, object: target, socketKey: key, debug, hooks, disconnectListen, limits }: {
+    socket: SocketTmpl;
+    object: T;
+    socketKey: string;
+    debug?: boolean;
+    hooks?: Omit<PromiseServerHooks<DeepSocketListen<T>>, "resolveTransform">;
+    disconnectListen?: ListenCallbackBase<any>;
+    limits?: RpcLimits;
+}): void;
 type ClientProtocol = 'v2' | 'legacy' | null;
 export declare function createRpcServerAuto2<T extends object>({ socket, object: target, socketKey: key, debug, hooks, disconnectListen, limits, onProtocolDetect, }: {
     socket: SocketTmpl;
@@ -15,6 +24,7 @@ export declare function createRpcServerAuto2<T extends object>({ socket, object:
     onProtocolDetect?: (protocol: 'v2' | 'legacy') => void;
 }): {
     getProtocol: () => ClientProtocol;
-    getSchema: () => any;
+    getLegacySchema: () => any;
+    getResolved: () => any;
 };
 export {};

package/lib/Common/rcp/createRpcServerAutoWithProtocolDetection.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRpcServerAuto = createRpcServerAuto;
 exports.createRpcServerAuto2 = createRpcServerAuto2;
 const Listen_1 = require("../events/Listen");
 const listen_socket_1 = require("./listen-socket");
 const rpc_server_1 = require("./rpc-server");
 const rpc_protocol_1 = require("./rpc-protocol");
 const old_ommonsServerMini_1 = require("./old\u0421ommonsServerMini");
-function createRpcServerAuto_({ socket, object: target, socketKey: key, debug, hooks, disconnectListen, limits }) {
+function createRpcServerAuto({ socket, object: target, socketKey: key, debug, hooks, disconnectListen, limits }) {
     const cache = new WeakMap();
     function getListenSocket(parent, disconnectListen) {
         let result = cache.get(parent);
@@ -44,7 +45,9 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
         return getListenSocket(obj);
     }
     function transformTree(obj) {
-        if (obj == null || typeof obj !== 'object')
+        if (obj == null || typeof obj === 'function')
+            return obj;
+        if (typeof obj !== 'object')
             return obj;
         const transformed = resolveTransform(obj);
         if (transformed !== obj)
@@ -52,7 +55,12 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
         const out = {};
         for (const k of Object.keys(obj)) {
             const v = obj[k];
-            out[k] = typeof v === 'function' ? v : (v != null && typeof v === 'object') ? transformTree(v) : v;
+            if (typeof v === 'function')
+                out[k] = v;
+            else if (v != null && typeof v === 'object')
+                out[k] = transformTree(v);
+            else
+                out[k] = v;
         }
         return out;
     }
@@ -72,22 +80,25 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
         return out;
     }
     const resolved = transformTree(target);
-    const strictSchema = serialize(resolved);
+    const legacySchema = serialize(resolved);
     let protocol = null;
     let v2Handler = null;
     let legacyHandler = null;
+    function isLegacyStrictRequest(msg) {
+        return msg === '___STRICTLY';
+    }
     function isLegacyMessage(msg) {
         return (typeof msg === 'object' &&
             msg !== null &&
             !Array.isArray(msg) &&
-            typeof msg.mapId === 'number' &&
-            (msg.data !== undefined || msg.error !== undefined));
-    }
-    function isLegacyStrictRequest(msg) {
-        return msg === '___STRICTLY';
+            typeof msg.mapId === 'number');
     }
     function isV2Message(msg) {
-        return (Array.isArray(msg) && (msg[0] === rpc_protocol_1.Pkt.CALL || msg[0] === rpc_protocol_1.Pkt.PIPE)) || msg === rpc_protocol_1.Pkt.STRICT;
+        if (msg === rpc_protocol_1.Pkt.STRICT)
+            return true;
+        if (Array.isArray(msg) && (msg[0] === rpc_protocol_1.Pkt.CALL || msg[0] === rpc_protocol_1.Pkt.PIPE))
+            return true;
+        return false;
     }
     function initLegacy() {
         if (legacyHandler)
@@ -97,7 +108,11 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             sendMessage: (msg) => socket.emit(key, msg),
             api: ({ onMessage }) => { onMessageCb = onMessage; },
         }, resolved);
-        legacyHandler = (msg) => onMessageCb?.(msg);
+        legacyHandler = (msg) => {
+            if (!onMessageCb)
+                return;
+            onMessageCb(msg);
+        };
     }
     function initV2() {
         if (v2Handler)
@@ -108,64 +123,72 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             on: (e, cb) => { if (e === key)
                 onMsgCb = cb; },
         };
-        if (debug) {
-            const origOn = innerSocket.on.bind(innerSocket);
-            innerSocket.on = (e, cb) => origOn(e, (d) => { console.log('[RPC IN]', typeof d === 'object' ? JSON.stringify(d) : d); cb(d); });
-        }
         (0, rpc_server_1.createRpcServer)({
             socket: innerSocket,
             object: target,
             socketKey: key,
-            debug: false,
+            debug,
             limits,
             hooks: {
                 ...hooks,
                 resolveTransform,
             },
         });
-        v2Handler = (msg) => onMsgCb?.(msg);
+        v2Handler = (msg) => {
+            if (!onMsgCb)
+                return;
+            onMsgCb(msg);
+        };
     }
     socket.on(key, (msg) => {
         if (debug) {
-            console.log('[RPC-AUTO2]', typeof msg === 'object' ? JSON.stringify(msg) : msg);
+            console.log('[RPC-AUTO2 IN]', typeof msg === 'object' ? JSON.stringify(msg) : msg);
         }
-        if (protocol === null) {
+        if (protocol === 'legacy') {
             if (isLegacyStrictRequest(msg)) {
-                protocol = 'legacy';
-                onProtocolDetect?.('legacy');
-                socket.emit(key, { STRICTLY: strictSchema });
-                initLegacy();
-                return;
-            }
-            if (isLegacyMessage(msg)) {
-                protocol = 'legacy';
-                onProtocolDetect?.('legacy');
-                initLegacy();
-                legacyHandler(msg);
-                return;
-            }
-            if (isV2Message(msg)) {
-                protocol = 'v2';
-                onProtocolDetect?.('v2');
-                initV2();
-                v2Handler(msg);
+                socket.emit(key, { STRICTLY: legacySchema });
                 return;
             }
+            legacyHandler(msg);
             return;
         }
-        if (protocol === 'legacy') {
-            if (isLegacyStrictRequest(msg)) {
-                socket.emit(key, { STRICTLY: strictSchema });
-                return;
-            }
+        if (protocol === 'v2') {
+            v2Handler(msg);
+            return;
+        }
+        if (isLegacyStrictRequest(msg)) {
+            protocol = 'legacy';
+            if (debug)
+                console.log('[RPC-AUTO2] Protocol detected: legacy (___STRICTLY)');
+            onProtocolDetect?.('legacy');
+            initLegacy();
+            socket.emit(key, { STRICTLY: legacySchema });
+            return;
+        }
+        if (isLegacyMessage(msg)) {
+            protocol = 'legacy';
+            if (debug)
+                console.log('[RPC-AUTO2] Protocol detected: legacy (mapId message)');
+            onProtocolDetect?.('legacy');
+            initLegacy();
             legacyHandler(msg);
+            return;
         }
-        else {
+        if (isV2Message(msg)) {
+            protocol = 'v2';
+            if (debug)
+                console.log('[RPC-AUTO2] Protocol detected: v2');
+            onProtocolDetect?.('v2');
+            initV2();
             v2Handler(msg);
+            return;
         }
+        if (debug)
+            console.warn('[RPC-AUTO2] Unknown message format, ignoring:', msg);
     });
     return {
         getProtocol: () => protocol,
-        getSchema: () => strictSchema,
+        getLegacySchema: () => legacySchema,
+        getResolved: () => resolved,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",