@kevisual/router 0.0.46 → 0.0.47

package/dist/router.d.ts

@@ -4,7 +4,7 @@ import https from 'node:https';
 import http2 from 'node:http2';
 import EventEmitter from 'node:events';
 import { EventEmitter as EventEmitter$1 } from 'events';
-import { WebSocketServer, WebSocket } from 'ws';
+import { WebSocketServer } from 'ws';
 import { z } from 'zod';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
 import { RouteOpts as RouteOpts$1, QueryRouterServer as QueryRouterServer$1, RouteMiddleware as RouteMiddleware$1, Run as Run$1 } from '@kevisual/router';
@@ -411,7 +411,7 @@ interface ServerType {
     server?: any;
     handle: ServerOpts['handle'];
     setHandle(handle?: any): void;
-    listeners: Listener$1[];
+    listeners: Listener[];
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
     listen(port: number, backlog?: number, listeningListener?: () => void): void;
@@ -451,13 +451,13 @@ type WS = {
         userApp?: string;
     };
 };
-type Listener$1 = {
+type Listener = {
     id?: string;
     io?: boolean;
     path?: string;
-    fun: WebScoketListenerFun | HttpListenerFun;
+    func: WebSocketListenerFun | HttpListenerFun;
 };
-type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 type WebSocketReq = {
     emitter?: EventEmitter;
@@ -470,8 +470,8 @@ type WebSocketReq = {
 type WebSocketRes = {
     end: (data: any) => void;
 };
-type ListenerFun = WebScoketListenerFun | HttpListenerFun;
-type OnListener = Listener$1 | ListenerFun | (Listener$1 | ListenerFun)[];
+type ListenerFun = WebSocketListenerFun | HttpListenerFun;
+type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 type RouterReq<T = {}> = {
     url: string;
     method: string;
@@ -615,7 +615,7 @@ declare class ServerBase implements ServerType {
     handle: ServerOpts['handle'];
     _callback: any;
     cors: Cors$1;
-    listeners: Listener$1[];
+    listeners: Listener[];
     emitter: EventEmitter$1<any>;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
@@ -650,19 +650,8 @@ type WsServerBaseOpts = {
     wss?: WebSocketServer | null;
     path?: string;
 };
-type ListenerFn = (message: {
-    data: Record<string, any>;
-    ws: WebSocket;
-    end: (data: any) => any;
-}) => Promise<any>;
-type Listener<T = 'router' | 'chat' | 'ai'> = {
-    type: T;
-    path?: string;
-    listener: ListenerFn;
-};
 declare class WsServerBase {
     wss: WebSocketServer | null;
-    listeners: Listener[];
     listening: boolean;
     server: ServerType;
     constructor(opts: WsServerBaseOpts);
@@ -689,7 +678,7 @@ declare class ServerNode extends ServerBase implements ServerType {
     _callback: any;
     cors: Cors;
     private httpType;
-    listeners: Listener$1[];
+    listeners: Listener[];
     private options;
     io: WsServer | undefined;
     constructor(opts?: ServerNodeOpts);
@@ -936,4 +925,4 @@ declare class App<U = {}> {
 }
 
 export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, define, handleServer, util };
-export type { Listener$1 as Listener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketReq, WebSocketRes };
+export type { HttpListenerFun, Listener, OnListener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketListenerFun, WebSocketReq, WebSocketRes };

package/dist/router.js

@@ -1261,9 +1261,9 @@ class ServerBase {
             }
             const listeners = that.listeners || [];
             for (const item of listeners) {
-                const fun = item.fun;
-                if (typeof fun === 'function' && !item.io) {
-                    await fun(req, res);
+                const func = item.func;
+                if (typeof func === 'function' && !item.io) {
+                    await func(req, res);
                 }
             }
             if (res.headersSent) {
@@ -1324,13 +1324,13 @@ class ServerBase {
     on(listener) {
         this.listeners = [];
         if (typeof listener === 'function') {
-            this.listeners.push({ fun: listener });
+            this.listeners.push({ func: listener });
             return;
         }
         if (Array.isArray(listener)) {
             for (const item of listener) {
                 if (typeof item === 'function') {
-                    this.listeners.push({ fun: item });
+                    this.listeners.push({ func: item });
                 }
                 else {
                     this.listeners.push(item);
@@ -1348,7 +1348,7 @@ class ServerBase {
             const end = (data) => {
                 ws.send(JSON.stringify(data));
             };
-            listener.fun({
+            listener.func({
                 emitter: this.emitter,
                 data,
                 token,
@@ -6340,7 +6340,6 @@ var WebSocketServer = /*@__PURE__*/getDefaultExportFromCjs(websocketServerExport
 // @ts-type=ws
 class WsServerBase {
     wss;
-    listeners = [];
     listening = false;
     server;
     constructor(opts) {

package/package.json

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

package/src/index.ts

@@ -21,5 +21,14 @@ export * from './router-define.ts';
 
 
 export {
-  RouterReq, RouterRes, OnWebSocketFn, WS, WebSocketReq, WebSocketRes, Listener,
+  RouterReq,
+  RouterRes,
+  OnWebSocketFn,
+  WS,
+  WebSocketReq,
+  WebSocketRes,
+  Listener,
+  WebSocketListenerFun,
+  HttpListenerFun,
+  OnListener,
 } from './server/server-type.ts';

package/src/server/server-base.ts

@@ -119,9 +119,9 @@ export class ServerBase implements ServerType {
       }
       const listeners = that.listeners || [];
       for (const item of listeners) {
-        const fun = item.fun as any;
-        if (typeof fun === 'function' && !item.io) {
-          await fun(req, res);
+        const func = item.func as any;
+        if (typeof func === 'function' && !item.io) {
+          await func(req, res);
         }
       }
       if (res.headersSent) {
@@ -179,13 +179,13 @@ export class ServerBase implements ServerType {
   on(listener: OnListener) {
     this.listeners = [];
     if (typeof listener === 'function') {
-      this.listeners.push({ fun: listener });
+      this.listeners.push({ func: listener });
       return;
     }
     if (Array.isArray(listener)) {
       for (const item of listener) {
         if (typeof item === 'function') {
-          this.listeners.push({ fun: item });
+          this.listeners.push({ func: item });
         } else {
           this.listeners.push(item);
         }
@@ -202,7 +202,7 @@ export class ServerBase implements ServerType {
       const end = (data: any) => {
         ws.send(JSON.stringify(data));
       }
-      (listener.fun as WebScoketListenerFun)({
+      (listener.func as WebScoketListenerFun)({
         emitter: this.emitter,
         data,
         token,

package/src/server/server-type.ts

@@ -62,10 +62,10 @@ export type Listener = {
   id?: string;
   io?: boolean;
   path?: string;
-  fun: WebScoketListenerFun | HttpListenerFun;
+  func: WebSocketListenerFun | HttpListenerFun;
 }
 
-export type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+export type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 export type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 
 export type WebSocketReq = {
@@ -79,7 +79,7 @@ export type WebSocketReq = {
 export type WebSocketRes = {
   end: (data: any) => void;
 }
-export type ListenerFun = WebScoketListenerFun | HttpListenerFun;;
+export type ListenerFun = WebSocketListenerFun | HttpListenerFun;;
 export type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 export type RouterReq<T = {}> = {
   url: string;

package/src/server/ws-server.ts

@@ -24,7 +24,6 @@ export type Listener<T = 'router' | 'chat' | 'ai'> = {
 
 export class WsServerBase {
   wss: WebSocketServer | null;
-  listeners: Listener[] = [];
   listening: boolean = false;
   server: ServerType;