@trpc/server 11.0.0-rc.730 → 11.0.0-rc.741

package/dist/adapters/fastify/fastifyRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,KAAK,2BAA2B,EAEjC,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAkCjE"}
+{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAkCjE"}

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

@@ -1,22 +1,9 @@
-import type * as http from 'http';
-export interface UniversalIncomingMessage extends Omit<http.IncomingMessage, 'socket'> {
-    /**
-     * Many adapters will add a `body` property to the incoming message and pre-parse the body
-     */
-    body?: unknown;
-    /**
-     * Socket is not always available in all deployments, so we need to make it optional
-     * @see https://github.com/trpc/trpc/issues/6341
-     * The socket object provided in the request does not fully implement the expected Node.js Socket interface.
-     * @see https://github.com/trpc/trpc/pull/6358
-     */
-    socket?: Partial<http.IncomingMessage['socket']>;
-}
-export declare function createURL(req: UniversalIncomingMessage): URL;
+import type { NodeHTTPRequest, NodeHTTPResponse } from './types';
+export declare function createURL(req: NodeHTTPRequest): 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: UniversalIncomingMessage, res: http.ServerResponse, opts: {
+export declare function incomingMessageToRequest(req: NodeHTTPRequest, res: NodeHTTPResponse, 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,wBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC;IAC5C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;CAClD;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,CAkB5D;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAqCT"}
+{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAiEjE,wBAAgB,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAqBnD;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAqCT"}

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

@@ -55,8 +55,10 @@ function createBody(req, opts) {
 }
 function createURL(req) {
     try {
-        const protocol = req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
-        const host = req.headers.host ?? 'localhost';
+        const protocol = // http2
+        req.headers[':scheme'] && req.headers[':scheme'] === 'https' || // http1
+        req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
+        const host = req.headers.host ?? req.headers[':authority'] ?? 'localhost';
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return new URL(req.url, `${protocol}//${host}`);
     } catch (cause) {
@@ -95,7 +97,7 @@ function createHeaders(incoming) {
         ac.abort();
     };
     res.once('close', onAbort);
-    req.socket?.once?.('end', onAbort);
+    req.socket?.once?.('close', 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

@@ -53,8 +53,10 @@ function createBody(req, opts) {
 }
 function createURL(req) {
     try {
-        const protocol = req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
-        const host = req.headers.host ?? 'localhost';
+        const protocol = // http2
+        req.headers[':scheme'] && req.headers[':scheme'] === 'https' || // http1
+        req.socket && 'encrypted' in req.socket && req.socket.encrypted ? 'https:' : 'http:';
+        const host = req.headers.host ?? req.headers[':authority'] ?? 'localhost';
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return new URL(req.url, `${protocol}//${host}`);
     } catch (cause) {
@@ -93,7 +95,7 @@ function createHeaders(incoming) {
         ac.abort();
     };
     res.once('close', onAbort);
-    req.socket?.once?.('end', onAbort);
+    req.socket?.once?.('close', onAbort);
     // Get host from either regular header or HTTP/2 pseudo-header
     const url = createURL(req);
     const init = {

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

@@ -8,14 +8,24 @@
  * ```
  */
 import type * as http from 'http';
+import type * as http2 from 'http2';
 import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../../@trpc/server';
 import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../@trpc/server/http';
-import type { MaybePromise } from '../../unstable-core-do-not-import';
-export type NodeHTTPRequest = http.IncomingMessage & {
+import type { DistributiveOmit, MaybePromise } from '../../unstable-core-do-not-import';
+export type NodeHTTPRequest = DistributiveOmit<http.IncomingMessage | http2.Http2ServerRequest, 'socket'> & {
+    /**
+     * Many adapters will add a `body` property to the incoming message and pre-parse the body
+     */
     body?: unknown;
-    query?: unknown;
+    /**
+     * Socket is not always available in all deployments, so we need to make it optional
+     * @see https://github.com/trpc/trpc/issues/6341
+     * The socket object provided in the request does not fully implement the expected Node.js Socket interface.
+     * @see https://github.com/trpc/trpc/pull/6358
+     */
+    socket?: Partial<http.IncomingMessage['socket']> | Partial<http2.Http2ServerRequest['socket']>;
 };
-export type NodeHTTPResponse = http.ServerResponse & {
+export type NodeHTTPResponse = DistributiveOmit<http.ServerResponse | http2.Http2ServerResponse, 'write'> & {
     /**
      * Force the partially-compressed response to be flushed to the client.
      *
@@ -25,6 +35,7 @@ export type NodeHTTPResponse = http.ServerResponse & {
      * e.g. Express w/ `compression()`)
      */
     flush?: () => void;
+    write: (chunk: string | Uint8Array) => boolean;
 };
 export type NodeHTTPCreateContextOption<TRouter extends AnyRouter, TRequest, TResponse> = CreateContextCallback<inferRouterContext<TRouter>, NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>>;
 /**
@@ -51,11 +62,15 @@ export type NodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends N
     middleware?: ConnectMiddleware<TRequest, TResponse>;
     maxBodySize?: number;
 };
-export type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = {
+export type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = NodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & {
     req: TRequest;
     res: TResponse;
+    /**
+     * The tRPC path to handle requests for
+     * @example 'post.all'
+     */
     path: string;
-} & NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>;
+};
 export type NodeHTTPCreateContextFnOptions<TRequest, TResponse> = {
     req: TRequest;
     res: TResponse;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG;IACnD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,GAAG;IACnD;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,qBAAqB,CACvB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CACtD,CAAC;AAEF;;GAEG;AACH,KAAK,iBAAiB,CACpB,QAAQ,SAAS,eAAe,GAAG,eAAe,EAClD,SAAS,SAAS,gBAAgB,GAAG,gBAAgB,IACnD,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,KAAK,IAAI,CAAC;AAEtE,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IAC1D;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEJ,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAEzD,MAAM,MAAM,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AACF,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":"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"}

package/dist/adapters/standalone.d.ts

@@ -8,13 +8,29 @@
  * ```
  */
 import http from 'http';
+import type * as http2 from 'http2';
 import { type AnyRouter } from '../@trpc/server';
-import type { NodeHTTPCreateContextFnOptions, NodeHTTPHandlerOptions } from './node-http';
-export type CreateHTTPHandlerOptions<TRouter extends AnyRouter> = NodeHTTPHandlerOptions<TRouter, http.IncomingMessage, http.ServerResponse>;
+import type { NodeHTTPCreateContextFnOptions, NodeHTTPHandlerOptions, NodeHTTPRequest, NodeHTTPResponse } from './node-http';
+type StandaloneHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = NodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & {
+    /**
+     * The base path to handle requests for.
+     * This will be sliced from the beginning of the request path
+     * (Do not miss including the trailing slash)
+     * @default '/'
+     * @example '/trpc/'
+     * @example '/trpc/api/'
+     */
+    basePath?: string;
+};
+export type CreateHTTPHandlerOptions<TRouter extends AnyRouter> = StandaloneHandlerOptions<TRouter, http.IncomingMessage, http.ServerResponse>;
 export type CreateHTTPContextOptions = NodeHTTPCreateContextFnOptions<http.IncomingMessage, http.ServerResponse>;
 /**
  * @internal
  */
 export declare function createHTTPHandler<TRouter extends AnyRouter>(opts: CreateHTTPHandlerOptions<TRouter>): http.RequestListener;
 export declare function createHTTPServer<TRouter extends AnyRouter>(opts: CreateHTTPHandlerOptions<TRouter>): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+export type CreateHTTP2HandlerOptions<TRouter extends AnyRouter> = StandaloneHandlerOptions<TRouter, http2.Http2ServerRequest, http2.Http2ServerResponse>;
+export type CreateHTTP2ContextOptions = NodeHTTPCreateContextFnOptions<http2.Http2ServerRequest, http2.Http2ServerResponse>;
+export declare function createHTTP2Handler(opts: CreateHTTP2HandlerOptions<AnyRouter>): (req: http2.Http2ServerRequest, res: http2.Http2ServerResponse<http2.Http2ServerRequest>) => void;
+export {};
 //# sourceMappingURL=standalone.d.ts.map

package/dist/adapters/standalone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACtC,IAAI,CAAC,eAAe,CAyBtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAGxC"}
+{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAOrB,KAAK,wBAAwB,CAC3B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACzD;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAsCF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACtC,IAAI,CAAC,eAAe,CAEtB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAGxC;AAGD,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,SAAS,IAC7D,wBAAwB,CACtB,OAAO,EACP,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,mBAAmB,CAC1B,CAAC;AAEJ,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,mBAAmB,CAC1B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,yBAAyB,CAAC,SAAS,CAAC,gGA1DvC,IAAI,CA4DzC"}

package/dist/adapters/standalone.js

@@ -8,16 +8,15 @@ require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');
 
-/**
- * @internal
- */ function createHTTPHandler(opts) {
+function createHandler(opts) {
+    const basePath = opts.basePath ?? '/';
+    const sliceLength = basePath.length;
     return (req, res)=>{
         let path = '';
         utils.run(async ()=>{
             const url = incomingMessageToRequest.createURL(req);
-            // get procedure path and remove the leading slash
-            // /procedure -> procedure
-            path = url.pathname.slice(1);
+            // get procedure(s) path and remove the leading slash
+            path = url.pathname.slice(sliceLength);
             await nodeHTTPRequestHandler.nodeHTTPRequestHandler({
                 ...opts,
                 req,
@@ -32,9 +31,18 @@ var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js'
         }));
     };
 }
+/**
+ * @internal
+ */ function createHTTPHandler(opts) {
+    return createHandler(opts);
+}
 function createHTTPServer(opts) {
     return http.createServer(createHTTPHandler(opts));
 }
+function createHTTP2Handler(opts) {
+    return createHandler(opts);
+}
 
+exports.createHTTP2Handler = createHTTP2Handler;
 exports.createHTTPHandler = createHTTPHandler;
 exports.createHTTPServer = createHTTPServer;

package/dist/adapters/standalone.mjs

@@ -6,16 +6,15 @@ import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 import { createURL } from './node-http/incomingMessageToRequest.mjs';
 
-/**
- * @internal
- */ function createHTTPHandler(opts) {
+function createHandler(opts) {
+    const basePath = opts.basePath ?? '/';
+    const sliceLength = basePath.length;
     return (req, res)=>{
         let path = '';
         run(async ()=>{
             const url = createURL(req);
-            // get procedure path and remove the leading slash
-            // /procedure -> procedure
-            path = url.pathname.slice(1);
+            // get procedure(s) path and remove the leading slash
+            path = url.pathname.slice(sliceLength);
             await nodeHTTPRequestHandler({
                 ...opts,
                 req,
@@ -30,8 +29,16 @@ import { createURL } from './node-http/incomingMessageToRequest.mjs';
         }));
     };
 }
+/**
+ * @internal
+ */ function createHTTPHandler(opts) {
+    return createHandler(opts);
+}
 function createHTTPServer(opts) {
     return http.createServer(createHTTPHandler(opts));
 }
+function createHTTP2Handler(opts) {
+    return createHandler(opts);
+}
 
-export { createHTTPHandler, createHTTPServer };
+export { createHTTP2Handler, createHTTPHandler, createHTTPServer };

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAkYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAmYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}

package/dist/adapters/ws.js

@@ -109,7 +109,8 @@ function getWSConnectionHandler(opts) {
                         isBatchCall: false,
                         accept: null,
                         type: 'unknown',
-                        signal: abortController.signal
+                        signal: abortController.signal,
+                        url: null
                     }
                 });
                 return ctx;

package/dist/adapters/ws.mjs

@@ -107,7 +107,8 @@ function getWSConnectionHandler(opts) {
                         isBatchCall: false,
                         accept: null,
                         type: 'unknown',
-                        signal: abortController.signal
+                        signal: abortController.signal,
+                        url: null
                     }
                 });
                 return ctx;

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 194424,
-  "bundleOrigSize": 224713,
-  "bundleReduction": 13.48,
+  "bundleSize": 194887,
+  "bundleOrigSize": 225774,
+  "bundleReduction": 13.68,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
-      "size": 21013,
-      "origSize": 19389,
+      "size": 21038,
+      "origSize": 19404,
       "renderedExports": [
         "resolveResponse"
       ],
@@ -14,13 +14,13 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 10.81,
+      "percent": 10.79,
       "reduction": 0
     },
     {
       "id": "/src/adapters/ws.ts",
-      "size": 20133,
-      "origSize": 15932,
+      "size": 20168,
+      "origSize": 15955,
       "renderedExports": [
         "getWSConnectionHandler",
         "handleKeepAlive",
@@ -30,7 +30,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.36,
+      "percent": 10.35,
       "reduction": 0
     },
     {
@@ -47,7 +47,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 10.3,
+      "percent": 10.27,
       "reduction": 0
     },
     {
@@ -64,7 +64,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 6.49,
+      "percent": 6.48,
       "reduction": 0
     },
     {
@@ -77,7 +77,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.25,
+      "percent": 6.24,
       "reduction": 11.62
     },
     {
@@ -91,13 +91,13 @@
       "dependents": [
         "/src/unstable-core-do-not-import/stream/jsonl.ts"
       ],
-      "percent": 4.18,
+      "percent": 4.17,
       "reduction": 0
     },
     {
       "id": "/src/unstable-core-do-not-import/http/contentType.ts",
-      "size": 7685,
-      "origSize": 7608,
+      "size": 7766,
+      "origSize": 7690,
       "renderedExports": [
         "getRequestInfo"
       ],
@@ -106,7 +106,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 3.95,
+      "percent": 3.98,
       "reduction": 0
     },
     {
@@ -124,7 +124,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 3.32,
+      "percent": 3.31,
       "reduction": 39.41
     },
     {
@@ -143,7 +143,7 @@
         "/src/unstable-core-do-not-import/stream/sse.ts",
         "/src/unstable-core-do-not-import/stream/utils/withPing.ts"
       ],
-      "percent": 3,
+      "percent": 2.99,
       "reduction": 0
     },
     {
@@ -158,7 +158,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.98,
+      "percent": 2.97,
       "reduction": 65.01
     },
     {
@@ -192,7 +192,7 @@
         "/src/observable/operators.ts",
         "/src/observable/behaviorSubject.ts"
       ],
-      "percent": 2.49,
+      "percent": 2.48,
       "reduction": 0
     },
     {
@@ -212,8 +212,8 @@
     },
     {
       "id": "/src/adapters/node-http/incomingMessageToRequest.ts",
-      "size": 3918,
-      "origSize": 4751,
+      "size": 4047,
+      "origSize": 4343,
       "renderedExports": [
         "createURL",
         "incomingMessageToRequest"
@@ -223,8 +223,8 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 2.02,
-      "reduction": 17.53
+      "percent": 2.08,
+      "reduction": 6.82
     },
     {
       "id": "/src/observable/operators.ts",
@@ -255,7 +255,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 1.67,
+      "percent": 1.66,
       "reduction": 22.52
     },
     {
@@ -351,18 +351,18 @@
         "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
         "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/error/TRPCError.ts",
         "/src/unstable-core-do-not-import/transformer.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/router.ts",
+        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/http/isAbortError.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 1.27,
+      "percent": 1.26,
       "reduction": 17.51
     },
     {
@@ -574,7 +574,7 @@
     {
       "id": "/src/adapters/fastify/fastifyRequestHandler.ts",
       "size": 1146,
-      "origSize": 2174,
+      "origSize": 2185,
       "renderedExports": [
         "fastifyRequestHandler"
       ],
@@ -584,7 +584,7 @@
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
       "percent": 0.59,
-      "reduction": 47.29
+      "reduction": 47.55
     },
     {
       "id": "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
@@ -613,7 +613,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.55,
+      "percent": 0.54,
       "reduction": 0
     },
     {
@@ -630,6 +630,20 @@
       "percent": 0.5,
       "reduction": 32.89
     },
+    {
+      "id": "/src/adapters/standalone.ts",
+      "size": 958,
+      "origSize": 3103,
+      "renderedExports": [
+        "createHTTPHandler",
+        "createHTTPServer",
+        "createHTTP2Handler"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0.49,
+      "reduction": 69.13
+    },
     {
       "id": "/src/adapters/express.ts",
       "size": 887,
@@ -659,19 +673,6 @@
       "percent": 0.4,
       "reduction": 44.13
     },
-    {
-      "id": "/src/adapters/standalone.ts",
-      "size": 765,
-      "origSize": 1765,
-      "renderedExports": [
-        "createHTTPHandler",
-        "createHTTPServer"
-      ],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0.39,
-      "reduction": 56.66
-    },
     {
       "id": "/src/adapters/aws-lambda/index.ts",
       "size": 759,
@@ -864,9 +865,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -874,9 +875,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -884,9 +885,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -902,8 +903,8 @@
       "dependents": [
         "/src/adapters/express.ts",
         "/src/adapters/ws.ts",
-        "/src/adapters/next.ts",
         "/src/adapters/standalone.ts",
+        "/src/adapters/next.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/node-http/writeResponse.ts"
@@ -934,9 +935,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/adapters/fastify/index.ts",
+      "id": "/src/adapters/fetch/index.ts",
       "size": 0,
-      "origSize": 78,
+      "origSize": 64,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -944,9 +945,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/adapters/fetch/index.ts",
+      "id": "/src/adapters/fastify/index.ts",
       "size": 0,
-      "origSize": 64,
+      "origSize": 78,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -962,8 +963,8 @@
       "dependents": [
         "/src/adapters/express.ts",
         "/src/adapters/ws.ts",
-        "/src/adapters/next.ts",
         "/src/adapters/standalone.ts",
+        "/src/adapters/next.ts",
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
       "percent": 0,

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

@@ -3,6 +3,7 @@ import type { TRPCRequestInfo } from './types';
 type GetRequestInfoOptions = {
     path: string;
     req: Request;
+    url: URL | null;
     searchParams: URLSearchParams;
     headers: Headers;
     router: AnyRouter;

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

@@ -1 +1 @@
-{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAwQF,wBAAgB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,eAAe,CAG3E"}
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IAChB,YAAY,EAAE,eAAe,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AA2QF,wBAAgB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,eAAe,CAG3E"}

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

@@ -129,7 +129,8 @@ const jsonContentTypeHandler = {
             calls,
             type,
             connectionParams: connectionParamsStr === null ? null : parseConnectionParams.parseConnectionParamsFromString(connectionParamsStr),
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
         return info;
     }
@@ -163,7 +164,8 @@ const formDataContentTypeHandler = {
             isBatchCall: false,
             type: 'mutation',
             connectionParams: null,
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
     }
 };
@@ -195,7 +197,8 @@ const octetStreamContentTypeHandler = {
             accept: null,
             type: 'mutation',
             connectionParams: null,
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
     }
 };

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

@@ -127,7 +127,8 @@ const jsonContentTypeHandler = {
             calls,
             type,
             connectionParams: connectionParamsStr === null ? null : parseConnectionParamsFromString(connectionParamsStr),
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
         return info;
     }
@@ -161,7 +162,8 @@ const formDataContentTypeHandler = {
             isBatchCall: false,
             type: 'mutation',
             connectionParams: null,
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
     }
 };
@@ -193,7 +195,8 @@ const octetStreamContentTypeHandler = {
             accept: null,
             type: 'mutation',
             connectionParams: null,
-            signal: req.signal
+            signal: req.signal,
+            url: opts.url
         };
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"resolveResponse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/resolveResponse.ts"],"names":[],"mappings":"AAMA,OAAO,EAA2B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,WAAW,CAAC;AAQnB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AA+BjB,UAAU,yBAAyB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC;IAChD,aAAa,EAAE,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC3D,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACzB;AA2ID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAmfnB"}
+{"version":3,"file":"resolveResponse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/resolveResponse.ts"],"names":[],"mappings":"AAMA,OAAO,EAA2B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,WAAW,CAAC;AAQnB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AA+BjB,UAAU,yBAAyB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC;IAChD,aAAa,EAAE,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC3D,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACzB;AA2ID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAofnB"}

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

@@ -151,7 +151,8 @@ async function resolveResponse(opts) {
                     path: decodeURIComponent(opts.path),
                     router,
                     searchParams: url.searchParams,
-                    headers: opts.req.headers
+                    headers: opts.req.headers,
+                    url
                 })
             ];
         } catch (cause) {

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

@@ -149,7 +149,8 @@ async function resolveResponse(opts) {
                     path: decodeURIComponent(opts.path),
                     router,
                     searchParams: url.searchParams,
-                    headers: opts.req.headers
+                    headers: opts.req.headers,
+                    url
                 })
             ];
         } catch (cause) {

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

@@ -88,6 +88,10 @@ export interface TRPCRequestInfo {
      * Can be used to abort async operations during the request, e.g. `fetch()`-requests
      */
     signal: AbortSignal;
+    /**
+     * The URL of the request if available
+     */
+    url: URL | null;
 }
 /**
  * Inner createContext function for `resolveResponse` used to forward `TRPCRequestInfo` to `createContext`

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.730+776d07336",
+  "version": "11.0.0-rc.741+caed91ee7",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -120,7 +120,7 @@
     "@fastify/websocket": "^10.0.1",
     "@tanstack/react-query": "^5.62.8",
     "@types/aws-lambda": "^8.10.137",
-    "@types/express": "^4.17.17",
+    "@types/express": "^5.0.0",
     "@types/hash-sum": "^1.0.0",
     "@types/node": "^22.9.0",
     "@types/react": "^19.0.0",
@@ -141,7 +141,7 @@
     "superstruct": "^2.0.0",
     "tsx": "^4.0.0",
     "typescript": "^5.7.2",
-    "valibot": "1.0.0-beta.14",
+    "valibot": "1.0.0-beta.15",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
     "zod": "^3.0.0"
@@ -152,5 +152,5 @@
   "peerDependencies": {
     "typescript": ">=5.7.2"
   },
-  "gitHead": "776d07336bddd01ac2ad02da0360fb71aa734471"
+  "gitHead": "caed91ee782f78ada6c8c0c82e2d9d2ff474f555"
 }

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -17,10 +17,10 @@ import {
   type ResolveHTTPRequestOptionsContextFn,
 } from '../../@trpc/server/http';
 // @trpc/server/node-http
+import type { NodeHTTPRequest } from '../node-http';
 import {
   incomingMessageToRequest,
   type NodeHTTPCreateContextOption,
-  type UniversalIncomingMessage,
 } from '../node-http';
 
 export type FastifyHandlerOptions<
@@ -54,7 +54,7 @@ export async function fastifyRequestHandler<
     });
   };
 
-  const incomingMessage: UniversalIncomingMessage = opts.req.raw;
+  const incomingMessage: NodeHTTPRequest = opts.req.raw;
 
   // monkey-path body to the IncomingMessage
   if ('body' in opts.req) {

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

@@ -1,23 +1,9 @@
 import type * as http from 'http';
 import { TRPCError } from '../../@trpc/server';
-
-export interface UniversalIncomingMessage
-  extends Omit<http.IncomingMessage, 'socket'> {
-  /**
-   * Many adapters will add a `body` property to the incoming message and pre-parse the body
-   */
-  body?: unknown;
-  /**
-   * Socket is not always available in all deployments, so we need to make it optional
-   * @see https://github.com/trpc/trpc/issues/6341
-   * The socket object provided in the request does not fully implement the expected Node.js Socket interface.
-   * @see https://github.com/trpc/trpc/pull/6358
-   */
-  socket?: Partial<http.IncomingMessage['socket']>;
-}
+import type { NodeHTTPRequest, NodeHTTPResponse } from './types';
 
 function createBody(
-  req: UniversalIncomingMessage,
+  req: NodeHTTPRequest,
   opts: {
     /**
      * Max body size in bytes. If the body is larger than this, the request will be aborted
@@ -79,14 +65,17 @@ function createBody(
     },
   });
 }
-export function createURL(req: UniversalIncomingMessage): URL {
+export function createURL(req: NodeHTTPRequest): URL {
   try {
     const protocol =
-      req.socket && 'encrypted' in req.socket && req.socket.encrypted
+      // http2
+      (req.headers[':scheme'] && req.headers[':scheme'] === 'https') ||
+      // http1
+      (req.socket && 'encrypted' in req.socket && req.socket.encrypted)
         ? 'https:'
         : 'http:';
 
-    const host = req.headers.host ?? 'localhost';
+    const host = req.headers.host ?? req.headers[':authority'] ?? 'localhost';
 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     return new URL(req.url!, `${protocol}//${host}`);
@@ -125,8 +114,8 @@ function createHeaders(incoming: http.IncomingHttpHeaders): Headers {
  * 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 function incomingMessageToRequest(
-  req: UniversalIncomingMessage,
-  res: http.ServerResponse,
+  req: NodeHTTPRequest,
+  res: NodeHTTPResponse,
   opts: {
     /**
      * Max body size in bytes. If the body is larger than this, the request will be aborted
@@ -145,7 +134,7 @@ export function incomingMessageToRequest(
   };
 
   res.once('close', onAbort);
-  req.socket?.once?.('end', onAbort);
+  req.socket?.once?.('close', onAbort);
 
   // Get host from either regular header or HTTP/2 pseudo-header
   const url = createURL(req);

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

@@ -8,6 +8,7 @@
  * ```
  */
 import type * as http from 'http';
+import type * as http2 from 'http2';
 // @trpc/server
 import type {
   AnyRouter,
@@ -20,13 +21,34 @@ import type {
   TRPCRequestInfo,
 } from '../../@trpc/server/http';
 // eslint-disable-next-line no-restricted-imports
-import type { MaybePromise } from '../../unstable-core-do-not-import';
+import type {
+  DistributiveOmit,
+  MaybePromise,
+} from '../../unstable-core-do-not-import';
 
-export type NodeHTTPRequest = http.IncomingMessage & {
+export type NodeHTTPRequest = DistributiveOmit<
+  http.IncomingMessage | http2.Http2ServerRequest,
+  'socket'
+> & {
+  /**
+   * Many adapters will add a `body` property to the incoming message and pre-parse the body
+   */
   body?: unknown;
-  query?: unknown;
+  /**
+   * Socket is not always available in all deployments, so we need to make it optional
+   * @see https://github.com/trpc/trpc/issues/6341
+   * The socket object provided in the request does not fully implement the expected Node.js Socket interface.
+   * @see https://github.com/trpc/trpc/pull/6358
+   */
+  socket?:
+    | Partial<http.IncomingMessage['socket']>
+    | Partial<http2.Http2ServerRequest['socket']>;
 };
-export type NodeHTTPResponse = http.ServerResponse & {
+
+export type NodeHTTPResponse = DistributiveOmit<
+  http.ServerResponse | http2.Http2ServerResponse,
+  'write'
+> & {
   /**
    * Force the partially-compressed response to be flushed to the client.
    *
@@ -36,8 +58,9 @@ export type NodeHTTPResponse = http.ServerResponse & {
    * e.g. Express w/ `compression()`)
    */
   flush?: () => void;
-};
 
+  write: (chunk: string | Uint8Array) => boolean;
+};
 export type NodeHTTPCreateContextOption<
   TRouter extends AnyRouter,
   TRequest,
@@ -85,11 +108,15 @@ export type NodeHTTPRequestHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
-> = {
+> = NodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & {
   req: TRequest;
   res: TResponse;
+  /**
+   * The tRPC path to handle requests for
+   * @example 'post.all'
+   */
   path: string;
-} & NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>;
+};
 
 export type NodeHTTPCreateContextFnOptions<TRequest, TResponse> = {
   req: TRequest;

package/src/adapters/standalone.ts

@@ -9,6 +9,8 @@
  */
 
 import http from 'http';
+// --- http2 ---
+import type * as http2 from 'http2';
 // @trpc/server
 import { type AnyRouter } from '../@trpc/server';
 // eslint-disable-next-line no-restricted-imports
@@ -16,6 +18,8 @@ import { run } from '../unstable-core-do-not-import';
 import type {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
+  NodeHTTPRequest,
+  NodeHTTPResponse,
 } from './node-http';
 import {
   createURL,
@@ -23,28 +27,49 @@ import {
   nodeHTTPRequestHandler,
 } from './node-http';
 
+type StandaloneHandlerOptions<
+  TRouter extends AnyRouter,
+  TRequest extends NodeHTTPRequest,
+  TResponse extends NodeHTTPResponse,
+> = NodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & {
+  /**
+   * The base path to handle requests for.
+   * This will be sliced from the beginning of the request path
+   * (Do not miss including the trailing slash)
+   * @default '/'
+   * @example '/trpc/'
+   * @example '/trpc/api/'
+   */
+  basePath?: string;
+};
+
+// --- http1 ---
 export type CreateHTTPHandlerOptions<TRouter extends AnyRouter> =
-  NodeHTTPHandlerOptions<TRouter, http.IncomingMessage, http.ServerResponse>;
+  StandaloneHandlerOptions<TRouter, http.IncomingMessage, http.ServerResponse>;
 
 export type CreateHTTPContextOptions = NodeHTTPCreateContextFnOptions<
   http.IncomingMessage,
   http.ServerResponse
 >;
 
-/**
- * @internal
- */
-export function createHTTPHandler<TRouter extends AnyRouter>(
-  opts: CreateHTTPHandlerOptions<TRouter>,
-): http.RequestListener {
+function createHandler<
+  TRouter extends AnyRouter,
+  TRequest extends NodeHTTPRequest,
+  TResponse extends NodeHTTPResponse,
+>(
+  opts: StandaloneHandlerOptions<TRouter, TRequest, TResponse>,
+): (req: TRequest, res: TResponse) => void {
+  const basePath = opts.basePath ?? '/';
+  const sliceLength = basePath.length;
+
   return (req, res) => {
     let path = '';
+
     run(async () => {
       const url = createURL(req);
 
-      // get procedure path and remove the leading slash
-      // /procedure -> procedure
-      path = url.pathname.slice(1);
+      // get procedure(s) path and remove the leading slash
+      path = url.pathname.slice(sliceLength);
 
       await nodeHTTPRequestHandler({
         ...(opts as any),
@@ -63,8 +88,34 @@ export function createHTTPHandler<TRouter extends AnyRouter>(
   };
 }
 
+/**
+ * @internal
+ */
+export function createHTTPHandler<TRouter extends AnyRouter>(
+  opts: CreateHTTPHandlerOptions<TRouter>,
+): http.RequestListener {
+  return createHandler(opts);
+}
+
 export function createHTTPServer<TRouter extends AnyRouter>(
   opts: CreateHTTPHandlerOptions<TRouter>,
 ) {
   return http.createServer(createHTTPHandler(opts));
 }
+
+// --- http2 ---
+export type CreateHTTP2HandlerOptions<TRouter extends AnyRouter> =
+  StandaloneHandlerOptions<
+    TRouter,
+    http2.Http2ServerRequest,
+    http2.Http2ServerResponse
+  >;
+
+export type CreateHTTP2ContextOptions = NodeHTTPCreateContextFnOptions<
+  http2.Http2ServerRequest,
+  http2.Http2ServerResponse
+>;
+
+export function createHTTP2Handler(opts: CreateHTTP2HandlerOptions<AnyRouter>) {
+  return createHandler(opts);
+}

package/src/adapters/ws.ts

@@ -136,6 +136,7 @@ export function getWSConnectionHandler<TRouter extends AnyRouter>(
             accept: null,
             type: 'unknown',
             signal: abortController.signal,
+            url: null,
           },
         });
 

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

@@ -8,6 +8,7 @@ import type { TRPCAcceptHeader, TRPCRequestInfo } from './types';
 type GetRequestInfoOptions = {
   path: string;
   req: Request;
+  url: URL | null;
   searchParams: URLSearchParams;
   headers: Headers;
   router: AnyRouter;
@@ -174,6 +175,7 @@ const jsonContentTypeHandler: ContentTypeHandler = {
           ? null
           : parseConnectionParamsFromString(connectionParamsStr),
       signal: req.signal,
+      url: opts.url,
     };
     return info;
   },
@@ -210,6 +212,7 @@ const formDataContentTypeHandler: ContentTypeHandler = {
       type: 'mutation',
       connectionParams: null,
       signal: req.signal,
+      url: opts.url,
     };
   },
 };
@@ -246,6 +249,7 @@ const octetStreamContentTypeHandler: ContentTypeHandler = {
       type: 'mutation',
       connectionParams: null,
       signal: req.signal,
+      url: opts.url,
     };
   },
 };

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

@@ -233,6 +233,7 @@ export async function resolveResponse<TRouter extends AnyRouter>(
           router,
           searchParams: url.searchParams,
           headers: opts.req.headers,
+          url,
         }),
       ];
     } catch (cause) {

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

@@ -104,6 +104,10 @@ export interface TRPCRequestInfo {
    * Can be used to abort async operations during the request, e.g. `fetch()`-requests
    */
   signal: AbortSignal;
+  /**
+   * The URL of the request if available
+   */
+  url: URL | null;
 }
 
 /**