@kevisual/router 0.0.83 → 0.0.85

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

@@ -3091,7 +3091,7 @@ function pick(obj, keys) {
 // node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
 var import__ = __toESM(require_eventemitter3(), 1);
 
-// node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
+// node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
 function isPlainObject(value) {
   if (!value || typeof value !== "object") {
     return false;
@@ -3104,12 +3104,12 @@ function isPlainObject(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
 
-// node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
+// node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
 function isUnsafeProperty(key) {
   return key === "__proto__";
 }
 
-// node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/object/merge.mjs
+// node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/object/merge.mjs
 function merge(target, source) {
   const sourceKeys = Object.keys(source);
   for (let i = 0;i < sourceKeys.length; i++) {
@@ -16932,7 +16932,7 @@ class Route {
     if (opts) {
       this.id = opts.id || randomId(12, "rand-");
       if (!opts.id && opts.idUsePath) {
-        const delimiter = opts.delimiter ?? "$#$";
+        const delimiter = opts.delimiter ?? "$$";
         this.id = path + delimiter + key;
       }
       this.run = opts.run;
@@ -17055,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;
@@ -17068,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 = [];
@@ -17143,7 +17144,9 @@ class QueryRouter {
             }
             return ctx;
           }
-          if (ctx.end) {}
+          if (ctx.end) {
+            return ctx;
+          }
         }
       }
     }
@@ -17337,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") {
@@ -17368,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";
@@ -17861,7 +17914,7 @@ class ServerBase {
     }
   }
   async onWsClose(ws) {
-    const id = ws?.data?.id || "";
+    const id = ws?.wsId || "";
     if (id) {
       this.emitter.emit("close--" + id, { type: "close", ws, id });
       setTimeout(() => {
@@ -17874,6 +17927,9 @@ class ServerBase {
     if (this.showConnected)
       ws.send(JSON.stringify({ type: "connected" }));
   }
+  createId() {
+    return Math.random().toString(36).substring(2, 15);
+  }
 }
 
 // node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/wrapper.mjs
@@ -17914,6 +17970,9 @@ class WsServerBase {
         token,
         id
       };
+      if (!ws.wsId) {
+        ws.wsId = this.createId();
+      }
       ws.on("message", async (message) => {
         await this.server.onWebSocket({ ws, message, pathname, token, id });
       });
@@ -17924,6 +17983,9 @@ class WsServerBase {
       });
     });
   }
+  createId() {
+    return Math.random().toString(36).substring(2, 15);
+  }
 }
 
 class WsServer extends WsServerBase {
@@ -18239,10 +18301,14 @@ class BunServer extends ServerBase {
         open: (ws) => {
           this.sendConnected(ws);
         },
-        message: async (ws, message) => {
+        message: async (bunWs, message) => {
+          const ws = bunWs;
           const pathname = ws.data.pathname || "";
           const token = ws.data.token || "";
           const id = ws.data.id || "";
+          if (!ws.wsId) {
+            ws.wsId = this.createId();
+          }
           await this.onWebSocket({ ws, message, pathname, token, id });
         },
         close: (ws) => {
@@ -18257,11 +18323,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) {
@@ -18273,7 +18339,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) {
@@ -18286,42 +18351,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);
   }
@@ -19242,7 +19272,7 @@ var addCallFn = (app2) => {
     path: "call",
     key: "",
     description: "调用",
-    middleware: ["auth"],
+    middleware: ["auth-admin"],
     metadata: {
       tags: ["opencode"],
       ...createSkill({
@@ -19256,7 +19286,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" }')
         }
       })
     }
@@ -19284,8 +19314,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) => {
@@ -19299,7 +19334,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,
@@ -19540,14 +19575,14 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.82";
+var version2 = "0.0.85";
 
 // agent/routes/route-create.ts
 app.route({
   path: "router-skill",
   key: "create-route",
   description: "创建路由技能",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19581,7 +19616,7 @@ app.route({
   path: "router-skill",
   key: "version",
   description: "获取最新router版本号",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19600,7 +19635,7 @@ app.route({
   path: "route-skill",
   key: "test",
   description: "测试路由技能",
-  middleware: ["auth"],
+  middleware: ["auth-admin"],
   metadata: {
     tags: ["opencode"],
     ...createSkill({
@@ -19620,14 +19655,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 });