@trpc/server 11.0.0-rc.528 → 11.0.0-rc.531

package/dist/adapters/ws.d.ts

@@ -27,17 +27,23 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = WSConnectionHandlerOp
         enabled: boolean;
         /**
          * Heartbeat interval in milliseconds
-         * @default 30000
+         * @default 30_000
          */
         pingMs?: number;
         /**
          * Terminate the WebSocket if no pong is received after this many milliseconds
-         * @default 5000
+         * @default 5_000
          */
         pongWaitMs?: number;
     };
+    /**
+     * Disable responding to ping messages from the client
+     * **Not recommended** - this is mainly used for testing
+     * @default false
+     */
+    dangerouslyDisablePong?: boolean;
 };
-export declare function getWSConnectionHandler<TRouter extends AnyRouter>(opts: WSConnectionHandlerOptions<TRouter>): (client: ws.WebSocket, req: IncomingMessage) => Promise<void>;
+export declare function getWSConnectionHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): (client: ws.WebSocket, req: IncomingMessage) => Promise<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,EAAS,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AActE,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;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;CACH,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,EAAE,CAAC,SAAS,OAAO,eAAe,mBAwWzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAQ,EACd,UAAU,SAAO,QAuBlB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA+BjC"}
+{"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,EAAS,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AActE,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;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,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAsXzD;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"}

package/dist/adapters/ws.js

@@ -23,6 +23,10 @@ function getWSConnectionHandler(opts) {
     return async (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
+        if (opts.keepAlive?.enabled) {
+            const { pingMs , pongWaitMs  } = opts.keepAlive;
+            handleKeepAlive(client, pingMs, pongWaitMs);
+        }
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));
         }
@@ -277,13 +281,23 @@ function getWSConnectionHandler(opts) {
                 });
             }
         }
