Merged

docs/Examples.md

@@ -34,7 +34,7 @@ webserver.post('/api/v1/delete_user/:id', async (request, response) => {
 webserver.post('/api/v1/delete_user/:id', async (request, response) => {
    // Some bad stuff happened and this request is now forbidden
 
-   // We multiple response network calls in atomic callback for best performance
+   // We wrap multiple response network calls in atomic callback for best performance
    response.atomic(() => {
         // All methods EXCEPT "response ending methods" such as send(), json(), upgrade() support chaining
        response
@@ -149,4 +149,4 @@ webserver.ws('/ws/connect', (ws) => {
        // You may do some cleanup here regarding analytics
     });
 });
-```
+```

package.json

@@ -44,6 +44,7 @@
         "mime-types": "^2.1.33",
         "range-parser": "^1.2.1",
         "type-is": "^1.6.18",
+        "typed-emitter": "^2.1.0",
         "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.24.0"
     },
     "devDependencies": {

types/components/ws/Websocket.d.ts

@@ -1,19 +1,22 @@
 import * as uWebsockets from 'uWebSockets.js';
 import { EventEmitter } from "events";
 import { Readable, Writable } from 'stream';
+import TypedEmitter from 'typed-emitter';
 import { SendableData } from "../http/Response";
 
 export type WebsocketContext = {
     [key: string]: string
 }
 
-export class Websocket<TUserData = unknown> extends EventEmitter {
-    /* EventEmitter Overrides */
-    on(eventName: 'message' | 'close' | 'drain' | 'ping' | 'pong', listener: (...args: any[]) => void): this;
-    once(eventName: 'message' | 'close' | 'drain' | 'ping' | 'pong', listener: (...args: any[]) => void): this;
-
-    /* Websocket Methods */
+type Events = {
+    message: (...args: any[]) => void | Promise<void>;
+    close: (...args: any[]) => void | Promise<void>;
+    drain: (...args: any[]) => void | Promise<void>;
+    ping: (...args: any[]) => void | Promise<void>;
+    pong: (...args: any[]) => void | Promise<void>;
+}
 
+export class Websocket<TUserData = unknown> extends (EventEmitter as new () => TypedEmitter<Events>) {
     /**
      * Alias of uWS.cork() method. Accepts a callback with multiple operations for network efficiency.
      *