cgserver 8.9.14 → 8.9.16

package/README.md

@@ -1,3 +1,7 @@
+8.9.16
+1、ws暴露当时请求的req
+8.9.15
+1、暴露mongo的objectid
 8.9.14
 1、字节操作能力
 8.9.13

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

@@ -26,6 +26,9 @@ class MongoBaseService {
         let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
         return id;
     }
+    toObjectId(id) {
+        return MongoManager_1.GMongoMgr.toObjectId(id);
+    }
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id

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

@@ -133,7 +133,7 @@ class MongoManager {
         if (Core_1.core.isString(where._id) && where._id.length == 24) {
             let _id = where._id;
             try {
-                where._id = new mongo.ObjectId(_id);
+                where._id = this.toObjectId(_id);
             }
             catch (e) {
                 where._id = _id;
@@ -141,6 +141,9 @@ class MongoManager {
         }
         return where;
     }
+    toObjectId(id) {
+        return new mongo.ObjectId(id);
+    }
     /**
      * 获取单条消息
      * @param collection

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

@@ -149,13 +149,13 @@ class ISocketServer {
             }
             Log_1.GLog.info((new Date()) + ' Connection accepted.');
             let server_name = this._getServerNameByCookies(req.cookies);
-            this.createWebSocketObjectByProtocol(server_name, conn);
+            this.createWebSocketObjectByProtocol(server_name, conn, req);
         }
         catch (e) {
             Log_1.GLog.info(' protocol reject');
         }
     }
-    createWebSocketObjectByProtocol(server_name, _ws) {
+    createWebSocketObjectByProtocol(server_name, _ws, req) {
         server_name = server_name || "default";
         let cls = this._name_vs_class[server_name];
         if (!cls) {
@@ -164,7 +164,7 @@ class ISocketServer {
         }
         let ws_server = (new cls(this));
         this.addClient(ws_server);
-        ws_server.onConnect(_ws);
+        ws_server.onConnect(_ws, req);
         return ws_server;
     }
     _getServerNameByCookies(cookies) {

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

@@ -43,6 +43,7 @@ class IWebSocket {
         return this._tipKey;
     }
     _ws = null;
+    _req = null;
     _protoType = IProtoFilter_1.EProtoType.Json;
     _protoFilter = null;
     _protoPath = "";
@@ -78,8 +79,9 @@ class IWebSocket {
         let msg = this.getNewMsg("heartbeat");
         this.send(msg);
     }
-    onConnect(_ws) {
+    onConnect(_ws, _req) {
         this._ws = _ws;
+        this._req = _req;
         if (!this._protoFilter) {
             this._protoFilter = ProtoFactory_1.GProtoFactory.createFilter(this._protoType);
             this._protoFilter.init(this._protoPath);

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

@@ -12,6 +12,7 @@ export declare class MongoBaseService<T> {
         new (): T;
     });
     getNextId(key?: string): Promise<number>;
+    toObjectId(id: string): mongo.BSON.ObjectId;
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id

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

@@ -7,7 +7,7 @@ export declare class MongoConfig {
     database: string;
 }
 export declare class MongoBaseModel {
-    _id: any;
+    _id: mongo.ObjectId;
 }
 export declare class MrResult {
     /**
@@ -59,6 +59,7 @@ export declare class MongoManager {
      */
     getAutoIds(key: string): Promise<number>;
     protected _convertWhere(where?: any): any;
+    toObjectId(id: string): mongo.BSON.ObjectId;
     /**
      * 获取单条消息
      * @param collection

package/dist/types/Framework/SocketServer/ISocketServer.d.ts

@@ -30,7 +30,7 @@ export declare class ISocketServer {
     onClose(connection: ws.connection, reason: number, desc: string): void;
     onListenning(): void;
     onRequest(req: ws.request): void;
-    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection): IClientWebSocket;
+    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection, req: ws.request): IClientWebSocket;
     protected _getServerNameByCookies(cookies: any): string;
     /**
      * 广播消息

package/dist/types/Framework/SocketServer/IWebSocket.d.ts

@@ -27,6 +27,7 @@ export declare class IWebSocket {
     protected _tipKey: string;
     get tipKey(): string;
     protected _ws: ws.connection;
+    protected _req: ws.request;
     protected _protoType: EProtoType;
     protected _protoFilter: IProtoFilter;
     protected _protoPath: string;
@@ -40,7 +41,7 @@ export declare class IWebSocket {
     }): BaseMsg | any;
     receive_heartbeat(jsonData: any): void;
     send_heartbeat(): void;
-    onConnect(_ws: ws.connection): void;
+    onConnect(_ws: ws.connection, _req: ws.request): void;
     onMessage(message: ws.Message): void;
     protected _onDecode(message: ws.Message, ...params: any[]): any;
     protected _onEncode(data: any, ...params: any[]): any;

package/package.json

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