cgserver 9.1.11 → 9.1.13

package/README.md

@@ -1,3 +1,7 @@
+9.1.13
+1、请求的时间消耗提示优化
+9.1.12
+1、部分httpserver 请求bug修改
 9.1.11
 1、部分httpserver的代码整理
 9.1.10

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

@@ -109,10 +109,10 @@ class Engine {
         await this._callCtrAction(httpinfo.action_name, httpinfo.req, httpinfo.res);
     }
     _method_preactions = {
-        "on": "on",
-        "show": "show",
-        "onoptions": "onoptions",
-        "onhead": "onhead"
+        "post": "on",
+        "get": "show",
+        "options": "onoptions",
+        "head": "onhead"
     };
     /**
      * 预处理http请求信息
@@ -125,13 +125,13 @@ class Engine {
         let res = new Response_1.Response(_res, this._cfg);
         //禁止访问
         if (!this._is_running) {
-            res.baseRes.sendStatus(403);
+            res.sendStatus(403);
             return;
         }
         let method = req.method.toLocaleLowerCase();
         let pre_action = this._method_preactions[method];
         if (!pre_action) {
-            res.baseRes.sendStatus(500);
+            res.sendStatus(500);
             let info = req.getDebugInfo();
             info["tip"] = "not support method:" + method;
             Log_1.GLog.error(info);
@@ -139,7 +139,7 @@ class Engine {
         }
         let action_name = ControllerManager_1.GCtrMgr.getActionName(req.module, req.controller, pre_action + req.action);
         if (!action_name) {
-            res.baseRes.sendStatus(500);
+            res.sendStatus(500);
             let info = req.getDebugInfo();
             info["tip"] = "request has no action";
             Log_1.GLog.error(info);
@@ -164,7 +164,7 @@ class Engine {
         else {
             ctr.initStatic(req, res, this);
         }
-        ctr[action_name].call(ctr);
+        await ctr[action_name].call(ctr);
     }
     pause() {
         if (!this._is_running) {

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

@@ -13,13 +13,10 @@ class Response {
         return this._res;
     }
     constructor(res, cfg) {
+        this._create_time = Date.now();
         this._cfg = cfg;
         this._res = res;
         this._cookie_prefix = this._cfg.cookie.prefix;
-        this._init();
-    }
-    _init() {
-        this._create_time = Date.now();
     }
     /**
      *
@@ -50,25 +47,13 @@ class Response {
         this.debugInfo(data);
         return this._res.json(data);
     }
-    renderJson404() {
-        return this._res.status(404).json();
-    }
-    renderJson500() {
-        this.debugInfo("500");
-        return this._res.status(500).json();
+    sendStatus(status) {
+        this.debugInfo(status);
+        this._res.sendStatus(status);
     }
     renderHtml(html) {
         return this._res.send(html || "");
     }
-    render404(html) {
-        return this._res.status(404).send(html || "没找到该页面");
-    }
-    render500(html) {
-        return this._res.status(500).send(html || "服务器内部错误500");
-    }
-    renderOptions(method, origin) {
-        this._res.sendStatus(204);
-    }
     renderFile(fullPath) {
         this._res.sendFile(fullPath);
     }
@@ -80,7 +65,7 @@ class Response {
         }
         fs.stat(fullPath, (err, stats) => {
             if (!stats || stats.isDirectory()) {
-                return this.render404("");
+                return this.sendStatus(404);
             }
             let size = stats.size;
             var f = fs.createReadStream(fullPath);
@@ -92,14 +77,10 @@ class Response {
             f.pipe(this._res);
         });
     }
-    render304() {
-        this._res.sendStatus(304);
-    }
     debugInfo(data) {
         if (!this._cfg.debug) {
             return;
         }
-        Log_1.GLog.info("dttime:" + (Date.now() - this._create_time).toLocaleString() + "ms");
         Log_1.GLog.info(data);
     }
 }

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

@@ -19,10 +19,10 @@ export declare class Engine {
     start(): void;
     protected _onall(_req: Express.Request, _res: Express.Response): Promise<void>;
     protected _method_preactions: {
-        on: string;
-        show: string;
-        onoptions: string;
-        onhead: string;
+        post: string;
+        get: string;
+        options: string;
+        head: string;
     };
     /**
      * 预处理http请求信息

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

@@ -7,7 +7,6 @@ export declare class Response {
     protected _create_time: number;
     get baseRes(): Express.Response<any, Record<string, any>>;
     constructor(res: Express.Response, cfg: WebServerConfig);
-    protected _init(): void;
     /**
      *
      * @param key
@@ -19,14 +18,9 @@ export declare class Response {
     redirect(path: string): void;
     render(data: any): Express.Response<any, Record<string, any>>;
     renderJson(data: any): Express.Response<any, Record<string, any>>;
-    renderJson404(): Express.Response<any, Record<string, any>>;
-    renderJson500(): Express.Response<any, Record<string, any>>;
+    sendStatus(status: number): void;
     renderHtml(html: string): Express.Response<any, Record<string, any>>;
-    render404(html?: string): Express.Response<any, Record<string, any>>;
-    render500(html?: string): Express.Response<any, Record<string, any>>;
-    renderOptions(method: any, origin: any): void;
     renderFile(fullPath: string): void;
     downloadFile(fullPath: string): void;
-    render304(): void;
     debugInfo(data: any): void;
 }

package/package.json

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