@kevisual/router 0.0.51 → 0.0.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -21,22 +21,22 @@
   "keywords": [],
   "author": "abearxiong",
   "license": "MIT",
-  "packageManager": "pnpm@10.26.2",
+  "packageManager": "pnpm@10.28.0",
   "devDependencies": {
     "@kevisual/local-proxy": "^0.0.8",
-    "@kevisual/query": "^0.0.33",
+    "@kevisual/query": "^0.0.35",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/bun": "^1.3.5",
-    "@types/node": "^25.0.3",
+    "@types/node": "^25.0.7",
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
-    "cookie": "^1.1.1",
+    "eventemitter3": "^5.0.1",
     "nanoid": "^5.1.6",
-    "rollup": "^4.54.0",
+    "rollup": "^4.55.1",
     "rollup-plugin-dts": "^6.3.0",
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
@@ -45,17 +45,16 @@
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
-    "zod": "^4.2.1"
+    "zod": "^4.3.5",
+    "@kevisual/js-filter": "^0.0.4",
+    "path-to-regexp": "^8.3.0",
+    "send": "^1.2.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
-  "dependencies": {
-    "path-to-regexp": "^8.3.0",
-    "selfsigned": "^5.4.0",
-    "send": "^1.2.1"
-  },
+  "dependencies": {},
   "publishConfig": {
     "access": "public"
   },
@@ -70,11 +69,6 @@
       "require": "./dist/router-browser.js",
       "types": "./dist/router-browser.d.ts"
     },
-    "./sign": {
-      "import": "./dist/router-sign.js",
-      "require": "./dist/router-sign.js",
-      "types": "./dist/router-sign.d.ts"
-    },
     "./simple": {
       "import": "./dist/router-simple.js",
       "require": "./dist/router-simple.js",
@@ -93,6 +87,10 @@
     "./src/*": {
       "import": "./src/*",
       "require": "./src/*"
+    },
+    "./modules/*": {
+      "import": "./src/modules/*",
+      "require": "./src/modules/*"
     }
   }
-}
+}

package/src/app.ts

@@ -7,6 +7,7 @@ import { handleServer } from './server/handle-server.ts';
 import { IncomingMessage, ServerResponse } from 'http';
 import { isBun } from './utils/is-engine.ts';
 import { BunServer } from './server/server-bun.ts';
