@kevisual/router 0.2.8 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/app.js CHANGED
@@ -685,7 +685,7 @@ var require_md5 = __commonJS((exports, module) => {
685
685
  });
686
686
  });
687
687
 
688
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
688
+ // node_modules/ws/lib/constants.js
689
689
  var require_constants = __commonJS((exports, module) => {
690
690
  var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
691
691
  var hasBlob = typeof Blob !== "undefined";
@@ -693,7 +693,6 @@ var require_constants = __commonJS((exports, module) => {
693
693
  BINARY_TYPES.push("blob");
694
694
  module.exports = {
695
695
  BINARY_TYPES,
696
- CLOSE_TIMEOUT: 30000,
697
696
  EMPTY_BUFFER: Buffer.alloc(0),
698
697
  GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
699
698
  hasBlob,
@@ -705,7 +704,7 @@ var require_constants = __commonJS((exports, module) => {
705
704
  };
706
705
  });
707
706
 
708
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
707
+ // node_modules/ws/lib/buffer-util.js
709
708
  var require_buffer_util = __commonJS((exports, module) => {
710
709
  var { EMPTY_BUFFER } = require_constants();
711
710
  var FastBuffer = Buffer[Symbol.species];
@@ -766,7 +765,7 @@ var require_buffer_util = __commonJS((exports, module) => {
766
765
  };
767
766
  });
768
767
 
769
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
768
+ // node_modules/ws/lib/limiter.js
770
769
  var require_limiter = __commonJS((exports, module) => {
771
770
  var kDone = Symbol("kDone");
772
771
  var kRun = Symbol("kRun");
@@ -798,7 +797,7 @@ var require_limiter = __commonJS((exports, module) => {
798
797
  module.exports = Limiter;
799
798
  });
800
799
 
801
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
800
+ // node_modules/ws/lib/permessage-deflate.js
802
801
  var require_permessage_deflate = __commonJS((exports, module) => {
803
802
  var zlib = __require("zlib");
804
803
  var bufferUtil = require_buffer_util();
@@ -1053,16 +1052,12 @@ var require_permessage_deflate = __commonJS((exports, module) => {
1053
1052
  }
1054
1053
  function inflateOnError(err) {
1055
1054
  this[kPerMessageDeflate]._inflate = null;
1056
- if (this[kError]) {
1057
- this[kCallback](this[kError]);
1058
- return;
1059
- }
1060
1055
  err[kStatusCode] = 1007;
1061
1056
  this[kCallback](err);
1062
1057
  }
1063
1058
  });
1064
1059
 
1065
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
1060
+ // node_modules/ws/lib/validation.js
1066
1061
  var require_validation = __commonJS((exports, module) => {
1067
1062
  var { isUtf8 } = __require("buffer");
1068
1063
  var { hasBlob } = require_constants();
@@ -1242,7 +1237,7 @@ var require_validation = __commonJS((exports, module) => {
1242
1237
  }
1243
1238
  });
1244
1239
 
1245
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
1240
+ // node_modules/ws/lib/receiver.js
1246
1241
  var require_receiver = __commonJS((exports, module) => {
1247
1242
  var { Writable } = __require("stream");
1248
1243
  var PerMessageDeflate = require_permessage_deflate();
@@ -1623,7 +1618,7 @@ var require_receiver = __commonJS((exports, module) => {
1623
1618
  module.exports = Receiver;
1624
1619
  });
1625
1620
 
1626
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
1621
+ // node_modules/ws/lib/sender.js
1627
1622
  var require_sender = __commonJS((exports, module) => {
1628
1623
  var { Duplex } = __require("stream");
1629
1624
  var { randomFillSync } = __require("crypto");
@@ -1977,7 +1972,7 @@ var require_sender = __commonJS((exports, module) => {
1977
1972
  }
1978
1973
  });
1979
1974
 
1980
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
1975
+ // node_modules/ws/lib/event-target.js
1981
1976
  var require_event_target = __commonJS((exports, module) => {
1982
1977
  var { kForOnEventAttribute, kListener } = require_constants();
1983
1978
  var kCode = Symbol("kCode");
@@ -2128,7 +2123,7 @@ var require_event_target = __commonJS((exports, module) => {
2128
2123
  }
2129
2124
  });
2130
2125
 
2131
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
2126
+ // node_modules/ws/lib/extension.js
2132
2127
  var require_extension = __commonJS((exports, module) => {
2133
2128
  var { tokenChars } = require_validation();
2134
2129
  function push(dest, name, elem) {
@@ -2293,7 +2288,7 @@ var require_extension = __commonJS((exports, module) => {
2293
2288
  module.exports = { format, parse: parse5 };
2294
2289
  });
2295
2290
 
2296
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
2291
+ // node_modules/ws/lib/websocket.js
2297
2292
  var require_websocket = __commonJS((exports, module) => {
2298
2293
  var EventEmitter2 = __require("events");
2299
2294
  var https = __require("https");
@@ -2309,7 +2304,6 @@ var require_websocket = __commonJS((exports, module) => {
2309
2304
  var { isBlob: isBlob2 } = require_validation();
2310
2305
  var {
2311
2306
  BINARY_TYPES,
2312
- CLOSE_TIMEOUT,
2313
2307
  EMPTY_BUFFER,
2314
2308
  GUID,
2315
2309
  kForOnEventAttribute,
@@ -2323,6 +2317,7 @@ var require_websocket = __commonJS((exports, module) => {
2323
2317
  } = require_event_target();
2324
2318
  var { format, parse: parse5 } = require_extension();
2325
2319
  var { toBuffer } = require_buffer_util();
2320
+ var closeTimeout = 30 * 1000;
2326
2321
  var kAborted = Symbol("kAborted");
2327
2322
  var protocolVersions = [8, 13];
2328
2323
  var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -2362,7 +2357,6 @@ var require_websocket = __commonJS((exports, module) => {
2362
2357
  initAsClient(this, address, protocols, options);
2363
2358
  } else {
2364
2359
  this._autoPong = options.autoPong;
2365
- this._closeTimeout = options.closeTimeout;
2366
2360
  this._isServer = true;
2367
2361
  }
2368
2362
  }
@@ -2654,7 +2648,6 @@ var require_websocket = __commonJS((exports, module) => {
2654
2648
  const opts = {
2655
2649
  allowSynchronousEvents: true,
2656
2650
  autoPong: true,
2657
- closeTimeout: CLOSE_TIMEOUT,
2658
2651
  protocolVersion: protocolVersions[1],
2659
2652
  maxPayload: 100 * 1024 * 1024,
2660
2653
  skipUTF8Validation: false,
@@ -2672,7 +2665,6 @@ var require_websocket = __commonJS((exports, module) => {
2672
2665
  port: undefined
2673
2666
  };
2674
2667
  websocket._autoPong = opts.autoPong;
2675
- websocket._closeTimeout = opts.closeTimeout;
2676
2668
  if (!protocolVersions.includes(opts.protocolVersion)) {
2677
2669
  throw new RangeError(`Unsupported protocol version: ${opts.protocolVersion} ` + `(supported versions: ${protocolVersions.join(", ")})`);
2678
2670
  }
@@ -3011,7 +3003,7 @@ var require_websocket = __commonJS((exports, module) => {
3011
3003
  }
3012
3004
  }
3013
3005
  function setCloseTimer(websocket) {
3014
- websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
3006
+ websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
3015
3007
  }
3016
3008
  function socketOnClose() {
3017
3009
  const websocket = this[kWebSocket];
@@ -3019,8 +3011,8 @@ var require_websocket = __commonJS((exports, module) => {
3019
3011
  this.removeListener("data", socketOnData);
3020
3012
  this.removeListener("end", socketOnEnd);
3021
3013
  websocket._readyState = WebSocket.CLOSING;
3022
- if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
3023
- const chunk2 = this.read(this._readableState.length);
3014
+ let chunk2;
3015
+ if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk2 = websocket._socket.read()) !== null) {
3024
3016
  websocket._receiver.write(chunk2);
3025
3017
  }
3026
3018
  websocket._receiver.end();
@@ -3055,7 +3047,7 @@ var require_websocket = __commonJS((exports, module) => {
3055
3047
  }
3056
3048
  });
3057
3049
 
3058
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
3050
+ // node_modules/ws/lib/stream.js
3059
3051
  var require_stream = __commonJS((exports, module) => {
3060
3052
  var WebSocket = require_websocket();
3061
3053
  var { Duplex } = __require("stream");
@@ -3158,7 +3150,7 @@ var require_stream = __commonJS((exports, module) => {
3158
3150
  module.exports = createWebSocketStream;
3159
3151
  });
3160
3152
 
3161
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
3153
+ // node_modules/ws/lib/subprotocol.js
3162
3154
  var require_subprotocol = __commonJS((exports, module) => {
3163
3155
  var { tokenChars } = require_validation();
3164
3156
  function parse5(header) {
@@ -3203,7 +3195,7 @@ var require_subprotocol = __commonJS((exports, module) => {
3203
3195
  module.exports = { parse: parse5 };
3204
3196
  });
3205
3197
 
3206
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
3198
+ // node_modules/ws/lib/websocket-server.js
3207
3199
  var require_websocket_server = __commonJS((exports, module) => {
3208
3200
  var EventEmitter2 = __require("events");
3209
3201
  var http = __require("http");
@@ -3213,7 +3205,7 @@ var require_websocket_server = __commonJS((exports, module) => {
3213
3205
  var PerMessageDeflate = require_permessage_deflate();
3214
3206
  var subprotocol = require_subprotocol();
3215
3207
  var WebSocket = require_websocket();
3216
- var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
3208
+ var { GUID, kWebSocket } = require_constants();
3217
3209
  var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
3218
3210
  var RUNNING = 0;
3219
3211
  var CLOSING = 1;
@@ -3230,7 +3222,6 @@ var require_websocket_server = __commonJS((exports, module) => {
3230
3222
  perMessageDeflate: false,
3231
3223
  handleProtocols: null,
3232
3224
  clientTracking: true,
3233
- closeTimeout: CLOSE_TIMEOUT,
3234
3225
  verifyClient: null,
3235
3226
  noServer: false,
3236
3227
  backlog: null,
@@ -3351,11 +3342,9 @@ var require_websocket_server = __commonJS((exports, module) => {
3351
3342
  abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
3352
3343
  return;
3353
3344
  }
3354
- if (version2 !== 13 && version2 !== 8) {
3345
+ if (version2 !== 8 && version2 !== 13) {
3355
3346
  const message = "Missing or invalid Sec-WebSocket-Version header";
3356
- abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
3357
- "Sec-WebSocket-Version": "13, 8"
3358
- });
3347
+ abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
3359
3348
  return;
3360
3349
  }
3361
3350
  if (!this.shouldHandle(req)) {
@@ -3494,13 +3483,13 @@ var require_websocket_server = __commonJS((exports, module) => {
3494
3483
  \r
3495
3484
  ` + message);
3496
3485
  }
3497
- function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
3486
+ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
3498
3487
  if (server.listenerCount("wsClientError")) {
3499
3488
  const err = new Error(message);
3500
3489
  Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
3501
3490
  server.emit("wsClientError", err, socket, req);
3502
3491
  } else {
3503
- abortHandshake(socket, code, message, headers);
3492
+ abortHandshake(socket, code, message);
3504
3493
  }
3505
3494
  }
3506
3495
  });
@@ -3581,12 +3570,12 @@ function pick(obj, keys) {
3581
3570
 
3582
3571
  // ../../node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
3583
3572
  var import__ = __toESM(require_eventemitter3(), 1);
3584
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
3573
+ // node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
3585
3574
  function isUnsafeProperty(key) {
3586
3575
  return key === "__proto__";
3587
3576
  }
3588
3577
 
3589
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
3578
+ // node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
3590
3579
  function isPlainObject(value) {
3591
3580
  if (!value || typeof value !== "object") {
3592
3581
  return false;
@@ -3599,7 +3588,7 @@ function isPlainObject(value) {
3599
3588
  return Object.prototype.toString.call(value) === "[object Object]";
3600
3589
  }
3601
3590
 
3602
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/object/merge.mjs
3591
+ // node_modules/es-toolkit/dist/object/merge.mjs
3603
3592
  function merge(target, source) {
3604
3593
  const sourceKeys = Object.keys(source);
3605
3594
  for (let i = 0;i < sourceKeys.length; i++) {
@@ -18488,7 +18477,7 @@ class ServerBase {
18488
18477
  }
18489
18478
  }
18490
18479
 
18491
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
18480
+ // node_modules/ws/wrapper.mjs
18492
18481
  var import_stream = __toESM(require_stream(), 1);
18493
18482
  var import_receiver = __toESM(require_receiver(), 1);
18494
18483
  var import_sender = __toESM(require_sender(), 1);
@@ -20131,7 +20120,7 @@ app
20131
20120
  10. **中间件找不到会返回 404**,错误信息中会包含找不到的中间件列表。
20132
20121
  `;
20133
20122
  // package.json
20134
- var version2 = "0.2.7";
20123
+ var version2 = "0.2.9";
20135
20124
 
20136
20125
  // agent/routes/route-create.ts
20137
20126
  app.route({
@@ -1,6 +1,7 @@
1
1
  import { EventEmitter } from 'eventemitter3';
2
2
  import { z } from 'zod';
3
3
  import { Command } from 'commander';
4
+ export { Command, program } from 'commander';
4
5
  import * as http from 'node:http';
5
6
  import { IncomingMessage, ServerResponse } from 'node:http';
6
7
  import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -128,7 +129,7 @@ type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Prom
128
129
  type RunMessage = {
129
130
  path?: string;
130
131
  key?: string;
131
- id?: string;
132
+ rid?: string;
132
133
  payload?: any;
133
134
  };
134
135
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
package/dist/commander.js CHANGED
@@ -45,7 +45,7 @@ var __export = (target, all) => {
45
45
  };
46
46
  var __require = /* @__PURE__ */ createRequire(import.meta.url);
47
47
 
48
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/error.js
48
+ // node_modules/commander/lib/error.js
49
49
  var require_error = __commonJS((exports) => {
50
50
  class CommanderError extends Error {
51
51
  constructor(exitCode, code, message) {
@@ -69,7 +69,7 @@ var require_error = __commonJS((exports) => {
69
69
  exports.InvalidArgumentError = InvalidArgumentError;
70
70
  });
71
71
 
72
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/argument.js
72
+ // node_modules/commander/lib/argument.js
73
73
  var require_argument = __commonJS((exports) => {
74
74
  var { InvalidArgumentError } = require_error();
75
75
 
@@ -149,7 +149,7 @@ var require_argument = __commonJS((exports) => {
149
149
  exports.humanReadableArgName = humanReadableArgName;
150
150
  });
151
151
 
152
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/help.js
152
+ // node_modules/commander/lib/help.js
153
153
  var require_help = __commonJS((exports) => {
154
154
  var { humanReadableArgName } = require_argument();
155
155
 
@@ -506,7 +506,7 @@ ${itemIndentStr}`);
506
506
  exports.stripColor = stripColor;
507
507
  });
508
508
 
509
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/option.js
509
+ // node_modules/commander/lib/option.js
510
510
  var require_option = __commonJS((exports) => {
511
511
  var { InvalidArgumentError } = require_error();
512
512
 
@@ -690,7 +690,7 @@ var require_option = __commonJS((exports) => {
690
690
  exports.DualOptions = DualOptions;
691
691
  });
692
692
 
693
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/suggestSimilar.js
693
+ // node_modules/commander/lib/suggestSimilar.js
694
694
  var require_suggestSimilar = __commonJS((exports) => {
695
695
  var maxDistance = 3;
696
696
  function editDistance(a, b) {
@@ -763,7 +763,7 @@ var require_suggestSimilar = __commonJS((exports) => {
763
763
  exports.suggestSimilar = suggestSimilar;
764
764
  });
765
765
 
766
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/command.js
766
+ // node_modules/commander/lib/command.js
767
767
  var require_command = __commonJS((exports) => {
768
768
  var EventEmitter = __require("node:events").EventEmitter;
769
769
  var childProcess = __require("node:child_process");
@@ -2118,7 +2118,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
2118
2118
  exports.useColor = useColor;
2119
2119
  });
2120
2120
 
2121
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/index.js
2121
+ // node_modules/commander/index.js
2122
2122
  var require_commander = __commonJS((exports) => {
2123
2123
  var { Argument } = require_argument();
2124
2124
  var { Command } = require_command();
@@ -2138,7 +2138,7 @@ var require_commander = __commonJS((exports) => {
2138
2138
  exports.InvalidOptionArgumentError = InvalidArgumentError;
2139
2139
  });
2140
2140
 
2141
- // ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
2141
+ // node_modules/commander/esm.mjs
2142
2142
  var import__ = __toESM(require_commander(), 1);
2143
2143
  var {
2144
2144
  program,
@@ -2154,7 +2154,7 @@ var {
2154
2154
  Help
2155
2155
  } = import__.default;
2156
2156
 
2157
- // ../../node_modules/.pnpm/@kevisual+remote-app@0.0.7/node_modules/@kevisual/remote-app/dist/app.js
2157
+ // node_modules/@kevisual/remote-app/dist/app.js
2158
2158
  var __create2 = Object.create;
2159
2159
  var __getProtoOf2 = Object.getPrototypeOf;
2160
2160
  var __defProp2 = Object.defineProperty;
@@ -16411,10 +16411,12 @@ var createCliList = (app) => {
16411
16411
  }).addTo(app, { overwrite: false });
16412
16412
  };
16413
16413
  export {
16414
+ program,
16414
16415
  parseDescription,
16415
16416
  parseArgs,
16416
16417
  parse5 as parse,
16417
16418
  groupByPath,
16418
16419
  createCommandList,
16419
- createCommand2 as createCommand
16420
+ createCommand2 as createCommand,
16421
+ Command
16420
16422
  };
@@ -128,7 +128,7 @@ type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Prom
128
128
  type RunMessage = {
129
129
  path?: string;
130
130
  key?: string;
131
- id?: string;
131
+ rid?: string;
132
132
  payload?: any;
133
133
  };
134
134
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
@@ -153,7 +153,7 @@ type Run<T extends SimpleObject$1 = {}> = (ctx: Required<RouteContext<T>>) => Pr
153
153
  type RunMessage = {
154
154
  path?: string;
155
155
  key?: string;
156
- id?: string;
156
+ rid?: string;
157
157
  payload?: any;
158
158
  };
159
159
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
@@ -18870,12 +18870,12 @@ function pick(obj, keys) {
18870
18870
 
18871
18871
  // ../../node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
18872
18872
  var import__ = __toESM(require_eventemitter3(), 1);
18873
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
18873
+ // node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
18874
18874
  function isUnsafeProperty(key) {
18875
18875
  return key === "__proto__";
18876
18876
  }
18877
18877
 
18878
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
18878
+ // node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
18879
18879
  function isPlainObject(value) {
18880
18880
  if (!value || typeof value !== "object") {
18881
18881
  return false;
@@ -18888,7 +18888,7 @@ function isPlainObject(value) {
18888
18888
  return Object.prototype.toString.call(value) === "[object Object]";
18889
18889
  }
18890
18890
 
18891
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/object/merge.mjs
18891
+ // node_modules/es-toolkit/dist/object/merge.mjs
18892
18892
  function merge(target, source) {
18893
18893
  const sourceKeys = Object.keys(source);
18894
18894
  for (let i = 0;i < sourceKeys.length; i++) {
@@ -125,7 +125,7 @@ type Run<T extends SimpleObject$1 = {}> = (ctx: Required<RouteContext<T>>) => Pr
125
125
  type RunMessage = {
126
126
  path?: string;
127
127
  key?: string;
128
- id?: string;
128
+ rid?: string;
129
129
  payload?: any;
130
130
  };
131
131
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
@@ -30,7 +30,7 @@ var __toESM = (mod, isNodeMode, target) => {
30
30
  };
31
31
  var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
32
32
 
33
- // ../../node_modules/.pnpm/path-to-regexp@8.4.2/node_modules/path-to-regexp/dist/index.js
33
+ // node_modules/path-to-regexp/dist/index.js
34
34
  var require_dist = __commonJS((exports) => {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.PathError = exports.TokenData = undefined;
package/dist/router.d.ts CHANGED
@@ -159,7 +159,7 @@ type Run<T extends SimpleObject$1 = {}> = (ctx: Required<RouteContext<T>>) => Pr
159
159
  type RunMessage = {
160
160
  path?: string;
161
161
  key?: string;
162
- id?: string;
162
+ rid?: string;
163
163
  payload?: any;
164
164
  };
165
165
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
package/dist/router.js CHANGED
@@ -685,7 +685,7 @@ var require_md5 = __commonJS((exports, module) => {
685
685
  });
686
686
  });
687
687
 
688
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
688
+ // node_modules/ws/lib/constants.js
689
689
  var require_constants = __commonJS((exports, module) => {
690
690
  var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
691
691
  var hasBlob = typeof Blob !== "undefined";
@@ -693,7 +693,6 @@ var require_constants = __commonJS((exports, module) => {
693
693
  BINARY_TYPES.push("blob");
694
694
  module.exports = {
695
695
  BINARY_TYPES,
696
- CLOSE_TIMEOUT: 30000,
697
696
  EMPTY_BUFFER: Buffer.alloc(0),
698
697
  GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
699
698
  hasBlob,
@@ -705,7 +704,7 @@ var require_constants = __commonJS((exports, module) => {
705
704
  };
706
705
  });
707
706
 
708
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
707
+ // node_modules/ws/lib/buffer-util.js
709
708
  var require_buffer_util = __commonJS((exports, module) => {
710
709
  var { EMPTY_BUFFER } = require_constants();
711
710
  var FastBuffer = Buffer[Symbol.species];
@@ -766,7 +765,7 @@ var require_buffer_util = __commonJS((exports, module) => {
766
765
  };
767
766
  });
768
767
 
769
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
768
+ // node_modules/ws/lib/limiter.js
770
769
  var require_limiter = __commonJS((exports, module) => {
771
770
  var kDone = Symbol("kDone");
772
771
  var kRun = Symbol("kRun");
@@ -798,7 +797,7 @@ var require_limiter = __commonJS((exports, module) => {
798
797
  module.exports = Limiter;
799
798
  });
800
799
 
801
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
800
+ // node_modules/ws/lib/permessage-deflate.js
802
801
  var require_permessage_deflate = __commonJS((exports, module) => {
803
802
  var zlib = __require("zlib");
804
803
  var bufferUtil = require_buffer_util();
@@ -1053,16 +1052,12 @@ var require_permessage_deflate = __commonJS((exports, module) => {
1053
1052
  }
1054
1053
  function inflateOnError(err) {
1055
1054
  this[kPerMessageDeflate]._inflate = null;
1056
- if (this[kError]) {
1057
- this[kCallback](this[kError]);
1058
- return;
1059
- }
1060
1055
  err[kStatusCode] = 1007;
1061
1056
  this[kCallback](err);
1062
1057
  }
1063
1058
  });
1064
1059
 
1065
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
1060
+ // node_modules/ws/lib/validation.js
1066
1061
  var require_validation = __commonJS((exports, module) => {
1067
1062
  var { isUtf8 } = __require("buffer");
1068
1063
  var { hasBlob } = require_constants();
@@ -1242,7 +1237,7 @@ var require_validation = __commonJS((exports, module) => {
1242
1237
  }
1243
1238
  });
1244
1239
 
1245
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
1240
+ // node_modules/ws/lib/receiver.js
1246
1241
  var require_receiver = __commonJS((exports, module) => {
1247
1242
  var { Writable } = __require("stream");
1248
1243
  var PerMessageDeflate = require_permessage_deflate();
@@ -1623,7 +1618,7 @@ var require_receiver = __commonJS((exports, module) => {
1623
1618
  module.exports = Receiver;
1624
1619
  });
1625
1620
 
1626
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
1621
+ // node_modules/ws/lib/sender.js
1627
1622
  var require_sender = __commonJS((exports, module) => {
1628
1623
  var { Duplex } = __require("stream");
1629
1624
  var { randomFillSync } = __require("crypto");
@@ -1977,7 +1972,7 @@ var require_sender = __commonJS((exports, module) => {
1977
1972
  }
1978
1973
  });
1979
1974
 
1980
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
1975
+ // node_modules/ws/lib/event-target.js
1981
1976
  var require_event_target = __commonJS((exports, module) => {
1982
1977
  var { kForOnEventAttribute, kListener } = require_constants();
1983
1978
  var kCode = Symbol("kCode");
@@ -2128,7 +2123,7 @@ var require_event_target = __commonJS((exports, module) => {
2128
2123
  }
2129
2124
  });
2130
2125
 
2131
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
2126
+ // node_modules/ws/lib/extension.js
2132
2127
  var require_extension = __commonJS((exports, module) => {
2133
2128
  var { tokenChars } = require_validation();
2134
2129
  function push(dest, name, elem) {
@@ -2293,7 +2288,7 @@ var require_extension = __commonJS((exports, module) => {
2293
2288
  module.exports = { format, parse: parse5 };
2294
2289
  });
2295
2290
 
2296
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
2291
+ // node_modules/ws/lib/websocket.js
2297
2292
  var require_websocket = __commonJS((exports, module) => {
2298
2293
  var EventEmitter2 = __require("events");
2299
2294
  var https = __require("https");
@@ -2309,7 +2304,6 @@ var require_websocket = __commonJS((exports, module) => {
2309
2304
  var { isBlob: isBlob2 } = require_validation();
2310
2305
  var {
2311
2306
  BINARY_TYPES,
2312
- CLOSE_TIMEOUT,
2313
2307
  EMPTY_BUFFER,
2314
2308
  GUID,
2315
2309
  kForOnEventAttribute,
@@ -2323,6 +2317,7 @@ var require_websocket = __commonJS((exports, module) => {
2323
2317
  } = require_event_target();
2324
2318
  var { format, parse: parse5 } = require_extension();
2325
2319
  var { toBuffer } = require_buffer_util();
2320
+ var closeTimeout = 30 * 1000;
2326
2321
  var kAborted = Symbol("kAborted");
2327
2322
  var protocolVersions = [8, 13];
2328
2323
  var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -2362,7 +2357,6 @@ var require_websocket = __commonJS((exports, module) => {
2362
2357
  initAsClient(this, address, protocols, options);
2363
2358
  } else {
2364
2359
  this._autoPong = options.autoPong;
2365
- this._closeTimeout = options.closeTimeout;
2366
2360
  this._isServer = true;
2367
2361
  }
2368
2362
  }
@@ -2654,7 +2648,6 @@ var require_websocket = __commonJS((exports, module) => {
2654
2648
  const opts = {
2655
2649
  allowSynchronousEvents: true,
2656
2650
  autoPong: true,
2657
- closeTimeout: CLOSE_TIMEOUT,
2658
2651
  protocolVersion: protocolVersions[1],
2659
2652
  maxPayload: 100 * 1024 * 1024,
2660
2653
  skipUTF8Validation: false,
@@ -2672,7 +2665,6 @@ var require_websocket = __commonJS((exports, module) => {
2672
2665
  port: undefined
2673
2666
  };
2674
2667
  websocket._autoPong = opts.autoPong;
2675
- websocket._closeTimeout = opts.closeTimeout;
2676
2668
  if (!protocolVersions.includes(opts.protocolVersion)) {
2677
2669
  throw new RangeError(`Unsupported protocol version: ${opts.protocolVersion} ` + `(supported versions: ${protocolVersions.join(", ")})`);
2678
2670
  }
@@ -3011,7 +3003,7 @@ var require_websocket = __commonJS((exports, module) => {
3011
3003
  }
3012
3004
  }
3013
3005
  function setCloseTimer(websocket) {
3014
- websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
3006
+ websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
3015
3007
  }
3016
3008
  function socketOnClose() {
3017
3009
  const websocket = this[kWebSocket];
@@ -3019,8 +3011,8 @@ var require_websocket = __commonJS((exports, module) => {
3019
3011
  this.removeListener("data", socketOnData);
3020
3012
  this.removeListener("end", socketOnEnd);
3021
3013
  websocket._readyState = WebSocket.CLOSING;
3022
- if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
3023
- const chunk2 = this.read(this._readableState.length);
3014
+ let chunk2;
3015
+ if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk2 = websocket._socket.read()) !== null) {
3024
3016
  websocket._receiver.write(chunk2);
3025
3017
  }
3026
3018
  websocket._receiver.end();
@@ -3055,7 +3047,7 @@ var require_websocket = __commonJS((exports, module) => {
3055
3047
  }
3056
3048
  });
3057
3049
 
3058
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
3050
+ // node_modules/ws/lib/stream.js
3059
3051
  var require_stream = __commonJS((exports, module) => {
3060
3052
  var WebSocket = require_websocket();
3061
3053
  var { Duplex } = __require("stream");
@@ -3158,7 +3150,7 @@ var require_stream = __commonJS((exports, module) => {
3158
3150
  module.exports = createWebSocketStream;
3159
3151
  });
3160
3152
 
3161
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
3153
+ // node_modules/ws/lib/subprotocol.js
3162
3154
  var require_subprotocol = __commonJS((exports, module) => {
3163
3155
  var { tokenChars } = require_validation();
3164
3156
  function parse5(header) {
@@ -3203,7 +3195,7 @@ var require_subprotocol = __commonJS((exports, module) => {
3203
3195
  module.exports = { parse: parse5 };
3204
3196
  });
3205
3197
 
3206
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
3198
+ // node_modules/ws/lib/websocket-server.js
3207
3199
  var require_websocket_server = __commonJS((exports, module) => {
3208
3200
  var EventEmitter2 = __require("events");
3209
3201
  var http = __require("http");
@@ -3213,7 +3205,7 @@ var require_websocket_server = __commonJS((exports, module) => {
3213
3205
  var PerMessageDeflate = require_permessage_deflate();
3214
3206
  var subprotocol = require_subprotocol();
3215
3207
  var WebSocket = require_websocket();
3216
- var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
3208
+ var { GUID, kWebSocket } = require_constants();
3217
3209
  var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
3218
3210
  var RUNNING = 0;
3219
3211
  var CLOSING = 1;
@@ -3230,7 +3222,6 @@ var require_websocket_server = __commonJS((exports, module) => {
3230
3222
  perMessageDeflate: false,
3231
3223
  handleProtocols: null,
3232
3224
  clientTracking: true,
3233
- closeTimeout: CLOSE_TIMEOUT,
3234
3225
  verifyClient: null,
3235
3226
  noServer: false,
3236
3227
  backlog: null,
@@ -3351,11 +3342,9 @@ var require_websocket_server = __commonJS((exports, module) => {
3351
3342
  abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
3352
3343
  return;
3353
3344
  }
3354
- if (version2 !== 13 && version2 !== 8) {
3345
+ if (version2 !== 8 && version2 !== 13) {
3355
3346
  const message = "Missing or invalid Sec-WebSocket-Version header";
3356
- abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
3357
- "Sec-WebSocket-Version": "13, 8"
3358
- });
3347
+ abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
3359
3348
  return;
3360
3349
  }
3361
3350
  if (!this.shouldHandle(req)) {
@@ -3494,13 +3483,13 @@ var require_websocket_server = __commonJS((exports, module) => {
3494
3483
  \r
3495
3484
  ` + message);
3496
3485
  }
3497
- function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
3486
+ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
3498
3487
  if (server.listenerCount("wsClientError")) {
3499
3488
  const err = new Error(message);
3500
3489
  Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
3501
3490
  server.emit("wsClientError", err, socket, req);
3502
3491
  } else {
3503
- abortHandshake(socket, code, message, headers);
3492
+ abortHandshake(socket, code, message);
3504
3493
  }
3505
3494
  }
3506
3495
  });
@@ -3581,12 +3570,12 @@ function pick(obj, keys) {
3581
3570
 
3582
3571
  // ../../node_modules/.pnpm/eventemitter3@5.0.4/node_modules/eventemitter3/index.mjs
3583
3572
  var import__ = __toESM(require_eventemitter3(), 1);
3584
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
3573
+ // node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
3585
3574
  function isUnsafeProperty(key) {
3586
3575
  return key === "__proto__";
3587
3576
  }
3588
3577
 
3589
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
3578
+ // node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
3590
3579
  function isPlainObject(value) {
3591
3580
  if (!value || typeof value !== "object") {
3592
3581
  return false;
@@ -3599,7 +3588,7 @@ function isPlainObject(value) {
3599
3588
  return Object.prototype.toString.call(value) === "[object Object]";
3600
3589
  }
3601
3590
 
3602
- // ../../node_modules/.pnpm/es-toolkit@1.45.1/node_modules/es-toolkit/dist/object/merge.mjs
3591
+ // node_modules/es-toolkit/dist/object/merge.mjs
3603
3592
  function merge(target, source) {
3604
3593
  const sourceKeys = Object.keys(source);
3605
3594
  for (let i = 0;i < sourceKeys.length; i++) {
@@ -18662,7 +18651,7 @@ class ServerBase {
18662
18651
  }
18663
18652
  }
18664
18653
 
18665
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
18654
+ // node_modules/ws/wrapper.mjs
18666
18655
  var import_stream = __toESM(require_stream(), 1);
18667
18656
  var import_receiver = __toESM(require_receiver(), 1);
18668
18657
  var import_sender = __toESM(require_sender(), 1);
package/dist/ws.d.ts CHANGED
@@ -175,7 +175,7 @@ type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Prom
175
175
  type RunMessage = {
176
176
  path?: string;
177
177
  key?: string;
178
- id?: string;
178
+ rid?: string;
179
179
  payload?: any;
180
180
  };
181
181
  type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
package/dist/ws.js CHANGED
@@ -32,7 +32,7 @@ var __toESM = (mod, isNodeMode, target) => {
32
32
  var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
33
33
  var __require = /* @__PURE__ */ createRequire(import.meta.url);
34
34
 
35
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
35
+ // node_modules/ws/lib/constants.js
36
36
  var require_constants = __commonJS((exports, module) => {
37
37
  var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
38
38
  var hasBlob = typeof Blob !== "undefined";
@@ -40,7 +40,6 @@ var require_constants = __commonJS((exports, module) => {
40
40
  BINARY_TYPES.push("blob");
41
41
  module.exports = {
42
42
  BINARY_TYPES,
43
- CLOSE_TIMEOUT: 30000,
44
43
  EMPTY_BUFFER: Buffer.alloc(0),
45
44
  GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
46
45
  hasBlob,
@@ -52,7 +51,7 @@ var require_constants = __commonJS((exports, module) => {
52
51
  };
53
52
  });
54
53
 
55
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
54
+ // node_modules/ws/lib/buffer-util.js
56
55
  var require_buffer_util = __commonJS((exports, module) => {
57
56
  var { EMPTY_BUFFER } = require_constants();
58
57
  var FastBuffer = Buffer[Symbol.species];
@@ -113,7 +112,7 @@ var require_buffer_util = __commonJS((exports, module) => {
113
112
  };
114
113
  });
115
114
 
116
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
115
+ // node_modules/ws/lib/limiter.js
117
116
  var require_limiter = __commonJS((exports, module) => {
118
117
  var kDone = Symbol("kDone");
119
118
  var kRun = Symbol("kRun");
@@ -145,7 +144,7 @@ var require_limiter = __commonJS((exports, module) => {
145
144
  module.exports = Limiter;
146
145
  });
147
146
 
148
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
147
+ // node_modules/ws/lib/permessage-deflate.js
149
148
  var require_permessage_deflate = __commonJS((exports, module) => {
150
149
  var zlib = __require("zlib");
151
150
  var bufferUtil = require_buffer_util();
@@ -400,16 +399,12 @@ var require_permessage_deflate = __commonJS((exports, module) => {
400
399
  }
401
400
  function inflateOnError(err) {
402
401
  this[kPerMessageDeflate]._inflate = null;
403
- if (this[kError]) {
404
- this[kCallback](this[kError]);
405
- return;
406
- }
407
402
  err[kStatusCode] = 1007;
408
403
  this[kCallback](err);
409
404
  }
410
405
  });
411
406
 
412
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
407
+ // node_modules/ws/lib/validation.js
413
408
  var require_validation = __commonJS((exports, module) => {
414
409
  var { isUtf8 } = __require("buffer");
415
410
  var { hasBlob } = require_constants();
@@ -589,7 +584,7 @@ var require_validation = __commonJS((exports, module) => {
589
584
  }
590
585
  });
591
586
 
592
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
587
+ // node_modules/ws/lib/receiver.js
593
588
  var require_receiver = __commonJS((exports, module) => {
594
589
  var { Writable } = __require("stream");
595
590
  var PerMessageDeflate = require_permessage_deflate();
@@ -970,7 +965,7 @@ var require_receiver = __commonJS((exports, module) => {
970
965
  module.exports = Receiver;
971
966
  });
972
967
 
973
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
968
+ // node_modules/ws/lib/sender.js
974
969
  var require_sender = __commonJS((exports, module) => {
975
970
  var { Duplex } = __require("stream");
976
971
  var { randomFillSync } = __require("crypto");
@@ -1324,7 +1319,7 @@ var require_sender = __commonJS((exports, module) => {
1324
1319
  }
1325
1320
  });
1326
1321
 
1327
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
1322
+ // node_modules/ws/lib/event-target.js
1328
1323
  var require_event_target = __commonJS((exports, module) => {
1329
1324
  var { kForOnEventAttribute, kListener } = require_constants();
1330
1325
  var kCode = Symbol("kCode");
@@ -1475,7 +1470,7 @@ var require_event_target = __commonJS((exports, module) => {
1475
1470
  }
1476
1471
  });
1477
1472
 
1478
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
1473
+ // node_modules/ws/lib/extension.js
1479
1474
  var require_extension = __commonJS((exports, module) => {
1480
1475
  var { tokenChars } = require_validation();
1481
1476
  function push(dest, name, elem) {
@@ -1640,7 +1635,7 @@ var require_extension = __commonJS((exports, module) => {
1640
1635
  module.exports = { format, parse };
1641
1636
  });
1642
1637
 
1643
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
1638
+ // node_modules/ws/lib/websocket.js
1644
1639
  var require_websocket = __commonJS((exports, module) => {
1645
1640
  var EventEmitter = __require("events");
1646
1641
  var https = __require("https");
@@ -1656,7 +1651,6 @@ var require_websocket = __commonJS((exports, module) => {
1656
1651
  var { isBlob } = require_validation();
1657
1652
  var {
1658
1653
  BINARY_TYPES,
1659
- CLOSE_TIMEOUT,
1660
1654
  EMPTY_BUFFER,
1661
1655
  GUID,
1662
1656
  kForOnEventAttribute,
@@ -1670,6 +1664,7 @@ var require_websocket = __commonJS((exports, module) => {
1670
1664
  } = require_event_target();
1671
1665
  var { format, parse } = require_extension();
1672
1666
  var { toBuffer } = require_buffer_util();
1667
+ var closeTimeout = 30 * 1000;
1673
1668
  var kAborted = Symbol("kAborted");
1674
1669
  var protocolVersions = [8, 13];
1675
1670
  var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -1709,7 +1704,6 @@ var require_websocket = __commonJS((exports, module) => {
1709
1704
  initAsClient(this, address, protocols, options);
1710
1705
  } else {
1711
1706
  this._autoPong = options.autoPong;
1712
- this._closeTimeout = options.closeTimeout;
1713
1707
  this._isServer = true;
1714
1708
  }
1715
1709
  }
@@ -2001,7 +1995,6 @@ var require_websocket = __commonJS((exports, module) => {
2001
1995
  const opts = {
2002
1996
  allowSynchronousEvents: true,
2003
1997
  autoPong: true,
2004
- closeTimeout: CLOSE_TIMEOUT,
2005
1998
  protocolVersion: protocolVersions[1],
2006
1999
  maxPayload: 100 * 1024 * 1024,
2007
2000
  skipUTF8Validation: false,
@@ -2019,7 +2012,6 @@ var require_websocket = __commonJS((exports, module) => {
2019
2012
  port: undefined
2020
2013
  };
2021
2014
  websocket._autoPong = opts.autoPong;
2022
- websocket._closeTimeout = opts.closeTimeout;
2023
2015
  if (!protocolVersions.includes(opts.protocolVersion)) {
2024
2016
  throw new RangeError(`Unsupported protocol version: ${opts.protocolVersion} ` + `(supported versions: ${protocolVersions.join(", ")})`);
2025
2017
  }
@@ -2358,7 +2350,7 @@ var require_websocket = __commonJS((exports, module) => {
2358
2350
  }
2359
2351
  }
2360
2352
  function setCloseTimer(websocket) {
2361
- websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
2353
+ websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
2362
2354
  }
2363
2355
  function socketOnClose() {
2364
2356
  const websocket = this[kWebSocket];
@@ -2366,8 +2358,8 @@ var require_websocket = __commonJS((exports, module) => {
2366
2358
  this.removeListener("data", socketOnData);
2367
2359
  this.removeListener("end", socketOnEnd);
2368
2360
  websocket._readyState = WebSocket.CLOSING;
2369
- if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
2370
- const chunk = this.read(this._readableState.length);
2361
+ let chunk;
2362
+ if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk = websocket._socket.read()) !== null) {
2371
2363
  websocket._receiver.write(chunk);
2372
2364
  }
2373
2365
  websocket._receiver.end();
@@ -2402,7 +2394,7 @@ var require_websocket = __commonJS((exports, module) => {
2402
2394
  }
2403
2395
  });
2404
2396
 
2405
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
2397
+ // node_modules/ws/lib/stream.js
2406
2398
  var require_stream = __commonJS((exports, module) => {
2407
2399
  var WebSocket = require_websocket();
2408
2400
  var { Duplex } = __require("stream");
@@ -2505,7 +2497,7 @@ var require_stream = __commonJS((exports, module) => {
2505
2497
  module.exports = createWebSocketStream;
2506
2498
  });
2507
2499
 
2508
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
2500
+ // node_modules/ws/lib/subprotocol.js
2509
2501
  var require_subprotocol = __commonJS((exports, module) => {
2510
2502
  var { tokenChars } = require_validation();
2511
2503
  function parse(header) {
@@ -2550,7 +2542,7 @@ var require_subprotocol = __commonJS((exports, module) => {
2550
2542
  module.exports = { parse };
2551
2543
  });
2552
2544
 
2553
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
2545
+ // node_modules/ws/lib/websocket-server.js
2554
2546
  var require_websocket_server = __commonJS((exports, module) => {
2555
2547
  var EventEmitter = __require("events");
2556
2548
  var http = __require("http");
@@ -2560,7 +2552,7 @@ var require_websocket_server = __commonJS((exports, module) => {
2560
2552
  var PerMessageDeflate = require_permessage_deflate();
2561
2553
  var subprotocol = require_subprotocol();
2562
2554
  var WebSocket = require_websocket();
2563
- var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
2555
+ var { GUID, kWebSocket } = require_constants();
2564
2556
  var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
2565
2557
  var RUNNING = 0;
2566
2558
  var CLOSING = 1;
@@ -2577,7 +2569,6 @@ var require_websocket_server = __commonJS((exports, module) => {
2577
2569
  perMessageDeflate: false,
2578
2570
  handleProtocols: null,
2579
2571
  clientTracking: true,
2580
- closeTimeout: CLOSE_TIMEOUT,
2581
2572
  verifyClient: null,
2582
2573
  noServer: false,
2583
2574
  backlog: null,
@@ -2698,11 +2689,9 @@ var require_websocket_server = __commonJS((exports, module) => {
2698
2689
  abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
2699
2690
  return;
2700
2691
  }
2701
- if (version !== 13 && version !== 8) {
2692
+ if (version !== 8 && version !== 13) {
2702
2693
  const message = "Missing or invalid Sec-WebSocket-Version header";
2703
- abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
2704
- "Sec-WebSocket-Version": "13, 8"
2705
- });
2694
+ abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
2706
2695
  return;
2707
2696
  }
2708
2697
  if (!this.shouldHandle(req)) {
@@ -2841,18 +2830,18 @@ var require_websocket_server = __commonJS((exports, module) => {
2841
2830
  \r
2842
2831
  ` + message);
2843
2832
  }
2844
- function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
2833
+ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
2845
2834
  if (server.listenerCount("wsClientError")) {
2846
2835
  const err = new Error(message);
2847
2836
  Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
2848
2837
  server.emit("wsClientError", err, socket, req);
2849
2838
  } else {
2850
- abortHandshake(socket, code, message, headers);
2839
+ abortHandshake(socket, code, message);
2851
2840
  }
2852
2841
  }
2853
2842
  });
2854
2843
 
2855
- // ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
2844
+ // node_modules/ws/wrapper.mjs
2856
2845
  var import_stream = __toESM(require_stream(), 1);
2857
2846
  var import_receiver = __toESM(require_receiver(), 1);
2858
2847
  var import_sender = __toESM(require_sender(), 1);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.schemastore.org/package",
3
3
  "name": "@kevisual/router",
4
- "version": "0.2.8",
4
+ "version": "0.2.10",
5
5
  "description": "",
6
6
  "type": "module",
7
7
  "main": "./dist/router.js",
@@ -30,8 +30,8 @@
30
30
  "@kevisual/query": "^0.0.56",
31
31
  "@kevisual/remote-app": "^0.0.7",
32
32
  "@kevisual/use-config": "^1.0.30",
33
- "@opencode-ai/plugin": "^1.4.6",
34
- "@types/bun": "^1.3.12",
33
+ "@opencode-ai/plugin": "^1.14.22",
34
+ "@types/bun": "^1.3.13",
35
35
  "@types/crypto-js": "^4.2.2",
36
36
  "@types/node": "^25.6.0",
37
37
  "@types/send": "^1.2.1",
@@ -39,13 +39,13 @@
39
39
  "@types/xml2js": "^0.4.14",
40
40
  "commander": "^14.0.3",
41
41
  "crypto-js": "^4.2.0",
42
- "es-toolkit": "^1.45.1",
42
+ "es-toolkit": "^1.46.0",
43
43
  "eventemitter3": "^5.0.4",
44
44
  "fast-glob": "^3.3.3",
45
45
  "nanoid": "^5.1.9",
46
46
  "path-to-regexp": "^8.4.2",
47
47
  "send": "^1.2.1",
48
- "typescript": "^6.0.2",
48
+ "typescript": "^6.0.3",
49
49
  "ws": "npm:@kevisual/ws",
50
50
  "xml2js": "^0.6.2"
51
51
  },
@@ -54,8 +54,6 @@
54
54
  "url": "git+https://github.com/abearxiong/kevisual-router.git"
55
55
  },
56
56
  "dependencies": {
57
- "crypto-js": "^4.2.0",
58
- "es-toolkit": "^1.45.1",
59
57
  "zod": "^4.3.6"
60
58
  },
61
59
  "publishConfig": {
package/src/commander.ts CHANGED
@@ -266,4 +266,8 @@ const createCliList = (app: App) => {
266
266
 
267
267
  console.log(table);
268
268
  }).addTo(app, { overwrite: false })
269
- }
269
+ }
270
+
271
+ export { program }
272
+
273
+ export { Command }
package/src/route.ts CHANGED
@@ -77,7 +77,7 @@ export type RouteContext<T = { code?: number }, U extends SimpleObject = {}, S =
77
77
  } & T & U;
78
78
  export type SimpleObject = Record<string, any>;
79
79
  export type Run<T extends SimpleObject = {}> = (ctx: Required<RouteContext<T>>) => Promise<typeof ctx | null | void>;
80
- export type RunMessage = { path?: string; key?: string; id?: string; payload?: any; };
80
+ export type RunMessage = { path?: string; key?: string; rid?: string; payload?: any; };
81
81
  export type NextRoute = Pick<Route, 'rid' | 'path' | 'key'>;
82
82
  export type RouteMiddleware =
83
83
  | {