Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/adapters/node-http/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ import { TRPCError } from '@trpc/server';
import { TRPC_ERROR_CODES_BY_KEY } from '@trpc/server/rpc';

export const getErrorFromUnknown = (error: unknown): TRPCError => {
if (error instanceof TRPCError) {
return error;
if (error instanceof Error && error.name === 'TRPCError') {
return error as TRPCError;
}

const code = (error as any).code as keyof typeof TRPC_ERROR_CODES_BY_KEY
const errorToString = typeof (error as any).toString === "function" ? (error as any).toString() : undefined;
const code = (error as any).code as keyof typeof TRPC_ERROR_CODES_BY_KEY;
const errorToString =
typeof (error as any).toString === 'function' ? (error as any).toString() : undefined;
return new TRPCError({
code: TRPC_ERROR_CODES_BY_KEY[code] ? code : 'INTERNAL_SERVER_ERROR',
message: error instanceof Error
? error.message
: errorToString
message:
error instanceof Error
? error.message
: errorToString
? errorToString
: 'Unknown error occurred',
});
Expand Down