@trpc/server 11.0.0-next.92 → 11.0.0-rc.329

package/dist/unstable-core-do-not-import.mjs

@@ -0,0 +1,21 @@
+export { createFlatProxy, createRecursiveProxy } from './unstable-core-do-not-import/createProxy.mjs';
+export { defaultFormatter } from './unstable-core-do-not-import/error/formatter.mjs';
+export { getErrorShape } from './unstable-core-do-not-import/error/getErrorShape.mjs';
+export { TRPCError, getCauseFromUnknown, getTRPCErrorFromUnknown } from './unstable-core-do-not-import/error/TRPCError.mjs';
+export { getHTTPStatusCode, getHTTPStatusCodeFromError } from './unstable-core-do-not-import/http/getHTTPStatusCode.mjs';
+export { resolveHTTPResponse } from './unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
+export { getBatchStreamFormatter } from './unstable-core-do-not-import/http/batchStreamFormatter.mjs';
+export { getJsonContentTypeInputs } from './unstable-core-do-not-import/http/contentType.mjs';
+export { toURL } from './unstable-core-do-not-import/http/toURL.mjs';
+export { initTRPC } from './unstable-core-do-not-import/initTRPC.mjs';
+export { createInputMiddleware, createMiddlewareFactory, createOutputMiddleware, experimental_standaloneMiddleware, middlewareMarker } from './unstable-core-do-not-import/middleware.mjs';
+export { getParseFn } from './unstable-core-do-not-import/parser.mjs';
+export { procedureTypes } from './unstable-core-do-not-import/procedure.mjs';
+export { createBuilder, unsetMarker } from './unstable-core-do-not-import/procedureBuilder.mjs';
+export { isServerDefault } from './unstable-core-do-not-import/rootConfig.mjs';
+export { callProcedure, createCallerFactory, createRouterFactory, mergeRouters } from './unstable-core-do-not-import/router.mjs';
+export { TRPC_ERROR_CODES_BY_KEY, TRPC_ERROR_CODES_BY_NUMBER } from './unstable-core-do-not-import/rpc/codes.mjs';
+export { parseTRPCMessage } from './unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
+export { defaultTransformer, getDataTransformer, transformResult, transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
+export { ERROR_SYMBOL } from './unstable-core-do-not-import/types.mjs';
+export { $typesProxy, isFunction, isObject, mergeWithoutOverrides, omitPrototype } from './unstable-core-do-not-import/utils.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next.92+06cebb01",
+  "version": "11.0.0-rc.329+fdcb4a7d8",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -13,29 +13,13 @@
     "url": "git+https://github.com/trpc/trpc.git",
     "directory": "packages/server"
   },
-  "eslintConfig": {
-    "overrides": [
-      {
-        "files": [
-          "src"
-        ],
-        "rules": {
-          "explicit-module-boundary-types": "off",
-          "no-restricted-imports": [
-            "error",
-            "@trpc/server"
-          ]
-        }
-      }
-    ]
-  },
   "scripts": {
     "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
     "codegen-entrypoints": "tsx entrypoints.script.ts",
     "benchmark": "tsc --project tsconfig.benchmark.json",
-    "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src",
-    "ts-watch": "tsc --project tsconfig.watch.json --watch"
+    "lint": "eslint --cache --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore src",
+    "ts-watch": "tsc --watch"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -59,25 +43,35 @@
       "require": "./dist/adapters/fastify/index.js",
       "default": "./dist/adapters/fastify/index.js"
     },
+    "./adapters/fetch": {
+      "import": "./dist/adapters/fetch/index.mjs",
+      "require": "./dist/adapters/fetch/index.js",
+      "default": "./dist/adapters/fetch/index.js"
+    },
+    "./adapters/next-app-dir": {
+      "import": "./dist/adapters/next-app-dir.mjs",
+      "require": "./dist/adapters/next-app-dir.js",
+      "default": "./dist/adapters/next-app-dir.js"
+    },
     "./adapters/next": {
       "import": "./dist/adapters/next.mjs",
       "require": "./dist/adapters/next.js",
       "default": "./dist/adapters/next.js"
     },
