@kevisual/router 0.0.51 → 0.0.52

package/dist/router-browser.js

@@ -627,7 +627,7 @@ class QueryRouter {
                 description: '列出当前应用下的所有的路由信息',
                 run: async (ctx) => {
                     const list = this.getList(filter);
-                    ctx.body = list;
+                    ctx.body = { list };
                 },
             });
             this.add(listRoute);

package/dist/router.d.ts

@@ -2,8 +2,7 @@ import * as http from 'node:http';
 import http__default, { IncomingMessage, ServerResponse } from 'node:http';
 import https from 'node:https';
 import http2 from 'node:http2';
-import EventEmitter from 'node:events';
-import { EventEmitter as EventEmitter$1 } from 'events';
+import { EventEmitter } from 'eventemitter3';
 import { WebSocketServer } from 'ws';
 import { z } from 'zod';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -626,7 +625,7 @@ declare class ServerBase implements ServerType {
     _callback: any;
     cors: Cors$1;
     listeners: Listener[];
-    emitter: EventEmitter$1<any>;
+    emitter: EventEmitter<string | symbol, any>;
     showConnected: boolean;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
@@ -654,6 +653,10 @@ declare class ServerBase implements ServerType {
     createCallback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): Promise<void>;
+    /**
+     * 根据emitter提醒关闭ws连接
+     * @param ws
+     */
     onWsClose(ws: WS): Promise<void>;
     sendConnected(ws: WS): Promise<void>;
 }

package/dist/router.js

@@ -3,7 +3,7 @@ import require$$2 from 'node:http';
 import require$$1$1 from 'node:https';
 import http2 from 'node:http2';
 import url from 'node:url';
-import require$$0$3, { EventEmitter } from 'node:events';
+import require$$0$3 from 'node:events';
 import require$$3 from 'node:net';
 import require$$4 from 'node:tls';
 import require$$0$2 from 'node:stream';
@@ -649,7 +649,7 @@ class QueryRouter {
                 description: '列出当前应用下的所有的路由信息',
                 run: async (ctx) => {
                     const list = this.getList(filter);
-                    ctx.body = list;
+                    ctx.body = { list };
                 },
             });
             this.add(listRoute);
