@trpc/server 11.0.0-rc.621 → 11.0.0-rc.632

package/dist/@trpc/server/http.d.ts

@@ -4,5 +4,5 @@ export type { BaseHandlerOptions, HTTPBaseHandlerOptions, HTTPErrorHandler,
  * @deprecated Use `HTTPErrorHandler` instead
  */
 HTTPErrorHandler as OnErrorFunction, ResolveHTTPRequestOptionsContextFn, ResponseMeta, ResponseMetaFn, TRPCRequestInfo, } from '../../unstable-core-do-not-import';
-export { getBatchStreamFormatter, octetInputParser, parseConnectionParamsFromUnknown, parseConnectionParamsFromString, } from '../../unstable-core-do-not-import';
+export { octetInputParser, parseConnectionParamsFromUnknown, parseConnectionParamsFromString, } from '../../unstable-core-do-not-import';
 //# sourceMappingURL=http.d.ts.map

package/dist/@trpc/server/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB;AAChB;;GAEG;AACH,gBAAgB,IAAI,eAAe,EACnC,kCAAkC,EAClC,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB;AAChB;;GAEG;AACH,gBAAgB,IAAI,eAAe,EACnC,kCAAkC,EAClC,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,mCAAmC,CAAC"}

package/dist/adapters/aws-lambda/getPlanner.js

