koatty_router 1.7.9 → 1.7.12

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.7.12](https://github.com/koatty/koatty_router/compare/v1.7.10...v1.7.12) (2022-11-01)
+
+
+### Bug Fixes
+
+* ctx.body 赋值 ([2a8d8c8](https://github.com/koatty/koatty_router/commit/2a8d8c8d4e8615777f50dc4ccaf331e4f10bc66b))
+
+### [1.7.10](https://github.com/koatty/koatty_router/compare/v1.7.9...v1.7.10) (2022-10-31)
+
 ### [1.7.9](https://github.com/koatty/koatty_router/compare/v1.7.8...v1.7.9) (2022-08-19)
 
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-08-19 15:39:43
+* @Date: 2022-11-01 15:47:40
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -71,6 +71,7 @@ export declare const GetMapping: (path?: string, routerOptions?: {
 
 export declare class GrpcRouter implements KoattyRouter {
     app: Koatty;
+    readonly protocol: string;
     options: GrpcRouterOptions;
     router: Map<string, ServiceImplementation>;
     constructor(app: Koatty, options?: RouterOptions);
@@ -138,6 +139,7 @@ export declare type HttpImplementation = (ctx: KoattyContext, next: KoattyNext)
  */
 export declare class HttpRouter implements KoattyRouter {
     app: Koatty;
+    readonly protocol: string;
     options: RouterOptions;
     router: KoaRouter;
     constructor(app: Koatty, options?: RouterOptions);
@@ -370,6 +372,7 @@ export declare interface ServiceImplementation {
 
 export declare class WebsocketRouter implements KoattyRouter {
     app: Koatty;
+    readonly protocol: string;
     options: WebsocketRouterOptions;
     router: KoaRouter;
     constructor(app: Koatty, options?: RouterOptions);

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-08-19 15:39:29
+* @Date: 2022-11-01 15:47:18
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -294,7 +294,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2022-03-15 17:10:46
+ * @LastEditTime: 2022-11-01 15:41:24
  */
 /**
  * controller handler
@@ -319,7 +319,8 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
         args = await getParamter(app, ctx, ctlParams);
     }
     // method
-    return ctl[method](...args);
+    const res = await ctl[method](...args);
+    ctx.body = res;
 }
 /**
  *
@@ -412,7 +413,7 @@ function injectParam(app, target, instance) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:10:30
- * @LastEditTime: 2022-03-15 17:10:19
+ * @LastEditTime: 2022-10-29 11:24:18
  */
 class GrpcRouter {
     constructor(app, options) {
@@ -520,7 +521,7 @@ class GrpcRouter {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-28 19:02:06
- * @LastEditTime: 2022-03-15 17:10:25
+ * @LastEditTime: 2022-10-29 11:24:21
  */
 /**
  * HttpRouter class
@@ -575,11 +576,14 @@ class HttpRouter {
                     const path = router.path;
                     const requestMethod = router.requestMethod;
                     const params = ctlParams[method];
-                    koatty_logger.DefaultLogger.Debug(`Register request mapping: [${requestMethod}] : ["${path}" => ${n}.${method}]`);
-                    this.SetRouter(path, (ctx) => {
-                        const ctl = koatty_container.IOCContainer.getInsByClass(ctlClass, [ctx]);
-                        return Handler(this.app, ctx, ctl, method, params);
-                    }, requestMethod);
+                    // websocket only handler get request 
+                    if (requestMethod == exports.RequestMethod.GET || requestMethod == exports.RequestMethod.ALL) {
+                        koatty_logger.DefaultLogger.Debug(`Register request mapping: [${requestMethod}] : ["${path}" => ${n}.${method}]`);
+                        this.SetRouter(path, (ctx) => {
+                            const ctl = koatty_container.IOCContainer.getInsByClass(ctlClass, [ctx]);
+                            return Handler(this.app, ctx, ctl, method, params);
+                        }, requestMethod);
+                    }
                 }
             }
             // exp: in middleware
@@ -598,7 +602,7 @@ class HttpRouter {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:16:44
- * @LastEditTime: 2022-03-15 17:10:30
+ * @LastEditTime: 2022-10-29 11:25:18
  */
 class WebsocketRouter {
     constructor(app, options) {
@@ -669,6 +673,41 @@ class WebsocketRouter {
     }
 }
 
+/*
+ * @Description:
+ * @Usage:
+ * @Author: richen
+ * @Date: 2022-10-29 11:15:30
+ * @LastEditTime: 2022-10-29 11:26:39
+ */
+/**
+ * get instance of Router
+ *
+ * @export
+ * @param {Koatty} app
+ * @param {RouterOptions} options
+ * @param {string} [protocol]
+ * @returns {*}  {KoattyRouter}
+ */
+function NewRouter(app, options, protocol) {
+    let router;
+    switch (protocol) {
+        case "grpc":
+            router = new GrpcRouter(app, options);
+            Helper.Helper.define(router, "protocol", protocol);
+            break;
+        case "ws":
+        case "wss":
+            router = new WebsocketRouter(app, options);
+            Helper.Helper.define(router, "protocol", protocol);
+            break;
+        default:
+            router = new HttpRouter(app, options);
+            Helper.Helper.define(router, "protocol", protocol);
+    }
+    return router;
+}
+
 /*
  * @Description:
  * @Usage:
@@ -847,38 +886,6 @@ const Inject = (fn, name) => {
     };
 };
 
-/*
- * @Description:
- * @Usage:
- * @Author: richen
- * @Date: 2021-06-28 18:48:14
- * @LastEditTime: 2022-03-15 17:10:39
- */
-/**
- * get instance of Router
- *
- * @export
- * @param {Koatty} app
- * @param {RouterOptions} options
- * @param {string} [protocol]
- * @returns {*}  {KoattyRouter}
- */
-function NewRouter(app, options, protocol) {
-    let router;
-    switch (protocol) {
-        case "grpc":
-            router = new GrpcRouter(app, options);
-            break;
-        case "ws":
-        case "wss":
-            router = new WebsocketRouter(app, options);
-            break;
-        default:
-            router = new HttpRouter(app, options);
-    }
-    return router;
-}
-
 exports.Body = Body;
 exports.CONTROLLER_ROUTER = CONTROLLER_ROUTER;
 exports.DeleteMapping = DeleteMapping;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-08-19 15:39:29
+* @Date: 2022-11-01 15:47:18
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -268,7 +268,7 @@ const HeadMapping = (path = "/", routerOptions = {}) => {
  * @Usage:
  * @Author: richen
  * @Date: 2021-11-10 16:58:57
- * @LastEditTime: 2022-03-15 17:10:46
+ * @LastEditTime: 2022-11-01 15:41:24
  */
 /**
  * controller handler
@@ -293,7 +293,8 @@ async function Handler(app, ctx, ctl, method, ctlParams) {
         args = await getParamter(app, ctx, ctlParams);
     }
     // method
-    return ctl[method](...args);
+    const res = await ctl[method](...args);
+    ctx.body = res;
 }
 /**
  *
@@ -386,7 +387,7 @@ function injectParam(app, target, instance) {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:10:30
- * @LastEditTime: 2022-03-15 17:10:19
+ * @LastEditTime: 2022-10-29 11:24:18
  */
 class GrpcRouter {
     constructor(app, options) {
@@ -494,7 +495,7 @@ class GrpcRouter {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-28 19:02:06
- * @LastEditTime: 2022-03-15 17:10:25
+ * @LastEditTime: 2022-10-29 11:24:21
  */
 /**
  * HttpRouter class
@@ -549,11 +550,14 @@ class HttpRouter {
                     const path = router.path;
                     const requestMethod = router.requestMethod;
                     const params = ctlParams[method];
-                    DefaultLogger.Debug(`Register request mapping: [${requestMethod}] : ["${path}" => ${n}.${method}]`);
-                    this.SetRouter(path, (ctx) => {
-                        const ctl = IOCContainer.getInsByClass(ctlClass, [ctx]);
-                        return Handler(this.app, ctx, ctl, method, params);
-                    }, requestMethod);
+                    // websocket only handler get request 
+                    if (requestMethod == RequestMethod.GET || requestMethod == RequestMethod.ALL) {
+                        DefaultLogger.Debug(`Register request mapping: [${requestMethod}] : ["${path}" => ${n}.${method}]`);
+                        this.SetRouter(path, (ctx) => {
+                            const ctl = IOCContainer.getInsByClass(ctlClass, [ctx]);
+                            return Handler(this.app, ctx, ctl, method, params);
+                        }, requestMethod);
+                    }
                 }
             }
             // exp: in middleware
@@ -572,7 +576,7 @@ class HttpRouter {
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 14:16:44
- * @LastEditTime: 2022-03-15 17:10:30
+ * @LastEditTime: 2022-10-29 11:25:18
  */
 class WebsocketRouter {
     constructor(app, options) {
@@ -643,6 +647,41 @@ class WebsocketRouter {
     }
 }
 
+/*
+ * @Description:
+ * @Usage:
+ * @Author: richen
+ * @Date: 2022-10-29 11:15:30
+ * @LastEditTime: 2022-10-29 11:26:39
+ */
+/**
+ * get instance of Router
+ *
+ * @export
+ * @param {Koatty} app
+ * @param {RouterOptions} options
+ * @param {string} [protocol]
+ * @returns {*}  {KoattyRouter}
+ */
+function NewRouter(app, options, protocol) {
+    let router;
+    switch (protocol) {
+        case "grpc":
+            router = new GrpcRouter(app, options);
+            Helper$1.define(router, "protocol", protocol);
+            break;
+        case "ws":
+        case "wss":
+            router = new WebsocketRouter(app, options);
+            Helper$1.define(router, "protocol", protocol);
+            break;
+        default:
+            router = new HttpRouter(app, options);
+            Helper$1.define(router, "protocol", protocol);
+    }
+    return router;
+}
+
 /*
  * @Description:
  * @Usage:
@@ -821,36 +860,4 @@ const Inject = (fn, name) => {
     };
 };
 
-/*
- * @Description:
- * @Usage:
- * @Author: richen
- * @Date: 2021-06-28 18:48:14
- * @LastEditTime: 2022-03-15 17:10:39
- */
-/**
- * get instance of Router
- *
- * @export
- * @param {Koatty} app
- * @param {RouterOptions} options
- * @param {string} [protocol]
- * @returns {*}  {KoattyRouter}
- */
-function NewRouter(app, options, protocol) {
-    let router;
-    switch (protocol) {
-        case "grpc":
-            router = new GrpcRouter(app, options);
-            break;
-        case "ws":
-        case "wss":
-            router = new WebsocketRouter(app, options);
-            break;
-        default:
-            router = new HttpRouter(app, options);
-    }
-    return router;
-}
-
 export { Body, CONTROLLER_ROUTER, DeleteMapping, File, Get, GetMapping, GrpcRouter, HeadMapping, Header, HttpRouter, NewRouter, OptionsMapping, Param, PatchMapping, PathVariable, Post, PostMapping, PutMapping, ROUTER_KEY, RequestBody, RequestMapping, RequestMethod, RequestParam, WebsocketRouter };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.7.9",
+  "version": "1.7.12",
   "description": "Koatty routing component, adapt to http1/2, websocket, gRPC.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty_router",
-  "version": "1.7.9",
+  "version": "1.7.12",
   "description": "Koatty routing component, adapt to http1/2, websocket, gRPC.",
   "scripts": {
     "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",