@trpc/server 11.0.0-next-beta.264 → 11.0.0-next-beta.271

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

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

package/dist/adapters/fastify/fastifyTRPCPlugin.js

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

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

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

package/dist/adapters/ws.d.ts

@@ -31,6 +31,7 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TR
 }) & {
     wss: ws.WebSocketServer;
     process?: NodeJS.Process;
+    prefix?: string;
 };
 export declare function applyWSSHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): {
     broadcastReconnectNotification: () => void;

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

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

package/dist/adapters/ws.js

@@ -14,9 +14,12 @@ var observable = require('../observable/observable.js');
  * @link https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 function applyWSSHandler(opts) {
-    const { wss , createContext , router: router$1  } = opts;
+    const { wss , createContext , router: router$1 , prefix  } = opts;
     const { transformer: transformer$1  } = router$1._def._config;
     wss.on('connection', async (client, req)=>{
+        if (prefix && !req.url?.startsWith(prefix)) {
+            return;
+        }
         const clientSubscriptions = new Map();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));

package/dist/adapters/ws.mjs

@@ -12,9 +12,12 @@ import { isObservable } from '../observable/observable.mjs';
  * @link https://github.com/trpc/trpc/pull/5279
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 function applyWSSHandler(opts) {
-    const { wss , createContext , router  } = opts;
+    const { wss , createContext , router , prefix  } = opts;
     const { transformer  } = router._def._config;
     wss.on('connection', async (client, req)=>{
+        if (prefix && !req.url?.startsWith(prefix)) {
+            return;
+        }
         const clientSubscriptions = new Map();
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformTRPCResponse(router._def._config, untransformedJSON)));

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 92119,
-  "bundleOrigSize": 145134,
-  "bundleReduction": 36.53,
+  "bundleSize": 92285,
+  "bundleOrigSize": 145299,
+  "bundleReduction": 36.49,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
-      "size": 9877,
-      "origSize": 9169,
+      "size": 9970,
+      "origSize": 9269,
       "renderedExports": [
         "applyWSSHandler"
       ],
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.72,
+      "percent": 10.8,
       "reduction": 0
     },
     {
@@ -26,7 +26,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.05,
+      "percent": 10.03,
       "reduction": 21.53
     },
     {
@@ -45,7 +45,7 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.56,
+      "percent": 6.54,
       "reduction": 37.21
     },
     {
@@ -61,7 +61,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.08,
+      "percent": 6.07,
       "reduction": 52.05
     },
     {
@@ -77,7 +77,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 5.4,
+      "percent": 5.39,
       "reduction": 36.77
     },
     {
@@ -91,7 +91,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.8,
+      "percent": 4.79,
       "reduction": 32.71
     },
     {
@@ -119,7 +119,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 3.86,
+      "percent": 3.85,
       "reduction": 9.5
     },
     {
@@ -154,7 +154,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.59,
+      "percent": 3.58,
       "reduction": 36.48
     },
     {
@@ -184,7 +184,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 3.13,
+      "percent": 3.12,
       "reduction": 38.95
     },
     {
@@ -204,7 +204,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.98,
+      "percent": 2.97,
       "reduction": 45.94
     },
     {
@@ -239,7 +239,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 2.8,
+      "percent": 2.79,
       "reduction": 55.95
     },
     {
@@ -251,7 +251,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.76,
+      "percent": 2.75,
       "reduction": 31.37
     },
     {
@@ -289,6 +289,20 @@
       "percent": 1.78,
       "reduction": 34.79
     },
+    {
+      "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
+      "size": 1603,
+      "origSize": 2343,
+      "renderedExports": [
+        "fastifyTRPCPlugin"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/fastify/index.ts"
+      ],
+      "percent": 1.74,
+      "reduction": 31.58
+    },
     {
       "id": "/src/adapters/next.ts",
       "size": 1602,
@@ -310,23 +324,9 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.72,
+      "percent": 1.71,
       "reduction": 21.04
     },
-    {
-      "id": "/src/adapters/fastify/fastifyTRPCPlugin.ts",
-      "size": 1530,
-      "origSize": 2278,
-      "renderedExports": [
-        "fastifyTRPCPlugin"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/fastify/index.ts"
-      ],
-      "percent": 1.66,
-      "reduction": 32.84
-    },
     {
       "id": "/src/unstable-core-do-not-import/createProxy.ts",
       "size": 1507,
@@ -341,7 +341,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 1.64,
+      "percent": 1.63,
       "reduction": 5.58
     },
     {
@@ -716,9 +716,9 @@
       "renderedExports": [],
       "removedExports": [],
       "dependents": [
-        "/src/adapters/standalone.ts",
         "/src/adapters/express.ts",
-        "/src/adapters/next.ts"
+        "/src/adapters/next.ts",
+        "/src/adapters/standalone.ts"
       ],
       "percent": 0,
       "reduction": 100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next-beta.264+f5f08f35d",
+  "version": "11.0.0-next-beta.271+79f6b3399",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -148,7 +148,7 @@
     "tslib": "^2.5.0",
     "tsx": "^4.0.0",
     "typescript": "^5.3.3",
-    "valibot": "^0.27.0",
+    "valibot": "^0.28.0",
     "vitest": "^0.32.0",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
@@ -157,5 +157,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "f5f08f35d0fce8eba59e4db2daed36b184f737a4"
+  "gitHead": "79f6b3399c69a3e47a881947db9b44ee51a1f6b4"
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -43,6 +43,7 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
   );
 
   let prefix = opts.prefix ?? '';
+  const websocketPrefix = prefix;
 
   // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
   // @ts-expect-error property 'default' does not exists on type ...
@@ -58,6 +59,7 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
   if (opts.useWSS) {
     applyWSSHandler<TRouter>({
       ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
+      prefix: websocketPrefix,
       wss: fastify.websocketServer,
     });
     // eslint-disable-next-line @typescript-eslint/no-empty-function

package/src/adapters/ws.ts

@@ -66,15 +66,20 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
       }) & {
     wss: ws.WebSocketServer;
     process?: NodeJS.Process;
+    prefix?: string;
   };
 
 export function applyWSSHandler<TRouter extends AnyRouter>(
   opts: WSSHandlerOptions<TRouter>,
 ) {
-  const { wss, createContext, router } = opts;
+  const { wss, createContext, router, prefix } = opts;
 
   const { transformer } = router._def._config;
   wss.on('connection', async (client, req) => {
+    if (prefix && !req.url?.startsWith(prefix)) {
+      return;
+    }
+
     const clientSubscriptions = new Map<number | string, Unsubscribable>();
 
     function respond(untransformedJSON: TRPCResponseMessage) {