-        client.on('message', async (message)=>{
+        client.on('message', async (rawData)=>{
+            const msgStr = rawData.toString();
+            if (msgStr === 'PONG') {
+                return;
+            }
+            if (msgStr === 'PING') {
+                if (!opts.dangerouslyDisablePong) {
+                    client.send('PONG');
+                }
+                return;
+            }
             if (ctxPromise === unsetContextPromiseSymbol) {
                 // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
                 ctxPromise = createCtxPromise(()=>{
                     let msg;
                     try {
-                        msg = JSON.parse(message.toString());
+                        msg = JSON.parse(msgStr);
                         if (!utils.isObject(msg)) {
                             throw new Error('Message was not an object');
                         }
@@ -300,7 +314,7 @@ function getWSConnectionHandler(opts) {
                 return;
             }
             try {
-                const msgJSON = JSON.parse(message.toString());
+                const msgJSON = JSON.parse(msgStr);
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
@@ -346,48 +360,59 @@ function getWSConnectionHandler(opts) {
             abortController.abort();
         });
         if (ctxPromise !== unsetContextPromiseSymbol) {
-            // prevent unhandled promise rejection errors
-            await ctxPromise.catch(()=>null);
+            await ctxPromise;
         }
     };
 }
 /**
  * Handle WebSocket keep-alive messages
  */ function handleKeepAlive(client, pingMs = 30000, pongWaitMs = 5000) {
-    let heartbeatTimeout;
-    const heartbeatInterval = setInterval(()=>{
-        if (client.readyState !== WEBSOCKET_OPEN) {
-            return;
-        }
-        // First we send a ping message and wait for a pong
-        client.ping();
-        // We set a timeout to close the connection if the pong is not received
-        heartbeatTimeout = setTimeout(()=>{
-            client.terminate();
-            clearInterval(heartbeatInterval);
-        }, pongWaitMs);
-    }, pingMs).unref();
-    // When we receive a pong message, we clear the timeout
-    client.on('pong', ()=>{
-        heartbeatTimeout && clearTimeout(heartbeatTimeout);
-    });
-    // If the connection is closed, we clear the interval
+    let timeout = undefined;
+    let ping = undefined;
+    const schedulePing = ()=>{
+        const scheduleTimeout = ()=>{
+            timeout = setTimeout(()=>{
+                client.terminate();
+            }, pongWaitMs);
+        };
+        ping = setTimeout(()=>{
+            client.send('PING');
+            scheduleTimeout();
+        }, pingMs);
+    };
+    const onMessage = ()=>{
+        clearTimeout(ping);
+        clearTimeout(timeout);
+        schedulePing();
+    };
+    client.on('message', onMessage);
     client.on('close', ()=>{
-        clearInterval(heartbeatInterval);
+        clearTimeout(ping);
+        clearTimeout(timeout);
     });
+    schedulePing();
 }
 function applyWSSHandler(opts) {
-    const { wss , prefix , keepAlive  } = opts;
     const onConnection = getWSConnectionHandler(opts);
-    wss.on('connection', async (client, req)=>{
-        if (prefix && !req.url?.startsWith(prefix)) {
+    opts.wss.on('connection', (client, req)=>{
+        if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
             return;
         }
-        await onConnection(client, req);
-        if (keepAlive?.enabled) {
-            const { pingMs , pongWaitMs  } = keepAlive;
-            handleKeepAlive(client, pingMs, pongWaitMs);
-        }
+        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();
+        });
     });
     return {
         broadcastReconnectNotification: ()=>{
@@ -396,7 +421,7 @@ function applyWSSHandler(opts) {
                 method: 'reconnect'
             };
             const data = JSON.stringify(response);
-            for (const client of wss.clients){
+            for (const client of opts.wss.clients){
                 if (client.readyState === WEBSOCKET_OPEN) {
                     client.send(data);
                 }

package/dist/adapters/ws.mjs

@@ -21,6 +21,10 @@ function getWSConnectionHandler(opts) {
     return async (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
+        if (opts.keepAlive?.enabled) {
+            const { pingMs , pongWaitMs  } = opts.keepAlive;
+            handleKeepAlive(client, pingMs, pongWaitMs);
+        }
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformTRPCResponse(router._def._config, untransformedJSON)));
         }
@@ -275,13 +279,23 @@ function getWSConnectionHandler(opts) {
                 });
             }
         }
-        client.on('message', async (message)=>{
+        client.on('message', async (rawData)=>{
+            const msgStr = rawData.toString();
+            if (msgStr === 'PONG') {
+                return;
+            }
+            if (msgStr === 'PING') {
+                if (!opts.dangerouslyDisablePong) {
+                    client.send('PONG');
+                }
+                return;
+            }
             if (ctxPromise === unsetContextPromiseSymbol) {
                 // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
                 ctxPromise = createCtxPromise(()=>{
                     let msg;
                     try {
-                        msg = JSON.parse(message.toString());
+                        msg = JSON.parse(msgStr);
                         if (!isObject(msg)) {
                             throw new Error('Message was not an object');
                         }
@@ -298,7 +312,7 @@ function getWSConnectionHandler(opts) {
                 return;
             }
             try {
-                const msgJSON = JSON.parse(message.toString());
+                const msgJSON = JSON.parse(msgStr);
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
@@ -344,48 +358,59 @@ function getWSConnectionHandler(opts) {
             abortController.abort();
         });
         if (ctxPromise !== unsetContextPromiseSymbol) {
-            // prevent unhandled promise rejection errors
-            await ctxPromise.catch(()=>null);
+            await ctxPromise;
         }
     };
 }
 /**
  * Handle WebSocket keep-alive messages
  */ function handleKeepAlive(client, pingMs = 30000, pongWaitMs = 5000) {
-    let heartbeatTimeout;
-    const heartbeatInterval = setInterval(()=>{
-        if (client.readyState !== WEBSOCKET_OPEN) {
-            return;
-        }
-        // First we send a ping message and wait for a pong
-        client.ping();
-        // We set a timeout to close the connection if the pong is not received
-        heartbeatTimeout = setTimeout(()=>{
-            client.terminate();
-            clearInterval(heartbeatInterval);
-        }, pongWaitMs);
-    }, pingMs).unref();
-    // When we receive a pong message, we clear the timeout
-    client.on('pong', ()=>{
-        heartbeatTimeout && clearTimeout(heartbeatTimeout);
-    });
-    // If the connection is closed, we clear the interval
+    let timeout = undefined;
+    let ping = undefined;
+    const schedulePing = ()=>{
+        const scheduleTimeout = ()=>{
+            timeout = setTimeout(()=>{
+                client.terminate();
+            }, pongWaitMs);
+        };
+        ping = setTimeout(()=>{
+            client.send('PING');
+            scheduleTimeout();
+        }, pingMs);
+    };
+    const onMessage = ()=>{
+        clearTimeout(ping);
+        clearTimeout(timeout);
+        schedulePing();
+    };
+    client.on('message', onMessage);
     client.on('close', ()=>{
-        clearInterval(heartbeatInterval);
+        clearTimeout(ping);
+        clearTimeout(timeout);
     });
+    schedulePing();
 }
 function applyWSSHandler(opts) {
-    const { wss , prefix , keepAlive  } = opts;
     const onConnection = getWSConnectionHandler(opts);
-    wss.on('connection', async (client, req)=>{
-        if (prefix && !req.url?.startsWith(prefix)) {
+    opts.wss.on('connection', (client, req)=>{
+        if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
             return;
         }
-        await onConnection(client, req);
-        if (keepAlive?.enabled) {
-            const { pingMs , pongWaitMs  } = keepAlive;
-            handleKeepAlive(client, pingMs, pongWaitMs);
-        }
+        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();
+        });
     });
     return {
         broadcastReconnectNotification: ()=>{
@@ -394,7 +419,7 @@ function applyWSSHandler(opts) {
                 method: 'reconnect'
             };
             const data = JSON.stringify(response);
-            for (const client of wss.clients){
+            for (const client of opts.wss.clients){
                 if (client.readyState === WEBSOCKET_OPEN) {
                     client.send(data);
                 }

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 135647,
-  "bundleOrigSize": 185375,
-  "bundleReduction": 26.83,
+  "bundleSize": 136151,
+  "bundleOrigSize": 185917,
+  "bundleReduction": 26.77,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 13.2,
+      "percent": 13.16,
       "reduction": 0
     },
     {
@@ -31,13 +31,13 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 12.95,
+      "percent": 12.9,
       "reduction": 4.31
     },
     {
       "id": "/src/adapters/ws.ts",
-      "size": 15782,
-      "origSize": 14714,
+      "size": 16286,
+      "origSize": 15256,
       "renderedExports": [
         "getWSConnectionHandler",
         "handleKeepAlive",
@@ -47,7 +47,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 11.63,
+      "percent": 11.96,
       "reduction": 0
     },
     {
@@ -62,7 +62,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.67,
+      "percent": 5.65,
       "reduction": 0
     },
     {
@@ -80,7 +80,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.73,
+      "percent": 4.72,
       "reduction": 40.18
     },
     {
@@ -97,7 +97,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 4.36,
+      "percent": 4.34,
       "reduction": 15.22
     },
     {
@@ -112,7 +112,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.27,
+      "percent": 4.26,
       "reduction": 63.05
     },
     {
@@ -126,7 +126,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.99,
+      "percent": 3.98,
       "reduction": 11.38
     },
     {
@@ -146,7 +146,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.03,
+      "percent": 3.02,
       "reduction": 0
     },
     {
@@ -174,7 +174,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2.11,
+      "percent": 2.1,
       "reduction": 6.07
     },
     {
@@ -190,7 +190,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.03,
+      "percent": 2.02,
       "reduction": 0
     },
     {
@@ -206,9 +206,9 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts",
-        "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
+        "/src/unstable-core-do-not-import/router.ts"
       ],
       "percent": 2.02,
       "reduction": 45.94
@@ -244,7 +244,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.94,
+      "percent": 1.93,
       "reduction": 55.77
     },
     {
@@ -260,7 +260,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.72,
+      "percent": 1.71,
       "reduction": 0
     },
     {
@@ -289,7 +289,7 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.62,
+      "percent": 1.61,
       "reduction": 13.79
     },
     {
@@ -332,16 +332,16 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/middleware.ts",
-        "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/middleware.ts",
+        "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 1.28,
+      "percent": 1.27,
       "reduction": 19.47
     },
     {
@@ -366,7 +366,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.19,
+      "percent": 1.18,
       "reduction": 27.47
     },
     {
@@ -378,7 +378,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.14,
+      "percent": 1.13,
       "reduction": 26.94
     },
     {
@@ -392,8 +392,8 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/error/getErrorShape.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
       "percent": 1.06,
       "reduction": 16.73
@@ -410,7 +410,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.96,
+      "percent": 0.95,
       "reduction": 55.21
     },
     {
@@ -429,14 +429,14 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
+        "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/error/TRPCError.ts",
         "/src/unstable-core-do-not-import/transformer.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
-        "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
-        "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
@@ -504,7 +504,7 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 0.73,
+      "percent": 0.72,
       "reduction": 13.65
     },
     {
@@ -726,6 +726,18 @@
       "percent": 0.04,
       "reduction": 93.8
     },
+    {
+      "id": "/src/http.ts",
+      "size": 0,
+      "origSize": 37,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/ws.ts"
+      ],
+      "percent": 0,
+      "reduction": 100
+    },
     {
       "id": "/src/index.ts",
       "size": 0,
@@ -747,13 +759,14 @@
       "reduction": 100
     },
     {
-      "id": "/src/http.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 37,
+      "origSize": 2306,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [
-        "/src/adapters/ws.ts"
+        "/src/adapters/ws.ts",
+        "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
       "percent": 0,
       "reduction": 100
@@ -768,19 +781,6 @@
       "percent": 0,
       "reduction": 100
     },
-    {
-      "id": "/src/unstable-core-do-not-import.ts",
-      "size": 0,
-      "origSize": 2306,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/ws.ts",
-        "/src/adapters/next-app-dir/nextAppDirCaller.ts"
-      ],
-      "percent": 0,
-      "reduction": 100
-    },
     {
       "id": "/src/adapters/next-app-dir.ts",
       "size": 0,
@@ -813,16 +813,6 @@
       "percent": 0,
       "reduction": 100
     },
-    {
-      "id": "/src/adapters/fetch/index.ts",
-      "size": 0,
-      "origSize": 64,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0,
-      "reduction": 100
-    },
     {
       "id": "/src/adapters/node-http/index.ts",
       "size": 0,
@@ -837,6 +827,16 @@
       ],
       "percent": 0,
       "reduction": 100
+    },
+    {
+      "id": "/src/adapters/fetch/index.ts",
+      "size": 0,
+      "origSize": 64,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
     }
   ],
   "moduleCount": 56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.528+32e6b1285",
+  "version": "11.0.0-rc.531+42d5af1b1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "32e6b1285dd844776d323ae23fbea638312d676e"
+  "gitHead": "42d5af1b189a1b80b1f128deb81550b1ddc6eeb6"
 }

package/src/adapters/ws.ts

@@ -79,20 +79,26 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> =
       enabled: boolean;
       /**
        * Heartbeat interval in milliseconds
-       * @default 30000
+       * @default 30_000
        */
       pingMs?: number;
       /**
        * Terminate the WebSocket if no pong is received after this many milliseconds
-       * @default 5000
+       * @default 5_000
        */
       pongWaitMs?: number;
     };
+    /**
+     * Disable responding to ping messages from the client
+     * **Not recommended** - this is mainly used for testing
+     * @default false
+     */
+    dangerouslyDisablePong?: boolean;
   };
 
 const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 export function getWSConnectionHandler<TRouter extends AnyRouter>(
-  opts: WSConnectionHandlerOptions<TRouter>,
+  opts: WSSHandlerOptions<TRouter>,
 ) {
   const { createContext, router } = opts;
   const { transformer } = router._def._config;
@@ -101,6 +107,11 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
     const clientSubscriptions = new Map<number | string, AbortController>();
     const abortController = new AbortController();
 
+    if (opts.keepAlive?.enabled) {
+      const { pingMs, pongWaitMs } = opts.keepAlive;
+      handleKeepAlive(client, pingMs, pongWaitMs);
+    }
+
     function respond(untransformedJSON: TRPCResponseMessage) {
       client.send(
         JSON.stringify(
@@ -377,13 +388,23 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         });
       }
     }
-    client.on('message', async (message) => {
+    client.on('message', async (rawData) => {
+      const msgStr = rawData.toString();
+      if (msgStr === 'PONG') {
+        return;
+      }
+      if (msgStr === 'PING') {
+        if (!opts.dangerouslyDisablePong) {
+          client.send('PONG');
+        }
+        return;
+      }
       if (ctxPromise === unsetContextPromiseSymbol) {
         // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
         ctxPromise = createCtxPromise(() => {
           let msg;
           try {
-            msg = JSON.parse(message.toString()) as TRPCConnectionParamsMessage;
+            msg = JSON.parse(msgStr) as TRPCConnectionParamsMessage;
 
             if (!isObject(msg)) {
               throw new Error('Message was not an object');
@@ -403,7 +424,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         return;
       }
       try {
-        const msgJSON: unknown = JSON.parse(message.toString());
+        const msgJSON: unknown = JSON.parse(msgStr);
         const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
         const promises = msgs
           .map((raw) => parseTRPCMessage(raw, transformer))
@@ -453,8 +474,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
     });
 
     if (ctxPromise !== unsetContextPromiseSymbol) {
-      // prevent unhandled promise rejection errors
-      await ctxPromise.catch(() => null);
+      await ctxPromise;
     }
   };
 }
@@ -464,48 +484,67 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
  */
 export function handleKeepAlive(
   client: ws.WebSocket,
-  pingMs = 30000,
-  pongWaitMs = 5000,
+  pingMs = 30_000,
+  pongWaitMs = 5_000,
 ) {
-  let heartbeatTimeout: NodeJS.Timeout | undefined;
-  const heartbeatInterval = setInterval(() => {
-    if (client.readyState !== WEBSOCKET_OPEN) {
-      return;
-    }
-    // First we send a ping message and wait for a pong
-    client.ping();
-    // We set a timeout to close the connection if the pong is not received
-    heartbeatTimeout = setTimeout(() => {
-      client.terminate();
-      clearInterval(heartbeatInterval);
-    }, pongWaitMs);
-  }, pingMs).unref();
-  // When we receive a pong message, we clear the timeout
-  client.on('pong', () => {
-    heartbeatTimeout && clearTimeout(heartbeatTimeout);
-  });
-  // If the connection is closed, we clear the interval
+  let timeout: NodeJS.Timeout | undefined = undefined;
+  let ping: NodeJS.Timeout | undefined = undefined;
+
+  const schedulePing = () => {
+    const scheduleTimeout = () => {
+      timeout = setTimeout(() => {
+        client.terminate();
+      }, pongWaitMs);
+    };
+    ping = setTimeout(() => {
+      client.send('PING');
+
+      scheduleTimeout();
+    }, pingMs);
+  };
+
+  const onMessage = () => {
+    clearTimeout(ping);
+    clearTimeout(timeout);
+
+    schedulePing();
+  };
+
+  client.on('message', onMessage);
+
   client.on('close', () => {
-    clearInterval(heartbeatInterval);
+    clearTimeout(ping);
+    clearTimeout(timeout);
   });
+
+  schedulePing();
 }
 
 export function applyWSSHandler<TRouter extends AnyRouter>(
   opts: WSSHandlerOptions<TRouter>,
 ) {
-  const { wss, prefix, keepAlive } = opts;
-
   const onConnection = getWSConnectionHandler(opts);
-  wss.on('connection', async (client, req) => {
-    if (prefix && !req.url?.startsWith(prefix)) {
+  opts.wss.on('connection', (client, req) => {
+    if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
       return;
     }
 
-    await onConnection(client, req);
-    if (keepAlive?.enabled) {
-      const { pingMs, pongWaitMs } = keepAlive;
-      handleKeepAlive(client, pingMs, pongWaitMs);
-    }
+    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();
+    });
   });
 
   return {
@@ -515,7 +554,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
         method: 'reconnect',
       };
       const data = JSON.stringify(response);
-      for (const client of wss.clients) {
+      for (const client of opts.wss.clients) {
         if (client.readyState === WEBSOCKET_OPEN) {
           client.send(data);
         }