@trpc/server 11.0.0-rc.630 → 11.0.0-rc.633

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/index.js

@@ -3,6 +3,7 @@
 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,6 +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

@@ -2,6 +2,7 @@
 
 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,5 +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

@@ -3,6 +3,7 @@
 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');
 
 /**
@@ -26,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,6 +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';
 
 /**
@@ -24,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/fetch/fetchRequestHandler.js

@@ -3,6 +3,7 @@
 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`

package/dist/adapters/fetch/fetchRequestHandler.mjs

@@ -1,6 +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`

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

@@ -3,6 +3,7 @@
 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');

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

@@ -1,6 +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';

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

@@ -2,6 +2,7 @@
 
 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,5 +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

@@ -3,6 +3,7 @@
 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');
 
 /**

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

@@ -1,6 +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';
 
 /**

package/dist/adapters/next.js

@@ -3,6 +3,7 @@
 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,6 +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

@@ -2,6 +2,7 @@
 
 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) {
@@ -83,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,5 +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) {
@@ -81,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

@@ -7,7 +7,9 @@ var resolveResponse = require('../../unstable-core-do-not-import/http/resolveRes
 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`
@@ -57,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
@@ -69,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) {
@@ -79,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 } = await reader.read();
-                        if (done) {
-                            break;
-                        }
-                        if (!res.writable) {
-                            break;
-                        }
-                        if (res.write(value) === 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

@@ -5,7 +5,9 @@ import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveR
 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`
@@ -55,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
@@ -67,7 +69,7 @@ import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
                 };
                 const response = await resolveResponse({
                     ...opts,
-                    req,
+                    req: request,
                     error: err ? getTRPCErrorFromUnknown(err) : null,
                     createContext,
                     onError (o) {
@@ -77,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 } = await reader.read();
-                        if (done) {
-                            break;
-                        }
-                        if (!res.writable) {
-                            break;
-                        }
-                        if (res.write(value) === 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));
         });
     });

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

@@ -0,0 +1,18 @@
+import type { NodeHTTPResponse } from './types';
+/**
+ * @internal
+ */
+export declare function writeResponseBody(opts: {
+    res: NodeHTTPResponse;
+    signal: AbortSignal;
+    body: NonNullable<Response['body']>;
+}): Promise<void>;
+/**
+ * @internal
+ */
+export declare function writeResponse(opts: {
+    request: Request;
+    response: Response;
+    rawResponse: NodeHTTPResponse;
+}): Promise<void>;
+//# sourceMappingURL=writeResponse.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"writeResponse.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/writeResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAyBhD;;GAEG;AAEH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,gBAAgB,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;CACrC,iBAoBA;AACD;;GAEG;AAEH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,gBAAgB,CAAC;CAC/B,iBA0BA"}

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

