@trpc/server 11.0.0-next-beta.303 → 11.0.0-next-beta.304

package/dist/adapters/fastify/fastifyTRPCPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyTRPCPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAKnE,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,SAAS;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,cAAc,EACd,YAAY,CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,EACvC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,QAoC5B"}
+{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyTRPCPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAKnE,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,SAAS;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,cAAc,EACd,YAAY,CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,EACvC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,QAmC5B"}

package/dist/adapters/fastify/fastifyTRPCPlugin.js

@@ -20,7 +20,6 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         _done(null, body);
     });
     let prefix = opts.prefix ?? '';
-    const websocketPrefix = prefix;
     // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
     // @ts-expect-error property 'default' does not exists on type ...
     if (typeof fastifyTRPCPlugin.default !== 'function') {
@@ -36,15 +35,12 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
     });
     if (opts.useWSS) {
-        ws.applyWSSHandler({
-            ...opts.trpcOptions,
-            prefix: websocketPrefix,
-            wss: fastify.websocketServer
+        const onConnection = ws.getWSConnectionHandler({
+            ...opts.trpcOptions
         });
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, ()=>{});
+        }, ({ socket  }, req)=>onConnection(socket, req.raw));
     }
     done();
 }

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

@@ -1,4 +1,4 @@
-import { applyWSSHandler } from '../ws.mjs';
+import { getWSConnectionHandler } from '../ws.mjs';
 import { fastifyRequestHandler } from './fastifyRequestHandler.mjs';
 
 /**
@@ -18,7 +18,6 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         _done(null, body);
     });
     let prefix = opts.prefix ?? '';
-    const websocketPrefix = prefix;
     // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
     // @ts-expect-error property 'default' does not exists on type ...
     if (typeof fastifyTRPCPlugin.default !== 'function') {
@@ -34,15 +33,12 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
     });
     if (opts.useWSS) {
-        applyWSSHandler({
-            ...opts.trpcOptions,
-            prefix: websocketPrefix,
-            wss: fastify.websocketServer
+        const onConnection = getWSConnectionHandler({
+            ...opts.trpcOptions
         });
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, ()=>{});
+        }, ({ socket  }, req)=>onConnection(socket, req.raw));
     }
     done();
 }

package/dist/adapters/ws.d.ts

@@ -15,10 +15,7 @@ export type CreateWSSContextFnOptions = Omit<NodeHTTPCreateContextFnOptions<Inco
  * @public
  */
 export type CreateWSSContextFn<TRouter extends AnyRouter> = (opts: CreateWSSContextFnOptions) => MaybePromise<inferRouterContext<TRouter>>;
-/**
- * Web socket server handler
- */
-export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, IncomingMessage> & (object extends inferRouterContext<TRouter> ? {
+export type WSConnectionHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, IncomingMessage> & (object extends inferRouterContext<TRouter> ? {
     /**
      * @link https://trpc.io/docs/v11/context
      **/
@@ -28,11 +25,16 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TR
      * @link https://trpc.io/docs/v11/context
      **/
     createContext: CreateWSSContextFn<TRouter>;
-}) & {
+});
+/**
+ * Web socket server handler
+ */
+export type WSSHandlerOptions<TRouter extends AnyRouter> = WSConnectionHandlerOptions<TRouter> & {
     wss: ws.WebSocketServer;
     process?: NodeJS.Process;
     prefix?: string;
 };
+export declare function getWSConnectionHandler<TRouter extends AnyRouter>(opts: WSConnectionHandlerOptions<TRouter>): (client: ws.WebSocket, req: IncomingMessage) => Promise<void>;
 export declare function applyWSSHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): {
     broadcastReconnectNotification: () => void;
 };

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAQrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAC7D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GACC,CAAC,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC7C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC5C,CAAC,GAAG;IACP,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEJ,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA4QjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAQrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAC7D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,CAAC,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC7C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,YAAY,OAAO,eAAe,mBAoPzD;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA2BjC"}

package/dist/adapters/ws.js

@@ -12,13 +12,10 @@ var observable = require('../observable/observable.js');
  * Importing ws causes a build error
  * @link https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
