cgserver 5.5.5 → 6.0.2

package/dist/types/Index.d.ts

@@ -0,0 +1,65 @@
+export { GProtoFactory } from './SocketServer/ProtoFilter/ProtoFactory';
+export { GDBCache } from './Database/Decorator/DBCache';
+export { AiObject } from "./AI/AiObject";
+export { AStar } from "./AI/Astar";
+export { BehaviorAI } from "./AI/BehaviorAI";
+export { Entity } from "./AI/Entity";
+export { Point } from "./AI/Point";
+export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
+export { FrameworkErrorCode } from "./Config/_error_";
+export { Config } from "./Config/Config";
+export { FrameworkConfig } from "./Config/FrameworkConfig";
+export { ServerConfig } from "./Config/ServerConfig";
+export { core } from "./Core/Core";
+export { Timer } from "./Core/Timer";
+export { AutoIncrement } from "./Database/Decorator/AutoIncrement";
+export { NotNull } from './Database/Decorator/NotNull';
+export { PrimaryKey } from './Database/Decorator/PrimaryKey';
+export { Property } from './Database/Decorator/Property';
+export { Table } from './Database/Decorator/Table';
+export { Type } from './Database/Decorator/Type';
+export { BaseService as MongoBaseService } from './Database/BaseMongoService';
+export { MongoBaseModel } from './Database/MongoManager';
+export { GMongoMgr } from './Database/MongoManager';
+export { GMSSqlMgr } from './Database/MSSqlManager';
+export { BaseService as MysqlBaseService } from './Database/BaseService';
+export { GMysqlMgr } from './Database/MysqlManager';
+export { GRedisMgr } from './Database/RedisManager';
+export { GCacheTool } from './Logic/CacheTool';
+export { GHttpTool } from './Logic/HttpTool';
+export { GLog } from './Logic/Log';
+export { AccountService as MysqlAccountService } from './Service/AccountService';
+export { AccountService as MongoAccountService } from './Service/MongoAccountService';
+export { UserService as MysqlUserService } from './Service/UserService';
+export { UserService as MongoUserService } from './Service/MongoUserService';
+export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
+export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
+export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
+export { IClientWebSocket } from './SocketServer/IClientWebSocket';
+export { IServerWebSocket } from './SocketServer/IServerWebSocket';
+export { ISocketServer } from './SocketServer/ISocketServer';
+export { IWebSocket } from './SocketServer/IWebSocket';
+export { GAlipayTool } from './ThirdParty/AlipayTool';
+export { GSmsTool } from './ThirdParty/Alisms';
+export { GAppleTool } from './ThirdParty/AppleTool';
+export { GEmailTool } from './ThirdParty/EmailTool';
+export { GOpenSocial } from './ThirdParty/OpenSocial';
+export { GQiniuTool } from './ThirdParty/QiniuTool';
+export { GQQTool } from './ThirdParty/QQTool';
+export { GWechatOATool } from './ThirdParty/WechatOATool';
+export { GWechatTool } from './ThirdParty/WechatTool';
+export { IWebServer } from './WebServer/IWebServer';
+export { BaseController } from './WebServer/Controller/BaseController';
+export { BaseUserController } from './WebServer/Controller/BaseUserController';
+export { MongoBaseUserController } from './WebServer/Controller/MongoBaseUserController';
+export { AdminValidate } from './WebServer/Decorator/AdminValidate';
+export { AuthorityValidate } from './WebServer/Decorator/AuthorityValidate';
+export { CreatorValidate } from './WebServer/Decorator/CreatorValidate';
+export { JsonAdminValidate } from './WebServer/Decorator/JsonAdminValidate';
+export { JsonAuthorityValidate } from './WebServer/Decorator/JsonAuthorityValidate';
+export { JsonCreatorValidate } from './WebServer/Decorator/JsonCreatorValidate';
+export { GCtrMgr } from './WebServer/Engine/ControllerManager';
+export { Engine } from './WebServer/Engine/Engine';
+export { RazorJs } from './WebServer/Engine/RazorJs';
+export { Request } from './WebServer/Engine/Request';
+export { Response } from './WebServer/Engine/Response';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "cgserver",
-  "version": "5.5.5",
+  "version": "6.0.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
-  "main": "./lib/index.js",
+  "main": "./dist/cgserver.js",
+  "directories": {"dist":true},
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -46,8 +47,8 @@
     "@types/underscore": "^1.11.3",
     "@types/urlencode": "^1.1.2",
     "@types/websocket": "^1.0.4",
-    "alipay-sdk": "^3.1.7",
     "alipay_sdk2": "^1.1.6",
+    "alipay-sdk": "^3.1.7",
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
@@ -76,7 +77,10 @@
     "socket.io": "^4.3.2",
     "underscore": "^1.13.1",
     "urlencode": "^1.1.0",
+    "webpack": "^5.73.0",
+    "webpack-node-externals": "^3.0.0",
     "websocket": "^1.0.34"
   },
-  "devDependencies": {}
+  "devDependencies": {
+  }
 }

package/lib/Framework/AI/AiObject.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AiObject = void 0;
-class AiObject {
-    onTriggerIn(obj, trigger) {
-    }
-    onTriggerOut(obj, trigger) {
-    }
-}
-exports.AiObject = AiObject;
-//# sourceMappingURL=AiObject.js.map

