@kevisual/router 0.0.5-alpha-0 → 0.0.6-alpha-1

package/dist/router-browser.d.ts

@@ -65,9 +65,18 @@ type RouteContext<T = {
     end?: boolean;
     queryRouter?: QueryRouter;
     error?: any;
+    /** 请求 route的返回结果，包函ctx */
     call?: (message: {
         path: string;
-        key: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }) => Promise<any>;
+    /** 请求 route的返回结果，不包函ctx */
+    queryRoute?: (message: {
+        path: string;
+        key?: string;
         payload?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
@@ -225,13 +234,36 @@ declare class QueryRouter {
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    /**
+     * 返回的数据包含所有的context的请求返回的内容，可做其他处理
+     * @param message
+     * @param ctx
+     * @returns
+     */
     call(message: {
         path: string;
-        key: string;
+        key?: string;
         payload?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    /**
+     * 请求 result 的数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    queryRoute(message: {
+        path: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     setContext(ctx: RouteContext): Promise<void>;
     getList(): RouteInfo[];
     getHandle<T = any>(router: QueryRouter, wrapperFn?: HandleFn<T>, ctx?: RouteContext): (msg: {
@@ -284,16 +316,14 @@ declare class QueryRouterServer extends QueryRouter {
     route(path: string, key?: string): Route;
     route(path: string, opts?: RouteOpts): Route;
     route(path: string, key?: string, opts?: RouteOpts): Route;
-    call(message: {
-        path: string;
-        key: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }): Promise<any>;
+    /**
+     * 等于queryRoute，但是调用了handle
+     * @param param0
+     * @returns
+     */
     run({ path, key, payload }: {
         path: string;
-        key: string;
+        key?: string;
         payload?: any;
     }): Promise<any>;
 }

package/dist/router-browser.js

@@ -5745,10 +5745,11 @@ class QueryRouter {
                     catch (e) {
                         if (route?.isDebug) {
                             console.error('=====debug====:middlerware error');
+                            console.error('=====debug====:', e);
                             console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
                             console.error('=====debug====:', e.message);
                         }
-                        if (e instanceof CustomError) {
+                        if (e instanceof CustomError || e?.code) {
                             ctx.code = e.code;
                             ctx.message = e.message;
                             ctx.body = null;
@@ -5864,12 +5865,33 @@ class QueryRouter {
         // TODO: 是否需要queryRouter，函数内部处理router路由执行，这应该是避免去内部去包含的功能过
         ctx.queryRouter = this;
         ctx.call = this.call.bind(this);
+        ctx.queryRoute = this.queryRoute.bind(this);
         ctx.index = 0;
         return await this.runRoute(path, key, ctx);
     }
+    /**
+     * 返回的数据包含所有的context的请求返回的内容，可做其他处理
+     * @param message
+     * @param ctx
+     * @returns
+     */
     async call(message, ctx) {
         return await this.parse(message, { ...this.context, ...ctx });
     }
+    /**
+     * 请求 result 的数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    async queryRoute(message, ctx) {
+        const res = await this.parse(message, { ...this.context, ...ctx });
+        return {
+            code: res.code,
+            data: res.body,
+            message: res.message,
+        };
+    }
     async setContext(ctx) {
         this.context = ctx;
     }
@@ -5946,9 +5968,11 @@ class QueryRouterServer extends QueryRouter {
         }
         return new Route(path, key, opts);
     }
-    async call(message, ctx) {
-        return await this.parse(message, ctx);
-    }
+    /**
+     * 等于queryRoute，但是调用了handle
+     * @param param0
+     * @returns
+     */
     async run({ path, key, payload }) {
         const handle = this.handle;
         const resultError = (error, code = 500) => {

package/dist/router-simple.d.ts

@@ -19,7 +19,7 @@ declare class SimpleRouter {
     use(method: string, route: string, ...fns: Array<(req: Req, res: ServerResponse) => Promise<void> | void>): this;
     get(route: string, ...fns: Array<(req: Req, res: ServerResponse) => Promise<void> | void>): this;
     post(route: string, ...fns: Array<(req: Req, res: ServerResponse) => Promise<void> | void>): this;
-    parse(req: Req, res: ServerResponse): Promise<void>;
+    parse(req: Req, res: ServerResponse): Promise<void> | "not_found";
 }
 
 export { SimpleRouter };

package/dist/router-simple.js

@@ -450,13 +450,7 @@ class SimpleRouter {
             const { handlers } = route;
             return handlers.reduce((promiseChain, handler) => promiseChain.then(() => Promise.resolve(handler(req, res))), Promise.resolve());
         }
-        if (!res?.headersSent && res && res?.end) {
-            res.statusCode = 404;
-            res.end('Not Found');
-        }
-        else {
-            console.error('Not Found');
-        }
+        return 'not_found';
     }
 }
 

package/dist/router.d.ts

@@ -68,9 +68,18 @@ type RouteContext<T = {
     end?: boolean;
     queryRouter?: QueryRouter;
     error?: any;
+    /** 请求 route的返回结果，包函ctx */
     call?: (message: {
         path: string;
-        key: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }) => Promise<any>;
+    /** 请求 route的返回结果，不包函ctx */
+    queryRoute?: (message: {
+        path: string;
+        key?: string;
         payload?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
@@ -228,13 +237,36 @@ declare class QueryRouter {
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    /**
+     * 返回的数据包含所有的context的请求返回的内容，可做其他处理
+     * @param message
+     * @param ctx
+     * @returns
+     */
     call(message: {
         path: string;
-        key: string;
+        key?: string;
         payload?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    /**
+     * 请求 result 的数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    queryRoute(message: {
+        path: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     setContext(ctx: RouteContext): Promise<void>;
     getList(): RouteInfo[];
     getHandle<T = any>(router: QueryRouter, wrapperFn?: HandleFn<T>, ctx?: RouteContext): (msg: {
@@ -287,16 +319,14 @@ declare class QueryRouterServer extends QueryRouter {
     route(path: string, key?: string): Route;
     route(path: string, opts?: RouteOpts): Route;
     route(path: string, key?: string, opts?: RouteOpts): Route;
-    call(message: {
-        path: string;
-        key: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }): Promise<any>;
+    /**
+     * 等于queryRoute，但是调用了handle
+     * @param param0
+     * @returns
+     */
     run({ path, key, payload }: {
         path: string;
-        key: string;
+        key?: string;
         payload?: any;
     }): Promise<any>;
 }
@@ -505,11 +535,18 @@ declare class App<T = {}> {
     route(path: string, key?: string, opts?: RouteOpts): Route;
     call(message: {
         path: string;
-        key: string;
+        key?: string;
         payload?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<any>;
+    queryRoute(path: string, key?: string, payload?: any, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     exportRoutes(): Route[];
     importRoutes(routes: any[]): void;
     importApp(app: App): void;

package/dist/router.js

@@ -5764,10 +5764,11 @@ class QueryRouter {
                     catch (e) {
                         if (route?.isDebug) {
                             console.error('=====debug====:middlerware error');
+                            console.error('=====debug====:', e);
                             console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
                             console.error('=====debug====:', e.message);
                         }
-                        if (e instanceof CustomError) {
+                        if (e instanceof CustomError || e?.code) {
                             ctx.code = e.code;
                             ctx.message = e.message;
                             ctx.body = null;
@@ -5883,12 +5884,33 @@ class QueryRouter {
         // TODO: 是否需要queryRouter，函数内部处理router路由执行，这应该是避免去内部去包含的功能过
         ctx.queryRouter = this;
         ctx.call = this.call.bind(this);
+        ctx.queryRoute = this.queryRoute.bind(this);
         ctx.index = 0;
         return await this.runRoute(path, key, ctx);
     }
+    /**
+     * 返回的数据包含所有的context的请求返回的内容，可做其他处理
+     * @param message
+     * @param ctx
+     * @returns
+     */
     async call(message, ctx) {
         return await this.parse(message, { ...this.context, ...ctx });
     }
+    /**
+     * 请求 result 的数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    async queryRoute(message, ctx) {
+        const res = await this.parse(message, { ...this.context, ...ctx });
+        return {
+            code: res.code,
+            data: res.body,
+            message: res.message,
+        };
+    }
     async setContext(ctx) {
         this.context = ctx;
     }
@@ -5965,9 +5987,11 @@ class QueryRouterServer extends QueryRouter {
         }
         return new Route(path, key, opts);
     }
-    async call(message, ctx) {
-        return await this.parse(message, ctx);
-    }
+    /**
+     * 等于queryRoute，但是调用了handle
+     * @param param0
+     * @returns
+     */
     async run({ path, key, payload }) {
         const handle = this.handle;
         const resultError = (error, code = 500) => {
@@ -6481,6 +6505,9 @@ class App {
         const router = this.router;
         return await router.call(message, ctx);
     }
+    async queryRoute(path, key, payload, ctx) {
+        return await this.router.queryRoute({ path, key, payload }, ctx);
+    }
     exportRoutes() {
         return this.router.exportRoutes();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.5-alpha-0",
+  "version": "0.0.6-alpha-1",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",