cgserver 12.0.4 → 12.0.7

package/README.md

@@ -1,141 +1,217 @@
-12.0.0
-1、增加socketserver
-11.2.5
-1、Engine 增加app接口
-11.2.2
-1、日志默认log
-11.2.1
-1、日志新配置
-2、新rpc
-10.2.1
-1、cgrank支持密码
-10.2.0
-1、修复redis
-2、增加对cgrank的支持
-10.0.25
-1、Config 支持原始数据
-10.0.23
-1、日志默认log_file
-2、添加minimist解析参数
-10.0.20
-1、增加bulkwrite接口
-10.0.9
-1、修复mongoservicemanager的接口bug
-10.0.8
-1、精简mongoservicemanager的接口
-10.0.7
-1、细微修改mongoservicemanager
-10.0.1-10.0.7
-1、一些列优化和bug修正
-10.0.0
-1、老项目切忌不要轻易升级
-2、老项目切忌不要轻易升级
-3、老项目切忌不要轻易升级
-
-1、修改引入方式
-2、修改mongo的where和property顺序
-
-9.2.7
-1、主要针对配置政策修改
-9.2.1
-1、增强提示
-9.2.0
-1、mysql 更换为mysql2
-9.1.23
-1、日志系统整理
-9.1.22
-1、日志系统整理
-9.1.21
-1、express 全局异常捕获日志
-9.1.20
-1、没什么就是一个日志配置功能功能
-9.1.19
-1、尴尬修改的是9.18的问题
-9.1.18
-1、普通日志默认100个文件
-9.1.17
-1、IServerWebSocket的重连可能的bug
-9.1.16
-1、websocket客户端无需强制配置服务器配置文件，debug_msg
-9.1.15
-1、websocket请求连接端扩展
-9.1.14
-1、http请求、websocker处理时间、rpc请求处理时间
-9.1.13
-1、请求的时间消耗提示优化
-9.1.12
-1、部分httpserver 请求bug修改
-9.1.11
-1、部分httpserver的代码整理
-9.1.10
-1、删除一些无用配置和代码
-2、整理现有的代码，增加一些人性化的提示
-9.1.9
-1、周起始时间bug修正
-9.1.8
-1、强制mongocache访问mongo的bug修改
-9.1.7
-1、httptool 默认可以支持全局输出日志了
-9.1.6
-1、默认不适用losslessjson，会把数字变成对象
-9.1.5
-1、https只单独监听
-9.1.3
-1、几乎同意替换成losslessjson
-2、express使用了raw
-9.1.2
-1、losslessjson
-9.1.1
-1、扩展mongomgr的一个接口addMongo，removeMongo方便自由增减
-2、清除部分无用代码
-3、mongoext的mongoclient未被初始化修正
-9.1.0
-1、支持多mongo示例
-2、支持多service实例
-ps:新的service必须是无参数得constructor
-9.0.7(重要修复)
-1、修复createFilter的bug
-9.0.6(修复bug)
-1、IRpcClientWebSocket toRetMsg的bug修正
-9.0.5(不重要)
-1、添加一个rpc提示
-9.0.4
-1、rpc回复指定发送的消息的位置不正确的bug
-9.0.3
-1、request添加rawBody接口，方便获取原始body字符串
-2、v4替换uuidv4(官方弃用，现有接口不影响)
-3、增强rpc的提示
-9.0.2
-1、修复uuid问题
-9.0.0
-1、升级了新的rpc，支持分组和具体
-2、rpc至少请使用2.0.0版本
-8.9.18
-1、支持自定义进程id
-8.9.17
-1、支持websocketserver 暂停和恢复
-2、支持webserver 暂停和恢复
-8.9.16
-1、ws暴露当时请求的req
-8.9.15
-1、暴露mongo的objectid
-8.9.14
-1、字节操作能力
-8.9.13
-1、protofilter 可扩展
-8.9.6
-1、webview的view可配置
-8.9.4
-1、扩展签名和验签功能
-8.6.9
-1、update all packages
-2、remove webpack about packages
-3、remove file request，instead，use express static config
-8.6.7
-1、getAutoIds bug修改
-8.6.6
-1、SyncCall2 this丢失的bug修正
-8.6.2
-1、C# post url-encoded data support
-8.6.1
-1、quickTrasaction support options
+# 版本更新日志
+
+## v12.0.7
+- 修复IServerSocket
+
+### v12.0.6
+- 修复IRpcClientWebSocket初始化bug
+
+### v12.0.0
+- 增加socketserver
+
+## v11.x
+
+### v11.2.5
+- Engine 增加app接口
+
+### v11.2.2
+- 日志默认log
+
+### v11.2.1
+- 日志新配置
+- 新rpc
+
+## v10.x
+
+### v10.2.1
+- cgrank支持密码
+
+### v10.2.0
+- 修复redis
+- 增加对cgrank的支持
+
+### v10.0.25
+- Config 支持原始数据
+
+### v10.0.23
+- 日志默认log_file
+- 添加minimist解析参数
+
+### v10.0.20
+- 增加bulkwrite接口
+
+### v10.0.9
+- 修复mongoservicemanager的接口bug
+
+### v10.0.8
+- 精简mongoservicemanager的接口
+
+### v10.0.7
+- 细微修改mongoservicemanager
+
+### v10.0.1-10.0.7
+- 一些列优化和bug修正
+
+### v10.0.0
+> **警告**：
+> - 老项目切忌不要轻易升级
+> - 老项目切忌不要轻易升级
+> - 老项目切忌不要轻易升级
+
+- 修改引入方式
+- 修改mongo的where和property顺序
+
+## v9.x
+
+### v9.2.7
+- 主要针对配置政策修改
+
+### v9.2.1
+- 增强提示
+
+### v9.2.0
+- mysql 更换为mysql2
+
+### v9.1.23
+- 日志系统整理
+
+### v9.1.22
+- 日志系统整理
+
+### v9.1.21
+- express 全局异常捕获日志
+
+### v9.1.20
+- 没什么就是一个日志配置功能功能
+
+### v9.1.19
+- 尴尬修改的是9.18的问题
+
+### v9.1.18
+- 普通日志默认100个文件
+
+### v9.1.17
+- IServerWebSocket的重连可能的bug
+
+### v9.1.16
+- websocket客户端无需强制配置服务器配置文件，debug_msg
+
+### v9.1.15
+- websocket请求连接端扩展
+
+### v9.1.14
+- http请求、websocker处理时间、rpc请求处理时间
+
+### v9.1.13
+- 请求的时间消耗提示优化
+
+### v9.1.12
+- 部分httpserver 请求bug修改
+
+### v9.1.11
+- 部分httpserver的代码整理
+
+### v9.1.10
+- 删除一些无用配置和代码
+- 整理现有的代码，增加一些人性化的提示
+
+### v9.1.9
+- 周起始时间bug修正
+
+### v9.1.8
+- 强制mongocache访问mongo的bug修改
+
+### v9.1.7
+- httptool 默认可以支持全局输出日志了
+
+### v9.1.6
+- 默认不适用losslessjson，会把数字变成对象
+
+### v9.1.5
+- https只单独监听
+
+### v9.1.3
+- 几乎同意替换成losslessjson
+- express使用了raw
+
+### v9.1.2
+- losslessjson
+
+### v9.1.1
+- 扩展mongomgr的一个接口addMongo，removeMongo方便自由增减
+- 清除部分无用代码
+- mongoext的mongoclient未被初始化修正
+
+### v9.1.0
+- 支持多mongo示例
+- 支持多service实例
+
+> 注：新的service必须是无参数得constructor
+
+### v9.0.7 (重要修复)
+- 修复createFilter的bug
+
+### v9.0.6 (修复bug)
+- IRpcClientWebSocket toRetMsg的bug修正
+
+### v9.0.5 (不重要)
+- 添加一个rpc提示
+
+### v9.0.4
+- rpc回复指定发送的消息的位置不正确的bug
+
+### v9.0.3
+- request添加rawBody接口，方便获取原始body字符串
+- v4替换uuidv4(官方弃用，现有接口不影响)
+- 增强rpc的提示
+
+### v9.0.2
+- 修复uuid问题
+
+### v9.0.0
+- 升级了新的rpc，支持分组和具体
+- rpc至少请使用2.0.0版本
+
+## v8.x
+
+### v8.9.18
+- 支持自定义进程id
+
+### v8.9.17
+- 支持websocketserver 暂停和恢复
+- 支持webserver 暂停和恢复
+
+### v8.9.16
+- ws暴露当时请求的req
+
+### v8.9.15
+- 暴露mongo的objectid
+
+### v8.9.14
+- 字节操作能力
+
+### v8.9.13
+- protofilter 可扩展
+
+### v8.9.6
+- webview的view可配置
+
+### v8.9.4
+- 扩展签名和验签功能
+
+### v8.6.9
+- update all packages
+- remove webpack about packages
+- remove file request，instead，use express static config
+
+### v8.6.7
+- getAutoIds bug修改
+
+### v8.6.6
+- SyncCall2 this丢失的bug修正
+
+### v8.6.2
+- C# post url-encoded data support
+
+### v8.6.1
+- quickTrasaction support options

