@kevisual/router 0.1.1 → 0.1.2

package/dist/ws.d.ts

@@ -194,14 +194,6 @@ type RouteOpts<U = {}, T = SimpleObject> = {
     metadata?: T;
     middleware?: RouteMiddleware[];
     type?: 'route' | 'middleware' | 'compound';
-    /**
-     * $#$ will be used to split path and key
-     */
-    idUsePath?: boolean;
-    /**
-     * id 合并的分隔符，默认为 $#$
-     */
-    delimiter?: string;
     isDebug?: boolean;
 };
 type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;

package/dist/ws.js

@@ -4,21 +4,35 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 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.0.0/node_modules/@kevisual/ws/lib/constants.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
 var require_constants = __commonJS((exports, module) => {
   var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
   var hasBlob = typeof Blob !== "undefined";
@@ -26,6 +40,7 @@ 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,
@@ -37,7 +52,7 @@ var require_constants = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/buffer-util.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS((exports, module) => {
   var { EMPTY_BUFFER } = require_constants();
   var FastBuffer = Buffer[Symbol.species];
@@ -98,7 +113,7 @@ var require_buffer_util = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/limiter.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
 var require_limiter = __commonJS((exports, module) => {
   var kDone = Symbol("kDone");
   var kRun = Symbol("kRun");
@@ -130,7 +145,7 @@ var require_limiter = __commonJS((exports, module) => {
   module.exports = Limiter;
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS((exports, module) => {
   var zlib = __require("zlib");
   var bufferUtil = require_buffer_util();
@@ -385,12 +400,16 @@ 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.0.0/node_modules/@kevisual/ws/lib/validation.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
 var require_validation = __commonJS((exports, module) => {
   var { isUtf8 } = __require("buffer");
   var { hasBlob } = require_constants();
@@ -570,7 +589,7 @@ var require_validation = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/receiver.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
 var require_receiver = __commonJS((exports, module) => {
   var { Writable } = __require("stream");
   var PerMessageDeflate = require_permessage_deflate();
@@ -951,7 +970,7 @@ var require_receiver = __commonJS((exports, module) => {
   module.exports = Receiver;
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/sender.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
 var require_sender = __commonJS((exports, module) => {
   var { Duplex } = __require("stream");
   var { randomFillSync } = __require("crypto");
@@ -1305,7 +1324,7 @@ var require_sender = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/event-target.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
 var require_event_target = __commonJS((exports, module) => {
   var { kForOnEventAttribute, kListener } = require_constants();
   var kCode = Symbol("kCode");
@@ -1456,7 +1475,7 @@ var require_event_target = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/extension.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
 var require_extension = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function push(dest, name, elem) {
@@ -1621,7 +1640,7 @@ var require_extension = __commonJS((exports, module) => {
   module.exports = { format, parse };
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/websocket.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
 var require_websocket = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var https = __require("https");
@@ -1637,6 +1656,7 @@ var require_websocket = __commonJS((exports, module) => {
   var { isBlob } = require_validation();
   var {
     BINARY_TYPES,
+    CLOSE_TIMEOUT,
     EMPTY_BUFFER,
     GUID,
     kForOnEventAttribute,
@@ -1650,7 +1670,6 @@ 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"];
@@ -1690,6 +1709,7 @@ var require_websocket = __commonJS((exports, module) => {
         initAsClient(this, address, protocols, options);
       } else {
         this._autoPong = options.autoPong;
+        this._closeTimeout = options.closeTimeout;
         this._isServer = true;
       }
     }
@@ -1981,6 +2001,7 @@ var require_websocket = __commonJS((exports, module) => {
     const opts = {
       allowSynchronousEvents: true,
       autoPong: true,
+      closeTimeout: CLOSE_TIMEOUT,
       protocolVersion: protocolVersions[1],
       maxPayload: 100 * 1024 * 1024,
       skipUTF8Validation: false,
@@ -1998,6 +2019,7 @@ 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(", ")})`);
     }
@@ -2336,7 +2358,7 @@ var require_websocket = __commonJS((exports, module) => {
     }
   }
   function setCloseTimer(websocket) {
-    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
+    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
   }
   function socketOnClose() {
     const websocket = this[kWebSocket];
@@ -2344,8 +2366,8 @@ var require_websocket = __commonJS((exports, module) => {
     this.removeListener("data", socketOnData);
     this.removeListener("end", socketOnEnd);
     websocket._readyState = WebSocket.CLOSING;
-    let chunk;
-    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk = websocket._socket.read()) !== null) {
+    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
+      const chunk = this.read(this._readableState.length);
       websocket._receiver.write(chunk);
     }
     websocket._receiver.end();
@@ -2380,7 +2402,7 @@ var require_websocket = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/stream.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
 var require_stream = __commonJS((exports, module) => {
   var WebSocket = require_websocket();
   var { Duplex } = __require("stream");
@@ -2483,7 +2505,7 @@ var require_stream = __commonJS((exports, module) => {
   module.exports = createWebSocketStream;
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/subprotocol.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function parse(header) {
@@ -2528,7 +2550,7 @@ var require_subprotocol = __commonJS((exports, module) => {
   module.exports = { parse };
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/lib/websocket-server.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var http = __require("http");
@@ -2538,7 +2560,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   var PerMessageDeflate = require_permessage_deflate();
   var subprotocol = require_subprotocol();
   var WebSocket = require_websocket();
-  var { GUID, kWebSocket } = require_constants();
+  var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
   var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
   var RUNNING = 0;
   var CLOSING = 1;
@@ -2555,6 +2577,7 @@ var require_websocket_server = __commonJS((exports, module) => {
         perMessageDeflate: false,
         handleProtocols: null,
         clientTracking: true,
+        closeTimeout: CLOSE_TIMEOUT,
         verifyClient: null,
         noServer: false,
         backlog: null,
@@ -2675,9 +2698,11 @@ var require_websocket_server = __commonJS((exports, module) => {
         abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
         return;
       }
-      if (version !== 8 && version !== 13) {
+      if (version !== 13 && version !== 8) {
         const message = "Missing or invalid Sec-WebSocket-Version header";
-        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
+        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
+          "Sec-WebSocket-Version": "13, 8"
+        });
         return;
       }
       if (!this.shouldHandle(req)) {
@@ -2816,18 +2841,18 @@ var require_websocket_server = __commonJS((exports, module) => {
 \r
 ` + message);
   }
-  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
+  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
     if (server.listenerCount("wsClientError")) {
       const err = new Error(message);
       Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
       server.emit("wsClientError", err, socket, req);
     } else {
-      abortHandshake(socket, code, message);
+      abortHandshake(socket, code, message, headers);
     }
   }
 });
 
-// node_modules/.pnpm/@kevisual+ws@8.0.0/node_modules/@kevisual/ws/wrapper.mjs
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/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.1.1",
+  "version": "0.1.2",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -25,34 +25,39 @@
     "@kevisual/code-builder": "^0.0.6",
     "@kevisual/context": "^0.0.8",
     "@kevisual/dts": "^0.0.4",
-    "@kevisual/js-filter": "^0.0.5",
+    "@kevisual/js-filter": "^0.0.6",
     "@kevisual/local-proxy": "^0.0.8",
     "@kevisual/query": "^0.0.53",
+    "@kevisual/remote-app": "^0.0.7",
     "@kevisual/use-config": "^1.0.30",
-    "@opencode-ai/plugin": "^1.2.24",
+    "@opencode-ai/plugin": "^1.2.26",
     "@types/bun": "^1.3.10",
-    "@types/node": "^25.4.0",
+    "@types/crypto-js": "^4.2.2",
+    "@types/node": "^25.5.0",
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
     "commander": "^14.0.3",
+    "crypto-js": "^4.2.0",
+    "es-toolkit": "^1.45.1",
     "eventemitter3": "^5.0.4",
     "fast-glob": "^3.3.3",
-    "hono": "^4.12.7",
+    "hono": "^4.12.8",
     "nanoid": "^5.1.6",
     "path-to-regexp": "^8.3.0",
     "send": "^1.2.1",
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
-    "xml2js": "^0.6.2",
-    "zod": "^4.3.6"
+    "xml2js": "^0.6.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
   "dependencies": {
-    "es-toolkit": "^1.45.1"
+    "crypto-js": "^4.2.0",
+    "es-toolkit": "^1.45.1",
+    "zod": "^4.3.6"
   },
   "publishConfig": {
     "access": "public"

package/src/app.ts

@@ -1,4 +1,4 @@
-import { AddOpts, QueryRouter, QueryRouterServer, Route, RouteContext, RouteOpts } from './route.ts';
+import { QueryRouterServer, Route, RouteContext, RouteOpts } from './route.ts';
 import { ServerNode, ServerNodeOpts } from './server/server.ts';
 import { HandleCtx } from './server/server-base.ts';
 import { ServerType } from './server/server-type.ts';

package/src/commander.ts

@@ -1,6 +1,6 @@
 import { Command, program } from 'commander';
 import { App, QueryRouterServer } from './app.ts';
-
+import { RemoteApp } from '@kevisual/remote-app'
 export const groupByPath = (routes: App['routes']) => {
   return routes.reduce((acc, route) => {
     const path = route.path || 'default';
@@ -66,8 +66,9 @@ export const parseDescription = (route: App['routes'][number]) => {
   }
   return desc;
 }
-export const createCommand = (opts: { app: App, program: Command }) => {
-  const { app, program } = opts;
+export const createCommand = (opts: { app: any, program: Command }) => {
+  const { program } = opts;
+  const app = opts.app as App;
   const routes = app.routes;
 
 
@@ -113,11 +114,61 @@ export const createCommand = (opts: { app: App, program: Command }) => {
   }
 }
 
-export const parse = (opts: { app: QueryRouterServer, description?: string, parse?: boolean, program?: Command }) => {
-  const { app, description, parse = true, } = opts;
+export const parse = async (opts: {
+  app: any,
+  description?: string,
+  parse?: boolean,
+  version?: string,
+  program?: Command,
+  remote?: {
+    token?: string,
+    username?: string,
+    id?: string,
+  }
+}) => {
+  const { description, parse = true, version } = opts;
+  const app = opts.app as App;
   const _program = opts.program || program;
   _program.description(description || 'Router 命令行工具');
+  if (version) {
+    _program.version(version);
+  }
+  app.createRouteList();
+  app.route({
+    path: 'cli',
+    key: 'list'
+  }).define(async () => {
+    const routes = app.routes.map(route => {
+      return {
+        path: route.path,
+        key: route.key,
+        description: route?.metadata?.summary || route.description || '',
+      };
+    });
+    // 输出为表格格式
+    const table = routes.map(route => {
+      return `${route.path} ${route.key} - ${route.description}`;
+    }).join('\n');
+
+    console.log(table);
+  }).addTo(app, { overwrite: false })
+
   createCommand({ app: app as App, program: _program });
+
+  if (opts.remote) {
+    const { token, username, id } = opts.remote;
+    const remoteApp = new RemoteApp({
+      token,
+      username,
+      id,
+    });
+    const isConnect = await remoteApp.isConnect();
+    if (isConnect) {
+      remoteApp.listenProxy();
+      console.log('已连接到远程应用，正在监听命令...');
+    }
+    return
+  }
   if (parse) {
     _program.parse(process.argv);
   }

package/src/route.ts

@@ -2,7 +2,7 @@ import { CustomError, throwError, CustomErrorOptions } from './result/error.ts';
 import { pick } from './utils/pick.ts';
 import { listenProcess, MockProcess } from './utils/listen-process.ts';
 import { z } from 'zod';
-import { randomId } from './utils/random.ts';
+import { hashIdMd5Sync, randomId } from './utils/random.ts';
 import * as schema from './validator/schema.ts';
 
 export type RouterContextT = { code?: number;[key: string]: any };
@@ -96,14 +96,6 @@ export type RouteOpts<U = {}, T = SimpleObject> = {
   metadata?: T;
   middleware?: RouteMiddleware[]; // middleware
   type?: 'route' | 'middleware' | 'compound'; // compound表示这个 route 作为一个聚合体，没有实际的 run，而是一个 router 的聚合列表
-  /**
-   * $#$ will be used to split path and key
-   */
-  idUsePath?: boolean;
-  /**
-   * id 合并的分隔符，默认为 $#$
-   */
-  delimiter?: string;
   isDebug?: boolean;
 };
 export type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'nextRoute'>;
@@ -170,12 +162,9 @@ export class Route<M extends SimpleObject = SimpleObject, U extends SimpleObject
     key = key.trim();
     this.path = path;
     this.key = key;
+    const pathKey = `${path}$$${key}`;
     if (opts) {
-      this.id = opts.id || randomId(12, 'rand-');
-      if (!opts.id && opts.idUsePath) {
-        const delimiter = opts.delimiter ?? '$$';
-        this.id = path + delimiter + key;
-      }
+      this.id = opts.id || hashIdMd5Sync(pathKey);
       this.run = opts.run as Run<BuildRouteContext<M, U>>;
       this.nextRoute = opts.nextRoute;
       this.description = opts.description;
@@ -186,7 +175,9 @@ export class Route<M extends SimpleObject = SimpleObject, U extends SimpleObject
       this.path = opts.path || path;
     } else {
       this.middleware = [];
-      this.id = randomId(12, 'rand-');
+    }
+    if (!this.id) {
+      this.id = hashIdMd5Sync(pathKey);
     }
     this.isDebug = opts?.isDebug ?? false;
   }

package/src/utils/random.ts

@@ -1,8 +1,17 @@
 import { customAlphabet } from 'nanoid';
-
+import Md5 from 'crypto-js/md5.js';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz', 16);
 
 export const randomId = (length: number = 8, affix: string = '') => {
   return affix + nanoid(length);
 }
-export { nanoid };
+export { nanoid };
+
+/**
+ * 基于 MD5 的确定性 ID 生成 (同步版本)
+ * 浏览器和 Node.js 都支持
+ * 相同的 pathKey 永远返回相同的 16 位 ID
+ */
+export const hashIdMd5Sync = (pathKey: string): string => {
+  return Md5(pathKey).toString().substring(0, 16);
+}