@@ -0,0 +1,80 @@
+'use strict';
+
+var isAbortError = require('../../unstable-core-do-not-import/http/isAbortError.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
+require('../../unstable-core-do-not-import/rootConfig.js');
+
+// eslint-disable-next-line no-restricted-imports
+async function writeResponseBodyChunk(res, chunk) {
+    if (res.write(chunk) === false) {
+        await new Promise((resolve, reject)=>{
+            const onError = (err)=>{
+                reject(err);
+                cleanup();
+            };
+            const onDrain = ()=>{
+                resolve();
+                cleanup();
+            };
+            const cleanup = ()=>{
+                res.off('error', onError);
+                res.off('drain', onDrain);
+            };
+            res.once('error', onError);
+            res.once('drain', onDrain);
+        });
+    }
+}
+/**
+ * @internal
+ */ async function writeResponseBody(opts) {
+    const { res } = opts;
+    try {
+        const writableStream = new WritableStream({
+            async write (chunk) {
+                await writeResponseBodyChunk(res, chunk);
+                res.flush?.();
+            }
+        });
+        await opts.body.pipeTo(writableStream, {
+            signal: opts.signal
+        });
+    } catch (err) {
+        if (isAbortError.isAbortError(err)) {
+            return;
+        }
+        throw err;
+    }
+}
+/**
+ * @internal
+ */ async function writeResponse(opts) {
+    const { response, rawResponse } = opts;
+    // Only override status code if it hasn't been explicitly set in a procedure etc
+    if (rawResponse.statusCode === 200) {
+        rawResponse.statusCode = response.status;
+    }
+    for (const [key, value] of response.headers){
+        rawResponse.setHeader(key, value);
+    }
+    try {
+        if (response.body) {
+            await writeResponseBody({
+                res: rawResponse,
+                signal: opts.request.signal,
+                body: response.body
+            });
+        }
+    } catch (err) {
+        if (!rawResponse.headersSent) {
+            rawResponse.statusCode = 500;
+        }
+        throw err;
+    } finally{
+        rawResponse.end();
+    }
+}
+
+exports.writeResponse = writeResponse;
+exports.writeResponseBody = writeResponseBody;

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

@@ -0,0 +1,77 @@
+import { isAbortError } from '../../unstable-core-do-not-import/http/isAbortError.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
+import '../../unstable-core-do-not-import/rootConfig.mjs';
+
+// eslint-disable-next-line no-restricted-imports
+async function writeResponseBodyChunk(res, chunk) {
+    if (res.write(chunk) === false) {
+        await new Promise((resolve, reject)=>{
+            const onError = (err)=>{
+                reject(err);
+                cleanup();
+            };
+            const onDrain = ()=>{
+                resolve();
+                cleanup();
+            };
+            const cleanup = ()=>{
+                res.off('error', onError);
+                res.off('drain', onDrain);
+            };
+            res.once('error', onError);
+            res.once('drain', onDrain);
+        });
+    }
+}
+/**
+ * @internal
+ */ async function writeResponseBody(opts) {
+    const { res } = opts;
+    try {
+        const writableStream = new WritableStream({
+            async write (chunk) {
+                await writeResponseBodyChunk(res, chunk);
+                res.flush?.();
+            }
+        });
+        await opts.body.pipeTo(writableStream, {
+            signal: opts.signal
+        });
+    } catch (err) {
+        if (isAbortError(err)) {
+            return;
+        }
+        throw err;
+    }
+}
+/**
+ * @internal
+ */ async function writeResponse(opts) {
+    const { response, rawResponse } = opts;
+    // Only override status code if it hasn't been explicitly set in a procedure etc
+    if (rawResponse.statusCode === 200) {
+        rawResponse.statusCode = response.status;
+    }
+    for (const [key, value] of response.headers){
+        rawResponse.setHeader(key, value);
+    }
+    try {
+        if (response.body) {
+            await writeResponseBody({
+                res: rawResponse,
+                signal: opts.request.signal,
+                body: response.body
+            });
+        }
+    } catch (err) {
+        if (!rawResponse.headersSent) {
+            rawResponse.statusCode = 500;
+        }
+        throw err;
+    } finally{
+        rawResponse.end();
+    }
+}
+
+export { writeResponse, writeResponseBody };

package/dist/adapters/standalone.js

@@ -3,6 +3,7 @@
 var http = require('node:http');
 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');
 var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');

package/dist/adapters/standalone.mjs

@@ -1,6 +1,7 @@
 import http from 'node:http';
 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';
 import { createURL } from './node-http/incomingMessageToRequest.mjs';

package/dist/adapters/ws.js

@@ -8,6 +8,7 @@ var parseTRPCMessage = require('../unstable-core-do-not-import/rpc/parseTRPCMess
 var observable = require('../observable/observable.js');
 var unpromise = require('../vendor/unpromise/unpromise.js');
 var tracked = require('../unstable-core-do-not-import/stream/tracked.js');
+require('../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var router = require('../unstable-core-do-not-import/router.js');

package/dist/adapters/ws.mjs

@@ -6,6 +6,7 @@ import { parseTRPCMessage } from '../unstable-core-do-not-import/rpc/parseTRPCMe
 import { isObservable, observableToAsyncIterable } from '../observable/observable.mjs';
 import { Unpromise } from '../vendor/unpromise/unpromise.mjs';
 import { isTrackedEnvelope } from '../unstable-core-do-not-import/stream/tracked.mjs';
+import '../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import { transformTRPCResponse } from '../unstable-core-do-not-import/transformer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { callProcedure } from '../unstable-core-do-not-import/router.mjs';