cgserver 9.1.10 → 9.1.11

package/README.md

@@ -1,3 +1,5 @@
+9.1.11
+1、部分httpserver的代码整理
 9.1.10
 1、删除一些无用配置和代码
 2、整理现有的代码，增加一些人性化的提示

package/dist/lib/Framework/WebServer/Engine/Engine.js

@@ -85,61 +85,73 @@ class Engine {
                 credentials: this._cfg.cors.credentials || false
             }));
         }
-        this._app.all("/*", (_req, _res) => {
-            this._all(_req, _res).catch((reason) => {
-                Log_1.GLog.error(reason);
-                let res = new Response_1.Response(_res, this._cfg);
-                let method = _req.method.toLowerCase();
-                if (method == "post") {
-                    res.renderJson500();
-                }
-                else if (method == "get") {
-                    res.render500();
+        this._app.all("/*", (req, res) => {
+            let time = Date.now();
+            this._onall(req, res).then(() => {
+                if (this._cfg.debug) {
+                    let time_str = (Date.now() - time) + "ms";
+                    Log_1.GLog.info("[" + time_str + "] " + req.method + " " + req.url);
                 }
+            }).catch(() => {
+                res.sendStatus(500);
+                let exreq = new Request_1.Request(req, this._cfg);
+                let info = exreq.getDebugInfo();
+                info["tip"] = "server error";
+                Log_1.GLog.error(info);
             });
         });
     }
-    async _all(_req, _res) {
+    async _onall(_req, _res) {
+        let httpinfo = this._preDoHttpInfo(_req, _res);
+        if (!httpinfo) {
+            return;
+        }
+        await this._callCtrAction(httpinfo.action_name, httpinfo.req, httpinfo.res);
+    }
+    _method_preactions = {
+        "on": "on",
+        "show": "show",
+        "onoptions": "onoptions",
+        "onhead": "onhead"
+    };
+    /**
+     * 预处理http请求信息
+     * @param _req
+     * @param _res
+     * @returns
+     */
+    _preDoHttpInfo(_req, _res) {
         let req = new Request_1.Request(_req, this._cfg);
         let res = new Response_1.Response(_res, this._cfg);
-        let method = req.method.toLowerCase();
         //禁止访问
         if (!this._is_running) {
             res.baseRes.sendStatus(403);
             return;
         }
-        if (method == "options") {
-            _res.sendStatus(200);
-            return;
-        }
-        if (method == "head") {
-            _res.sendStatus(200);
-            return;
-        }
-        if (method != "get" && method != "post") {
-            return;
-        }
-        let pre_action = "show";
-        let action_name = "";
-        if (method == "post") {
-            pre_action = "on";
-        }
-        //大小写还原
-        action_name = ControllerManager_1.GCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
-        //尝试一次on，变态支持
-        if (!action_name && method == "get") {
-            pre_action = "on";
-            action_name = ControllerManager_1.GCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
+        let method = req.method.toLocaleLowerCase();
+        let pre_action = this._method_preactions[method];
+        if (!pre_action) {
+            res.baseRes.sendStatus(500);
+            let info = req.getDebugInfo();
+            info["tip"] = "not support method:" + method;
+            Log_1.GLog.error(info);
+            return null;
         }
+        let action_name = ControllerManager_1.GCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
         if (!action_name) {
-            if (method == "get") {
-                res.render404();
-            }
-            else if (method == "post") {
-                res.renderJson404();
-            }
-            return;
-        }
+            res.baseRes.sendStatus(500);
+            let info = req.getDebugInfo();
+            info["tip"] = "request has no action";
+            Log_1.GLog.error(info);
+            return null;
+        }
+        return {
+            action_name: action_name,
+            req: req,
+            res: res
+        };
+    }
+    async _callCtrAction(action_name, req, res) {
         let ctr = ControllerManager_1.GCtrMgr.getStaticCtr(req.module, req.controller);
         let cls_ctr = null;
         if (!ctr) {

package/dist/lib/Framework/WebServer/Engine/Request.js

@@ -206,10 +206,7 @@ class Request {
         this._params = this._params || {};
         return;
     }
-    debugInfo() {
-        if (!this._cfg.debug) {
-            return;
-        }
+    getDebugInfo() {
         let debuginfo = {
             module: this._module,
             controller: this._controller,
@@ -220,6 +217,13 @@ class Request {
             post: this.postData,
             method: this._req.method.toLowerCase()
         };
+        return debuginfo;
+    }
+    debugInfo(force = false) {
+        if (!this._cfg.debug && !force) {
+            return;
+        }
+        let debuginfo = this.getDebugInfo();
         Log_1.GLog.info(debuginfo);
     }
 }

package/dist/types/Framework/WebServer/Engine/Engine.d.ts

@@ -17,7 +17,25 @@ export declare class Engine {
     get isrunning(): boolean;
     constructor(cfg: WebServerConfig, razorJs: RazorJs);
     start(): void;
-    protected _all(_req: Express.Request, _res: Express.Response): Promise<void>;
+    protected _onall(_req: Express.Request, _res: Express.Response): Promise<void>;
+    protected _method_preactions: {
+        on: string;
+        show: string;
+        onoptions: string;
+        onhead: string;
+    };
+    /**
+     * 预处理http请求信息
+     * @param _req
+     * @param _res
+     * @returns
+     */
+    protected _preDoHttpInfo(_req: Express.Request, _res: Express.Response): {
+        action_name: string;
+        req: Request;
+        res: Response;
+    };
+    protected _callCtrAction(action_name: string, req: Request, res: Response): Promise<void>;
     pause(): void;
     resume(): void;
     getRenderHtml(req: Request, res: Response, datas: any): any;

package/dist/types/Framework/WebServer/Engine/Request.d.ts

@@ -36,5 +36,15 @@ export declare class Request {
     protected _init(): void;
     protected _addListener(event: string | symbol, listener: (...args: any[]) => void): void;
     protected _parseParams(path: string): void;
-    debugInfo(): void;
+    getDebugInfo(): {
+        module: string;
+        controller: string;
+        action: string;
+        suffix: string;
+        file_url: any;
+        params: any;
+        post: any;
+        method: string;
+    };
+    debugInfo(force?: boolean): void;
 }

package/package.json

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