@trpc/server 11.0.0-rc.361 → 11.0.0-rc.363

package/dist/adapters/fastify/fastifyRequestHandler.js

@@ -1,12 +1,18 @@
 'use strict';
 
-var node_stream = require('node:stream');
-var resolveHTTPResponse = require('../../unstable-core-do-not-import/http/resolveHTTPResponse.js');
-var batchStreamFormatter = require('../../unstable-core-do-not-import/http/batchStreamFormatter.js');
+var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
-var selectContentHandlerOrUnsupportedMediaType = require('../content-handlers/selectContentHandlerOrUnsupportedMediaType.js');
-var index = require('./content-type/json/index.js');
+var incomingMessageToRequest = require('../node-http/incomingMessageToRequest.js');
 
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */ // @trpc/server/http
 async function fastifyRequestHandler(opts) {
     const createContext = async (innerOpts)=>{
         return await opts.createContext?.({
@@ -14,75 +20,27 @@ async function fastifyRequestHandler(opts) {
             ...innerOpts
         });
     };
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        query,
-        method: opts.req.method,
-        headers: opts.req.headers
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let isStream = false;
-    let stream;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        if (!opts.res.statusCode || opts.res.statusCode === 200) {
-            opts.res.statusCode = head.status;
-        }
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            void opts.res.header(key, value);
-        }
-        if (isStreaming) {
-            void opts.res.header('Transfer-Encoding', 'chunked');
-            void opts.res.header('Vary', opts.res.hasHeader('Vary') ? 'trpc-batch-mode, ' + opts.res.getHeader('Vary') : 'trpc-batch-mode');
-            stream = new node_stream.Readable();
-            stream._read = ()=>{}; // eslint-disable-line @typescript-eslint/no-empty-function -- https://github.com/fastify/fastify/issues/805#issuecomment-369172154
-            resolve(opts.res.send(stream));
-            isStream = true;
-            formatter = batchStreamFormatter.getBatchStreamFormatter();
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            resolve(opts.res.send(string));
-        } else {
-            stream.push(formatter(index, string));
-        }
-    };
-    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType.selectContentHandlerOrUnsupportedMediaType([
-        index.getFastifyHTTPJSONContentTypeHandler()
-    ], opts);
-    resolveHTTPResponse.resolveHTTPResponse({
+    const incomingMessage = opts.req.raw;
+    // monkey-path body to the IncomingMessage
+    if ('body' in opts.req) {
+        incomingMessage.body = opts.req.body;
+    }
+    const req = incomingMessageToRequest.incomingMessageToRequest(incomingMessage, {
+        maxBodySize: null
+    });
+    const res = await resolveResponse.resolveResponse({
         ...opts,
         req,
-        error: unsupportedMediaTypeError,
-        async getInput (info) {
-            return await contentTypeHandler?.getInputs(opts, info);
-        },
+        error: null,
         createContext,
         onError (o) {
             opts?.onError?.({
                 ...o,
                 req: opts.req
             });
-        },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            stream.push(formatter.end());
-            stream.push(null); // https://github.com/fastify/fastify/issues/805#issuecomment-369172154
-        }
-    }).catch(()=>{
-        if (isStream) {
-            stream.push(null);
         }
     });
-    return promise;
+    await opts.res.send(res);
 }
 
 exports.fastifyRequestHandler = fastifyRequestHandler;

package/dist/adapters/fastify/fastifyRequestHandler.mjs

