@kevisual/router 0.2.2 → 0.2.4

package/dist/ws.d.ts

@@ -218,7 +218,7 @@ declare class Route<M extends SimpleObject = SimpleObject, U extends SimpleObjec
     description?: string;
     metadata?: M;
     middleware?: RouteMiddleware[];
-    type?: string;
+    type?: string | undefined;
     /**
      * 是否开启debug，开启后会打印错误信息
      */
@@ -316,7 +316,7 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
         [key: string]: any;
     }> | {
         code: number;
-        body: any;
+        body: null;
         message: string;
     }>;
     /**
@@ -334,9 +334,9 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
     }, ctx?: RouteContext & {
         [key: string]: any;
     }): Promise<{
-        code: number;
-        data: any;
-        message: string;
+        code: number | undefined;
+        data: string | number | Object | null | undefined;
+        message: string | undefined;
     }>;
     /**
      * Router Run获取数据
@@ -352,9 +352,9 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
     }, ctx?: RouteContext<T> & {
         [key: string]: any;
     }): Promise<{
-        code: number;
-        data: any;
-        message: string;
+        code: number | undefined;
+        data: string | number | Object | null | undefined;
+        message: string | undefined;
     }>;
     /**
      * 设置上下文
@@ -389,12 +389,12 @@ declare class QueryRouter<T extends SimpleObject = SimpleObject> implements thro
     importRoutes(routes: Route[]): void;
     importRouter(router: QueryRouter): void;
     throw(...args: any[]): void;
-    hasRoute(path: string, key?: string): Route<SimpleObject, SimpleObject>;
+    hasRoute(path: string, key?: string): Route<SimpleObject, SimpleObject> | undefined;
     findRoute(opts?: {
         path?: string;
         key?: string;
         rid?: string;
-    }): Route<SimpleObject, SimpleObject>;
+    }): Route<SimpleObject, SimpleObject> | undefined;
     createRouteList(opts?: {
         force?: boolean;
         filter?: (route: Route) => boolean;
@@ -838,10 +838,7 @@ declare class App<U = {}> extends QueryRouterServer<AppRouteContext<U>> {
     listen(handle: any, backlog?: number, listeningListener?: () => void): void;
     listen(handle: any, listeningListener?: () => void): void;
     Route: typeof Route;
-    static handleRequest(req: IncomingMessage$1, res: ServerResponse$1): Promise<{
-        cookies: Record<string, string>;
-        token: string;
-    }>;
+    static handleRequest(req: IncomingMessage$1, res: ServerResponse$1): Promise<any>;
     onServerRequest(fn: (req: IncomingMessage$1, res: ServerResponse$1) => void): void;
 }
 

package/dist/ws.js

@@ -32,7 +32,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
+// node_modules/ws/lib/constants.js
 var require_constants = __commonJS((exports, module) => {
   var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
   var hasBlob = typeof Blob !== "undefined";
@@ -40,7 +40,6 @@ var require_constants = __commonJS((exports, module) => {
     BINARY_TYPES.push("blob");
   module.exports = {
     BINARY_TYPES,
-    CLOSE_TIMEOUT: 30000,
     EMPTY_BUFFER: Buffer.alloc(0),
     GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
     hasBlob,
@@ -52,7 +51,7 @@ var require_constants = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
+// node_modules/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS((exports, module) => {
   var { EMPTY_BUFFER } = require_constants();
   var FastBuffer = Buffer[Symbol.species];
@@ -113,7 +112,7 @@ var require_buffer_util = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
+// node_modules/ws/lib/limiter.js
 var require_limiter = __commonJS((exports, module) => {
   var kDone = Symbol("kDone");
   var kRun = Symbol("kRun");
@@ -145,7 +144,7 @@ var require_limiter = __commonJS((exports, module) => {
   module.exports = Limiter;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
+// node_modules/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS((exports, module) => {
   var zlib = __require("zlib");
   var bufferUtil = require_buffer_util();
@@ -400,16 +399,12 @@ var require_permessage_deflate = __commonJS((exports, module) => {
   }
   function inflateOnError(err) {
     this[kPerMessageDeflate]._inflate = null;
-    if (this[kError]) {
-      this[kCallback](this[kError]);
-      return;
-    }
     err[kStatusCode] = 1007;
     this[kCallback](err);
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
+// node_modules/ws/lib/validation.js
 var require_validation = __commonJS((exports, module) => {
   var { isUtf8 } = __require("buffer");
   var { hasBlob } = require_constants();
@@ -589,7 +584,7 @@ var require_validation = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
+// node_modules/ws/lib/receiver.js
 var require_receiver = __commonJS((exports, module) => {
   var { Writable } = __require("stream");
   var PerMessageDeflate = require_permessage_deflate();
@@ -970,7 +965,7 @@ var require_receiver = __commonJS((exports, module) => {
   module.exports = Receiver;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
+// node_modules/ws/lib/sender.js
 var require_sender = __commonJS((exports, module) => {
   var { Duplex } = __require("stream");
   var { randomFillSync } = __require("crypto");
@@ -1324,7 +1319,7 @@ var require_sender = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
+// node_modules/ws/lib/event-target.js
 var require_event_target = __commonJS((exports, module) => {
   var { kForOnEventAttribute, kListener } = require_constants();
   var kCode = Symbol("kCode");
@@ -1475,7 +1470,7 @@ var require_event_target = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
+// node_modules/ws/lib/extension.js
 var require_extension = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function push(dest, name, elem) {
@@ -1640,7 +1635,7 @@ var require_extension = __commonJS((exports, module) => {
   module.exports = { format, parse };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
+// node_modules/ws/lib/websocket.js
 var require_websocket = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var https = __require("https");
@@ -1656,7 +1651,6 @@ var require_websocket = __commonJS((exports, module) => {
   var { isBlob } = require_validation();
   var {
     BINARY_TYPES,
-    CLOSE_TIMEOUT,
     EMPTY_BUFFER,
     GUID,
     kForOnEventAttribute,
@@ -1670,6 +1664,7 @@ var require_websocket = __commonJS((exports, module) => {
   } = require_event_target();
   var { format, parse } = require_extension();
   var { toBuffer } = require_buffer_util();
+  var closeTimeout = 30 * 1000;
   var kAborted = Symbol("kAborted");
   var protocolVersions = [8, 13];
   var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -1709,7 +1704,6 @@ var require_websocket = __commonJS((exports, module) => {
         initAsClient(this, address, protocols, options);
       } else {
         this._autoPong = options.autoPong;
-        this._closeTimeout = options.closeTimeout;
         this._isServer = true;
       }
     }
@@ -2001,7 +1995,6 @@ var require_websocket = __commonJS((exports, module) => {
     const opts = {
       allowSynchronousEvents: true,
       autoPong: true,
-      closeTimeout: CLOSE_TIMEOUT,
       protocolVersion: protocolVersions[1],
       maxPayload: 100 * 1024 * 1024,
       skipUTF8Validation: false,
@@ -2019,7 +2012,6 @@ var require_websocket = __commonJS((exports, module) => {
       port: undefined
     };
     websocket._autoPong = opts.autoPong;
-    websocket._closeTimeout = opts.closeTimeout;
     if (!protocolVersions.includes(opts.protocolVersion)) {
       throw new RangeError(`Unsupported protocol version: ${opts.protocolVersion} ` + `(supported versions: ${protocolVersions.join(", ")})`);
     }
@@ -2358,7 +2350,7 @@ var require_websocket = __commonJS((exports, module) => {
     }
   }
   function setCloseTimer(websocket) {
-    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
+    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
   }
   function socketOnClose() {
     const websocket = this[kWebSocket];
@@ -2366,8 +2358,8 @@ var require_websocket = __commonJS((exports, module) => {
     this.removeListener("data", socketOnData);
     this.removeListener("end", socketOnEnd);
     websocket._readyState = WebSocket.CLOSING;
-    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
-      const chunk = this.read(this._readableState.length);
+    let chunk;
+    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk = websocket._socket.read()) !== null) {
       websocket._receiver.write(chunk);
     }
     websocket._receiver.end();
@@ -2402,7 +2394,7 @@ var require_websocket = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
+// node_modules/ws/lib/stream.js
 var require_stream = __commonJS((exports, module) => {
   var WebSocket = require_websocket();
   var { Duplex } = __require("stream");
@@ -2505,7 +2497,7 @@ var require_stream = __commonJS((exports, module) => {
   module.exports = createWebSocketStream;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
+// node_modules/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function parse(header) {
@@ -2550,7 +2542,7 @@ var require_subprotocol = __commonJS((exports, module) => {
   module.exports = { parse };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
+// node_modules/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var http = __require("http");
@@ -2560,7 +2552,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   var PerMessageDeflate = require_permessage_deflate();
   var subprotocol = require_subprotocol();
   var WebSocket = require_websocket();
-  var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
+  var { GUID, kWebSocket } = require_constants();
   var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
   var RUNNING = 0;
   var CLOSING = 1;
@@ -2577,7 +2569,6 @@ var require_websocket_server = __commonJS((exports, module) => {
         perMessageDeflate: false,
         handleProtocols: null,
         clientTracking: true,
-        closeTimeout: CLOSE_TIMEOUT,
         verifyClient: null,
         noServer: false,
         backlog: null,
@@ -2698,11 +2689,9 @@ var require_websocket_server = __commonJS((exports, module) => {
         abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
         return;
       }
-      if (version !== 13 && version !== 8) {
+      if (version !== 8 && version !== 13) {
         const message = "Missing or invalid Sec-WebSocket-Version header";
-        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
-          "Sec-WebSocket-Version": "13, 8"
-        });
+        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
         return;
       }
       if (!this.shouldHandle(req)) {
@@ -2841,18 +2830,18 @@ var require_websocket_server = __commonJS((exports, module) => {
 \r
 ` + message);
   }
-  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
+  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
     if (server.listenerCount("wsClientError")) {
       const err = new Error(message);
       Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
       server.emit("wsClientError", err, socket, req);
     } else {
-      abortHandshake(socket, code, message, headers);
+      abortHandshake(socket, code, message);
     }
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
+// node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
 var import_receiver = __toESM(require_receiver(), 1);
 var import_sender = __toESM(require_sender(), 1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -30,7 +30,7 @@
     "@kevisual/query": "^0.0.55",
     "@kevisual/remote-app": "^0.0.7",
     "@kevisual/use-config": "^1.0.30",
-    "@opencode-ai/plugin": "^1.3.0",
+    "@opencode-ai/plugin": "^1.3.2",
     "@types/bun": "^1.3.11",
     "@types/crypto-js": "^4.2.2",
     "@types/node": "^25.5.0",
@@ -42,11 +42,10 @@
     "es-toolkit": "^1.45.1",
     "eventemitter3": "^5.0.4",
     "fast-glob": "^3.3.3",
-    "hono": "^4.12.8",
     "nanoid": "^5.1.7",
     "path-to-regexp": "^8.3.0",
     "send": "^1.2.1",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.2",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2"
   },

package/src/commander.ts

@@ -18,7 +18,7 @@ export const parseArgs = (args: string) => {
   } catch {
     // 尝试解析 a=b b=c 格式
     const result: Record<string, string> = {};
-    const pairs = args.match(/(\S+?)=(\S+)/g);
+    const pairs = args.match(/(\S+?)=(.*?)(?=\s|$)/g);
     if (pairs && pairs.length > 0) {
       for (const pair of pairs) {
         const idx = pair.indexOf('=');
@@ -27,7 +27,8 @@ export const parseArgs = (args: string) => {
         let value: string | number | boolean = raw;
         if (raw === 'true') value = true;
         else if (raw === 'false') value = false;
-        else if (raw !== '' && !isNaN(Number(raw))) value = Number(raw);
+        else if (raw === '') value = true;
+        else if (!isNaN(Number(raw))) value = Number(raw);
         result[key] = value as string;
       }
       return result;
@@ -72,7 +73,6 @@ export const createCommand = (opts: { app: any, program: Command }) => {
   const app = opts.app as App;
   const routes = app.routes;
 
-
   const groupRoutes = groupByPath(routes);
   for (const path in groupRoutes) {
     const routeList = groupRoutes[path];
@@ -174,7 +174,7 @@ const createCliList = (app: App) => {
         q: z.string().optional().describe('查询关键词，支持模糊匹配命令'),
         path: z.string().optional().describe('按路径前缀过滤，如 user、admin'),
         tags: z.string().optional().describe('按标签过滤，多个标签用逗号分隔'),
-        sort: z.enum(['key', 'path', 'name']).optional().describe('排序方式'),
+        sort: z.enum(['key', 'path', '-key', '-path']).optional().describe('排序方式'),
         limit: z.number().optional().describe('限制返回数量'),
         offset: z.number().optional().describe('偏移量，用于分页'),
         format: z.enum(['table', 'simple', 'json']).optional().describe('输出格式'),
@@ -222,6 +222,8 @@ const createCliList = (app: App) => {
       routes.sort((a, b) => {
         if (sort === 'path') return a.path.localeCompare(b.path);
         if (sort === 'key') return a.key.localeCompare(b.key);
+        if (sort === '-path') return b.path.localeCompare(a.path);
+        if (sort === '-key') return b.key.localeCompare(a.key);
         return a.key.localeCompare(b.key); // name 默认为 key
       });
     }