cgserver 7.10.2113 → 7.12.2113

package/src/Framework/WebServer/Engine/Request.ts

@@ -1,267 +0,0 @@
-import * as Express from 'express';
-import { URL } from 'url';
-import { WebServerConfig } from "../../Config/FrameworkConfig";
-import { core } from "../../Core/Core";
-import { GLog } from "../../Logic/Log";
-
-export class Request
-{
-    protected _req:Express.Request=null
-    get baseReq()
-    {
-        return this._req
-    }
-    protected _cfg:WebServerConfig=null
-    protected _post_cb:()=>void=null
-    set onPost(value)
-    {
-        this._post_cb=value
-    }
-    protected _module=""
-    get module()
-    {
-        return this._module
-    }
-    protected _controller=""
-    get controller()
-    {
-        return this._controller
-    }
-    protected _action=""
-    get action()
-    {
-        return this._action
-    }
-    protected _suffix=""
-    get suffix()
-    {
-        return this._suffix
-    }
-    protected _file_url=null
-    get fileUrl()
-    {
-        return this._file_url
-    }
-    protected _params=<any>{}
-    get params()
-    {
-        var body = <any>(this._req.query||{})
-        for(let k in body)
-        {
-            var v = body[k]
-            if(!core.isString(v))
-            {
-                continue
-            }
-            if(parseInt(v)==v)
-            {
-                body[k]=parseInt(v)
-            }
-            else if(parseFloat(v)==v)
-            {
-                body[k]==parseFloat(v)
-            }
-        }
-        return body
-    }
-    get postData()
-    {
-        var body = this._req.body||{}
-        //服务器会有一层空key的json解析
-        for(let k in body)
-        {
-            var v = body[k]
-            if(!core.isString(v))
-            {
-                continue
-            }
-            if(parseInt(v)==v)
-            {
-                body[k]=parseInt(v)
-            }
-            else if(parseFloat(v)==v)
-            {
-                body[k]==parseFloat(v)
-            }
-        }
-        return body
-    }
-    get url()
-    {
-        return this._req.url
-    }
-    get root()
-    {
-        let root = this._req.headers.host
-        if (root != "")
-        {
-            root = this._req.protocol+"://" + root
-        }
-        return root
-    }
-    get method()
-    {
-        return this._req.method
-    }
-    get headers()
-    {
-        return this._req.headers
-    }
-    get remoteHost()
-    {
-        let ips = this._req.headers['x-forwarded-for']
-        let ip = ""
-        if(core.isArray(ips))
-        {
-            ip = ips[0]
-        }
-        else 
-        {
-            ip = <string>ips
-        }
-        ip = ip ||
-            this._req.connection.remoteAddress ||
-            this._req.socket.remoteAddress ||
-            this._req.ip||""
-        
-        ip = ip.replace("::ffff:","")
-        return ip
-    }
-    constructor(req:Express.Request,cfg:WebServerConfig)
-    {
-        this._cfg = cfg
-        this._req = req
-        this._init()
-    }
-    getCookie(key:string)
-    {
-        let cookie_key = this._cfg.cookie.prefix + key
-        if(!this._req.cookies)
-        {
-            return null
-        }
-        return this._req.cookies[cookie_key]
-    }
-    protected _init()
-    {
-        let method=this._req.method.toLowerCase()
-        if(method!="get"&&method!="post")
-        {
-            return
-        }
-        let path = this._req.url
-        //服务器根目录路径写法，链接转换
-        let _i = path.lastIndexOf("~")
-        if (_i >= 0)
-        {
-            path = path.substr(_i + 1)
-        }
-        //处理参数
-        this._parseParams(path)
-    }
-    protected _addListener(event: string | symbol, listener: (...args: any[]) => void)
-    {
-        this._req.addListener(event, listener)
-    }
-    protected _parseParams (path:string)
-    {
-        this._module =this._cfg.routs.onlyModule||this._cfg.routs.defaults.module
-        this._controller = this._cfg.routs.defaults.controller
-        this._action = this._cfg.routs.defaults.action
-        this._suffix = null
-        this._file_url = null
-        this._params = <any>{}
-        if (path == "/")
-        {
-            return
-        }
-        let firstQuoteIndex = path.indexOf("?")
-        let preQuoteStr=path
-        if(firstQuoteIndex>0)
-        {
-            preQuoteStr = path.substring(0,firstQuoteIndex)
-        }
-
-        let lastDotIndex = preQuoteStr.lastIndexOf(".")
-        if (lastDotIndex > 0)
-        {
-            let dotStr = preQuoteStr.substring(lastDotIndex + 1)
-            this._suffix = dotStr
-            this._file_url = preQuoteStr
-            return
-        }
-        let quote_index = path.indexOf("?")
-        if (quote_index >= 0)
-        {
-            let url = new URL(path)
-            url.searchParams.forEach((value, name, searchParams) => {
-                this._params[name]=value
-            })
-            path = path.substring(0, quote_index)
-        }
-        let params = path.split("/")
-        let default_module = false
-        if(this._cfg.routs.onlyModule)
-        {
-            default_module = true
-        }
-        if (params.length > 1 && params[1].length>0)
-        {
-            /**
-             * 如果是only模式，那么就不支持controller和module相同，
-             * 如果相同则认为是模块名，这样就可以同时支持，带模块的路径模式和非带模块的路径模式了
-             */
-            if(default_module
-                &&params[1].toLowerCase()==this._cfg.routs.onlyModule.toLowerCase())
-            {
-                default_module = false
-            }
-            if(default_module)
-            {
-                this._controller = params[1]
-            }
-            else
-            {
-                this._module = params[1]
-            }
-        }
-        if (params.length > 2 && params[2].length>0)
-        {
-            if(default_module)
-            {
-                this._action = params[2]
-            }
-            else
-            {
-                this._controller = params[2]
-            }
-        }
-        if (params.length > 3 
-            && params[3].length > 0
-            && !default_module)
-        {
-            this._action = params[3]
-        }
-        this._params = this._params||{}
-        return
-    }
-    debugInfo()
-    {
-        if(!this._cfg.debug)
-        {
-            return
-        }
-        let debuginfo =
-        {
-            module:this._module,
-            controller:this._controller,
-            action:this._action,
-            suffix:this._suffix,
-            file_url:this._file_url,
-            params:this._params,
-            post:this.postData,
-            method:this._req.method.toLowerCase()
-        }
-        GLog.info(debuginfo)
-    }
-}