@@ -1174,6 +1174,360 @@ const parseIfJson = (input) => {
     return str;
 };
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+var eventemitter3 = {exports: {}};
+
+var hasRequiredEventemitter3;
+
+function requireEventemitter3 () {
+	if (hasRequiredEventemitter3) return eventemitter3.exports;
+	hasRequiredEventemitter3 = 1;
+	(function (module) {
+
+		var has = Object.prototype.hasOwnProperty
+		  , prefix = '~';
+
+		/**
+		 * Constructor to create a storage for our `EE` objects.
+		 * An `Events` instance is a plain object whose properties are event names.
+		 *
+		 * @constructor
+		 * @private
+		 */
+		function Events() {}
+
+		//
+		// We try to not inherit from `Object.prototype`. In some engines creating an
+		// instance in this way is faster than calling `Object.create(null)` directly.
+		// If `Object.create(null)` is not supported we prefix the event names with a
+		// character to make sure that the built-in object properties are not
+		// overridden or used as an attack vector.
+		//
+		if (Object.create) {
+		  Events.prototype = Object.create(null);
+
+		  //
+		  // This hack is needed because the `__proto__` property is still inherited in
+		  // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
+		  //
+		  if (!new Events().__proto__) prefix = false;
+		}
+
+		/**
+		 * Representation of a single event listener.
+		 *
+		 * @param {Function} fn The listener function.
+		 * @param {*} context The context to invoke the listener with.
+		 * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
+		 * @constructor
+		 * @private
+		 */
+		function EE(fn, context, once) {
+		  this.fn = fn;
+		  this.context = context;
+		  this.once = once || false;
+		}
+
+		/**
+		 * Add a listener for a given event.
+		 *
+		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
+		 * @param {(String|Symbol)} event The event name.
+		 * @param {Function} fn The listener function.
+		 * @param {*} context The context to invoke the listener with.
+		 * @param {Boolean} once Specify if the listener is a one-time listener.
+		 * @returns {EventEmitter}
+		 * @private
+		 */
+		function addListener(emitter, event, fn, context, once) {
+		  if (typeof fn !== 'function') {
+		    throw new TypeError('The listener must be a function');
+		  }
+
+		  var listener = new EE(fn, context || emitter, once)
+		    , evt = prefix ? prefix + event : event;
+
+		  if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;
+		  else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
+		  else emitter._events[evt] = [emitter._events[evt], listener];
+
+		  return emitter;
+		}
+
+		/**
+		 * Clear event by name.
+		 *
+		 * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
+		 * @param {(String|Symbol)} evt The Event name.
+		 * @private
+		 */
+		function clearEvent(emitter, evt) {
+		  if (--emitter._eventsCount === 0) emitter._events = new Events();
+		  else delete emitter._events[evt];
+		}
+
+		/**
+		 * Minimal `EventEmitter` interface that is molded against the Node.js
+		 * `EventEmitter` interface.
+		 *
+		 * @constructor
+		 * @public
+		 */
+		function EventEmitter() {
+		  this._events = new Events();
+		  this._eventsCount = 0;
+		}
+
+		/**
+		 * Return an array listing the events for which the emitter has registered
+		 * listeners.
+		 *
+		 * @returns {Array}
+		 * @public
+		 */
+		EventEmitter.prototype.eventNames = function eventNames() {
+		  var names = []
+		    , events
+		    , name;
+
+		  if (this._eventsCount === 0) return names;
+
+		  for (name in (events = this._events)) {
+		    if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
+		  }
+
+		  if (Object.getOwnPropertySymbols) {
+		    return names.concat(Object.getOwnPropertySymbols(events));
+		  }
+
+		  return names;
+		};
+
+		/**
+		 * Return the listeners registered for a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @returns {Array} The registered listeners.
+		 * @public
+		 */
+		EventEmitter.prototype.listeners = function listeners(event) {
+		  var evt = prefix ? prefix + event : event
+		    , handlers = this._events[evt];
+
+		  if (!handlers) return [];
+		  if (handlers.fn) return [handlers.fn];
+
+		  for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
+		    ee[i] = handlers[i].fn;
+		  }
+
+		  return ee;
+		};
+
+		/**
+		 * Return the number of listeners listening to a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @returns {Number} The number of listeners.
+		 * @public
+		 */
+		EventEmitter.prototype.listenerCount = function listenerCount(event) {
+		  var evt = prefix ? prefix + event : event
+		    , listeners = this._events[evt];
+
+		  if (!listeners) return 0;
+		  if (listeners.fn) return 1;
+		  return listeners.length;
+		};
+
+		/**
+		 * Calls each of the listeners registered for a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @returns {Boolean} `true` if the event had listeners, else `false`.
+		 * @public
+		 */
+		EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
+		  var evt = prefix ? prefix + event : event;
+
+		  if (!this._events[evt]) return false;
+
+		  var listeners = this._events[evt]
+		    , len = arguments.length
+		    , args
+		    , i;
+
+		  if (listeners.fn) {
+		    if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
+
+		    switch (len) {
+		      case 1: return listeners.fn.call(listeners.context), true;
+		      case 2: return listeners.fn.call(listeners.context, a1), true;
+		      case 3: return listeners.fn.call(listeners.context, a1, a2), true;
+		      case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;
+		      case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
+		      case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
+		    }
+
+		    for (i = 1, args = new Array(len -1); i < len; i++) {
+		      args[i - 1] = arguments[i];
+		    }
+
+		    listeners.fn.apply(listeners.context, args);
+		  } else {
+		    var length = listeners.length
+		      , j;
+
+		    for (i = 0; i < length; i++) {
+		      if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
+
+		      switch (len) {
+		        case 1: listeners[i].fn.call(listeners[i].context); break;
+		        case 2: listeners[i].fn.call(listeners[i].context, a1); break;
+		        case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;
+		        case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;
+		        default:
+		          if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {
+		            args[j - 1] = arguments[j];
+		          }
+
+		          listeners[i].fn.apply(listeners[i].context, args);
+		      }
+		    }
+		  }
+
+		  return true;
+		};
+
+		/**
+		 * Add a listener for a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @param {Function} fn The listener function.
+		 * @param {*} [context=this] The context to invoke the listener with.
+		 * @returns {EventEmitter} `this`.
+		 * @public
+		 */
+		EventEmitter.prototype.on = function on(event, fn, context) {
+		  return addListener(this, event, fn, context, false);
+		};
+
+		/**
+		 * Add a one-time listener for a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @param {Function} fn The listener function.
+		 * @param {*} [context=this] The context to invoke the listener with.
+		 * @returns {EventEmitter} `this`.
+		 * @public
+		 */
+		EventEmitter.prototype.once = function once(event, fn, context) {
+		  return addListener(this, event, fn, context, true);
+		};
+
+		/**
+		 * Remove the listeners of a given event.
+		 *
+		 * @param {(String|Symbol)} event The event name.
+		 * @param {Function} fn Only remove the listeners that match this function.
+		 * @param {*} context Only remove the listeners that have this context.
+		 * @param {Boolean} once Only remove one-time listeners.
+		 * @returns {EventEmitter} `this`.
+		 * @public
+		 */
+		EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
+		  var evt = prefix ? prefix + event : event;
+
+		  if (!this._events[evt]) return this;
+		  if (!fn) {
+		    clearEvent(this, evt);
+		    return this;
+		  }
+
+		  var listeners = this._events[evt];
+
+		  if (listeners.fn) {
+		    if (
+		      listeners.fn === fn &&
+		      (!once || listeners.once) &&
+		      (!context || listeners.context === context)
+		    ) {
+		      clearEvent(this, evt);
+		    }
+		  } else {
+		    for (var i = 0, events = [], length = listeners.length; i < length; i++) {
+		      if (
+		        listeners[i].fn !== fn ||
+		        (once && !listeners[i].once) ||
+		        (context && listeners[i].context !== context)
+		      ) {
+		        events.push(listeners[i]);
+		      }
+		    }
+
+		    //
+		    // Reset the array, or remove it completely if we have no more listeners.
+		    //
+		    if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
+		    else clearEvent(this, evt);
+		  }
+
+		  return this;
+		};
+
+		/**
+		 * Remove all listeners, or those of the specified event.
+		 *
+		 * @param {(String|Symbol)} [event] The event name.
+		 * @returns {EventEmitter} `this`.
+		 * @public
+		 */
+		EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
+		  var evt;
+
+		  if (event) {
+		    evt = prefix ? prefix + event : event;
+		    if (this._events[evt]) clearEvent(this, evt);
+		  } else {
+		    this._events = new Events();
+		    this._eventsCount = 0;
+		  }
+
+		  return this;
+		};
+
+		//
+		// Alias methods names because people roll like that.
+		//
+		EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
+		EventEmitter.prototype.addListener = EventEmitter.prototype.on;
+
+		//
+		// Expose the prefix.
+		//
+		EventEmitter.prefixed = prefix;
+
+		//
+		// Allow `EventEmitter` to be imported as module namespace.
+		//
+		EventEmitter.EventEmitter = EventEmitter;
+
+		//
+		// Expose the module.
+		//
+		{
+		  module.exports = EventEmitter;
+		} 
+	} (eventemitter3));
+	return eventemitter3.exports;
+}
+
+var eventemitter3Exports = requireEventemitter3();
+var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
+
 // 实现函数
 function createHandleCtx(req, res) {
     // 用于存储所有的 Set-Cookie 字符串
@@ -1419,6 +1773,10 @@ class ServerBase {
             end({ code: 500, message: `${type} server is error` });
         }
     }
