@trpc/server 10.13.2 → 10.14.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) <year> <author>
+Copyright (c) 2023 Alex Johansson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/adapters/zodFileSchema/index.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/adapters/zodFileSchema';

package/adapters/zodFileSchema/index.js

@@ -0,0 +1 @@
+module.exports = require('../../dist/adapters/zodFileSchema');

package/dist/adapters/express.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-40bc6a18.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
 require('../resolveHTTPResponse-cbfdc43d.js');
 require('../config-bd759464.js');
 require('../TRPCError-4cbab0d0.js');

package/dist/adapters/express.mjs

@@ -1,4 +1,4 @@
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-4314fa32.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
 import '../resolveHTTPResponse-8e9dd846.mjs';
 import '../config-fb5f49a1.mjs';
 import '../TRPCError-e7333eae.mjs';

package/dist/adapters/next.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var TRPCError = require('../TRPCError-4cbab0d0.js');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-40bc6a18.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
 require('../resolveHTTPResponse-cbfdc43d.js');
 require('../config-bd759464.js');
 require('../codes-e0ea0f4c.js');

package/dist/adapters/next.mjs

@@ -1,5 +1,5 @@
 import { T as TRPCError } from '../TRPCError-e7333eae.mjs';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-4314fa32.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
 import '../resolveHTTPResponse-8e9dd846.mjs';
 import '../config-fb5f49a1.mjs';
 import '../codes-52c11119.mjs';

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-40bc6a18.js');
+var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-7ebe1e44.js');
 require('../../resolveHTTPResponse-cbfdc43d.js');
 require('../../config-bd759464.js');
 require('../../TRPCError-4cbab0d0.js');

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

@@ -1,4 +1,4 @@
-export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-4314fa32.mjs';
+export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-8c27f394.mjs';
 import '../../resolveHTTPResponse-8e9dd846.mjs';
 import '../../config-fb5f49a1.mjs';
 import '../../TRPCError-e7333eae.mjs';

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

@@ -1 +1 @@
-{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,aAAK,6BAA6B,CAChC,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,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA8ClE"}
+{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,aAAK,6BAA6B,CAChC,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,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAqElE"}

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

@@ -22,7 +22,30 @@ export declare type NodeHTTPCreateContextOption<TRouter extends AnyRouter, TRequ
      **/
     createContext: NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>;
 };
+/**
+ * @internal
+ */
+interface ConnectMiddleware<TRequest extends NodeHTTPRequest = NodeHTTPRequest, TResponse extends NodeHTTPResponse = NodeHTTPResponse> {
+    (req: TRequest, res: TResponse, next: (err?: any) => any): void;
+}
 export declare type NodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = HTTPBaseHandlerOptions<TRouter, TRequest> & {
+    /**
+     * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
+     *
+     * This can be used to handle them manually or via the `cors` npm package: https://www.npmjs.com/package/cors
+     *
+     * ```ts
+     * import cors from 'cors'
+     *
+     * nodeHTTPRequestHandler({
+     *   cors: cors()
+     * })
+     * ```
+     *
+     * You can also use it for other needs which a connect/node.js compatible middleware can solve,
+     *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
+     */
+    middleware?: ConnectMiddleware;
     maxBodySize?: number;
 } & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
 export declare type NodeHTTPCreateContextFnOptions<TRequest, 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,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;CACtE;AAED,oBAAY,eAAe,GAAG,eAAe,GAAG;IAC9C,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,cAAc,CAAC;AAE9C,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC1C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,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":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;CACtE;AAED,oBAAY,eAAe,GAAG,eAAe,GAAG;IAC9C,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,cAAc,CAAC;AAE9C,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC1C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN;;GAEG;AACH,UAAU,iBAAiB,CACzB,QAAQ,SAAS,eAAe,GAAG,eAAe,EAClD,SAAS,SAAS,gBAAgB,GAAG,gBAAgB;IAErD,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI,CAAC;CACjE;AAED,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,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"}

package/dist/adapters/standalone.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var http = require('node:http');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-40bc6a18.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
 require('../resolveHTTPResponse-cbfdc43d.js');
 require('../config-bd759464.js');
 require('../TRPCError-4cbab0d0.js');

package/dist/adapters/standalone.mjs

