@trpc/server 10.29.0 → 10.29.1

package/dist/{nodeHTTPRequestHandler-e637755a.js → nodeHTTPRequestHandler-071d36b5.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 require('./index-4a823936.js');
-var resolveHTTPResponse = require('./resolveHTTPResponse-2c307e04.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-1f03fdfd.js');
 var batchStreamFormatter = require('./batchStreamFormatter-93cdcdd4.js');
 var adapters_nodeHttp_contentType_json_index = require('./adapters/node-http/content-type/json/index.js');
 
@@ -33,7 +33,9 @@ async function nodeHTTPRequestHandler(opts) {
             query,
             body: bodyResult.ok ? bodyResult.data : undefined
         };
-        const onHead = (head)=>{
+        let isStream = false;
+        let formatter;
+        const unstable_onHead = (head, isStreaming)=>{
             if ('status' in head && (!opts.res.statusCode || opts.res.statusCode === 200)) {
                 opts.res.statusCode = head.status;
             }
@@ -43,25 +45,26 @@ async function nodeHTTPRequestHandler(opts) {
                 }
                 opts.res.setHeader(key, value);
             }
+            if (isStreaming) {
+                opts.res.setHeader('Transfer-Encoding', 'chunked');
+                const vary = opts.res.getHeader('Vary');
+                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
+                isStream = true;
+                formatter = batchStreamFormatter.getBatchStreamFormatter();
+                opts.res.flushHeaders();
+            }
         };
-        const formatter = batchStreamFormatter.getBatchStreamFormatter();
-        let isStream = false;
-        const onChunk = ([index, string])=>{
+        const unstable_onChunk = ([index, string])=>{
             if (index === -1) {
                 /**
          * Full response, no streaming. This can happen
          * - if the response is an error
          * - if response is empty (HEAD request)
          */ opts.res.end(string);
-                return;
-            }
-            if (!isStream) {
-                opts.res.setHeader('Transfer-Encoding', 'chunked');
-                const vary = opts.res.getHeader('Vary');
-                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
-                isStream = true;
+            } else {
+                opts.res.write(formatter(index, string));
+                opts.res.flush?.();
             }
-            opts.res.write(formatter(index, string));
         };
         await resolveHTTPResponse.resolveHTTPResponse({
             batching: opts.batching,
@@ -79,14 +82,13 @@ async function nodeHTTPRequestHandler(opts) {
                 });
             },
             contentTypeHandler,
-            onHead,
-            onChunk
+            unstable_onHead,
+            unstable_onChunk
         });
-        if (!isStream) {
-            return opts.res;
+        if (isStream) {
+            opts.res.write(formatter.end());
+            opts.res.end();
         }
-        opts.res.write(formatter.end());
-        opts.res.end();
         return opts.res;
     });
 }

package/dist/{nodeHTTPRequestHandler-53b9fc2d.js → nodeHTTPRequestHandler-51d58a23.js}

@@ -1,5 +1,5 @@
 import './index-ca9a128e.js';
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-2bdf2cd7.js';
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-e0047ea2.js';
 import { g as getBatchStreamFormatter } from './batchStreamFormatter-2c1405a1.js';
 import { nodeHTTPJSONContentTypeHandler } from './adapters/node-http/content-type/json/index.js';
 
@@ -35,7 +35,9 @@ async function nodeHTTPRequestHandler(opts) {
             query,
             body: bodyResult.ok ? bodyResult.data : undefined,
         };
