@kevisual/router 0.0.34 → 0.0.35

package/dist/router-browser.d.ts

@@ -312,6 +312,7 @@ declare class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     queryRoute(message: {
@@ -326,6 +327,24 @@ declare class QueryRouter {
         data: any;
         message: any;
     }>;
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    run(message: {
+        id?: string;
+        path?: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     /**
      * 设置上下文
      * @description 这里的上下文是为了在handle函数中使用
@@ -417,7 +436,7 @@ declare class QueryRouterServer extends QueryRouter {
     prompt(description: string): Route<Required<RouteContext>>;
     prompt(description: Function): Route<Required<RouteContext>>;
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
@@ -425,9 +444,12 @@ declare class QueryRouterServer extends QueryRouter {
         path: string;
         key?: string;
         payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
     }): Promise<any>;
 }
-declare const Mini: typeof QueryRouterServer;
+declare class Mini extends QueryRouterServer {
+}
 
 /** 自定义错误 */
 declare class CustomError extends Error {

package/dist/router-browser.js

@@ -5332,6 +5332,7 @@ class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     async queryRoute(message, ctx) {
@@ -5342,6 +5343,20 @@ class QueryRouter {
             message: res.message,
         };
     }
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    async run(message, ctx) {
+        const res = await this.call(message, { ...this.context, ...ctx });
+        return {
+            code: res.code,
+            data: res.body,
+            message: res.message,
+        };
+    }
     /**
      * 设置上下文
      * @description 这里的上下文是为了在handle函数中使用
@@ -5362,18 +5377,7 @@ class QueryRouter {
         return async (msg, handleContext) => {
             try {
                 const context = { ...ctx, ...handleContext };
-                if (msg.id) {
-                    const route = router.routes.find((r) => r.id === msg.id);
-                    if (route) {
-                        msg.path = route.path;
-                        msg.key = route.key;
-                    }
-                    else {
-                        return { code: 404, message: 'Not found route' };
-                    }
-                }
-                // @ts-ignore
-                const res = await router.parse(msg, context);
+                const res = await router.call(msg, context);
                 if (wrapperFn) {
                     res.data = res.body;
                     return wrapperFn(res, context);
@@ -5485,37 +5489,21 @@ class QueryRouterServer extends QueryRouter {
         return new Route('', '', { description });
     }
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
-    async run({ path, key, payload }) {
+    async run({ path, key, payload }, ctx) {
         const handle = this.handle;
-        const resultError = (error, code = 500) => {
-            const r = {
-                code: code,
-                message: error,
-            };
-            return r;
-        };
-        try {
-            const end = handle({ path, key, ...payload });
-            return end;
-        }
-        catch (e) {
-            if (e.code && typeof e.code === 'number') {
-                return {
-                    code: e.code,
-                    message: e.message,
-                };
-            }
-            else {
-                return resultError('Router Server error');
-            }
+        if (handle) {
+            const result = await this.call({ path, key, payload }, ctx);
+            return handle(result);
         }
+        return super.run({ path, key, payload }, ctx);
     }
 }
-const Mini = QueryRouterServer;
+class Mini extends QueryRouterServer {
+}
 
 const parseBody = async (req) => {
     return new Promise((resolve, reject) => {

package/dist/router.d.ts

@@ -316,6 +316,7 @@ declare class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     queryRoute(message: {
@@ -330,6 +331,24 @@ declare class QueryRouter {
         data: any;
         message: any;
     }>;
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    run(message: {
+        id?: string;
+        path?: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     /**
      * 设置上下文
      * @description 这里的上下文是为了在handle函数中使用
@@ -421,7 +440,7 @@ declare class QueryRouterServer extends QueryRouter {
     prompt(description: string): Route<Required<RouteContext>>;
     prompt(description: Function): Route<Required<RouteContext>>;
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
@@ -429,9 +448,12 @@ declare class QueryRouterServer extends QueryRouter {
         path: string;
         key?: string;
         payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
     }): Promise<any>;
 }
-declare const Mini: typeof QueryRouterServer;
+declare class Mini extends QueryRouterServer {
+}
 
 declare class Connect {
     path: string;

package/dist/router.js

@@ -5354,6 +5354,7 @@ class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     async queryRoute(message, ctx) {
@@ -5364,6 +5365,20 @@ class QueryRouter {
             message: res.message,
         };
     }
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    async run(message, ctx) {
+        const res = await this.call(message, { ...this.context, ...ctx });
+        return {
+            code: res.code,
+            data: res.body,
+            message: res.message,
+        };
+    }
     /**
      * 设置上下文
      * @description 这里的上下文是为了在handle函数中使用
@@ -5384,18 +5399,7 @@ class QueryRouter {
         return async (msg, handleContext) => {
             try {
                 const context = { ...ctx, ...handleContext };
-                if (msg.id) {
-                    const route = router.routes.find((r) => r.id === msg.id);
-                    if (route) {
-                        msg.path = route.path;
-                        msg.key = route.key;
-                    }
-                    else {
-                        return { code: 404, message: 'Not found route' };
-                    }
-                }
-                // @ts-ignore
-                const res = await router.parse(msg, context);
+                const res = await router.call(msg, context);
                 if (wrapperFn) {
                     res.data = res.body;
                     return wrapperFn(res, context);
@@ -5507,37 +5511,21 @@ class QueryRouterServer extends QueryRouter {
         return new Route('', '', { description });
     }
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
-    async run({ path, key, payload }) {
+    async run({ path, key, payload }, ctx) {
         const handle = this.handle;
-        const resultError = (error, code = 500) => {
-            const r = {
-                code: code,
-                message: error,
-            };
-            return r;
-        };
-        try {
-            const end = handle({ path, key, ...payload });
-            return end;
-        }
-        catch (e) {
-            if (e.code && typeof e.code === 'number') {
-                return {
-                    code: e.code,
-                    message: e.message,
-                };
-            }
-            else {
-                return resultError('Router Server error');
-            }
+        if (handle) {
+            const result = await this.call({ path, key, payload }, ctx);
+            return handle(result);
         }
+        return super.run({ path, key, payload }, ctx);
     }
 }
-const Mini = QueryRouterServer;
+class Mini extends QueryRouterServer {
+}
 
 class Connect {
     path;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/route.ts

@@ -628,6 +628,7 @@ export class QueryRouter {
    * 请求 result 的数据
    * @param message
    * @param ctx
+   * @deprecated use run or call instead
    * @returns
    */
   async queryRoute(message: { id?: string; path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
@@ -638,6 +639,20 @@ export class QueryRouter {
       message: res.message,
     };
   }
+  /**
+   * Router Run获取数据
+   * @param message 
+   * @param ctx 
+   * @returns 
+   */
+  async run(message: { id?: string; path?: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
+    const res = await this.call(message, { ...this.context, ...ctx });
+    return {
+      code: res.code,
+      data: res.body,
+      message: res.message,
+    };
+  }
   /**
    * 设置上下文
    * @description 这里的上下文是为了在handle函数中使用
@@ -658,17 +673,7 @@ export class QueryRouter {
     return async (msg: { id?: string; path?: string; key?: string;[key: string]: any }, handleContext?: RouteContext) => {
       try {
         const context = { ...ctx, ...handleContext };
-        if (msg.id) {
-          const route = router.routes.find((r) => r.id === msg.id);
-          if (route) {
-            msg.path = route.path;
-            msg.key = route.key;
-          } else {
-            return { code: 404, message: 'Not found route' };
-          }
-        }
-        // @ts-ignore
-        const res = await router.parse(msg, context);
+        const res = await router.call(msg, context);
         if (wrapperFn) {
           res.data = res.body;
           return wrapperFn(res, context);
@@ -796,34 +801,19 @@ export class QueryRouterServer extends QueryRouter {
   }
 
   /**
-   * 等于queryRoute，但是调用了handle
+   * 调用了handle
    * @param param0
    * @returns
    */
-  async run({ path, key, payload }: { path: string; key?: string; payload?: any }) {
+  async run({ path, key, payload }: { path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
     const handle = this.handle;
-    const resultError = (error: string, code = 500) => {
-      const r = {
-        code: code,
-        message: error,
-      };
-      return r;
-    };
-    try {
-      const end = handle({ path, key, ...payload });
-      return end;
-    } catch (e) {
-      if (e.code && typeof e.code === 'number') {
-        return {
-          code: e.code,
-          message: e.message,
-        };
-      } else {
-        return resultError('Router Server error');
-      }
+    if (handle) {
+      const result = await this.call({ path, key, payload }, ctx);
+      return handle(result);
     }
+    return super.run({ path, key, payload }, ctx);
   }
 }
 
 
-export const Mini = QueryRouterServer
+export class Mini extends QueryRouterServer {}