@@ -1,5 +1,5 @@
 import http from 'node:http';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-4314fa32.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
 import '../resolveHTTPResponse-8e9dd846.mjs';
 import '../config-fb5f49a1.mjs';
 import '../TRPCError-e7333eae.mjs';

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
-export type { AnyRouter, ProcedureRecord, ProcedureRouterRecord, CreateRouterInner, } from './router';
+export type { AnyRouter, ProcedureRecord, ProcedureRouterRecord, CreateRouterInner, Router, } from './router';
 export { callProcedure } from './router';
 export type { Procedure, AnyProcedure, AnyQueryProcedure, AnyMutationProcedure, AnySubscriptionProcedure, ProcedureParams, ProcedureArgs, ProcedureOptions, } from './procedure';
 export type { inferParser } from './parser';

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,SAAS,EACT,eAAe,EACf,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,YAAY,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,EACf,aAAa,EACb,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,SAAS,EACT,eAAe,EACf,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,GACP,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,YAAY,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,EACf,aAAa,EACb,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,cAAc,SAAS,CAAC"}

package/dist/nodeHTTPRequestHandler-5a5141c3.js

@@ -0,0 +1,90 @@
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-39258d19.js';
+import { T as TRPCError } from './TRPCError-ed16b3b7.js';
+
+async function getPostBody(opts) {
+    const { req, maxBodySize = Infinity } = opts;
+    return new Promise((resolve) => {
+        if ('body' in req) {
+            resolve({ ok: true, data: req.body });
+            return;
+        }
+        let body = '';
+        let hasBody = false;
+        req.on('data', function (data) {
+            body += data;
+            hasBody = true;
+            if (body.length > maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new TRPCError({ code: 'PAYLOAD_TOO_LARGE' }),
+                });
+                req.socket.destroy();
+            }
+        });
+        req.on('end', () => {
+            resolve({
+                ok: true,
+                data: hasBody ? body : undefined,
+            });
+        });
+    });
+}
+
+async function nodeHTTPRequestHandler(opts) {
+    const handleViaMiddleware = opts.middleware ??
+        ((_req, _res, next) => {
+            return next();
+        });
+    return handleViaMiddleware(opts.req, opts.res, async (err) => {
+        if (err) {
+            throw err;
+        }
+        //
+        // Build tRPC dependencies
+        async function createContext() {
+            return await opts.createContext?.(opts);
+        }
+        const bodyResult = await getPostBody(opts);
+        const query = opts.req.query
+            ? new URLSearchParams(opts.req.query)
+            : new URLSearchParams(opts.req.url.split('?')[1]);
+        const req = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined,
+        };
+        //
+        // Invoke tRPC
+        const result = await resolveHTTPResponse({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req,
+            error: bodyResult.ok ? null : bodyResult.error,
+            onError(o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req,
+                });
+            },
+        });
+        //
+        // Handle result
+        const { res } = opts;
+        if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+            res.statusCode = result.status;
+        }
+        for (const [key, value] of Object.entries(result.headers ?? {})) {
+            if (typeof value === 'undefined') {
+                continue;
+            }
+            res.setHeader(key, value);
+        }
+        res.end(result.body);
+    });
+}
+
+export { nodeHTTPRequestHandler as n };

package/dist/nodeHTTPRequestHandler-7ebe1e44.js

