@kevisual/router 0.2.5 → 0.2.7

package/dist/router-browser.d.ts

@@ -16,7 +16,7 @@ declare class CustomError extends Error {
     static fromCode(code?: number): CustomError;
     static fromErrorData(code?: number, data?: any): CustomError;
     static parseError(e: CustomError): {
-        code: number | undefined;
+        code: number;
         data: any;
         message: string;
     };
@@ -30,7 +30,7 @@ declare class CustomError extends Error {
     static throw(code?: number | string, opts?: CustomErrorOptions): void;
     static throw(opts?: CustomErrorOptions): void;
     parse(e?: CustomError): {
-        code: number | undefined;
+        code: number;
         data: any;
         message: string;
     };
@@ -53,22 +53,6 @@ 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;
@@ -226,7 +210,7 @@ declare class Route<M extends SimpleObject$1 = SimpleObject$1, U extends SimpleO
     description?: string;
     metadata?: M;
     middleware?: RouteMiddleware[];
-    type?: string | undefined;
+    type?: string;
     /**
      * 是否开启debug，开启后会打印错误信息
      */
@@ -319,6 +303,7 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<RouteContext<T, {}, {
@@ -335,13 +320,14 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<RouteContext<T, {}, {
         [key: string]: any;
     }> | {
         code: number;
-        body: null;
+        body: any;
         message: string;
     }>;
     /**
@@ -356,12 +342,13 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<{
-        code: number | undefined;
-        data: string | number | Object | null | undefined;
-        message: string | undefined;
+        code: number;
+        data: any;
+        message: string;
     }>;
     /**
      * Router Run获取数据
@@ -374,12 +361,13 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<{
-        code: number | undefined;
-        data: string | number | Object | null | undefined;
-        message: string | undefined;
+        code: number;
+        data: any;
+        message: string;
     }>;
     /**
      * 设置上下文
@@ -414,12 +402,12 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
     throw(...args: any[]): void;
-    hasRoute(path: string, key?: string): Route<SimpleObject$1, SimpleObject$1> | undefined;
+    hasRoute(path: string, key?: string): Route<SimpleObject$1, SimpleObject$1>;
     findRoute(opts?: {
         path?: string;
         key?: string;
         rid?: string;
-    }): Route<SimpleObject$1, SimpleObject$1> | undefined;
+    }): Route<SimpleObject$1, SimpleObject$1>;
     createRouteList(opts?: {
         force?: boolean;
         filter?: (route: Route) => boolean;
@@ -513,6 +501,21 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
+        token?: string;
+        data?: any;
+    }, ctx?: Partial<RouteContext<C>>): Promise<any>;
+    /**
+     * 调用了handle
+     * @param param0
+     * @returns
+     */
+    runLocal(msg: {
+        rid?: string;
+        path?: string;
+        key?: string;
+        payload?: any;
+        args?: any;
         token?: string;
         data?: any;
     }, ctx?: Partial<RouteContext<C>>): Promise<any>;
@@ -528,7 +531,9 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
      * 创建认证相关的中间件，默认是 auth, auth-admin, auth-can 三个中间件
      * @param fun 认证函数，接收 RouteContext 和认证类型
      */
-    createAuth(fun: (ctx: RouteContext<C>, type?: 'auth' | 'auth-admin' | 'auth-can') => any): Promise<void>;
+    createAuth(fun?: (ctx: RouteContext<C>, type?: 'auth' | 'auth-admin' | 'auth-can') => any, opts?: {
+        overwrite?: boolean;
+    }): Promise<void>;
 }
 declare class Mini extends QueryRouterServer {
 }
@@ -622,8 +627,8 @@ declare class Chain {
     object: RouteOpts;
     app?: QueryRouterServer;
     constructor(object: RouteOpts, opts?: ChainOptions);
-    get key(): string | undefined;
-    get path(): string | undefined;
+    get key(): string;
+    get path(): string;
     setDescription(desc: string): this;
     setMeta(metadata: {
         [key: string]: any;
@@ -677,5 +682,5 @@ 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 { ListenProcessParams, ListenProcessResponse, RouteArray, RouteContext, RouteInfo, RouteMiddleware, RouteObject, RouteOpts, Rule, Run, Schema, Skill };
+export { App, CustomError, Mini, QueryRouter, QueryRouterServer, QueryUtil, Route, createSchema, createSkill, define, fromJSONSchema, toJSONSchema, tool, util };
+export type { RouteArray, RouteContext, RouteInfo, RouteMiddleware, RouteObject, RouteOpts, Rule, Run, Schema, Skill };

package/dist/router-browser.js

@@ -18980,7 +18980,7 @@ var listenProcess = async ({ app, mockProcess, params = {}, timeout: timeout2 =
     const ctx = mergeParams?.context || {};
     if (!msg.path && !msg.id) {
       const route = app.routes.find((r) => r.path !== "router");
-      msg.id = route?.id;
+      msg.id = route?.rid;
     }
     const result = await app.run(msg, ctx);
     const response = {
@@ -32971,9 +32971,9 @@ class QueryRouter {
     if (!message?.path) {
       return Promise.resolve({ code: 404, body: null, message: "Not found path" });
     }
-    const { path, key = "", payload = {}, ...query } = message;
+    const { path, key = "", payload = {}, args = {}, ...query } = message;
     ctx = ctx || {};
-    ctx.query = { ...ctx.query, ...query, ...payload };
+    ctx.query = { ...ctx.query, ...query, ...payload, ...args };
     ctx.args = ctx.query;
     ctx.state = { ...ctx?.state };
     ctx.throw = this.throw;
@@ -33179,11 +33179,15 @@ class QueryRouterServer extends QueryRouter {
     }
     return super.run(msg, ctx);
   }
+  async runLocal(msg, ctx) {
+    return this.run(msg, { ...ctx, appId: this.appId });
+  }
   async runAction(api2, payload, ctx) {
     const { path, key, rid } = api2;
     return this.run({ path, key, rid, payload }, ctx);
   }
-  async createAuth(fun) {
+  async createAuth(fun, opts) {
+    const overwrite = opts?.overwrite ?? false;
     this.route({
       path: "auth",
       key: "auth",
@@ -33193,7 +33197,7 @@ class QueryRouterServer extends QueryRouter {
       if (fun) {
         await fun(ctx, "auth");
       }
-    }).addTo(this, { overwrite: false });
+    }).addTo(this, { overwrite });
     this.route({
       path: "auth-admin",
       key: "auth-admin",
@@ -33204,7 +33208,7 @@ class QueryRouterServer extends QueryRouter {
       if (fun) {
         await fun(ctx, "auth-admin");
       }
-    }).addTo(this, { overwrite: false });
+    }).addTo(this, { overwrite });
     this.route({
       path: "auth-can",
       key: "auth-can",
@@ -33214,7 +33218,7 @@ class QueryRouterServer extends QueryRouter {
       if (fun) {
         await fun(ctx, "auth-can");
       }
-    }).addTo(this, { overwrite: false });
+    }).addTo(this, { overwrite });
   }
 }
 
@@ -33409,7 +33413,6 @@ export {
   QueryUtil,
   QueryRouterServer,
   QueryRouter,
-  MockProcess,
   Mini,
   CustomError,
   App

package/dist/router-define.d.ts

@@ -168,7 +168,7 @@ declare class Route<M extends SimpleObject$1 = SimpleObject$1, U extends SimpleO
     description?: string;
     metadata?: M;
     middleware?: RouteMiddleware[];
-    type?: string | undefined;
+    type?: string;
     /**
      * 是否开启debug，开启后会打印错误信息
      */
@@ -244,6 +244,7 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<RouteContext<T, {}, {
@@ -260,13 +261,14 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<RouteContext<T, {}, {
         [key: string]: any;
     }> | {
         code: number;
-        body: null;
+        body: any;
         message: string;
     }>;
     /**
@@ -281,12 +283,13 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<{
-        code: number | undefined;
-        data: string | number | Object | null | undefined;
-        message: string | undefined;
+        code: number;
+        data: any;
+        message: string;
     }>;
     /**
      * Router Run获取数据
@@ -299,12 +302,13 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<{
-        code: number | undefined;
-        data: string | number | Object | null | undefined;
-        message: string | undefined;
+        code: number;
+        data: any;
+        message: string;
     }>;
     /**
      * 设置上下文
@@ -339,12 +343,12 @@ declare class QueryRouter<T extends SimpleObject$1 = SimpleObject$1> implements
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
     throw(...args: any[]): void;
-    hasRoute(path: string, key?: string): Route<SimpleObject$1, SimpleObject$1> | undefined;
+    hasRoute(path: string, key?: string): Route<SimpleObject$1, SimpleObject$1>;
     findRoute(opts?: {
         path?: string;
         key?: string;
         rid?: string;
-    }): Route<SimpleObject$1, SimpleObject$1> | undefined;
+    }): Route<SimpleObject$1, SimpleObject$1>;
     createRouteList(opts?: {
         force?: boolean;
         filter?: (route: Route) => boolean;
@@ -438,6 +442,21 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
         path?: string;
         key?: string;
         payload?: any;
+        args?: any;
+        token?: string;
+        data?: any;
+    }, ctx?: Partial<RouteContext<C>>): Promise<any>;
+    /**
+     * 调用了handle
+     * @param param0
+     * @returns
+     */
+    runLocal(msg: {
+        rid?: string;
+        path?: string;
+        key?: string;
+        payload?: any;
+        args?: any;
         token?: string;
         data?: any;
     }, ctx?: Partial<RouteContext<C>>): Promise<any>;
@@ -453,7 +472,9 @@ declare class QueryRouterServer<C extends SimpleObject$1 = SimpleObject$1> exten
      * 创建认证相关的中间件，默认是 auth, auth-admin, auth-can 三个中间件
      * @param fun 认证函数，接收 RouteContext 和认证类型
      */
-    createAuth(fun: (ctx: RouteContext<C>, type?: 'auth' | 'auth-admin' | 'auth-can') => any): Promise<void>;
+    createAuth(fun?: (ctx: RouteContext<C>, type?: 'auth' | 'auth-admin' | 'auth-can') => any, opts?: {
+        overwrite?: boolean;
+    }): Promise<void>;
 }
 /** JSON Schema 基本类型映射到 TypeScript 类型 */
 type JsonSchemaTypeToTS<T> = T extends {
@@ -508,8 +529,8 @@ declare class Chain {
     object: RouteOpts;
     app?: QueryRouterServer;
     constructor(object: RouteOpts, opts?: ChainOptions);
-    get key(): string | undefined;
-    get path(): string | undefined;
+    get key(): string;
+    get path(): string;
     setDescription(desc: string): this;
     setMeta(metadata: {
         [key: string]: any;

package/dist/router-simple.d.ts

@@ -1,3 +1,4 @@
+import * as node_querystring from 'node:querystring';
 import { Key } from 'path-to-regexp';
 import { IncomingMessage, ServerResponse, Server } from 'node:http';
 import { ListenOptions } from 'node:net';
@@ -24,7 +25,7 @@ declare class SimpleRouter {
         exclude?: string[];
     });
     getBody(req: Req): Promise<Record<string, any>>;
-    getSearch(req: Req): any;
+    getSearch(req: Req): node_querystring.ParsedUrlQuery;
     parseSearchValue: (value?: string, opts?: {
         decode?: boolean;
     }) => any;
@@ -102,7 +103,7 @@ declare class HttpChain {
         listenCallBack?: () => void;
     }): () => void;
     getString(value: string | SimpleObject): string;
-    sse(value: string | SimpleObject): this | undefined;
+    sse(value: string | SimpleObject): this;
     close(): this;
 }