fix(graphql-ws): fix import to avoid typescript issue

Closes: #3035

Author: Romakita

docs/tutorials/graphql-ws.md

@@ -26,12 +26,20 @@ This module need to be used with `@tsed/apollo` module. So, you must install it
 
 ::: code-group
 
-```bash [Npm]
-npm install --save @tsed/graphql-ws graphql-ws
+```bash [npm]
+npm install --save @tsed/graphql-ws graphql-ws ws @types/ws
 ```
 
-```bash [Yarn]
-yarn add @tsed/graphql-ws graphql-ws
+```bash [yarn]
+yarn add @tsed/graphql-ws graphql-ws ws @types/ws
+```
+
+```bash [pnpm]
+pnpm add @tsed/graphql-ws graphql-ws ws @types/ws
+```
+
+```bash [bun]
+bun add @tsed/graphql-ws graphql-ws ws @types/ws
 ```
 
 :::
@@ -52,10 +60,10 @@ import {join} from "node:path";
       plugins: [], // Apollo plugins
 
       wsServerOptions: {
-        // See options descriptions on
+        // See options descriptions on WS website
       },
       wsUseServerOptions: {
-        // See options descriptions on GraphQL WS
+        // See options descriptions on GraphQL WS website
       }
 
       // Give custom server instance

packages/core/package.json

@@ -45,5 +45,6 @@
     "vite": "6.0.14",
     "vitest": "3.0.9",
     "webpack": "^5.75.0"
-  }
+  },
+  "peerDependencies": {}
 }

packages/engines/package.json

@@ -90,5 +90,6 @@
     "decorators",
     "engines",
     "view"
-  ]
+  ],
+  "peerDependencies": {}
 }

packages/graphql/graphql-ws/package.json

@@ -30,15 +30,18 @@
     "@tsed/logger": "^7.0.1",
     "@tsed/platform-http": "workspace:*",
     "@tsed/typescript": "workspace:*",
+    "@types/ws": "8.18.1",
     "eslint": "9.12.0",
-    "graphql-ws": "5.16.0",
-    "typescript": "5.4.5"
+    "graphql-ws": "6.0.4",
+    "typescript": "5.4.5",
+    "ws": "8.18.1"
   },
   "peerDependencies": {
     "@tsed/core": ">=8.7.1",
     "@tsed/di": ">=8.7.1",
     "@tsed/logger": ">=7.0.1",
     "@tsed/platform-http": ">=8.7.1",
-    "graphql-ws": ">=5.14.2"
+    "graphql-ws": ">=6.0.4",
+    "ws": ">=8.18.1"
   }
 }

packages/graphql/graphql-ws/readme.md

@@ -37,7 +37,7 @@ You need to install `@tsed/apollo` before using this module.
 To begin, install the GraphQL WS module for TS.ED:
 
 ```bash
-npm install --save @tsed/graphql-ws graphql-ws
+npm install --save @tsed/graphql-ws graphql-ws ws @types/ws
 ```
 
 Now, we can configure the Ts.ED server by importing `@tsed/gr` in your Server:

packages/graphql/graphql-ws/src/GraphQLWSModule.ts

@@ -1,36 +1,27 @@
 import Http from "node:http";
 import Https from "node:https";
 
-import {Constant, Inject, InjectorService, Module} from "@tsed/di";
-import type {Disposable} from "graphql-ws";
-import {useServer} from "graphql-ws/lib/use/ws";
+import {constant, inject, logger, Module} from "@tsed/di";
+import {useServer} from "graphql-ws/use/ws";
+import {WebSocketServer} from "ws";
 
 import {GraphQLWSOptions} from "./GraphQLWSOptions.js";
 
 @Module()
 export class GraphQLWSModule {
-  @Constant("graphqlWs", {})
-  private settings: GraphQLWSOptions;
-
-  @Inject(Http.Server)
-  private httpServer: Http.Server | null;
-
-  @Inject(Https.Server)
-  private httpsServer: Https.Server | null;
-
-  @Inject()
-  private injector: InjectorService;
+  private settings = constant<GraphQLWSOptions>("graphqlWs", {} as GraphQLWSOptions);
+  private httpServer = inject<Http.Server | null>(Http.Server);
+  private httpsServer = inject<Https.Server | null>(Https.Server);
 
   async createWSServer(settings: GraphQLWSOptions) {
-    // @ts-ignore
-    const {WebSocketServer} = await import("ws");
-
-    const wsServer = new WebSocketServer({
+    const opts = {
       ...(this.settings.wsServerOptions || {}),
       ...settings.wsServerOptions,
       server: this.httpsServer || this.httpServer!,
       path: settings.path
-    });
+    };
+
+    const wsServer = new WebSocketServer(opts);
 
     return useServer(
       {
@@ -45,7 +36,7 @@ export class GraphQLWSModule {
   async $alterApolloServerPlugins(plugins: any[], settings: GraphQLWSOptions) {
     const wsServer = await this.createWSServer(settings);
 
-    this.injector.logger.info(`Create GraphQL WS server on: ${settings.path}`);
+    logger().info(`Create GraphQL WS server on: ${settings.path}`);
 
     return plugins.concat({
       serverWillStart() {

packages/graphql/graphql-ws/src/GraphQLWSOptions.ts

@@ -1,18 +1,17 @@
-// @ts-ignore
-import {ServerOptions} from "graphql-ws/lib/server";
-import {ServerOptions as WSServerOptions} from "ws";
+import type {ServerOptions as UseServerOptions} from "graphql-ws";
+import type {ServerOptions as WSServerOptions} from "ws";
 
 export interface GraphQLWSOptions {
   path: string;
-  schema: any;
-  wsUseServerOptions?: ServerOptions;
+  schema: UseServerOptions["schema"];
+  wsUseServerOptions?: UseServerOptions;
   wsServerOptions?: WSServerOptions;
 }
 
 declare global {
   namespace TsED {
     interface ApolloSettings {
-      wsUseServerOptions?: ServerOptions;
+      wsUseServerOptions?: UseServerOptions;
       wsServerOptions?: WSServerOptions;
     }
   }

packages/hooks/package.json

@@ -42,5 +42,6 @@
     "vite": "6.0.14",
     "vitest": "3.0.9",
     "webpack": "^5.75.0"
-  }
+  },
+  "peerDependencies": {}
 }

packages/perf/package.json

@@ -29,5 +29,6 @@
     "@tsed/typescript": "workspace:*",
     "eslint": "9.12.0",
     "typescript": "5.4.5"
-  }
+  },
+  "peerDependencies": {}
 }

packages/platform/platform-test-sdk/package.json

@@ -49,5 +49,6 @@
     "@tsed/typescript": "workspace:*",
     "eslint": "9.12.0",
     "typescript": "5.4.5"
-  }
+  },
+  "peerDependencies": {}
 }