@kevisual/router 0.0.22 → 0.0.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -21,19 +21,21 @@
   "author": "abearxiong",
   "license": "MIT",
   "devDependencies": {
-    "@kevisual/query": "^0.0.25",
+    "@kevisual/local-proxy": "^0.0.3",
+    "@kevisual/query": "^0.0.29",
     "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "@rollup/plugin-typescript": "^12.1.3",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.29",
+    "@types/node": "^24.0.3",
+    "@types/send": "^0.17.5",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
     "cookie": "^1.0.2",
     "lodash-es": "^4.17.21",
     "nanoid": "^5.1.5",
-    "rollup": "^4.41.1",
+    "rollup": "^4.44.0",
     "rollup-plugin-dts": "^6.2.1",
     "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
@@ -41,7 +43,7 @@
     "typescript": "^5.8.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
-    "zod": "^3.25.51"
+    "zod": "^3.25.67"
   },
   "repository": {
     "type": "git",
@@ -49,7 +51,8 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.2.0",
-    "selfsigned": "^2.4.1"
+    "selfsigned": "^2.4.1",
+    "send": "^1.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/app-browser.ts

@@ -0,0 +1,5 @@
+import { QueryRouterServer } from './browser.ts';
+
+export const App = QueryRouterServer;
+
+export * from './browser.ts';

package/src/app.ts

@@ -105,6 +105,12 @@ export class App<T = {}, U = AppReqRes> {
   static handleRequest(req: IncomingMessage, res: ServerResponse) {
     return handleServer(req, res);
   }
+  onServerRequest(fn: (req: IncomingMessage, res: ServerResponse) => void) {
+    if (!this.server) {
+      throw new Error('Server is not initialized');
+    }
+    this.server.on(fn);
+  }
 }
 
 export * from './browser.ts';

package/src/browser.ts

@@ -1,6 +1,8 @@
 export { Route, QueryRouter, QueryRouterServer } from './route.ts';
 
-export { Rule, Schema, createSchema } from './validator/index.ts';
+export type { Rule, Schema } from './validator/index.ts';
+
+export { createSchema } from './validator/index.ts';
 
 export type { RouteContext, RouteOpts } from './route.ts';
 

package/src/route.ts

@@ -54,7 +54,7 @@ export type RouteContext<T = { code?: number }, S = any> = {
   queryRoute?: (message: { path: string; key?: string; payload?: any }, ctx?: RouteContext & { [key: string]: any }) => Promise<any>;
   index?: number;
   throw?: (code?: number | string, message?: string, tips?: string) => void;
-  /** 是否需要序列化 */
+  /** 是否需要序列化, 使用JSON.stringify和JSON.parse */
   needSerialize?: boolean;
 } & T;
 export type SimpleObject = Record<string, any>;
@@ -603,7 +603,12 @@ export class QueryRouter {
       message: res.message,
     };
   }
-  async setContext(ctx: RouteContext) {
+  /**
+   * 设置上下文
+   * @description 这里的上下文是为了在handle函数中使用
+   * @param ctx
+   */
+   setContext(ctx: RouteContext) {
     this.context = ctx;
   }
   getList(): RouteInfo[] {
@@ -647,7 +652,7 @@ export class QueryRouter {
   throw(...args: any[]) {
     throw new CustomError(...args);
   }
-  hasRoute(path: string, key?: string) {
+  hasRoute(path: string, key: string = '') {
     return this.routes.find((r) => r.path === path && r.key === key);
   }
 }

package/src/sign.ts

@@ -1,28 +1,33 @@
 import { generate } from 'selfsigned';
 
-type Attributes = {
+export type Attributes = {
   name: string;
   value: string;
 };
-type AltNames = {
+export type AltNames = {
   type: number;
   value?: string;
   ip?: string;
 };
 export const createCert = (attrs: Attributes[] = [], altNames: AltNames[] = []) => {
   let attributes = [
-    { name: 'commonName', value: '*' }, // 通配符域名
     { name: 'countryName', value: 'CN' }, // 国家代码
     { name: 'stateOrProvinceName', value: 'ZheJiang' }, // 州名
-    { name: 'localityName', value: 'Hangzhou' }, // 城市名
-    { name: 'organizationName', value: 'Envision' }, // 组织名
-    { name: 'organizationalUnitName', value: 'IT' }, // 组织单位
+    { name: 'localityName', value: 'HangZhou' }, // 城市名
+    { name: 'organizationName', value: 'kevisual' }, // 组织名
+    { name: 'organizationalUnitName', value: 'kevisual' }, // 组织单位
     ...attrs,
   ];
   // attribute 根据name去重复, 后面的覆盖前面的
-  attributes = attributes.filter((item, index, self) => {
-    return self.findIndex((t) => t.name === item.name) === index;
-  });
+  attributes = Object.values(
+    attributes.reduce(
+      (acc, attr) => ({
+        ...acc,
+        [attr.name]: attr,
+      }),
+      {} as Record<string, Attributes>,
+    ),
+  );
 
   const options = {
     days: 365, // 证书有效期（天）
@@ -32,6 +37,14 @@ export const createCert = (attrs: Attributes[] = [], altNames: AltNames[] = [])
         altNames: [
           { type: 2, value: '*' }, // DNS 名称
           { type: 2, value: 'localhost' }, // DNS
+          {
+            type: 2,
+            value: '[::1]',
+          },
+          {
+            type: 7,
+            ip: 'fe80::1',
+          },
           { type: 7, ip: '127.0.0.1' }, // IP 地址
           ...altNames,
         ],

package/src/test/static.ts

@@ -0,0 +1,22 @@
+import { proxyRoute, initProxy } from '@kevisual/local-proxy/proxy.ts';
+initProxy({
+  pagesDir: './demo',
+  watch: true,
+});
+import { App } from '../app.ts';
+
+const app = new App();
+app
+  .route({
+    path: 'a',
+  })
+  .define(async (ctx) => {
+    ctx.body = '1';
+  })
+  .addTo(app);
+
+app.listen(2233, () => {
+  console.log('Server is running on http://localhost:2233');
+});
+
+app.onServerRequest(proxyRoute);

package/src/utils/is-engine.ts

@@ -0,0 +1,15 @@
+export const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+export const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof document.createElement === 'function';
+// @ts-ignore
+export const isDeno = typeof Deno !== 'undefined' && typeof Deno.version === 'object' && typeof Deno.version.deno === 'string';
+
+export const getEngine = () => {
+  if (isNode) {
+    return 'node';
+  } else if (isBrowser) {
+    return 'browser';
+  } else if (isDeno) {
+    return 'deno';
+  }
+  return 'unknown';
+};

package/src/validator/index.ts

@@ -1 +1,2 @@
-export * from './rule.ts';
+export type { Rule, Schema } from './rule.ts';
+export { schemaFormRule, createSchema, createSchemaList } from './rule.ts';