@trpc/server 11.0.5-canary.2 → 11.1.1-canary.8

package/dist/adapters/fastify/fastifyTRPCPlugin.js

@@ -42,8 +42,8 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, async (socket, req)=>{
-            await onConnection(socket, req.raw);
+        }, (socket, req)=>{
+            onConnection(socket, req.raw);
             if (trpcOptions?.keepAlive?.enabled) {
                 const { pingMs, pongWaitMs } = trpcOptions.keepAlive;
                 ws.handleKeepAlive(socket, pingMs, pongWaitMs);

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

@@ -40,8 +40,8 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         });
         fastify.get(prefix ?? '/', {
             websocket: true
-        }, async (socket, req)=>{
-            await onConnection(socket, req.raw);
+        }, (socket, req)=>{
+            onConnection(socket, req.raw);
             if (trpcOptions?.keepAlive?.enabled) {
                 const { pingMs, pongWaitMs } = trpcOptions.keepAlive;
                 handleKeepAlive(socket, pingMs, pongWaitMs);

package/dist/adapters/ws.d.ts

@@ -43,7 +43,7 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = WSConnectionHandlerOp
      */
     dangerouslyDisablePong?: boolean;
 };
-export declare function getWSConnectionHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): (client: ws.WebSocket, req: IncomingMessage) => Promise<void>;
+export declare function getWSConnectionHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): (client: ws.WebSocket, req: IncomingMessage) => void;
 /**
  * Handle WebSocket keep-alive messages
  */

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,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,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,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAKlB,QAAQ,EAAE,CAAC,SAAS,EAAE,KAAK,eAAe,mBAmYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}
+{"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,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAMxC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,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,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAKxB,QAAQ,EAAE,CAAC,SAAS,EAAE,KAAK,eAAe,UAyanD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAyBjC"}

package/dist/adapters/ws.js

