@kevisual/router 0.0.59 → 0.0.61

package/package.json

@@ -1,20 +1,21 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
   "types": "./dist/router.d.ts",
   "scripts": {
     "build": "npm run clean && rollup -c",
-    "build:app": "npm run build && rsync dist/*browser* ../deploy/dist",
+    "postbuild": "bun run bun.config.ts",
     "watch": "rollup -c -w",
     "clean": "rm -rf dist"
   },
   "files": [
     "dist",
     "src",
+    "agent",
     "auto.ts",
     "mod.ts"
   ],
@@ -39,6 +40,7 @@
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
     "eventemitter3": "^5.0.4",
+    "fast-glob": "^3.3.3",
     "nanoid": "^5.1.6",
     "path-to-regexp": "^8.3.0",
     "rollup": "^4.55.2",
@@ -80,6 +82,7 @@
       "types": "./dist/router-simple.d.ts"
     },
     "./opencode": "./dist/opencode.js",
+    "./skill": "./dist/app.js",
     "./define": {
       "import": "./dist/router-define.js",
       "require": "./dist/router-define.js",

package/src/app.ts

@@ -2,7 +2,6 @@ import { QueryRouter, Route, RouteContext, RouteOpts } from './route.ts';
 import { ServerNode, ServerNodeOpts } from './server/server.ts';
 import { HandleCtx } from './server/server-base.ts';
 import { ServerType } from './server/server-type.ts';
-import { CustomError } from './result/error.ts';
 import { handleServer } from './server/handle-server.ts';
 import { IncomingMessage, ServerResponse } from 'http';
 import { isBun } from './utils/is-engine.ts';

package/src/browser.ts

@@ -13,4 +13,6 @@ export { createSkill, tool } from './route.ts';
 export { CustomError } from './result/error.ts';
 
 export * from './router-define.ts';
+
+export { MockProcess } from './utils/listen-process.ts'
 // --- 以上同步更新至 browser.ts ---

package/src/index.ts

@@ -13,6 +13,8 @@ export { createSkill, tool } from './route.ts';
 export { CustomError } from './result/error.ts';
 
 export * from './router-define.ts';
+
+export { MockProcess } from './utils/listen-process.ts'
 // --- 以上同步更新至 browser.ts ---
 
 export { ServerNode, handleServer } from './server/index.ts';

package/src/opencode.ts

@@ -50,6 +50,9 @@ export const createRouterAgentPluginFn = (opts?: {
   if (!router.hasRoute('call', '')) {
     addCallFn(router as App)
   }
+  if (!router.hasRoute('auth', '')) {
+    router.route({ path: 'auth', key: '', id: 'auth', description: '认证' }).define(async (ctx) => { }).addTo(router as App)
+  }
   const _routes = filter(router.routes, opts?.query || '')
   const routes = _routes.filter(r => {
     const metadata = r.metadata as Skill
@@ -88,6 +91,7 @@ export const createRouterAgentPluginFn = (opts?: {
                 }
                 return str;
               }
+              console.error('调用出错', res);
               return `Error: ${res?.message || '无法获取结果'}`;
             }
           }

package/src/result/error.ts

@@ -9,10 +9,10 @@ export class CustomError extends Error {
     this.name = 'CustomError';
     if (typeof code === 'number') {
       this.code = code;
-      this.message = message;
+      this.message = message!;
     } else {
       this.code = 500;
-      this.message = code;
+      this.message = code!;
     }
     this.tips = tips;
     // 这一步可不写，默认会保存堆栈追踪信息到自定义错误构造函数之前，

package/src/route.ts

@@ -60,7 +60,7 @@ export type RouteContext<T = { code?: number }, S = any> = {
   needSerialize?: boolean;
 } & T;
 export type SimpleObject = Record<string, any>;
-export type Run<T extends SimpleObject = {}> = (ctx: RouteContext<T>) => Promise<typeof ctx | null | void>;
+export type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
 
 export type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 export type RouteMiddleware =
@@ -355,7 +355,7 @@ export class QueryRouter {
         const middleware = routeMiddleware[i];
         if (middleware) {
           try {
-            await middleware.run(ctx);
+            await middleware.run(ctx as Required<RouteContext>);
           } catch (e) {
             if (route?.isDebug) {
               console.error('=====debug====:middlerware error');
@@ -385,7 +385,7 @@ export class QueryRouter {
     if (route) {
       if (route.run) {
         try {
-          await route.run(ctx);
+          await route.run(ctx as Required<RouteContext>);
         } catch (e) {
           if (route?.isDebug) {
             console.error('=====debug====:', 'router run error:', e.message);
@@ -614,7 +614,8 @@ export class QueryRouter {
   }
   /**
    * 等待程序运行, 获取到message的数据,就执行
-   *
+   * params 是预设参数，默认path为main
+   * 
    * emitter = process
    * -- .exit
    * -- .on
@@ -631,7 +632,7 @@ export class QueryRouter {
     if (getList) {
       this.createRouteList(opts?.force ?? false, opts?.filter);
     }
-    return listenProcess({ app: this, params, ...opts });
+    return listenProcess({ app: this as any, params, ...opts });
   }
 }
 

package/src/test/mini.ts

@@ -0,0 +1,14 @@
+import { Mini } from "../route.ts";
+
+const app = new Mini();
+
+app.route({
+  path: 'main'
+}).define(async (ctx) => {
+  ctx.body = {
+    a: '123'
+  }
+}).addTo(app)
+
+
+app.wait()

package/src/test/run-mini.ts

@@ -0,0 +1,56 @@
+import { fork } from 'child_process'
+
+export type RunCodeParams = {
+  path?: string;
+  key?: string;
+  payload?: string;
+  [key: string]: any
+}
+type RunCode = {
+  // 调用进程的功能
+  success?: boolean
+  data?: {
+    // 调用router的结果
+    code?: number
+    data?: any
+    message?: string
+    [key: string]: any
+  };
+  error?: any
+  timestamp?: string
+  [key: string]: any
+}
+export const runCode = async (tsPath: string, params: RunCodeParams = {}): Promise<RunCode> => {
+  return new Promise((resolve, reject) => {
+    // 使用 Bun 的 fork 模式启动子进程
+    const child = fork(tsPath)
+
+    // 监听来自子进程的消息
+    child.on('message', (msg: RunCode) => {
+      resolve(msg)
+    })
+
+    // child.on('exit', (code, signal) => {
+    //   console.log('子进程已退出，退出码:', code, '信号:', signal)
+    // })
+
+    // child.on('close', (code, signal) => {
+    //   console.log('子进程已关闭，退出码:', code, '信号:', signal)
+    // })
+
+    child.on('error', (error) => {
+      resolve({
+        success: false, error: error?.message
+      })
+    })
+
+    // 向子进程发送消息
+    child.send(params)
+  });
+}
+import path from 'node:path'
+const res =await runCode(path.join(process.cwd(), './src/test/mini.ts'), {
+  // path: 'main'
+})
+
+console.log('res', res)

package/src/utils/listen-process.ts

@@ -1,23 +1,63 @@
+import { EventEmitter } from "eventemitter3";
+import { QueryRouterServer } from "../route.ts"
+export class MockProcess {
+  emitter?: EventEmitter
+  process?: NodeJS.Process;
+  constructor(opts?: { emitter?: EventEmitter, isNode?: boolean }) {
+    this.emitter = opts?.emitter || new EventEmitter();
+    const isNode = opts?.isNode ?? true;
+    if (isNode) {
+      this.process = globalThis?.process;
+    }
+  }
+  send(data?: any, callback?: (err?: Error) => void) {
+    if (this.process) {
+      this.process?.send?.(data, (err?: Error) => {
+        callback(err)
+      })
+    }
+    this.emitter.emit('send', data)
+  }
+  exit(flag: number = 0) {
+    if (this.process) {
+      this.process?.exit?.(flag)
+    }
+    this.emitter.emit('exit', flag)
+  }
+  on(fn: (msg?: any) => any) {
+    if (this.process) {
+      this.process.on('message', fn)
+    }
+    this.emitter.on('message', fn)
+  }
+  desctroy() {
+    if (this.emitter) {
+      this.emitter = undefined;
+    }
+    this.process = undefined;
+  }
+}
 export type ListenProcessOptions = {
-  app?: any; // 传入的应用实例
-  emitter?: any; // 可选的事件发射器
+  app?: QueryRouterServer; // 传入的应用实例
+  mockProcess?: MockProcess; // 可选的事件发射器
   params?: any; // 可选的参数
-  timeout?: number; // 可选的超时时间 (单位: 毫秒)
+  timeout?: number; // 可选的超时时间 (单位: 毫秒) 默认 10 分钟
 };
-export const listenProcess = async ({ app, emitter, params, timeout = 10 * 60 * 60 * 1000 }: ListenProcessOptions) => {
-  const process = emitter || globalThis.process;
+export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60 * 1000 }: ListenProcessOptions) => {
+  const process = mockProcess || new MockProcess();
   let isEnd = false;
   const timer = setTimeout(() => {
     if (isEnd) return;
     isEnd = true;
-    process.send?.({ success: false, error: 'Timeout' });
-    process.exit?.(1);
+    process.send?.({ success: false, error: 'Timeout' }, () => {
+      process.exit?.(1);
+    });
   }, timeout);
 
   // 监听来自主进程的消息
   const getParams = async (): Promise<any> => {
     return new Promise((resolve) => {
-      process.on('message', (msg) => {
+      process.on((msg) => {
         if (isEnd) return;
         isEnd = true;
         clearTimeout(timer);
@@ -27,9 +67,16 @@ export const listenProcess = async ({ app, emitter, params, timeout = 10 * 60 *
   }
 
   try {
-    const { path = 'main', ...rest } = await getParams()
+    /**
+     * 如果不提供path，默认是main
+     */
+    const {
+      path = 'main',
+      payload = {},
+      ...rest
+    } = await getParams()
     // 执行主要逻辑
-    const result = await app.queryRoute({ path, ...rest, ...params })
+    const result = await app.run({ path, ...params, ...rest, payload: { ...params?.payload, ...payload } })
     // 发送结果回主进程
     const response = {
       success: true,
@@ -37,14 +84,15 @@ export const listenProcess = async ({ app, emitter, params, timeout = 10 * 60 *
       timestamp: new Date().toISOString()
     }
 
-    process.send?.(response, (error) => {
+    process.send?.(response, () => {
       process.exit?.(0)
     })
   } catch (error) {
     process.send?.({
       success: false,
       error: error.message
+    }, () => {
+      process.exit?.(1)
     })
-    process.exit?.(1)
   }
 }