Fixes

examples/bun-yoga-ws/src/index.ts

@@ -1,6 +1,6 @@
 import { setTimeout as setTimeout$ } from 'node:timers/promises';
 import Bun from 'bun';
-import { makeHandler } from 'graphql-ws/lib/use/bun';
+import { makeHandler } from 'graphql-ws/use/bun';
 import { createSchema, createYoga } from 'graphql-yoga';
 
 const schema = createSchema({
@@ -46,19 +46,19 @@ export const websocketHandler = makeHandler({
   schema,
   execute: args => args.rootValue.execute(args),
   subscribe: args => args.rootValue.subscribe(args),
-  onSubscribe: async (ctx, msg) => {
+  onSubscribe: async (ctx, _id, params) => {
     const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped({
       ...ctx,
       req: ctx.extra.request,
       socket: ctx.extra.socket,
-      params: msg.payload,
+      params,
     });
 
     const args = {
       schema,
-      operationName: msg.payload.operationName,
-      document: parse(msg.payload.query),
-      variableValues: msg.payload.variables,
+      operationName: params.operationName,
+      document: parse(params.query),
+      variableValues: params.variables,
       contextValue: await contextFactory(),
       rootValue: {
         execute,

examples/graphql-ws/__integration-tests__/graphql-ws.spec.ts

@@ -1,7 +1,7 @@
 import { createServer } from 'node:http';
 import { AddressInfo } from 'node:net';
 import { createClient } from 'graphql-ws';
-import { useServer } from 'graphql-ws/lib/use/ws';
+import { useServer } from 'graphql-ws/use/ws';
 import { createSchema, createYoga } from 'graphql-yoga';
 import WebSocket from 'ws';
 import { buildApp } from '../src/app.js';
@@ -122,15 +122,15 @@ describe('graphql-ws example integration', () => {
         execute: (args: any) => args.execute(args),
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         subscribe: (args: any) => args.subscribe(args),
-        onSubscribe: async (_ctx, msg) => {
+        onSubscribe: async (_ctx, _id, params) => {
           const { schema, execute, subscribe, contextFactory, parse, validate } =
             yoga.getEnveloped(); // <- malformed/missing context
 
           const args = {
             schema,
-            operationName: msg.payload.operationName,
-            document: parse(msg.payload.query),
-            variableValues: msg.payload.variables,
+            operationName: params.operationName,
+            document: parse(params.query),
+            variableValues: params.variables,
             contextValue: await contextFactory(),
             execute,
             subscribe,

examples/graphql-ws/src/app.ts

@@ -1,6 +1,6 @@
 import { createServer } from 'node:http';
 import { Socket } from 'node:net';
-import { useServer } from 'graphql-ws/lib/use/ws';
+import { useServer } from 'graphql-ws/use/ws';
 import { createSchema, createYoga } from 'graphql-yoga';
 import { WebSocketServer } from 'ws';
 
@@ -57,19 +57,19 @@ export function buildApp() {
       execute: (args: any) => args.execute(args),
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       subscribe: (args: any) => args.subscribe(args),
-      onSubscribe: async (ctx, msg) => {
+      onSubscribe: async (ctx, _id, params) => {
         const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped({
           ...ctx,
           req: ctx.extra.request,
           socket: ctx.extra.socket,
-          params: msg.payload,
+          params,
         });
 
         const args = {
           schema,
-          operationName: msg.payload.operationName,
-          document: parse(msg.payload.query),
-          variableValues: msg.payload.variables,
+          operationName: params.operationName,
+          document: parse(params.query),
+          variableValues: params.variables,
           contextValue: await contextFactory(),
           execute,
           subscribe,

examples/graphql-ws/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "moduleResolution": "node",
-    "module": "commonjs",
+    "moduleResolution": "bundler",
+    "module": "esnext",
     "sourceMap": true,
     "lib": ["esnext", "DOM", "DOM.Iterable"],
     "allowSyntheticDefaultImports": true,

examples/nextjs-ws/server.js

@@ -3,7 +3,7 @@
 const { createServer } = require('node:http');
 const { WebSocketServer } = require('ws');
 const { createYoga, createSchema } = require('graphql-yoga');
-const { useServer } = require('graphql-ws/lib/use/ws');
+const { useServer } = require('graphql-ws/use/ws');
 const { parse } = require('node:url');
 const next = require('next');
 const { setTimeout: setTimeout$ } = require('node:timers/promises');
@@ -106,20 +106,20 @@ async function start(port, handle) {
       execute: args => args.rootValue.execute(args),
       /** @param {EnvelopedExecutionArgs} args */
       subscribe: args => args.rootValue.subscribe(args),
-      onSubscribe: async (ctx, msg) => {
+      onSubscribe: async (ctx, _id, params) => {
         const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped({
           ...ctx,
           req: ctx.extra.request,
           socket: ctx.extra.socket,
-          params: msg.payload,
+          params,
         });
 
         /** @type EnvelopedExecutionArgs */
         const args = {
           schema,
-          operationName: msg.payload.operationName,
-          document: parse(msg.payload.query),
-          variableValues: msg.payload.variables,
+          operationName: params.operationName,
+          document: parse(params.query),
+          variableValues: params.variables,
           contextValue: await contextFactory(),
           rootValue: {
             execute,

examples/uwebsockets/src/app.ts

@@ -1,5 +1,5 @@
 import { execute, ExecutionArgs, subscribe } from 'graphql';
-import { makeBehavior } from 'graphql-ws/lib/use/uWebSockets';
+import { makeBehavior } from 'graphql-ws/use/uWebSockets';
 import { createSchema, createYoga, Repeater } from 'graphql-yoga';
 import { App, HttpRequest, HttpResponse } from 'uWebSockets.js';
 
@@ -55,14 +55,14 @@ type EnvelopedExecutionArgs = ExecutionArgs & {
 const wsHandler = makeBehavior({
   execute: args => (args as EnvelopedExecutionArgs).rootValue.execute(args),
   subscribe: args => (args as EnvelopedExecutionArgs).rootValue.subscribe(args),
-  onSubscribe: async (ctx, msg) => {
+  onSubscribe: async (ctx, _id, params) => {
     const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped(ctx);
 
     const args: EnvelopedExecutionArgs = {
       schema,
-      operationName: msg.payload.operationName,
-      document: parse(msg.payload.query),
-      variableValues: msg.payload.variables,
+      operationName: params.operationName,
+      document: parse(params.query),
+      variableValues: params.variables,
       contextValue: await contextFactory(),
       rootValue: {
         execute,

packages/plugins/jwt/src/__tests__/jwt.spec.ts

@@ -3,7 +3,7 @@ import { createHmac } from 'node:crypto';
 import { createServer, Server } from 'node:http';
 import { AddressInfo } from 'node:net';
 import { createClient } from 'graphql-ws';
-import { useServer } from 'graphql-ws/lib/use/ws';
+import { useServer } from 'graphql-ws/use/ws';
 import { createSchema, createYoga, Plugin } from 'graphql-yoga';
 import jwt, { Algorithm, SignOptions } from 'jsonwebtoken';
 import WebSocket from 'ws';
@@ -650,20 +650,20 @@ describe('jwt plugin', () => {
         execute: (args: any) => args.execute(args),
 
         subscribe: (args: any) => args.subscribe(args),
-        onSubscribe: async (ctx, msg) => {
+        onSubscribe: async (ctx, _id, params) => {
           const { schema, execute, subscribe, contextFactory, parse, validate } =
             test.yoga.getEnveloped({
               ...ctx,
               req: ctx.extra.request,
               socket: ctx.extra.socket,
-              params: msg.payload,
+              params,
             });
 
           const args = {
             schema,
-            operationName: msg.payload.operationName,
-            document: parse(msg.payload.query),
-            variableValues: msg.payload.variables,
+            operationName: params.operationName,
+            document: parse(params.query),
+            variableValues: params.variables,
             contextValue: await contextFactory(),
             execute,
             subscribe,

packages/plugins/jwt/src/utils.ts

@@ -1,6 +1,7 @@
 import { createGraphQLError } from 'graphql-yoga';
 import { JwksClient, type Options as JwksClientOptions } from 'jwks-rsa';
 import { GetSigningKeyFunction, type ExtractTokenFunction } from './config.js';
+import '@whatwg-node/server-plugin-cookies';
 
 export function extractFromHeader(options: {
   name: string;

packages/plugins/prometheus/__integration-tests__/graphql-ws.test.ts

@@ -1,7 +1,7 @@
 import { createServer, type Server } from 'node:http';
 import { AddressInfo } from 'node:net';
 import { Client, createClient } from 'graphql-ws';
-import { useServer } from 'graphql-ws/lib/use/ws';
+import { useServer } from 'graphql-ws/use/ws';
 import { createSchema, createYoga } from 'graphql-yoga';
 import { register as registry } from 'prom-client';
 import WebSocket from 'ws';
@@ -64,21 +64,21 @@ describe('GraphQL WS & Prometheus integration', () => {
         execute: (args: any) => args.execute(args),
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         subscribe: (args: any) => args.subscribe(args),
-        onSubscribe: async (ctx, msg) => {
+        onSubscribe: async (ctx, _id, params) => {
           const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped(
             {
               ...ctx,
               req: ctx.extra.request,
               socket: ctx.extra.socket,
-              params: msg.payload,
+              params,
             },
           );
 
           const args = {
             schema,
-            operationName: msg.payload.operationName,
-            document: parse(msg.payload.query),
-            variableValues: msg.payload.variables,
+            operationName: params.operationName,
+            document: parse(params.query),
+            variableValues: params.variables,
             contextValue: await contextFactory(),
             execute,
             subscribe,

tsconfig.build.json

@@ -2,7 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "declaration": true,
-    "verbatimModuleSyntax": false
+    "verbatimModuleSyntax": false,
+    "moduleResolution": "node"
   },
   "exclude": [
     "**/node_modules",
@@ -11,6 +12,8 @@
     "**/scripts",
     "**/test/*.ts",
     "**/tests/*.ts",
+    "**/__tests__",
+    "**/__integration-tests__",
     "*.spec.ts",
     "*.test.ts"
   ]

tsconfig.json

@@ -8,7 +8,7 @@
     "experimentalDecorators": true,
     "target": "es2022",
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "lib": ["esnext"],
     "emitDecoratorMetadata": true,
     "sourceMap": false,

website/src/pages/docs/features/subscriptions.mdx

@@ -190,7 +190,7 @@ use WebSockets instead of Server-Sent Events within GraphiQL.
 
 ```ts filename="yoga-with-ws.ts"
 import { createServer } from 'node:http'
-import { useServer } from 'graphql-ws/lib/use/ws'
+import { useServer } from 'graphql-ws/use/ws'
 import { createYoga } from 'graphql-yoga'
 import { WebSocketServer } from 'ws'
 
@@ -214,19 +214,19 @@ useServer(
   {
     execute: (args: any) => args.rootValue.execute(args),
     subscribe: (args: any) => args.rootValue.subscribe(args),
-    onSubscribe: async (ctx, msg) => {
+    onSubscribe: async (ctx, _id, params) => {
       const { schema, execute, subscribe, contextFactory, parse, validate } = yogaApp.getEnveloped({
         ...ctx,
         req: ctx.extra.request,
         socket: ctx.extra.socket,
-        params: msg.payload
+        params
       })
 
       const args = {
         schema,
-        operationName: msg.payload.operationName,
-        document: parse(msg.payload.query),
-        variableValues: msg.payload.variables,
+        operationName: params.operationName,
+        document: parse(params.query),
+        variableValues: params.variables,
         contextValue: await contextFactory(),
         rootValue: {
           execute,

website/src/pages/docs/integrations/integration-with-nextjs.mdx

@@ -116,7 +116,7 @@ npm i graphql-yoga graphql ws graphql-ws
 const { createServer } = require('http')
 const { WebSocketServer } = require('ws')
 const { createYoga, createSchema } = require('graphql-yoga')
-const { useServer } = require('graphql-ws/lib/use/ws')
+const { useServer } = require('graphql-ws/use/ws')
 const { parse } = require('url')
 const next = require('next')
 const { setTimeout: setTimeout$ } = require('timers/promises')
@@ -194,19 +194,19 @@ const yoga = createYoga({
     {
       execute: args => args.rootValue.execute(args),
       subscribe: args => args.rootValue.subscribe(args),
-      onSubscribe: async (ctx, msg) => {
+      onSubscribe: async (ctx, _id, params) => {
         const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped({
           ...ctx,
           req: ctx.extra.request,
           socket: ctx.extra.socket,
-          params: msg.payload
+          params
         })
 
         const args = {
           schema,
-          operationName: msg.payload.operationName,
-          document: parse(msg.payload.query),
-          variableValues: msg.payload.variables,
+          operationName: params.operationName,
+          document: parse(params.query),
+          variableValues: params.variables,
           contextValue: await contextFactory(),
           rootValue: {
             execute,

website/src/pages/docs/integrations/integration-with-uwebsockets.mdx

@@ -62,7 +62,7 @@ npm i graphql-ws
 
 ```ts filename="index.ts"
 import { execute, ExecutionArgs, subscribe } from 'graphql'
-import { makeBehavior } from 'graphql-ws/lib/use/uWebSockets'
+import { makeBehavior } from 'graphql-ws/use/uWebSockets'
 import { createSchema, createYoga, Repeater } from 'graphql-yoga'
 import { App, HttpRequest, HttpResponse } from 'uWebSockets.js'
 
@@ -118,14 +118,14 @@ type EnvelopedExecutionArgs = ExecutionArgs & {
 const wsHandler = makeBehavior({
   execute: args => (args as EnvelopedExecutionArgs).rootValue.execute(args),
   subscribe: args => (args as EnvelopedExecutionArgs).rootValue.subscribe(args),
-  onSubscribe: async (ctx, msg) => {
+  onSubscribe: async (ctx, _id, params) => {
     const { schema, execute, subscribe, contextFactory, parse, validate } = yoga.getEnveloped(ctx)
 
     const args: EnvelopedExecutionArgs = {
       schema,
-      operationName: msg.payload.operationName,
-      document: parse(msg.payload.query),
-      variableValues: msg.payload.variables,
+      operationName: params.operationName,
+      document: parse(params.query),
+      variableValues: params.variables,
       contextValue: await contextFactory(),
       rootValue: {
         execute,