@trpc/server 9.18.0 → 9.20.1

package/dist/trpc-server.cjs.dev.js

@@ -2,16 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-b7ff366e.cjs.dev.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-3867844c.cjs.dev.js');
 var subscription = require('./subscription-b8831081.cjs.dev.js');
 var transformTRPCResponse = require('./transformTRPCResponse-8248515e.cjs.dev.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-2cc444d8.cjs.dev.js');
 var codes = require('./codes-33cef953.cjs.dev.js');
-require('url');
 require('events');
 require('http');
+require('url');
 
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 
 // this has been moved to separate package
 
@@ -58,7 +59,7 @@ async function wrapCallSafe(fn) {
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 
 function getParseFn(inputParser) {
   const parser = inputParser;
@@ -214,7 +215,7 @@ function createProcedure(opts) {
 }
 
 /* eslint-disable @typescript-eslint/ban-types */
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 /**
  * @public
  */
@@ -462,7 +463,7 @@ class Router {
       code: codes.TRPC_ERROR_CODES_BY_KEY[code],
       data: {
         code,
-        httpStatus: nodeHTTPRequestHandler.getHTTPStatusCodeFromError(error)
+        httpStatus: resolveHTTPResponse.getHTTPStatusCodeFromError(error)
       }
     };
 
@@ -519,8 +520,8 @@ function router() {
   return new Router();
 }
 
-exports.assertNotBrowser = nodeHTTPRequestHandler.assertNotBrowser;
-exports.resolveHTTPResponse = nodeHTTPRequestHandler.resolveHTTPResponse;
+exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
+exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
 exports.Subscription = subscription.Subscription;
 exports.subscriptionPullFactory = subscription.subscriptionPullFactory;
 exports.TRPCError = transformTRPCResponse.TRPCError;

package/dist/trpc-server.cjs.prod.js

@@ -2,16 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-7325b53f.cjs.prod.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-562c3d62.cjs.prod.js');
 var subscription = require('./subscription-c2e0bfbc.cjs.prod.js');
 var transformTRPCResponse = require('./transformTRPCResponse-dcbf66c5.cjs.prod.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-8ddacc19.cjs.prod.js');
 var codes = require('./codes-e0df67c4.cjs.prod.js');
-require('url');
 require('events');
 require('http');
+require('url');
 
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 
 // this has been moved to separate package
 
@@ -58,7 +59,7 @@ async function wrapCallSafe(fn) {
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 
 function getParseFn(inputParser) {
   const parser = inputParser;
@@ -214,7 +215,7 @@ function createProcedure(opts) {
 }
 
 /* eslint-disable @typescript-eslint/ban-types */
-nodeHTTPRequestHandler.assertNotBrowser();
+resolveHTTPResponse.assertNotBrowser();
 /**
  * @public
  */
@@ -462,7 +463,7 @@ class Router {
       code: codes.TRPC_ERROR_CODES_BY_KEY[code],
       data: {
         code,
-        httpStatus: nodeHTTPRequestHandler.getHTTPStatusCodeFromError(error)
+        httpStatus: resolveHTTPResponse.getHTTPStatusCodeFromError(error)
       }
     };
 
@@ -515,8 +516,8 @@ function router() {
   return new Router();
 }
 
-exports.assertNotBrowser = nodeHTTPRequestHandler.assertNotBrowser;
-exports.resolveHTTPResponse = nodeHTTPRequestHandler.resolveHTTPResponse;
+exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
+exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
 exports.Subscription = subscription.Subscription;
 exports.subscriptionPullFactory = subscription.subscriptionPullFactory;
 exports.TRPCError = transformTRPCResponse.TRPCError;

package/dist/trpc-server.esm.js

@@ -1,13 +1,14 @@
-import { a as assertNotBrowser, n as nodeHTTPRequestHandler, g as getHTTPStatusCodeFromError } from './nodeHTTPRequestHandler-2e6cc2d7.esm.js';
-export { a as assertNotBrowser, r as resolveHTTPResponse } from './nodeHTTPRequestHandler-2e6cc2d7.esm.js';
+import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-85f3f5df.esm.js';
+export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-85f3f5df.esm.js';
 export { S as Subscription, s as subscriptionPullFactory } from './subscription-fbda2888.esm.js';
 import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-f73dc4a2.esm.js';
 export { T as TRPCError } from './transformTRPCResponse-f73dc4a2.esm.js';
 import { createHTTPServer, createHTTPHandler } from '../adapters/standalone/dist/trpc-server-adapters-standalone.esm.js';
+import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-d00c1126.esm.js';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-fe07bf82.esm.js';
-import 'url';
 import 'events';
 import 'http';
+import 'url';
 
 assertNotBrowser();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "9.18.0",
+  "version": "9.20.1",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -19,6 +19,7 @@
     "entrypoints": [
       "index.ts",
       "adapters/express.ts",
+      "adapters/fastify/index.ts",
       "adapters/next.ts",
       "adapters/node-http/index.ts",
       "adapters/standalone.ts",
@@ -51,21 +52,25 @@
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
+    "abort-controller": "^3.0.0",
     "devalue": "^2.0.1",
     "express": "^4.17.1",
-    "fastify": "^3.17.0",
+    "fastify": "^3.27.1",
+    "fastify-plugin": "^3.0.1",
+    "fastify-websocket": "^4.0.0",
     "hash-sum": "^2.0.0",
     "jest": "^27.1.0",
     "konn": "^0.7.0",
     "myzod": "^1.3.1",
     "next": "^12.0.1",
+    "node-fetch": "^2.6.1",
     "superstruct": "^0.15.2",
     "typescript": "4.4.4",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "e8468a50b289b0231cf1ee92d0f5195fe20c0d44",
+  "gitHead": "fcacb235651d8ba9640af6b9752a981c520957ba",
   "dependencies": {
     "tslib": "^2.1.0"
   }

package/src/adapters/express.ts

@@ -16,7 +16,7 @@ export function createExpressMiddleware<TRouter extends AnyRouter>(
   opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
 ): express.Handler {
   return (req, res) => {
-    const endpoint = req.path.substr(1);
+    const endpoint = req.path.slice(1);
 
     nodeHTTPRequestHandler({
       ...opts,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -0,0 +1,79 @@
+import { URLSearchParams } from 'url';
+import { FastifyReply, FastifyRequest } from 'fastify';
+import { assertNotBrowser } from '../../assertNotBrowser';
+import { NodeHTTPCreateContextOption } from '../node-http';
+import { AnyRouter, inferRouterContext } from '../../router';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import {
+  HTTPBaseHandlerOptions,
+  HTTPRequest,
+} from '../../http/internals/types';
+
+assertNotBrowser();
+
+export type FastifyHandlerOptions<
+  TRouter extends AnyRouter,
+  TRequest extends FastifyRequest,
+  TResponse extends FastifyReply,
+> = HTTPBaseHandlerOptions<TRouter, TRequest> &
+  NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
+
+type FastifyRequestHandlerOptions<
+  TRouter extends AnyRouter,
+  TRequest extends FastifyRequest,
+  TResponse extends FastifyReply,
+> = {
+  req: TRequest;
+  res: TResponse;
+  path: string;
+} & FastifyHandlerOptions<TRouter, TRequest, TResponse>;
+
+export async function fastifyRequestHandler<
+  TRouter extends AnyRouter,
+  TRequest extends FastifyRequest,
+  TResponse extends FastifyReply,
+>(opts: FastifyRequestHandlerOptions<TRouter, TRequest, TResponse>) {
+  const createContext = async function _createContext(): Promise<
+    inferRouterContext<TRouter>
+  > {
+    return opts.createContext?.(opts);
+  };
+
+  const query = opts.req.query
+    ? new URLSearchParams(opts.req.query as any)
+    : new URLSearchParams(opts.req.url.split('?')[1]);
+
+  const req: HTTPRequest = {
+    query,
+    method: opts.req.method,
+    headers: opts.req.headers,
+    body: opts.req.body ?? 'null',
+  };
+
+  const result = await resolveHTTPResponse({
+    req,
+    createContext,
+    path: opts.path,
+    router: opts.router,
+    batching: opts.batching,
+    responseMeta: opts.responseMeta,
+    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.header(key, value);
+  }
+
+  res.send(result.body);
+}

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -0,0 +1,48 @@
+/// <reference types="fastify-websocket" />
+import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import { fastifyRequestHandler } from './fastifyRequestHandler';
+import { NodeHTTPCreateContextFnOptions } from '../node-http';
+import { applyWSSHandler, WSSHandlerOptions } from '../ws';
+import { FastifyHandlerOptions } from '.';
+import { AnyRouter } from '../..';
+
+export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
+  prefix?: string;
+  useWSS?: boolean;
+  trpcOptions: FastifyHandlerOptions<TRouter, FastifyRequest, FastifyReply>;
+}
+
+export type CreateFastifyContextOptions = NodeHTTPCreateContextFnOptions<
+  FastifyRequest,
+  FastifyReply
+>;
+
+export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
+  fastify: FastifyInstance,
+  opts: FastifyTRPCPluginOptions<TRouter>,
+  done: (err?: Error) => void,
+) {
+  fastify.addContentTypeParser(
+    'application/json',
+    { parseAs: 'string' },
+    function (_, body, _done) {
+      _done(null, body);
+    },
+  );
+
+  fastify.all(`${opts.prefix ?? ''}/:path`, (req, res) => {
+    const path = (req.params as any).path;
+    fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
+  });
+
+  if (opts.useWSS) {
+    applyWSSHandler<TRouter>({
+      ...(opts.trpcOptions as WSSHandlerOptions<TRouter>),
+      wss: fastify.websocketServer,
+    });
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    fastify.get(opts.prefix ?? '/', { websocket: true }, () => {});
+  }
+
+  done();
+}

package/src/adapters/fastify/index.ts

@@ -0,0 +1,2 @@
+export * from './fastifyRequestHandler';
+export * from './fastifyTRPCPlugin';

package/src/adapters/standalone.ts

@@ -21,7 +21,7 @@ export function createHTTPHandler<TRouter extends AnyRouter>(
   opts: CreateHTTPHandlerOptions<TRouter>,
 ) {
   return async (req: http.IncomingMessage, res: http.ServerResponse) => {
-    const endpoint = url.parse(req.url!).pathname!.substr(1);
+    const endpoint = url.parse(req.url!).pathname!.slice(1);
     await nodeHTTPRequestHandler({
       ...opts,
       req,

package/src/adapters/ws.ts

@@ -225,7 +225,10 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       try {
         const msgJSON: unknown = JSON.parse(message.toString());
         const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
-        msgs.map((raw) => parseMessage(raw, transformer)).map(handleRequest);
+        const promises = msgs
+          .map((raw) => parseMessage(raw, transformer))
+          .map(handleRequest);
+        await Promise.all(promises);
       } catch (cause) {
         const error = new TRPCError({
           code: 'PARSE_ERROR',