+    /**
+     * 根据emitter提醒关闭ws连接
+     * @param ws
+     */
     async onWsClose(ws) {
         const id = ws?.data?.id || '';
         if (id) {
@@ -1436,10 +1794,6 @@ class ServerBase {
     }
 }
 
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
 var constants;
 var hasRequiredConstants;
 
@@ -6390,6 +6744,8 @@ class WsServerBase {
             });
             this.server.sendConnected(ws);
             this.wss.on('close', () => {
+                // @ts-ignore
+                ws?.data?.close?.();
                 this.server.onWsClose(ws);
             });
         });
@@ -6731,6 +7087,7 @@ class BunServer extends ServerBase {
                 },
                 close: (ws) => {
                     // WebSocket 连接关闭
+                    ws?.data?.close?.();
                     this.onWsClose(ws);
                 },
             },

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -32,9 +32,8 @@
     "@types/bun": "^1.3.5",
     "@types/node": "^25.0.3",
     "@types/send": "^1.2.1",
-    "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
-    "cookie": "^1.1.1",
+    "@types/ws": "^8.18.1",
     "nanoid": "^5.1.6",
     "rollup": "^4.54.0",
     "rollup-plugin-dts": "^6.3.0",
@@ -43,15 +42,16 @@
     "tslib": "^2.8.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
