@kevisual/router 0.0.81 → 0.0.82

package/dist/app.js

@@ -3020,6 +3020,10 @@ class CustomError extends Error {
   data;
   message;
   constructor(code, opts) {
+    if (typeof code === "object" && code !== null) {
+      opts = code;
+      code = opts.code || 500;
+    }
     let message = opts?.message || String(code);
     const cause = opts?.cause;
     super(message, { cause });
@@ -17294,7 +17298,16 @@ class QueryRouter {
     this.importRoutes(router.routes);
   }
   throw(...args) {
-    throw new CustomError(...args);
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === "object") {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === "object") {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    throw new CustomError(args0);
   }
   hasRoute(path, key = "") {
     return this.routes.find((r) => r.path === path && r.key === key);
@@ -17738,8 +17751,13 @@ class ServerBase {
           res.end(JSON.stringify(end));
         }
       } catch (e) {
-        console.error(e);
         res.setHeader("Content-Type", "application/json; charset=utf-8");
+        if (CustomError.isError(e)) {
+          const parsedError = CustomError.parseError(e);
+          res.end(JSON.stringify(parsedError));
+          return;
+        }
+        console.error(e);
         if (e.code && typeof e.code === "number") {
           res.end(resultError(e.message || `Router Server error`, e.code));
         } else {
@@ -19519,7 +19537,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.81";
+var version2 = "0.0.82";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/opencode.d.ts

@@ -5,6 +5,12 @@ import { IncomingMessage, ServerResponse } from 'node:http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
 import { PluginInput, Hooks, Plugin } from '@opencode-ai/plugin';
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
+
 declare class MockProcess {
     emitter?: EventEmitter;
     process?: NodeJS.Process;
@@ -314,7 +320,9 @@ declare class QueryRouter {
     }, SimpleObject>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
+    throw(code?: number | string, message?: string): void;
+    throw(code?: number | string, opts?: CustomErrorOptions): void;
+    throw(opts?: CustomErrorOptions): void;
     hasRoute(path: string, key?: string): Route<{
         [key: string]: any;
     }, SimpleObject>;

package/dist/router-browser.d.ts

@@ -2,6 +2,37 @@ import { EventEmitter } from 'eventemitter3';
 import { z } from 'zod';
 import { Query, DataOpts, Result } from '@kevisual/query/query';
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
+/** 自定义错误 */
+declare class CustomError extends Error {
+    code?: number;
+    data?: any;
+    message: string;
+    constructor(code?: number | string | CustomErrorOptions, opts?: CustomErrorOptions);
+    static fromCode(code?: number): CustomError;
+    static fromErrorData(code?: number, data?: any): CustomError;
+    static parseError(e: CustomError): {
+        code: number;
+        data: any;
+        message: string;
+    };
+    /**
+     * 判断 throw 的错误是否不是当前这个错误
+     * @param err
+     * @returns
+     */
+    static isError(error: unknown): error is CustomError;
+    parse(e?: CustomError): {
+        code: number;
+        data: any;
+        message: string;
+    };
+}
+
 declare class MockProcess {
     emitter?: EventEmitter;
     process?: NodeJS.Process;
@@ -358,7 +389,9 @@ declare class QueryRouter {
     }, SimpleObject$1>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
+    throw(code?: number | string, message?: string): void;
+    throw(code?: number | string, opts?: CustomErrorOptions): void;
+    throw(opts?: CustomErrorOptions): void;
     hasRoute(path: string, key?: string): Route<{
         [key: string]: any;
     }, SimpleObject$1>;
@@ -498,37 +531,6 @@ declare const createSchema: (rule: Rule) => z.ZodType<any, any, any>;
 
 type Schema = z.ZodType<any, any, any>;
 
-type CustomErrorOptions = {
-    cause?: Error | string;
-    code?: number;
-    message?: string;
-};
-/** 自定义错误 */
-declare class CustomError extends Error {
-    code?: number;
-    data?: any;
-    message: string;
-    constructor(code?: number | string, opts?: CustomErrorOptions);
-    static fromCode(code?: number): CustomError;
-    static fromErrorData(code?: number, data?: any): CustomError;
-    static parseError(e: CustomError): {
-        code: number;
-        data: any;
-        message: string;
-    };
-    /**
-     * 判断 throw 的错误是否不是当前这个错误
-     * @param err
-     * @returns
-     */
-    static isError(error: unknown): error is CustomError;
-    parse(e?: CustomError): {
-        code: number;
-        data: any;
-        message: string;
-    };
-}
-
 type RouteObject = {
     [key: string]: RouteOpts;
 };

package/dist/router-browser.js

@@ -209,6 +209,10 @@ class CustomError extends Error {
   data;
   message;
   constructor(code, opts) {
+    if (typeof code === "object" && code !== null) {
+      opts = code;
+      code = opts.code || 500;
+    }
     let message = opts?.message || String(code);
     const cause = opts?.cause;
     super(message, { cause });
@@ -14458,7 +14462,16 @@ class QueryRouter {
     this.importRoutes(router.routes);
   }
   throw(...args) {
-    throw new CustomError(...args);
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === "object") {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === "object") {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    throw new CustomError(args0);
   }
   hasRoute(path, key = "") {
     return this.routes.find((r) => r.path === path && r.key === key);

package/dist/router-define.d.ts

@@ -2,6 +2,12 @@ import { EventEmitter } from 'eventemitter3';
 import { z } from 'zod';
 import { Query, DataOpts, Result } from '@kevisual/query/query';
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
+
 declare class MockProcess {
     emitter?: EventEmitter;
     process?: NodeJS.Process;
@@ -311,7 +317,9 @@ declare class QueryRouter {
     }, SimpleObject$1>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
+    throw(code?: number | string, message?: string): void;
+    throw(code?: number | string, opts?: CustomErrorOptions): void;
+    throw(opts?: CustomErrorOptions): void;
     hasRoute(path: string, key?: string): Route<{
         [key: string]: any;
     }, SimpleObject$1>;

package/dist/router.d.ts

@@ -8,6 +8,37 @@ import http2 from 'node:http2';
 import { WebSocketServer } from 'ws';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
+/** 自定义错误 */
+declare class CustomError extends Error {
+    code?: number;
+    data?: any;
+    message: string;
+    constructor(code?: number | string | CustomErrorOptions, opts?: CustomErrorOptions);
+    static fromCode(code?: number): CustomError;
+    static fromErrorData(code?: number, data?: any): CustomError;
+    static parseError(e: CustomError): {
+        code: number;
+        data: any;
+        message: string;
+    };
+    /**
+     * 判断 throw 的错误是否不是当前这个错误
+     * @param err
+     * @returns
+     */
+    static isError(error: unknown): error is CustomError;
+    parse(e?: CustomError): {
+        code: number;
+        data: any;
+        message: string;
+    };
+}
+
 declare class MockProcess {
     emitter?: EventEmitter;
     process?: NodeJS.Process;
@@ -364,7 +395,9 @@ declare class QueryRouter {
     }, SimpleObject$1>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
+    throw(code?: number | string, message?: string): void;
+    throw(code?: number | string, opts?: CustomErrorOptions): void;
+    throw(opts?: CustomErrorOptions): void;
     hasRoute(path: string, key?: string): Route<{
         [key: string]: any;
     }, SimpleObject$1>;
@@ -504,37 +537,6 @@ declare const createSchema: (rule: Rule) => z.ZodType<any, any, any>;
 
 type Schema = z.ZodType<any, any, any>;
 
-type CustomErrorOptions = {
-    cause?: Error | string;
-    code?: number;
-    message?: string;
-};
-/** 自定义错误 */
-declare class CustomError extends Error {
-    code?: number;
-    data?: any;
-    message: string;
-    constructor(code?: number | string, opts?: CustomErrorOptions);
-    static fromCode(code?: number): CustomError;
-    static fromErrorData(code?: number, data?: any): CustomError;
-    static parseError(e: CustomError): {
-        code: number;
-        data: any;
-        message: string;
-    };
-    /**
-     * 判断 throw 的错误是否不是当前这个错误
-     * @param err
-     * @returns
-     */
-    static isError(error: unknown): error is CustomError;
-    parse(e?: CustomError): {
-        code: number;
-        data: any;
-        message: string;
-    };
-}
-
 type RouteObject = {
     [key: string]: RouteOpts;
 };

package/dist/router.js

@@ -3020,6 +3020,10 @@ class CustomError extends Error {
   data;
   message;
   constructor(code, opts) {
+    if (typeof code === "object" && code !== null) {
+      opts = code;
+      code = opts.code || 500;
+    }
     let message = opts?.message || String(code);
     const cause = opts?.cause;
     super(message, { cause });
@@ -17291,7 +17295,16 @@ class QueryRouter {
     this.importRoutes(router.routes);
   }
   throw(...args) {
-    throw new CustomError(...args);
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === "object") {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === "object") {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    throw new CustomError(args0);
   }
   hasRoute(path, key = "") {
     return this.routes.find((r) => r.path === path && r.key === key);
@@ -17966,8 +17979,13 @@ class ServerBase {
           res.end(JSON.stringify(end));
         }
       } catch (e) {
-        console.error(e);
         res.setHeader("Content-Type", "application/json; charset=utf-8");
+        if (CustomError.isError(e)) {
+          const parsedError = CustomError.parseError(e);
+          res.end(JSON.stringify(parsedError));
+          return;
+        }
+        console.error(e);
         if (e.code && typeof e.code === "number") {
           res.end(resultError(e.message || `Router Server error`, e.code));
         } else {

package/dist/ws.d.ts

@@ -52,6 +52,12 @@ declare class ReconnectingWebSocket {
     getRetryCount(): number;
 }
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
+
 declare class MockProcess {
     emitter?: EventEmitter;
     process?: NodeJS.Process;
@@ -361,7 +367,9 @@ declare class QueryRouter {
     }, SimpleObject>[];
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
+    throw(code?: number | string, message?: string): void;
+    throw(code?: number | string, opts?: CustomErrorOptions): void;
+    throw(opts?: CustomErrorOptions): void;
     hasRoute(path: string, key?: string): Route<{
         [key: string]: any;
     }, SimpleObject>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.81",
+  "version": "0.0.82",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/result/error.ts

@@ -1,4 +1,4 @@
-type CustomErrorOptions = {
+export type CustomErrorOptions = {
   cause?: Error | string;
   code?: number;
   message?: string;
@@ -8,7 +8,11 @@ export class CustomError extends Error {
   code?: number;
   data?: any;
   message: string;
-  constructor(code?: number | string, opts?: CustomErrorOptions) {
+  constructor(code?: number | string | CustomErrorOptions, opts?: CustomErrorOptions) {
+    if (typeof code === 'object' && code !== null) {
+      opts = code;
+      code = opts.code || 500;
+    }
     let message = opts?.message || String(code);
     const cause = opts?.cause;
     super(message, { cause });

package/src/route.ts

@@ -1,4 +1,4 @@
-import { CustomError } from './result/error.ts';
+import { CustomError, CustomErrorOptions } from './result/error.ts';
 import { pick } from './utils/pick.ts';
 import { listenProcess, MockProcess } from './utils/listen-process.ts';
 import { z } from 'zod';
@@ -610,9 +610,21 @@ export class QueryRouter {
   importRouter(router: QueryRouter) {
     this.importRoutes(router.routes);
   }
-  throw(code?: number | string, message?: string, tips?: string): void;
+  throw(code?: number | string, message?: string): void;
+  throw(code?: number | string, opts?: CustomErrorOptions): void;
+  throw(opts?: CustomErrorOptions): void;
   throw(...args: any[]) {
-    throw new CustomError(...args);
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === 'object') {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === 'object') {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    // args1 不存在;
+    throw new CustomError(args0);
   }
   hasRoute(path: string, key: string = '') {
     return this.routes.find((r) => r.path === path && r.key === key);

package/src/server/server-base.ts

@@ -4,6 +4,7 @@ import * as cookie from './cookie.ts';
 import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebSocketListenerFun, ListenerFun, HttpListenerFun, WS } from './server-type.ts';
 import { parseIfJson } from '../utils/parse.ts';
 import { EventEmitter } from 'eventemitter3';
+import { CustomError } from '../result/error.ts';
 type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
 
 export type HandleCtx = {
@@ -165,8 +166,13 @@ export class ServerBase implements ServerType {
           res.end(JSON.stringify(end));
         }
       } catch (e) {
-        console.error(e);
         res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        if (CustomError.isError(e)) {
+          const parsedError = CustomError.parseError(e);
+          res.end(JSON.stringify(parsedError));
+          return;
+        }
+        console.error(e);
         if (e.code && typeof e.code === 'number') {
           res.end(resultError(e.message || `Router Server error`, e.code));
         } else {