@kevisual/router 0.0.82 → 0.0.84

package/agent/routes/index.ts

@@ -1,14 +1,20 @@
 import { app } from '../app.ts'
 import './route-create.ts'
 
-if (!app.hasRoute('auth', '')) {
-  app.route({
-    path: 'auth',
-    key: '',
-    id: 'auth',
-    description: '身份验证路由',
-  }).define(async (ctx) => {
-    //
-  }).addTo(app);
-}
+app.route({
+  path: 'auth',
+  key: '',
+  id: 'auth',
+  description: '身份验证路由',
+}).define(async (ctx) => {
+  //
+}).addTo(app, { overwrite: false });
 
+app.route({
+  path: 'auth-admin',
+  key: '',
+  id: 'auth-admin',
+  description: '管理员身份验证路由',
+}).define(async (ctx) => {
+  //
+}).addTo(app, { overwrite: false });

package/agent/routes/route-create.ts

@@ -6,7 +6,7 @@ app.route({
   path: 'router-skill',
   key: 'create-route',
   description: '创建路由技能',
-  middleware: ['auth'],
+  middleware: ['auth-admin'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -38,7 +38,7 @@ app.route({
   path: 'router-skill',
   key: 'version',
   description: '获取最新router版本号',
-  middleware: ['auth'],
+  middleware: ['auth-admin'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -59,7 +59,7 @@ app.route({
   path: 'route-skill',
   key: 'test',
   description: '测试路由技能',
-  middleware: ['auth'],
+  middleware: ['auth-admin'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({

package/dist/app.js

@@ -3051,6 +3051,18 @@ class CustomError extends Error {
   static isError(error) {
     return error instanceof CustomError || typeof error === "object" && error !== null && "code" in error;
   }
+  static throw(...args) {
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === "object") {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === "object") {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    throw new CustomError(args0);
+  }
   parse(e) {
     if (e) {
       return CustomError.parseError(e);
@@ -17000,7 +17012,7 @@ class Route {
     router.add(this, opts);
   }
   throw(...args) {
-    throw new CustomError(...args);
+    CustomError.throw(...args);
   }
 }
 var toJSONSchemaRoute = (route) => {
@@ -17043,6 +17055,7 @@ class QueryRouter {
     const maxNextRoute = this.maxNextRoute;
     ctx = ctx || {};
     ctx.currentPath = path;
+    ctx.currentId = route?.id;
     ctx.currentKey = key;
     ctx.currentRoute = route;
     ctx.index = (ctx.index || 0) + 1;
@@ -17056,7 +17069,7 @@ class QueryRouter {
       ctx.code = 500;
       ctx.message = "Too many nextRoute";
       ctx.body = null;
-      return;
+      return ctx;
     }
     if (route && route.middleware && route.middleware.length > 0) {
       const errorMiddleware = [];
@@ -17131,7 +17144,9 @@ class QueryRouter {
             }
             return ctx;
           }
-          if (ctx.end) {}
+          if (ctx.end) {
+            return ctx;
+          }
         }
       }
     }
@@ -17298,16 +17313,7 @@ class QueryRouter {
     this.importRoutes(router.routes);
   }
   throw(...args) {
-    const [args0, args1] = args;
-    if (args0 && typeof args0 === "object") {
-      throw new CustomError(args0);
-    }
-    if (args1 && typeof args1 === "object") {
-      throw new CustomError(args0, args1);
-    } else if (args1) {
-      throw new CustomError(args0, { message: args1 });
-    }
-    throw new CustomError(args0);
+    CustomError.throw(...args);
   }
   hasRoute(path, key = "") {
     return this.routes.find((r) => r.path === path && r.key === key);
@@ -17334,7 +17340,7 @@ class QueryRouter {
         description: "列出当前应用下的所有的路由信息",
         middleware: opts?.middleware || [],
         run: async (ctx) => {
-          const tokenUser = ctx.state.tokenUser;
+          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") {
@@ -17365,6 +17371,56 @@ class QueryRouter {
   fromJSONSchema = fromJSONSchema3;
 }
 
+class QueryRouterServer extends QueryRouter {
+  handle;
+  constructor(opts) {
+    super();
+    const initHandle = opts?.initHandle ?? true;
+    if (initHandle || opts?.handleFn) {
+      this.handle = this.getHandle(this, opts?.handleFn, opts?.context);
+    }
+    this.setContext({ needSerialize: false, ...opts?.context });
+    if (opts?.appId) {
+      this.appId = opts.appId;
+    } else {
+      this.appId = randomId(16);
+    }
+  }
+  setHandle(wrapperFn, ctx) {
+    this.handle = this.getHandle(this, wrapperFn, ctx);
+  }
+  addRoute(route, opts) {
+    this.add(route, opts);
+  }
+  Route = Route;
+  route(...args) {
+    const [path, key, opts] = args;
+    if (typeof path === "object") {
+      return new Route(path.path, path.key, path);
+    }
+    if (typeof path === "string") {
+      if (opts) {
+        return new Route(path, key, opts);
+      }
+      if (key && typeof key === "object") {
+        return new Route(path, key?.key || "", key);
+      }
+      return new Route(path, key);
+    }
+    return new Route(path, key, opts);
+  }
+  prompt(description) {
+    return new Route(undefined, undefined, { description });
+  }
+  async run(msg, ctx) {
+    const handle = this.handle;
+    if (handle) {
+      return handle(msg, ctx);
+    }
+    return super.run(msg, ctx);
+  }
+}
+
 // src/server/server.ts
 import http from "node:http";
 import https from "node:https";
@@ -18254,11 +18310,11 @@ class BunServer extends ServerBase {
   }
 }
 // src/app.ts
-class App extends QueryRouter {
+class App extends QueryRouterServer {
   router;
   server;
   constructor(opts) {
-    super();
+    super({ initHandle: false, context: { needSerialize: true, ...opts?.routerContext } });
     const router = this;
     let server = opts?.server;
     if (!server) {
@@ -18270,7 +18326,6 @@ class App extends QueryRouter {
       }
     }
     server.setHandle(router.getHandle(router, opts?.routerHandle, opts?.routerContext));
-    router.setContext({ needSerialize: true, ...opts?.routerContext });
     this.router = router;
     this.server = server;
     if (opts?.appId) {
@@ -18283,42 +18338,7 @@ class App extends QueryRouter {
   listen(...args) {
     this.server.listen(...args);
   }
-  addRoute(route, opts) {
-    super.add(route, opts);
-  }
   Route = Route;
-  route(...args) {
-    const [path, key, opts] = args;
-    if (typeof path === "object") {
-      return new Route(path.path, path.key, path);
-    }
-    if (typeof path === "string") {
-      if (opts) {
-        return new Route(path, key, opts);
-      }
-      if (key && typeof key === "object") {
-        return new Route(path, key?.key || "", key);
-      }
-      return new Route(path, key);
-    }
-    return new Route(path, key, opts);
-  }
-  prompt(...args) {
-    const [desc] = args;
-    let description = "";
-    if (typeof desc === "string") {
-      description = desc;
-    } else if (typeof desc === "function") {
-      description = desc() || "";
-    }
-    return new Route("", "", { description });
-  }
-  async call(message, ctx) {
-    return await super.call(message, ctx);
-  }
-  async run(msg, ctx) {
-    return await super.run(msg, ctx);
-  }
   static handleRequest(req, res) {
     return handleServer(req, res);
   }
@@ -19239,7 +19259,7 @@ var addCallFn = (app2) => {
     path: "call",
     key: "",
     description: "调用",
-    middleware: ["auth"],
+    middleware: ["auth-admin"],
     metadata: {
       tags: ["opencode"],
       ...createSkill({
@@ -19253,7 +19273,7 @@ var addCallFn = (app2) => {
         args: {
           path: tool.schema.string().describe("应用路径，例如 cnb"),
           key: tool.schema.string().optional().describe("应用key，例如 list-repos"),
-          payload: tool.schema.object({}).optional().describe("调用参数")
+          payload: tool.schema.object({}).optional().describe('调用参数, 为对象, 例如 { "query": "javascript" }')
         }
       })
     }
@@ -19281,8 +19301,13 @@ var createRouterAgentPluginFn = (opts) => {
   if (!router.hasRoute("call", "")) {
     addCallFn(router);
   }
-  if (!router.hasRoute("auth", "")) {
-    router.route({ path: "auth", key: "", id: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router);
+  if (router) {
+    router.route({ path: "auth", key: "", id: "auth", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+      overwrite: false
+    });
+    router.route({ path: "auth-admin", key: "", id: "auth-admin", description: "认证" }).define(async (ctx) => {}).addTo(router, {
+      overwrite: false
+    });
   }
   const _routes = filter(router.routes, opts?.query || "");
   const routes = _routes.filter((r) => {
@@ -19296,7 +19321,7 @@ var createRouterAgentPluginFn = (opts) => {
     return false;
   });
   const AgentPlugin = async (pluginInput) => {
-    useContextKey("plugin-input", () => pluginInput, true);
+    useContextKey("plugin-input", () => pluginInput, { isNew: true });
     const hooks = opts?.hooks ? await opts.hooks(pluginInput) : {};
     return {
       ...hooks,
@@ -19537,14 +19562,14 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.82";
+var version2 = "0.0.84";
 
 // agent/routes/route-create.ts
 app.route({
   path: "router-skill",
   key: "create-route",
   description: "创建路由技能",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19578,7 +19603,7 @@ app.route({
   path: "router-skill",
   key: "version",
   description: "获取最新router版本号",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19597,7 +19622,7 @@ app.route({
   path: "route-skill",
   key: "test",
   description: "测试路由技能",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19617,14 +19642,18 @@ app.route({
 }).addTo(app);
 
 // agent/routes/index.ts
-if (!app.hasRoute("auth", "")) {
-  app.route({
-    path: "auth",
-    key: "",
-    id: "auth",
-    description: "身份验证路由"
-  }).define(async (ctx) => {}).addTo(app);
-}
+app.route({
+  path: "auth",
+  key: "",
+  id: "auth",
+  description: "身份验证路由"
+}).define(async (ctx) => {}).addTo(app, { overwrite: false });
+app.route({
+  path: "auth-admin",
+  key: "",
+  id: "auth-admin",
+  description: "管理员身份验证路由"
+}).define(async (ctx) => {}).addTo(app, { overwrite: false });
 
 // agent/main.ts
 var routerAgentPlugin = createRouterAgentPluginFn({ router: app });