@kevisual/router 0.1.6 → 0.2.2

package/{readme.md → README.md}

@@ -55,7 +55,7 @@ app
 
 | 方法                                | 参数                                      | 说明                                         |
 | ----------------------------------- | ----------------------------------------- | -------------------------------------------- |
-| `ctx.call(msg, ctx?)`               | `{ path, key?, payload?, ... } \| { id }` | 调用其他路由，返回完整 context               |
+| `ctx.call(msg, ctx?)`               | `{ path, key?, payload?, ... } \| { rid }` | 调用其他路由，返回完整 context               |
 | `ctx.run(msg, ctx?)`                | `{ path, key?, payload? }`                | 调用其他路由，返回 `{ code, data, message }` |
 | `ctx.forward(res)`                  | `{ code, data?, message? }`               | 设置响应结果                                 |
 | `ctx.throw(code?, message?, tips?)` | -                                         | 抛出自定义错误                               |
@@ -64,13 +64,13 @@ app
 
 ```ts
 import { App } from '@kevisual/router';
-import z from 'zod';
+import { z } from 'zod';
 const app = new App();
 app.listen(4002);
 
 // 基本路由
 app
-  .route({ path: 'user', key: 'info', id: 'user-info' })
+  .route({ path: 'user', key: 'info', rid: 'user-info' })
   .define(async (ctx) => {
     // ctx.query 包含请求参数
     const { id } = ctx.query;
@@ -129,7 +129,7 @@ const app = new App();
 // 定义中间件
 app
   .route({
-    id: 'auth-example',
+    rid: 'auth-example',
     description: '权限校验中间件',
   })
   .define(async (ctx) => {
@@ -142,7 +142,7 @@ app
   })
   .addTo(app);
 
-// 使用中间件（通过 id 引用）
+// 使用中间件（通过 rid 引用）
 app
   .route({ path: 'admin', key: 'panel', middleware: ['auth-example'] })
   .define(async (ctx) => {
@@ -164,17 +164,17 @@ app
     path: 'dog',
     key: 'info',
     description: '获取狗的信息',
-    metedata: {
+    metadata: {
       args: {
-        owner: z.string().describe('狗主人姓名'),
+        name: z.string().describe('狗的姓名'),
         age: z.number().describe('狗的年龄'),
       },
     },
   })
   .define(async (ctx) => {
-    const { owner, age } = ctx.query;
+    const { name, age } = ctx.query;
     ctx.body = {
-      content: `这是一只${age}岁的狗，主人是${owner}`,
+      content: `这是一只${age}岁的狗，名字是${name}`,
     };
   })
   .addTo(app);

package/dist/app.js

@@ -17387,7 +17387,7 @@ var fromJSONSchema2 = (args = {}, opts) => {
 };
 
 // src/route.ts
-var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
+var pickValue = ["path", "key", "rid", "description", "type", "middleware", "metadata"];
 var tool = {
   schema: exports_external
 };
@@ -17407,7 +17407,7 @@ var createSkill = (skill) => {
 class Route {
   path;
   key;
-  id;
+  rid;
   run;
   nextRoute;
   description;
@@ -17425,7 +17425,7 @@ class Route {
     this.key = key;
     const pathKey = `${path}$$${key}`;
     if (opts) {
-      this.id = opts.id || hashIdMd5Sync(pathKey);
+      this.rid = opts.rid || hashIdMd5Sync(pathKey);
       this.run = opts.run;
       this.nextRoute = opts.nextRoute;
       this.description = opts.description;
@@ -17437,8 +17437,8 @@ class Route {
     } else {
       this.middleware = [];
     }
-    if (!this.id) {
-      this.id = hashIdMd5Sync(pathKey);
+    if (!this.rid) {
+      this.rid = hashIdMd5Sync(pathKey);
     }
     this.isDebug = opts?.isDebug ?? false;
   }
@@ -17544,14 +17544,14 @@ class QueryRouter {
     this.routes = this.routes.filter((r) => r.path === route.path && r.key == route.key);
   }
   removeById(uniqueId) {
-    this.routes = this.routes.filter((r) => r.id !== uniqueId);
+    this.routes = this.routes.filter((r) => r.rid !== uniqueId);
   }
   async runRoute(path, key, ctx) {
     const route = this.routes.find((r) => r.path === path && r.key === key);
     const maxNextRoute = this.maxNextRoute;
     ctx = ctx || {};
     ctx.currentPath = path;
-    ctx.currentId = route?.id;
+    ctx.currentId = route?.rid;
     ctx.currentKey = key;
     ctx.currentRoute = route;
     ctx.index = (ctx.index || 0) + 1;
@@ -17578,11 +17578,11 @@ class QueryRouter {
           let route2;
           const isString2 = typeof item === "string";
           if (isString2) {
-            route2 = this.routes.find((r) => r.id === item);
+            route2 = this.routes.find((r) => r.rid === item);
           } else {
             route2 = this.routes.find((r) => {
-              if (item.id) {
-                return r.id === item.id;
+              if (item.rid) {
+                return r.rid === item.rid;
               } else {
                 return r.path === item.path && r.key == item.key;
               }
@@ -17631,8 +17631,8 @@ class QueryRouter {
               ctx.message = e.message;
               ctx.body = null;
             } else {
-              console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
-              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(`[router error] fn:${route.path}-${route.key}:${route.rid}`);
+              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.rid}`);
               console.error(e);
               ctx.code = 500;
               ctx.message = "Internal Server Error";
