@trpc/server 10.0.0-alpha.4 → 10.0.0-alpha.40

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -0,0 +1,77 @@
+import { FastifyReply, FastifyRequest } from 'fastify';
+import { assertNotBrowser } from '../../assertNotBrowser';
+import { AnyRouter, inferRouterContext } from '../../core';
+import {
+  HTTPBaseHandlerOptions,
+  HTTPRequest,
+} from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { NodeHTTPCreateContextOption } from '../node-http';
+
+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;
+    }
+
+    void res.header(key, value);
+  }
+  await res.send(result.body);
+}

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -0,0 +1,56 @@
+/// <reference types="@fastify/websocket" />
+import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import { FastifyHandlerOptions } from '.';
+import { AnyRouter } from '../../core';
+import { NodeHTTPCreateContextFnOptions } from '../node-http';
+import { WSSHandlerOptions, applyWSSHandler } from '../ws';
+import { fastifyRequestHandler } from './fastifyRequestHandler';
+
+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);
+    },
+  );
+
+  let prefix = opts.prefix ?? '';
+
+  // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
+  // @ts-expect-error property 'default' does not exists on type ...
+  if (typeof fastifyTRPCPlugin.default !== 'function') {
+    prefix = ''; // handled by fastify internally
+  }
+
+  fastify.all(`${prefix}/:path`, async (req, res) => {
+    const path = (req.params as any).path;
+    await fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
+  });
+
+  if (opts.useWSS) {
+    applyWSSHandler<TRouter>({
+      ...(opts.trpcOptions as unknown as WSSHandlerOptions<TRouter>),
+      wss: fastify.websocketServer,
+    });
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    fastify.get(prefix ?? '/', { websocket: true }, () => {});
+  }
+
+  done();
+}

package/src/adapters/fastify/index.ts

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

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -0,0 +1,61 @@
+import { assertNotBrowser } from '../../assertNotBrowser';
+import { AnyRouter } from '../../core';
+import { HTTPRequest } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { FetchHandlerOptions } from './types';
+
+assertNotBrowser();
+
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = {
+  req: Request;
+  endpoint: string;
+} & FetchHandlerOptions<TRouter>;
+
+export async function fetchRequestHandler<TRouter extends AnyRouter>(
+  opts: FetchHandlerRequestOptions<TRouter>,
+): Promise<Response> {
+  const createContext = async () => {
+    return opts.createContext?.({ req: opts.req });
+  };
+
+  const url = new URL(opts.req.url);
+  const path = url.pathname.slice(opts.endpoint.length + 1);
+  const req: HTTPRequest = {
+    query: url.searchParams,
+    method: opts.req.method,
+    headers: Object.fromEntries(opts.req.headers),
+    body: await opts.req.text(),
+  };
+
+  const result = await resolveHTTPResponse({
+    req,
+    createContext,
+    path,
+    router: opts.router,
+    batching: opts.batching,
+    responseMeta: opts.responseMeta,
+    onError(o) {
+      opts?.onError?.({ ...o, req: opts.req });
+    },
+  });
+
+  const res = new Response(result.body, {
+    status: result.status,
+  });
+
+  for (const [key, value] of Object.entries(result.headers ?? {})) {
+    if (typeof value === 'undefined') {
+      continue;
+    }
+
+    if (typeof value === 'string') {
+      res.headers.set(key, value);
+      continue;
+    }
+
+    for (const v of value) {
+      res.headers.append(key, v);
+    }
+  }
+  return res;
+}

package/src/adapters/fetch/index.ts

@@ -0,0 +1,2 @@
+export * from './fetchRequestHandler';
+export * from './types';

package/src/adapters/fetch/types.ts

@@ -0,0 +1,28 @@
+import { AnyRouter, inferRouterContext } from '../../core';
+import { HTTPBaseHandlerOptions } from '../../http/internals/types';
+
+export type FetchCreateContextFnOptions = {
+  req: Request;
+};
+
+export type FetchCreateContextFn<TRouter extends AnyRouter> = (opts: {
+  req: Request;
+}) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+
+export type FetchCreateContextOption<TRouter extends AnyRouter> =
+  unknown extends inferRouterContext<TRouter>
+    ? {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext?: FetchCreateContextFn<TRouter>;
+      }
+    : {
+        /**
+         * @link https://trpc.io/docs/context
+         **/
+        createContext: FetchCreateContextFn<TRouter>;
+      };
+
+export type FetchHandlerOptions<TRouter extends AnyRouter> =
+  HTTPBaseHandlerOptions<TRouter, Request> & FetchCreateContextOption<TRouter>;

package/src/adapters/lambda/index.ts

