@kevisual/router 0.0.40 → 0.0.42

package/dist/router-browser.js

@@ -707,8 +707,7 @@ class QueryRouterServer extends QueryRouter {
     async run(msg, ctx) {
         const handle = this.handle;
         if (handle) {
-            const result = await this.call(msg, ctx);
-            return handle(result);
+            return handle(msg, ctx);
         }
         return super.run(msg, ctx);
     }
@@ -3601,7 +3600,7 @@ function initializeContext(params) {
         external: params?.external ?? undefined,
     };
 }
-function process(schema, ctx, _params = { path: [], schemaPath: [] }) {
+function process$1(schema, ctx, _params = { path: [], schemaPath: [] }) {
     var _a;
     const def = schema._zod.def;
     // check for schema in seens
@@ -3633,7 +3632,7 @@ function process(schema, ctx, _params = { path: [], schemaPath: [] }) {
         if (parent) {
             // schema was cloned from another schema
             result.ref = parent;
-            process(parent, ctx, params);
+            process$1(parent, ctx, params);
             ctx.seen.get(parent).isParent = true;
         }
         else if (schema._zod.processJSONSchema) {
@@ -3938,14 +3937,14 @@ function isTransforming(_schema, _ctx) {
  */
 const createToJSONSchemaMethod = (schema, processors = {}) => (params) => {
     const ctx = initializeContext({ ...params, processors });
-    process(schema, ctx);
+    process$1(schema, ctx);
     extractDefs(ctx, schema);
     return finalize(ctx, schema);
 };
 const createStandardJSONSchemaMethod = (schema, io) => (params) => {
     const { libraryOptions, target } = params ?? {};
     const ctx = initializeContext({ ...(libraryOptions ?? {}), target, io, processors: {} });
-    process(schema, ctx);
+    process$1(schema, ctx);
     extractDefs(ctx, schema);
     return finalize(ctx, schema);
 };
@@ -4079,7 +4078,7 @@ const arrayProcessor = (schema, ctx, _json, params) => {
     if (typeof maximum === "number")
         json.maxItems = maximum;
     json.type = "array";
-    json.items = process(def.element, ctx, { ...params, path: [...params.path, "items"] });
+    json.items = process$1(def.element, ctx, { ...params, path: [...params.path, "items"] });
 };
 const objectProcessor = (schema, ctx, _json, params) => {
     const json = _json;
@@ -4088,7 +4087,7 @@ const objectProcessor = (schema, ctx, _json, params) => {
     json.properties = {};
     const shape = def.shape;
     for (const key in shape) {
-        json.properties[key] = process(shape[key], ctx, {
+        json.properties[key] = process$1(shape[key], ctx, {
             ...params,
             path: [...params.path, "properties", key],
         });
@@ -4118,7 +4117,7 @@ const objectProcessor = (schema, ctx, _json, params) => {
             json.additionalProperties = false;
     }
     else if (def.catchall) {
-        json.additionalProperties = process(def.catchall, ctx, {
+        json.additionalProperties = process$1(def.catchall, ctx, {
             ...params,
             path: [...params.path, "additionalProperties"],
         });
@@ -4129,7 +4128,7 @@ const unionProcessor = (schema, ctx, json, params) => {
     // Exclusive unions (inclusive === false) use oneOf (exactly one match) instead of anyOf (one or more matches)
     // This includes both z.xor() and discriminated unions
     const isExclusive = def.inclusive === false;
-    const options = def.options.map((x, i) => process(x, ctx, {
+    const options = def.options.map((x, i) => process$1(x, ctx, {
         ...params,
         path: [...params.path, isExclusive ? "oneOf" : "anyOf", i],
     }));
@@ -4142,11 +4141,11 @@ const unionProcessor = (schema, ctx, json, params) => {
 };
 const intersectionProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    const a = process(def.left, ctx, {
+    const a = process$1(def.left, ctx, {
         ...params,
         path: [...params.path, "allOf", 0],
     });
-    const b = process(def.right, ctx, {
+    const b = process$1(def.right, ctx, {
         ...params,
         path: [...params.path, "allOf", 1],
     });
@@ -4159,7 +4158,7 @@ const intersectionProcessor = (schema, ctx, json, params) => {
 };
 const nullableProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    const inner = process(def.innerType, ctx, params);
+    const inner = process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     if (ctx.target === "openapi-3.0") {
         seen.ref = def.innerType;
@@ -4171,20 +4170,20 @@ const nullableProcessor = (schema, ctx, json, params) => {
 };
 const nonoptionalProcessor = (schema, ctx, _json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
 };
 const defaultProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
     json.default = JSON.parse(JSON.stringify(def.defaultValue));
 };
 const prefaultProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
     if (ctx.io === "input")
@@ -4192,7 +4191,7 @@ const prefaultProcessor = (schema, ctx, json, params) => {
 };
 const catchProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
     let catchValue;
@@ -4207,20 +4206,20 @@ const catchProcessor = (schema, ctx, json, params) => {
 const pipeProcessor = (schema, ctx, _json, params) => {
     const def = schema._zod.def;
     const innerType = ctx.io === "input" ? (def.in._zod.def.type === "transform" ? def.out : def.in) : def.out;
-    process(innerType, ctx, params);
+    process$1(innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = innerType;
 };
 const readonlyProcessor = (schema, ctx, json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
     json.readOnly = true;
 };
 const optionalProcessor = (schema, ctx, _json, params) => {
     const def = schema._zod.def;
-    process(def.innerType, ctx, params);
+    process$1(def.innerType, ctx, params);
     const seen = ctx.seen.get(schema);
     seen.ref = def.innerType;
 };
@@ -4962,7 +4961,54 @@ const createSchema = (rule) => {
     }
 };
 
+typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+// @ts-ignore
+typeof Deno !== 'undefined' && typeof Deno.version === 'object' && typeof Deno.version.deno === 'string';
+// @ts-ignore
+const isBun = typeof Bun !== 'undefined' && typeof Bun.version === 'string';
+
 const parseBody = async (req) => {
+    const resolveBody = (body) => {
+        // 获取 Content-Type 头信息
+        const contentType = req.headers['content-type'] || '';
+        const resolve = (data) => {
+            return data;
+        };
+        // 处理 application/json
+        if (contentType.includes('application/json')) {
+            return resolve(JSON.parse(body));
+        }
+        // 处理 application/x-www-form-urlencoded
+        if (contentType.includes('application/x-www-form-urlencoded')) {
+            const formData = new URLSearchParams(body);
+            const result = {};
+            formData.forEach((value, key) => {
+                // 尝试将值解析为 JSON，如果失败则保留原始字符串
+                try {
+                    result[key] = JSON.parse(value);
+                }
+                catch {
+                    result[key] = value;
+                }
+            });
+            return resolve(result);
+        }
+        // 默认尝试 JSON 解析
+        try {
+            return resolve(JSON.parse(body));
+        }
+        catch {
+            return resolve({});
+        }
+    };
+    if (isBun) {
+        // @ts-ignore
+        const body = req.body;
+        if (body) {
+            return resolveBody(body);
+        }
+        return {};
+    }
     return new Promise((resolve, reject) => {
         const arr = [];
         req.on('data', (chunk) => {
@@ -4971,36 +5017,7 @@ const parseBody = async (req) => {
         req.on('end', () => {
             try {
                 const body = Buffer.concat(arr).toString();
-                // 获取 Content-Type 头信息
-                const contentType = req.headers['content-type'] || '';
-                // 处理 application/json
-                if (contentType.includes('application/json')) {
-                    resolve(JSON.parse(body));
-                    return;
-                }
-                // 处理 application/x-www-form-urlencoded
-                if (contentType.includes('application/x-www-form-urlencoded')) {
-                    const formData = new URLSearchParams(body);
-                    const result = {};
-                    formData.forEach((value, key) => {
-                        // 尝试将值解析为 JSON，如果失败则保留原始字符串
-                        try {
-                            result[key] = JSON.parse(value);
-                        }
-                        catch {
-                            result[key] = value;
-                        }
-                    });
-                    resolve(result);
-                    return;
-                }
-                // 默认尝试 JSON 解析
-                try {
-                    resolve(JSON.parse(body));
-                }
-                catch {
-                    resolve({});
-                }
+                resolve(resolveBody(body));
             }
             catch (e) {
                 resolve({});

package/dist/router-sign.js

@@ -3272,7 +3272,9 @@ class LocalBitStringValueBlock extends HexBlock(LocalConstructedValueBlock) {
             return new ArrayBuffer(this.valueHexView.byteLength + 1);
         }
         if (!this.valueHexView.byteLength) {
-            return EMPTY_BUFFER;
+            const empty = new Uint8Array(1);
+            empty[0] = 0;
+            return empty.buffer;
         }
         const retView = new Uint8Array(this.valueHexView.length + 1);
         retView[0] = this.unusedBits;

package/dist/router-simple.js

@@ -420,7 +420,54 @@ function requireDist () {
 
 var distExports = requireDist();
 
+typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+// @ts-ignore
+typeof Deno !== 'undefined' && typeof Deno.version === 'object' && typeof Deno.version.deno === 'string';
+// @ts-ignore
+const isBun = typeof Bun !== 'undefined' && typeof Bun.version === 'string';
+
 const parseBody = async (req) => {
+    const resolveBody = (body) => {
+        // 获取 Content-Type 头信息
+        const contentType = req.headers['content-type'] || '';
+        const resolve = (data) => {
+            return data;
+        };
+        // 处理 application/json
+        if (contentType.includes('application/json')) {
+            return resolve(JSON.parse(body));
+        }
+        // 处理 application/x-www-form-urlencoded
+        if (contentType.includes('application/x-www-form-urlencoded')) {
+            const formData = new URLSearchParams(body);
+            const result = {};
+            formData.forEach((value, key) => {
+                // 尝试将值解析为 JSON，如果失败则保留原始字符串
+                try {
+                    result[key] = JSON.parse(value);
+                }
+                catch {
+                    result[key] = value;
+                }
+            });
+            return resolve(result);
+        }
+        // 默认尝试 JSON 解析
+        try {
+            return resolve(JSON.parse(body));
+        }
+        catch {
+            return resolve({});
+        }
+    };
+    if (isBun) {
+        // @ts-ignore
+        const body = req.body;
+        if (body) {
+            return resolveBody(body);
+        }
+        return {};
+    }
     return new Promise((resolve, reject) => {
         const arr = [];
         req.on('data', (chunk) => {
@@ -429,36 +476,7 @@ const parseBody = async (req) => {
         req.on('end', () => {
             try {
                 const body = Buffer.concat(arr).toString();
-                // 获取 Content-Type 头信息
-                const contentType = req.headers['content-type'] || '';
-                // 处理 application/json
-                if (contentType.includes('application/json')) {
-                    resolve(JSON.parse(body));
-                    return;
-                }
-                // 处理 application/x-www-form-urlencoded
-                if (contentType.includes('application/x-www-form-urlencoded')) {
-                    const formData = new URLSearchParams(body);
-                    const result = {};
-                    formData.forEach((value, key) => {
-                        // 尝试将值解析为 JSON，如果失败则保留原始字符串
-                        try {
-                            result[key] = JSON.parse(value);
-                        }
-                        catch {
-                            result[key] = value;
-                        }
-                    });
-                    resolve(result);
-                    return;
-                }
-                // 默认尝试 JSON 解析
-                try {
-                    resolve(JSON.parse(body));
-                }
-                catch {
-                    resolve({});
-                }
+                resolve(resolveBody(body));
             }
             catch (e) {
                 resolve({});
@@ -539,6 +557,8 @@ class SimpleRouter {
     }
     isSse(req) {
         const { headers } = req;
+        if (!headers)
+            return false;
         if (headers['accept'] && headers['accept'].includes('text/event-stream')) {
             return true;
         }

package/dist/router.d.ts

@@ -1,9 +1,10 @@
-import http, { IncomingMessage, ServerResponse } from 'node:http';
+import http$1, { IncomingMessage, ServerResponse } from 'node:http';
 import https from 'node:https';
 import http2 from 'node:http2';
-import { z } from 'zod';
-import { WebSocketServer, WebSocket } from 'ws';
+import * as http from 'http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
+import { WebSocketServer, WebSocket } from 'ws';
+import { z } from 'zod';
 import { RouteOpts as RouteOpts$1, QueryRouterServer as QueryRouterServer$1, RouteMiddleware as RouteMiddleware$1, Run as Run$1 } from '@kevisual/router';
 import { Query, DataOpts, Result } from '@kevisual/query/query';
 
@@ -382,6 +383,68 @@ declare class QueryConnect {
     }[];
 }
 
+type Listener$1 = {
+    id?: string;
+    io?: boolean;
+    path?: string;
+    fun: (...args: any[]) => Promise<void> | void;
+};
+type ListenerFun = (...args: any[]) => Promise<void> | void;
+type OnListener = Listener$1 | Listener$1[] | ListenerFun | ListenerFun[];
+type Cors$2 = {
+    /**
+     * @default '*''
+     */
+    origin?: string | undefined;
+};
+type ServerOpts<T = {}> = {
+    /**path default `/api/router` */
+    path?: string;
+    /**handle Fn */
+    handle?: (msg?: {
+        path: string;
+        key?: string;
+        [key: string]: any;
+    }, ctx?: {
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    }) => any;
+    cors?: Cors$2;
+    io?: boolean;
+} & T;
+interface ServerType {
+    path?: string;
+    server?: any;
+    handle: ServerOpts['handle'];
+    setHandle(handle?: any): void;
+    listeners: Listener$1[];
+    listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
+    listen(port: number, hostname?: string, listeningListener?: () => void): void;
+    listen(port: number, backlog?: number, listeningListener?: () => void): void;
+    listen(port: number, listeningListener?: () => void): void;
+    listen(path: string, backlog?: number, listeningListener?: () => void): void;
+    listen(path: string, listeningListener?: () => void): void;
+    listen(handle: any, backlog?: number, listeningListener?: () => void): void;
+    listen(handle: any, listeningListener?: () => void): void;
+    /**
+     * 兜底监听，当除开 `/api/router` 之外的请求，框架只监听一个api，所以有其他的请求都执行其他的监听
+     * @description 主要是为了兼容其他的监听
+     * @param listener
+     */
+    on(listener: OnListener): void;
+    onWebSocket({ ws, message, pathname, token, id }: {
+        ws: WS;
+        message: string | Buffer;
+        pathname: string;
+        token?: string;
+        id?: string;
+    }): void;
+}
+type WS = {
+    send: (data: any) => void;
+    close: () => void;
+};
+
 interface StringifyOptions {
     /**
      * Specifies a function that will be used to encode a [cookie-value](https://datatracker.ietf.org/doc/html/rfc6265#section-4.1.1).
@@ -477,7 +540,6 @@ interface SetCookie {
  */
 type SerializeOptions = StringifyOptions & Omit<SetCookie, "name" | "value">;
 
-type Listener = (...args: any[]) => void;
 type CookieFn = (name: string, value: string, options?: SerializeOptions, end?: boolean) => void;
 type HandleCtx = {
     req: IncomingMessage & {
@@ -490,38 +552,19 @@ type HandleCtx = {
         cookie: CookieFn;
     };
 };
-type Cors = {
+type Cors$1 = {
     /**
      * @default '*''
      */
     origin?: string | undefined;
 };
-type ServerOpts = {
-    /**path default `/api/router` */
-    path?: string;
-    /**handle Fn */
-    handle?: (msg?: {
-        path: string;
-        key?: string;
-        [key: string]: any;
-    }, ctx?: {
-        req: http.IncomingMessage;
-        res: http.ServerResponse;
-    }) => any;
-    cors?: Cors;
-    httpType?: 'http' | 'https' | 'http2';
-    httpsKey?: string;
-    httpsCert?: string;
-};
-declare class Server {
+declare class ServerBase implements ServerType {
     path: string;
-    private _server;
+    _server: any;
     handle: ServerOpts['handle'];
-    private _callback;
-    private cors;
-    private hasOn;
-    private httpType;
-    private options;
+    _callback: any;
+    cors: Cors$1;
+    listeners: Listener$1[];
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -531,23 +574,80 @@ declare class Server {
     listen(path: string, listeningListener?: () => void): void;
     listen(handle: any, backlog?: number, listeningListener?: () => void): void;
     listen(handle: any, listeningListener?: () => void): void;
-    createServer(): http.Server<typeof IncomingMessage, typeof ServerResponse> | http2.Http2SecureServer<typeof IncomingMessage, typeof ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
+    /**
+     * child class can custom listen method
+     * @param args
+     */
+    customListen(...args: any[]): void;
+    get handleServer(): any;
+    set handleServer(fn: any);
+    get callback(): any;
+    get server(): any;
     setHandle(handle?: any): void;
     /**
      * get callback
      * @returns
      */
     createCallback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-    get handleServer(): any;
-    set handleServer(fn: any);
+    on(listener: OnListener): void;
+    onWebSocket({ ws, message, pathname, token, id }: {
+        ws: any;
+        message: any;
+        pathname: any;
+        token: any;
+        id: any;
+    }): Promise<void>;
+}
+
+type WsServerBaseOpts = {
+    wss?: WebSocketServer | null;
+    path?: string;
+};
+type ListenerFn = (message: {
+    data: Record<string, any>;
+    ws: WebSocket;
+    end: (data: any) => any;
+}) => Promise<any>;
+type Listener<T = 'router' | 'chat' | 'ai'> = {
+    type: T;
+    path?: string;
+    listener: ListenerFn;
+};
+declare class WsServerBase {
+    wss: WebSocketServer | null;
+    listeners: Listener[];
+    listening: boolean;
+    server: ServerType;
+    constructor(opts: WsServerBaseOpts);
+    listen(): void;
+}
+declare class WsServer extends WsServerBase {
+    constructor(server: ServerType);
+    listen(): void;
+}
+
+type Cors = {
     /**
-     * 兜底监听，当除开 `/api/router` 之外的请求，框架只监听一个api，所以有其他的请求都执行其他的监听
-     * @description 主要是为了兼容其他的监听
-     * @param listener
+     * @default '*''
      */
-    on(listener: Listener | Listener[]): () => void;
-    get callback(): any;
-    get server(): http.Server<typeof IncomingMessage, typeof ServerResponse> | https.Server<typeof IncomingMessage, typeof ServerResponse> | http2.Http2SecureServer<typeof IncomingMessage, typeof ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
+    origin?: string | undefined;
+};
+type ServerNodeOpts = ServerOpts<{
+    httpType?: 'http' | 'https' | 'http2';
+    httpsKey?: string;
+    httpsCert?: string;
+}>;
+declare class ServerNode extends ServerBase implements ServerType {
+    _server: http$1.Server | https.Server | http2.Http2SecureServer;
+    _callback: any;
+    cors: Cors;
+    private httpType;
+    listeners: Listener$1[];
+    private options;
+    io: WsServer | undefined;
+    constructor(opts?: ServerNodeOpts);
+    customListen(...args: any[]): void;
+    createServer(): http$1.Server<typeof http$1.IncomingMessage, typeof http$1.ServerResponse> | http2.Http2SecureServer<typeof http$1.IncomingMessage, typeof http$1.ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
 }
 
 /**
@@ -631,36 +731,6 @@ declare const createSchema: (rule: Rule) => z.ZodType<any, any, any>;
 
 type Schema = z.ZodType<any, any, any>;
 
-type WsServerBaseOpts = {
-    wss?: WebSocketServer;
-    path?: string;
-};
-type ListenerFn = (message: {
-    data: Record<string, any>;
-    ws: WebSocket;
-    end: (data: any) => any;
-}) => Promise<any>;
-declare class WsServerBase {
-    wss: WebSocketServer;
-    path: string;
-    listeners: {
-        type: string;
-        listener: ListenerFn;
-    }[];
-    listening: boolean;
-    constructor(opts: WsServerBaseOpts);
-    setPath(path: string): void;
-    listen(): void;
-    addListener(type: string, listener: ListenerFn): void;
-    removeListener(type: string): void;
-}
-declare class WsServer extends WsServerBase {
-    server: Server;
-    constructor(server: Server, opts?: any);
-    initListener(): void;
-    listen(): void;
-}
-
 type RouteObject = {
     [key: string]: RouteOpts$1;
 };
@@ -740,17 +810,11 @@ type RouterHandle = (msg: {
 };
 type AppOptions<T = {}> = {
     router?: QueryRouter;
-    server?: Server;
+    server?: ServerType;
     /** handle msg 关联 */
     routerHandle?: RouterHandle;
     routerContext?: RouteContext<T>;
-    serverOptions?: ServerOpts;
-    io?: boolean;
-    ioOpts?: {
-        routerHandle?: RouterHandle;
-        routerContext?: RouteContext<T>;
-        path?: string;
-    };
+    serverOptions?: ServerNodeOpts;
 };
 type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & {
     app: App<T>;
@@ -761,8 +825,7 @@ type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & {
  */
 declare class App<U = {}> {
     router: QueryRouter;
-    server: Server;
-    io: WsServer;
+    server: ServerType;
     constructor(opts?: AppOptions<U>);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -825,5 +888,5 @@ declare class App<U = {}> {
     onServerRequest(fn: (req: IncomingMessage$1, res: ServerResponse$1) => void): void;
 }
 
-export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, Server, createSchema, define, handleServer, util };
+export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, define, handleServer, util };
 export type { RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, Rule, Run, Schema };