@@ -17660,7 +17660,7 @@ class QueryRouter {
             ctx.code = e.code;
             ctx.message = e.message;
           } else {
-            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+            console.error(`[router error] fn:${route.path}-${route.key}:${route.rid}`);
             console.error(`[router error] error`, e);
             ctx.code = 500;
             ctx.message = "Internal Server Error";
@@ -17676,8 +17676,8 @@ class QueryRouter {
           if (route.nextRoute.path || route.nextRoute.key) {
             path2 = route.nextRoute.path;
             key2 = route.nextRoute.key;
-          } else if (route.nextRoute.id) {
-            const nextRoute = this.routes.find((r) => r.id === route.nextRoute.id);
+          } else if (route.nextRoute.rid) {
+            const nextRoute = this.routes.find((r) => r.rid === route.nextRoute.rid);
             if (nextRoute) {
               path2 = nextRoute.path;
               key2 = nextRoute.key;
@@ -17741,8 +17741,8 @@ class QueryRouter {
     let key = message.key;
     if (path) {
       return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
-    } else if (message.id) {
-      const route = this.routes.find((r) => r.id === message.id);
+    } else if (message.rid) {
+      const route = this.routes.find((r) => r.rid === message.rid);
       if (route) {
         path = route.path;
         key = route.key;
@@ -17815,10 +17815,10 @@ class QueryRouter {
     return this.routes.find((r) => r.path === path && r.key === key);
   }
   findRoute(opts) {
-    const { path, key, id } = opts || {};
+    const { path, key, rid } = opts || {};
     return this.routes.find((r) => {
-      if (id) {
-        return r.id === id;
+      if (rid) {
+        return r.rid === rid;
       }
       if (path) {
         if (key !== undefined) {
@@ -17839,14 +17839,14 @@ class QueryRouter {
           const tokenUser = ctx.state;
           let isUser = !!tokenUser;
           const list = this.getList(opts?.filter).filter((item) => {
-            if (item.id === "auth" || item.id === "auth-can" || item.id === "check-auth-admin" || item.id === "auth-admin") {
+            if (item.rid === "auth" || item.rid === "auth-can" || item.rid === "check-auth-admin" || item.rid === "auth-admin") {
               return false;
             }
             return true;
           });
           ctx.body = {
             list: list.map((item) => {
-              const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
+              const route = pick(item, ["rid", "path", "key", "description", "middleware", "metadata"]);
               return toJSONSchemaRoute(route);
             }),
             isUser
@@ -17916,14 +17916,14 @@ class QueryRouterServer extends QueryRouter {
     return super.run(msg, ctx);
   }
   async runAction(api2, payload, ctx) {
-    const { path, key, id } = api2;
-    return this.run({ path, key, id, payload }, ctx);
+    const { path, key, rid } = api2;
+    return this.run({ path, key, rid, payload }, ctx);
   }
   async createAuth(fun) {
     this.route({
       path: "auth",
       key: "auth",
-      id: "auth",
+      rid: "auth",
       description: "token验证"
     }).define(async (ctx) => {
       if (fun) {
@@ -17933,7 +17933,7 @@ class QueryRouterServer extends QueryRouter {
     this.route({
       path: "auth-admin",
       key: "auth-admin",
-      id: "auth-admin",
+      rid: "auth-admin",
       description: "admin token验证",
       middleware: ["auth"]
     }).define(async (ctx) => {
@@ -17944,7 +17944,7 @@ class QueryRouterServer extends QueryRouter {
     this.route({
       path: "auth-can",
       key: "auth-can",
-      id: "auth-can",
+      rid: "auth-can",
       description: "权限验证"
     }).define(async (ctx) => {
       if (fun) {
@@ -19848,10 +19848,10 @@ var createRouterAgentPluginFn = (opts) => {
     addCallFn(router);
   }
   if (router) {
-    router.route({ path: "auth", key: "", id: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+    router.route({ path: "auth", key: "", rid: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router, {
       overwrite: false
     });
-    router.route({ path: "auth-admin", key: "", id: "auth-admin", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+    router.route({ path: "auth-admin", key: "", rid: "auth-admin", description: "认证" }).define(async (ctx) => {}).addTo(router, {
       overwrite: false
     });
   }
@@ -20108,7 +20108,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.1.5";
+var version2 = "0.2.1";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/commander.d.ts

@@ -131,16 +131,16 @@ type RunMessage = {
     id?: string;
     payload?: any;
 };
-type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
 type RouteMiddleware = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
 } | string;
 type RouteOpts<U = {}, T = SimpleObject> = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<U>;
     nextRoute?: NextRoute;
     description?: string;
@@ -150,7 +150,7 @@ type RouteOpts<U = {}, T = SimpleObject> = {
     isDebug?: boolean;
 };
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;
-declare const pickValue: readonly ["path", "key", "id", "description", "type", "middleware", "metadata"];
+declare const pickValue: readonly ["path", "key", "rid", "description", "type", "middleware", "metadata"];
 type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
 /**
  * @M 是 route的 metadate的类型，默认是 SimpleObject
@@ -165,7 +165,7 @@ declare class Route<M extends SimpleObject = SimpleObject, U extends SimpleObjec
      * 二级路径
      */
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<BuildRouteContext<M, U>>;
     nextRoute?: NextRoute;
     description?: string;
@@ -259,7 +259,7 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
      * @returns
      */
     call(message: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -346,7 +346,7 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
     findRoute(opts?: {
         path?: string;
         key?: string;
-        id?: string;
+        rid?: string;
     }): Route<SimpleObject, SimpleObject>;
     createRouteList(opts?: {
         force?: boolean;
@@ -437,7 +437,7 @@ declare class QueryRouterServer<C extends SimpleObject = SimpleObject> extends Q
      * @returns
      */
     run(msg: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -445,7 +445,7 @@ declare class QueryRouterServer<C extends SimpleObject = SimpleObject> extends Q
         data?: any;
     }, ctx?: Partial<RouteContext<C>>): Promise<any>;
     runAction<T extends {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         metadata?: {

package/dist/commander.js

@@ -16298,6 +16298,7 @@ var parse5 = async (opts) => {
   if (opts.remote) {
     const { token, username, id } = opts.remote;
     const remoteApp = new RemoteApp({
+      app,
       token,
       username,
       id

package/dist/opencode.d.ts

@@ -131,16 +131,16 @@ type RunMessage = {
     id?: string;
     payload?: any;
 };
-type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
 type RouteMiddleware = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
 } | string;
 type RouteOpts<U = {}, T = SimpleObject> = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<U>;
     nextRoute?: NextRoute;
     description?: string;
@@ -150,7 +150,7 @@ type RouteOpts<U = {}, T = SimpleObject> = {
     isDebug?: boolean;
 };
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;
-declare const pickValue: readonly ["path", "key", "id", "description", "type", "middleware", "metadata"];
+declare const pickValue: readonly ["path", "key", "rid", "description", "type", "middleware", "metadata"];
 type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
 /**
  * @M 是 route的 metadate的类型，默认是 SimpleObject
@@ -165,7 +165,7 @@ declare class Route<M extends SimpleObject = SimpleObject, U extends SimpleObjec
      * 二级路径
      */
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<BuildRouteContext<M, U>>;
     nextRoute?: NextRoute;
     description?: string;
@@ -259,7 +259,7 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
      * @returns
      */
     call(message: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -346,7 +346,7 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
     findRoute(opts?: {
         path?: string;
         key?: string;
-        id?: string;
+        rid?: string;
     }): Route<SimpleObject, SimpleObject>;
     createRouteList(opts?: {
         force?: boolean;
@@ -437,7 +437,7 @@ declare class QueryRouterServer<C extends SimpleObject = SimpleObject> extends Q
      * @returns
      */
     run(msg: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -445,7 +445,7 @@ declare class QueryRouterServer<C extends SimpleObject = SimpleObject> extends Q
         data?: any;
     }, ctx?: Partial<RouteContext<C>>): Promise<any>;
     runAction<T extends {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         metadata?: {

package/dist/opencode.js

@@ -15229,10 +15229,10 @@ var createRouterAgentPluginFn = (opts) => {
     addCallFn(router);
   }
   if (router) {
-    router.route({ path: "auth", key: "", id: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+    router.route({ path: "auth", key: "", rid: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router, {
       overwrite: false
     });
-    router.route({ path: "auth-admin", key: "", id: "auth-admin", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+    router.route({ path: "auth-admin", key: "", rid: "auth-admin", description: "认证" }).define(async (ctx) => {}).addTo(router, {
       overwrite: false
     });
   }

package/dist/router-browser.d.ts

@@ -172,16 +172,16 @@ type RunMessage = {
     id?: string;
     payload?: any;
 };
-type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
 type RouteMiddleware = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
 } | string;
 type RouteOpts<U = {}, T = SimpleObject$1> = {
     path?: string;
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<U>;
     nextRoute?: NextRoute;
     description?: string;
@@ -191,7 +191,7 @@ type RouteOpts<U = {}, T = SimpleObject$1> = {
     isDebug?: boolean;
 };
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;
-declare const pickValue: readonly ["path", "key", "id", "description", "type", "middleware", "metadata"];
+declare const pickValue: readonly ["path", "key", "rid", "description", "type", "middleware", "metadata"];
 type Skill<T = SimpleObject$1> = {
     skill: string;
     title: string;
@@ -220,7 +220,7 @@ declare class Route<M extends SimpleObject$1 = SimpleObject$1, U extends SimpleO
      * 二级路径
      */
     key?: string;
-    id?: string;
+    rid?: string;
     run?: Run<BuildRouteContext<M, U>>;
     nextRoute?: NextRoute;
     description?: string;
@@ -331,7 +331,7 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
      * @returns
      */
     call(message: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -418,7 +418,7 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
     findRoute(opts?: {
         path?: string;
         key?: string;
-        id?: string;
+        rid?: string;
     }): Route<SimpleObject$1, SimpleObject$1>;
     createRouteList(opts?: {
         force?: boolean;
@@ -509,7 +509,7 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
      * @returns
      */
     run(msg: {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         payload?: any;
@@ -517,7 +517,7 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
         data?: any;
     }, ctx?: Partial<RouteContext<C>>): Promise<any>;
     runAction<T extends {
-        id?: string;
+        rid?: string;
         path?: string;
         key?: string;
         metadata?: {
@@ -631,7 +631,7 @@ declare class Chain {
     setPath(path: string): this;
     setMiddleware(middleware: RouteMiddleware[]): this;
     setKey(key: string): this;
-    setId(key: string): this;
+    setRid(key: string): this;
     setRun<U extends SimpleObject = {}>(run: Run<U>): this;
     define<U extends SimpleObject = {}>(run: Run<U>): this;
     createRoute(): this;