@kevisual/router 0.0.26-alpha.5 → 0.0.27

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.26-alpha.5",
+  "version": "0.0.27",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -10,15 +10,12 @@
     "build": "npm run clean && rollup -c",
     "build:app": "npm run build && rsync dist/*browser* ../deploy/dist",
     "watch": "rollup -c -w",
-    "clean": "rm -rf dist",
-    "auto:bun": "bun test/auto/app.ts",
-    "auto:deno": "bun test/auto/app.ts"
+    "clean": "rm -rf dist"
   },
   "files": [
     "dist",
     "src",
-    "mod.ts",
-    "auto.ts"
+    "mod.ts"
   ],
   "keywords": [],
   "author": "abearxiong",
@@ -26,33 +23,34 @@
   "devDependencies": {
     "@kevisual/local-proxy": "^0.0.6",
     "@kevisual/query": "^0.0.29",
-    "@kevisual/use-config": "^1.0.19",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.6",
-    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.1.4",
-    "@types/bun": "^1.2.10",
-    "@types/node": "^24.2.1",
-    "@types/send": "^0.17.5",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.7.2",
+    "@types/send": "^1.2.0",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
     "cookie": "^1.0.2",
-    "deno": "^2.4.3",
-    "es-toolkit": "^1.39.8",
-    "nanoid": "^5.1.5",
-    "rollup": "^4.46.2",
-    "rollup-plugin-dts": "^6.2.1",
-    "typescript": "^5.9.2",
+    "lodash-es": "^4.17.21",
+    "nanoid": "^5.1.6",
+    "rollup": "^4.52.4",
+    "rollup-plugin-dts": "^6.2.3",
+    "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.0.17"
+    "zod": "^4.1.12"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
   "dependencies": {
-    "path-to-regexp": "^8.2.0",
+    "path-to-regexp": "^8.3.0",
     "selfsigned": "^3.0.1",
     "send": "^1.2.0"
   },
@@ -70,6 +68,11 @@
       "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",
@@ -80,16 +83,16 @@
       "require": "./dist/router-define.js",
       "types": "./dist/router-define.d.ts"
     },
+    "./simple-lib": {
+      "import": "./dist/router-simple-lib.js",
+      "require": "./dist/router-simple-lib.js",
+      "types": "./dist/router-simple-lib.d.ts"
+    },
     "./mod.ts": {
       "import": "./mod.ts",
       "require": "./mod.ts",
       "types": "./mod.d.ts"
     },
