diff --git a/.github/workflows/vercel.yml b/.github/workflows/vercel.yml index 3f36a18c..b3a28e74 100644 --- a/.github/workflows/vercel.yml +++ b/.github/workflows/vercel.yml @@ -7,8 +7,9 @@ env: on: push: branches: - - develop + - master - beta + - develop pull_request: jobs: diff --git a/src/api/init.ts b/src/api/init.ts index f9c796dd..a95a3831 100644 --- a/src/api/init.ts +++ b/src/api/init.ts @@ -8,6 +8,7 @@ import { PgStore } from '../pg/pg-store'; import { SatRoutes } from './routes/sats'; import { StatusRoutes } from './routes/status'; import FastifyMetrics from 'fastify-metrics'; +import { isProdEnv } from './util/helpers'; export const Api: FastifyPluginAsync< Record, @@ -26,7 +27,7 @@ export async function buildApiServer(args: { db: PgStore }) { }).withTypeProvider(); fastify.decorate('db', args.db); - if (process.env.NODE_ENV === 'production') { + if (isProdEnv) { await fastify.register(FastifyMetrics); } await fastify.register(FastifyCors); diff --git a/src/api/util/helpers.ts b/src/api/util/helpers.ts index a8f526d9..aa0821d5 100644 --- a/src/api/util/helpers.ts +++ b/src/api/util/helpers.ts @@ -1,6 +1,14 @@ import { DbFullyLocatedInscriptionResult, DbLocation } from '../../pg/types'; import { InscriptionLocationResponse, InscriptionResponseType } from '../schemas'; +export const isDevEnv = process.env.NODE_ENV === 'development'; +export const isTestEnv = process.env.NODE_ENV === 'test'; +export const isProdEnv = + process.env.NODE_ENV === 'production' || + process.env.NODE_ENV === 'prod' || + !process.env.NODE_ENV || + (!isTestEnv && !isDevEnv); + export const DEFAULT_API_LIMIT = 20; export function parseDbInscriptions( diff --git a/src/env.ts b/src/env.ts index a6edd743..c204ec78 100644 --- a/src/env.ts +++ b/src/env.ts @@ -1,14 +1,6 @@ import { Static, Type } from '@sinclair/typebox'; import envSchema from 'env-schema'; -export const isDevEnv = process.env.NODE_ENV === 'development'; -export const isTestEnv = process.env.NODE_ENV === 'test'; -export const isProdEnv = - process.env.NODE_ENV === 'production' || - process.env.NODE_ENV === 'prod' || - !process.env.NODE_ENV || - (!isTestEnv && !isDevEnv); - const schema = Type.Object({ /** * Run mode for this service. Allows you to control how the API runs, typically in an auto-scaled