cgserver 8.9.13 → 8.9.15

package/README.md

@@ -1,3 +1,7 @@
+8.9.15
+1、暴露mongo的objectid
+8.9.14
+1、字节操作能力
 8.9.13
 1、protofilter 可扩展
 8.9.6

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GByteTool = void 0;
+class ByteTool {
+    //构建一个视图，把字节数组写到缓存中，索引从0开始
+    getView(bytes) {
+        var view = new DataView(new ArrayBuffer(bytes.length));
+        for (var i = 0; i < bytes.length; i++) {
+            view.setUint8(i, bytes[i]);
+        }
+        return view;
+    }
+    //将字节数组转成有符号的8位整型
+    toInt8(bytes, offset = 0) {
+        return this.getView(bytes).getInt8(offset);
+    }
+    //将字节数组转成无符号的8位整型
+    toUint8(bytes, offset = 0) {
+        return this.getView(bytes).getUint8(offset);
+    }
+    //将字节数组转成有符号的16位整型
+    toInt16(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getInt16(offset, littleEndian);
+    }
+    //将字节数组转成无符号的16位整型
+    toUint16(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getUint16(offset, littleEndian);
+    }
+    //将字节数组转成有符号的32位整型
+    toInt32(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getInt32(offset, littleEndian);
+    }
+    //将字节数组转成无符号的32位整型
+    toUint32(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getUint32(offset, littleEndian);
+    }
+    //将字节数组转成32位浮点型
+    toFloat32(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getFloat32(offset, littleEndian);
+    }
+    //将字节数组转成64位浮点型
+    toFloat64(bytes, offset = 0, littleEndian = false) {
+        return this.getView(bytes).getFloat64(offset, littleEndian);
+    }
+    //将数值写入到视图中，获得其字节数组
+    getUint8Array(len, setNum) {
+        var buffer = new ArrayBuffer(len); //指定字节长度
+        setNum(new DataView(buffer)); //根据不同的类型调用不同的函数来写入数值
+        return new Uint8Array(buffer); //创建一个字节数组，从缓存中拿取数据
+    }
+    //得到一个8位有符号整型的字节数组
+    getInt8Bytes(num) {
+        return this.getUint8Array(1, (view) => { view.setInt8(0, num); });
+    }
+    //得到一个8位无符号整型的字节数组
+    getUint8Bytes(num) {
+        return this.getUint8Array(1, (view) => { view.setUint8(0, num); });
+    }
+    //得到一个16位有符号整型的字节数组
+    getInt16Bytes(num, littleEndian = false) {
+        return this.getUint8Array(2, (view) => { view.setInt16(0, num, littleEndian); });
+    }
+    //得到一个16位无符号整型的字节数组
+    getUint16Bytes(num, littleEndian = false) {
+        return this.getUint8Array(2, (view) => { view.setUint16(0, num, littleEndian); });
+    }
+    //得到一个32位有符号整型的字节数组
+    getInt32Bytes(num, littleEndian = false) {
+        return this.getUint8Array(4, (view) => { view.setInt32(0, num, littleEndian); });
+    }
+    //得到一个32位无符号整型的字节数组
+    getUint32Bytes(num, littleEndian = false) {
+        return this.getUint8Array(4, (view) => { view.setUint32(0, num, littleEndian); });
+    }
+    //得到一个32位浮点型的字节数组
+    getFloat32Bytes(num, littleEndian = false) {
+        return this.getUint8Array(4, (view) => { view.setFloat32(0, num, littleEndian); });
+    }
+    //得到一个64位浮点型的字节数组
+    getFloat64Bytes(num, littleEndian = false) {
+        return this.getUint8Array(8, (view) => { view.setFloat64(0, num, littleEndian); });
+    }
+}
+exports.GByteTool = new ByteTool();

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/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
 exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = void 0;
-exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = void 0;
+exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -200,3 +200,5 @@ Object.defineProperty(exports, "SyncCall2", { enumerable: true, get: function ()
 var SyncCallServer_1 = require("./Decorator/SyncCallServer");
 Object.defineProperty(exports, "SyncCallServer", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer; } });
 Object.defineProperty(exports, "SyncCallServer2", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer2; } });
+var ByteTool_1 = require("./Core/ByteTool");
+Object.defineProperty(exports, "GByteTool", { enumerable: true, get: function () { return ByteTool_1.GByteTool; } });

package/dist/types/Framework/Core/ByteTool.d.ts

@@ -0,0 +1,22 @@
+declare class ByteTool {
+    getView(bytes: Uint8Array): DataView;
+    toInt8(bytes: Uint8Array, offset?: number): number;
+    toUint8(bytes: Uint8Array, offset?: number): number;
+    toInt16(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    toUint16(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    toInt32(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    toUint32(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    toFloat32(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    toFloat64(bytes: Uint8Array, offset?: number, littleEndian?: boolean): number;
+    getUint8Array(len: number, setNum: (view: DataView) => void): Uint8Array;
+    getInt8Bytes(num: number): Uint8Array;
+    getUint8Bytes(num: number): Uint8Array;
+    getInt16Bytes(num: number, littleEndian?: boolean): Uint8Array;
+    getUint16Bytes(num: number, littleEndian?: boolean): Uint8Array;
+    getInt32Bytes(num: number, littleEndian?: boolean): Uint8Array;
+    getUint32Bytes(num: number, littleEndian?: boolean): Uint8Array;
+    getFloat32Bytes(num: number, littleEndian?: boolean): Uint8Array;
+    getFloat64Bytes(num: number, littleEndian?: boolean): Uint8Array;
+}
+export declare let GByteTool: ByteTool;
+export {};

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

@@ -89,3 +89,4 @@ export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
 export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
 export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
 export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';
+export { GByteTool } from './Core/ByteTool';

package/package.json

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