@trpc/server 11.0.0-rc.348 → 11.0.0-rc.354

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

@@ -24,8 +24,6 @@ import type {
   ResolveHTTPRequestOptionsContextFn,
 } from '../../@trpc/server/http';
 import { resolveHTTPResponse } from '../../@trpc/server/http';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType';
-import { getLambdaHTTPJSONContentTypeHandler } from './content-type/json';
 import type {
   APIGatewayEvent,
   APIGatewayResult,
@@ -52,10 +50,18 @@ function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
     }
   }
 
+  let body: string | null | undefined;
+  if (event.body && event.isBase64Encoded) {
+    body = Buffer.from(event.body, 'base64').toString('utf8');
+  } else {
+    body = event.body;
+  }
+
   return {
     method: getHTTPMethod(event),
     query: query,
     headers: event.headers,
+    body: body,
   };
 }
 
@@ -103,39 +109,18 @@ export function awsLambdaRequestHandler<
   return async (event, context) => {
     const req = lambdaEventToHTTPRequest(event);
     const path = getPath(event);
-
     const createContext: ResolveHTTPRequestOptionsContextFn<TRouter> = async (
       innerOpts,
     ) => {
       return await opts.createContext?.({ event, context, ...innerOpts });
     };
 
-    const [contentTypeHandler, unsupportedMediaTypeError] =
-      selectContentHandlerOrUnsupportedMediaType(
-        [getLambdaHTTPJSONContentTypeHandler<TRouter, TEvent>()],
-        {
-          ...opts,
-          event,
-          req,
-        },
-      );
-
     const response = await resolveHTTPResponse({
       ...opts,
       createContext,
       req,
       path,
-      error: unsupportedMediaTypeError,
-      async getInput(info) {
-        return await contentTypeHandler?.getInputs(
-          {
-            ...opts,
-            event,
-            req,
-          },
-          info,
-        );
-      },
+      error: null,
       onError(o) {
         opts?.onError?.({
           ...o,

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

@@ -14,12 +14,7 @@ import type {
   APIGatewayProxyStructuredResultV2,
   Context as APIGWContext,
 } from 'aws-lambda';
-import type {
-  AnyRouter,
-  CreateContextCallback,
-  inferRouterContext,
-} from '../../@trpc/server';
-// import @trpc/server
+import type { AnyRouter, inferRouterContext } from '../../@trpc/server'; // import @trpc/server
 
 // @trpc/server
 import { TRPCError } from '../../@trpc/server';
@@ -55,10 +50,20 @@ export type AWSLambdaOptions<
   TEvent extends APIGatewayEvent,
 > =
   | HTTPBaseHandlerOptions<TRouter, TEvent> &
-      CreateContextCallback<
-        inferRouterContext<AnyRouter>,
-        AWSLambdaCreateContextFn<TRouter, TEvent>
-      >;
+      (
+        | {
+            /**
+             * @link https://trpc.io/docs/v11/context
+             **/
+            createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
+          }
+        | {
+            /**
+             * @link https://trpc.io/docs/v11/context
+             **/
+            createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
+          }
+      );
 
 export function isPayloadV1(
   event: APIGatewayEvent,
@@ -157,14 +162,3 @@ export type APIGatewayPayloadFormatVersion =
 export const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE =
   'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' +
   'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-export function lambdaEventToHTTPBody(event: APIGatewayEvent) {
-  let body: string | null | undefined;
-  if (event.body && event.isBase64Encoded) {
-    body = Buffer.from(event.body, 'base64').toString('utf8');
-  } else {
-    body = event.body;
-  }
-
-  return body;
-}

package/src/adapters/express.ts

@@ -27,7 +27,12 @@ export function createExpressMiddleware<TRouter extends AnyRouter>(
     const endpoint = req.path.slice(1);
 
     await nodeHTTPRequestHandler({
-      ...opts,
+      // FIXME: no typecasting should be needed here
+      ...(opts as NodeHTTPHandlerOptions<
+        AnyRouter,
+        express.Request,
+        express.Response
+      >),
       req,
       res,
       path: endpoint,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -7,11 +7,12 @@
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 import type { FastifyReply, FastifyRequest } from 'fastify';
 // @trpc/server
 import type { AnyRouter } from '../../@trpc/server';
 import type {
+  HTTPBaseHandlerOptions,
   HTTPRequest,
   HTTPResponse,
   ResolveHTTPRequestOptionsContextFn,
@@ -21,9 +22,24 @@ import {
   getBatchStreamFormatter,
   resolveHTTPResponse,
 } from '../../@trpc/server/http';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType';
-import { getFastifyHTTPJSONContentTypeHandler } from './content-type/json';
-import type { FastifyRequestHandlerOptions } from './types';
+import type { NodeHTTPCreateContextOption } from '../node-http';
+
+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,
+> = FastifyHandlerOptions<TRouter, TRequest, TResponse> & {
+  req: TRequest;
+  res: TResponse;
+  path: string;
+};
 
 export async function fastifyRequestHandler<
   TRouter extends AnyRouter,
@@ -47,6 +63,7 @@ export async function fastifyRequestHandler<
     query,
     method: opts.req.method,
     headers: opts.req.headers,
+    body: opts.req.body ?? 'null',
   };
 
   let resolve: (value: FastifyReply) => void;
@@ -91,21 +108,10 @@ export async function fastifyRequestHandler<
     }
   };
 
-  const [contentTypeHandler, unsupportedMediaTypeError] =
-    selectContentHandlerOrUnsupportedMediaType(
-      [getFastifyHTTPJSONContentTypeHandler<TRouter, TRequest, TResponse>()],
-      opts,
-    );
-
   resolveHTTPResponse({
     ...opts,
     req,
-    error: unsupportedMediaTypeError,
-    async getInput(info) {
-      return await contentTypeHandler?.getInputs(opts, info);
-    },
     createContext,
-
     onError(o) {
       opts?.onError?.({ ...o, req: opts.req });
     },

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -9,13 +9,13 @@
  */
 /// <reference types="@fastify/websocket" />
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
+import type { FastifyHandlerOptions } from '.';
 // @trpc/server
 import type { AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
 import type { WSSHandlerOptions } from '../ws';
 import { getWSConnectionHandler } from '../ws';
 import { fastifyRequestHandler } from './fastifyRequestHandler';
-import type { FastifyHandlerOptions } from './types';
 
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
   prefix?: string;

package/src/adapters/fetch/fetchRequestHandler.ts

@@ -21,10 +21,14 @@ import {
   resolveHTTPResponse,
   toURL,
 } from '../../@trpc/server/http';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType';
-import { getFetchHTTPJSONContentTypeHandler } from './content-type/json';
 import type { FetchHandlerOptions } from './types';
 
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> =
+  FetchHandlerOptions<TRouter> & {
+    req: Request;
+    endpoint: string;
+  };
+
 const trimSlashes = (path: string): string => {
   path = path.startsWith('/') ? path.slice(1) : path;
   path = path.endsWith('/') ? path.slice(0, -1) : path;
@@ -33,7 +37,7 @@ const trimSlashes = (path: string): string => {
 };
 
 export async function fetchRequestHandler<TRouter extends AnyRouter>(
-  opts: FetchHandlerOptions<TRouter>,
+  opts: FetchHandlerRequestOptions<TRouter>,
 ): Promise<Response> {
   const resHeaders = new Headers();
 
@@ -53,6 +57,9 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
     query: url.searchParams,
     method: opts.req.method,
     headers: Object.fromEntries(opts.req.headers),
+    body: opts.req.headers.get('content-type')?.startsWith('application/json')
+      ? await opts.req.text()
+      : '',
   };
 
   let resolve: (value: Response) => void;
@@ -110,30 +117,11 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
     }
   };
 
-  const [contentTypeHandler, unsupportedMediaTypeError] =
-    selectContentHandlerOrUnsupportedMediaType(
-      [getFetchHTTPJSONContentTypeHandler<TRouter>()],
-      {
-        ...opts,
-        url,
-      },
-    );
-
   resolveHTTPResponse({
     ...opts,
     req,
     createContext,
     path,
-    error: unsupportedMediaTypeError,
-    async getInput(info) {
-      return await contentTypeHandler?.getInputs(
-        {
-          ...opts,
-          url,
-        },
-        info,
-      );
-    },
     onError(o) {
       opts?.onError?.({ ...o, req: opts.req });
     },

package/src/adapters/fetch/types.ts

@@ -8,12 +8,7 @@
  * ```
  */
 // @trpc/server
-import type {
-  AnyRouter,
-  CreateContextCallback,
-  inferRouterContext,
-  WrapCreateContext,
-} from '../../@trpc/server';
+import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
 // @trpc/server/http
 import type {
   HTTPBaseHandlerOptions,
@@ -31,21 +26,19 @@ export type FetchCreateContextFn<TRouter extends AnyRouter> = (
 ) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
 
 export type FetchCreateContextOption<TRouter extends AnyRouter> =
-  CreateContextCallback<
-    inferRouterContext<TRouter>,
-    FetchCreateContextFn<TRouter>
-  >;
+  unknown extends inferRouterContext<TRouter>
+    ? {
+        /**
+         * @link https://trpc.io/docs/v11/context
+         **/
+        createContext?: FetchCreateContextFn<TRouter>;
+      }
+    : {
+        /**
+         * @link https://trpc.io/docs/v11/context
+         **/
+        createContext: FetchCreateContextFn<TRouter>;
+      };
 
 export type FetchHandlerOptions<TRouter extends AnyRouter> =
-  FetchCreateContextOption<TRouter> &
-    HTTPBaseHandlerOptions<TRouter, Request> & {
-      req: Request;
-      endpoint: string;
-    };
-
-export type FetchHandlerRequestOptions<TRouter extends AnyRouter> =
-  HTTPBaseHandlerOptions<TRouter, Request> &
-    WrapCreateContext<FetchCreateContextFn<TRouter>> & {
-      req: Request;
-      endpoint: string;
-    };
+  FetchCreateContextOption<TRouter> & HTTPBaseHandlerOptions<TRouter, Request>;

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

@@ -1,4 +1,3 @@
-import type { CreateContextCallback } from '../../@trpc/server';
 import { getTRPCErrorFromUnknown, TRPCError } from '../../@trpc/server';
 // FIXME: fix lint rule, this is ok
 // eslint-disable-next-line no-restricted-imports
@@ -16,6 +15,14 @@ import { formDataToObject } from './formDataToObject';
 import { TRPCRedirectError } from './redirect';
 import { rethrowNextErrors } from './rethrowNextErrors';
 
+type ContextCallback<TContext> = object extends TContext
+  ? {
+      createContext?: () => MaybePromise<TContext>;
+    }
+  : {
+      createContext: () => MaybePromise<TContext>;
+    };
+
 /**
  * Create a caller that works with Next.js React Server Components & Server Actions
  */
@@ -31,7 +38,7 @@ export function nextAppDirCaller<TContext>(
        * Called when an error occurs in the handler
        */
       onError?: (opts: ErrorHandlerOptions<TContext>) => void;
-    } & CreateContextCallback<TContext, () => MaybePromise<TContext>>
+    } & ContextCallback<TContext>
   >,
 ): CallerOverride<TContext> {
   const {

package/src/adapters/next.ts

@@ -65,7 +65,12 @@ export function createNextApiHandler<TRouter extends AnyRouter>(
     }
 
     await nodeHTTPRequestHandler({
-      ...opts,
+      // FIXME: no typecasting should be needed here
+      ...(opts as NodeHTTPHandlerOptions<
+        AnyRouter,
+        NextApiRequest,
+        NextApiResponse
+      >),
       req,
       res,
       path,

package/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts

@@ -0,0 +1,277 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+
+/**
+ * Copyright 2021 Remix Software Inc.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+
+/**
+ * @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-node/upload/fileUploadHandler.ts
+ */
+import { randomBytes } from 'node:crypto';
+import { createReadStream, createWriteStream, statSync } from 'node:fs';
+import { mkdir, rm, stat as statAsync, unlink } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { basename, dirname, extname, resolve as resolvePath } from 'node:path';
+import { finished, Readable } from 'node:stream';
+import { promisify } from 'node:util';
+import { streamSlice } from './streamSlice';
+import type { UploadHandler } from './uploadHandler';
+import { MaxPartSizeExceededError } from './uploadHandler';
+
+export async function readableStreamToString(
+  stream: ReadableStream<Uint8Array>,
+  encoding?: BufferEncoding,
+) {
+  const reader = stream.getReader();
+  const chunks: Uint8Array[] = [];
+
+  async function read() {
+    const { done, value } = await reader.read();
+
+    if (done) {
+      return;
+    } else if (value) {
+      chunks.push(value);
+    }
+
+    await read();
+  }
+
+  await read();
+
+  return Buffer.concat(chunks).toString(encoding);
+}
+
+export type FileUploadHandlerFilterArgs = {
+  filename: string;
+  contentType: string;
+  name: string;
+};
+
+export type FileUploadHandlerPathResolverArgs = {
+  filename: string;
+  contentType: string;
+  name: string;
+};
+
+/**
+ * Chooses the path of the file to be uploaded. If a string is not
+ * returned the file will not be written.
+ */
+export type FileUploadHandlerPathResolver = (
+  args: FileUploadHandlerPathResolverArgs,
+) => string | undefined;
+
+export type FileUploadHandlerOptions = {
+  /**
+   * Avoid file conflicts by appending a count on the end of the filename
+   * if it already exists on disk. Defaults to `true`.
+   */
+  avoidFileConflicts?: boolean;
+  /**
+   * The directory to write the upload.
+   */
+  directory?: FileUploadHandlerPathResolver | string;
+  /**
+   * The name of the file in the directory. Can be a relative path, the directory
+   * structure will be created if it does not exist.
+   */
+  file?: FileUploadHandlerPathResolver;
+  /**
+   * The maximum upload size allowed. If the size is exceeded an error will be thrown.
+   * Defaults to 3000000B (3MB).
+   */
+  maxPartSize?: number;
+  /**
+   *
+   * @param filename
+   * @param contentType
+   * @param name
+   */
+  filter?(args: FileUploadHandlerFilterArgs): Promise<boolean> | boolean;
+};
+
+const defaultFilePathResolver: FileUploadHandlerPathResolver = ({
+  filename,
+}) => {
+  const ext = filename ? extname(filename) : '';
+  return 'upload_' + randomBytes(4).readUInt32LE(0) + ext;
+};
+
+async function uniqueFile(filepath: string) {
+  const ext = extname(filepath);
+  let uniqueFilepath = filepath;
+
+  for (
+    let i = 1;
+    await statAsync(uniqueFilepath)
+      .then(() => true)
+      .catch(() => false);
+    i++
+  ) {
+    uniqueFilepath =
+      (ext ? filepath.slice(0, -ext.length) : filepath) +
+      `-${new Date().getTime()}${ext}`;
+  }
+
+  return uniqueFilepath;
+}
+
+export function createFileUploadHandler({
+  directory = tmpdir(),
+  avoidFileConflicts = true,
+  file = defaultFilePathResolver,
+  filter,
+  maxPartSize = 3000000,
+}: FileUploadHandlerOptions = {}): UploadHandler {
+  return async ({ name, filename, contentType, data }) => {
+    if (
+      !filename ||
+      (filter && !(await filter({ name, filename, contentType })))
+    ) {
+      return undefined;
+    }
+
+    const dir =
+      typeof directory === 'string'
+        ? directory
+        : directory({ name, filename, contentType });
+
+    if (!dir) {
+      return undefined;
+    }
+
+    const filedir = resolvePath(dir);
+    const path =
+      typeof file === 'string' ? file : file({ name, filename, contentType });
+
+    if (!path) {
+      return undefined;
+    }
+
+    let filepath = resolvePath(filedir, path);
+
+    if (avoidFileConflicts) {
+      filepath = await uniqueFile(filepath);
+    }
+
+    await mkdir(dirname(filepath), { recursive: true }).catch(() => {});
+
+    const writeFileStream = createWriteStream(filepath);
+    let size = 0;
+    let deleteFile = false;
+    try {
+      for await (const chunk of data) {
+        size += chunk.byteLength;
+        if (size > maxPartSize) {
+          deleteFile = true;
+          throw new MaxPartSizeExceededError(name, maxPartSize);
+        }
+        writeFileStream.write(chunk);
+      }
+    } finally {
+      writeFileStream.end();
+      await promisify(finished)(writeFileStream);
+
+      if (deleteFile) {
+        await rm(filepath).catch(() => {});
+      }
+    }
+
+    return new NodeOnDiskFile(filepath, contentType);
+  };
+}
+type NodeJSReadableStreamEsque = {
+  on(
+    eventName: string | symbol,
+    listener: (...args: any[]) => void,
+  ): NodeJSReadableStreamEsque;
+};
+
+export class NodeOnDiskFile {
+  name: string;
+  lastModified = 0;
+  webkitRelativePath = '';
+
+  constructor(
+    private filepath: string,
+    public type: string,
+    private slicer?: { start: number; end: number },
+  ) {
+    this.name = basename(filepath);
+  }
+
+  get size(): number {
+    const stats = statSync(this.filepath);
+
+    if (this.slicer) {
+      const slice = this.slicer.end - this.slicer.start;
+      return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
+    }
+
+    return stats.size;
+  }
+
+  slice(start?: number, end?: number, type?: string): NodeOnDiskFile {
+    if (typeof start === 'number' && start < 0) start = this.size + start;
+    if (typeof end === 'number' && end < 0) end = this.size + end;
+
+    const startOffset = this.slicer?.start ?? 0;
+
+    start = startOffset + (start ?? 0);
+    end = startOffset + (end ?? this.size);
+    return new NodeOnDiskFile(
+      this.filepath,
+      typeof type === 'string' ? type : this.type,
+      {
+        start,
+        end,
+      },
+    );
+  }
+
+  async arrayBuffer(): Promise<ArrayBuffer> {
+    let stream: Readable = createReadStream(this.filepath);
+    if (this.slicer) {
+      stream = stream.pipe(streamSlice(this.slicer.start, this.slicer.end));
+    }
+
+    return new Promise((resolve, reject) => {
+      const buf: any[] = [];
+      stream.on('data', (chunk) => buf.push(chunk));
+      stream.on('end', () => {
+        resolve(Buffer.concat(buf));
+      });
+      stream.on('error', (err) => {
+        reject(err);
+      });
+    });
+  }
+
+  stream(): ReadableStream<any>;
+  stream(): NodeJSReadableStreamEsque;
+  stream(): NodeJSReadableStreamEsque | ReadableStream<any> {
+    let stream: Readable = createReadStream(this.filepath);
+    if (this.slicer) {
+      stream = stream.pipe(streamSlice(this.slicer.start, this.slicer.end));
+    }
+
+    return Readable.toWeb(stream) as ReadableStream<Uint8Array>;
+  }
+
+  async text(): Promise<string> {
+    return readableStreamToString(this.stream());
+  }
+
+  public readonly [Symbol.toStringTag] = 'File';
+
+  remove(): Promise<void> {
+    return unlink(this.filepath);
+  }
+  getFilePath(): string {
+    return this.filepath;
+  }
+}