-    "zod": "^4.2.1"
+    "zod": "^4.2.1",
+    "ws": "npm:@kevisual/ws"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/abearxiong/kevisual-router.git"
   },
   "dependencies": {
+    "eventemitter3": "^5.0.1",
     "path-to-regexp": "^8.3.0",
     "selfsigned": "^5.4.0",
     "send": "^1.2.1"
@@ -95,4 +95,4 @@
       "require": "./src/*"
     }
   }
-}
+}

package/src/route.ts

@@ -562,7 +562,7 @@ export class QueryRouter {
         description: '列出当前应用下的所有的路由信息',
         run: async (ctx: RouteContext) => {
           const list = this.getList(filter);
-          ctx.body = list;
+          ctx.body = { list };
         },
       });
       this.add(listRoute);

package/src/server/server-base.ts

@@ -3,7 +3,7 @@ import { handleServer } from './handle-server.ts';
 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 'events';
+import { EventEmitter } from 'eventemitter3';
 type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
 
 export type HandleCtx = {
@@ -273,6 +273,10 @@ export class ServerBase implements ServerType {
       end({ code: 500, message: `${type} server is error` });
     }
   }
+  /**
+   * 根据emitter提醒关闭ws连接
+   * @param ws 
+   */
   async onWsClose(ws: WS) {
     const id = ws?.data?.id || '';
     if (id) {

package/src/server/server-bun.ts

@@ -253,6 +253,7 @@ export class BunServer extends ServerBase implements ServerType {
         },
         close: (ws: any) => {
           // WebSocket 连接关闭
+          ws?.data?.close?.();
           this.onWsClose(ws);
         },
       },

package/src/server/server-type.ts

@@ -1,4 +1,4 @@
-import EventEmitter from 'node:events';
+import { EventEmitter } from 'eventemitter3';
 import * as http from 'node:http';
 
 

package/src/server/ws-server.ts

@@ -2,7 +2,6 @@
 import { WebSocketServer } from 'ws';
 import type { WebSocket } from 'ws';
 import { ServerType } from './server-type.ts'
-import { parseIfJson } from '../utils/parse.ts';
 import { isBun } from '../utils/is-engine.ts';
 
 
@@ -62,6 +61,8 @@ export class WsServerBase {
       });
       this.server.sendConnected(ws);
       this.wss.on('close', () => {
+        // @ts-ignore
+        ws?.data?.close?.();
         this.server.onWsClose(ws);
       });
     });