diff --git a/package.json b/package.json index 50fda63..853cfef 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,7 @@ "@sentry/node": "~7.59.3", "fastify": "~5.6.2", "fastify-plugin": "~5.1.0", - "http-errors": "~2.0.0", - "nested-env-schema": "~1.4.0", + "nested-env-schema": "~1.4.1", "yaml": "~2.5.0", "zod": "~4.1.12" }, @@ -46,7 +45,6 @@ }, "devDependencies": { "@types/chai": "~4.3.3", - "@types/http-errors": "~2.0.1", "@types/mocha": "~9.1.1", "@types/node": "~22.13.5", "@types/sinon": "~17.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 22fad41..c06ac96 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,12 +62,9 @@ importers: fastify-plugin: specifier: ~5.1.0 version: 5.1.0 - http-errors: - specifier: ~2.0.0 - version: 2.0.0 nested-env-schema: - specifier: ~1.4.0 - version: 1.4.0 + specifier: ~1.4.1 + version: 1.4.1 yaml: specifier: ~2.5.0 version: 2.5.1 @@ -78,9 +75,6 @@ importers: '@types/chai': specifier: ~4.3.3 version: 4.3.16 - '@types/http-errors': - specifier: ~2.0.1 - version: 2.0.4 '@types/mocha': specifier: ~9.1.1 version: 9.1.1 @@ -749,9 +743,6 @@ packages: '@types/chai@4.3.16': resolution: {integrity: sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==} - '@types/http-errors@2.0.4': - resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==} - '@types/json5@0.0.29': resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -2398,8 +2389,8 @@ packages: engines: {node: '>= 4.4.x'} hasBin: true - nested-env-schema@1.4.0: - resolution: {integrity: sha512-c6AyPFCsg15BhdcmVzBdoC+1PHHqQzU7IUWj79Gj8RORri5+D6z4jzrpYcdWGEQVg7TT+nfuPCQpXH79QZWWaw==} + nested-env-schema@1.4.1: + resolution: {integrity: sha512-VNo61NvaIPif/hhyva+EcIVs8hhF/2WdTD0wepE+k14Vcq/wWkG03cZQpzhUnN1k9wYo3stpQEgIcxJCup/ksQ==} netmask@2.0.2: resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} @@ -4125,8 +4116,6 @@ snapshots: '@types/chai@4.3.16': {} - '@types/http-errors@2.0.4': {} - '@types/json5@0.0.29': {} '@types/mocha@9.1.1': {} @@ -5912,7 +5901,7 @@ snapshots: transitivePeerDependencies: - supports-color - nested-env-schema@1.4.0: + nested-env-schema@1.4.1: dependencies: '@dotenvx/dotenvx': 1.11.1 ajv: 8.17.1 diff --git a/src/index.ts b/src/index.ts index 0258b9c..614c8c2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,10 +7,9 @@ import fastify from 'fastify'; import fastifyAutoload from '@fastify/autoload'; import { FastifyError } from '@fastify/error'; import fastifyHelmet from '@fastify/helmet'; -import fastifySensible from '@fastify/sensible'; +import fastifySensible, { HttpError } from '@fastify/sensible'; import fastifySwagger from '@fastify/swagger'; import fastifySwaggerUi from '@fastify/swagger-ui'; -import httpErrors from 'http-errors'; export const server = async () => { const app = fastify({ @@ -34,7 +33,7 @@ export const server = async () => { await app.register(fastifyHelmet); app.setErrorHandler((error, request, reply) => { - if (error instanceof httpErrors.HttpError) { + if (error instanceof HttpError) { return error; } diff --git a/src/plugins/error.ts b/src/plugins/error.ts index 0e0ddbf..f0d92da 100644 --- a/src/plugins/error.ts +++ b/src/plugins/error.ts @@ -6,6 +6,7 @@ import { env, environment, isProduction, + isTest, product, service, version, @@ -41,7 +42,7 @@ const errorPlugin: FastifyPluginAsync = async (app) => { scope.setContext('error', { message: err.message, ...context }); captureException(err); }); - } else { + } else if (!isTest) { console.error(err); } diff --git a/src/telemetry.ts b/src/telemetry.ts index 08f671b..64ead79 100644 --- a/src/telemetry.ts +++ b/src/telemetry.ts @@ -82,9 +82,6 @@ export const meter = api.metrics.getMeter('default'); process.on('SIGTERM', () => { sdk .shutdown() - .then( - () => console.log('Telemetry shut down successfully'), - () => console.log('Telemetry shut down failed'), - ) + .catch(() => console.log('Telemetry shut down failed')) .finally(() => process.exit(0)); });