+import { nanoid } from 'nanoid';
 
 type RouterHandle = (msg: { path: string;[key: string]: any }) => { code: string; data?: any; message?: string;[key: string]: any };
 type AppOptions<T = {}> = {
@@ -16,6 +17,7 @@ type AppOptions<T = {}> = {
   routerHandle?: RouterHandle;
   routerContext?: RouteContext<T>;
   serverOptions?: ServerNodeOpts;
+  appId?: string;
 };
 
 export type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & { app: App<T> };
@@ -25,6 +27,7 @@ export type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & { app: App<T
  *  U - Route Context的扩展类型
  */
 export class App<U = {}> {
+  appId: string;
   router: QueryRouter;
   server: ServerType;
   constructor(opts?: AppOptions<U>) {
@@ -42,6 +45,12 @@ export class App<U = {}> {
     router.setContext({ needSerialize: true, ...opts?.routerContext });
     this.router = router;
     this.server = server;
+    if (opts?.appId) {
+      this.appId = opts.appId;
+    } else {
+      this.appId = nanoid(16);
+    }
+    router.appId = this.appId;
   }
   listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
   listen(port: number, hostname?: string, listeningListener?: () => void): void;

package/src/auto/index.ts

@@ -0,0 +1,19 @@
+import { loadTS, getMatchFiles } from './load-ts.ts';
+import { listenSocket } from './listen-sock.ts';
+import { Route, QueryRouter, QueryRouterServer } from '../route.ts';
+
+export { Route, QueryRouter, QueryRouterServer };
+
+export const App = QueryRouterServer;
+
+export { createSchema } from './../index.ts';
+export type { Rule } from '../validator/rule.ts';
+export type { RouteContext, RouteOpts } from '../route.ts';
+
+export type { Run } from '../route.ts';
+
+export { CustomError } from '../result/error.ts';
+
+export { listenSocket, loadTS, getMatchFiles };
+
+export { autoCall } from './call-sock.ts';

package/src/index.ts

@@ -20,7 +20,7 @@ export { App } from './app.ts';
 export * from './router-define.ts';
 
 
-export {
+export type {
   RouterReq,
   RouterRes,
   OnWebSocketFn,
@@ -31,4 +31,6 @@ export {
   WebSocketListenerFun,
   HttpListenerFun,
   OnListener,
-} from './server/server-type.ts';
+} from './server/server-type.ts';
+
+export { loadTS } from './auto/load-ts.ts';

package/src/modules/chat.ts

@@ -0,0 +1,57 @@
+import { QueryRouter } from "../route.ts";
+import { filter } from '@kevisual/js-filter'
+type RouterChatOptions = {
+  router?: QueryRouter;
+}
+export class RouterChat {
+  router: QueryRouter;
+  prompt: string = '';
+  constructor(opts?: RouterChatOptions) {
+    this.router = opts?.router || new QueryRouter();
+  }
+  prefix(opts?: { query?: string }) {
+    if (this.prompt) {
+      return this.prompt;
+    }
+    let _routes = this.router.routes;
+    if (opts?.query) {
+      _routes = filter(this.router.routes, opts.query);
+    }
+    const toolsList = _routes.map((r, index) =>
+      `${index + 1}. 工具名称: ${r.id}\n   描述: ${r.description}`
+    ).join('\n\n');
+    const _prompt = `你是一个 AI 助手，你可以使用以下工具来帮助用户完成任务:
+
+${toolsList}
+
+## 回复规则
+1. 如果用户的请求可以使用上述工具完成，请返回 JSON 格式数据
+2. 如果没有合适的工具，请直接分析并回答用户问题
+
+## JSON 数据格式
+\`\`\`json
+{
+  "id": "工具的id",
+  "payload": {
+    // 工具所需的参数（如果需要）
+    // 例如: "id": "xxx", "name": "xxx"
+  }
+}
+\`\`\`
+
+注意：
+- payload 中包含工具执行所需的所有参数
+- 如果工具不需要参数，payload 可以为空对象 {}
+- 确保返回的 id 与上述工具列表中的工具名称完全匹配`
+
+    this.prompt = _prompt;
+    return _prompt;
+  }
+  recreate() {
+    this.prompt = '';
+  }
+  getChatPrompt() {
+    const prompt = this.prefix();
+    return prompt;
+  }
+}

package/src/route.ts

@@ -5,6 +5,11 @@ import { listenProcess } from './utils/listen-process.ts';
 
 export type RouterContextT = { code?: number;[key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
+  /**
+   * 本地自己调用的时候使用，可以标识为当前自调用，那么 auth 就不许重复的校验
+   * 或者不需要登录的，直接调用
+   */
+  appId?: string;
   // run first
   query?: { [key: string]: any };
   // response body
@@ -217,6 +222,7 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
 }
 
 export class QueryRouter {
+  appId: string = '';
   routes: Route[];
   maxNextRoute = 40;
   context?: RouteContext = {}; // default context for call
@@ -555,6 +561,21 @@ export class QueryRouter {
   hasRoute(path: string, key: string = '') {
     return this.routes.find((r) => r.path === path && r.key === key);
   }
+  findRoute(opts?: { path?: string; key?: string; id?: string }) {
+    const { path, key, id } = opts || {};
+    return this.routes.find((r) => {
+      if (id) {
+        return r.id === id;
+      }
+      if (path) {
+        if (key !== undefined) {
+          return r.path === path && r.key === key;
+        }
+        return r.path === path;
+      }
+      return false;
+    });
+  }
   createRouteList(force: boolean = false, filter?: (route: Route) => boolean) {
     const hasListRoute = this.hasRoute('router', 'list');
     if (!hasListRoute || force) {
@@ -562,7 +583,7 @@ export class QueryRouter {
         description: '列出当前应用下的所有的路由信息',
         run: async (ctx: RouteContext) => {
           const list = this.getList(filter);
-          ctx.body = list;
+          ctx.body = { list };
         },
       });
       this.add(listRoute);
@@ -594,6 +615,7 @@ export class QueryRouter {
 type QueryRouterServerOpts = {
   handleFn?: HandleFn;
   context?: RouteContext;
+  appId?: string;
 };
 interface HandleFn<T = any> {
   (msg: { path: string;[key: string]: any }, ctx?: any): { code: string; data?: any; message?: string;[key: string]: any };
@@ -604,11 +626,17 @@ interface HandleFn<T = any> {
  * @description 移除server相关的功能，只保留router相关的功能，和http.createServer不相关，独立
  */
 export class QueryRouterServer extends QueryRouter {
+  declare appId: string;
   handle: any;
   constructor(opts?: QueryRouterServerOpts) {
     super();
     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 = nanoid(16);
+    }
   }
   setHandle(wrapperFn?: HandleFn, ctx?: RouteContext) {
     this.handle = this.getHandle(this, wrapperFn, ctx);

package/src/server/server-base.ts

@@ -3,7 +3,7 @@ import { handleServer } from './handle-server.ts';
 import * as cookie from './cookie.ts';
 import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebSocketListenerFun, ListenerFun, HttpListenerFun, WS } from './server-type.ts';
 import { parseIfJson } from '../utils/parse.ts';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
 
 export type HandleCtx = {
@@ -273,6 +273,10 @@ export class ServerBase implements ServerType {
       end({ code: 500, message: `${type} server is error` });
     }
   }
+  /**
+   * 根据emitter提醒关闭ws连接
+   * @param ws 
+   */
   async onWsClose(ws: WS) {
     const id = ws?.data?.id || '';
     if (id) {

package/src/server/server-bun.ts

@@ -253,6 +253,7 @@ export class BunServer extends ServerBase implements ServerType {
         },
         close: (ws: any) => {
           // WebSocket 连接关闭
+          ws?.data?.close?.();
           this.onWsClose(ws);
         },
       },

package/src/server/server-type.ts

@@ -1,4 +1,4 @@
-import EventEmitter from 'node:events';
+import { EventEmitter } from 'eventemitter3';
 import * as http from 'node:http';
 
 

package/src/server/ws-server.ts

@@ -2,7 +2,6 @@
 import { WebSocketServer } from 'ws';
 import type { WebSocket } from 'ws';
 import { ServerType } from './server-type.ts'
-import { parseIfJson } from '../utils/parse.ts';
 import { isBun } from '../utils/is-engine.ts';
 
 
@@ -62,6 +61,8 @@ export class WsServerBase {
       });
       this.server.sendConnected(ws);
       this.wss.on('close', () => {
+        // @ts-ignore
+        ws?.data?.close?.();
         this.server.onWsClose(ws);
       });
     });

package/src/test/chat.ts

@@ -1,5 +1,5 @@
 import { App } from '../app.ts'
-import { RouterChat } from '@/chat.ts';
+import { RouterChat } from '@/modules/chat.ts';
 
 const app = new App();
 

package/auto.ts

@@ -1,19 +0,0 @@
-import { loadTS, getMatchFiles } from './src/auto/load-ts.ts';
-import { listenSocket } from './src/auto/listen-sock.ts';
-import { Route, QueryRouter, QueryRouterServer } from './src/route.ts';
-
-export { Route, QueryRouter, QueryRouterServer };
-
-export const App = QueryRouterServer;
-
-export { createSchema } from './src/validator/index.ts';
-export type { Rule } from './src/validator/rule.ts';
-export type { RouteContext, RouteOpts } from './src/route.ts';
-
-export type { Run } from './src/route.ts';
-
-export { CustomError } from './src/result/error.ts';
-
-export { listenSocket, loadTS, getMatchFiles };
-
-export { autoCall } from './src/auto/call-sock.ts';

package/dist/router-sign.d.ts

@@ -1,16 +0,0 @@
-type Attributes = {
-    name: string;
-    value: string;
-};
-type AltNames = {
-    type: number;
-    value?: string;
-    ip?: string;
-};
-declare const createCert: (attrs?: Attributes[], altNames?: AltNames[]) => {
-    key: any;
-    cert: any;
-};
-
-export { createCert };
-export type { AltNames, Attributes };