package/dist/lib/Framework/Database/Mongo/MongoBaseService.js

@@ -66,12 +66,12 @@ class MongoBaseService {
         let rs = await this.mongoDb.simpleAggregate(this._table, where, property, null, num);
         return rs.list;
     }
-    async updateOne(where, model, upsert = false) {
-        let rs = await this.mongoDb.updateOne(this._table, where, model, upsert);
+    async updateOne(where, model, options) {
+        let rs = await this.mongoDb.updateOne(this._table, where, model, options);
         return rs;
     }
-    async updateMany(where, model = null, upsert = false) {
-        let rs = await this.mongoDb.updateMany(this._table, where, model, upsert);
+    async updateMany(where, model = null, options) {
+        let rs = await this.mongoDb.updateMany(this._table, where, model, options);
         return rs;
     }
     async insert(model) {

package/dist/lib/Framework/Database/Mongo/MongoManager.js

@@ -374,7 +374,7 @@ class MongoExt {
         rs.rs = in_rs;
         return rs;
     }
-    async updateOne(collection, where, model, upsert = false) {
+    async updateOne(collection, where, model, options) {
         let _id = model["_id"];
         delete model["_id"];
         if (!where && _id) {
@@ -405,10 +405,10 @@ class MongoExt {
                 updatemodel = model;
             }
             let col = this._mongoDb.collection(collection);
-            up_rs = await col.updateOne(where, updatemodel, { upsert: upsert });
+            up_rs = await col.updateOne(where, updatemodel, options);
         }
         catch (e) {
-            Log_1.gLog.error({ collection, model, where, upsert });
+            Log_1.gLog.error({ collection, model, where, options });
             Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -418,7 +418,7 @@ class MongoExt {
         }
         return rs;
     }
-    async updateMany(collection, where, model, upsert = false) {
+    async updateMany(collection, where, model, options) {
         this._convertWhere(where);
         let rs = { errcode: null, rs: null };
         if (!this._mongoDb) {
@@ -436,10 +436,10 @@ class MongoExt {
                 updateModel = model;
             }
             let col = this._mongoDb.collection(collection);
-            up_rs = await col.updateMany(where, updateModel, { upsert: upsert });
+            up_rs = await col.updateMany(where, updateModel, options);
         }
         catch (e) {
-            Log_1.gLog.error({ collection, model, where, upsert });
+            Log_1.gLog.error({ collection, model, where, options });
             Log_1.gLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }

package/dist/lib/Framework/Decorator/JsonAdminValidate.js

@@ -6,7 +6,7 @@ function JsonAdminValidate(target, propertyName, descriptor) {
     descriptor.value = function () {
         let self = this;
         if (!self.isAdmin) {
-            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" }, err: "需要管理员或创始人权限" });
+            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" } });
             return;
         }
         return method.apply(this, arguments);

package/dist/lib/Framework/Server/RpcWebSocketServer/CgMq.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CgMq = exports.RpcConfig = void 0;
 const Core_1 = require("../../Core/Core");
-const Log_1 = require("../../Logic/Log");
 const IRpcServerWebSocket_1 = require("./IRpcServerWebSocket");
+const Log_1 = require("../../Logic/Log");
 class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
     _cgmq = null;
     _listens = {};
@@ -142,7 +142,7 @@ class CgMq {
                     break;
                 }
                 let now = Date.now();
-                if (now - pretime >= 3 * 1000) {
+                if (now - pretime >= this._cfg.timeout) {
                     this._ws.close();
                     resolve(false);
                     break;

package/dist/lib/Framework/Server/RpcWebSocketServer/IRpcClientWebSocket.js

@@ -156,7 +156,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
         super(server);
         this._debug_msg = true;
         this._group = "";
-        this._id = global.gCgServer.customprocessid;
+        this._id = Core_1.core.getUuid();
     }
     getWsByGroup(group, listen) {
         let wses = [];
@@ -187,8 +187,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     }
     async receive_msg(req_msg) {
         if (!req_msg.__rpcid) {
-            let retMsg = this.getNewMsg("msg", { id: 10001, des: "非法rpc消息" });
-            this.send(retMsg);
+            //直接丢掉
             return;
         }
         if (!req_msg.to_group) {
@@ -207,6 +206,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
         //发送给远程服务器的消息
         if (wses.length == 0) {
             req_msg.errcode = { id: 10004, des: "一个接收者都没找到" };
+            req_msg.__return = true;
             this.send(req_msg);
             return;
         }

package/dist/lib/Framework/Server/RpcWebSocketServer/IRpcServerWebSocket.js

@@ -69,6 +69,7 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
             handler = setTimeout(() => {
                 EventTool_1.gEventTool.off(msg.__rpcid, func);
                 let error_msg = this.getNewMsg(msg.cmd, { id: 10086, des: "timeout" });
+                error_msg.__return = true;
                 resolve(error_msg);
             }, this._timeout);
             EventTool_1.gEventTool.once(msg.__rpcid, func);

package/dist/lib/Framework/Server/SocketServer/IServerSocket.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IServerSocket = void 0;
 const ISocket_1 = require("./ISocket");
-const ws = require("websocket");
 const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
 const Log_1 = require("../../Logic/Log");
+const net = require("net");
 /**
  * 连接到服务器的websocket
  * 默认自动重连
@@ -24,42 +24,30 @@ class IServerSocket extends ISocket_1.ISocket {
     get port() {
         return this._port;
     }
-    _requestedProtocols = null;
-    get requestedProtocols() {
-        return this._requestedProtocols;
-    }
-    _origin = null;
-    get origin() {
-        return this._origin;
-    }
-    _headers = null;
-    get headers() {
-        return this._headers;
-    }
-    _extraRequestOptions = null;
-    get extraRequestOptions() {
-        return this._extraRequestOptions;
-    }
     _need_close = false;
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         super(protoType, protoPath);
     }
-    connect(domain, port, requestedProtocols = null, origin = null, headers = null, extraRequestOptions = null) {
+    connect(domain, port) {
         this._host = domain || this._host;
         this._port = port || this._port;
-        this._requestedProtocols = requestedProtocols || this._requestedProtocols;
-        this._origin = origin || this._origin;
-        this._headers = headers || this._headers;
-        this._extraRequestOptions = extraRequestOptions || this._extraRequestOptions;
         this._connect();
     }
     _connect() {
-        let url = "ws://" + this._host + ":" + this._port + "/";
-        Log_1.gLog.info("Trying to connect to server : " + url);
-        let _ws = new ws.client();
-        _ws.on("connect", this.onConnect.bind(this));
-        _ws.on("connectFailed", this.onClose.bind(this));
-        _ws.connect(url, this._requestedProtocols, this._origin, this._headers, this._extraRequestOptions);
+        if (this._socket) {
+            this._socket.destroy();
+            this._socket = null;
+        }
+        this._need_close = false;
+        let url = `${this._host}:${this._port}`;
+        Log_1.gLog.info(this._socket_id + ":try to connect to " + url);
+        this._socket = new net.Socket();
+        this._socket.connect(this._port, this._host);
+        this._socket.on("connect", this.onConnect.bind(this));
+        this._socket.on("error", this.onError.bind(this));
+        this._socket.on("close", this.onClose.bind(this));
+        this._socket.on("data", this._onData.bind(this));
+        this.onOpen();
     }
     onOpen(e) {
         super.onOpen(e);

package/dist/lib/Framework/Server/WebServer/Controller/MongoBaseUserController.js

@@ -140,7 +140,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, { upsert: true });
         }
         this._self_user = user;
     }

package/dist/lib/Framework/Server/WebServer/Controller/MysqlBaseUserController.js

@@ -138,7 +138,7 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, { upsert: true });
         }
         this._self_user = user;
     }

package/dist/lib/Framework/Server/WebSocketServer/IWebSocketServer.js

@@ -164,7 +164,7 @@ class IWebSocketServer {
             this.createWebSocketObjectByProtocol(server_name, conn, req);
         }
         catch (e) {
-            Log_1.gLog.error(' protocol reject');
+            Log_1.gLog.error(e);
         }
     }
     createWebSocketObjectByProtocol(server_name, _ws, req) {

package/dist/lib/Framework/Service/MongoCacheService.js

@@ -39,7 +39,7 @@ class MongoCacheService extends MongoBaseService_1.MongoBaseService {
         mcm.key = key;
         mcm.data = data;
         mcm.expireAt = expireAt;
-        let rs = await this.updateOne({ key: mcm.key }, mcm, true);
+        let rs = await this.updateOne({ key: mcm.key }, mcm, { upsert: true });
         if (rs.rs.upsertedCount <= 0) {
             return null;
         }

package/dist/lib/Framework/Service/MongoUserService.js

@@ -51,6 +51,7 @@ class MongoUserService extends MongoBaseService_1.MongoBaseService {
         um.state = 0;
         um.role_group = group;
         um.role = 0;
+        um.create_time = Date.now();
         //随机userid
         let id = 0;
         do {

package/dist/types/Framework/Database/Mongo/MongoBaseService.d.ts

@@ -40,7 +40,7 @@ export declare class MongoBaseService<T extends MongoBaseModel> {
     }): Promise<T[]>;
     updateOne(where: {
         [key: string]: any;
-    }, model: any, upsert?: boolean): Promise<{
+    }, model: any, options?: mongo.UpdateOptions): Promise<{
         errcode: {
             id: number;
             des: string;
@@ -49,7 +49,7 @@ export declare class MongoBaseService<T extends MongoBaseModel> {
     }>;
     updateMany(where: {
         [key: string]: any;
-    }, model?: any, upsert?: boolean): Promise<{
+    }, model?: any, options?: mongo.UpdateOptions): Promise<{
         errcode: {
             id: number;
             des: string;

package/dist/types/Framework/Database/Mongo/MongoManager.d.ts

@@ -158,7 +158,7 @@ export declare class MongoExt {
     }>;
     updateOne(collection: string, where: {
         [key: string]: any;
-    }, model: any, upsert?: boolean): Promise<{
+    }, model: any, options?: mongo.UpdateOptions): Promise<{
         errcode: {
             id: number;
             des: string;
@@ -167,7 +167,7 @@ export declare class MongoExt {
     }>;
     updateMany(collection: string, where: {
         [key: string]: any;
-    }, model: any, upsert?: boolean): Promise<{
+    }, model: any, options?: mongo.UpdateOptions): Promise<{
         errcode: {
             id: number;
             des: string;

package/dist/types/Framework/Server/SocketServer/IServerSocket.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { ISocket } from './ISocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';
-import * as http from "http";
 /**
  * 连接到服务器的websocket
  * 默认自动重连
@@ -19,17 +17,9 @@ export declare class IServerSocket extends ISocket {
      * 连接的服务器端口
      */
     get port(): number;
-    protected _requestedProtocols: string | string[];
-    get requestedProtocols(): string | string[];
-    protected _origin: string;
-    get origin(): string;
-    protected _headers: http.OutgoingHttpHeaders;
-    get headers(): http.OutgoingHttpHeaders;
-    protected _extraRequestOptions: http.RequestOptions;
-    get extraRequestOptions(): http.RequestOptions;
     protected _need_close: boolean;
     constructor(protoType?: EProtoType, protoPath?: string);
-    connect(domain: string, port: number, requestedProtocols?: string | string[], origin?: string, headers?: http.OutgoingHttpHeaders, extraRequestOptions?: http.RequestOptions): void;
+    connect(domain: string, port: number): void;
     protected _connect(): void;
     onOpen(e?: any): void;
     onClose(reasonCode: number, description: string): boolean;

package/package.json

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