@trpc/server 11.0.0-rc.346 → 11.0.0-rc.348

package/dist/adapters/aws-lambda/content-type/json/index.js

@@ -7,8 +7,8 @@ var utils = require('../../utils.js');
 // @trpc/server
 const getLambdaHTTPJSONContentTypeHandler = ()=>({
         name: 'lambda-json',
-        isMatch (opts) {
-            return !!opts.event.headers['Content-Type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             function getRawProcedureInputOrThrow() {

package/dist/adapters/aws-lambda/content-type/json/index.mjs

@@ -5,8 +5,8 @@ import { lambdaEventToHTTPBody } from '../../utils.mjs';
 // @trpc/server
 const getLambdaHTTPJSONContentTypeHandler = ()=>({
         name: 'lambda-json',
-        isMatch (opts) {
-            return !!opts.event.headers['Content-Type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             function getRawProcedureInputOrThrow() {

package/dist/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.d.ts

@@ -1,4 +1,10 @@
 import { TRPCError } from '../../@trpc/server';
-import type { BaseContentTypeHandler } from '../../@trpc/server/http';
-export declare function selectContentHandlerOrUnsupportedMediaType<THandlerOpts, THandler extends BaseContentTypeHandler<THandlerOpts>>(handlers: THandler[], opts: THandlerOpts): readonly [undefined, TRPCError] | readonly [THandler];
+import type { BaseContentTypeHandler, HTTPHeaders } from '../../@trpc/server/http';
+interface MinimalHandlerOpts {
+    req: {
+        headers: HTTPHeaders | Headers;
+    };
+}
+export declare function selectContentHandlerOrUnsupportedMediaType<THandlerOpts extends MinimalHandlerOpts, THandler extends BaseContentTypeHandler<THandlerOpts>>(handlers: THandler[], opts: THandlerOpts): readonly [undefined, TRPCError] | readonly [THandler];
+export {};
 //# sourceMappingURL=selectContentHandlerOrUnsupportedMediaType.d.ts.map

package/dist/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectContentHandlerOrUnsupportedMediaType.d.ts","sourceRoot":"","sources":["../../../src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,wBAAgB,0CAA0C,CACxD,YAAY,EACZ,QAAQ,SAAS,sBAAsB,CAAC,YAAY,CAAC,EACrD,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,yDAczC"}
+{"version":3,"file":"selectContentHandlerOrUnsupportedMediaType.d.ts","sourceRoot":"","sources":["../../../src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EACV,sBAAsB,EACtB,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAEjC,UAAU,kBAAkB;IAC1B,GAAG,EAAE;QAGH,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;KAChC,CAAC;CACH;AAED,wBAAgB,0CAA0C,CACxD,YAAY,SAAS,kBAAkB,EACvC,QAAQ,SAAS,sBAAsB,CAAC,YAAY,CAAC,EACrD,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,yDA2BzC"}

package/dist/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.js

@@ -4,13 +4,24 @@ var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
 function selectContentHandlerOrUnsupportedMediaType(handlers, opts) {
-    const handler = handlers.find((handler)=>handler.isMatch(opts));
+    const headers = new Headers(opts.req.headers);
+    const contentType = headers.get('content-type');
+    if (contentType === null) {
+        return [
+            undefined,
+            new TRPCError.TRPCError({
+                code: 'UNSUPPORTED_MEDIA_TYPE',
+                message: 'No Content-Type header detected on the incoming request. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all'
+            })
+        ];
+    }
+    const handler = handlers.find((handler)=>handler.isMatch(headers));
     if (!handler) {
         return [
             undefined,
             new TRPCError.TRPCError({
                 code: 'UNSUPPORTED_MEDIA_TYPE',
-                message: 'Invalid Content-Type header. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all'
+                message: `Invalid Content-Type header '${contentType}'. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all`
             })
         ];
     }

package/dist/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.mjs

@@ -2,13 +2,24 @@ import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
 function selectContentHandlerOrUnsupportedMediaType(handlers, opts) {
-    const handler = handlers.find((handler)=>handler.isMatch(opts));
+    const headers = new Headers(opts.req.headers);
+    const contentType = headers.get('content-type');
+    if (contentType === null) {
+        return [
+            undefined,
+            new TRPCError({
+                code: 'UNSUPPORTED_MEDIA_TYPE',
+                message: 'No Content-Type header detected on the incoming request. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all'
+            })
+        ];
+    }
+    const handler = handlers.find((handler)=>handler.isMatch(headers));
     if (!handler) {
         return [
             undefined,
             new TRPCError({
                 code: 'UNSUPPORTED_MEDIA_TYPE',
-                message: 'Invalid Content-Type header. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all'
+                message: `Invalid Content-Type header '${contentType}'. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all`
             })
         ];
     }

package/dist/adapters/fastify/content-type/json/index.js

@@ -6,8 +6,8 @@ require('../../../../unstable-core-do-not-import/rootConfig.js');
 // @trpc/server
 const getFastifyHTTPJSONContentTypeHandler = ()=>({
         name: 'fastify-json',
-        isMatch (opts) {
-            return !!opts.req.headers['content-type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             async function getRawProcedureInputOrThrow() {

package/dist/adapters/fastify/content-type/json/index.mjs

@@ -4,8 +4,8 @@ import '../../../../unstable-core-do-not-import/rootConfig.mjs';
 // @trpc/server
 const getFastifyHTTPJSONContentTypeHandler = ()=>({
         name: 'fastify-json',
-        isMatch (opts) {
-            return !!opts.req.headers['content-type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             async function getRawProcedureInputOrThrow() {

package/dist/adapters/fetch/content-type/json/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/fetch/content-type/json/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAEV,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,WAAW,2BAA2B,CAAC,OAAO,SAAS,SAAS,CACpE,SAAQ,sBAAsB,CAC5B,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,GAAG,CAAC;CACV,CACF;CAAG;AAEN,eAAO,MAAM,kCAAkC,EAAE,CAC/C,OAAO,SAAS,SAAS,OACpB,2BAA2B,CAAC,OAAO,CA6ExC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/fetch/content-type/json/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAEV,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,WAAW,2BAA2B,CAAC,OAAO,SAAS,SAAS,CACpE,SAAQ,sBAAsB,CAC5B,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,GAAG,CAAC;CACV,CACF;CAAG;AAEN,eAAO,MAAM,kCAAkC,EAAE,CAC/C,OAAO,SAAS,SAAS,OACpB,2BAA2B,CAAC,OAAO,CA2ExC,CAAC"}

package/dist/adapters/fetch/content-type/json/index.js

@@ -6,8 +6,8 @@ require('../../../../unstable-core-do-not-import/rootConfig.js');
 // @trpc/server
 const getFetchHTTPJSONContentTypeHandler = ()=>({
         name: 'fetch-json',
-        isMatch (opts) {
-            return !!opts.req.headers.get('content-type')?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             async function getRawProcedureInputOrThrow() {

package/dist/adapters/fetch/content-type/json/index.mjs

@@ -4,8 +4,8 @@ import '../../../../unstable-core-do-not-import/rootConfig.mjs';
 // @trpc/server
 const getFetchHTTPJSONContentTypeHandler = ()=>({
         name: 'fetch-json',
-        isMatch (opts) {
-            return !!opts.req.headers.get('content-type')?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             async function getRawProcedureInputOrThrow() {

package/dist/adapters/node-http/content-type/form-data/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,6BAA6B,EAAE,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CA6B5D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,6BAA6B,EAAE,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CA0B5D,CAAC"}

package/dist/adapters/node-http/content-type/form-data/index.js

@@ -4,8 +4,8 @@ var node_stream = require('node:stream');
 
 const getFormDataContentTypeHandler = ()=>({
         name: 'node-http-formdata',
-        isMatch (opts) {
-            return opts.req.headers['content-type']?.startsWith('multipart/form-data') ?? false;
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('multipart/form-data');
         },
         async getInputs (opts, inputOpts) {
             if (inputOpts.isBatchCall) {

package/dist/adapters/node-http/content-type/form-data/index.mjs

@@ -2,8 +2,8 @@ import { Readable } from 'node:stream';
 
 const getFormDataContentTypeHandler = ()=>({
         name: 'node-http-formdata',
-        isMatch (opts) {
-            return opts.req.headers['content-type']?.startsWith('multipart/form-data') ?? false;
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('multipart/form-data');
         },
         async getInputs (opts, inputOpts) {
             if (inputOpts.isBatchCall) {

package/dist/adapters/node-http/content-type/json/index.js

@@ -7,8 +7,8 @@ var getPostBody = require('./getPostBody.js');
 // @trpc/server
 const getNodeHTTPJSONContentTypeHandler = ()=>({
         name: 'node-http-json',
-        isMatch (opts) {
-            return !!opts.req.headers['content-type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             const bodyResult = await getPostBody.getPostBody(opts);

package/dist/adapters/node-http/content-type/json/index.mjs

@@ -5,8 +5,8 @@ import { getPostBody } from './getPostBody.mjs';
 // @trpc/server
 const getNodeHTTPJSONContentTypeHandler = ()=>({
         name: 'node-http-json',
-        isMatch (opts) {
-            return !!opts.req.headers['content-type']?.startsWith('application/json');
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/json');
         },
         getInputs: async (opts, info)=>{
             const bodyResult = await getPostBody(opts);

package/dist/adapters/node-http/content-type/octet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/octet/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,0BAA0B,EAAE,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAkB5D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/octet/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,0BAA0B,EAAE,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAgB5D,CAAC"}

package/dist/adapters/node-http/content-type/octet/index.js

@@ -4,8 +4,8 @@ var node_stream = require('node:stream');
 
 const getOctetContentTypeHandler = ()=>({
         name: 'node-http-octet',
-        isMatch (opts) {
-            return opts.req.headers['content-type']?.startsWith('application/octet-stream') ?? false;
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/octet-stream');
         },
         async getInputs (opts, inputOpts) {
             if (inputOpts.isBatchCall) {

package/dist/adapters/node-http/content-type/octet/index.mjs

@@ -2,8 +2,8 @@ import { Stream } from 'node:stream';
 
 const getOctetContentTypeHandler = ()=>({
         name: 'node-http-octet',
-        isMatch (opts) {
-            return opts.req.headers['content-type']?.startsWith('application/octet-stream') ?? false;
+        isMatch: (headers)=>{
+            return !!headers.get('content-type')?.startsWith('application/octet-stream');
         },
         async getInputs (opts, inputOpts) {
             if (inputOpts.isBatchCall) {

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 97464,
-  "bundleOrigSize": 148201,
-  "bundleReduction": 34.24,
+  "bundleSize": 97925,
+  "bundleOrigSize": 148868,
+  "bundleReduction": 34.22,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
@@ -15,7 +15,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.43,
+      "percent": 10.39,
       "reduction": 0
     },
     {
@@ -27,7 +27,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.04,
+      "percent": 10,
       "reduction": 19.08
     },
     {
@@ -43,7 +43,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.55,
+      "percent": 6.52,
       "reduction": 59.29
     },
     {
@@ -59,10 +59,10 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/initTRPC.ts",
-        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
+        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
+        "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.14,
+      "percent": 6.11,
       "reduction": 41.05
     },
     {
@@ -76,7 +76,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 3.91,
+      "percent": 3.89,
       "reduction": 9.03
     },
     {
@@ -90,7 +90,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 3.7,
+      "percent": 3.68,
       "reduction": 16.83
     },
     {
@@ -111,7 +111,7 @@
         "/src/adapters/aws-lambda/index.ts",
         "/src/adapters/aws-lambda/content-type/json/index.ts"
       ],
-      "percent": 3.66,
+      "percent": 3.64,
       "reduction": 30.57
     },
     {
@@ -128,7 +128,7 @@
         "/src/observable/index.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.21,
+      "percent": 3.2,
       "reduction": 0.67
     },
     {
@@ -142,7 +142,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 3.13,
+      "percent": 3.11,
       "reduction": 20.12
     },
     {
@@ -157,7 +157,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 2.88,
+      "percent": 2.87,
       "reduction": 27.72
     },
     {
@@ -169,7 +169,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.85,
+      "percent": 2.84,
       "reduction": 32.14
     },
     {
@@ -185,7 +185,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.83,
+      "percent": 2.81,
       "reduction": 0
     },
     {
@@ -201,11 +201,11 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/initTRPC.ts",
-        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
+        "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.82,
+      "percent": 2.8,
       "reduction": 45.94
     },
     {
@@ -219,7 +219,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 2.72,
+      "percent": 2.71,
       "reduction": 41.08
     },
     {
@@ -239,13 +239,13 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 2.7,
+      "percent": 2.68,
       "reduction": 55.5
     },
     {
       "id": "/src/adapters/node-http/content-type/json/index.ts",
       "size": 2464,
-      "origSize": 2497,
+      "origSize": 2500,
       "renderedExports": [
         "getNodeHTTPJSONContentTypeHandler"
       ],
@@ -253,13 +253,13 @@
       "dependents": [
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 2.53,
-      "reduction": 1.32
+      "percent": 2.52,
+      "reduction": 1.44
     },
     {
       "id": "/src/adapters/fastify/content-type/json/index.ts",
       "size": 2355,
-      "origSize": 2750,
+      "origSize": 2753,
       "renderedExports": [
         "getFastifyHTTPJSONContentTypeHandler"
       ],
@@ -267,13 +267,13 @@
       "dependents": [
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
-      "percent": 2.42,
-      "reduction": 14.36
+      "percent": 2.4,
+      "reduction": 14.46
     },
     {
       "id": "/src/adapters/fetch/content-type/json/index.ts",
-      "size": 2303,
-      "origSize": 2511,
+      "size": 2299,
+      "origSize": 2496,
       "renderedExports": [
         "getFetchHTTPJSONContentTypeHandler"
       ],
@@ -281,13 +281,13 @@
       "dependents": [
         "/src/adapters/fetch/fetchRequestHandler.ts"
       ],
-      "percent": 2.36,
-      "reduction": 8.28
+      "percent": 2.35,
+      "reduction": 7.89
     },
     {
       "id": "/src/adapters/aws-lambda/content-type/json/index.ts",
-      "size": 2235,
-      "origSize": 2546,
+      "size": 2233,
+      "origSize": 2547,
       "renderedExports": [
         "getLambdaHTTPJSONContentTypeHandler"
       ],
@@ -295,8 +295,8 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 2.29,
-      "reduction": 12.22
+      "percent": 2.28,
+      "reduction": 12.33
     },
     {
       "id": "/src/unstable-core-do-not-import/createProxy.ts",
@@ -311,7 +311,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2.05,
+      "percent": 2.04,
       "reduction": 0
     },
     {
@@ -326,13 +326,13 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/contentTypeParsers.ts",
-        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.78,
+      "percent": 1.77,
       "reduction": 19.47
     },
     {
@@ -344,7 +344,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.62,
+      "percent": 1.61,
       "reduction": 21.04
     },
     {
@@ -383,7 +383,7 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.52,
+      "percent": 1.51,
       "reduction": 34.61
     },
     {
@@ -396,10 +396,10 @@
       ],
       "removedExports": [],
       "dependents": [
-        "/src/unstable-core-do-not-import/error/getErrorShape.ts",
-        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
+        "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
+        "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.3,
+      "percent": 1.29,
       "reduction": 22.76
     },
     {
@@ -418,8 +418,8 @@
     },
     {
       "id": "/src/adapters/node-http/content-type/form-data/index.ts",
-      "size": 1050,
-      "origSize": 1278,
+      "size": 1043,
+      "origSize": 1254,
       "renderedExports": [
         "getFormDataContentTypeHandler"
       ],
@@ -427,8 +427,8 @@
       "dependents": [
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.08,
-      "reduction": 17.84
+      "percent": 1.07,
+      "reduction": 16.83
     },
     {
       "id": "/src/unstable-core-do-not-import/parser.ts",
@@ -442,7 +442,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.02,
+      "percent": 1.01,
       "reduction": 56.22
     },
     {
@@ -462,6 +462,23 @@
       "percent": 1.01,
       "reduction": 13.65
     },
+    {
+      "id": "/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts",
+      "size": 974,
+      "origSize": 1402,
+      "renderedExports": [
+        "selectContentHandlerOrUnsupportedMediaType"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/aws-lambda/index.ts",
+        "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
+        "/src/adapters/fastify/fastifyRequestHandler.ts",
+        "/src/adapters/fetch/fetchRequestHandler.ts"
+      ],
+      "percent": 0.99,
+      "reduction": 30.53
+    },
     {
       "id": "/src/unstable-core-do-not-import/utils.ts",
       "size": 880,
@@ -553,8 +570,8 @@
     },
     {
       "id": "/src/adapters/node-http/content-type/octet/index.ts",
-      "size": 507,
-      "origSize": 862,
+      "size": 500,
+      "origSize": 841,
       "renderedExports": [
         "getOctetContentTypeHandler"
       ],
@@ -562,25 +579,8 @@
       "dependents": [
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 0.52,
-      "reduction": 41.18
-    },
-    {
-      "id": "/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts",
-      "size": 493,
-      "origSize": 682,
-      "renderedExports": [
-        "selectContentHandlerOrUnsupportedMediaType"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/aws-lambda/index.ts",
-        "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
-        "/src/adapters/fastify/fastifyRequestHandler.ts",
-        "/src/adapters/fetch/fetchRequestHandler.ts"
-      ],
       "percent": 0.51,
-      "reduction": 27.71
+      "reduction": 40.55
     },
     {
       "id": "/src/adapters/next-app-dir/rethrowNextErrors.ts",
@@ -695,9 +695,9 @@
       "reduction": 93.8
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/http.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 37,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -705,9 +705,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/http.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 37,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -725,9 +725,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/unstable-core-do-not-import.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 1498,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -735,9 +735,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 1498,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],

package/dist/unstable-core-do-not-import/http/contentType.d.ts

@@ -12,7 +12,7 @@ export type BodyResult = {
 };
 export type BaseContentTypeHandler<TOptions> = {
     name: string;
-    isMatch(opts: TOptions): boolean;
+    isMatch(headers: Headers): boolean;
     getInputs: (opts: TOptions, info: {
         isBatchCall: boolean;
         batch: number;

package/dist/unstable-core-do-not-import/http/contentType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAClB;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEpC,MAAM,MAAM,sBAAsB,CAAC,QAAQ,IAAI;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACjC,SAAS,EAAE,CACT,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,KACE,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC"}
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAClB;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEpC,MAAM,MAAM,sBAAsB,CAAC,QAAQ,IAAI;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IACnC,SAAS,EAAE,CACT,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,KACE,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.346+62b378ae6",
+  "version": "11.0.0-rc.348+9d8b631a7",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -159,5 +159,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "62b378ae69907db634f02d3b7be87440f062e4a5"
+  "gitHead": "9d8b631a7e78c94e19d9822abda61278664bceee"
 }

package/src/adapters/aws-lambda/content-type/json/index.ts

@@ -29,8 +29,8 @@ export const getLambdaHTTPJSONContentTypeHandler: <
   TEvent extends APIGatewayEvent,
 >() => LambdaHTTPContentTypeHandler<TRouter, TEvent> = () => ({
   name: 'lambda-json',
-  isMatch(opts) {
-    return !!opts.event.headers['Content-Type']?.startsWith('application/json');
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('application/json');
   },
   getInputs: async (opts, info) => {
     function getRawProcedureInputOrThrow() {

package/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts

@@ -1,18 +1,42 @@
 import { TRPCError } from '../../@trpc/server';
-import type { BaseContentTypeHandler } from '../../@trpc/server/http';
+import type {
+  BaseContentTypeHandler,
+  HTTPHeaders,
+} from '../../@trpc/server/http';
+
+interface MinimalHandlerOpts {
+  req: {
+    // TODO: This could probably only take Headers and do the conversion higher up,
+    //       but that's a bigger refactor for another day
+    headers: HTTPHeaders | Headers;
+  };
+}
 
 export function selectContentHandlerOrUnsupportedMediaType<
-  THandlerOpts,
+  THandlerOpts extends MinimalHandlerOpts,
   THandler extends BaseContentTypeHandler<THandlerOpts>,
 >(handlers: THandler[], opts: THandlerOpts) {
-  const handler = handlers.find((handler) => handler.isMatch(opts));
-  if (!handler) {
+  const headers = new Headers(opts.req.headers as HeadersInit);
+  const contentType = headers.get('content-type');
+
+  if (contentType === null) {
     return [
       undefined,
       new TRPCError({
         code: 'UNSUPPORTED_MEDIA_TYPE',
         message:
-          'Invalid Content-Type header. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all',
+          'No Content-Type header detected on the incoming request. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all',
+      }),
+    ] as const;
+  }
+
+  const handler = handlers.find((handler) => handler.isMatch(headers));
+  if (!handler) {
+    return [
+      undefined,
+      new TRPCError({
+        code: 'UNSUPPORTED_MEDIA_TYPE',
+        message: `Invalid Content-Type header '${contentType}'. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all`,
       }),
     ] as const;
   }

package/src/adapters/fastify/content-type/json/index.ts

@@ -22,8 +22,8 @@ export const getFastifyHTTPJSONContentTypeHandler: <
   TResponse extends FastifyReply,
 >() => FastifyHTTPContentTypeHandler<TRouter, TRequest, TResponse> = () => ({
   name: 'fastify-json',
-  isMatch(opts) {
-    return !!opts.req.headers['content-type']?.startsWith('application/json');
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('application/json');
   },
   getInputs: async (opts, info) => {
     async function getRawProcedureInputOrThrow() {

package/src/adapters/fetch/content-type/json/index.ts

@@ -18,10 +18,8 @@ export const getFetchHTTPJSONContentTypeHandler: <
   TRouter extends AnyRouter,
 >() => FetchHTTPContentTypeHandler<TRouter> = () => ({
   name: 'fetch-json',
-  isMatch(opts) {
-    return !!opts.req.headers
-      .get('content-type')
-      ?.startsWith('application/json');
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('application/json');
   },
   getInputs: async (opts, info) => {
     async function getRawProcedureInputOrThrow() {

package/src/adapters/node-http/content-type/form-data/index.ts

@@ -10,11 +10,8 @@ export const getFormDataContentTypeHandler: <
   TResponse extends NodeHTTPResponse,
 >() => NodeHTTPContentTypeHandler<TRouter, TRequest, TResponse> = () => ({
   name: 'node-http-formdata',
-  isMatch(opts) {
-    return (
-      opts.req.headers['content-type']?.startsWith('multipart/form-data') ??
-      false
-    );
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('multipart/form-data');
   },
   async getInputs(opts, inputOpts) {
     if (inputOpts.isBatchCall) {

package/src/adapters/node-http/content-type/json/index.ts

@@ -14,8 +14,8 @@ export const getNodeHTTPJSONContentTypeHandler: <
   TResponse extends NodeHTTPResponse,
 >() => NodeHTTPContentTypeHandler<TRouter, TRequest, TResponse> = () => ({
   name: 'node-http-json',
-  isMatch(opts) {
-    return !!opts.req.headers['content-type']?.startsWith('application/json');
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('application/json');
   },
   getInputs: async (opts, info) => {
     const bodyResult = await getPostBody(opts);

package/src/adapters/node-http/content-type/octet/index.ts

@@ -10,12 +10,10 @@ export const getOctetContentTypeHandler: <
   TResponse extends NodeHTTPResponse,
 >() => NodeHTTPContentTypeHandler<TRouter, TRequest, TResponse> = () => ({
   name: 'node-http-octet',
-  isMatch(opts) {
-    return (
-      opts.req.headers['content-type']?.startsWith(
-        'application/octet-stream',
-      ) ?? false
-    );
+  isMatch: (headers) => {
+    return !!headers
+      .get('content-type')
+      ?.startsWith('application/octet-stream');
   },
   async getInputs(opts, inputOpts) {
     if (inputOpts.isBatchCall) {

package/src/unstable-core-do-not-import/http/contentType.ts

@@ -13,7 +13,7 @@ export type BodyResult =
 
 export type BaseContentTypeHandler<TOptions> = {
   name: string;
-  isMatch(opts: TOptions): boolean;
+  isMatch(headers: Headers): boolean;
   getInputs: (
     opts: TOptions,
     info: {