@trpc/server 11.0.0-alpha-tmp-app-router-example.388 → 11.0.0-alpha-tmp-issues-5851-take-two.448

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

@@ -1,13 +1,15 @@
 'use strict';
 
 var createProxy = require('./unstable-core-do-not-import/createProxy.js');
-var TRPCError = require('./unstable-core-do-not-import/error/TRPCError.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 parseConnectionParams = require('./unstable-core-do-not-import/http/parseConnectionParams.js');
 var resolveResponse = require('./unstable-core-do-not-import/http/resolveResponse.js');
 var toURL = require('./unstable-core-do-not-import/http/toURL.js');
 var initTRPC = require('./unstable-core-do-not-import/initTRPC.js');
@@ -19,25 +21,29 @@ var rootConfig = require('./unstable-core-do-not-import/rootConfig.js');
 var router = require('./unstable-core-do-not-import/router.js');
 var codes = require('./unstable-core-do-not-import/rpc/codes.js');
 var parseTRPCMessage = require('./unstable-core-do-not-import/rpc/parseTRPCMessage.js');
+var jsonl = require('./unstable-core-do-not-import/stream/jsonl.js');
+var sse = require('./unstable-core-do-not-import/stream/sse.js');
 var transformer = require('./unstable-core-do-not-import/transformer.js');
 var types = require('./unstable-core-do-not-import/types.js');
 var utils = require('./unstable-core-do-not-import/utils.js');
-var stream = require('./unstable-core-do-not-import/stream/stream.js');
 
 
 
 exports.createFlatProxy = createProxy.createFlatProxy;
 exports.createRecursiveProxy = createProxy.createRecursiveProxy;
+exports.defaultFormatter = formatter.defaultFormatter;
+exports.getErrorShape = getErrorShape.getErrorShape;
 exports.TRPCError = TRPCError.TRPCError;
 exports.getCauseFromUnknown = TRPCError.getCauseFromUnknown;
 exports.getTRPCErrorFromUnknown = TRPCError.getTRPCErrorFromUnknown;
-exports.defaultFormatter = formatter.defaultFormatter;
-exports.getErrorShape = getErrorShape.getErrorShape;
 exports.getBatchStreamFormatter = batchStreamFormatter.getBatchStreamFormatter;
 exports.getRequestInfo = contentType.getRequestInfo;
 exports.octetInputParser = contentTypeParsers.octetInputParser;
+exports.formDataToObject = formDataToObject.formDataToObject;
 exports.getHTTPStatusCode = getHTTPStatusCode.getHTTPStatusCode;
 exports.getHTTPStatusCodeFromError = getHTTPStatusCode.getHTTPStatusCodeFromError;
+exports.parseConnectionParamsFromString = parseConnectionParams.parseConnectionParamsFromString;
+exports.parseConnectionParamsFromUnknown = parseConnectionParams.parseConnectionParamsFromUnknown;
 exports.resolveResponse = resolveResponse.resolveResponse;
 exports.toURL = toURL.toURL;
 exports.initTRPC = initTRPC.initTRPC;
@@ -57,6 +63,14 @@ exports.mergeRouters = router.mergeRouters;
 exports.TRPC_ERROR_CODES_BY_KEY = codes.TRPC_ERROR_CODES_BY_KEY;
 exports.TRPC_ERROR_CODES_BY_NUMBER = codes.TRPC_ERROR_CODES_BY_NUMBER;
 exports.parseTRPCMessage = parseTRPCMessage.parseTRPCMessage;
+exports.isPromise = jsonl.isPromise;
+exports.jsonlStreamConsumer = jsonl.jsonlStreamConsumer;
+exports.jsonlStreamProducer = jsonl.jsonlStreamProducer;
+exports.isSSEMessageEnvelope = sse.isSSEMessageEnvelope;
+exports.sse = sse.sse;
+exports.sseHeaders = sse.sseHeaders;
+exports.sseStreamConsumer = sse.sseStreamConsumer;
+exports.sseStreamProducer = sse.sseStreamProducer;
 exports.defaultTransformer = transformer.defaultTransformer;
 exports.getDataTransformer = transformer.getDataTransformer;
 exports.transformResult = transformer.transformResult;
@@ -67,7 +81,5 @@ exports.isFunction = utils.isFunction;
 exports.isObject = utils.isObject;
 exports.mergeWithoutOverrides = utils.mergeWithoutOverrides;
 exports.omitPrototype = utils.omitPrototype;
+exports.run = utils.run;
 exports.unsetMarker = utils.unsetMarker;
-exports.isPromise = stream.isPromise;
-exports.jsonlStreamConsumer = stream.jsonlStreamConsumer;
-exports.jsonlStreamProducer = stream.jsonlStreamProducer;

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

@@ -1,11 +1,13 @@
 export { createFlatProxy, createRecursiveProxy } from './unstable-core-do-not-import/createProxy.mjs';
-export { TRPCError, getCauseFromUnknown, getTRPCErrorFromUnknown } from './unstable-core-do-not-import/error/TRPCError.mjs';
 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 { getHTTPStatusCode, getHTTPStatusCodeFromError } from './unstable-core-do-not-import/http/getHTTPStatusCode.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 { toURL } from './unstable-core-do-not-import/http/toURL.mjs';
 export { initTRPC } from './unstable-core-do-not-import/initTRPC.mjs';
@@ -17,7 +19,8 @@ export { isServerDefault } from './unstable-core-do-not-import/rootConfig.mjs';
 export { callProcedure, createCallerFactory, createRouterFactory, mergeRouters } from './unstable-core-do-not-import/router.mjs';
 export { TRPC_ERROR_CODES_BY_KEY, TRPC_ERROR_CODES_BY_NUMBER } from './unstable-core-do-not-import/rpc/codes.mjs';
 export { parseTRPCMessage } from './unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
+export { isPromise, jsonlStreamConsumer, jsonlStreamProducer } from './unstable-core-do-not-import/stream/jsonl.mjs';
+export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';
 export { defaultTransformer, getDataTransformer, transformResult, transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
 export { ERROR_SYMBOL } from './unstable-core-do-not-import/types.mjs';
-export { isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, omitPrototype, unsetMarker } from './unstable-core-do-not-import/utils.mjs';
-export { isPromise, jsonlStreamConsumer, jsonlStreamProducer } from './unstable-core-do-not-import/stream/stream.mjs';
+export { isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, omitPrototype, run, unsetMarker } from './unstable-core-do-not-import/utils.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-alpha-tmp-app-router-example.388+2b04d6593",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.448+7e3e84d25",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -117,7 +117,7 @@
   },
   "devDependencies": {
     "@fastify/websocket": "^10.0.1",
-    "@tanstack/react-query": "^5.45.0",
+    "@tanstack/react-query": "^5.49.2",
     "@types/aws-lambda": "^8.10.137",
     "@types/express": "^4.17.17",
     "@types/hash-sum": "^1.0.0",
@@ -137,11 +137,11 @@
     "react-dom": "^18.3.1",
     "rollup": "^4.9.5",
     "superjson": "^1.12.4",
-    "superstruct": "^1.0.0",
+    "superstruct": "^2.0.0",
     "tslib": "^2.5.0",
     "tsx": "^4.0.0",
-    "typescript": "^5.4.0",
-    "valibot": "^0.31.0",
+    "typescript": "^5.5.0",
+    "valibot": "^0.35.0",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
     "zod": "^3.0.0"
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "2b04d659340f9d18d0a8138a09da7f9c54985787"
+  "gitHead": "7e3e84d25c9561871d468d3cf55b7604bed8203e"
 }

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

@@ -17,5 +17,10 @@ export type {
   TRPCRequestInfo,
 } from '../../unstable-core-do-not-import';
 
-export { getBatchStreamFormatter } from '../../unstable-core-do-not-import';
-export { octetInputParser, toURL } from '../../unstable-core-do-not-import';
+export {
+  getBatchStreamFormatter,
+  octetInputParser,
+  parseConnectionParamsFromUnknown,
+  parseConnectionParamsFromString,
+  toURL,
+} from '../../unstable-core-do-not-import';

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

@@ -37,6 +37,7 @@ export {
   type QueryProcedure as TRPCQueryProcedure,
   type SubscriptionProcedure as TRPCSubscriptionProcedure,
   type TRPCBuilder,
+  sse,
 } from '../../unstable-core-do-not-import';
 
 export type {

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

@@ -18,6 +18,7 @@ export type {
   TRPCSuccessResponse,
   TRPC_ERROR_CODE_KEY,
   TRPC_ERROR_CODE_NUMBER,
+  TRPCConnectionParamsMessage,
 } from '../../unstable-core-do-not-import';
 export {
   TRPC_ERROR_CODES_BY_KEY,

package/src/adapters/aws-lambda/getPlanner.ts

@@ -40,6 +40,19 @@ interface Processor<TEvent extends LambdaEvent> {
   toResult: (response: Response) => Promise<inferAPIGWReturn<TEvent>>;
 }
 
+function getHeadersAndCookiesFromResponse(response: Response) {
+  const headers = Object.fromEntries(response.headers.entries());
+
+  const cookies: string[] = response.headers
+    .getSetCookie()
+    .flatMap((value) => value.split(','))
+    .map((cookie) => cookie.trim());
+
+  delete headers['set-cookie'];
+
+  return { headers, cookies };
+}
+
 const v1Processor: Processor<APIGatewayProxyEvent> = {
   // same as getPath above
   getTRPCPath: (event) => {
@@ -98,10 +111,13 @@ const v1Processor: Processor<APIGatewayProxyEvent> = {
   },
   getMethod: (event) => event.httpMethod,
   toResult: async (response) => {
+    const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
+
     const result: APIGatewayProxyResult = {
+      ...(cookies.length && { multiValueHeaders: { 'set-cookie': cookies } }),
       statusCode: response.status,
       body: await response.text(),
-      headers: Object.fromEntries(response.headers.entries()),
+      headers,
     };
 
     return result;
@@ -142,10 +158,13 @@ const v2Processor: Processor<APIGatewayProxyEventV2> = {
   },
   getMethod: (event) => event.requestContext.http.method,
   toResult: async (response) => {
+    const { headers, cookies } = getHeadersAndCookiesFromResponse(response);
+
     const result: APIGatewayProxyStructuredResultV2 = {
+      cookies,
       statusCode: response.status,
       body: await response.text(),
-      headers: Object.fromEntries(response.headers.entries()),
+      headers,
     };
 
     return result;

package/src/adapters/next-app-dir/nextAppDirCaller.ts

@@ -1,5 +1,7 @@
 import type { CreateContextCallback } from '../../@trpc/server';
 import { getTRPCErrorFromUnknown, TRPCError } from '../../@trpc/server';
+// eslint-disable-next-line no-restricted-imports
+import { formDataToObject } from '../../unstable-core-do-not-import';
 // FIXME: fix lint rule, this is ok
 // eslint-disable-next-line no-restricted-imports
 import type { ErrorHandlerOptions } from '../../unstable-core-do-not-import/procedure';
@@ -12,7 +14,6 @@ import type {
   MaybePromise,
   Simplify,
 } from '../../unstable-core-do-not-import/types';
-import { formDataToObject } from './formDataToObject';
 import { TRPCRedirectError } from './redirect';
 import { rethrowNextErrors } from './rethrowNextErrors';
 

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

@@ -68,8 +68,9 @@ export function incomingMessageToRequest(
   const ac = new AbortController();
   const headers = new Headers(req.headers as any);
   const url = `http://${headers.get('host')}${req.url}`;
-
-  req.once('aborted', () => ac.abort());
+  req.once('aborted', () => {
+    ac.abort();
+  });
 
   const init: RequestInit = {
     headers,

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

@@ -10,7 +10,6 @@
 
 // @trpc/server
 
-import { Readable } from 'node:stream';
 import { getTRPCErrorFromUnknown, type AnyRouter } from '../../@trpc/server';
 import type { ResolveHTTPRequestOptionsContextFn } from '../../@trpc/server/http';
 import { resolveResponse } from '../../@trpc/server/http';
@@ -56,17 +55,43 @@ export async function nodeHTTPRequestHandler<
       },
     });
 
-    if (opts.res.statusCode === 200) {
+    const { res } = opts;
+    if (res.statusCode === 200) {
       // if the status code is set, we assume that it's been manually overridden
-      opts.res.statusCode = response.status;
+      res.statusCode = response.status;
     }
     for (const [key, value] of response.headers) {
-      opts.res.setHeader(key, value);
+      res.setHeader(key, value);
     }
     if (response.body) {
-      Readable.fromWeb(response.body as any).pipe(opts.res);
-    } else {
-      opts.res.end();
+      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);
+
+      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);
+          });
+        }
+        // IMPORTANT - flush the response buffer, otherwise the client will not receive the data until `.end()`
+        res.flush?.();
+      }
+      req.signal.removeEventListener('abort', onAbort);
     }
+    res.end();
   });
 }