package/src/Framework/WebServer/Engine/Response.ts

@@ -1,123 +0,0 @@
-import * as Express from 'express';
-import * as fs from "fs";
-import * as mime from "mime";
-import { GLog } from "../../Logic/Log";
-import { WebServerConfig } from "../../Config/FrameworkConfig";
-
-export class Response
-{
-    protected _res:Express.Response=null
-    protected _cookie_prefix=""
-    protected _cfg:WebServerConfig=null
-    protected _create_time=-1
-    constructor(res:Express.Response,cfg:WebServerConfig)
-    {
-        this._cfg = cfg
-        this._res = res
-        this._cookie_prefix = this._cfg.cookie.prefix
-        this._init()
-    }
-    protected _init()
-    {
-        this._create_time=Date.now()
-    }
-    /**
-     * 
-     * @param key 
-     * @param value 
-     * @param time 秒
-     */
-    setCookie(key:string, value, time?)
-    {
-        key = this._cookie_prefix + key
-        if(time)
-        {
-            this._res.cookie(key,value,{maxAge:time*1000,httpOnly:true})
-        }
-        else
-        {
-            this._res.cookie(key,value,{httpOnly:true})
-        }
-    }
-    clearCookie(key:string)
-    {
-        this.setCookie(key,"",-1000)
-    }
-    redirect(path:string)
-    {
-        this._res.writeHead(302, { 'Location': path });
-        this._res.end()
-    }
-    renderJson(data,origin?:string | string[] | undefined)
-    {
-        this._res.json(data)
-        this.debugInfo(data)
-    }
-    renderJson404(origin?:string | string[] | undefined)
-    {
-        this._res.status(404).json();
-    }
-    renderJson500(origin?:string | string[] | undefined)
-    {
-        this._res.status(500).json()
-        this.debugInfo("500")
-    }
-    renderHtml(html:string)
-    {
-        this._res.send(html||"")
-    }
-    render404(html?:string)
-    {
-        this._res.status(404).send(html||"没找到该页面")
-    }
-    render500(html?:string)
-    {
-        this._res.status(500).send(html||"服务器内部错误500")
-    }
-    renderOptions(method,origin)
-    {
-        this._res.sendStatus(204)
-    }
-    renderFile(fullPath:string)
-    {
-        this._res.sendFile(fullPath)
-    }
-    downloadFile(fullPath:string)
-    {
-        let fileName = ""
-        let quote_index = fullPath.indexOf("/")
-        if(quote_index>0)
-        {
-            fileName = fullPath.substring(quote_index+1)
-        }
-
-        fs.stat(fullPath,(err,stats)=>
-        {
-            if(!stats||stats.isDirectory())
-            {
-                return this.render404("")
-            }
-            let size = stats.size
-            var f = fs.createReadStream(fullPath)
-            this._res.writeHead(200, {
-                'Content-Type': mime.getType(fullPath)||'application/octet-stream',
-                'Content-Disposition': 'attachment; filename=' + fileName,
-                'Content-Length': size
-            });
-            f.pipe(this._res)
-        })
-    }
-    render304()
-    {
-        this._res.sendStatus(304)
-    }
-    debugInfo(data)
-    {
-        if(!this._cfg.debug)
-        {
-            return
-        }
-        GLog.info("dttime:"+(Date.now()-this._create_time).toLocaleString()+"ms")
-        GLog.info(data)
-    }
-}

