@trpc/server 11.0.0-rc.530 → 11.0.0-rc.532

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;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,mBAoXzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAuBnB;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,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

@@ -281,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');
                         }
@@ -304,14 +314,7 @@ function getWSConnectionHandler(opts) {
                 return;
             }
             try {
-                const str = message.toString();
-                if (str === 'PING') {
-                    if (!opts.dangerouslyDisablePong) {
-                        client.send('PONG');
-                    }
-                    return;
-                }
-                const msgJSON = JSON.parse(str);
+                const msgJSON = JSON.parse(msgStr);
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
@@ -364,27 +367,30 @@ function getWSConnectionHandler(opts) {
 /**
  * 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 onConnection = getWSConnectionHandler(opts);

package/dist/adapters/ws.mjs

@@ -279,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');
                         }
@@ -302,14 +312,7 @@ function getWSConnectionHandler(opts) {
                 return;
             }
             try {
-                const str = message.toString();
-                if (str === 'PING') {
-                    if (!opts.dangerouslyDisablePong) {
-                        client.send('PONG');
-                    }
-                    return;
-                }
-                const msgJSON = JSON.parse(str);
+                const msgJSON = JSON.parse(msgStr);
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
@@ -362,27 +365,30 @@ function getWSConnectionHandler(opts) {
 /**
  * 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 onConnection = getWSConnectionHandler(opts);

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 136257,
-  "bundleOrigSize": 186007,
-  "bundleReduction": 26.75,
+  "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.15,
+      "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.89,
+      "percent": 12.9,
       "reduction": 4.31
     },
     {
       "id": "/src/adapters/ws.ts",
-      "size": 16392,
-      "origSize": 15346,
+      "size": 16286,
+      "origSize": 15256,
       "renderedExports": [
         "getWSConnectionHandler",
         "handleKeepAlive",
@@ -47,7 +47,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 12.03,
+      "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.64,
+      "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.71,
+      "percent": 4.72,
       "reduction": 40.18
     },
     {
@@ -112,7 +112,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.25,
+      "percent": 4.26,
       "reduction": 63.05
     },
     {
@@ -160,7 +160,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.36,
+      "percent": 2.37,
       "reduction": 22.57
     },
     {
@@ -210,7 +210,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2.01,
+      "percent": 2.02,
       "reduction": 45.94
     },
     {
@@ -224,7 +224,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 1.98,
+      "percent": 1.99,
       "reduction": 40.91
     },
     {
@@ -274,7 +274,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 1.65,
+      "percent": 1.66,
       "reduction": 2.17
     },
     {
@@ -303,7 +303,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 1.5,
+      "percent": 1.51,
       "reduction": 5.79
     },
     {
@@ -432,13 +432,13 @@
         "/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/rpc/parseTRPCMessage.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/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
@@ -539,7 +539,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.58,
+      "percent": 0.59,
       "reduction": 44.65
     },
     {
@@ -739,9 +739,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -749,22 +749,19 @@
       "reduction": 100
     },
     {
-      "id": "/src/unstable-core-do-not-import.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 2306,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [
-        "/src/adapters/ws.ts",
-        "/src/adapters/next-app-dir/nextAppDirCaller.ts"
-      ],
+      "dependents": [],
       "percent": 0,
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -772,12 +769,15 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 2306,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [],
+      "dependents": [
+        "/src/adapters/ws.ts",
+        "/src/adapters/next-app-dir/nextAppDirCaller.ts"
+      ],
       "percent": 0,
       "reduction": 100
     },
@@ -831,8 +831,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.530+d1e8f33f6",
+  "version": "11.0.0-rc.532+476db0d8c",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "d1e8f33f6bc6104003f4a0d4030c6cf306e6dec2"
+  "gitHead": "476db0d8c42cd886182b117f6fd1ecbe0ae7cbd8"
 }

package/src/adapters/ws.ts

@@ -388,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');
@@ -414,15 +424,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
         return;
       }
       try {
-        const str = message.toString();
-        if (str === 'PING') {
-          if (!opts.dangerouslyDisablePong) {
-            client.send('PONG');
-          }
-
-          return;
-        }
-        const msgJSON: unknown = JSON.parse(str);
+        const msgJSON: unknown = JSON.parse(msgStr);
         const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
         const promises = msgs
           .map((raw) => parseTRPCMessage(raw, transformer))
@@ -485,27 +487,37 @@ export function handleKeepAlive(
   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>(