cgserver 12.0.3 → 12.0.5

package/README.md

@@ -1,3 +1,6 @@
+
+12.0.6
+1、修复IRpcClientWebSocket初始化bug
 12.0.0
 1、增加socketserver
 11.2.5

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/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 = [];

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/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/IClientSocket.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { ISocketServer } from './ISocketServer';
 import { ISocket } from './ISocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';

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

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { ISocket } from './ISocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';
 import * as http from "http";

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

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { IProtoFilter, EProtoType } from "../ProtoFilter/IProtoFilter";
 import * as net from "net";
 import { PacketParser } from "./PacketParser";

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

@@ -1,8 +1,7 @@
 /// <reference types="node" />
-/// <reference types="node" />
 export declare class PacketParser {
-    private buffer;
-    private offset;
+    protected buffer: Buffer;
+    protected offset: number;
     constructor();
     push(chunk: Buffer): void;
     parse(): Buffer | null;

package/package.json

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