@kevisual/router 0.0.69 → 0.0.71

package/dist/opencode.d.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'eventemitter3';
-import { z } from 'zod';
 import * as http from 'node:http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -33,6 +32,9 @@ type RouteContext<T = {
     query?: {
         [key: string]: any;
     };
+    args?: {
+        [key: string]: any;
+    };
     /** return body */
     body?: number | string | Object;
     forward?: (response: {
@@ -95,6 +97,12 @@ type RouteContext<T = {
 } & T;
 type SimpleObject = Record<string, any>;
 type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
+type RunMessage = {
+    path?: string;
+    key?: string;
+    id?: string;
+    payload?: any;
+};
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 type RouteMiddleware = {
     path: string;
@@ -328,9 +336,7 @@ declare class QueryRouter {
      * -- .send
      */
     wait(params?: {
-        path?: string;
-        key?: string;
-        payload?: any;
+        message: RunMessage;
     }, opts?: {
         mockProcess?: MockProcess;
         timeout?: number;
@@ -338,10 +344,8 @@ declare class QueryRouter {
         force?: boolean;
         filter?: (route: Route) => boolean;
     }): Promise<void>;
-    static toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    static fromJSONSchema: (route: RouteInfo) => {
-        [key: string]: z.ZodTypeAny;
-    };
+    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
+    fromJSONSchema: (route: RouteInfo) => RouteInfo;
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;

package/dist/opencode.js

@@ -1,3 +1,5 @@
+import 'es-toolkit';
+
 // src/utils/path-key.ts
 
 // ../../node_modules/.pnpm/@kevisual+load@0.0.6/node_modules/@kevisual/load/dist/load.js

package/dist/router-browser.d.ts

@@ -15,6 +15,22 @@ declare class MockProcess {
     on(fn: (msg?: any) => any): void;
     desctroy(): void;
 }
+type ListenProcessParams = {
+    message?: RunMessage;
+    context?: any;
+};
+type ListenProcessResponse = {
+    success?: boolean;
+    data?: {
+        code?: number;
+        data?: any;
+        message?: string;
+        [key: string]: any;
+    };
+    error?: any;
+    timestamp?: string;
+    [key: string]: any;
+};
 
 type RouterContextT = {
     code?: number;
@@ -31,6 +47,9 @@ type RouteContext<T = {
     query?: {
         [key: string]: any;
     };
+    args?: {
+        [key: string]: any;
+    };
     /** return body */
     body?: number | string | Object;
     forward?: (response: {
@@ -93,6 +112,12 @@ type RouteContext<T = {
 } & T;
 type SimpleObject$1 = Record<string, any>;
 type Run<T extends SimpleObject$1 = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
+type RunMessage = {
+    path?: string;
+    key?: string;
+    id?: string;
+    payload?: any;
+};
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 type RouteMiddleware = {
     path: string;
@@ -182,9 +207,7 @@ declare class Route<U = {
     throw(code?: number | string, message?: string, tips?: string): void;
 }
 declare const toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-declare const fromJSONSchema: (route: RouteInfo) => {
-    [key: string]: z.ZodTypeAny;
-};
+declare const fromJSONSchema: (route: RouteInfo) => RouteInfo;
 /**
  * @parmas overwrite 是否覆盖已存在的route，默认true
  */
@@ -343,9 +366,7 @@ declare class QueryRouter {
      * -- .send
      */
     wait(params?: {
-        path?: string;
-        key?: string;
-        payload?: any;
+        message: RunMessage;
     }, opts?: {
         mockProcess?: MockProcess;
         timeout?: number;
@@ -353,10 +374,8 @@ declare class QueryRouter {
         force?: boolean;
         filter?: (route: Route) => boolean;
     }): Promise<void>;
-    static toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    static fromJSONSchema: (route: RouteInfo) => {
-        [key: string]: z.ZodTypeAny;
-    };
+    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
+    fromJSONSchema: (route: RouteInfo) => RouteInfo;
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;
@@ -546,4 +565,4 @@ declare class QueryUtil<T extends RouteObject = RouteObject> {
 declare const App: typeof QueryRouterServer;
 
 export { App, CustomError, Mini, MockProcess, QueryRouter, QueryRouterServer, QueryUtil, Route, createSchema, createSkill, define, fromJSONSchema, toJSONSchema, tool, util };
-export type { RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, Rule, Run, Schema, Skill };
+export type { ListenProcessParams, ListenProcessResponse, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, Rule, Run, Schema, Skill };

package/dist/router-browser.js

@@ -1,3 +1,5 @@
+import { merge as merge$1 } from 'es-toolkit';
+
 const urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
 
@@ -490,7 +492,7 @@ class MockProcess {
         this.process = undefined;
     }
 }
-const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60 * 1000 }) => {
+const listenProcess = async ({ app, mockProcess, params = {}, timeout = 10 * 60 * 60 * 1000 }) => {
     const process = mockProcess || new MockProcess();
     let isEnd = false;
     const timer = setTimeout(() => {
@@ -504,12 +506,12 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
     // 监听来自主进程的消息
     const getParams = async () => {
         return new Promise((resolve) => {
-            process.on((msg) => {
+            process.on((params) => {
                 if (isEnd)
                     return;
                 isEnd = true;
                 clearTimeout(timer);
-                resolve(msg);
+                resolve(params || {});
             });
         });
     };
@@ -517,8 +519,10 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
         /**
          * 如果不提供path，默认是main
          */
-        const { payload = {}, ...rest } = await getParams();
-        const msg = { ...params, ...rest, payload: { ...params?.payload, ...payload } };
+        const _params = await getParams();
+        const mergeParams = merge$1(params, _params);
+        const msg = mergeParams?.message || {};
+        const ctx = mergeParams?.context || {};
         /**
          * 如果没有提供path和id，默认取第一个路由, 而且路由path不是router的
          */
@@ -527,7 +531,7 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
             msg.id = route?.id;
         }
         // 执行主要逻辑
-        const result = await app.run(msg);
+        const result = await app.run(msg, ctx);
         // 发送结果回主进程
         const response = {
             success: true,
@@ -539,6 +543,7 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
         });
     }
     catch (error) {
+        console.error('Error in listenProcess:', error);
         process.send?.({
             success: false,
             error: error.message
@@ -15064,14 +15069,17 @@ const toJSONSchema = (route) => {
     return pickValues;
 };
 const fromJSONSchema = (route) => {
-    const args = route?.metadata?.args || {};
+    const args = route?.metadata?.args;
+    if (!args)
+        return route;
     const keys = Object.keys(args);
     const newArgs = {};
     for (let key of keys) {
         const item = args[key];
         newArgs[key] = fromJSONSchema$1(item);
     }
-    return newArgs;
+    route.metadata.args = newArgs;
+    return route;
 };
 class QueryRouter {
     appId = '';
@@ -15204,7 +15212,6 @@ class QueryRouter {
                             console.error('=====debug====:middlerware error');
                             console.error('=====debug====:', e);
                             console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
-                            console.error('=====debug====:', e.message);
                         }
                         if (e instanceof CustomError || e?.code) {
                             ctx.code = e.code;
@@ -15212,8 +15219,9 @@ class QueryRouter {
                             ctx.body = null;
                         }
                         else {
-                            console.error(`fn:${route.path}-${route.key}:${route.id}`);
-                            console.error(`middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+                            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+                            console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+                            console.error(e);
                             ctx.code = 500;
                             ctx.message = 'Internal Server Error';
                             ctx.body = null;
@@ -15232,15 +15240,17 @@ class QueryRouter {
                 }
                 catch (e) {
                     if (route?.isDebug) {
-                        console.error('=====debug====:', 'router run error:', e.message);
+                        console.error('=====debug====:route error');
+                        console.error('=====debug====:', e);
+                        console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
                     }
                     if (e instanceof CustomError) {
                         ctx.code = e.code;
                         ctx.message = e.message;
                     }
                     else {
-                        console.error(`[error]fn:${route.path}-${route.key}:${route.id}`);
-                        console.error('error', e.message);
+                        console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+                        console.error(`[router error] error`, e);
                         ctx.code = 500;
                         ctx.message = 'Internal Server Error';
                     }
@@ -15271,6 +15281,7 @@ class QueryRouter {
                         return ctx;
                     }
                     ctx.query = { ...ctx.query, ...ctx.nextQuery };
+                    ctx.args = ctx.query;
                     ctx.nextQuery = {};
                     return await this.runRoute(path, key, ctx);
                 }
@@ -15300,6 +15311,7 @@ class QueryRouter {
         const { path, key = '', payload = {}, ...query } = message;
         ctx = ctx || {};
         ctx.query = { ...ctx.query, ...query, ...payload };
+        ctx.args = ctx.query;
         ctx.state = { ...ctx?.state };
         ctx.throw = this.throw;
         ctx.app = this;
@@ -15494,8 +15506,8 @@ class QueryRouter {
         }
         return listenProcess({ app: this, params, ...opts });
     }
-    static toJSONSchema = toJSONSchema;
-    static fromJSONSchema = fromJSONSchema;
+    toJSONSchema = toJSONSchema;
+    fromJSONSchema = fromJSONSchema;
 }
 /**
  * QueryRouterServer

package/dist/router.d.ts

@@ -21,6 +21,22 @@ declare class MockProcess {
     on(fn: (msg?: any) => any): void;
     desctroy(): void;
 }
+type ListenProcessParams = {
+    message?: RunMessage;
+    context?: any;
+};
+type ListenProcessResponse = {
+    success?: boolean;
+    data?: {
+        code?: number;
+        data?: any;
+        message?: string;
+        [key: string]: any;
+    };
+    error?: any;
+    timestamp?: string;
+    [key: string]: any;
+};
 
 type RouterContextT = {
     code?: number;
@@ -37,6 +53,9 @@ type RouteContext<T = {
     query?: {
         [key: string]: any;
     };
+    args?: {
+        [key: string]: any;
+    };
     /** return body */
     body?: number | string | Object;
     forward?: (response: {
@@ -99,6 +118,12 @@ type RouteContext<T = {
 } & T;
 type SimpleObject$1 = Record<string, any>;
 type Run<T extends SimpleObject$1 = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
+type RunMessage = {
+    path?: string;
+    key?: string;
+    id?: string;
+    payload?: any;
+};
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 type RouteMiddleware = {
     path: string;
@@ -188,9 +213,7 @@ declare class Route<U = {
     throw(code?: number | string, message?: string, tips?: string): void;
 }
 declare const toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-declare const fromJSONSchema: (route: RouteInfo) => {
-    [key: string]: z.ZodTypeAny;
-};
+declare const fromJSONSchema: (route: RouteInfo) => RouteInfo;
 /**
  * @parmas overwrite 是否覆盖已存在的route，默认true
  */
@@ -349,9 +372,7 @@ declare class QueryRouter {
      * -- .send
      */
     wait(params?: {
-        path?: string;
-        key?: string;
-        payload?: any;
+        message: RunMessage;
     }, opts?: {
         mockProcess?: MockProcess;
         timeout?: number;
@@ -359,10 +380,8 @@ declare class QueryRouter {
         force?: boolean;
         filter?: (route: Route) => boolean;
     }): Promise<void>;
-    static toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    static fromJSONSchema: (route: RouteInfo) => {
-        [key: string]: z.ZodTypeAny;
-    };
+    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
+    fromJSONSchema: (route: RouteInfo) => RouteInfo;
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;
@@ -959,4 +978,4 @@ declare class App<U = {}> extends QueryRouter {
 }
 
 export { App, CustomError, Mini, MockProcess, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, createSkill, define, fromJSONSchema, handleServer, toJSONSchema, tool, util };
-export type { HttpListenerFun, Listener, OnListener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, Skill, WS, WebSocketListenerFun, WebSocketReq, WebSocketRes };
+export type { HttpListenerFun, ListenProcessParams, ListenProcessResponse, Listener, OnListener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, Skill, WS, WebSocketListenerFun, WebSocketReq, WebSocketRes };

package/dist/router.js

@@ -1,4 +1,5 @@
 import require$$1, { webcrypto } from 'node:crypto';
+import { merge as merge$1 } from 'es-toolkit';
 import require$$2 from 'node:http';
 import require$$1$1 from 'node:https';
 import http2 from 'node:http2';
@@ -514,7 +515,7 @@ class MockProcess {
         this.process = undefined;
     }
 }
-const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60 * 1000 }) => {
+const listenProcess = async ({ app, mockProcess, params = {}, timeout = 10 * 60 * 60 * 1000 }) => {
     const process = mockProcess || new MockProcess();
     let isEnd = false;
     const timer = setTimeout(() => {
@@ -528,12 +529,12 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
     // 监听来自主进程的消息
     const getParams = async () => {
         return new Promise((resolve) => {
-            process.on((msg) => {
+            process.on((params) => {
                 if (isEnd)
                     return;
                 isEnd = true;
                 clearTimeout(timer);
-                resolve(msg);
+                resolve(params || {});
             });
         });
     };
@@ -541,8 +542,10 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
         /**
          * 如果不提供path，默认是main
          */
-        const { payload = {}, ...rest } = await getParams();
-        const msg = { ...params, ...rest, payload: { ...params?.payload, ...payload } };
+        const _params = await getParams();
+        const mergeParams = merge$1(params, _params);
+        const msg = mergeParams?.message || {};
+        const ctx = mergeParams?.context || {};
         /**
          * 如果没有提供path和id，默认取第一个路由, 而且路由path不是router的
          */
@@ -551,7 +554,7 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
             msg.id = route?.id;
         }
         // 执行主要逻辑
-        const result = await app.run(msg);
+        const result = await app.run(msg, ctx);
         // 发送结果回主进程
         const response = {
             success: true,
@@ -563,6 +566,7 @@ const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60
         });
     }
     catch (error) {
+        console.error('Error in listenProcess:', error);
         process.send?.({
             success: false,
             error: error.message
@@ -15088,14 +15092,17 @@ const toJSONSchema = (route) => {
     return pickValues;
 };
 const fromJSONSchema = (route) => {
-    const args = route?.metadata?.args || {};
+    const args = route?.metadata?.args;
+    if (!args)
+        return route;
     const keys = Object.keys(args);
     const newArgs = {};
     for (let key of keys) {
         const item = args[key];
         newArgs[key] = fromJSONSchema$1(item);
     }
-    return newArgs;
+    route.metadata.args = newArgs;
+    return route;
 };
 class QueryRouter {
     appId = '';
@@ -15228,7 +15235,6 @@ class QueryRouter {
                             console.error('=====debug====:middlerware error');
                             console.error('=====debug====:', e);
                             console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
-                            console.error('=====debug====:', e.message);
                         }
                         if (e instanceof CustomError || e?.code) {
                             ctx.code = e.code;
@@ -15236,8 +15242,9 @@ class QueryRouter {
                             ctx.body = null;
                         }
                         else {
-                            console.error(`fn:${route.path}-${route.key}:${route.id}`);
-                            console.error(`middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+                            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+                            console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+                            console.error(e);
                             ctx.code = 500;
                             ctx.message = 'Internal Server Error';
                             ctx.body = null;
@@ -15256,15 +15263,17 @@ class QueryRouter {
                 }
                 catch (e) {
                     if (route?.isDebug) {
-                        console.error('=====debug====:', 'router run error:', e.message);
+                        console.error('=====debug====:route error');
+                        console.error('=====debug====:', e);
+                        console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
                     }
                     if (e instanceof CustomError) {
                         ctx.code = e.code;
                         ctx.message = e.message;
                     }
                     else {
-                        console.error(`[error]fn:${route.path}-${route.key}:${route.id}`);
-                        console.error('error', e.message);
+                        console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+                        console.error(`[router error] error`, e);
                         ctx.code = 500;
                         ctx.message = 'Internal Server Error';
                     }
@@ -15295,6 +15304,7 @@ class QueryRouter {
                         return ctx;
                     }
                     ctx.query = { ...ctx.query, ...ctx.nextQuery };
+                    ctx.args = ctx.query;
                     ctx.nextQuery = {};
                     return await this.runRoute(path, key, ctx);
                 }
@@ -15324,6 +15334,7 @@ class QueryRouter {
         const { path, key = '', payload = {}, ...query } = message;
         ctx = ctx || {};
         ctx.query = { ...ctx.query, ...query, ...payload };
+        ctx.args = ctx.query;
         ctx.state = { ...ctx?.state };
         ctx.throw = this.throw;
         ctx.app = this;
@@ -15518,8 +15529,8 @@ class QueryRouter {
         }
         return listenProcess({ app: this, params, ...opts });
     }
-    static toJSONSchema = toJSONSchema;
-    static fromJSONSchema = fromJSONSchema;
+    toJSONSchema = toJSONSchema;
+    fromJSONSchema = fromJSONSchema;
 }
 /**
  * QueryRouterServer

package/dist/ws.d.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'eventemitter3';
-import { z } from 'zod';
 import * as http from 'node:http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -80,6 +79,9 @@ type RouteContext<T = {
     query?: {
         [key: string]: any;
     };
+    args?: {
+        [key: string]: any;
+    };
     /** return body */
     body?: number | string | Object;
     forward?: (response: {
@@ -142,6 +144,12 @@ type RouteContext<T = {
 } & T;
 type SimpleObject = Record<string, any>;
 type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
+type RunMessage = {
+    path?: string;
+    key?: string;
+    id?: string;
+    payload?: any;
+};
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 type RouteMiddleware = {
     path: string;
@@ -375,9 +383,7 @@ declare class QueryRouter {
      * -- .send
      */
     wait(params?: {
-        path?: string;
-        key?: string;
-        payload?: any;
+        message: RunMessage;
     }, opts?: {
         mockProcess?: MockProcess;
         timeout?: number;
@@ -385,10 +391,8 @@ declare class QueryRouter {
         force?: boolean;
         filter?: (route: Route) => boolean;
     }): Promise<void>;
-    static toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "key" | "path" | "id" | "description" | "type" | "middleware" | "metadata">;
-    static fromJSONSchema: (route: RouteInfo) => {
-        [key: string]: z.ZodTypeAny;
-    };
+    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
+    fromJSONSchema: (route: RouteInfo) => RouteInfo;
 }
 interface HandleFn<T = any> {
     (msg: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -29,7 +29,7 @@
     "@kevisual/local-proxy": "^0.0.8",
     "@kevisual/query": "^0.0.39",
     "@kevisual/use-config": "^1.0.30",
-    "@opencode-ai/plugin": "^1.1.48",
+    "@opencode-ai/plugin": "^1.1.49",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -41,6 +41,7 @@
     "@types/xml2js": "^0.4.14",
     "eventemitter3": "^5.0.4",
     "fast-glob": "^3.3.3",
+    "hono": "^4.11.7",
     "nanoid": "^5.1.6",
     "path-to-regexp": "^8.3.0",
     "rollup": "^4.57.1",
@@ -53,14 +54,15 @@
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
-    "zod": "^4.3.6",
-    "hono": "^4.11.7"
+    "zod": "^4.3.6"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
-  "dependencies": {},
+  "dependencies": {
+    "es-toolkit": "^1.44.0"
+  },
   "publishConfig": {
     "access": "public"
   },

package/src/browser.ts

@@ -14,5 +14,5 @@ export { CustomError } from './result/error.ts';
 
 export * from './router-define.ts';
 
-export { MockProcess } from './utils/listen-process.ts'
+export { MockProcess, type ListenProcessParams, type ListenProcessResponse } from './utils/listen-process.ts'
 // --- 以上同步更新至 browser.ts ---

package/src/index.ts

@@ -14,7 +14,7 @@ export { CustomError } from './result/error.ts';
 
 export * from './router-define.ts';
 
-export { MockProcess } from './utils/listen-process.ts'
+export { MockProcess, type ListenProcessParams, type ListenProcessResponse } from './utils/listen-process.ts'
 // --- 以上同步更新至 browser.ts ---
 
 export { ServerNode, handleServer } from './server/index.ts';

package/src/route.ts

@@ -3,7 +3,6 @@ import { CustomError } from './result/error.ts';
 import { pick } from './utils/pick.ts';
 import { listenProcess, MockProcess } from './utils/listen-process.ts';
 import { z } from 'zod';
-import { filter } from '@kevisual/js-filter'
 
 export type RouterContextT = { code?: number;[key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
@@ -14,6 +13,7 @@ export type RouteContext<T = { code?: number }, S = any> = {
   appId?: string;
   // run first
   query?: { [key: string]: any };
+  args?: { [key: string]: any };
   // response body
   /** return body */
   body?: number | string | Object;
@@ -61,7 +61,7 @@ export type RouteContext<T = { code?: number }, S = any> = {
 } & T;
 export type SimpleObject = Record<string, any>;
 export type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
-
+export type RunMessage = { path?: string; key?: string; id?: string; payload?: any; };
 export type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
 export type RouteMiddleware =
   | {
@@ -262,17 +262,17 @@ export const toJSONSchema = (route: RouteInfo) => {
   return pickValues;
 }
 
-export const fromJSONSchema = (route: RouteInfo): {
-  [key: string]: z.ZodTypeAny
-} => {
-  const args = route?.metadata?.args || {};
+export const fromJSONSchema = (route: RouteInfo): RouteInfo => {
+  const args = route?.metadata?.args;
+  if (!args) return route;
   const keys = Object.keys(args);
   const newArgs: { [key: string]: any } = {};
   for (let key of keys) {
     const item = args[key];
     newArgs[key] = z.fromJSONSchema(item);
   }
-  return newArgs;
+  route.metadata.args = newArgs;
+  return route;
 }
 
 /**
@@ -405,15 +405,15 @@ export class QueryRouter {
               console.error('=====debug====:middlerware error');
               console.error('=====debug====:', e);
               console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
-              console.error('=====debug====:', e.message);
             }
             if (e instanceof CustomError || e?.code) {
               ctx.code = e.code;
               ctx.message = e.message;
               ctx.body = null;
             } else {
-              console.error(`fn:${route.path}-${route.key}:${route.id}`);
-              console.error(`middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(e)
               ctx.code = 500;
               ctx.message = 'Internal Server Error';
               ctx.body = null;
@@ -432,14 +432,16 @@ export class QueryRouter {
           await route.run(ctx as Required<RouteContext>);
         } catch (e) {
           if (route?.isDebug) {
-            console.error('=====debug====:', 'router run error:', e.message);
+            console.error('=====debug====:route error');
+            console.error('=====debug====:', e);
+            console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
           }
           if (e instanceof CustomError) {
             ctx.code = e.code;
             ctx.message = e.message;
           } else {
-            console.error(`[error]fn:${route.path}-${route.key}:${route.id}`);
-            console.error('error', e.message);
+            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+            console.error(`[router error] error`, e);
             ctx.code = 500;
             ctx.message = 'Internal Server Error';
           }
@@ -469,6 +471,7 @@ export class QueryRouter {
             return ctx;
           }
           ctx.query = { ...ctx.query, ...ctx.nextQuery };
+          ctx.args = ctx.query;
           ctx.nextQuery = {};
           return await this.runRoute(path, key, ctx);
         }
@@ -496,6 +499,7 @@ export class QueryRouter {
     const { path, key = '', payload = {}, ...query } = message;
     ctx = ctx || {};
     ctx.query = { ...ctx.query, ...query, ...payload };
+    ctx.args = ctx.query;
     ctx.state = { ...ctx?.state };
     ctx.throw = this.throw;
     ctx.app = this;
@@ -680,7 +684,7 @@ export class QueryRouter {
    * -- .on
    * -- .send
    */
-  wait(params?: { path?: string; key?: string; payload?: any }, opts?: {
+  wait(params?: { message: RunMessage }, opts?: {
     mockProcess?: MockProcess,
     timeout?: number,
     getList?: boolean
@@ -693,8 +697,8 @@ export class QueryRouter {
     }
     return listenProcess({ app: this as any, params, ...opts });
   }
-  static toJSONSchema = toJSONSchema;
-  static fromJSONSchema = fromJSONSchema;
+  toJSONSchema = toJSONSchema;
+  fromJSONSchema = fromJSONSchema;
 }
 
 type QueryRouterServerOpts = {

package/src/test/run-mini.ts

@@ -1,25 +1,7 @@
 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
-}
+import { ListenProcessParams, ListenProcessResponse } from '@/utils/listen-process.ts';
+export type RunCodeParams = ListenProcessParams
+export type RunCode = ListenProcessResponse
 export const runCode = async (tsPath: string, params: RunCodeParams = {}): Promise<RunCode> => {
   return new Promise((resolve, reject) => {
     // 使用 Bun 的 fork 模式启动子进程
@@ -52,8 +34,11 @@ import path from 'node:path'
 const res = await runCode(path.join(process.cwd(), './src/test/mini.ts'), {
   // path: 'main'
   // id: 'abc'
-  path: 'router',
-  key: 'list'
+  message: {
+    path: 'router',
+    key: 'list'
+  }
 })
 
-console.log('res', res.data.data.list)
+console.log('success', res)
+console.log('res', res.data?.data?.list)

package/src/test/ws.ts

@@ -1,7 +1,6 @@
 import { App } from "../app.ts";
 
 const app = new App({
-  io: true
 });
 
 app

package/src/utils/listen-process.ts

@@ -1,5 +1,6 @@
 import { EventEmitter } from "eventemitter3";
-import { QueryRouterServer } from "../route.ts"
+import { QueryRouterServer, RouterContextT, RunMessage } from "../route.ts"
+import { merge } from 'es-toolkit'
 export class MockProcess {
   emitter?: EventEmitter
   process?: NodeJS.Process;
@@ -37,13 +38,31 @@ export class MockProcess {
     this.process = undefined;
   }
 }
+export type ListenProcessParams = {
+  message?: RunMessage,
+  context?: any
+}
+export type ListenProcessResponse = {
+  // 调用进程的功能
+  success?: boolean
+  data?: {
+    // 调用router的结果
+    code?: number
+    data?: any
+    message?: string
+    [key: string]: any
+  };
+  error?: any
+  timestamp?: string
+  [key: string]: any
+}
 export type ListenProcessOptions = {
   app?: QueryRouterServer; // 传入的应用实例
   mockProcess?: MockProcess; // 可选的事件发射器
-  params?: any; // 可选的参数
+  params?: ListenProcessParams; // 可选的参数
   timeout?: number; // 可选的超时时间 (单位: 毫秒) 默认 10 分钟
 };
-export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 60 * 60 * 1000 }: ListenProcessOptions) => {
+export const listenProcess = async ({ app, mockProcess, params = {}, timeout = 10 * 60 * 60 * 1000 }: ListenProcessOptions) => {
   const process = mockProcess || new MockProcess();
   let isEnd = false;
   const timer = setTimeout(() => {
@@ -57,11 +76,11 @@ export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 6
   // 监听来自主进程的消息
   const getParams = async (): Promise<any> => {
     return new Promise((resolve) => {
-      process.on((msg) => {
+      process.on((params) => {
         if (isEnd) return;
         isEnd = true;
         clearTimeout(timer);
-        resolve(msg)
+        resolve(params || {})
       })
     })
   }
@@ -70,11 +89,11 @@ export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 6
     /**
      * 如果不提供path，默认是main
      */
-    const {
-      payload = {},
-      ...rest
-    } = await getParams()
-    const msg = { ...params, ...rest, payload: { ...params?.payload, ...payload } }
+    const _params = await getParams()
+    const mergeParams = merge(params, _params)
+
+    const msg = mergeParams?.message || {};
+    const ctx: RouterContextT = mergeParams?.context || {}
     /**
      * 如果没有提供path和id，默认取第一个路由, 而且路由path不是router的
      */
@@ -83,7 +102,7 @@ export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 6
       msg.id = route?.id
     }
     // 执行主要逻辑
-    const result = await app.run(msg)
+    const result = await app.run(msg, ctx);
     // 发送结果回主进程
     const response = {
       success: true,
@@ -95,6 +114,7 @@ export const listenProcess = async ({ app, mockProcess, params, timeout = 10 * 6
       process.exit?.(0)
     })
   } catch (error) {
+    console.error('Error in listenProcess:', error);
     process.send?.({
       success: false,
       error: error.message