@@ -0,0 +1,94 @@
+'use strict';
+
+var resolveHTTPResponse = require('./resolveHTTPResponse-cbfdc43d.js');
+var TRPCError = require('./TRPCError-4cbab0d0.js');
+
+async function getPostBody(opts) {
+    const { req , maxBodySize =Infinity  } = opts;
+    return new Promise((resolve)=>{
+        if ('body' in req) {
+            resolve({
+                ok: true,
+                data: req.body
+            });
+            return;
+        }
+        let body = '';
+        let hasBody = false;
+        req.on('data', function(data) {
+            body += data;
+            hasBody = true;
+            if (body.length > maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new TRPCError.TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    })
+                });
+                req.socket.destroy();
+            }
+        });
+        req.on('end', ()=>{
+            resolve({
+                ok: true,
+                data: hasBody ? body : undefined
+            });
+        });
+    });
+}
+
+async function nodeHTTPRequestHandler(opts) {
+    const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>{
+        return next();
+    });
+    return handleViaMiddleware(opts.req, opts.res, async (err)=>{
+        if (err) {
+            throw err;
+        }
+        //
+        // Build tRPC dependencies
+        async function createContext() {
+            return await opts.createContext?.(opts);
+        }
+        const bodyResult = await getPostBody(opts);
+        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
+        const req = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
+        };
+        //
+        // Invoke tRPC
+        const result = await resolveHTTPResponse.resolveHTTPResponse({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req,
+            error: bodyResult.ok ? null : bodyResult.error,
+            onError (o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req
+                });
+            }
+        });
+        //
+        // Handle result
+        const { res  } = opts;
+        if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+            res.statusCode = result.status;
+        }
+        for (const [key, value] of Object.entries(result.headers ?? {})){
+            if (typeof value === 'undefined') {
+                continue;
+            }
+            res.setHeader(key, value);
+        }
+        res.end(result.body);
+    });
+}
+
+exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler;

package/dist/nodeHTTPRequestHandler-8c27f394.mjs

@@ -0,0 +1,92 @@
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-8e9dd846.mjs';
+import { T as TRPCError } from './TRPCError-e7333eae.mjs';
+
+async function getPostBody(opts) {
+    const { req , maxBodySize =Infinity  } = opts;
+    return new Promise((resolve)=>{
+        if ('body' in req) {
+            resolve({
+                ok: true,
+                data: req.body
+            });
+            return;
+        }
+        let body = '';
+        let hasBody = false;
+        req.on('data', function(data) {
+            body += data;
+            hasBody = true;
+            if (body.length > maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    })
+                });
+                req.socket.destroy();
+            }
+        });
+        req.on('end', ()=>{
+            resolve({
+                ok: true,
+                data: hasBody ? body : undefined
+            });
+        });
+    });
+}
+
+async function nodeHTTPRequestHandler(opts) {
+    const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>{
+        return next();
+    });
+    return handleViaMiddleware(opts.req, opts.res, async (err)=>{
+        if (err) {
+            throw err;
+        }
+        //
+        // Build tRPC dependencies
+        async function createContext() {
+            return await opts.createContext?.(opts);
+        }
+        const bodyResult = await getPostBody(opts);
+        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
+        const req = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
+        };
+        //
+        // Invoke tRPC
+        const result = await resolveHTTPResponse({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req,
+            error: bodyResult.ok ? null : bodyResult.error,
+            onError (o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req
+                });
+            }
+        });
+        //
+        // Handle result
+        const { res  } = opts;
+        if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+            res.statusCode = result.status;
+        }
+        for (const [key, value] of Object.entries(result.headers ?? {})){
+            if (typeof value === 'undefined') {
+                continue;
+            }
+            res.setHeader(key, value);
+        }
+        res.end(result.body);
+    });
+}
+
+export { nodeHTTPRequestHandler as n };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.13.2",
+  "version": "10.14.0",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -156,5 +156,5 @@
     "yup": "^1.0.0",
     "zod": "^3.0.0"
   },
-  "gitHead": "5f4fb9641e1f43125f977b3f84268ac7e5884715"
+  "gitHead": "452b679c1ba5ad52dc5fd8a1779cdb98544cdd30"
 }

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

@@ -25,49 +25,72 @@ export async function nodeHTTPRequestHandler<
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
-  const createContext = async function _createContext(): Promise<
-    inferRouterContext<TRouter>
-  > {
-    return await opts.createContext?.(opts);
-  };
-  const { path, router } = opts;
+  const handleViaMiddleware =
+    opts.middleware ??
+    ((_req, _res, next) => {
+      return next();
+    });
 