-    "./auto.ts": {
-      "import": "./auto.ts",
-      "require": "./auto.ts",
-      "types": "./auto.ts"
-    },
     "./src/*": {
       "import": "./src/*",
       "require": "./src/*"

package/src/app.ts

@@ -3,7 +3,7 @@ import { Server, ServerOpts, HandleCtx } from './server/server.ts';
 import { WsServer } from './server/ws-server.ts';
 import { CustomError } from './result/error.ts';
 import { handleServer } from './server/handle-server.ts';
-import { IncomingMessage, ServerResponse } from 'node:http';
+import { IncomingMessage, ServerResponse } from 'http';
 
 type RouterHandle = (msg: { path: string; [key: string]: any }) => { code: string; data?: any; message?: string; [key: string]: any };
 type AppOptions<T = {}> = {

package/src/connect.ts

@@ -0,0 +1,67 @@
+import { nanoid } from 'nanoid';
+import { RouteContext } from './route.ts';
+
+export class Connect {
+  path: string;
+  key?: string;
+  _fn?: (ctx?: RouteContext) => Promise<RouteContext>;
+  description?: string;
+  connects: { path: string; key?: string }[];
+  share = false;
+
+  constructor(path: string) {
+    this.path = path;
+    this.key = nanoid();
+  }
+  use(path: string) {
+    this.connects.push({ path });
+  }
+  useList(paths: string[]) {
+    paths.forEach((path) => {
+      this.connects.push({ path });
+    });
+  }
+  useConnect(connect: Connect) {
+    this.connects.push({ path: connect.path, key: connect.key });
+  }
+  useConnectList(connects: Connect[]) {
+    connects.forEach((connect) => {
+      this.connects.push({ path: connect.path, key: connect.key });
+    });
+  }
+  getPathList() {
+    return this.connects.map((c) => c.path).filter(Boolean);
+  }
+  set fn(fn: (ctx?: RouteContext) => Promise<RouteContext>) {
+    this._fn = fn;
+  }
+  get fn() {
+    return this._fn;
+  }
+}
+export class QueryConnect {
+  connects: Connect[];
+  constructor() {
+    this.connects = [];
+  }
+  add(connect: Connect) {
+    const has = this.connects.find((c) => c.path === connect.path && c.key === connect.key);
+    if (has) {
+      // remove the old connect
+      console.log('[replace connect]:', connect.path, connect.key);
+      this.connects = this.connects.filter((c) => c.path !== connect.path && c.key !== connect.key);
+    }
+    this.connects.push(connect);
+  }
+  remove(connect: Connect) {
+    this.connects = this.connects.filter((c) => c.path !== connect.path && c.key !== connect.key);
+  }
+  getList() {
+    return this.connects.map((c) => {
+      return {
+        path: c.path,
+        key: c.key,
+      };
+    });
+  }
+}

package/src/index.ts

@@ -1,4 +1,5 @@
 export { Route, QueryRouter, QueryRouterServer } from './route.ts';
+export { Connect, QueryConnect } from './connect.ts';
 
 export type { RouteContext, RouteOpts, RouteMiddleware } from './route.ts';
 
@@ -10,9 +11,8 @@ export { Server, handleServer } from './server/index.ts';
  */
 export { CustomError } from './result/error.ts';
 
-export { createSchema } from './validator/index.ts';
-export type { Rule } from './validator/rule.ts';
-export type { Schema } from 'zod';
+export { Rule, Schema, createSchema } from './validator/index.ts';
+
 export { App } from './app.ts';
 
 export * from './router-define.ts';

package/src/io.ts

@@ -0,0 +1,6 @@
+// TODO: Implement IOApp
+export class IOApp {
+  constructor() {
+    console.log('IoApp');
+  }
+}

package/src/route.ts

@@ -2,6 +2,7 @@ import { nanoid } from 'nanoid';
 import { CustomError } from './result/error.ts';
 import { Schema, Rule, createSchema } from './validator/index.ts';
 import { pick } from './utils/pick.ts';
+import { get } from 'lodash-es';
 
 export type RouterContextT = { code?: number; [key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
@@ -86,7 +87,7 @@ export type RouteOpts = {
    * }
    */
   validator?: { [key: string]: Rule };
-  schema?: { [key: string]: any };
+  schema?: { [key: string]: Schema<any> };
   isVerify?: boolean;
   verify?: (ctx?: RouteContext, dev?: boolean) => boolean;
   verifyKey?: (key: string, ctx?: RouteContext, dev?: boolean) => boolean;
@@ -121,7 +122,7 @@ export class Route<U = { [key: string]: any }> {
   middleware?: RouteMiddleware[]; // middleware
   type? = 'route';
   private _validator?: { [key: string]: Rule };
-  schema?: { [key: string]: any };
+  schema?: { [key: string]: Schema<any> };
   data?: any;
   /**
    * 是否需要验证
@@ -205,8 +206,12 @@ export class Route<U = { [key: string]: any }> {
         if (schema[key]) {
           const result = schema[key].safeParse(value);
           if (!result.success) {
-            // TODO:
-            const message = 'safe error, TODO:';
+            const path = result.error.errors[0]?.path?.join?.('.properties.');
+            let message = 'Invalid params';
+            if (path) {
+              const keyS = `${key}.properties.${path}.message`;
+              message = get(validator, keyS, 'Invalid params') as any;
+            }
             throw new CustomError(500, message);
           }
         }
@@ -603,7 +608,7 @@ export class QueryRouter {
    * @description 这里的上下文是为了在handle函数中使用
    * @param ctx
    */
-  setContext(ctx: RouteContext) {
+   setContext(ctx: RouteContext) {
     this.context = ctx;
   }
   getList(): RouteInfo[] {

package/src/server/ws-server.ts

@@ -43,10 +43,11 @@ export class WsServerBase {
     this.listening = true;
 
     this.wss.on('connection', (ws) => {
-      ws.on('message', async (message: string) => {
+      ws.on('message', async (message: string | Buffer) => {
         const data = parseIfJson(message);
         if (typeof data === 'string') {
-          ws.emit('string', data);
+          const cleanMessage = data.trim().replace(/^["']|["']$/g, '');
+          ws.emit('string', cleanMessage);
           return;
         }
         const { type, data: typeData, ...rest } = data;
@@ -83,7 +84,7 @@ export class WsServerBase {
         if (message === 'close') {
           ws.close();
         }
-        if (message === 'ping') {
+        if (message == 'ping') {
           ws.send('pong');
         }
       });

package/src/sign.ts

@@ -30,7 +30,7 @@ export const createCert = (attrs: Attributes[] = [], altNames: AltNames[] = [])
   );
 
   const options = {
-    days: 365 * 99, // 证书有效期（天）
+    days: 365, // 证书有效期（天）
     extensions: [
       {
         name: 'subjectAltName',

package/src/test/ws.ts

@@ -0,0 +1,25 @@
+import { App } from "../app.ts";
+
+const app = new App({
+  io: true
+});
+
+app
+  .route('demo', '03')
+  .define(async (ctx) => {
+    ctx.body = '03';
+    return ctx;
+  })
+  .addTo(app);
+app
+  .route('test', 'test')
+  .define(async (ctx) => {
+    ctx.body = 'test';
+    return ctx;
+  })
+  .addTo(app);
+console.log(`http://localhost:4002/api/router?path=demo&key=03`);
+
+app.listen(4002, () => {
+  console.log("Server started on http://localhost:4002");
+});

package/src/utils/parse.ts

@@ -1,7 +1,8 @@
-export const parseIfJson = (input: string): { [key: string]: any } | string => {
+export const parseIfJson = (input: string|Buffer): { [key: string]: any } | string => {
+  const str = typeof input === 'string' ? input : input.toString();
   try {
     // 尝试解析 JSON
-    const parsed = JSON.parse(input);
+    const parsed = JSON.parse(str);
     // 检查解析结果是否为对象（数组或普通对象）
     if (typeof parsed === 'object' && parsed !== null) {
       return parsed;
@@ -9,5 +10,5 @@ export const parseIfJson = (input: string): { [key: string]: any } | string => {
   } catch (e) {
     // 如果解析失败，直接返回原始字符串
   }
-  return input;
+  return str;
 };

package/src/validator/index.ts

@@ -1,6 +1,2 @@
-import { z } from 'zod';
+export type { Rule, Schema } from './rule.ts';
 export { schemaFormRule, createSchema, createSchemaList } from './rule.ts';
-
-export type { Rule } from './rule.ts';
-
-export type Schema = z.ZodType<any, any, any>;

package/src/validator/rule.ts

@@ -1,4 +1,5 @@
-import { z, ZodError } from 'zod';
+import { z, ZodError, Schema } from 'zod';
+export { Schema };
 type BaseRule = {
   value?: any;
   required?: boolean;
@@ -63,7 +64,7 @@ export const schemaFormRule = (rule: Rule): z.ZodType<any, any, any> => {
       throw new Error(`Unknown rule type: ${(rule as any)?.type}`);
   }
 };
-export const createSchema = (rule: Rule): z.ZodType<any, any, any> => {
+export const createSchema = (rule: Rule): Schema => {
   try {
     rule.required = rule.required ?? false;
     if (!rule.required) {

package/auto.ts

@@ -1,20 +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 { Schema } from 'zod';
-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/src/auto/call-sock.ts

@@ -1,164 +0,0 @@
-import { createConnection } from 'node:net';
-
-type QueryData = {
-  path?: string;
-  key?: string;
-  payload?: any;
-  [key: string]: any;
-};
-
-type CallSockOptions = {
-  socketPath?: string;
-  timeout?: number;
-  method?: 'GET' | 'POST';
-};
-
-export const callSock = async (data: QueryData, options: CallSockOptions = {}): Promise<any> => {
-  const { socketPath = './app.sock', timeout = 10000, method = 'POST' } = options;
-
-  return new Promise((resolve, reject) => {
-    const client = createConnection(socketPath);
-    let responseData = '';
-    let timer: NodeJS.Timeout;
-
-    // 设置超时
-    if (timeout > 0) {
-      timer = setTimeout(() => {
-        client.destroy();
-        reject(new Error(`Socket call timeout after ${timeout}ms`));
-      }, timeout);
-    }
-
-    client.on('connect', () => {
-      try {
-        let request: string;
-
-        if (method === 'GET') {
-          // GET 请求：参数放在 URL 中
-          const searchParams = new URLSearchParams();
-          Object.entries(data).forEach(([key, value]) => {
-            if (key === 'payload' && typeof value === 'object') {
-              searchParams.append(key, JSON.stringify(value));
-            } else {
-              searchParams.append(key, String(value));
-            }
-          });
-
-          const queryString = searchParams.toString();
-          const url = queryString ? `/?${queryString}` : '/';
-
-          request = [`GET ${url} HTTP/1.1`, 'Host: localhost', 'Connection: close', '', ''].join('\r\n');
-        } else {
-          // POST 请求：数据放在 body 中
-          const body = JSON.stringify(data);
-          const contentLength = Buffer.byteLength(body, 'utf8');
-
-          request = [
-            'POST / HTTP/1.1',
-            'Host: localhost',
-            'Content-Type: application/json',
-            `Content-Length: ${contentLength}`,
-            'Connection: close',
-            '',
-            body,
-          ].join('\r\n');
-        }
-
-        client.write(request);
-      } catch (error) {
-        if (timer) clearTimeout(timer);
-        client.destroy();
-        reject(error);
-      }
-    });
-
-    client.on('data', (chunk) => {
-      responseData += chunk.toString();
-      
-      // 检查是否收到完整的HTTP响应
-      if (responseData.includes('\r\n\r\n')) {
-        const [headerSection] = responseData.split('\r\n\r\n');
-        const contentLengthMatch = headerSection.match(/content-length:\s*(\d+)/i);
-        
-        if (contentLengthMatch) {
-          const expectedLength = parseInt(contentLengthMatch[1]);
-          const bodyStart = responseData.indexOf('\r\n\r\n') + 4;
-          const currentBodyLength = Buffer.byteLength(responseData.slice(bodyStart), 'utf8');
-          
-          // 如果收到了完整的响应，主动关闭连接
-          if (currentBodyLength >= expectedLength) {
-            client.end();
-          }
-        } else if (responseData.includes('\r\n0\r\n\r\n')) {
-          // 检查 chunked 编码结束标记
-          client.end();
-        }
-      }
-    });
-
-    client.on('end', () => {
-      if (timer) clearTimeout(timer);
-
-      try {
-        // 解析 HTTP 响应
-        const response = parseHttpResponse(responseData);
-
-        if (response.statusCode >= 400) {
-          reject(new Error(`HTTP ${response.statusCode}: ${response.body}`));
-          return;
-        }
-
-        // 尝试解析 JSON 响应
-        try {
-          const result = JSON.parse(response.body);
-          resolve(result);
-        } catch {
-          // 如果不是 JSON，直接返回文本
-          resolve(response.body);
-        }
-      } catch (error) {
-        reject(error);
-      }
-    });
-
-    client.on('error', (error) => {
-      if (timer) clearTimeout(timer);
-      reject(error);
-    });
-
-    client.on('timeout', () => {
-      if (timer) clearTimeout(timer);
-      client.destroy();
-      reject(new Error('Socket connection timeout'));
-    });
-  });
-};
-
-// 解析 HTTP 响应的辅助函数
-function parseHttpResponse(responseData: string) {
-  const [headerSection, ...bodyParts] = responseData.split('\r\n\r\n');
-  const body = bodyParts.join('\r\n\r\n');
-
-  const lines = headerSection.split('\r\n');
-  const statusLine = lines[0];
-  const statusMatch = statusLine.match(/HTTP\/\d\.\d (\d+)/);
-  const statusCode = statusMatch ? parseInt(statusMatch[1]) : 200;
-
-  const headers: Record<string, string> = {};
-  for (let i = 1; i < lines.length; i++) {
-    const [key, ...valueParts] = lines[i].split(':');
-    if (key && valueParts.length > 0) {
-      headers[key.trim().toLowerCase()] = valueParts.join(':').trim();
-    }
-  }
-
-  return {
-    statusCode,
-    headers,
-    body: body || '',
-  };
-}
-
-export const autoCall = (data: QueryData, options?: Omit<CallSockOptions, 'method'>) => {
-  return callSock(data, { ...options, method: 'POST' });
-};

package/src/auto/listen/cleanup.ts

@@ -1,102 +0,0 @@
-import { getRuntime } from '../runtime.ts';
-
-let isClean = false;
-export const deleteFileDetached = async (path: string, pidPath: string = './app.pid') => {
-  const runtime = getRuntime();
-  if (runtime.isDeno) {
-    // Deno 实现 - 启动后不等待结果
-    const process = new Deno.Command('sh', {
-      args: ['-c', `rm -f "${path}" & rm -f "${pidPath}"`],
-      stdout: 'null',
-      stderr: 'null',
-    });
-    process.spawn(); // 不等待结果
-    console.log(`[DEBUG] Fire-and-forget delete initiated for ${path}`);
-    return;
-  }
-  const { spawn } = await import('node:child_process');
-  const child = spawn('sh', ['-c', `rm -f "${path}" & rm -f "${pidPath}"`], {
-    detached: true,
-    stdio: 'ignore',
-  });
-  child.unref(); // 完全分离
-  console.log(`[DEBUG] Fire-and-forget delete initiated for ${path}`);
-};
-
-type CleanupOptions = {
-  path: string;
-  close?: () => Promise<void>;
-  pidPath?: string;
-};
-export const cleanup = async ({ path, close = async () => {}, pidPath = './app.pid' }: CleanupOptions) => {
-  const runtime = getRuntime();
-
-  // 检查文件是否存在并删除
-  const cleanupFile = async () => {
-    if (isClean) return;
-    isClean = true;
-    if (runtime.isDeno) {
-      await deleteFileDetached(path, pidPath);
-    }
-    await close();
-    if (!runtime.isDeno) {
-      await deleteFileDetached(path, pidPath);
-    }
-  };
-
-  // 根据运行时环境注册不同的退出监听器
-  if (runtime.isDeno) {
-    // Deno 环境
-    const handleSignal = () => {
-      cleanupFile();
-      Deno.exit(0);
-    };
-
-    try {
-      Deno.addSignalListener('SIGINT', handleSignal);
-      Deno.addSignalListener('SIGTERM', handleSignal);
-    } catch (error) {
-      console.warn('[DEBUG] Failed to add signal listeners:', error);
-    }
-
-    // 对于 beforeunload 和 unload，使用异步清理
-    const handleUnload = () => {
-      cleanupFile();
-    };
-
-    globalThis.addEventListener('beforeunload', handleUnload);
-    globalThis.addEventListener('unload', handleUnload);
-  } else if (runtime.isNode || runtime.isBun) {
-    // Node.js 和 Bun 环境
-    import('process').then(({ default: process }) => {
-      // 信号处理使用同步清理，然后退出
-      const signalHandler = async (signal: string) => {
-        await cleanupFile();
-        process.exit(0);
-      };
-
-      process.on('SIGINT', () => signalHandler('SIGINT'));
-      process.on('SIGTERM', () => signalHandler('SIGTERM'));
-      process.on('SIGUSR1', () => signalHandler('SIGUSR1'));
-      process.on('SIGUSR2', () => signalHandler('SIGUSR2'));
-
-      process.on('exit', async () => {
-        await cleanupFile();
-      });
-
-      process.on('uncaughtException', async (error) => {
-        console.error('Uncaught Exception:', error);
-        await cleanupFile();
-        process.exit(1);
-      });
-
-      process.on('unhandledRejection', async (reason, promise) => {
-        console.error('Unhandled Rejection at:', promise, 'reason:', reason);
-        await cleanupFile();
-      });
-    });
-  }
-
-  // 返回手动清理函数，以便需要时主动调用
-  return cleanupFile;
-};