wenay-common2 1.0.40 → 1.0.41

package/lib/Common/rcp/rpc-client.js

@@ -14,11 +14,6 @@ function createClient(socket, key, opts) {
     let strictData = {};
     let strictWaiters = [];
     let debug = false;
-    const unpackResult = (v) => {
-        if (!v)
-            return v;
-        return v;
-    };
     socket.on(key, (msg) => {
         if (!Array.isArray(msg))
             return;
@@ -33,11 +28,11 @@ function createClient(socket, key, opts) {
                     callbacks.delete(cbId);
                     pool.release(cbId);
                 }
-                msg[3] ? req.fail(msg[3]) : req.ok(unpackResult(msg[2]));
+                msg[3] ? req.fail(msg[3]) : req.ok((0, rpc_walk_1.unpackResult)(msg[2]));
                 break;
             }
             case rpc_protocol_1.Pkt.CB: {
-                callbacks.get(msg[1])?.(...(msg[2] || []));
+                callbacks.get(msg[1])?.(...(msg[2] || []).map(rpc_walk_1.unpackResult));
                 break;
             }
             case rpc_protocol_1.Pkt.CB_END: {

package/lib/Common/rcp/rpc-server.js

@@ -189,7 +189,7 @@ function createServer(socket, key, target, hooks, limits) {
                     send([rpc_protocol_1.Pkt.RESP, reqId, (0, rpc_walk_1.packResult)(current)]);
             }
             else {
-                const args = (0, rpc_walk_1.unpack)(rawArgsOrSteps, (cbId, cbArgs) => send([rpc_protocol_1.Pkt.CB, cbId, cbArgs]), (cbId) => send([rpc_protocol_1.Pkt.CB_END, cbId]), lim);
+                const args = (0, rpc_walk_1.unpack)(rawArgsOrSteps, (cbId, cbArgs) => send([rpc_protocol_1.Pkt.CB, cbId, cbArgs.map(rpc_walk_1.packResult)]), (cbId) => send([rpc_protocol_1.Pkt.CB_END, cbId]), lim);
                 const res = await fn.apply(ctx, args);
                 if (wait)
                     send([rpc_protocol_1.Pkt.RESP, reqId, (0, rpc_walk_1.packResult)(res)]);

package/lib/Common/rcp/rpc-walk.js

@@ -38,6 +38,8 @@ function walk(val, onLeaf, lim, depth = 0) {
     }
     if (val == null || typeof val !== "object")
         return onLeaf(val);
+    if (val instanceof Date || val instanceof Map || val instanceof Set || val instanceof RegExp)
+        return onLeaf(val);
     if (ALL_MARKERS.has(Object.keys(val)[0]))
         return onLeaf(val);
     if (Array.isArray(val)) {

package/lib/Common/rcp/test.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

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