-  const bodyResult = await getPostBody(opts);
+  return handleViaMiddleware(opts.req, opts.res, async (err) => {
+    if (err) {
+      throw err;
+    }
 
-  const query = opts.req.query
-    ? new URLSearchParams(opts.req.query as any)
-    : new URLSearchParams(opts.req.url!.split('?')[1]);
-  const req: HTTPRequest = {
-    method: opts.req.method!,
-    headers: opts.req.headers,
-    query,
-    body: bodyResult.ok ? bodyResult.data : undefined,
-  };
-  const result = await resolveHTTPResponse({
-    batching: opts.batching,
-    responseMeta: opts.responseMeta,
-    path,
-    createContext,
-    router,
-    req,
-    error: bodyResult.ok ? null : bodyResult.error,
-    onError(o) {
-      opts?.onError?.({
-        ...o,
-        req: opts.req,
-      });
-    },
-  });
+    //
+    // Build tRPC dependencies
 
-  const { res } = opts;
-  if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-    res.statusCode = result.status;
-  }
-  for (const [key, value] of Object.entries(result.headers ?? {})) {
-    if (typeof value === 'undefined') {
-      continue;
+    async function createContext(): Promise<inferRouterContext<TRouter>> {
+      return await opts.createContext?.(opts);
     }
-    res.setHeader(key, value);
-  }
-  res.end(result.body);
+
+    const bodyResult = await getPostBody(opts);
+
+    const query = opts.req.query
+      ? new URLSearchParams(opts.req.query as any)
+      : new URLSearchParams(opts.req.url!.split('?')[1]);
+
+    const req: HTTPRequest = {
+      method: opts.req.method!,
+      headers: opts.req.headers,
+      query,
+      body: bodyResult.ok ? bodyResult.data : undefined,
+    };
+
+    //
+    // Invoke tRPC
+
+    const result = await resolveHTTPResponse({
+      batching: opts.batching,
+      responseMeta: opts.responseMeta,
+      path: opts.path,
+      createContext,
+      router: opts.router,
+      req,
+      error: bodyResult.ok ? null : bodyResult.error,
+      onError(o) {
+        opts?.onError?.({
+          ...o,
+          req: opts.req,
+        });
+      },
+    });
+
+    //
+    // Handle result
+
+    const { res } = opts;
+    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+      res.statusCode = result.status;
+    }
+
+    for (const [key, value] of Object.entries(result.headers ?? {})) {
+      if (typeof value === 'undefined') {
+        continue;
+      }
+
+      res.setHeader(key, value);
+    }
+
+    res.end(result.body);
+  });
 }

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

@@ -31,11 +31,38 @@ export type NodeHTTPCreateContextOption<
       createContext: NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>;
     };
 
+/**
+ * @internal
+ */
+interface ConnectMiddleware<
+  TRequest extends NodeHTTPRequest = NodeHTTPRequest,
+  TResponse extends NodeHTTPResponse = NodeHTTPResponse,
+> {
+  (req: TRequest, res: TResponse, next: (err?: any) => any): void;
+}
+
 export type NodeHTTPHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
 > = HTTPBaseHandlerOptions<TRouter, TRequest> & {
+  /**
+   * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
+   *
+   * This can be used to handle them manually or via the `cors` npm package: https://www.npmjs.com/package/cors
+   *
+   * ```ts
+   * import cors from 'cors'
+   *
+   * nodeHTTPRequestHandler({
+   *   cors: cors()
+   * })
+   * ```
+   *
+   * You can also use it for other needs which a connect/node.js compatible middleware can solve,
+   *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
+   */
+  middleware?: ConnectMiddleware;
   maxBodySize?: number;
 } & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
 

package/src/core/index.ts

@@ -3,6 +3,7 @@ export type {
   ProcedureRecord,
   ProcedureRouterRecord,
   CreateRouterInner,
+  Router,
 } from './router';
 export { callProcedure } from './router';
 export type {

package/dist/nodeHTTPRequestHandler-40bc6a18.js

@@ -1,81 +0,0 @@
-'use strict';
-
-var resolveHTTPResponse = require('./resolveHTTPResponse-cbfdc43d.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
-
-async function getPostBody(opts) {
-    const { req , maxBodySize =Infinity  } = opts;
-    return new Promise((resolve)=>{
-        if ('body' in req) {
-            resolve({
-                ok: true,
-                data: req.body
-            });
-            return;
-        }
-        let body = '';
-        let hasBody = false;
-        req.on('data', function(data) {
-            body += data;
-            hasBody = true;
-            if (body.length > maxBodySize) {
-                resolve({
-                    ok: false,
-                    error: new TRPCError.TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    })
-                });
-                req.socket.destroy();
-            }
-        });
-        req.on('end', ()=>{
-            resolve({
-                ok: true,
-                data: hasBody ? body : undefined
-            });
-        });
-    });
-}
-
-async function nodeHTTPRequestHandler(opts) {
-    const createContext = async function _createContext() {
-        return await opts.createContext?.(opts);
-    };
-    const { path , router  } = opts;
-    const bodyResult = await getPostBody(opts);
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined
-    };
-    const result = await resolveHTTPResponse.resolveHTTPResponse({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        }
-    });
-    const { res  } = opts;
-    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        res.statusCode = result.status;
-    }
-    for (const [key, value] of Object.entries(result.headers ?? {})){
-        if (typeof value === 'undefined') {
-            continue;
-        }
-        res.setHeader(key, value);
-    }
-    res.end(result.body);
-}
-
-exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler;

