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

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

@@ -15,11 +15,11 @@ export * from './unstable-core-do-not-import/createProxy';
 export * from './unstable-core-do-not-import/error/formatter';
 export * from './unstable-core-do-not-import/error/getErrorShape';
 export * from './unstable-core-do-not-import/error/TRPCError';
-export * from './unstable-core-do-not-import/http/batchStreamFormatter';
 export * from './unstable-core-do-not-import/http/contentType';
 export * from './unstable-core-do-not-import/http/contentTypeParsers';
 export * from './unstable-core-do-not-import/http/formDataToObject';
 export * from './unstable-core-do-not-import/http/getHTTPStatusCode';
+export * from './unstable-core-do-not-import/http/isAbortError';
 export * from './unstable-core-do-not-import/http/parseConnectionParams';
 export * from './unstable-core-do-not-import/http/resolveResponse';
 export * from './unstable-core-do-not-import/http/types';
@@ -32,8 +32,8 @@ export * from './unstable-core-do-not-import/rootConfig';
 export * from './unstable-core-do-not-import/router';
 export * from './unstable-core-do-not-import/rpc';
 export * from './unstable-core-do-not-import/stream/jsonl';
-export * from './unstable-core-do-not-import/stream/sse';
 export * from './unstable-core-do-not-import/stream/sse.types';
+export * from './unstable-core-do-not-import/stream/sse';
 export * from './unstable-core-do-not-import/stream/tracked';
 export * from './unstable-core-do-not-import/stream/utils/createDeferred';
 export * from './unstable-core-do-not-import/transformer';

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

@@ -1 +1 @@
-{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,0CAA0C,CAAC;AACzD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}
+{"version":3,"file":"unstable-core-do-not-import.d.ts","sourceRoot":"","sources":["../src/unstable-core-do-not-import.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,cAAc,mDAAmD,CAAC;AAClE,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uDAAuD,CAAC;AACtE,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,iDAAiD,CAAC;AAChE,cAAc,0DAA0D,CAAC;AACzE,cAAc,oDAAoD,CAAC;AACnE,cAAc,0CAA0C,CAAC;AACzD,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC"}

package/dist/unstable-core-do-not-import.js

@@ -4,11 +4,11 @@ var createProxy = require('./unstable-core-do-not-import/createProxy.js');
 var formatter = require('./unstable-core-do-not-import/error/formatter.js');
 var getErrorShape = require('./unstable-core-do-not-import/error/getErrorShape.js');
 var TRPCError = require('./unstable-core-do-not-import/error/TRPCError.js');
-var batchStreamFormatter = require('./unstable-core-do-not-import/http/batchStreamFormatter.js');
 var contentType = require('./unstable-core-do-not-import/http/contentType.js');
 var contentTypeParsers = require('./unstable-core-do-not-import/http/contentTypeParsers.js');
 var formDataToObject = require('./unstable-core-do-not-import/http/formDataToObject.js');
 var getHTTPStatusCode = require('./unstable-core-do-not-import/http/getHTTPStatusCode.js');
+var isAbortError = require('./unstable-core-do-not-import/http/isAbortError.js');
 var parseConnectionParams = require('./unstable-core-do-not-import/http/parseConnectionParams.js');
 var resolveResponse = require('./unstable-core-do-not-import/http/resolveResponse.js');
 var initTRPC = require('./unstable-core-do-not-import/initTRPC.js');
@@ -36,7 +36,6 @@ exports.getErrorShape = getErrorShape.getErrorShape;
 exports.TRPCError = TRPCError.TRPCError;
 exports.getCauseFromUnknown = TRPCError.getCauseFromUnknown;
 exports.getTRPCErrorFromUnknown = TRPCError.getTRPCErrorFromUnknown;
-exports.getBatchStreamFormatter = batchStreamFormatter.getBatchStreamFormatter;
 exports.getRequestInfo = contentType.getRequestInfo;
 exports.octetInputParser = contentTypeParsers.octetInputParser;
 exports.formDataToObject = formDataToObject.formDataToObject;
@@ -46,6 +45,7 @@ exports.getHTTPStatusCode = getHTTPStatusCode.getHTTPStatusCode;
 exports.getHTTPStatusCodeFromError = getHTTPStatusCode.getHTTPStatusCodeFromError;
 exports.getStatusCodeFromKey = getHTTPStatusCode.getStatusCodeFromKey;
 exports.getStatusKeyFromCode = getHTTPStatusCode.getStatusKeyFromCode;
+exports.isAbortError = isAbortError.isAbortError;
 exports.parseConnectionParamsFromString = parseConnectionParams.parseConnectionParamsFromString;
 exports.parseConnectionParamsFromUnknown = parseConnectionParams.parseConnectionParamsFromUnknown;
 exports.resolveResponse = resolveResponse.resolveResponse;

package/dist/unstable-core-do-not-import.mjs

@@ -2,11 +2,11 @@ export { createFlatProxy, createRecursiveProxy } from './unstable-core-do-not-im
 export { defaultFormatter } from './unstable-core-do-not-import/error/formatter.mjs';
 export { getErrorShape } from './unstable-core-do-not-import/error/getErrorShape.mjs';
 export { TRPCError, getCauseFromUnknown, getTRPCErrorFromUnknown } from './unstable-core-do-not-import/error/TRPCError.mjs';
-export { getBatchStreamFormatter } from './unstable-core-do-not-import/http/batchStreamFormatter.mjs';
 export { getRequestInfo } from './unstable-core-do-not-import/http/contentType.mjs';
 export { octetInputParser } from './unstable-core-do-not-import/http/contentTypeParsers.mjs';
 export { formDataToObject } from './unstable-core-do-not-import/http/formDataToObject.mjs';
 export { HTTP_CODE_TO_JSONRPC2, JSONRPC2_TO_HTTP_CODE, getHTTPStatusCode, getHTTPStatusCodeFromError, getStatusCodeFromKey, getStatusKeyFromCode } from './unstable-core-do-not-import/http/getHTTPStatusCode.mjs';
+export { isAbortError } from './unstable-core-do-not-import/http/isAbortError.mjs';
 export { parseConnectionParamsFromString, parseConnectionParamsFromUnknown } from './unstable-core-do-not-import/http/parseConnectionParams.mjs';
 export { resolveResponse } from './unstable-core-do-not-import/http/resolveResponse.mjs';
 export { initTRPC } from './unstable-core-do-not-import/initTRPC.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.630+73639524c",
+  "version": "11.0.0-rc.632+3df8b21be",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -138,7 +138,7 @@
     "rollup": "^4.24.4",
     "superjson": "^1.12.4",
     "superstruct": "^2.0.0",
-    "tslib": "^2.5.0",
+    "tslib": "^2.8.1",
     "tsx": "^4.0.0",
     "typescript": "^5.6.2",
     "valibot": "^0.42.0",
@@ -156,5 +156,5 @@
     "next": "*",
     "ws": "*"
   },