@@ -1,10 +1,16 @@
-import { Readable } from 'node:stream';
-import { resolveHTTPResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
-import { getBatchStreamFormatter } from '../../unstable-core-do-not-import/http/batchStreamFormatter.mjs';
+import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType.mjs';
-import { getFastifyHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
+import { incomingMessageToRequest } from '../node-http/incomingMessageToRequest.mjs';
 
+/**
+ * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */ // @trpc/server/http
 async function fastifyRequestHandler(opts) {
     const createContext = async (innerOpts)=>{
         return await opts.createContext?.({
@@ -12,75 +18,27 @@ async function fastifyRequestHandler(opts) {
             ...innerOpts
         });
     };
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        query,
-        method: opts.req.method,
-        headers: opts.req.headers
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let isStream = false;
-    let stream;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        if (!opts.res.statusCode || opts.res.statusCode === 200) {
-            opts.res.statusCode = head.status;
-        }
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            void opts.res.header(key, value);
-        }
-        if (isStreaming) {
-            void opts.res.header('Transfer-Encoding', 'chunked');
-            void opts.res.header('Vary', opts.res.hasHeader('Vary') ? 'trpc-batch-mode, ' + opts.res.getHeader('Vary') : 'trpc-batch-mode');
-            stream = new Readable();
-            stream._read = ()=>{}; // eslint-disable-line @typescript-eslint/no-empty-function -- https://github.com/fastify/fastify/issues/805#issuecomment-369172154
-            resolve(opts.res.send(stream));
-            isStream = true;
-            formatter = getBatchStreamFormatter();
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            resolve(opts.res.send(string));
-        } else {
-            stream.push(formatter(index, string));
-        }
-    };
-    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType([
-        getFastifyHTTPJSONContentTypeHandler()
-    ], opts);
-    resolveHTTPResponse({
+    const incomingMessage = opts.req.raw;
+    // monkey-path body to the IncomingMessage
+    if ('body' in opts.req) {
+        incomingMessage.body = opts.req.body;
+    }
+    const req = incomingMessageToRequest(incomingMessage, {
+        maxBodySize: null
+    });
+    const res = await resolveResponse({
         ...opts,
         req,
-        error: unsupportedMediaTypeError,
-        async getInput (info) {
-            return await contentTypeHandler?.getInputs(opts, info);
-        },
+        error: null,
         createContext,
         onError (o) {
             opts?.onError?.({
                 ...o,
                 req: opts.req
             });
-        },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            stream.push(formatter.end());
-            stream.push(null); // https://github.com/fastify/fastify/issues/805#issuecomment-369172154
-        }
-    }).catch(()=>{
-        if (isStream) {
-            stream.push(null);
         }
     });
-    return promise;
+    await opts.res.send(res);
 }
 
 export { fastifyRequestHandler };

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

@@ -10,7 +10,7 @@
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import type { AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
-import type { FastifyHandlerOptions } from './types';
+import type { FastifyHandlerOptions } from './fastifyRequestHandler';
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
     prefix?: string;
     useWSS?: boolean;

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;AAE7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAInE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,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,QAmC5B"}
+{"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;AAE7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAGnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGrE,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,QAmC5B"}

package/dist/adapters/fastify/fastifyTRPCPlugin.js

@@ -12,6 +12,7 @@ var fastifyRequestHandler = require('./fastifyRequestHandler.js');
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */ /// <reference types="@fastify/websocket" />
+// @trpc/server/ws
 function fastifyTRPCPlugin(fastify, opts, done) {
     fastify.removeContentTypeParser('application/json');
     fastify.addContentTypeParser('application/json', {

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

@@ -10,6 +10,7 @@ import { fastifyRequestHandler } from './fastifyRequestHandler.mjs';
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */ /// <reference types="@fastify/websocket" />
+// @trpc/server/ws
 function fastifyTRPCPlugin(fastify, opts, done) {
     fastify.removeContentTypeParser('application/json');
     fastify.addContentTypeParser('application/json', {

package/dist/adapters/fetch/fetchRequestHandler.d.ts

@@ -8,6 +8,6 @@
  * ```
  */
 import type { AnyRouter } from '../../@trpc/server';
-import type { FetchHandlerOptions } from './types';
-export declare function fetchRequestHandler<TRouter extends AnyRouter>(opts: FetchHandlerOptions<TRouter>): Promise<Response>;
+import type { FetchHandlerRequestOptions } from './types';
+export declare function fetchRequestHandler<TRouter extends AnyRouter>(opts: FetchHandlerRequestOptions<TRouter>): Promise<Response>;
 //# sourceMappingURL=fetchRequestHandler.d.ts.map

package/dist/adapters/fetch/fetchRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAcpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AASnD,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,QAAQ,CAAC,CAuHnB"}
+{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAS1D,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,GACxC,OAAO,CAAC,QAAQ,CAAC,CAsDnB"}

package/dist/adapters/fetch/fetchRequestHandler.js

@@ -1,11 +1,8 @@
 'use strict';
 
-var resolveHTTPResponse = require('../../unstable-core-do-not-import/http/resolveHTTPResponse.js');
-var batchStreamFormatter = require('../../unstable-core-do-not-import/http/batchStreamFormatter.js');
+var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 var toURL = require('../../unstable-core-do-not-import/http/toURL.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
-var selectContentHandlerOrUnsupportedMediaType = require('../content-handlers/selectContentHandlerOrUnsupportedMediaType.js');
-var index = require('./content-type/json/index.js');
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
@@ -34,99 +31,45 @@ async function fetchRequestHandler(opts) {
     const pathname = trimSlashes(url.pathname);
     const endpoint = trimSlashes(opts.endpoint);
     const path = trimSlashes(pathname.slice(endpoint.length));
-    const req = {
-        query: url.searchParams,
-        method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers)
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let status = 200;
-    let isStream = false;
-    let controller;
-    let encoder;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            if (typeof value === 'string') {
-                resHeaders.set(key, value);
-                continue;
-            }
-            for (const v of value){
-                resHeaders.append(key, v);
-            }
-        }
-        status = head.status;
-        if (isStreaming) {
-            resHeaders.set('Transfer-Encoding', 'chunked');
-            resHeaders.append('Vary', 'trpc-batch-mode');
-            const stream = new ReadableStream({
-                start (c) {
-                    controller = c;
-                }
-            });
-            const response = new Response(stream, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-            encoder = new TextEncoder();
-            formatter = batchStreamFormatter.getBatchStreamFormatter();
-            isStream = true;
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            const response = new Response(string || null, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-        } else {
-            controller.enqueue(encoder.encode(formatter(index, string)));
-        }
-    };
-    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType.selectContentHandlerOrUnsupportedMediaType([
-        index.getFetchHTTPJSONContentTypeHandler()
-    ], {
-        ...opts,
-        url
-    });
-    resolveHTTPResponse.resolveHTTPResponse({
+    return await resolveResponse.resolveResponse({
         ...opts,
-        req,
+        req: opts.req,
         createContext,
         path,
-        error: unsupportedMediaTypeError,
-        async getInput (info) {
-            return await contentTypeHandler?.getInputs({
-                ...opts,
-                url
-            }, info);
-        },
+        error: null,
         onError (o) {
             opts?.onError?.({
                 ...o,
                 req: opts.req
             });
         },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            controller.enqueue(encoder.encode(formatter.end()));
-            controller.close();
-        }
-    }).catch(()=>{
-        if (isStream) {
-            controller.close();
+        responseMeta (data) {
+            const meta = opts.responseMeta?.(data);
+            if (meta?.headers) {
+                if (meta.headers instanceof Headers) {
+                    for (const [key, value] of meta.headers.entries()){
+                        resHeaders.append(key, value);
+                    }
+                } else {
+                    /**
+           * @deprecated, delete in v12
+           */ for (const [key1, value1] of Object.entries(meta.headers)){
+                        if (Array.isArray(value1)) {
+                            for (const v of value1){
+                                resHeaders.append(key1, v);
+                            }
+                        } else if (typeof value1 === 'string') {
+                            resHeaders.set(key1, value1);
+                        }
+                    }
+                }
+            }
+            return {
+                headers: resHeaders,
+                status: meta?.status
+            };
         }
     });
-    return promise;
 }
 
 exports.fetchRequestHandler = fetchRequestHandler;

package/dist/adapters/fetch/fetchRequestHandler.mjs

@@ -1,9 +1,6 @@
-import { resolveHTTPResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
-import { getBatchStreamFormatter } from '../../unstable-core-do-not-import/http/batchStreamFormatter.mjs';
+import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import { toURL } from '../../unstable-core-do-not-import/http/toURL.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType.mjs';
-import { getFetchHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
@@ -32,99 +29,45 @@ async function fetchRequestHandler(opts) {
     const pathname = trimSlashes(url.pathname);
     const endpoint = trimSlashes(opts.endpoint);
     const path = trimSlashes(pathname.slice(endpoint.length));
-    const req = {
-        query: url.searchParams,
-        method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers)
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let status = 200;
-    let isStream = false;
-    let controller;
-    let encoder;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            if (typeof value === 'string') {
-                resHeaders.set(key, value);
-                continue;
-            }
-            for (const v of value){
-                resHeaders.append(key, v);
-            }
-        }
-        status = head.status;
-        if (isStreaming) {
-            resHeaders.set('Transfer-Encoding', 'chunked');
-            resHeaders.append('Vary', 'trpc-batch-mode');
-            const stream = new ReadableStream({
-                start (c) {
-                    controller = c;
-                }
-            });
-            const response = new Response(stream, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-            encoder = new TextEncoder();
-            formatter = getBatchStreamFormatter();
-            isStream = true;
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            const response = new Response(string || null, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-        } else {
-            controller.enqueue(encoder.encode(formatter(index, string)));
-        }
-    };
-    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType([
-        getFetchHTTPJSONContentTypeHandler()
-    ], {
-        ...opts,
-        url
-    });
-    resolveHTTPResponse({
+    return await resolveResponse({
         ...opts,
-        req,
+        req: opts.req,
         createContext,
         path,
-        error: unsupportedMediaTypeError,
-        async getInput (info) {
-            return await contentTypeHandler?.getInputs({
-                ...opts,
-                url
-            }, info);
-        },
+        error: null,
         onError (o) {
             opts?.onError?.({
                 ...o,
                 req: opts.req
             });
         },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            controller.enqueue(encoder.encode(formatter.end()));
-            controller.close();
-        }
-    }).catch(()=>{
-        if (isStream) {
-            controller.close();
+        responseMeta (data) {
+            const meta = opts.responseMeta?.(data);
+            if (meta?.headers) {
+                if (meta.headers instanceof Headers) {
+                    for (const [key, value] of meta.headers.entries()){
+                        resHeaders.append(key, value);
+                    }
+                } else {
+                    /**
+           * @deprecated, delete in v12
+           */ for (const [key1, value1] of Object.entries(meta.headers)){
+                        if (Array.isArray(value1)) {
+                            for (const v of value1){
+                                resHeaders.append(key1, v);
+                            }
+                        } else if (typeof value1 === 'string') {
+                            resHeaders.set(key1, value1);
+                        }
+                    }
+                }
+            }
+            return {
+                headers: resHeaders,
+                status: meta?.status
+            };
         }
     });
-    return promise;
 }
 
 export { fetchRequestHandler };

package/dist/adapters/fetch/types.d.ts

@@ -7,7 +7,7 @@
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */
-import type { AnyRouter, CreateContextCallback, inferRouterContext, WrapCreateContext } from '../../@trpc/server';
+import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../../@trpc/server';
 import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../@trpc/server/http';
 export type FetchCreateContextFnOptions = {
     req: Request;
@@ -20,7 +20,7 @@ export type FetchHandlerOptions<TRouter extends AnyRouter> = FetchCreateContextO
     req: Request;
     endpoint: string;
 };
-export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = HTTPBaseHandlerOptions<TRouter, Request> & WrapCreateContext<FetchCreateContextFn<TRouter>> & {
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = HTTPBaseHandlerOptions<TRouter, Request> & CreateContextCallback<inferRouterContext<TRouter>, FetchCreateContextFn<TRouter>> & {
     req: Request;
     endpoint: string;
 };

package/dist/adapters/fetch/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,oBAAoB,CAAC,OAAO,CAAC,CAC9B,CAAC;AAEJ,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,wBAAwB,CAAC,OAAO,CAAC,GAC/B,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG;IACzC,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GACtC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,GAAG;IACjD,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,oBAAoB,CAAC,OAAO,CAAC,CAC9B,CAAC;AAEJ,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,wBAAwB,CAAC,OAAO,CAAC,GAC/B,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG;IACzC,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GACtC,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,oBAAoB,CAAC,OAAO,CAAC,CAC9B,GAAG;IACF,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/dist/adapters/next.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var getErrorShape = require('../unstable-core-do-not-import/error/getErrorShape.js');
 var TRPCError = require('../unstable-core-do-not-import/error/TRPCError.js');
+var getErrorShape = require('../unstable-core-do-not-import/error/getErrorShape.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 

package/dist/adapters/next.mjs

@@ -1,5 +1,5 @@
-import { getErrorShape } from '../unstable-core-do-not-import/error/getErrorShape.mjs';
 import { TRPCError } from '../unstable-core-do-not-import/error/TRPCError.mjs';
+import { getErrorShape } from '../unstable-core-do-not-import/error/getErrorShape.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 

package/dist/adapters/node-http/incomingMessageToRequest.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+import type * as http from 'http';
+export interface IncomingMessageWithBody extends http.IncomingMessage {
+    /**
+     * Many adapters will add a `body` property to the incoming message and pre-parse the body
+     */
+    body?: unknown;
+}
+/**
+ * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
+ */
+export declare function incomingMessageToRequest(req: http.IncomingMessage, opts: {
+    /**
+     * Max body size in bytes. If the body is larger than this, the request will be aborted
+     */
+    maxBodySize: number | null;
+}): Request;
+//# sourceMappingURL=incomingMessageToRequest.d.ts.map

package/dist/adapters/node-http/incomingMessageToRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAGlC,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe;IACnE;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA+CD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CA2BT"}