cgserver 9.0.0 → 9.0.2

package/README.md

@@ -1,3 +1,5 @@
+9.0.2
+1、修复uuid问题
 9.0.0
 1、升级了新的rpc，支持分组和具体
 2、rpc至少请使用2.0.0版本

package/dist/lib/Framework/Core/Core.js

@@ -8,7 +8,7 @@ const crypto = require("crypto");
 const Log_1 = require("../Logic/Log");
 const CryptoJS = require("crypto-js");
 const ec_key_1 = require("ec-key");
-const uuid_1 = require("uuid");
+const uuidv4_1 = require("uuidv4");
 /**
  * 常用的工具函数类
  */
@@ -654,7 +654,7 @@ class core {
         return dtext;
     }
     static getUuid() {
-        let id = new uuid_1.v4();
+        let id = (0, uuidv4_1.uuid)();
         return id;
     }
     static signatureBase64(private_key, rsa_name, payload) {

package/dist/lib/Framework/SocketServer/IRpcClientWebSocket.js

@@ -26,6 +26,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     toRetMsg(req_msg, data, errcode) {
         let ret_msg = this.getNewMsg(req_msg.cmd, errcode);
         //唯一标识必须保持一致
+        ret_msg.__return = true;
         ret_msg.__rpcid = req_msg.__rpcid;
         ret_msg.data = data;
         ret_msg.from_group = this._group;

package/dist/lib/Framework/SocketServer/IRpcServerWebSocket.js

@@ -32,6 +32,7 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
     toRetMsg(req_msg, data, errcode) {
         let ret_msg = this.getNewMsg(req_msg.cmd, errcode);
         //唯一标识必须保持一致
+        ret_msg.__return = true;
         ret_msg.__rpcid = req_msg.__rpcid;
         ret_msg.data = data;
         ret_msg.from_group = this._group;

package/dist/lib/Framework/ThirdParty/CgMq.js

@@ -29,16 +29,10 @@ class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
         return jsonData;
     }
     //收到来自远程的调用消息
-    async receive_msg(msg) {
-        let data = await this._cgmq.onMsg(msg);
-        let ret_msg = this.getNewMsg("msg");
-        ret_msg.data = data;
-        ret_msg.__return = true;
-        //这个唯一标识必须和请求一致
-        ret_msg.__rpcid = msg.__rpcid;
-        ret_msg.to_group = msg.from_group;
-        ret_msg.to_id = msg.to_id;
-        this.send(msg);
+    async receive_msg(req_msg) {
+        let data = await this._cgmq.onMsg(req_msg);
+        let ret_msg = this.toRetMsg(req_msg, data);
+        this.send(ret_msg);
     }
 }
 class RpcConfig {

package/dist/types/Framework/ThirdParty/AppleTool.d.ts

@@ -123,7 +123,7 @@ declare class AppleTool {
     onVerify(receipt: string, environment: string): Promise<ResponseBody>;
     signature(nickname: string, create_time: number, appBundleID: string, productIdentifier: string, offerIdentifier: string): {
         keyIdentifier: string;
-        nonce: any;
+        nonce: string;
         timestamp: number;
         signature: any;
     };

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

@@ -6,7 +6,7 @@ declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     onOpen(e?: any): void;
     init(): Promise<RpcMsg>;
     push(to_group: string, data: any, to_id?: string): Promise<RpcMsg>;
-    receive_msg(msg: RpcMsg): Promise<void>;
+    receive_msg(req_msg: RpcMsg): Promise<void>;
 }
 export declare class RpcConfig {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -77,6 +77,7 @@
     "socket.io": "^4.7.4",
     "underscore": "^1.13.6",
     "urlencode": "^2.0.0",
+    "uuidv4": "^6.2.13",
     "websocket": "^1.0.34"
   }
 }