-function applyWSSHandler(opts) {
-    const { wss , createContext , router: router$1 , prefix  } = opts;
+function getWSConnectionHandler(opts) {
+    const { createContext , router: router$1  } = opts;
     const { transformer: transformer$1  } = router$1._def._config;
-    wss.on('connection', async (client, req)=>{
-        if (prefix && !req.url?.startsWith(prefix)) {
-            return;
-        }
+    return async (client, req)=>{
         const clientSubscriptions = new Map();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));
@@ -260,6 +257,16 @@ function applyWSSHandler(opts) {
             }
         }
         await createContextAsync();
+    };
+}
+function applyWSSHandler(opts) {
+    const { wss , prefix  } = opts;
+    const onConnection = getWSConnectionHandler(opts);
+    wss.on('connection', async (client, req)=>{
+        if (prefix && !req.url?.startsWith(prefix)) {
+            return;
+        }
+        await onConnection(client, req);
     });
     return {
         broadcastReconnectNotification: ()=>{
@@ -278,3 +285,4 @@ function applyWSSHandler(opts) {
 }
 
 exports.applyWSSHandler = applyWSSHandler;
+exports.getWSConnectionHandler = getWSConnectionHandler;

package/dist/adapters/ws.mjs

@@ -10,13 +10,10 @@ import { isObservable } from '../observable/observable.mjs';
  * Importing ws causes a build error
  * @link https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
-function applyWSSHandler(opts) {
-    const { wss , createContext , router , prefix  } = opts;
+function getWSConnectionHandler(opts) {
+    const { createContext , router  } = opts;
     const { transformer  } = router._def._config;
-    wss.on('connection', async (client, req)=>{
-        if (prefix && !req.url?.startsWith(prefix)) {
-            return;
-        }
+    return async (client, req)=>{
         const clientSubscriptions = new Map();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformTRPCResponse(router._def._config, untransformedJSON)));
@@ -258,6 +255,16 @@ function applyWSSHandler(opts) {
             }
         }
         await createContextAsync();
+    };
+}
+function applyWSSHandler(opts) {
+    const { wss , prefix  } = opts;
+    const onConnection = getWSConnectionHandler(opts);
+    wss.on('connection', async (client, req)=>{
+        if (prefix && !req.url?.startsWith(prefix)) {
+            return;
+        }
+        await onConnection(client, req);
     });
     return {
         broadcastReconnectNotification: ()=>{
@@ -275,4 +282,4 @@ function applyWSSHandler(opts) {
     };
 }
 
-export { applyWSSHandler };
+export { applyWSSHandler, getWSConnectionHandler };

package/dist/bundle-analysis.json

@@ -1,20 +1,21 @@
 {
-  "bundleSize": 93108,
-  "bundleOrigSize": 148167,
-  "bundleReduction": 37.16,
+  "bundleSize": 93191,
+  "bundleOrigSize": 148516,
+  "bundleReduction": 37.25,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
-      "size": 9970,
-      "origSize": 9269,
+      "size": 10170,
+      "origSize": 9698,
       "renderedExports": [
+        "getWSConnectionHandler",
         "applyWSSHandler"
       ],
       "removedExports": [],
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.71,
+      "percent": 10.91,
       "reduction": 0
     },
     {
@@ -26,7 +27,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.08,
+      "percent": 10.07,
       "reduction": 21.23
     },
     {
@@ -45,7 +46,7 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.52,
+      "percent": 6.51,
       "reduction": 38.58
     },
     {
@@ -61,7 +62,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.13,
+      "percent": 6.12,
       "reduction": 58.57
     },
     {
@@ -77,7 +78,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 5.35,
+      "percent": 5.34,
       "reduction": 36.77
     },
     {
@@ -91,7 +92,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.75,
+      "percent": 4.74,
       "reduction": 32.71
     },
     {
@@ -119,7 +120,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 3.82,
+      "percent": 3.81,
       "reduction": 9.5
     },
     {
@@ -190,7 +191,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.95,
+      "percent": 2.94,
       "reduction": 45.94
     },
     {
@@ -289,20 +290,6 @@
       "percent": 1.76,
       "reduction": 34.79
     },
-    {
-      "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
-      "size": 1603,
-      "origSize": 2343,
-      "renderedExports": [
-        "fastifyTRPCPlugin"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/fastify/index.ts"
-      ],
-      "percent": 1.72,
-      "reduction": 31.58
-    },
     {
       "id": "/src/adapters/next.ts",
       "size": 1602,
@@ -371,6 +358,20 @@
       "percent": 1.62,
       "reduction": 5.58
     },
+    {
+      "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
+      "size": 1486,
+      "origSize": 2263,
+      "renderedExports": [
+        "fastifyTRPCPlugin"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/fastify/index.ts"
+      ],
+      "percent": 1.59,
+      "reduction": 34.33
+    },
     {
       "id": "/src/adapters/node-http/content-type/form-data/streamSlice.ts",
       "size": 1393,
@@ -382,7 +383,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"
       ],
-      "percent": 1.5,
+      "percent": 1.49,
       "reduction": 0
     },
     {
@@ -413,7 +414,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.07,
+      "percent": 1.06,
       "reduction": 56.22
     },
     {
@@ -435,7 +436,7 @@
         "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.88,
+      "percent": 0.87,
       "reduction": 19.78
     },
     {
@@ -656,9 +657,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 1552,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -666,9 +667,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/unstable-core-do-not-import.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 1552,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -714,8 +715,8 @@
       "renderedExports": [],
       "removedExports": [],
       "dependents": [
-        "/src/adapters/express.ts",
         "/src/adapters/next.ts",
+        "/src/adapters/express.ts",
         "/src/adapters/standalone.ts"
       ],
       "percent": 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next-beta.303+cdf215127",
+  "version": "11.0.0-next-beta.304+1724978f1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -157,5 +157,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "cdf215127a172e497468dec04acb8ea12e840e84"
+  "gitHead": "1724978f1aa05be40413cd7ca0859b74d6971b68"
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -14,7 +14,7 @@ import type { FastifyHandlerOptions } from '.';
 import type { AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
 import type { WSSHandlerOptions } from '../ws';
-import { applyWSSHandler } from '../ws';
+import { getWSConnectionHandler } from '../ws';
 import { fastifyRequestHandler } from './fastifyRequestHandler';
 
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
@@ -43,7 +43,6 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
   );
 
   let prefix = opts.prefix ?? '';
-  const websocketPrefix = prefix;
 
   // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
   // @ts-expect-error property 'default' does not exists on type ...
@@ -57,13 +56,13 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
   });
 
   if (opts.useWSS) {
-    applyWSSHandler<TRouter>({
+    const onConnection = getWSConnectionHandler<TRouter>({
       ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
-      prefix: websocketPrefix,
-      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();

package/src/adapters/ws.ts

@@ -44,42 +44,39 @@ export type CreateWSSContextFn<TRouter extends AnyRouter> = (
   opts: CreateWSSContextFnOptions,
 ) => MaybePromise<inferRouterContext<TRouter>>;
 
+export type WSConnectionHandlerOptions<TRouter extends AnyRouter> =
+  BaseHandlerOptions<TRouter, IncomingMessage> &
+    (object extends inferRouterContext<TRouter>
+      ? {
+          /**
+           * @link https://trpc.io/docs/v11/context
+           **/
+          createContext?: CreateWSSContextFn<TRouter>;
+        }
+      : {
+          /**
+           * @link https://trpc.io/docs/v11/context
+           **/
+          createContext: CreateWSSContextFn<TRouter>;
+        });
+
 /**
  * Web socket server handler
  */
-export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
-  TRouter,
-  IncomingMessage
-> &
-  (object extends inferRouterContext<TRouter>
-    ? {
-        /**
-         * @link https://trpc.io/docs/v11/context
-         **/
-        createContext?: CreateWSSContextFn<TRouter>;
-      }
-    : {
-        /**
-         * @link https://trpc.io/docs/v11/context
-         **/
-        createContext: CreateWSSContextFn<TRouter>;
-      }) & {
+export type WSSHandlerOptions<TRouter extends AnyRouter> =
+  WSConnectionHandlerOptions<TRouter> & {
     wss: ws.WebSocketServer;
     process?: NodeJS.Process;
     prefix?: string;
   };
 
-export function applyWSSHandler<TRouter extends AnyRouter>(
-  opts: WSSHandlerOptions<TRouter>,
+export function getWSConnectionHandler<TRouter extends AnyRouter>(
+  opts: WSConnectionHandlerOptions<TRouter>,
 ) {
-  const { wss, createContext, router, prefix } = opts;
-
+  const { createContext, router } = opts;
   const { transformer } = router._def._config;
-  wss.on('connection', async (client, req) => {
-    if (prefix && !req.url?.startsWith(prefix)) {
-      return;
-    }
 
+  return async (client: ws.WebSocket, req: IncomingMessage) => {
     const clientSubscriptions = new Map<number | string, Unsubscribable>();
 
     function respond(untransformedJSON: TRPCResponseMessage) {
@@ -322,6 +319,21 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       }
     }
     await createContextAsync();
+  };
+}
+
+export function applyWSSHandler<TRouter extends AnyRouter>(
+  opts: WSSHandlerOptions<TRouter>,
+) {
+  const { wss, prefix } = opts;
+
+  const onConnection = getWSConnectionHandler(opts);
+  wss.on('connection', async (client, req) => {
+    if (prefix && !req.url?.startsWith(prefix)) {
+      return;
+    }
+
+    await onConnection(client, req);
   });
 
   return {