@trpc/server 11.0.0-rc.369 → 11.0.0-rc.373

package/dist/adapters/node-http/incomingMessageToRequest.js

@@ -8,27 +8,29 @@ require('../../unstable-core-do-not-import/rootConfig.js');
  */ function incomingMessageToBodyStream(req, opts) {
     let size = 0;
     const maxBodySize = opts.maxBodySize;
-    let controller = null;
+    let hasClosed = false;
     const stream = new ReadableStream({
-        start (c) {
-            controller = c;
-        },
-        async pull (c) {
-            const chunk = req.read();
-            if (chunk) {
+        start (controller) {
+            req.on('data', (chunk)=>{
                 size += chunk.length;
-            }
-            if (maxBodySize !== null && size > maxBodySize) {
-                controller.error(new TRPCError.TRPCError({
-                    code: 'PAYLOAD_TOO_LARGE'
-                }));
-                return;
-            }
-            if (chunk === null) {
-                c.close();
-                return;
-            }
-            controller.enqueue(chunk);
+                if (maxBodySize != null && size > maxBodySize) {
+                    controller.error(new TRPCError.TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    }));
+                    // an error is thrown if we try to close the controller after
+                    // erroring, so track the closure
+                    hasClosed = true;
+                    return;
+                }
+                controller.enqueue(chunk);
+            });
+            req.once('end', ()=>{
+                if (hasClosed) {
+                    return;
+                }
+                hasClosed = true;
+                controller.close();
+            });
         },
         cancel () {
             req.destroy();

package/dist/adapters/node-http/incomingMessageToRequest.mjs

@@ -6,27 +6,29 @@ import '../../unstable-core-do-not-import/rootConfig.mjs';
  */ function incomingMessageToBodyStream(req, opts) {
     let size = 0;
     const maxBodySize = opts.maxBodySize;
-    let controller = null;
+    let hasClosed = false;
     const stream = new ReadableStream({
-        start (c) {
-            controller = c;
-        },
-        async pull (c) {
-            const chunk = req.read();
-            if (chunk) {
+        start (controller) {
+            req.on('data', (chunk)=>{
                 size += chunk.length;
-            }
-            if (maxBodySize !== null && size > maxBodySize) {
-                controller.error(new TRPCError({
-                    code: 'PAYLOAD_TOO_LARGE'
-                }));
-                return;
-            }
-            if (chunk === null) {
-                c.close();
-                return;
-            }
-            controller.enqueue(chunk);
+                if (maxBodySize != null && size > maxBodySize) {
+                    controller.error(new TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    }));
+                    // an error is thrown if we try to close the controller after
+                    // erroring, so track the closure
+                    hasClosed = true;
+                    return;
+                }
+                controller.enqueue(chunk);
+            });
+            req.once('end', ()=>{
+                if (hasClosed) {
+                    return;
+                }
+                hasClosed = true;
+                controller.close();
+            });
         },
         cancel () {
             req.destroy();

package/dist/adapters/ws.d.ts

@@ -20,6 +20,23 @@ export type WSConnectionHandlerOptions<TRouter extends AnyRouter> = BaseHandlerO
 export type WSSHandlerOptions<TRouter extends AnyRouter> = WSConnectionHandlerOptions<TRouter> & {
     wss: ws.WebSocketServer;
     prefix?: string;
+    keepAlive?: {
+        /**
+         * Enable heartbeat messages
+         * @default false
+         */
+        enabled: boolean;
+        /**
+         * Heartbeat interval in milliseconds
+         * @default 30000
+         */
+        pingMs?: number;
+        /**
+         * Terminate the WebSocket if no pong is received after this many milliseconds
+         * @default 5000
+         */
+        pongWaitMs?: number;
+    };
 };
 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>): {

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;AAQzB,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,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;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"}
+{"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;AAQzB,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,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;AAEJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,YAAY,OAAO,eAAe,mBAoPzD;AAiCD,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA+BjC"}

package/dist/adapters/ws.js

@@ -259,14 +259,43 @@ function getWSConnectionHandler(opts) {
         await createContextAsync();
     };
 }
+/**
+ * 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
+    client.on('close', ()=>{
+        clearInterval(heartbeatInterval);
+    });
+}
 function applyWSSHandler(opts) {
-    const { wss , prefix  } = opts;
+    const { wss , prefix , keepAlive  } = opts;
     const onConnection = getWSConnectionHandler(opts);
     wss.on('connection', async (client, req)=>{
         if (prefix && !req.url?.startsWith(prefix)) {
             return;
         }
         await onConnection(client, req);
+        if (keepAlive?.enabled) {
+            const { pingMs , pongWaitMs  } = keepAlive;
+            handleKeepAlive(client, pingMs, pongWaitMs);
+        }
     });
     return {
         broadcastReconnectNotification: ()=>{

package/dist/adapters/ws.mjs

@@ -257,14 +257,43 @@ function getWSConnectionHandler(opts) {
         await createContextAsync();
     };
 }
+/**
+ * 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
+    client.on('close', ()=>{
+        clearInterval(heartbeatInterval);
+    });
+}
 function applyWSSHandler(opts) {
-    const { wss , prefix  } = opts;
+    const { wss , prefix , keepAlive  } = opts;
     const onConnection = getWSConnectionHandler(opts);
     wss.on('connection', async (client, req)=>{
         if (prefix && !req.url?.startsWith(prefix)) {
             return;
         }
         await onConnection(client, req);
+        if (keepAlive?.enabled) {
+            const { pingMs , pongWaitMs  } = keepAlive;
+            handleKeepAlive(client, pingMs, pongWaitMs);
+        }
     });
     return {
         broadcastReconnectNotification: ()=>{

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 85905,
-  "bundleOrigSize": 132659,
-  "bundleReduction": 35.24,
+  "bundleSize": 87199,
+  "bundleOrigSize": 134166,
+  "bundleReduction": 35.01,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
-      "size": 10170,
-      "origSize": 9440,
+      "size": 11241,
+      "origSize": 10870,
       "renderedExports": [
         "getWSConnectionHandler",
         "applyWSSHandler"
@@ -15,7 +15,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 11.84,
+      "percent": 12.89,
       "reduction": 0
     },
     {
@@ -29,7 +29,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 11.05,
+      "percent": 10.89,
       "reduction": 4.97
     },
     {
@@ -44,7 +44,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 7.36,
+      "percent": 7.25,
       "reduction": 59.52
     },
     {
@@ -63,7 +63,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.97,
+      "percent": 6.87,
       "reduction": 41.05
     },
     {
@@ -78,7 +78,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 6.46,
+      "percent": 6.36,
       "reduction": 0
     },
     {
@@ -92,7 +92,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 5.65,
+      "percent": 5.56,
       "reduction": 13.62
     },
     {
@@ -109,7 +109,7 @@
         "/src/observable/index.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.64,
+      "percent": 3.59,
       "reduction": 0.67
     },
     {
@@ -123,7 +123,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 3.55,
+      "percent": 3.5,
       "reduction": 20.12
     },
     {
@@ -139,7 +139,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 3.21,
+      "percent": 3.16,
       "reduction": 0
     },
     {
@@ -159,7 +159,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 3.19,
+      "percent": 3.15,
       "reduction": 45.94
     },
     {
@@ -173,7 +173,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 3.09,
+      "percent": 3.04,
       "reduction": 41.46
     },
     {
@@ -193,7 +193,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 3.06,
+      "percent": 3.01,
       "reduction": 55.5
     },
     {
@@ -207,9 +207,24 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 2.62,
+      "percent": 2.59,
       "reduction": 2.17
     },
+    {
+      "id": "/src/adapters/node-http/incomingMessageToRequest.ts",
+      "size": 2177,
+      "origSize": 2535,
+      "renderedExports": [
+        "incomingMessageToRequest"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/node-http/index.ts",
+        "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
+      ],
+      "percent": 2.5,
+      "reduction": 14.12
+    },
     {
       "id": "/src/unstable-core-do-not-import/createProxy.ts",
       "size": 2000,
@@ -223,24 +238,9 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2.33,
+      "percent": 2.29,
       "reduction": 0
     },
-    {
-      "id": "/src/adapters/node-http/incomingMessageToRequest.ts",
-      "size": 1954,
-      "origSize": 2458,
-      "renderedExports": [
-        "incomingMessageToRequest"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/node-http/index.ts",
-        "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
-      ],
-      "percent": 2.27,
-      "reduction": 20.5
-    },
     {
       "id": "/src/unstable-core-do-not-import/error/TRPCError.ts",
       "size": 1733,
@@ -259,7 +259,7 @@
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 2.02,
+      "percent": 1.99,
       "reduction": 19.47
     },
     {
@@ -273,7 +273,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2,
+      "percent": 1.97,
       "reduction": 20.03
     },
     {
@@ -285,7 +285,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.84,
+      "percent": 1.81,
       "reduction": 21.04
     },
     {
@@ -297,7 +297,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.8,
+      "percent": 1.77,
       "reduction": 26.94
     },
     {
@@ -310,7 +310,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.77,
+      "percent": 1.75,
       "reduction": 27.6
     },
     {
@@ -324,7 +324,7 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.75,
+      "percent": 1.72,
       "reduction": 34.7
     },
     {
@@ -341,7 +341,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.47,
+      "percent": 1.45,
       "reduction": 23.5
     },
     {
@@ -356,7 +356,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 1.32,
+      "percent": 1.3,
       "reduction": 47.59
     },
     {
@@ -371,7 +371,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.15,
+      "percent": 1.14,
       "reduction": 56.22
     },
     {
@@ -388,7 +388,7 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 1.15,
+      "percent": 1.13,
       "reduction": 13.65
     },
     {
@@ -405,15 +405,15 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/error/TRPCError.ts",
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/transformer.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.09,
+      "percent": 1.08,
       "reduction": 25.69
     },
     {
@@ -427,7 +427,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 0.95,
+      "percent": 0.94,
       "reduction": 0.97
     },
     {
@@ -439,7 +439,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.88,
+      "percent": 0.87,
       "reduction": 66.9
     },
     {
@@ -454,7 +454,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 0.78,
+      "percent": 0.76,
       "reduction": 0.6
     },
     {
@@ -469,7 +469,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 0.73,
+      "percent": 0.72,
       "reduction": 43.49
     },
     {
@@ -482,7 +482,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.61,
+      "percent": 0.6,
       "reduction": 67.09
     },
     {
@@ -496,7 +496,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 0.49,
+      "percent": 0.48,
       "reduction": 40.06
     },
     {
@@ -511,7 +511,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 0.4,
+      "percent": 0.39,
       "reduction": 87.07
     },
     {
@@ -523,7 +523,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.33,
+      "percent": 0.32,
       "reduction": 72.92
     },
     {
@@ -551,7 +551,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.26,
+      "percent": 0.25,
       "reduction": 94.55
     },
     {
@@ -624,9 +624,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -634,9 +634,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -644,9 +644,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 1908,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -654,9 +654,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/unstable-core-do-not-import.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 1908,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -713,8 +713,8 @@
       "removedExports": [],
       "dependents": [
         "/src/adapters/express.ts",
-        "/src/adapters/standalone.ts",
         "/src/adapters/next.ts",
+        "/src/adapters/standalone.ts",
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
       "percent": 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.369+0fb9a1d0a",
+  "version": "11.0.0-rc.373+db2ec5cae",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "0fb9a1d0a5ed26aa155b6d01d5deebe22cbf19cf"
+  "gitHead": "db2ec5cae339cabd8dfa19bdc1d596214568d205"
 }

package/src/adapters/node-http/incomingMessageToRequest.ts

@@ -17,32 +17,32 @@ function incomingMessageToBodyStream(
   type Value = Buffer | Uint8Array | string | null;
   let size = 0;
   const maxBodySize = opts.maxBodySize;
+  let hasClosed = false;
 
-  let controller: ReadableStreamDefaultController<Value> =
-    null as unknown as ReadableStreamDefaultController<Value>;
   const stream = new ReadableStream<Value>({
-    start(c) {
-      controller = c;
-    },
-    async pull(c) {
-      const chunk: Value = req.read();
-
-      if (chunk) {
+    start(controller) {
+      req.on('data', (chunk) => {
         size += chunk.length;
-      }
-      if (maxBodySize !== null && size > maxBodySize) {
-        controller.error(
-          new TRPCError({
-            code: 'PAYLOAD_TOO_LARGE',
-          }),
-        );
-        return;
-      }
-      if (chunk === null) {
-        c.close();
-        return;
-      }
-      controller.enqueue(chunk);
+        if (maxBodySize != null && size > maxBodySize) {
+          controller.error(
+            new TRPCError({
+              code: 'PAYLOAD_TOO_LARGE',
+            }),
+          );
+          // an error is thrown if we try to close the controller after
+          // erroring, so track the closure
+          hasClosed = true;
+          return;
+        }
+        controller.enqueue(chunk);
+      });
+      req.once('end', () => {
+        if (hasClosed) {
+          return;
+        }
+        hasClosed = true;
+        controller.close();
+      });
     },
     cancel() {
       req.destroy();

package/src/adapters/ws.ts

@@ -62,6 +62,23 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> =
   WSConnectionHandlerOptions<TRouter> & {
     wss: ws.WebSocketServer;
     prefix?: string;
+    keepAlive?: {
+      /**
+       * Enable heartbeat messages
+       * @default false
+       */
+      enabled: boolean;
+      /**
+       * Heartbeat interval in milliseconds
+       * @default 30000
+       */
+      pingMs?: number;
+      /**
+       * Terminate the WebSocket if no pong is received after this many milliseconds
+       * @default 5000
+       */
+      pongWaitMs?: number;
+    };
   };
 
 export function getWSConnectionHandler<TRouter extends AnyRouter>(
@@ -316,10 +333,41 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
   };
 }
 
+/**
+ * Handle WebSocket keep-alive messages
+ */
+function handleKeepAlive(
+  client: ws.WebSocket,
+  pingMs = 30000,
+  pongWaitMs = 5000,
+) {
+  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
+  client.on('close', () => {
+    clearInterval(heartbeatInterval);
+  });
+}
+
 export function applyWSSHandler<TRouter extends AnyRouter>(
   opts: WSSHandlerOptions<TRouter>,
 ) {
-  const { wss, prefix } = opts;
+  const { wss, prefix, keepAlive } = opts;
 
   const onConnection = getWSConnectionHandler(opts);
   wss.on('connection', async (client, req) => {
@@ -328,6 +376,10 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
     }
 
     await onConnection(client, req);
+    if (keepAlive?.enabled) {
+      const { pingMs, pongWaitMs } = keepAlive;
+      handleKeepAlive(client, pingMs, pongWaitMs);
+    }
   });
 
   return {