package/dist/nodeHTTPRequestHandler-4314fa32.mjs

@@ -1,79 +0,0 @@
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-8e9dd846.mjs';
-import { T as TRPCError } from './TRPCError-e7333eae.mjs';
-
-async function getPostBody(opts) {
-    const { req , maxBodySize =Infinity  } = opts;
-    return new Promise((resolve)=>{
-        if ('body' in req) {
-            resolve({
-                ok: true,
-                data: req.body
-            });
-            return;
-        }
-        let body = '';
-        let hasBody = false;
-        req.on('data', function(data) {
-            body += data;
-            hasBody = true;
-            if (body.length > maxBodySize) {
-                resolve({
-                    ok: false,
-                    error: new TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    })
-                });
-                req.socket.destroy();
-            }
-        });
-        req.on('end', ()=>{
-            resolve({
-                ok: true,
-                data: hasBody ? body : undefined
-            });
-        });
-    });
-}
-
-async function nodeHTTPRequestHandler(opts) {
-    const createContext = async function _createContext() {
-        return await opts.createContext?.(opts);
-    };
-    const { path , router  } = opts;
-    const bodyResult = await getPostBody(opts);
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined
-    };
-    const result = await resolveHTTPResponse({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        }
-    });
-    const { res  } = opts;
-    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        res.statusCode = result.status;
-    }
-    for (const [key, value] of Object.entries(result.headers ?? {})){
-        if (typeof value === 'undefined') {
-            continue;
-        }
-        res.setHeader(key, value);
-    }
-    res.end(result.body);
-}
-
-export { nodeHTTPRequestHandler as n };

package/dist/nodeHTTPRequestHandler-93528c16.js

@@ -1,76 +0,0 @@
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-39258d19.js';
-import { T as TRPCError } from './TRPCError-ed16b3b7.js';
-
-async function getPostBody(opts) {
-    const { req, maxBodySize = Infinity } = opts;
-    return new Promise((resolve) => {
-        if ('body' in req) {
-            resolve({ ok: true, data: req.body });
-            return;
-        }
-        let body = '';
-        let hasBody = false;
-        req.on('data', function (data) {
-            body += data;
-            hasBody = true;
-            if (body.length > maxBodySize) {
-                resolve({
-                    ok: false,
-                    error: new TRPCError({ code: 'PAYLOAD_TOO_LARGE' }),
-                });
-                req.socket.destroy();
-            }
-        });
-        req.on('end', () => {
-            resolve({
-                ok: true,
-                data: hasBody ? body : undefined,
-            });
-        });
-    });
-}
-
-async function nodeHTTPRequestHandler(opts) {
-    const createContext = async function _createContext() {
-        return await opts.createContext?.(opts);
-    };
-    const { path, router } = opts;
-    const bodyResult = await getPostBody(opts);
-    const query = opts.req.query
-        ? new URLSearchParams(opts.req.query)
-        : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined,
-    };
-    const result = await resolveHTTPResponse({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError(o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req,
-            });
-        },
-    });
-    const { res } = opts;
-    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        res.statusCode = result.status;
-    }
-    for (const [key, value] of Object.entries(result.headers ?? {})) {
-        if (typeof value === 'undefined') {
-            continue;
-        }
-        res.setHeader(key, value);
-    }
-    res.end(result.body);
-}
-
-export { nodeHTTPRequestHandler as n };