-        const onHead = (head) => {
+        let isStream = false;
+        let formatter;
+        const unstable_onHead = (head, isStreaming) => {
             if ('status' in head &&
                 (!opts.res.statusCode || opts.res.statusCode === 200)) {
                 opts.res.statusCode = head.status;
@@ -47,10 +49,16 @@ async function nodeHTTPRequestHandler(opts) {
                 }
                 opts.res.setHeader(key, value);
             }
+            if (isStreaming) {
+                opts.res.setHeader('Transfer-Encoding', 'chunked');
+                const vary = opts.res.getHeader('Vary');
+                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
+                isStream = true;
+                formatter = getBatchStreamFormatter();
+                opts.res.flushHeaders();
+            }
         };
-        const formatter = getBatchStreamFormatter();
-        let isStream = false;
-        const onChunk = ([index, string]) => {
+        const unstable_onChunk = ([index, string]) => {
             if (index === -1) {
                 /**
                  * Full response, no streaming. This can happen
@@ -58,15 +66,11 @@ async function nodeHTTPRequestHandler(opts) {
                  * - if response is empty (HEAD request)
                  */
                 opts.res.end(string);
-                return;
             }
-            if (!isStream) {
-                opts.res.setHeader('Transfer-Encoding', 'chunked');
-                const vary = opts.res.getHeader('Vary');
-                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
-                isStream = true;
+            else {
+                opts.res.write(formatter(index, string));
+                opts.res.flush?.();
             }
-            opts.res.write(formatter(index, string));
         };
         await resolveHTTPResponse({
             batching: opts.batching,
@@ -84,14 +88,13 @@ async function nodeHTTPRequestHandler(opts) {
                 });
             },
             contentTypeHandler,
-            onHead,
-            onChunk,
+            unstable_onHead,
+            unstable_onChunk,
         });
-        if (!isStream) {
-            return opts.res;
+        if (isStream) {
+            opts.res.write(formatter.end());
+            opts.res.end();
         }
-        opts.res.write(formatter.end());
-        opts.res.end();
         return opts.res;
     });
 }

package/dist/{nodeHTTPRequestHandler-bdad2781.mjs → nodeHTTPRequestHandler-bb12529f.mjs}

@@ -1,5 +1,5 @@
 import './index-044a193b.mjs';
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-a9be3d96.mjs';
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-dd3677b3.mjs';
 import { g as getBatchStreamFormatter } from './batchStreamFormatter-fc1ffb26.mjs';
 import { nodeHTTPJSONContentTypeHandler } from './adapters/node-http/content-type/json/index.mjs';
 
@@ -31,7 +31,9 @@ async function nodeHTTPRequestHandler(opts) {
             query,
             body: bodyResult.ok ? bodyResult.data : undefined
         };
-        const onHead = (head)=>{
+        let isStream = false;
+        let formatter;
+        const unstable_onHead = (head, isStreaming)=>{
             if ('status' in head && (!opts.res.statusCode || opts.res.statusCode === 200)) {
                 opts.res.statusCode = head.status;
             }
@@ -41,25 +43,26 @@ async function nodeHTTPRequestHandler(opts) {
                 }
                 opts.res.setHeader(key, value);
             }
+            if (isStreaming) {
+                opts.res.setHeader('Transfer-Encoding', 'chunked');
+                const vary = opts.res.getHeader('Vary');
+                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
+                isStream = true;
+                formatter = getBatchStreamFormatter();
+                opts.res.flushHeaders();
+            }
         };
-        const formatter = getBatchStreamFormatter();
-        let isStream = false;
-        const onChunk = ([index, string])=>{
+        const unstable_onChunk = ([index, string])=>{
             if (index === -1) {
                 /**
          * Full response, no streaming. This can happen
          * - if the response is an error
          * - if response is empty (HEAD request)
          */ opts.res.end(string);
-                return;
-            }
-            if (!isStream) {
-                opts.res.setHeader('Transfer-Encoding', 'chunked');
-                const vary = opts.res.getHeader('Vary');
-                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
-                isStream = true;
+            } else {
+                opts.res.write(formatter(index, string));
+                opts.res.flush?.();
             }
-            opts.res.write(formatter(index, string));
         };
         await resolveHTTPResponse({
             batching: opts.batching,
@@ -77,14 +80,13 @@ async function nodeHTTPRequestHandler(opts) {
                 });
             },
             contentTypeHandler,
-            onHead,
-            onChunk
+            unstable_onHead,
+            unstable_onChunk
         });
-        if (!isStream) {
-            return opts.res;
+        if (isStream) {
+            opts.res.write(formatter.end());
+            opts.res.end();
         }
-        opts.res.write(formatter.end());
-        opts.res.end();
         return opts.res;
     });
 }

package/dist/{resolveHTTPResponse-2c307e04.js → resolveHTTPResponse-1f03fdfd.js}

