@tsed/graphql-ws 8.8.0-beta.1 → 8.8.0-beta.2

package/lib/esm/GraphQLWSModule.js

@@ -1,18 +1,23 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import Http from "node:http";
 import Https from "node:https";
-import { Constant, Inject, InjectorService, Module } from "@tsed/di";
-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";
 let GraphQLWSModule = class GraphQLWSModule {
+    constructor() {
+        this.settings = constant("graphqlWs", {});
+        this.httpServer = inject(Http.Server);
+        this.httpsServer = inject(Https.Server);
+    }
     async createWSServer(settings) {
-        // @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({
             ...(this.settings.wsUseServerOptions || {}),
             ...settings.wsUseServerOptions,
@@ -21,7 +26,7 @@ let GraphQLWSModule = class GraphQLWSModule {
     }
     async $alterApolloServerPlugins(plugins, settings) {
         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() {
                 return {
@@ -33,22 +38,6 @@ let GraphQLWSModule = class GraphQLWSModule {
         });
     }
 };
-__decorate([
-    Constant("graphqlWs", {}),
-    __metadata("design:type", Object)
-], GraphQLWSModule.prototype, "settings", void 0);
-__decorate([
-    Inject(Http.Server),
-    __metadata("design:type", Object)
-], GraphQLWSModule.prototype, "httpServer", void 0);
-__decorate([
-    Inject(Https.Server),
-    __metadata("design:type", Object)
-], GraphQLWSModule.prototype, "httpsServer", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], GraphQLWSModule.prototype, "injector", void 0);
 GraphQLWSModule = __decorate([
     Module()
 ], GraphQLWSModule);

package/lib/esm/GraphQLWSModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphQLWSModule.js","sourceRoot":"","sources":["../../src/GraphQLWSModule.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAKzC,IAAM,eAAe,GAArB,MAAM,eAAe;IAa1B,KAAK,CAAC,cAAc,CAAC,QAA0B;QAC7C,aAAa;QACb,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC;YACxC,GAAG,QAAQ,CAAC,eAAe;YAC3B,MAAM,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,UAAW;YAC5C,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO,SAAS,CACd;YACE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAC3C,GAAG,QAAQ,CAAC,kBAAkB;YAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,EACD,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAc,EAAE,QAA0B;QACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAE3E,OAAO,OAAO,CAAC,MAAM,CAAC;YACpB,eAAe;gBACb,OAAO;oBACL,KAAK,CAAC,WAAW;wBACf,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC3B,CAAC;iBACF,CAAC;YACJ,CAAC;SACK,CAAC,CAAC;IACZ,CAAC;CACF,CAAA;AA/CS;IADP,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;;iDACS;AAG3B;IADP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;;mDACmB;AAG/B;IADP,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;;oDACoB;AAGjC;IADP,MAAM,EAAE;8BACS,eAAe;iDAAC;AAXvB,eAAe;IAD3B,MAAM,EAAE;GACI,eAAe,CAiD3B"}
+{"version":3,"file":"GraphQLWSModule.js","sourceRoot":"","sources":["../../src/GraphQLWSModule.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,eAAe,EAAC,MAAM,IAAI,CAAC;AAK5B,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QACG,aAAQ,GAAG,QAAQ,CAAmB,WAAW,EAAE,EAAsB,CAAC,CAAC;QAC3E,eAAU,GAAG,MAAM,CAAqB,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,gBAAW,GAAG,MAAM,CAAsB,KAAK,CAAC,MAAM,CAAC,CAAC;IAqClE,CAAC;IAnCC,KAAK,CAAC,cAAc,CAAC,QAA0B;QAC7C,MAAM,IAAI,GAAG;YACX,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC;YACxC,GAAG,QAAQ,CAAC,eAAe;YAC3B,MAAM,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,UAAW;YAC5C,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3C,OAAO,SAAS,CACd;YACE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAC3C,GAAG,QAAQ,CAAC,kBAAkB;YAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,EACD,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAc,EAAE,QAA0B;QACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAErD,MAAM,EAAE,CAAC,IAAI,CAAC,gCAAgC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/D,OAAO,OAAO,CAAC,MAAM,CAAC;YACpB,eAAe;gBACb,OAAO;oBACL,KAAK,CAAC,WAAW;wBACf,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC3B,CAAC;iBACF,CAAC;YACJ,CAAC;SACK,CAAC,CAAC;IACZ,CAAC;CACF,CAAA;AAxCY,eAAe;IAD3B,MAAM,EAAE;GACI,eAAe,CAwC3B"}

package/lib/types/GraphQLWSModule.d.ts

@@ -1,10 +1,8 @@
-import type { Disposable } from "graphql-ws";
 import { GraphQLWSOptions } from "./GraphQLWSOptions.js";
 export declare class GraphQLWSModule {
     private settings;
     private httpServer;
     private httpsServer;
-    private injector;
-    createWSServer(settings: GraphQLWSOptions): Promise<Disposable>;
+    createWSServer(settings: GraphQLWSOptions): Promise<import("graphql-ws").Disposable>;
     $alterApolloServerPlugins(plugins: any[], settings: GraphQLWSOptions): Promise<any[]>;
 }

package/lib/types/GraphQLWSOptions.d.ts

@@ -1,15 +1,15 @@
-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;
         }
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/graphql-ws",
   "description": "An extension to allow GraphQL over WebSockets using graphql-ws protocol",
   "type": "module",
-  "version": "8.8.0-beta.1",
+  "version": "8.8.0-beta.2",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -24,22 +24,25 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.8.0-beta.1",
-    "@tsed/core": "8.8.0-beta.1",
-    "@tsed/di": "8.8.0-beta.1",
+    "@tsed/barrels": "8.8.0-beta.2",
+    "@tsed/core": "8.8.0-beta.2",
+    "@tsed/di": "8.8.0-beta.2",
     "@tsed/logger": "^7.0.1",
-    "@tsed/platform-http": "8.8.0-beta.1",
-    "@tsed/typescript": "8.8.0-beta.1",
+    "@tsed/platform-http": "8.8.0-beta.2",
+    "@tsed/typescript": "8.8.0-beta.2",
+    "@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.8.0-beta.1",
-    "@tsed/di": ">=8.8.0-beta.1",
+    "@tsed/core": ">=8.8.0-beta.2",
+    "@tsed/di": ">=8.8.0-beta.2",
     "@tsed/logger": ">=7.0.1",
-    "@tsed/platform-http": ">=8.8.0-beta.1",
-    "graphql-ws": ">=5.14.2"
+    "@tsed/platform-http": ">=8.8.0-beta.2",
+    "graphql-ws": ">=6.0.4",
+    "ws": ">=8.18.1"
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {

package/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:

package/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() {

package/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;
     }
   }