@@ -0,0 +1,18 @@
+import {
+  CreateAWSLambdaContextOptions,
+  awsLambdaRequestHandler,
+} from '../aws-lambda';
+import { APIGatewayEvent } from '../aws-lambda/utils';
+
+export * from '../aws-lambda';
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export type CreateLambdaContextOptions<T extends APIGatewayEvent> =
+  CreateAWSLambdaContextOptions<T>;
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export const lambdaRequestHandler = awsLambdaRequestHandler;

package/src/adapters/next.ts

@@ -1,9 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
-import { AnyRouter } from '../router';
-import { TRPCErrorResponse } from '../rpc';
-import { TRPCError } from '../TRPCError';
+import type {
+  NextApiHandler,
+  NextApiRequest,
+  NextApiResponse,
+} from 'next/types';
+import { AnyRouter } from '../core';
+import { TRPCError } from '../error/TRPCError';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,
@@ -42,12 +45,11 @@ export function createNextApiHandler<TRouter extends AnyRouter>(
         path: undefined,
         input: undefined,
       });
-      const json: TRPCErrorResponse = {
+      res.statusCode = 500;
+      res.json({
         id: -1,
         error,
-      };
-      res.statusCode = 500;
-      res.json(json);
+      });
       return;
     }
 

package/src/adapters/node-http/internals/getPostBody.test.ts

@@ -1,5 +1,6 @@
-import { getPostBody } from './getPostBody';
 import { EventEmitter } from 'events';
+import { getPostBody } from './getPostBody';
+
 test('has body', async () => {
   const body = {};
   const resolvedBody = await getPostBody({ req: { body } } as any);

package/src/adapters/node-http/internals/getPostBody.ts

@@ -1,4 +1,4 @@
-import { TRPCError } from '../../../TRPCError';
+import { TRPCError } from '../../../error/TRPCError';
 import { NodeHTTPRequest } from '../types';
 
 export async function getPostBody({

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

@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { URLSearchParams } from 'url';
 import { assertNotBrowser } from '../../assertNotBrowser';
+import { AnyRouter } from '../../core';
+import { inferRouterDef } from '../../core/types';
+import { HTTPRequest } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { getPostBody } from './internals/getPostBody';
 import {
+  NodeHTTPHandlerOptions,
   NodeHTTPRequest,
   NodeHTTPResponse,
-  NodeHTTPHandlerOptions,
 } from './types';
-import { AnyRouter, inferRouterContext } from '../../router';
-import { getPostBody } from './internals/getPostBody';
-import { HTTPRequest } from '../../http/internals/types';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 
 assertNotBrowser();
 
@@ -29,7 +29,7 @@ export async function nodeHTTPRequestHandler<
   TResponse extends NodeHTTPResponse,
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
   const createContext = async function _createContext(): Promise<
-    inferRouterContext<TRouter>
+    inferRouterDef<TRouter>['_ctx']
   > {
     return await opts.createContext?.(opts);
   };

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

@@ -1,15 +1,17 @@
-import http from 'http';
-import qs from 'qs';
-import { inferRouterContext } from '../..';
+import { IncomingMessage, ServerResponse } from 'http';
+import { AnyRouter, inferRouterContext } from '../../core';
+import { inferRouterDef } from '../../core';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
-import { AnyRouter } from '../../router';
 
-export type NodeHTTPRequest = http.IncomingMessage & {
-  method?: string;
-  query?: qs.ParsedQs;
+interface ParsedQs {
+  [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
+}
+
+export type NodeHTTPRequest = IncomingMessage & {
+  query?: ParsedQs;
   body?: unknown;
 };
-export type NodeHTTPResponse = http.ServerResponse;
+export type NodeHTTPResponse = ServerResponse;
 
 export type NodeHTTPCreateContextOption<
   TRouter extends AnyRouter,
@@ -48,4 +50,4 @@ export type NodeHTTPCreateContextFn<
   TResponse,
 > = (
   opts: NodeHTTPCreateContextFnOptions<TRequest, TResponse>,
-) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+) => inferRouterDef<TRouter>['_ctx'] | Promise<inferRouterDef<TRouter>['_ctx']>;

package/src/adapters/standalone.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import http from 'http';
-import url from 'url';
-import { AnyRouter } from '../router';
+import { AnyRouter } from '../core';
 import {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
@@ -21,12 +21,20 @@ 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);
+    // if no hostname, set a dummy one
+    const href = req.url!.startsWith('/')
+      ? `http://127.0.0.1${req.url}`
+      : req.url!;
+
+    // get procedure path and remove the leading slash
+    // /procedure -> procedure
+    const path = new URL(href).pathname.slice(1);
+
     await nodeHTTPRequestHandler({
       ...opts,
       req,
       res,
-      path: endpoint,
+      path,
     });
   };
 }