@@ -110,14 +110,14 @@ function caughtErrorToData(cause, errorOpts) {
 }
 // implementation
 async function resolveHTTPResponse(opts) {
-    const { router , req , onHead , onChunk  } = opts;
+    const { router , req , unstable_onHead , unstable_onChunk  } = opts;
     if (req.method === 'HEAD') {
         // can be used for lambda warmup
         const headResponse = {
             status: 204
         };
-        onHead?.(headResponse);
-        onChunk?.([
+        unstable_onHead?.(headResponse, false);
+        unstable_onChunk?.([
             -1,
             ''
         ]);
@@ -129,7 +129,7 @@ async function resolveHTTPResponse(opts) {
     let ctx = undefined;
     let paths;
     const isBatchCall = !!req.query.get('batch');
-    const isStreamCall = isBatchCall && onHead && onChunk && req.headers['trpc-batch-mode'] === 'stream';
+    const isStreamCall = isBatchCall && unstable_onHead && unstable_onChunk && req.headers['trpc-batch-mode'] === 'stream';
     try {
         if (opts.error) {
             throw opts.error;
@@ -184,12 +184,12 @@ async function resolveHTTPResponse(opts) {
                 untransformedJSON,
                 errors
             });
-            onHead?.(headResponse1);
+            unstable_onHead?.(headResponse1, false);
             // return body stuff
             const result = isBatchCall ? untransformedJSON : untransformedJSON[0]; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- `untransformedJSON` should be the length of `paths` which should be at least 1 otherwise there wouldn't be a request at all
             const transformedJSON = transformTRPCResponse.transformTRPCResponse(router._def._config, result);
             const body = JSON.stringify(transformedJSON);
-            onChunk?.([
+            unstable_onChunk?.([
                 -1,
                 body
             ]);
@@ -210,7 +210,7 @@ async function resolveHTTPResponse(opts) {
             type,
             responseMeta: opts.responseMeta
         });
-        onHead(headResponse2);
+        unstable_onHead(headResponse2, true);
         const indexedPromises = new Map(promises.map((promise, index)=>[
                 index,
                 promise.then((r)=>[
@@ -224,7 +224,7 @@ async function resolveHTTPResponse(opts) {
             try {
                 const transformedJSON1 = transformTRPCResponse.transformTRPCResponse(router._def._config, untransformedJSON1);
                 const body1 = JSON.stringify(transformedJSON1);
-                onChunk([
+                unstable_onChunk([
                     index,
                     body1
                 ]);
@@ -238,7 +238,7 @@ async function resolveHTTPResponse(opts) {
                     path,
                     input
                 });
-                onChunk([
+                unstable_onChunk([
                     index,
                     body2
                 ]);
@@ -268,8 +268,8 @@ async function resolveHTTPResponse(opts) {
                 error
             ]
         });
-        onHead?.(headResponse3);
-        onChunk?.([
+        unstable_onHead?.(headResponse3, false);
+        unstable_onChunk?.([
             -1,
             body3
         ]);

package/dist/{resolveHTTPResponse-a9be3d96.mjs → resolveHTTPResponse-dd3677b3.mjs}

@@ -108,14 +108,14 @@ function caughtErrorToData(cause, errorOpts) {
 }
 // implementation
 async function resolveHTTPResponse(opts) {
-    const { router , req , onHead , onChunk  } = opts;
+    const { router , req , unstable_onHead , unstable_onChunk  } = opts;
     if (req.method === 'HEAD') {
         // can be used for lambda warmup
         const headResponse = {
             status: 204
         };
-        onHead?.(headResponse);
-        onChunk?.([
+        unstable_onHead?.(headResponse, false);
+        unstable_onChunk?.([
             -1,
             ''
         ]);
@@ -127,7 +127,7 @@ async function resolveHTTPResponse(opts) {
     let ctx = undefined;
     let paths;
     const isBatchCall = !!req.query.get('batch');
-    const isStreamCall = isBatchCall && onHead && onChunk && req.headers['trpc-batch-mode'] === 'stream';
+    const isStreamCall = isBatchCall && unstable_onHead && unstable_onChunk && req.headers['trpc-batch-mode'] === 'stream';
     try {
         if (opts.error) {
             throw opts.error;
@@ -182,12 +182,12 @@ async function resolveHTTPResponse(opts) {
                 untransformedJSON,
                 errors
             });
-            onHead?.(headResponse1);
+            unstable_onHead?.(headResponse1, false);
             // return body stuff
             const result = isBatchCall ? untransformedJSON : untransformedJSON[0]; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- `untransformedJSON` should be the length of `paths` which should be at least 1 otherwise there wouldn't be a request at all
             const transformedJSON = transformTRPCResponse(router._def._config, result);
             const body = JSON.stringify(transformedJSON);
-            onChunk?.([
+            unstable_onChunk?.([
                 -1,
                 body
             ]);
@@ -208,7 +208,7 @@ async function resolveHTTPResponse(opts) {
             type,
             responseMeta: opts.responseMeta
         });
-        onHead(headResponse2);
+        unstable_onHead(headResponse2, true);
         const indexedPromises = new Map(promises.map((promise, index)=>[
                 index,
                 promise.then((r)=>[
@@ -222,7 +222,7 @@ async function resolveHTTPResponse(opts) {
             try {
                 const transformedJSON1 = transformTRPCResponse(router._def._config, untransformedJSON1);
                 const body1 = JSON.stringify(transformedJSON1);
-                onChunk([
+                unstable_onChunk([
                     index,
                     body1
                 ]);
@@ -236,7 +236,7 @@ async function resolveHTTPResponse(opts) {
                     path,
                     input
                 });
-                onChunk([
+                unstable_onChunk([
                     index,
                     body2
                 ]);
@@ -266,8 +266,8 @@ async function resolveHTTPResponse(opts) {
                 error
             ]
         });
-        onHead?.(headResponse3);
-        onChunk?.([
+        unstable_onHead?.(headResponse3, false);
+        unstable_onChunk?.([
             -1,
             body3
         ]);

package/dist/{resolveHTTPResponse-2bdf2cd7.js → resolveHTTPResponse-e0047ea2.js}

@@ -104,14 +104,14 @@ function caughtErrorToData(cause, errorOpts) {
 }
 // implementation
 async function resolveHTTPResponse(opts) {
-    const { router, req, onHead, onChunk } = opts;
+    const { router, req, unstable_onHead, unstable_onChunk } = opts;
     if (req.method === 'HEAD') {
         // can be used for lambda warmup
         const headResponse = {
             status: 204,
         };
-        onHead?.(headResponse);
-        onChunk?.([-1, '']);
+        unstable_onHead?.(headResponse, false);
+        unstable_onChunk?.([-1, '']);
         return headResponse;
     }
     const contentTypeHandler = opts.contentTypeHandler ?? fallbackContentTypeHandler;
@@ -121,8 +121,8 @@ async function resolveHTTPResponse(opts) {
     let paths;
     const isBatchCall = !!req.query.get('batch');
     const isStreamCall = isBatchCall &&
-        onHead &&
-        onChunk &&
+        unstable_onHead &&
+        unstable_onChunk &&
         req.headers['trpc-batch-mode'] === 'stream';
     try {
         if (opts.error) {
@@ -170,12 +170,12 @@ async function resolveHTTPResponse(opts) {
                 untransformedJSON,
                 errors,
             });
-            onHead?.(headResponse);
+            unstable_onHead?.(headResponse, false);
             // return body stuff
             const result = isBatchCall ? untransformedJSON : untransformedJSON[0]; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- `untransformedJSON` should be the length of `paths` which should be at least 1 otherwise there wouldn't be a request at all
             const transformedJSON = transformTRPCResponse(router._def._config, result);
             const body = JSON.stringify(transformedJSON);
-            onChunk?.([-1, body]);
+            unstable_onChunk?.([-1, body]);
             return {
                 status: headResponse.status,
                 headers: headResponse.headers,
@@ -194,7 +194,7 @@ async function resolveHTTPResponse(opts) {
             type,
             responseMeta: opts.responseMeta,
         });
-        onHead(headResponse);
+        unstable_onHead(headResponse, true);
         const indexedPromises = new Map(promises.map((promise, index) => [
             index,
             promise.then((r) => [index, r]),
@@ -205,7 +205,7 @@ async function resolveHTTPResponse(opts) {
             try {
                 const transformedJSON = transformTRPCResponse(router._def._config, untransformedJSON);
                 const body = JSON.stringify(transformedJSON);
-                onChunk([index, body]);
+                unstable_onChunk([index, body]);
             }
             catch (cause) {
                 const path = paths[index];
@@ -217,7 +217,7 @@ async function resolveHTTPResponse(opts) {
                     path,
                     input,
                 });
-                onChunk([index, body]);
+                unstable_onChunk([index, body]);
             }
         }
         return;
@@ -243,8 +243,8 @@ async function resolveHTTPResponse(opts) {
             untransformedJSON,
             errors: [error],
         });
-        onHead?.(headResponse);
-        onChunk?.([-1, body]);
+        unstable_onHead?.(headResponse, false);
+        unstable_onChunk?.([-1, body]);
         return {
             status: headResponse.status,
             headers: headResponse.headers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.29.0",
+  "version": "10.29.1",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -173,5 +173,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "49b0a55b74b57bbf7451dad5976d315d9fb7785c"
+  "gitHead": "3dbc7b7e9fff233f89627c21450ba89754bc3e46"
 }

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -52,7 +52,10 @@ export async function fastifyRequestHandler<
   let resolve: (value: FastifyReply) => void;
   const promise = new Promise<FastifyReply>((r) => (resolve = r));
 
-  const onHead = (head: HTTPResponse) => {
+  let isStream = false;
+  let stream: Readable;
+  let formatter: ReturnType<typeof getBatchStreamFormatter>;
+  const unstable_onHead = (head: HTTPResponse, isStreaming: boolean) => {
     if (!opts.res.statusCode || opts.res.statusCode === 200) {
       opts.res.statusCode = head.status;
     }
@@ -63,18 +66,7 @@ export async function fastifyRequestHandler<
       }
       void opts.res.header(key, value);
     }
-  };
-
-  let isStream = false;
-  let stream: Readable;
-  const formatter = getBatchStreamFormatter();
-  const onChunk = ([index, string]: ResponseChunk) => {
-    if (index === -1) {
-      // full response, no streaming
-      resolve(opts.res.send(string));
-      return;
-    }
-    if (!isStream) {
+    if (isStreaming) {
       void opts.res.header('Transfer-Encoding', 'chunked');
       void opts.res.header(
         'Vary',
@@ -86,8 +78,17 @@ export async function fastifyRequestHandler<
       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]: ResponseChunk) => {
+    if (index === -1) {
+      // full response, no streaming
+      resolve(opts.res.send(string));
+    } else {
+      stream.push(formatter!(index, string));
     }
-    stream.push(formatter(index, string));
   };
 
   resolveHTTPResponse({
@@ -100,12 +101,12 @@ export async function fastifyRequestHandler<
     onError(o) {
       opts?.onError?.({ ...o, req: opts.req });
     },
-    onHead,
-    onChunk,
+    unstable_onHead,
+    unstable_onChunk,
   })
     .then(() => {
       if (isStream) {
-        stream.push(formatter.end());
+        stream.push(formatter!.end());
         stream.push(null); // https://github.com/fastify/fastify/issues/805#issuecomment-369172154
       }
     })

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -34,7 +34,11 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
   const promise = new Promise<Response>((r) => (resolve = r));
   let status = 200;
 
-  const onHead = (head: HTTPResponse) => {
+  let isStream = false;
+  let controller: ReadableStreamController<any>;
+  let encoder: TextEncoder;
+  let formatter: ReturnType<typeof getBatchStreamFormatter>;
+  const unstable_onHead = (head: HTTPResponse, isStreaming: boolean) => {
     for (const [key, value] of Object.entries(head.headers ?? {})) {
       /* istanbul ignore if -- @preserve */
       if (typeof value === 'undefined') {
@@ -49,23 +53,7 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
       }
     }
     status = head.status;
-  };
-
-  let isStream = false;
-  let controller: ReadableStreamController<any>;
-  let encoder: TextEncoder;
-  const formatter = getBatchStreamFormatter();
-  const onChunk = ([index, string]: ResponseChunk) => {
-    if (index === -1) {
-      // full response, no streaming
-      const response = new Response(string || null, {
-        status,
-        headers: resHeaders,
-      });
-      resolve(response);
-      return;
-    }
-    if (!isStream) {
+    if (isStreaming) {
       resHeaders.set('Transfer-Encoding', 'chunked');
       resHeaders.append('Vary', 'trpc-batch-mode');
       const stream = new ReadableStream({
@@ -79,9 +67,22 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
       });
       resolve(response);
       encoder = new TextEncoder();
+      formatter = getBatchStreamFormatter();
       isStream = true;
     }
-    controller.enqueue(encoder.encode(formatter(index, string)));
+  };
+
+  const unstable_onChunk = ([index, string]: ResponseChunk) => {
+    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)));
+    }
   };
 
   resolveHTTPResponse({
@@ -94,12 +95,12 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
     onError(o) {
       opts?.onError?.({ ...o, req: opts.req });
     },
-    onHead,
-    onChunk,
+    unstable_onHead,
+    unstable_onChunk,
   })
     .then(() => {
       if (isStream) {
-        controller.enqueue(encoder.encode(formatter.end()));
+        controller.enqueue(encoder.encode(formatter!.end()));
         controller.close();
       }
     })