package/src/Framework/WebServer/IWebServer.ts

@@ -1,61 +0,0 @@
-import { Engine } from './Engine/Engine';
-import { GLog } from '../Logic/Log';
-import { GRedisMgr } from '../Database/RedisManager';
-import { GMysqlMgr } from '../Database/MysqlManager';
-import { WebServerConfig } from '../Config/FrameworkConfig';
-import { RazorJs } from './Engine/RazorJs';
-import { GMongoMgr } from '../Database/MongoManager';
-import { GAlipayTool } from '../ThirdParty/AlipayTool';
-import { GServerCfg } from '../Config/IServerConfig';
-import { GEventTool } from '../Logic/EventTool';
-import { GCgServer } from '../cgserver';
-
-//实现对controller的手动注册
-export class IWebServer
-{
-    protected _engine:Engine=null
-    /**
-     * 启动服务器
-     * @param server_index 这个是服务器的配置index
-     */
-    async start(cfg:WebServerConfig)
-    {
-        GCgServer.addWebServer(this)
-        if(!cfg)
-        {
-            GLog.error("webserver 配置不存在，启动服务器失败")
-            return false
-        }
-        await GRedisMgr.init(GServerCfg.db?.redis)
-        await GMysqlMgr.init()
-        await GMongoMgr.init(GServerCfg.db?.mongo)
-        GAlipayTool.init()
-        //初始化web引擎
-        this._engine = new Engine(cfg,new RazorJs())
-        this._engine.start()
-
-        this._registerController()
-        this._registerRouter()
-        GEventTool.emit("web_server_init_done")
-        return true
-    }
-    stop()
-    {
-        this._engine.stop()
-    }
-    /**
-     * 注册控制器
-     * eg:GControllerMgr.registerController("Admin","System",SystemController)
-     */
-    protected _registerController()
-    {
-
-    }
-    /**
-     * 注册路由
-     */
-    protected _registerRouter()
-    {
-
-    }
-}

package/src/Framework/cgserver.ts

@@ -1,112 +0,0 @@
-
-
-import { GLog } from "./Logic/Log";
-import { GEventTool } from './Logic/EventTool';
-import { core } from "./Core/Core";
-import { Config } from "./Config/Config";
-import { IWebServer } from "./WebServer/IWebServer";
-import { ISocketServer } from "./SocketServer/ISocketServer";
-
-class CgServer
-{
-    protected _webservers:IWebServer[]=[]
-    get webServers()
-    {
-        return this._webservers
-    }
-    protected _socketservers:ISocketServer[]=[]
-    get socketServers()
-    {
-        return this._socketservers
-    }
-    protected _events:{[name:string]:Function[]}={}
-    protected _debug=false
-    get debug()
-    {
-        return this._debug
-    }
-    constructor()
-    {
-        this.init()
-    }
-    init()
-    {
-        process.on("uncaughtException",this.onUnCaughtException.bind(this))
-        process.env.TZ = "Asia/Shanghai"
-
-        GEventTool.on("socket_server_init_done",this.onStart.bind(this))
-        GEventTool.on("web_server_init_done",this.onStart.bind(this))
-
-        let argv = process.argv||[]
-        for(let i=0;i<argv.length;++i)
-        {
-            let arg = argv[i].toLowerCase()
-            if(arg=="-d"||arg=="-debug")
-            {
-                Config.debug=true
-                this._debug=true
-            }
-            if(arg=="-data")
-            {
-                if(i+1>=argv.length)
-                {
-                    break
-                }
-                ++i
-                Config.rootDataDir=argv[i].toLocaleLowerCase()
-                if(!Config.rootDataDir.endsWith("/"))
-                {
-                    Config.rootDataDir+="/"
-                }
-            }
-        }
-    }
-    protected _done=0
-    onStart()
-    {
-        ++this._done
-        let total = this._webservers.length+this._socketservers.length
-        if(this._done!=total)
-        {
-            return
-        }
-        let events=this._events["start"]||[]
-        for(let i=0;i<events.length;++i)
-        {
-            core.safeCall(events[i])
-        }
-    }
-    addListener(event:"start",func:()=>void)
-    {
-        this._events[event]=this._events[event]||[]
-        this._events[event].push(func)
-    }
-    removeListener(event:"start",func:()=>void)
-    {
-        let events=this._events[event]
-        if(!events)
-        {
-            return false
-        }
-        let index=events.findIndex((_func)=>_func==func)
-        if(index<0)
-        {
-            return false
-        }
-        events.splice(index,1)
-        return true
-    }
-    onUnCaughtException(e)
-    {
-        GLog.error(e.stack)
-    }
-    addWebServer(server:IWebServer)
-    {
-        this._webservers.push(server)
-    }
-    addSocketServer(server:ISocketServer)
-    {
-        this._socketservers.push(server)
-    }
-}
-export let GCgServer=new CgServer()

