@kevisual/router 0.0.36 → 0.0.38

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -28,7 +28,7 @@
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.10.1",
+    "@types/node": "^24.10.2",
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",

package/src/app.ts

@@ -107,8 +107,8 @@ export class App<U = {}> {
   async queryRoute(path: string, key?: string, payload?: any, ctx?: AppRouteContext<U> & { [key: string]: any }) {
     return await this.router.queryRoute({ path, key, payload }, ctx);
   }
-  async run(path: string, key?: string, payload?: any, ctx?: AppRouteContext<U> & { [key: string]: any }) {
-    return await this.router.run({ path, key, payload }, ctx);
+  async run(msg: { id?: string, path?: string; key?: string; payload?: any }, ctx?: AppRouteContext<U> & { [key: string]: any }) {
+    return await this.router.run(msg, ctx);
   }
   exportRoutes() {
     return this.router.exportRoutes();

package/src/route.ts

@@ -63,14 +63,14 @@ export type RouteMiddleware =
     id?: string;
   }
   | string;
-export type RouteOpts<T = {}> = {
+export type RouteOpts<U = {}, T = SimpleObject> = {
   path?: string;
   key?: string;
   id?: string;
-  run?: Run<T>;
+  run?: Run<U>;
   nextRoute?: NextRoute; // route to run after this route
   description?: string;
-  metadata?: { [key: string]: any };
+  metadata?: T;
   middleware?: RouteMiddleware[]; // middleware
   type?: 'route' | 'middleware';
   /**
@@ -86,7 +86,7 @@ export type RouteOpts<T = {}> = {
 export type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;
 const pickValue = ['path', 'key', 'id', 'description', 'type', 'middleware', 'metadata'] as const;
 export type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
-export class Route<U = { [key: string]: any }> {
+export class Route<U = { [key: string]: any }, T extends SimpleObject =SimpleObject> {
   /**
    * 一级路径
    */
@@ -99,7 +99,7 @@ export class Route<U = { [key: string]: any }> {
   run?: Run;
   nextRoute?: NextRoute; // route to run after this route
   description?: string;
-  metadata?: { [key: string]: any };
+  metadata?: T;
   middleware?: RouteMiddleware[]; // middleware
   type? = 'route';
   data?: any;
@@ -124,7 +124,7 @@ export class Route<U = { [key: string]: any }> {
       this.run = opts.run;
       this.nextRoute = opts.nextRoute;
       this.description = opts.description;
-      this.metadata = opts.metadata;
+      this.metadata = opts.metadata as T;
       this.type = opts.type || 'route';
       this.middleware = opts.middleware || [];
       this.key = opts.key || key;
@@ -511,8 +511,8 @@ export class QueryRouter {
   setContext(ctx: RouteContext) {
     this.context = ctx;
   }
-  getList(): RouteInfo[] {
-    return this.routes.map((r) => {
+  getList(filter?: (route: Route) => boolean): RouteInfo[] {
+    return this.routes.filter(filter || (() => true)).map((r) => {
       return pick(r, pickValue as any);
     });
   }
@@ -655,13 +655,13 @@ export class QueryRouterServer extends QueryRouter {
    * @param param0
    * @returns
    */
-  async run({ path, key, payload }: { path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
+  async run(msg: { id?: string; path?: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
     const handle = this.handle;
     if (handle) {
-      const result = await this.call({ path, key, payload }, ctx);
+      const result = await this.call(msg, ctx);
       return handle(result);
     }
-    return super.run({ path, key, payload }, ctx);
+    return super.run(msg, ctx);
   }
 }