package/lib/Framework/AI/AiObject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AiObject.js","sourceRoot":"","sources":["../../../Framework/AI/AiObject.ts"],"names":[],"mappings":";;;AACA,MAAa,QAAQ;IAEjB,WAAW,CAAC,GAAG,EAAC,OAAe;IAG/B,CAAC;IACD,YAAY,CAAC,GAAG,EAAC,OAAe;IAGhC,CAAC;CACJ;AAVD,4BAUC"}

package/lib/Framework/AI/Astar.js

@@ -1,134 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AStar = exports.Rect = void 0;
-const Point_1 = require("./Point");
-class Rect {
-    x = 0;
-    y = 0;
-    width = 0;
-    height = 0;
-}
-exports.Rect = Rect;
-class AStarNode {
-    ParentNode = null;
-    CurTilePos = null;
-    G = 0;
-    H = 0;
-    constructor(node, tilePos) {
-        this.ParentNode = node;
-        this.CurTilePos = tilePos;
-        if (this.ParentNode) {
-            this.G = this.ParentNode.G + 10;
-        }
-        else {
-            this.G = 0;
-        }
-    }
-    F() {
-        return this.G + this.H;
-    }
-}
-class AStar {
-    _markList = null;
-    _markedList = null;
-    _routes = null;
-    _maxTileWidth = 0;
-    _maxTileHeight = 0;
-    /**
-     * 先y在x，p(x:1,y:2),data[2][1]
-     */
-    _mapData = null;
-    getRoutes(srcTilePos, tarTilePos, mapData) {
-        if (srcTilePos.equals(tarTilePos)) {
-            return [];
-        }
-        this._markList = [];
-        this._markedList = [];
-        this._routes = [];
-        this._mapData = mapData;
-        this._maxTileWidth = this._mapData.width();
-        this._maxTileHeight = this._mapData.height();
-        let tp = srcTilePos.sub(tarTilePos);
-        let node = new AStarNode(null, srcTilePos);
-        node.H = (Math.abs(tp.x) + Math.abs(tp.y)) * 10 + mapData.extraWeight(tarTilePos);
-        this._markList.push(node);
-        node = this._routing(srcTilePos, tarTilePos);
-        while (node) {
-            this._routes.push(node.CurTilePos);
-            node = node.ParentNode;
-        }
-        this._routes.reverse();
-        this._routes.shift();
-        return this._routes;
-    }
-    _routing(srcTilePos, tarTilePos) {
-        if (this._markList.length <= 0) //已经没有节点，是死路根本无法到达
-         {
-            return null;
-        }
-        let node = this._markList[0];
-        let curIndex = 0;
-        for (let i = 0; i < this._markList.length; ++i) {
-            if (node.F() > this._markList[i].F()) {
-                node = this._markList[i];
-                curIndex = i;
-            }
-            if (this._markList[i].CurTilePos.equals(tarTilePos)) //到达终点
-             {
-                return this._markList[i];
-            }
-        }
-        this._markList.splice(curIndex, 1);
-        this._markedList.push(node);
-        let tp = new Point_1.Point(0, 0);
-        //上
-        tp.x = node.CurTilePos.x;
-        tp.y = node.CurTilePos.y + 1;
-        this._addToMark(tp, tarTilePos, node);
-        //下
-        tp = new Point_1.Point(0, 0);
-        tp.x = node.CurTilePos.x;
-        tp.y = node.CurTilePos.y - 1;
-        this._addToMark(tp, tarTilePos, node);
-        //左
-        tp = new Point_1.Point(0, 0);
-        tp.x = node.CurTilePos.x - 1;
-        tp.y = node.CurTilePos.y;
-        this._addToMark(tp, tarTilePos, node);
-        //右
-        tp = new Point_1.Point(0, 0);
-        tp.x = node.CurTilePos.x + 1;
-        tp.y = node.CurTilePos.y;
-        this._addToMark(tp, tarTilePos, node);
-        return this._routing(srcTilePos, tarTilePos);
-    }
-    _isInMark(tilePos) {
-        for (let i = 0; i < this._markList.length; ++i) {
-            if (this._markList[i].CurTilePos.equals(tilePos)) {
-                return true;
-            }
-        }
-        for (let i = 0; i < this._markedList.length; ++i) {
-            if (this._markedList[i].CurTilePos.equals(tilePos)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    _addToMark(curTilePos, tarTilePos, parentAStarNode) {
-        //无地图数据
-        if (curTilePos.x < 0 || curTilePos.y < 0
-            || !this._mapData.canPass(curTilePos)) {
-            return;
-        }
-        if (!this._isInMark(curTilePos)) //未曾添加
-         {
-            let newNode = new AStarNode(parentAStarNode, curTilePos);
-            let temp_tp = parentAStarNode.CurTilePos.sub(tarTilePos);
-            newNode.H = (Math.abs(temp_tp.x) + Math.abs(temp_tp.y)) * 10;
-            this._markList.push(newNode);
-        }
-    }
-}
-exports.AStar = AStar;
-//# sourceMappingURL=Astar.js.map

package/lib/Framework/AI/Astar.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Astar.js","sourceRoot":"","sources":["../../../Framework/AI/Astar.ts"],"names":[],"mappings":"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"}