@kevisual/router 0.0.33 → 0.0.35

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -21,8 +21,8 @@
   "author": "abearxiong",
   "license": "MIT",
   "devDependencies": {
-    "@kevisual/local-proxy": "^0.0.6",
-    "@kevisual/query": "^0.0.29",
+    "@kevisual/local-proxy": "^0.0.8",
+    "@kevisual/query": "^0.0.31",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -32,18 +32,18 @@
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
-    "cookie": "^1.0.2",
+    "cookie": "^1.1.1",
     "lodash-es": "^4.17.21",
     "nanoid": "^5.1.6",
-    "rollup": "^4.53.2",
-    "rollup-plugin-dts": "^6.2.3",
+    "rollup": "^4.53.3",
+    "rollup-plugin-dts": "^6.3.0",
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
-    "zod": "^4.1.12"
+    "zod": "^4.1.13"
   },
   "repository": {
     "type": "git",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.3.0",
-    "selfsigned": "^4.0.0",
+    "selfsigned": "^5.2.0",
     "send": "^1.2.0"
   },
   "publishConfig": {

package/src/route.ts

@@ -115,7 +115,6 @@ export class Route<U = { [key: string]: any }> {
    */
   key?: string;
   id?: string;
-  share? = false;
   run?: Run;
   nextRoute?: NextRoute; // route to run after this route
   description?: string;
@@ -587,9 +586,7 @@ export class QueryRouter {
     ctx.query = { ...ctx.query, ...query, ...payload };
     ctx.state = { ...ctx?.state };
     ctx.throw = this.throw;
-    // put queryRouter to ctx
-    // TODO: 是否需要queryRouter，函数内部处理router路由执行，这应该是避免去内部去包含的功能过
-    ctx.queryRouter = this;
+    ctx.app = this;
     ctx.call = this.call.bind(this);
     ctx.queryRoute = this.queryRoute.bind(this);
     ctx.index = 0;
@@ -610,7 +607,10 @@ export class QueryRouter {
   async call(message: { id?: string; path?: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
     let path = message.path;
     let key = message.key;
-    if (message.id) {
+    // 优先 path + key
+    if (path) {
+      return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
+    } else if (message.id) {
       const route = this.routes.find((r) => r.id === message.id);
       if (route) {
         path = route.path;
@@ -619,8 +619,6 @@ export class QueryRouter {
         return { code: 404, body: null, message: 'Not found route' };
       }
       return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
-    } else if (path) {
-      return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
     } else {
       return { code: 404, body: null, message: 'Not found path' };
     }
@@ -630,10 +628,25 @@ export class QueryRouter {
    * 请求 result 的数据
    * @param message
    * @param ctx
+   * @deprecated use run or call instead
    * @returns
    */
   async queryRoute(message: { id?: string; path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
-    const res = await this.parse(message, { ...this.context, ...ctx });
+    const res = await this.call(message, { ...this.context, ...ctx });
+    return {
+      code: res.code,
+      data: res.body,
+      message: res.message,
+    };
+  }
+  /**
+   * Router Run获取数据
+   * @param message 
+   * @param ctx 
+   * @returns 
+   */
+  async run(message: { id?: string; path?: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
+    const res = await this.call(message, { ...this.context, ...ctx });
     return {
       code: res.code,
       data: res.body,
@@ -660,17 +673,7 @@ export class QueryRouter {
     return async (msg: { id?: string; path?: string; key?: string;[key: string]: any }, handleContext?: RouteContext) => {
       try {
         const context = { ...ctx, ...handleContext };
-        if (msg.id) {
-          const route = router.routes.find((r) => r.id === msg.id);
-          if (route) {
-            msg.path = route.path;
-            msg.key = route.key;
-          } else {
-            return { code: 404, message: 'Not found route' };
-          }
-        }
-        // @ts-ignore
-        const res = await router.parse(msg, context);
+        const res = await router.call(msg, context);
         if (wrapperFn) {
           res.data = res.body;
           return wrapperFn(res, context);
@@ -798,34 +801,19 @@ export class QueryRouterServer extends QueryRouter {
   }
 
   /**
-   * 等于queryRoute，但是调用了handle
+   * 调用了handle
    * @param param0
    * @returns
    */
-  async run({ path, key, payload }: { path: string; key?: string; payload?: any }) {
+  async run({ path, key, payload }: { path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) {
     const handle = this.handle;
-    const resultError = (error: string, code = 500) => {
-      const r = {
-        code: code,
-        message: error,
-      };
-      return r;
-    };
-    try {
-      const end = handle({ path, key, ...payload });
-      return end;
-    } catch (e) {
-      if (e.code && typeof e.code === 'number') {
-        return {
-          code: e.code,
-          message: e.message,
-        };
-      } else {
-        return resultError('Router Server error');
-      }
+    if (handle) {
+      const result = await this.call({ path, key, payload }, ctx);
+      return handle(result);
     }
+    return super.run({ path, key, payload }, ctx);
   }
 }
 
 
-export const Mini = QueryRouterServer
+export class Mini extends QueryRouterServer {}

package/src/router-simple.ts

@@ -122,17 +122,33 @@ type HttpChainOpts = {
   req?: Req;
   res?: ServerResponse;
   simpleRouter?: SimpleRouter;
+  server?: Server;
 };
+
+/**
+ * HttpChain 类, 用于链式调用,router.get内部使用
+ */
+
 export class HttpChain {
+  /**
+   * 请求对象, 每一次请求都是不一样的
+   */
   req: Req;
+  /**
+   * 响应对象, 每一次请求响应都是不一样的
+   */
   res: ServerResponse;
   simpleRouter: SimpleRouter;
   server: Server;
   hasSetHeader: boolean = false;
   isSseSet: boolean = false;
   constructor(opts?: HttpChainOpts) {
-    this.req = opts?.req;
-    this.res = opts?.res;
+    if (opts?.res) {
+      this.res = opts.res;
+    }
+    if (opts?.req) {
+      this.req = opts.req;
+    }
     this.simpleRouter = opts?.simpleRouter;
   }
   setReq(req: Req) {
@@ -200,7 +216,13 @@ export class HttpChain {
     this.server.listen(opts, callback);
     return this;
   }
-  parse() {
+  /**
+   * 外部 parse 方法
+   * @returns 
+   */
+  parse(opts?: { listenOptions?: ListenOptions, listenCallBack?: () => void }) {
+    const { listenOptions, listenCallBack } = opts || {};
+
     if (!this.server || !this.simpleRouter) {
       throw new Error('Server and SimpleRouter must be set before calling parse');
     }
@@ -216,6 +238,9 @@ export class HttpChain {
         }
       }
     };
+    if (listenOptions) {
+      this.server.listen(listenOptions, listenCallBack);
+    }
     this.server.on('request', listener);
     return () => {
       that.server.removeListener('request', listener);

package/src/test/listen-ip.ts

@@ -0,0 +1,18 @@
+// import { Server } from 'node:http';
+import { Server } from '../server/server.ts'
+
+const server = new Server({
+  path: '/',
+  handle: async (data, ctx) => {
+    console.log('ctx', ctx.req.url)
+    console.log('Received data:', data);
+
+    ctx.res.writeHead(200, { 'Content-Type': 'application/json' });
+    return JSON.stringify({ code: 200, message: 'Success', data });
+  }
+});
+
+server.listen(51015, '0.0.0.0', () => {
+  console.log('Server is listening on http://localhost:3000');
+});
+