@@ -68,7 +68,7 @@ const v1Processor = {
     },
     getMethod: (event)=>event.httpMethod,
     toResult: async (response)=>{
-        const { headers , cookies  } = getHeadersAndCookiesFromResponse(response);
+        const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
         const result = {
             ...cookies.length && {
                 multiValueHeaders: {
@@ -115,7 +115,7 @@ const v2Processor = {
     },
     getMethod: (event)=>event.requestContext.http.method,
     toResult: async (response)=>{
-        const { headers , cookies  } = getHeadersAndCookiesFromResponse(response);
+        const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
         const result = {
             cookies,
             statusCode: response.status,

package/dist/adapters/aws-lambda/getPlanner.mjs

@@ -66,7 +66,7 @@ const v1Processor = {
     },
     getMethod: (event)=>event.httpMethod,
     toResult: async (response)=>{
-        const { headers , cookies  } = getHeadersAndCookiesFromResponse(response);
+        const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
         const result = {
             ...cookies.length && {
                 multiValueHeaders: {
@@ -113,7 +113,7 @@ const v2Processor = {
     },
     getMethod: (event)=>event.requestContext.http.method,
     toResult: async (response)=>{
-        const { headers , cookies  } = getHeadersAndCookiesFromResponse(response);
+        const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
         const result = {
             cookies,
             statusCode: response.status,

package/dist/adapters/aws-lambda/index.js

@@ -2,6 +2,8 @@
 
 var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 var getPlanner = require('./getPlanner.js');
 
 function awsLambdaRequestHandler(opts) {

package/dist/adapters/aws-lambda/index.mjs

@@ -1,5 +1,7 @@
 import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import { getPlanner } from './getPlanner.mjs';
 
 function awsLambdaRequestHandler(opts) {

package/dist/adapters/express.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var utils = require('../unstable-core-do-not-import/utils.js');
+require('../vendor/unpromise/unpromise.js');
+require('../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 

package/dist/adapters/express.mjs

@@ -1,4 +1,6 @@
 import { run } from '../unstable-core-do-not-import/utils.mjs';
+import '../vendor/unpromise/unpromise.mjs';
+import '../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 

package/dist/adapters/fastify/fastifyRequestHandler.js

@@ -2,6 +2,8 @@
 
 var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 var incomingMessageToRequest = require('../node-http/incomingMessageToRequest.js');
 
 /**
@@ -25,7 +27,7 @@ async function fastifyRequestHandler(opts) {
     if ('body' in opts.req) {
         incomingMessage.body = opts.req.body;
     }
-    const req = incomingMessageToRequest.incomingMessageToRequest(incomingMessage, {
+    const req = incomingMessageToRequest.incomingMessageToRequest(incomingMessage, opts.res.raw, {
         maxBodySize: null
     });
     const res = await resolveResponse.resolveResponse({

package/dist/adapters/fastify/fastifyRequestHandler.mjs

@@ -1,5 +1,7 @@
 import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import { incomingMessageToRequest } from '../node-http/incomingMessageToRequest.mjs';
 
 /**
@@ -23,7 +25,7 @@ async function fastifyRequestHandler(opts) {
     if ('body' in opts.req) {
         incomingMessage.body = opts.req.body;
     }
-    const req = incomingMessageToRequest(incomingMessage, {
+    const req = incomingMessageToRequest(incomingMessage, opts.res.raw, {
         maxBodySize: null
     });
     const res = await resolveResponse({

package/dist/adapters/fastify/fastifyTRPCPlugin.js

@@ -45,7 +45,7 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         }, async (socket, req)=>{
             await onConnection(socket, req.raw);
             if (trpcOptions?.keepAlive?.enabled) {
-                const { pingMs , pongWaitMs  } = trpcOptions.keepAlive;
+                const { pingMs, pongWaitMs } = trpcOptions.keepAlive;
                 ws.handleKeepAlive(socket, pingMs, pongWaitMs);
             }
         });

package/dist/adapters/fastify/fastifyTRPCPlugin.mjs

@@ -43,7 +43,7 @@ function fastifyTRPCPlugin(fastify, opts, done) {
         }, async (socket, req)=>{
             await onConnection(socket, req.raw);
             if (trpcOptions?.keepAlive?.enabled) {
-                const { pingMs , pongWaitMs  } = trpcOptions.keepAlive;
+                const { pingMs, pongWaitMs } = trpcOptions.keepAlive;
                 handleKeepAlive(socket, pingMs, pongWaitMs);
             }
         });

package/dist/adapters/fetch/fetchRequestHandler.js

@@ -2,6 +2,8 @@
 
 var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.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`
@@ -52,13 +54,13 @@ async function fetchRequestHandler(opts) {
                 } 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);
+           */ for (const [key, value] of Object.entries(meta.headers)){
+                        if (Array.isArray(value)) {
+                            for (const v of value){
+                                resHeaders.append(key, v);
                             }
-                        } else if (typeof value1 === 'string') {
-                            resHeaders.set(key1, value1);
+                        } else if (typeof value === 'string') {
+                            resHeaders.set(key, value);
                         }
                     }
                 }

package/dist/adapters/fetch/fetchRequestHandler.mjs

@@ -1,5 +1,7 @@
 import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.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`
@@ -50,13 +52,13 @@ async function fetchRequestHandler(opts) {
                 } 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);
+           */ for (const [key, value] of Object.entries(meta.headers)){
+                        if (Array.isArray(value)) {
+                            for (const v of value){
+                                resHeaders.append(key, v);
                             }
-                        } else if (typeof value1 === 'string') {
-                            resHeaders.set(key1, value1);
+                        } else if (typeof value === 'string') {
+                            resHeaders.set(key, value);
                         }
                     }
                 }

package/dist/adapters/next-app-dir/nextAppDirCaller.js

@@ -2,6 +2,8 @@
 
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
 var formDataToObject = require('../../unstable-core-do-not-import/http/formDataToObject.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 var redirect = require('./redirect.js');
 var rethrowNextErrors = require('./rethrowNextErrors.js');
@@ -9,7 +11,7 @@ var rethrowNextErrors = require('./rethrowNextErrors.js');
 /**
  * Create a caller that works with Next.js React Server Components & Server Actions
  */ function nextAppDirCaller(config) {
-    const { normalizeFormData =true  } = config;
+    const { normalizeFormData = true } = config;
     const createContext = async ()=>{
         return config?.createContext?.() ?? {};
     };
@@ -63,13 +65,13 @@ var rethrowNextErrors = require('./rethrowNextErrors.js');
                 }
             case 'query':
                 {
-                    const input1 = opts.args[0];
+                    const input = opts.args[0];
                     return await opts.invoke({
                         type: opts._def.type,
                         ctx,
-                        getRawInput: async ()=>input1,
+                        getRawInput: async ()=>input,
                         path,
-                        input: input1,
+                        input,
                         signal: undefined
                     }).then((data)=>{
                         if (data instanceof redirect.TRPCRedirectError) throw data;

package/dist/adapters/next-app-dir/nextAppDirCaller.mjs

@@ -1,5 +1,7 @@
 import { TRPCError, getTRPCErrorFromUnknown } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
 import { formDataToObject } from '../../unstable-core-do-not-import/http/formDataToObject.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 import { TRPCRedirectError } from './redirect.mjs';
 import { rethrowNextErrors } from './rethrowNextErrors.mjs';
@@ -7,7 +9,7 @@ import { rethrowNextErrors } from './rethrowNextErrors.mjs';
 /**
  * Create a caller that works with Next.js React Server Components & Server Actions
  */ function nextAppDirCaller(config) {
-    const { normalizeFormData =true  } = config;
+    const { normalizeFormData = true } = config;
     const createContext = async ()=>{
         return config?.createContext?.() ?? {};
     };
@@ -61,13 +63,13 @@ import { rethrowNextErrors } from './rethrowNextErrors.mjs';
                 }
             case 'query':
                 {
-                    const input1 = opts.args[0];
+                    const input = opts.args[0];
                     return await opts.invoke({
                         type: opts._def.type,
                         ctx,
-                        getRawInput: async ()=>input1,
+                        getRawInput: async ()=>input,
                         path,
-                        input: input1,
+                        input,
                         signal: undefined
                     }).then((data)=>{
                         if (data instanceof TRPCRedirectError) throw data;

package/dist/adapters/next-app-dir/notFound.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
 /**

package/dist/adapters/next-app-dir/notFound.mjs

@@ -1,4 +1,6 @@
 import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
 /**

package/dist/adapters/next-app-dir/redirect.js

@@ -1,6 +1,9 @@
 'use strict';
 
+var _define_property = require('../../node_modules/.pnpm/@swc_helpers@0.5.13/node_modules/@swc/helpers/esm/_define_property.js');
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
 /**
@@ -11,7 +14,7 @@ require('../../unstable-core-do-not-import/rootConfig.js');
             // TODO(?): This should maybe a custom error code
             code: 'UNPROCESSABLE_CONTENT',
             message: `Redirect error to "${url}" that will be handled by Next.js`
-        });
+        }), _define_property._(this, "args", void 0);
         this.args = [
             url.toString(),
             redirectType

package/dist/adapters/next-app-dir/redirect.mjs

@@ -1,4 +1,7 @@
+import { _ as _define_property } from '../../node_modules/.pnpm/@swc_helpers@0.5.13/node_modules/@swc/helpers/esm/_define_property.mjs';
 import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
 /**
@@ -9,7 +12,7 @@ import '../../unstable-core-do-not-import/rootConfig.mjs';
             // TODO(?): This should maybe a custom error code
             code: 'UNPROCESSABLE_CONTENT',
             message: `Redirect error to "${url}" that will be handled by Next.js`
-        });
+        }), _define_property(this, "args", void 0);
         this.args = [
             url.toString(),
             redirectType

package/dist/adapters/next-app-dir/rethrowNextErrors.js

@@ -55,7 +55,7 @@ function isNotFoundError(error) {
     if (error instanceof redirect.TRPCRedirectError) {
         nextNavigation__namespace.redirect(...error.args);
     }
-    const { cause  } = error;
+    const { cause } = error;
     // Next.js 15 has `unstable_rethrow`. Use that if it exists.
     if ('unstable_rethrow' in nextNavigation__namespace && typeof nextNavigation__namespace.unstable_rethrow === 'function') {
         nextNavigation__namespace.unstable_rethrow(cause);

package/dist/adapters/next-app-dir/rethrowNextErrors.mjs

@@ -34,7 +34,7 @@ function isNotFoundError(error) {
     if (error instanceof TRPCRedirectError) {
         nextNavigation.redirect(...error.args);
     }
-    const { cause  } = error;
+    const { cause } = error;
     // Next.js 15 has `unstable_rethrow`. Use that if it exists.
     if ('unstable_rethrow' in nextNavigation && typeof nextNavigation.unstable_rethrow === 'function') {
         nextNavigation.unstable_rethrow(cause);

package/dist/adapters/next.js

@@ -2,6 +2,8 @@
 
 var utils = require('../unstable-core-do-not-import/utils.js');
 var TRPCError = require('../unstable-core-do-not-import/error/TRPCError.js');
+require('../vendor/unpromise/unpromise.js');
+require('../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 

package/dist/adapters/next.mjs

@@ -1,5 +1,7 @@
 import { run } from '../unstable-core-do-not-import/utils.mjs';
 import { TRPCError } from '../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../vendor/unpromise/unpromise.mjs';
+import '../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 

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

@@ -9,7 +9,7 @@ export declare function createURL(req: http.IncomingMessage): URL;
 /**
  * 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: {
+export declare function incomingMessageToRequest(req: http.IncomingMessage, res: http.ServerResponse, opts: {
     /**
      * Max body size in bytes. If the body is larger than this, the request will be aborted
      */

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

@@ -1 +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;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,GAAG,CAkBxD;AAwBD;;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,CAkCT"}
+{"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;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,GAAG,CAkBxD;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAqCT"}

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

@@ -1,6 +1,8 @@
 'use strict';
 
 var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 
 function createBody(req, opts) {
@@ -82,15 +84,16 @@ function createHeaders(incoming) {
 }
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
- */ function incomingMessageToRequest(req, opts) {
+ */ function incomingMessageToRequest(req, res, opts) {
     const ac = new AbortController();
     const onAbort = ()=>{
+        res.off('close', onAbort);
+        req.socket.off('end', onAbort);
+        // abort the request
         ac.abort();
-        req.off('aborted', onAbort);
-        req.off('close', onAbort);
     };
-    req.once('aborted', onAbort);
-    req.socket?.once('close', onAbort);
+    res.once('close', onAbort);
+    req.socket.once('end', onAbort);
     // Get host from either regular header or HTTP/2 pseudo-header
     const url = createURL(req);
     const init = {

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

@@ -1,4 +1,6 @@
 import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 
 function createBody(req, opts) {
@@ -80,15 +82,16 @@ function createHeaders(incoming) {
 }
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
- */ function incomingMessageToRequest(req, opts) {
+ */ function incomingMessageToRequest(req, res, opts) {
     const ac = new AbortController();
     const onAbort = ()=>{
+        res.off('close', onAbort);
+        req.socket.off('end', onAbort);
+        // abort the request
         ac.abort();
-        req.off('aborted', onAbort);
-        req.off('close', onAbort);
     };
-    req.once('aborted', onAbort);
-    req.socket?.once('close', onAbort);
+    res.once('close', onAbort);
+    req.socket.once('end', onAbort);
     // Get host from either regular header or HTTP/2 pseudo-header
     const url = createURL(req);
     const init = {

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

@@ -1 +1 @@
-{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAM5B,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,WAClD,OAAO,UA6BvB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAoFlE"}
+{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAM5B,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,WAClD,OAAO,UA6BvB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA6ClE"}

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

@@ -6,7 +6,10 @@ var utils = require('../../unstable-core-do-not-import/utils.js');
 var resolveResponse = require('../../unstable-core-do-not-import/http/resolveResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
 var transformer = require('../../unstable-core-do-not-import/transformer.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 var incomingMessageToRequest = require('./incomingMessageToRequest.js');
+var writeResponse = require('./writeResponse.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`
@@ -21,7 +24,7 @@ var incomingMessageToRequest = require('./incomingMessageToRequest.js');
  * @internal
  */ function internal_exceptionHandler(opts) {
     return (cause)=>{
-        const { res , req  } = opts;
+        const { res, req } = opts;
         const error = TRPCError.getTRPCErrorFromUnknown(cause);
         const shape = getErrorShape.getErrorShape({
             config: opts.router._def._config,
@@ -56,7 +59,7 @@ var incomingMessageToRequest = require('./incomingMessageToRequest.js');
         });
         return handleViaMiddleware(opts.req, opts.res, (err)=>{
             utils.run(async ()=>{
-                const req = incomingMessageToRequest.incomingMessageToRequest(opts.req, {
+                const request = incomingMessageToRequest.incomingMessageToRequest(opts.req, opts.res, {
                     maxBodySize: opts.maxBodySize ?? null
                 });
                 // Build tRPC dependencies
@@ -68,7 +71,7 @@ var incomingMessageToRequest = require('./incomingMessageToRequest.js');
                 };
                 const response = await resolveResponse.resolveResponse({
                     ...opts,
-                    req,
+                    req: request,
                     error: err ? TRPCError.getTRPCErrorFromUnknown(err) : null,
                     createContext,
                     onError (o) {
@@ -78,46 +81,11 @@ var incomingMessageToRequest = require('./incomingMessageToRequest.js');
                         });
                     }
                 });
-                const { res  } = opts;
-                if (res.statusCode === 200) {
-                    // if the status code is set, we assume that it's been manually overridden
-                    res.statusCode = response.status;
-                }
-                for (const [key, value] of response.headers){
-                    res.setHeader(key, value);
-                }
-                if (response.body) {
-                    const reader = response.body.getReader();
-                    const onAbort = ()=>{
-                        // cancelling the reader will cause the whole stream to be cancelled
-                        reader.cancel().catch(()=>{
-                        // console.error('reader.cancel() error', err);
-                        });
-                    };
-                    req.signal.addEventListener('abort', onAbort, {
-                        once: true
-                    });
-                    while(true){
-                        const { done , value: value1  } = await reader.read();
-                        if (done) {
-                            break;
-                        }
-                        if (!res.writable) {
-                            break;
-                        }
-                        if (res.write(value1) === false) {
-                            await new Promise((resolve)=>{
-                                res.once('drain', resolve);
-                            });
-                        }
-                        // useful for debugging chunked responses:
-                        // console.log('wrote', Buffer.from(value).toString());
-                        // IMPORTANT - flush the response buffer, otherwise the client will not receive the data until `.end()`
-                        res.flush?.();
-                    }
-                    req.signal.removeEventListener('abort', onAbort);
-                }
-                res.end();
+                await writeResponse.writeResponse({
+                    request,
+                    response,
+                    rawResponse: opts.res
+                });
             }).catch(internal_exceptionHandler(opts));
         });
     });

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

@@ -4,7 +4,10 @@ import { run } from '../../unstable-core-do-not-import/utils.mjs';
 import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
 import { transformTRPCResponse } from '../../unstable-core-do-not-import/transformer.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
+import { writeResponse } from './writeResponse.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`
@@ -19,7 +22,7 @@ import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
  * @internal
  */ function internal_exceptionHandler(opts) {
     return (cause)=>{
-        const { res , req  } = opts;
+        const { res, req } = opts;
         const error = getTRPCErrorFromUnknown(cause);
         const shape = getErrorShape({
             config: opts.router._def._config,
@@ -54,7 +57,7 @@ import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
         });
         return handleViaMiddleware(opts.req, opts.res, (err)=>{
             run(async ()=>{
-                const req = incomingMessageToRequest(opts.req, {
+                const request = incomingMessageToRequest(opts.req, opts.res, {
                     maxBodySize: opts.maxBodySize ?? null
                 });
                 // Build tRPC dependencies
@@ -66,7 +69,7 @@ import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
                 };
                 const response = await resolveResponse({
                     ...opts,
-                    req,
+                    req: request,
                     error: err ? getTRPCErrorFromUnknown(err) : null,
                     createContext,
                     onError (o) {
@@ -76,46 +79,11 @@ import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
                         });
                     }
                 });
-                const { res  } = opts;
-                if (res.statusCode === 200) {
-                    // if the status code is set, we assume that it's been manually overridden
-                    res.statusCode = response.status;
-                }
-                for (const [key, value] of response.headers){
-                    res.setHeader(key, value);
-                }
-                if (response.body) {
-                    const reader = response.body.getReader();
-                    const onAbort = ()=>{
-                        // cancelling the reader will cause the whole stream to be cancelled
-                        reader.cancel().catch(()=>{
-                        // console.error('reader.cancel() error', err);
-                        });
-                    };
-                    req.signal.addEventListener('abort', onAbort, {
-                        once: true
-                    });
-                    while(true){
-                        const { done , value: value1  } = await reader.read();
-                        if (done) {
-                            break;
-                        }
-                        if (!res.writable) {
-                            break;
-                        }
-                        if (res.write(value1) === false) {
-                            await new Promise((resolve)=>{
-                                res.once('drain', resolve);
-                            });
-                        }
-                        // useful for debugging chunked responses:
-                        // console.log('wrote', Buffer.from(value).toString());
-                        // IMPORTANT - flush the response buffer, otherwise the client will not receive the data until `.end()`
-                        res.flush?.();
-                    }
-                    req.signal.removeEventListener('abort', onAbort);
-                }
-                res.end();
+                await writeResponse({
+                    request,
+                    response,
+                    rawResponse: opts.res
+                });
             }).catch(internal_exceptionHandler(opts));
         });
     });