-    "./adapters/node-http": {
-      "import": "./dist/adapters/node-http/index.mjs",
-      "require": "./dist/adapters/node-http/index.js",
-      "default": "./dist/adapters/node-http/index.js"
+    "./adapters/node-http/content-type/form-data": {
+      "import": "./dist/adapters/node-http/content-type/form-data/index.mjs",
+      "require": "./dist/adapters/node-http/content-type/form-data/index.js",
+      "default": "./dist/adapters/node-http/content-type/form-data/index.js"
     },
     "./adapters/node-http/content-type/json": {
       "import": "./dist/adapters/node-http/content-type/json/index.mjs",
       "require": "./dist/adapters/node-http/content-type/json/index.js",
       "default": "./dist/adapters/node-http/content-type/json/index.js"
     },
-    "./adapters/node-http/content-type/form-data": {
-      "import": "./dist/adapters/node-http/content-type/form-data/index.mjs",
-      "require": "./dist/adapters/node-http/content-type/form-data/index.js",
-      "default": "./dist/adapters/node-http/content-type/form-data/index.js"
+    "./adapters/node-http": {
+      "import": "./dist/adapters/node-http/index.mjs",
+      "require": "./dist/adapters/node-http/index.js",
+      "default": "./dist/adapters/node-http/index.js"
     },
     "./adapters/standalone": {
       "import": "./dist/adapters/standalone.mjs",
@@ -89,40 +83,30 @@
       "require": "./dist/adapters/ws.js",
       "default": "./dist/adapters/ws.js"
     },
-    "./adapters/fetch": {
-      "import": "./dist/adapters/fetch/index.mjs",
-      "require": "./dist/adapters/fetch/index.js",
-      "default": "./dist/adapters/fetch/index.js"
-    },
     "./http": {
-      "import": "./dist/http/index.mjs",
-      "require": "./dist/http/index.js",
-      "default": "./dist/http/index.js"
-    },
-    "./rpc": {
-      "import": "./dist/rpc/index.mjs",
-      "require": "./dist/rpc/index.js",
-      "default": "./dist/rpc/index.js"
+      "import": "./dist/http.mjs",
+      "require": "./dist/http.js",
+      "default": "./dist/http.js"
     },
     "./observable": {
       "import": "./dist/observable/index.mjs",
       "require": "./dist/observable/index.js",
       "default": "./dist/observable/index.js"
     },
-    "./subscription": {
-      "import": "./dist/subscription.mjs",
-      "require": "./dist/subscription.js",
-      "default": "./dist/subscription.js"
+    "./rpc": {
+      "import": "./dist/rpc.mjs",
+      "require": "./dist/rpc.js",
+      "default": "./dist/rpc.js"
     },
     "./shared": {
-      "import": "./dist/shared/index.mjs",
-      "require": "./dist/shared/index.js",
-      "default": "./dist/shared/index.js"
-    },
-    "./unstableInternalsExport": {
-      "import": "./dist/unstableInternalsExport.mjs",
-      "require": "./dist/unstableInternalsExport.js",
-      "default": "./dist/unstableInternalsExport.js"
+      "import": "./dist/shared.mjs",
+      "require": "./dist/shared.js",
+      "default": "./dist/shared.js"
+    },
+    "./unstable-core-do-not-import": {
+      "import": "./dist/unstable-core-do-not-import.mjs",
+      "require": "./dist/unstable-core-do-not-import.js",
+      "default": "./dist/unstable-core-do-not-import.js"
     }
   },
   "files": [
@@ -132,46 +116,44 @@
     "package.json",
     "adapters",
     "http",
-    "rpc",
     "observable",
-    "subscription",
+    "rpc",
     "shared",
-    "unstableInternalsExport",
+    "unstable-core-do-not-import",
     "!**/*.test.*"
   ],
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@fastify/websocket": "^7.1.2",
-    "@tanstack/react-query": "^5.0.0",
+    "@fastify/websocket": "^10.0.1",
+    "@tanstack/react-query": "^5.25.0",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.17",
     "@types/hash-sum": "^1.0.0",
-    "@types/node": "^18.16.16",
-    "@types/react": "^18.2.8",
-    "@types/react-dom": "^18.2.4",
+    "@types/node": "^20.10.0",
+    "@types/react": "^18.2.33",
+    "@types/react-dom": "^18.2.14",
     "@types/ws": "^8.2.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "aws-lambda": "^1.0.7",
     "devalue": "^4.0.0",
-    "eslint": "^8.40.0",
+    "eslint": "^8.56.0",
     "express": "^4.17.1",
-    "fastify": "^4.13.0",
+    "fastify": "^4.16.0",
     "fastify-plugin": "^4.5.0",
     "hash-sum": "^2.0.0",
     "myzod": "^1.3.1",
-    "next": "^13.4.8",
+    "next": "^14.1.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup": "^2.79.1",
+    "rollup": "^4.9.5",
     "superjson": "^1.12.4",
     "superstruct": "^1.0.0",
     "tslib": "^2.5.0",
-    "tsx": "^3.12.7",
-    "typescript": "^5.1.3",
-    "valibot": "^0.19.0",
-    "vitest": "^0.32.0",
+    "tsx": "^4.0.0",
+    "typescript": "^5.4.0",
+    "valibot": "^0.30.0",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
     "zod": "^3.0.0"
@@ -179,5 +161,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "06cebb015144e438281edace5dc4a5328477e495"
+  "gitHead": "fdcb4a7d8168d19f9bcbc816b80db815b06a134c"
 }

package/src/@trpc/server/http.ts

@@ -0,0 +1,27 @@
+export {
+  getHTTPStatusCode,
+  getHTTPStatusCodeFromError,
+} from '../../unstable-core-do-not-import';
+export { resolveHTTPResponse } from '../../unstable-core-do-not-import';
+export type {
+  BaseHandlerOptions,
+  HTTPBaseHandlerOptions,
+  HTTPHeaders,
+  HTTPRequest,
+  HTTPResponse,
+  OnErrorFunction,
+  ProcedureCall,
+  ResolveHTTPRequestOptionsContextFn,
+  ResponseChunk,
+  ResponseMeta,
+  ResponseMetaFn,
+  TRPCRequestInfo,
+} from '../../unstable-core-do-not-import';
+
+export { getBatchStreamFormatter } from '../../unstable-core-do-not-import';
+export type {
+  BaseContentTypeHandler,
+  BodyResult,
+} from '../../unstable-core-do-not-import';
+export { getJsonContentTypeInputs } from '../../unstable-core-do-not-import';
+export { toURL } from '../../unstable-core-do-not-import';

package/src/@trpc/server/index.ts

@@ -0,0 +1,100 @@
+export {
+  TRPCError,
+  /**
+   * @deprecated use `experimental_trpcMiddleware` instead
+   */
+  experimental_standaloneMiddleware,
+  experimental_standaloneMiddleware as experimental_trpcMiddleware,
+  initTRPC,
+  // --- FIXME a bunch of these exports are only useful for plugins - move them somewhere else? ----
+  callProcedure as callTRPCProcedure,
+  getTRPCErrorFromUnknown,
+  transformTRPCResponse,
+  createFlatProxy as createTRPCFlatProxy,
+  type inferProcedureInput,
+  type inferProcedureOutput,
+  type inferProcedureBuilderResolverOptions,
+  type inferRouterError,
+  type inferRouterInputs,
+  type inferRouterOutputs,
+  type inferRouterContext,
+  type inferClientTypes as inferTRPCClientTypes,
+  type AnyClientTypes as AnyTRPCClientTypes,
+  type inferTransformedProcedureOutput,
+  type inferTransformedSubscriptionOutput,
+  type AnyProcedure as AnyTRPCProcedure,
+  type AnyRouter as AnyTRPCRouter,
+  type AnyMiddlewareFunction as AnyTRPCMiddlewareFunction,
+  type CombinedDataTransformer as TRPCCombinedDataTransformer,
+  type ProcedureType as TRPCProcedureType,
+  type AnyMutationProcedure as AnyTRPCMutationProcedure,
+  type AnyQueryProcedure as AnyTRPCQueryProcedure,
+  type RouterRecord as TRPCRouterRecord,
+  type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
+  type ProcedureOptions as TRPCProcedureOptions,
+} from '../../unstable-core-do-not-import';
+
+export type {
+  /**
+   * @deprecated use `AnyTRPCProcedure` instead
+   */
+  AnyProcedure,
+  /**
+   * @deprecated use `AnyTRPCRouter` instead
+   */
+  AnyRouter,
+  /**
+   * @deprecated use `AnyTRPCMiddlewareFunction` instead
+   */
+  AnyMiddlewareFunction,
+  /**
+   * @deprecated use `TRPCCombinedDataTransformer` instead
+   */
+  CombinedDataTransformer,
+
+  /**
+   * @deprecated This is a utility type will be removed in v12
+   */
+  Dict,
+
+  /**
+   * @deprecated This is a utility type will be removed in v12
+   */
+  DeepPartial,
+  /**
+   * @deprecated use `TRPCProcedureType` instead
+   */
+  ProcedureType,
+  /**
+   * @deprecated use `AnyTRPCMutationProcedure` instead
+   */
+  AnyMutationProcedure,
+
+  /**
+   * @deprecated use `AnyTRPCQueryProcedure` instead
+   */
+  AnyQueryProcedure,
+  /**
+   * @deprecated use `AnyTRPCSubscriptionProcedure` instead
+   */
+  AnySubscriptionProcedure,
+} from '../../unstable-core-do-not-import';
+
+export {
+  /**
+   * @deprecated use `getTRPCErrorShape` instead
+   */
+  getErrorShape,
+
+  /**
+   * @deprecated use `callTRPCProcedure` instead
+   */
+  callProcedure,
+} from '../../unstable-core-do-not-import';
+
+/**
+ * @deprecated
+ * Use `Awaited<ReturnType<typeof myFunction>>` instead
+ */
+export type inferAsyncReturnType<TFunction extends (...args: any[]) => any> =
+  Awaited<ReturnType<TFunction>>;

package/src/@trpc/server/rpc.ts

@@ -0,0 +1,26 @@
+// Note: this should likely be moved to a sort of `@trpc/plugin` package
+export type {
+  JSONRPC2,
+  TRPCClientIncomingMessage,
+  TRPCClientIncomingRequest,
+  TRPCClientOutgoingMessage,
+  TRPCClientOutgoingRequest,
+  TRPCErrorResponse,
+  TRPCErrorShape,
+  TRPCReconnectNotification,
+  TRPCRequest,
+  TRPCRequestMessage,
+  TRPCResponse,
+  TRPCResponseMessage,
+  TRPCResult,
+  TRPCResultMessage,
+  TRPCSubscriptionStopNotification,
+  TRPCSuccessResponse,
+  TRPC_ERROR_CODE_KEY,
+  TRPC_ERROR_CODE_NUMBER,
+} from '../../unstable-core-do-not-import';
+export {
+  TRPC_ERROR_CODES_BY_KEY,
+  TRPC_ERROR_CODES_BY_NUMBER,
+  parseTRPCMessage,
+} from '../../unstable-core-do-not-import';

package/src/adapters/aws-lambda/index.ts

@@ -1,3 +1,12 @@
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type {
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
@@ -5,18 +14,22 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
-import { TRPCError } from '../..';
-import { AnyRouter } from '../../core';
-import {
+// @trpc/server
+import type { AnyRouter } from '../../@trpc/server';
+// @trpc/server
+import { TRPCError } from '../../@trpc/server';
+import type {
   HTTPRequest,
+  HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
-  resolveHTTPResponse,
-} from '../../http';
-import type { HTTPResponse } from '../../http/internals/types';
-import {
+} from '../../@trpc/server/http';
+import { resolveHTTPResponse } from '../../@trpc/server/http';
+import type {
   APIGatewayEvent,
   APIGatewayResult,
   AWSLambdaOptions,
+} from './utils';
+import {
   getHTTPMethod,
   getPath,
   isPayloadV1,
@@ -103,9 +116,7 @@ export function awsLambdaRequestHandler<
     };
 
     const response = await resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts?.responseMeta,
+      ...opts,
       createContext,
       req,
       path,

package/src/adapters/aws-lambda/utils.ts

@@ -1,3 +1,12 @@
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type {
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
@@ -5,11 +14,15 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
-import type { AnyRouter, inferRouterContext } from '../../core';
-import { TRPCError } from '../../error/TRPCError';
-import { TRPCRequestInfo } from '../../http';
-import type { HTTPHeaders, ResponseMetaFn } from '../../http/internals/types';
-import { OnErrorFunction } from '../../internals/types';
+import type { AnyRouter, inferRouterContext } from '../../@trpc/server'; // import @trpc/server
+
+// @trpc/server
+import { TRPCError } from '../../@trpc/server';
+import type {
+  HTTPBaseHandlerOptions,
+  HTTPHeaders,
+  TRPCRequestInfo,
+} from '../../@trpc/server/http';
 
 export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
 export type APIGatewayResult =
@@ -36,27 +49,21 @@ export type AWSLambdaOptions<
   TRouter extends AnyRouter,
   TEvent extends APIGatewayEvent,
 > =
-  | {
-      router: TRouter;
-      batching?: {
-        enabled: boolean;
-      };
-      onError?: OnErrorFunction<TRouter, TEvent>;
-      responseMeta?: ResponseMetaFn<TRouter>;
-    } & (
-      | {
-          /**
-           * @link https://trpc.io/docs/context
-           **/
-          createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
-        }
-      | {
-          /**
-           * @link https://trpc.io/docs/context
-           **/
-          createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
-        }
-    );
+  | HTTPBaseHandlerOptions<TRouter, TEvent> &
+      (
+        | {
+            /**
+             * @link https://trpc.io/docs/v11/context
+             **/
+            createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
+          }
+        | {
+            /**
+             * @link https://trpc.io/docs/v11/context
+             **/
+            createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
+          }
+      );
 
 export function isPayloadV1(
   event: APIGatewayEvent,

package/src/adapters/express.ts

@@ -1,10 +1,19 @@
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type * as express from 'express';
-import { AnyRouter } from '../core';
-import {
+import type { AnyRouter } from '../@trpc/server';
+import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
-  nodeHTTPRequestHandler,
 } from './node-http';
+import { nodeHTTPRequestHandler } from './node-http';
 
 export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
   express.Request,
@@ -18,7 +27,12 @@ export function createExpressMiddleware<TRouter extends AnyRouter>(
     const endpoint = req.path.slice(1);
 
     await nodeHTTPRequestHandler({
-      ...opts,
+      // FIXME: no typecasting should be needed here
+      ...(opts as NodeHTTPHandlerOptions<
+        AnyRouter,
+        express.Request,
+        express.Response
+      >),
       req,
       res,
       path: endpoint,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,15 +1,28 @@
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import { Readable } from 'node:stream';
-import { FastifyReply, FastifyRequest } from 'fastify';
-import { AnyRouter } from '../../core';
-import {
-  getBatchStreamFormatter,
+import type { FastifyReply, FastifyRequest } from 'fastify';
+// @trpc/server
+import type { AnyRouter } from '../../@trpc/server';
+import type {
   HTTPBaseHandlerOptions,
   HTTPRequest,
+  HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
-} from '../../http';
-import { HTTPResponse, ResponseChunk } from '../../http/internals/types';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
-import { NodeHTTPCreateContextOption } from '../node-http';
+  ResponseChunk,
+} from '../../@trpc/server/http';
+import {
+  getBatchStreamFormatter,
+  resolveHTTPResponse,
+} from '../../@trpc/server/http';
+import type { NodeHTTPCreateContextOption } from '../node-http';
 
 export type FastifyHandlerOptions<
   TRouter extends AnyRouter,
@@ -96,12 +109,9 @@ export async function fastifyRequestHandler<
   };
 
   resolveHTTPResponse({
+    ...opts,
     req,
     createContext,
-    path: opts.path,
-    router: opts.router,
-    batching: opts.batching,
-    responseMeta: opts.responseMeta,
     onError(o) {
       opts?.onError?.({ ...o, req: opts.req });
     },

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,9 +1,20 @@
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 /// <reference types="@fastify/websocket" />
-import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
-import { FastifyHandlerOptions } from '.';
-import { AnyRouter } from '../../core';
-import { NodeHTTPCreateContextFnOptions } from '../node-http';
-import { applyWSSHandler, WSSHandlerOptions } from '../ws';
+import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import type { FastifyHandlerOptions } from '.';
+// @trpc/server
+import type { AnyRouter } from '../../@trpc/server';
+import type { NodeHTTPCreateContextFnOptions } from '../node-http';
+import type { WSSHandlerOptions } from '../ws';
+import { getWSConnectionHandler } from '../ws';
 import { fastifyRequestHandler } from './fastifyRequestHandler';
 
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
@@ -45,12 +56,13 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
   });
 
   if (opts.useWSS) {
-    applyWSSHandler<TRouter>({
+    const onConnection = getWSConnectionHandler<TRouter>({
       ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
-      wss: fastify.websocketServer,
     });
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    fastify.get(prefix ?? '/', { websocket: true }, () => {});
+
+    fastify.get(prefix ?? '/', { websocket: true }, (socket, req) =>
+      onConnection(socket, req.raw),
+    );
   }
 
   done();