package/src/Framework/index.ts

@@ -1,92 +0,0 @@
-import { SqlResult, SqlReturn, SqlReturns } from './Database/MysqlManager';
-
-export { GCgServer } from './cgserver';
-
-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 { IServerConfig,GServerCfg } from "./Config/IServerConfig";
-
-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 { EPropertyType } from './Database/Decorator/Property';
-export { MongoBaseService } from './Database/MongoBaseService';
-export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
-export { MongoBaseModel } from './Database/MongoManager';
-export { GMongoMgr } from './Database/MongoManager';
-export { GMSSqlMgr } from './Database/MSSqlManager';
-export { MysqlBaseService } from './Database/MysqlBaseService';
-export { GMysqlMgr,SqlResult,SqlReturn,SqlReturns } from './Database/MysqlManager';
-export { GRedisMgr,RedisManager } from './Database/RedisManager';
-export { GCacheTool } from './Logic/CacheTool';
-export { GHttpTool } from './Logic/HttpTool';
-export { GLog } from './Logic/Log';
-export { ERoleGroup,EUserState,EAccountFrom } from './Service/ini';
-export { AccountService as MysqlAccountService,GAccountSer as GMysqlAccountSer } from './Service/AccountService';
-export { AccountService as MongoAccountService,GAccountSer as GMongoAccountSer } from './Service/MongoAccountService';
-export { UserService as MysqlUserService } from './Service/UserService';
-export { UserService as MongoUserService } from './Service/MongoUserService';
-export { UserModel as MysqlUserModel } from './Service/UserService';
-export { UserModel as MongoUserModel } from './Service/MongoUserService';
-export { GMongoCacheSer,MongoCacheModel } from './Service/MongoCacheService';
-
-export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
-export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
-export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
-export { IServerWebSocket } from './SocketServer/IServerWebSocket';
-export { IClientWebSocket } from './SocketServer/IClientWebSocket';
-export { ISocketServer } from './SocketServer/ISocketServer';
-export { IWebSocket,BaseMsg } 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 { AccountModel as MysqlAccountModel } from './Service/AccountService';
-export { AccountModel as MongoAccountModel } from './Service/MongoAccountService';
-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';
-export { WebServerConfig } from './Config/FrameworkConfig';
-export { GSyncQueueTool } from './Logic/SyncQueueTool';
-export { GEventTool } from './Logic/EventTool';
-export { EAccountState } from './Service/ini';
-
-export { RpcBaseMsg } from './SocketServer/IRpc';
-export { Rpc,RpcConfig } from './ThirdParty/Rpc';
-export { CgMq,CgMqConfig } from './ThirdParty/CgMq';
-export { IRpcServerWebSocket} from './SocketServer/IRpcServerWebSocket';
-export { IRpcClientWebSocket} from './SocketServer/IRpcClientWebSocket';
-
-export { SyncCall } from './WebServer/Decorator/SyncCall';
-export { SyncCallServer } from './WebServer/Decorator/SyncCallServer';

package/src/test/test.ts

@@ -1,12 +0,0 @@
-import { SyncCall, core } from "../Framework"
-
-class Test{
-    @SyncCall
-    public test() {
-        console.log("test")
-    }
-}
-let test = new Test()
-test.test()
-let str = core.format(Date.now(),"yyyy-MM-dd hh:mm:ss")
-console.log(str)