cgserver 6.9.466 → 6.9.468

package/dist/lib/SocketServer/IRpcClientWebSocket.js

@@ -14,6 +14,12 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
         msg.__rpcid = this._genId(cmd);
         return msg;
     }
+    extendRetMsg(msg, errcode) {
+        let basemsg = super.getNewMsg(msg.cmd, errcode);
+        basemsg.__rpcid = msg.__rpcid;
+        _.extend(msg, basemsg);
+        return msg;
+    }
     async callRemote(msg) {
         if (!msg) {
             Log_1.GLog.error("send null msg!");

package/dist/lib/SocketServer/IRpcServerWebSocket.js

@@ -14,6 +14,12 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
         msg.__rpcid = this._genId(cmd);
         return msg;
     }
+    extendRetMsg(msg, errcode) {
+        let basemsg = super.getNewMsg(msg.cmd, errcode);
+        basemsg.__rpcid = msg.__rpcid;
+        _.extend(msg, basemsg);
+        return msg;
+    }
     async callRemote(msg) {
         if (!msg) {
             Log_1.GLog.error("send null msg!");

package/dist/lib/ThirdParty/CgMq.js

@@ -118,7 +118,7 @@ class CgMq {
             cmd: func_name,
             args: args
         };
-        let jsonData = await this._ws.push(to_identity, data);
+        let jsonData = (await this._ws.push(to_identity, data));
         return jsonData;
     }
     async onMsg(msg) {

package/dist/lib/ThirdParty/Rpc.js

@@ -5,6 +5,10 @@ const Core_1 = require("../Core/Core");
 const Log_1 = require("../Logic/Log");
 const CgMq_1 = require("./CgMq");
 class Remote {
+    _retmsg = null;
+    get retMsg() {
+        return this._retmsg;
+    }
     _cgmq = null;
     get cgmq() {
         return this._cgmq;
@@ -15,8 +19,15 @@ class Remote {
         this._cgmq = cgmq;
     }
     async call(func_name, ...args) {
-        let jsonData = await this._cgmq.callRemote(this._to_identity, func_name, ...args);
-        return jsonData;
+        this._retmsg = await this._cgmq.callRemote(this._to_identity, func_name, ...args);
+        if (!this._retmsg.data) {
+            return;
+        }
+        let datas = this._retmsg.data;
+        if (datas.length == 1) {
+            return datas[0];
+        }
+        return datas;
     }
 }
 class RpcConfig extends CgMq_1.CgMqConfig {

package/dist/types/SocketServer/IRpcClientWebSocket.d.ts

@@ -6,6 +6,10 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
         id: number;
         des: string;
     }): any;
+    extendRetMsg(msg: RpcBaseMsg, errcode?: {
+        id: number;
+        des: string;
+    }): RpcBaseMsg;
     callRemote(msg: RpcBaseMsg): Promise<unknown>;
     receive_other_all(msg: RpcBaseMsg): void;
     protected _onMessage(msg: RpcBaseMsg): Promise<void>;

package/dist/types/SocketServer/IRpcServerWebSocket.d.ts

@@ -6,6 +6,10 @@ export declare class IRpcServerWebSocket extends IServerWebSocket implements IRp
         id: number;
         des: string;
     }): any;
+    extendRetMsg(msg: RpcBaseMsg, errcode?: {
+        id: number;
+        des: string;
+    }): RpcBaseMsg;
     callRemote(msg: RpcBaseMsg): Promise<unknown>;
     receive_other_all(msg: RpcBaseMsg): void;
     protected _onMessage(msg: RpcBaseMsg): Promise<void>;

package/dist/types/ThirdParty/CgMq.d.ts

@@ -45,7 +45,7 @@ export declare class CgMq {
     get cfg(): CgMqConfig;
     get identity(): string;
     init(cfg: CgMqConfig, onmsg?: (msg: CgMqRetMsg) => any): Promise<unknown>;
-    callRemote(to_identity: string, func_name: string, ...args: any[]): Promise<unknown>;
+    callRemote(to_identity: string, func_name: string, ...args: any[]): Promise<CgMqRetMsg>;
     onMsg(msg: CgMqRetMsg): Promise<any>;
 }
 export {};

package/dist/types/ThirdParty/Rpc.d.ts

@@ -1,10 +1,12 @@
 import { CgMq, CgMqConfig, CgMqRetMsg } from "./CgMq";
 declare class Remote {
+    protected _retmsg: CgMqRetMsg;
+    get retMsg(): CgMqRetMsg;
     protected _cgmq: CgMq;
     get cgmq(): CgMq;
     protected _to_identity: string;
     constructor(identity: string, cgmq: CgMq);
-    call(func_name: string, ...args: any[]): Promise<unknown>;
+    call(func_name: string, ...args: any[]): Promise<any | any[]>;
 }
 export declare class RpcConfig extends CgMqConfig {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.9.466",
+  "version": "6.9.468",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",