-  "gitHead": "73639524cd2d8071e4818435a76f7234685ac2af"
+  "gitHead": "3df8b21beb4925cf73194fc776d1a88603a3c420"
 }

package/src/@trpc/server/http.ts

@@ -18,7 +18,6 @@ export type {
 } from '../../unstable-core-do-not-import';
 
 export {
-  getBatchStreamFormatter,
   octetInputParser,
   parseConnectionParamsFromUnknown,
   parseConnectionParamsFromString,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -60,7 +60,7 @@ export async function fastifyRequestHandler<
   if ('body' in opts.req) {
     incomingMessage.body = opts.req.body;
   }
-  const req = incomingMessageToRequest(incomingMessage, {
+  const req = incomingMessageToRequest(incomingMessage, opts.res.raw, {
     maxBodySize: null,
   });
 

package/src/adapters/node-http/incomingMessageToRequest.ts

@@ -118,6 +118,7 @@ function createHeaders(incoming: http.IncomingHttpHeaders): Headers {
  */
 export 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
@@ -128,12 +129,15 @@ export function incomingMessageToRequest(
   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);

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -25,6 +25,7 @@ import type {
   NodeHTTPRequestHandlerOptions,
   NodeHTTPResponse,
 } from './types';
+import { writeResponse } from './writeResponse';
 
 /**
  * @internal
@@ -82,7 +83,7 @@ export async function nodeHTTPRequestHandler<
     });
     return handleViaMiddleware(opts.req, opts.res, (err: unknown) => {
       run(async () => {
-        const req = incomingMessageToRequest(opts.req, {
+        const request = incomingMessageToRequest(opts.req, opts.res, {
           maxBodySize: opts.maxBodySize ?? null,
         });
 
@@ -98,7 +99,7 @@ export async function nodeHTTPRequestHandler<
 
         const response = await resolveResponse({
           ...opts,
-          req,
+          req: request,
           error: err ? getTRPCErrorFromUnknown(err) : null,
           createContext,
           onError(o) {
@@ -109,50 +110,11 @@ export async function nodeHTTPRequestHandler<
           },
         });
 
-        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<void>((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/src/adapters/node-http/writeResponse.ts

@@ -0,0 +1,96 @@
+// eslint-disable-next-line no-restricted-imports
+import { isAbortError } from '../../unstable-core-do-not-import';
+import type { NodeHTTPResponse } from './types';
+
+async function writeResponseBodyChunk(
+  res: NodeHTTPResponse,
+  chunk: Uint8Array,
+) {
+  if (res.write(chunk) === false) {
+    await new Promise<void>((resolve, reject) => {
+      const onError = (err: unknown) => {
+        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
+ */
+
+export async function writeResponseBody(opts: {
+  res: NodeHTTPResponse;
+  signal: AbortSignal;
+  body: NonNullable<Response['body']>;
+}) {
+  const { res } = opts;
+
+  try {
+    const writableStream = new WritableStream({
+      async write(chunk) {
+        await writeResponseBodyChunk(res, chunk);
+        res.flush?.();
+      },
+      abort() {
+        if (!res.headersSent) {
+          res.statusCode = 500;
+        }
+      },
+    });
+
+    await opts.body.pipeTo(writableStream, {
+      signal: opts.signal,
+    });
+  } catch (err) {
+    if (isAbortError(err)) {
+      return;
+    }
+    throw err;
+  }
+}
+/**
+ * @internal
+ */
+
+export async function writeResponse(opts: {
+  request: Request;
+  response: Response;
+  rawResponse: NodeHTTPResponse;
+}) {
+  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();
+  }
+}

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

@@ -0,0 +1,7 @@
+import { isObject } from '../utils';
+
+export function isAbortError(
+  error: unknown,
+): error is DOMException | Error | { name: 'AbortError' } {
+  return isObject(error) && error['name'] === 'AbortError';
+}