fix: SocketStream is not imported

fastify/fastify-websocket#295
fastify/fastify-websocket#289

Author: geforseN

src/module/Chat/initializeChatNamespace.ts

@@ -1,40 +1,21 @@
-import type { SocketStream } from "@fastify/websocket";
+import type { WebSocket } from "@fastify/websocket";
 import type { FastifyRequest } from "fastify";
-import type { WebSocket } from "ws";
-import {
-  SocketsStore,
-  defaultListeners,
-  type CustomWebsocketEvent,
-} from "../../ws/index.js";
+import { SocketsStore, defaultListeners } from "../../ws/index.js";
 import { Chat } from "./entity/index.js";
 
-export interface AdditionalListeners {
-  addListener(
-    event: "socket",
-    listener: (this: WebSocket, event: CustomWebsocketEvent) => void,
-  ): this;
-  on(
-    event: "socket",
-    listener: (this: WebSocket, event: CustomWebsocketEvent) => void,
-  ): this;
-}
-
 export default function initializeChat() {
   const socketsStore = new SocketsStore();
   const chat = new Chat({ socketsStore });
 
-  return function getChatContext(
-    connection: SocketStream & { socket: WebSocket & AdditionalListeners },
-    request: FastifyRequest,
-  ) {
-    socketsStore.add(connection.socket);
-    socketsStore.room(request.session.user.id).add(connection.socket);
-    connection.socket
+  return function getChatContext(socket: WebSocket, request: FastifyRequest) {
+    socketsStore.add(socket);
+    socketsStore.room(request.session.user.id).add(socket);
+    socket
       .addListener("socket", defaultListeners.socket)
       .addListener("message", defaultListeners.message);
     return {
       sender: request.session.user,
-      socket: connection.socket,
+      socket,
       chat,
       socketsStore,
     };

src/module/Lobbies/lobbies.plugin.ts

@@ -1,5 +1,5 @@
 import assert from "node:assert";
-import type { SocketStream } from "@fastify/websocket";
+import type { WebSocket } from "@fastify/websocket";
 import type { FastifyInstance, FastifyRequest } from "fastify";
 import type { InitialGameSettings } from "@durak-game/durak-dts";
 import {
@@ -96,18 +96,15 @@ function initializeGameLobbies() {
   const socketsStore = new SocketsStore();
   const lobbies = new Lobbies(socketsStore);
 
-  return function handleConnection(
-    connection: SocketStream,
-    request: FastifyRequest,
-  ) {
-    socketsStore.add(connection.socket);
-    socketsStore.room(request.session.user.id).add(connection.socket);
-    connection.socket
+  return function handleConnection(socket: WebSocket, request: FastifyRequest) {
+    socketsStore.add(socket);
+    socketsStore.room(request.session.user.id).add(socket);
+    socket
       .addListener("message", defaultListeners.message)
       .addListener("socket", defaultListeners.socket);
     return {
       user: request.session.user,
-      socket: connection.socket,
+      socket,
       lobbies,
     };
   };