@@ -84,11 +84,10 @@ function _ts_dispose_resources(env) {
  * Importing ws causes a build error
  * @see https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
-const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 function getWSConnectionHandler(opts) {
     const { createContext, router: router$1 } = opts;
     const { transformer: transformer$1 } = router$1._def._config;
-    return async (client, req)=>{
+    return (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
         if (opts.keepAlive?.enabled) {
@@ -98,23 +97,28 @@ function getWSConnectionHandler(opts) {
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));
         }
-        function createCtxPromise(getConnectionParams) {
-            return utils.run(async ()=>{
-                ctx = await createContext?.({
-                    req,
-                    res: client,
-                    info: {
-                        connectionParams: getConnectionParams(),
-                        calls: [],
-                        isBatchCall: false,
-                        accept: null,
-                        type: 'unknown',
-                        signal: abortController.signal,
-                        url: null
-                    }
+        async function createCtxPromise(getConnectionParams) {
+            try {
+                return await utils.run(async ()=>{
+                    ctx = await createContext?.({
+                        req,
+                        res: client,
+                        info: {
+                            connectionParams: getConnectionParams(),
+                            calls: [],
+                            isBatchCall: false,
+                            accept: null,
+                            type: 'unknown',
+                            signal: abortController.signal,
+                            url: null
+                        }
+                    });
+                    return {
+                        ok: true,
+                        value: ctx
+                    };
                 });
-                return ctx;
-            }).catch((cause)=>{
+            } catch (cause) {
                 const error = TRPCError.getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
                     error,
@@ -139,8 +143,11 @@ function getWSConnectionHandler(opts) {
                 (globalThis.setImmediate ?? globalThis.setTimeout)(()=>{
                     client.close();
                 });
-                throw error;
-            });
+                return {
+                    ok: false,
+                    error
+                };
+            }
         }
         let ctx = undefined;
         /**
@@ -148,14 +155,35 @@ function getWSConnectionHandler(opts) {
      *
      * - the context promise will be created immediately on connection if no connectionParams are expected
      * - if connection params are expected, they will be created once received
-     */ let ctxPromise = incomingMessageToRequest.createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
-        async function handleRequest(msg) {
+     */ let ctxPromise = incomingMessageToRequest.createURL(req).searchParams.get('connectionParams') === '1' ? null : createCtxPromise(()=>null);
+        function handleRequest(msg) {
             const { id, jsonrpc } = msg;
-            /* istanbul ignore next -- @preserve */ if (id === null) {
-                throw new TRPCError.TRPCError({
-                    code: 'BAD_REQUEST',
+            if (id === null) {
+                const error = TRPCError.getTRPCErrorFromUnknown(new TRPCError.TRPCError({
+                    code: 'PARSE_ERROR',
                     message: '`id` is required'
+                }));
+                opts.onError?.({
+                    error,
+                    path: undefined,
+                    type: 'unknown',
+                    ctx,
+                    req,
+                    input: undefined
                 });
+                respond({
+                    id,
+                    jsonrpc,
+                    error: getErrorShape.getErrorShape({
+                        config: router$1._def._config,
+                        error,
+                        type: 'unknown',
+                        path: undefined,
+                        input: undefined,
+                        ctx
+                    })
+                });
+                return;
             }
             if (msg.method === 'subscription.stop') {
                 clientSubscriptions.get(id)?.abort();
@@ -164,20 +192,24 @@ function getWSConnectionHandler(opts) {
             const { path, lastEventId } = msg.params;
             let { input } = msg.params;
             const type = msg.method;
-            try {
-                if (lastEventId !== undefined) {
-                    if (utils.isObject(input)) {
-                        input = {
-                            ...input,
-                            lastEventId: lastEventId
-                        };
-                    } else {
-                        input ?? (input = {
-                            lastEventId: lastEventId
-                        });
-                    }
+            if (lastEventId !== undefined) {
+                if (utils.isObject(input)) {
+                    input = {
+                        ...input,
+                        lastEventId: lastEventId
+                    };
+                } else {
+                    input ?? (input = {
+                        lastEventId: lastEventId
+                    });
+                }
+            }
+            utils.run(async ()=>{
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const res = await ctxPromise; // asserts context has been set
+                if (!res.ok) {
+                    throw res.error;
                 }
-                await ctxPromise; // asserts context has been set
                 const abortController = new AbortController();
                 const result = await router.callProcedure({
                     router: router$1,
@@ -345,7 +377,7 @@ function getWSConnectionHandler(opts) {
                         type: 'started'
                     }
                 });
-            } catch (cause) /* istanbul ignore next -- @preserve */ {
+            }).catch((cause)=>{
                 // procedure threw an error
                 const error = TRPCError.getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
@@ -368,9 +400,9 @@ function getWSConnectionHandler(opts) {
                         ctx
                     })
                 });
-            }
+            });
         }
-        client.on('message', async (rawData)=>{
+        client.on('message', (rawData)=>{
             // eslint-disable-next-line @typescript-eslint/no-base-to-string
             const msgStr = rawData.toString();
             if (msgStr === 'PONG') {
@@ -382,7 +414,7 @@ function getWSConnectionHandler(opts) {
                 }
                 return;
             }
-            if (ctxPromise === unsetContextPromiseSymbol) {
+            if (!ctxPromise) {
                 // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
                 ctxPromise = createCtxPromise(()=>{
                     let msg;
@@ -403,30 +435,33 @@ function getWSConnectionHandler(opts) {
                 });
                 return;
             }
-            try {
-                const msgJSON = JSON.parse(msgStr);
-                const msgs = Array.isArray(msgJSON) ? msgJSON : [
-                    msgJSON
-                ];
-                const promises = msgs.map((raw)=>parseTRPCMessage.parseTRPCMessage(raw, transformer$1)).map(handleRequest);
-                await Promise.all(promises);
-            } catch (cause) {
-                const error = new TRPCError.TRPCError({
-                    code: 'PARSE_ERROR',
-                    cause
-                });
-                respond({
-                    id: null,
-                    error: getErrorShape.getErrorShape({
-                        config: router$1._def._config,
-                        error,
-                        type: 'unknown',
-                        path: undefined,
-                        input: undefined,
-                        ctx: undefined
-                    })
-                });
-            }
+            const parsedMsgs = utils.run(()=>{
+                try {
+                    const msgJSON = JSON.parse(msgStr);
+                    const msgs = Array.isArray(msgJSON) ? msgJSON : [
+                        msgJSON
+                    ];
+                    return msgs.map((raw)=>parseTRPCMessage.parseTRPCMessage(raw, transformer$1));
+                } catch (cause) {
+                    const error = new TRPCError.TRPCError({
+                        code: 'PARSE_ERROR',
+                        cause
+                    });
+                    respond({
+                        id: null,
+                        error: getErrorShape.getErrorShape({
+                            config: router$1._def._config,
+                            error,
+                            type: 'unknown',
+                            path: undefined,
+                            input: undefined,
+                            ctx
+                        })
+                    });
+                    return [];
+                }
+            });
+            parsedMsgs.map(handleRequest);
         });
         // WebSocket errors should be handled, as otherwise unhandled exceptions will crash Node.js.
         // This line was introduced after the following error brought down production systems:
@@ -449,9 +484,6 @@ function getWSConnectionHandler(opts) {
             clientSubscriptions.clear();
             abortController.abort();
         });
-        if (ctxPromise !== unsetContextPromiseSymbol) {
-            await ctxPromise;
-        }
     };
 }
 /**
@@ -488,21 +520,7 @@ function applyWSSHandler(opts) {
         if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
             return;
         }
-        onConnection(client, req).catch((cause)=>{
-            opts.onError?.({
-                error: new TRPCError.TRPCError({
-                    code: 'INTERNAL_SERVER_ERROR',
-                    cause,
-                    message: 'Failed to handle WebSocket connection'
-                }),
-                req: req,
-                path: undefined,
-                type: 'unknown',
-                ctx: undefined,
-                input: undefined
-            });
-            client.close();
-        });
+        onConnection(client, req);
     });
     return {
         broadcastReconnectNotification: ()=>{

package/dist/adapters/ws.mjs

@@ -82,11 +82,10 @@ function _ts_dispose_resources(env) {
  * Importing ws causes a build error
  * @see https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
-const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 function getWSConnectionHandler(opts) {
     const { createContext, router } = opts;
     const { transformer } = router._def._config;
-    return async (client, req)=>{
+    return (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
         if (opts.keepAlive?.enabled) {
@@ -96,23 +95,28 @@ function getWSConnectionHandler(opts) {
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformTRPCResponse(router._def._config, untransformedJSON)));
         }
-        function createCtxPromise(getConnectionParams) {
-            return run(async ()=>{
-                ctx = await createContext?.({
-                    req,
-                    res: client,
-                    info: {
-                        connectionParams: getConnectionParams(),
-                        calls: [],
-                        isBatchCall: false,
-                        accept: null,
-                        type: 'unknown',
-                        signal: abortController.signal,
-                        url: null
-                    }
+        async function createCtxPromise(getConnectionParams) {
+            try {
+                return await run(async ()=>{
+                    ctx = await createContext?.({
+                        req,
+                        res: client,
+                        info: {
+                            connectionParams: getConnectionParams(),
+                            calls: [],
+                            isBatchCall: false,
+                            accept: null,
+                            type: 'unknown',
+                            signal: abortController.signal,
+                            url: null
+                        }
+                    });
+                    return {
+                        ok: true,
+                        value: ctx
+                    };
                 });
-                return ctx;
-            }).catch((cause)=>{
+            } catch (cause) {
                 const error = getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
                     error,
@@ -137,8 +141,11 @@ function getWSConnectionHandler(opts) {
                 (globalThis.setImmediate ?? globalThis.setTimeout)(()=>{
                     client.close();
                 });
-                throw error;
-            });
+                return {
+                    ok: false,
+                    error
+                };
+            }
         }
         let ctx = undefined;
         /**
@@ -146,14 +153,35 @@ function getWSConnectionHandler(opts) {
      *
      * - the context promise will be created immediately on connection if no connectionParams are expected
      * - if connection params are expected, they will be created once received
-     */ let ctxPromise = createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
-        async function handleRequest(msg) {
+     */ let ctxPromise = createURL(req).searchParams.get('connectionParams') === '1' ? null : createCtxPromise(()=>null);
+        function handleRequest(msg) {
             const { id, jsonrpc } = msg;
-            /* istanbul ignore next -- @preserve */ if (id === null) {
-                throw new TRPCError({
-                    code: 'BAD_REQUEST',
+            if (id === null) {
+                const error = getTRPCErrorFromUnknown(new TRPCError({
+                    code: 'PARSE_ERROR',
                     message: '`id` is required'
+                }));
+                opts.onError?.({
+                    error,
+                    path: undefined,
+                    type: 'unknown',
+                    ctx,
+                    req,
+                    input: undefined
                 });
+                respond({
+                    id,
+                    jsonrpc,
+                    error: getErrorShape({
+                        config: router._def._config,
+                        error,
+                        type: 'unknown',
+                        path: undefined,
+                        input: undefined,
+                        ctx
+                    })
+                });
+                return;
             }
             if (msg.method === 'subscription.stop') {
                 clientSubscriptions.get(id)?.abort();
@@ -162,20 +190,24 @@ function getWSConnectionHandler(opts) {
             const { path, lastEventId } = msg.params;
             let { input } = msg.params;
             const type = msg.method;
-            try {
-                if (lastEventId !== undefined) {
-                    if (isObject(input)) {
-                        input = {
-                            ...input,
-                            lastEventId: lastEventId
-                        };
-                    } else {
-                        input ?? (input = {
-                            lastEventId: lastEventId
-                        });
-                    }
+            if (lastEventId !== undefined) {
+                if (isObject(input)) {
+                    input = {
+                        ...input,
+                        lastEventId: lastEventId
+                    };
+                } else {
+                    input ?? (input = {
+                        lastEventId: lastEventId
+                    });
+                }
+            }
+            run(async ()=>{
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const res = await ctxPromise; // asserts context has been set
+                if (!res.ok) {
+                    throw res.error;
                 }
-                await ctxPromise; // asserts context has been set
                 const abortController = new AbortController();
                 const result = await callProcedure({
                     router,
@@ -343,7 +375,7 @@ function getWSConnectionHandler(opts) {
                         type: 'started'
                     }
                 });
-            } catch (cause) /* istanbul ignore next -- @preserve */ {
+            }).catch((cause)=>{
                 // procedure threw an error
                 const error = getTRPCErrorFromUnknown(cause);
                 opts.onError?.({
@@ -366,9 +398,9 @@ function getWSConnectionHandler(opts) {
                         ctx
                     })
                 });
-            }
+            });
         }
-        client.on('message', async (rawData)=>{
+        client.on('message', (rawData)=>{
             // eslint-disable-next-line @typescript-eslint/no-base-to-string
             const msgStr = rawData.toString();
             if (msgStr === 'PONG') {
@@ -380,7 +412,7 @@ function getWSConnectionHandler(opts) {
                 }
                 return;
             }
-            if (ctxPromise === unsetContextPromiseSymbol) {
+            if (!ctxPromise) {
                 // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
                 ctxPromise = createCtxPromise(()=>{
                     let msg;
@@ -401,30 +433,33 @@ function getWSConnectionHandler(opts) {
                 });
                 return;
             }
-            try {
-                const msgJSON = JSON.parse(msgStr);
-                const msgs = Array.isArray(msgJSON) ? msgJSON : [
-                    msgJSON
-                ];
-                const promises = msgs.map((raw)=>parseTRPCMessage(raw, transformer)).map(handleRequest);
-                await Promise.all(promises);
-            } catch (cause) {
-                const error = new TRPCError({
-                    code: 'PARSE_ERROR',
-                    cause
-                });
-                respond({
-                    id: null,
-                    error: getErrorShape({
-                        config: router._def._config,
-                        error,
-                        type: 'unknown',
-                        path: undefined,
-                        input: undefined,
-                        ctx: undefined
-                    })
-                });
-            }
+            const parsedMsgs = run(()=>{
+                try {
+                    const msgJSON = JSON.parse(msgStr);
+                    const msgs = Array.isArray(msgJSON) ? msgJSON : [
+                        msgJSON
+                    ];
+                    return msgs.map((raw)=>parseTRPCMessage(raw, transformer));
+                } catch (cause) {
+                    const error = new TRPCError({
+                        code: 'PARSE_ERROR',
+                        cause
+                    });
+                    respond({
+                        id: null,
+                        error: getErrorShape({
+                            config: router._def._config,
+                            error,
+                            type: 'unknown',
+                            path: undefined,
+                            input: undefined,
+                            ctx
+                        })
+                    });
+                    return [];
+                }
+            });
+            parsedMsgs.map(handleRequest);
         });
         // WebSocket errors should be handled, as otherwise unhandled exceptions will crash Node.js.
         // This line was introduced after the following error brought down production systems:
@@ -447,9 +482,6 @@ function getWSConnectionHandler(opts) {
             clientSubscriptions.clear();
             abortController.abort();
         });
-        if (ctxPromise !== unsetContextPromiseSymbol) {
-            await ctxPromise;
-        }
     };
 }
 /**
@@ -486,21 +518,7 @@ function applyWSSHandler(opts) {
         if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
             return;
         }
-        onConnection(client, req).catch((cause)=>{
-            opts.onError?.({
-                error: new TRPCError({
-                    code: 'INTERNAL_SERVER_ERROR',
-                    cause,
-                    message: 'Failed to handle WebSocket connection'
-                }),
-                req: req,
-                path: undefined,
-                type: 'unknown',
-                ctx: undefined,
-                input: undefined
-            });
-            client.close();
-        });
+        onConnection(client, req);
     });
     return {
         broadcastReconnectNotification: ()=>{

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 202129,
-  "bundleOrigSize": 234830,
-  "bundleReduction": 13.93,
+  "bundleSize": 202625,
+  "bundleOrigSize": 235222,
+  "bundleReduction": 13.86,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -14,13 +14,13 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 10.43,
+      "percent": 10.41,
       "reduction": 0
     },
     {
       "id": "/src/adapters/ws.ts",
-      "size": 20148,
-      "origSize": 15935,
+      "size": 20656,
+      "origSize": 16339,
       "renderedExports": [
         "getWSConnectionHandler",
         "handleKeepAlive",
@@ -30,7 +30,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 9.97,
+      "percent": 10.19,
       "reduction": 0
     },
     {
@@ -47,7 +47,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 9.87,
+      "percent": 9.84,
       "reduction": 0
     },
     {
@@ -64,7 +64,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 6.41,
+      "percent": 6.39,
       "reduction": 0
     },
     {
@@ -77,7 +77,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.01,
+      "percent": 6,
       "reduction": 11.62
     },
     {
@@ -98,7 +98,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts"
       ],
-      "percent": 5.02,
+      "percent": 5.01,
       "reduction": 29.54
     },
     {
@@ -112,7 +112,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import/stream/jsonl.ts"
       ],
-      "percent": 4.02,
+      "percent": 4.01,
       "reduction": 0
     },
     {
@@ -127,7 +127,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 3.9,
+      "percent": 3.89,
       "reduction": 0.83
     },
     {
@@ -142,7 +142,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.93,
+      "percent": 2.92,
       "reduction": 66.3
     },
     {
@@ -162,7 +162,7 @@
         "/src/unstable-core-do-not-import/stream/sse.ts",
         "/src/unstable-core-do-not-import/stream/utils/withPing.ts"
       ],
-      "percent": 2.83,
+      "percent": 2.82,
       "reduction": 0
     },
     {
@@ -176,7 +176,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 2.68,
+      "percent": 2.67,
       "reduction": 12.47
     },
     {
@@ -212,7 +212,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 2.2,
+      "percent": 2.19,
       "reduction": 0
     },
     {
@@ -289,7 +289,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 1.36,
+      "percent": 1.35,
       "reduction": 16.3
     },
     {
@@ -309,7 +309,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 1.36,
+      "percent": 1.35,
       "reduction": 45.98
     },
     {
@@ -323,7 +323,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 1.32,
+      "percent": 1.31,
       "reduction": 40.81
     },
     {
@@ -381,7 +381,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 1.22,
+      "percent": 1.21,
       "reduction": 17.51
     },
     {
@@ -505,8 +505,8 @@
     },
     {
       "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
-      "size": 1777,
-      "origSize": 2546,
+      "size": 1765,
+      "origSize": 2534,
       "renderedExports": [
         "fastifyTRPCPlugin"
       ],
@@ -514,8 +514,8 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 0.88,
-      "reduction": 30.2
+      "percent": 0.87,
+      "reduction": 30.35
     },
     {
       "id": "/src/unstable-core-do-not-import/stream/utils/disposable.ts",
@@ -571,7 +571,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.66,
+      "percent": 0.65,
       "reduction": 35.1
     },
     {
@@ -588,7 +588,7 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 0.66,
+      "percent": 0.65,
       "reduction": 0
     },
     {
@@ -619,7 +619,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts"
       ],
-      "percent": 0.55,
+      "percent": 0.54,
       "reduction": 15.08
     },
     {
@@ -690,7 +690,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.39,
+      "percent": 0.38,
       "reduction": 44.13
     },
     {
@@ -702,7 +702,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.38,
+      "percent": 0.37,
       "reduction": 66.61
     },
     {
@@ -896,6 +896,16 @@
       "percent": 0,
       "reduction": 100
     },
+    {
+      "id": "/src/shared.ts",
+      "size": 0,
+      "origSize": 653,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
+    },
     {
       "id": "/src/rpc.ts",
       "size": 0,
@@ -915,8 +925,8 @@
       "dependents": [
         "/src/adapters/express.ts",
         "/src/adapters/next.ts",
-        "/src/adapters/ws.ts",
         "/src/adapters/standalone.ts",
+        "/src/adapters/ws.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/node-http/writeResponse.ts"
@@ -924,16 +934,6 @@
       "percent": 0,
       "reduction": 100
     },
-    {
-      "id": "/src/shared.ts",
-      "size": 0,
-      "origSize": 653,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0,
-      "reduction": 100
-    },
     {
       "id": "/src/adapters/next-app-dir.ts",
       "size": 0,
@@ -957,9 +957,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/adapters/fetch/index.ts",
+      "id": "/src/adapters/fastify/index.ts",
       "size": 0,
-      "origSize": 64,
+      "origSize": 78,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -967,9 +967,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/adapters/fastify/index.ts",
+      "id": "/src/adapters/fetch/index.ts",
       "size": 0,
-      "origSize": 78,
+      "origSize": 64,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -985,8 +985,8 @@
       "dependents": [
         "/src/adapters/express.ts",
         "/src/adapters/next.ts",
-        "/src/adapters/ws.ts",
         "/src/adapters/standalone.ts",
+        "/src/adapters/ws.ts",
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
       "percent": 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.5-canary.2+129addc5f",
+  "version": "11.1.1-canary.8+9beb26c63",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -152,5 +152,5 @@
   "peerDependencies": {
     "typescript": ">=5.7.2"
   },
-  "gitHead": "129addc5f2cd183d99c383e47cea4916d648d927"
+  "gitHead": "9beb26c636d44852e0f407f3d7a82ad54df65b4d"
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -68,8 +68,8 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
       ...trpcOptions,
     });
 
-    fastify.get(prefix ?? '/', { websocket: true }, async (socket, req) => {
-      await onConnection(socket, req.raw);
+    fastify.get(prefix ?? '/', { websocket: true }, (socket, req) => {
+      onConnection(socket, req.raw);
       if (trpcOptions?.keepAlive?.enabled) {
         const { pingMs, pongWaitMs } = trpcOptions.keepAlive;
         handleKeepAlive(socket, pingMs, pongWaitMs);

package/src/adapters/ws.ts

@@ -34,6 +34,8 @@ import {
   type MaybePromise,
 } from '../unstable-core-do-not-import';
 // eslint-disable-next-line no-restricted-imports
+import type { Result } from '../unstable-core-do-not-import';
+// eslint-disable-next-line no-restricted-imports
 import { iteratorResource } from '../unstable-core-do-not-import/stream/utils/asyncIterable';
 import { Unpromise } from '../vendor/unpromise';
 import { createURL, type NodeHTTPCreateContextFnOptions } from './node-http';
@@ -98,14 +100,16 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> =
     dangerouslyDisablePong?: boolean;
   };
 
-const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 export function getWSConnectionHandler<TRouter extends AnyRouter>(
   opts: WSSHandlerOptions<TRouter>,
 ) {
   const { createContext, router } = opts;
   const { transformer } = router._def._config;
 
-  return async (client: ws.WebSocket, req: IncomingMessage) => {
+  return (client: ws.WebSocket, req: IncomingMessage) => {
+    type Context = inferRouterContext<TRouter>;
+    type ContextResult = Result<Context>;
+
     const clientSubscriptions = new Map<number | string, AbortController>();
     const abortController = new AbortController();
 
@@ -122,26 +126,31 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
       );
     }
 
-    function createCtxPromise(
+    async function createCtxPromise(
       getConnectionParams: () => TRPCRequestInfo['connectionParams'],
-    ): Promise<inferRouterContext<TRouter>> {
-      return run(async () => {
-        ctx = await createContext?.({
-          req,
-          res: client,
-          info: {
-            connectionParams: getConnectionParams(),
-            calls: [],
-            isBatchCall: false,
-            accept: null,
-            type: 'unknown',
-            signal: abortController.signal,
-            url: null,
-          },
-        });
+    ): Promise<ContextResult> {
+      try {
+        return await run(async (): Promise<ContextResult> => {
+          ctx = await createContext?.({
+            req,
+            res: client,
+            info: {
+              connectionParams: getConnectionParams(),
+              calls: [],
+              isBatchCall: false,
+              accept: null,
+              type: 'unknown',
+              signal: abortController.signal,
+              url: null,
+            },
+          });
 
-        return ctx;
-      }).catch((cause) => {
+          return {
+            ok: true,
+            value: ctx,
+          };
+        });
+      } catch (cause) {
         const error = getTRPCErrorFromUnknown(cause);
         opts.onError?.({
           error,
@@ -167,12 +176,14 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         (globalThis.setImmediate ?? globalThis.setTimeout)(() => {
           client.close();
         });
-
-        throw error;
-      });
+        return {
+          ok: false,
+          error,
+        };
+      }
     }
 
-    let ctx: inferRouterContext<TRouter> | undefined = undefined;
+    let ctx: Context | undefined = undefined;
 
     /**
      * promise for initializing the context
@@ -182,18 +193,40 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
      */
     let ctxPromise =
       createURL(req).searchParams.get('connectionParams') === '1'
-        ? unsetContextPromiseSymbol
+        ? null
         : createCtxPromise(() => null);
 
-    async function handleRequest(msg: TRPCClientOutgoingMessage) {
+    function handleRequest(msg: TRPCClientOutgoingMessage) {
       const { id, jsonrpc } = msg;
 
-      /* istanbul ignore next -- @preserve */
       if (id === null) {
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: '`id` is required',
+        const error = getTRPCErrorFromUnknown(
+          new TRPCError({
+            code: 'PARSE_ERROR',
+            message: '`id` is required',
+          }),
+        );
+        opts.onError?.({
+          error,
+          path: undefined,
+          type: 'unknown',
+          ctx,
+          req,
+          input: undefined,
         });
+        respond({
+          id,
+          jsonrpc,
+          error: getErrorShape({
+            config: router._def._config,
+            error,
+            type: 'unknown',
+            path: undefined,
+            input: undefined,
+            ctx,
+          }),
+        });
+        return;
       }
       if (msg.method === 'subscription.stop') {
         clientSubscriptions.get(id)?.abort();
@@ -202,20 +235,25 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
       const { path, lastEventId } = msg.params;
       let { input } = msg.params;
       const type = msg.method;
-      try {
-        if (lastEventId !== undefined) {
-          if (isObject(input)) {
-            input = {
-              ...input,
-              lastEventId: lastEventId,
-            };
-          } else {
-            input ??= {
-              lastEventId: lastEventId,
-            };
-          }
+
+      if (lastEventId !== undefined) {
+        if (isObject(input)) {
+          input = {
+            ...input,
+            lastEventId: lastEventId,
+          };
+        } else {
+          input ??= {
+            lastEventId: lastEventId,
+          };
+        }
+      }
+      run(async () => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const res = await ctxPromise!; // asserts context has been set
+        if (!res.ok) {
+          throw res.error;
         }
-        await ctxPromise; // asserts context has been set
 
         const abortController = new AbortController();
         const result = await callTRPCProcedure({
@@ -384,7 +422,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
             type: 'started',
           },
         });
-      } catch (cause) /* istanbul ignore next -- @preserve */ {
+      }).catch((cause) => {
         // procedure threw an error
         const error = getTRPCErrorFromUnknown(cause);
         opts.onError?.({ error, path, type, ctx, req, input });
@@ -400,9 +438,9 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
             ctx,
           }),
         });
-      }
+      });
     }
-    client.on('message', async (rawData) => {
+    client.on('message', (rawData) => {
       // eslint-disable-next-line @typescript-eslint/no-base-to-string
       const msgStr = rawData.toString();
       if (msgStr === 'PONG') {
@@ -414,7 +452,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         }
         return;
       }
-      if (ctxPromise === unsetContextPromiseSymbol) {
+      if (!ctxPromise) {
         // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
         ctxPromise = createCtxPromise(() => {
           let msg;
@@ -438,31 +476,36 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         });
         return;
       }
-      try {
-        const msgJSON: unknown = JSON.parse(msgStr);
-        const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
-        const promises = msgs
-          .map((raw) => parseTRPCMessage(raw, transformer))
-          .map(handleRequest);
-        await Promise.all(promises);
-      } catch (cause) {
-        const error = new TRPCError({
-          code: 'PARSE_ERROR',
-          cause,
-        });
 
-        respond({
-          id: null,
-          error: getErrorShape({
-            config: router._def._config,
-            error,
-            type: 'unknown',
-            path: undefined,
-            input: undefined,
-            ctx: undefined,
-          }),
-        });
-      }
+      const parsedMsgs = run(() => {
+        try {
+          const msgJSON: unknown = JSON.parse(msgStr);
+          const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
+
+          return msgs.map((raw) => parseTRPCMessage(raw, transformer));
+        } catch (cause) {
+          const error = new TRPCError({
+            code: 'PARSE_ERROR',
+            cause,
+          });
+
+          respond({
+            id: null,
+            error: getErrorShape({
+              config: router._def._config,
+              error,
+              type: 'unknown',
+              path: undefined,
+              input: undefined,
+              ctx,
+            }),
+          });
+
+          return [];
+        }
+      });
+
+      parsedMsgs.map(handleRequest);
     });
 
     // WebSocket errors should be handled, as otherwise unhandled exceptions will crash Node.js.
@@ -487,10 +530,6 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
       clientSubscriptions.clear();
       abortController.abort();
     });
-
-    if (ctxPromise !== unsetContextPromiseSymbol) {
-      await ctxPromise;
-    }
   };
 }
 
@@ -544,22 +583,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       return;
     }
 
-    onConnection(client, req).catch((cause) => {
-      opts.onError?.({
-        error: new TRPCError({
-          code: 'INTERNAL_SERVER_ERROR',
-          cause,
-          message: 'Failed to handle WebSocket connection',
-        }),
-        req: req,
-        path: undefined,
-        type: 'unknown',
-        ctx: undefined,
-        input: undefined,
-      });
-
-      client.close();
-    });
+    onConnection(client, req);
   });
 
   return {