fix(typings): properly type server-side events

See also: 93cce05
socketio · May 11, 2021 · b84ed1e · JordanPawlett · May 13, 2021 · MaximeKjaer
1 parent fb6b0ef
commit b84ed1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -168,7 +168,7 @@ interface ServerOptions extends EngineAttachOptions {
 export class Server<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,

diff --git a/lib/namespace.ts b/lib/namespace.ts
@@ -50,7 +50,7 @@ export const RESERVED_EVENTS: ReadonlySet<string | Symbol> = new Set<
 export class Namespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,
@@ -306,9 +306,8 @@ export class Namespace<
    *
    * @private
    */
-  _onServerSideEmit(args: any[]) {
-    const event = args.shift();
-    this.emitUntyped(event, args);
+  _onServerSideEmit(args: [eventName: string, ...args: any[]]) {
+    super.emitUntyped.apply(this, args);
   }
 
   /**

diff --git a/lib/parent-namespace.ts b/lib/parent-namespace.ts
@@ -11,7 +11,7 @@ import type { BroadcastOptions } from "socket.io-adapter";
 export class ParentNamespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends Namespace<ListenEvents, EmitEvents, ServerSideEvents> {
   private static count: number = 0;
   private children: Set<

diff --git a/lib/socket.ts b/lib/socket.ts
@@ -111,7 +111,7 @@ export interface Handshake {
 export class Socket<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ListenEvents,
   EmitEvents,

diff --git a/test/socket.io.test-d.ts b/test/socket.io.test-d.ts
@@ -117,7 +117,9 @@ describe("server", () => {
 
       it("does not accept arguments of wrong types", (done) => {
         const srv = createServer();
-        const sio = new Server<BidirectionalEvents>(srv);
+        const sio = new Server<BidirectionalEvents, BidirectionalEvents, {}>(
+          srv
+        );
         expectError(sio.on("random", (a, b, c) => {}));
         srv.listen(() => {
           expectError(sio.on("wrong name", (s) => {}));