♻️ Add env variable validation

This commit is contained in:
Meierschlumpf
2023-07-23 14:18:10 +02:00
parent 18e0e2a8ff
commit 3990c1a4ad
12 changed files with 140 additions and 25 deletions

View File

@@ -9,6 +9,7 @@ import {
} from '@tabler/icons-react';
import { i18n, useTranslation } from 'next-i18next';
import { ReactNode } from 'react';
import { env } from '~/env';
import { AccessibilitySettings } from './Accessibility/AccessibilitySettings';
import { GridstackConfiguration } from './Layout/GridstackConfiguration';
@@ -130,7 +131,7 @@ const getItems = () => {
),
},
];
if (process.env.NODE_ENV === 'development') {
if (env.NEXT_PUBLIC_NODE_ENV === 'development') {
items.push({
id: 'dev',
image: <IconCode />,

66
src/env.js Normal file
View File

@@ -0,0 +1,66 @@
const { z } = require('zod');
const { createEnv } = require('@t3-oss/env-nextjs');
const portSchema = z.string().regex(/\d+/).transform(Number).optional()
const envSchema = z.enum(["development", "test", "production"]);
const env = createEnv({
/**
* Specify your server-side environment variables schema here. This way you can ensure the app
* isn't built with invalid env vars.
*/
server: {
DATABASE_URL: z.string().url(),
NODE_ENV: envSchema,
NEXTAUTH_SECRET:
process.env.NODE_ENV === "production"
? z.string().min(1)
: z.string().min(1).optional(),
NEXTAUTH_URL: z.preprocess(
// This makes Vercel deployments not fail if you don't set NEXTAUTH_URL
// Since NextAuth.js automatically uses the VERCEL_URL if present.
(str) => process.env.VERCEL_URL ?? str,
// VERCEL_URL doesn't include `https` so it cant be validated as a URL
process.env.VERCEL ? z.string().min(1) : z.string().url(),
),
DEFAULT_COLOR_SCHEME: z.enum(['light', 'dark']).optional().default('light'),
DOCKER_HOST: z.string().optional(),
DOCKER_PORT: z.string().regex(/\d+/).transform(Number).optional(),
PORT: portSchema
},
/**
* Specify your client-side environment variables schema here. This way you can ensure the app
* isn't built with invalid env vars. To expose them to the client, prefix them with
* `NEXT_PUBLIC_`.
*/
client: {
// NEXT_PUBLIC_CLIENTVAR: z.string().min(1),
NEXT_PUBLIC_PORT: portSchema,
NEXT_PUBLIC_NODE_ENV: envSchema
},
/**
* You can't destruct `process.env` as a regular object in the Next.js edge runtimes (e.g.
* middlewares) or client-side so we need to destruct manually.
*/
runtimeEnv: {
DATABASE_URL: process.env.DATABASE_URL,
NODE_ENV: process.env.NODE_ENV,
NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
NEXTAUTH_URL: process.env.NEXTAUTH_URL,
NEXT_PUBLIC_DISABLE_EDIT_MODE: process.env.DISABLE_EDIT_MODE,
DISABLE_EDIT_MODE: process.env.DISABLE_EDIT_MODE,
DEFAULT_COLOR_SCHEME: process.env.DEFAULT_COLOR_SCHEME,
DOCKER_HOST: process.env.DOCKER_HOST,
DOCKER_PORT: process.env.DOCKER_PORT,
VERCEL_URL: process.env.VERCEL_URL,
PORT: process.env.PORT,
NEXT_PUBLIC_PORT: process.env.PORT,
NEXT_PUBLIC_NODE_ENV: process.env.NODE_ENV
},
});
module.exports = {
env
}

View File

@@ -14,9 +14,10 @@ import { AppProps } from 'next/app';
import Head from 'next/head';
import { useEffect, useState } from 'react';
import 'video.js/dist/video-js.css';
import { env } from '~/env.js';
import { api } from '~/utils/api';
import nextI18nextConfig from '../../next-i18next.config';
import nextI18nextConfig from '../../next-i18next.config.js';
import { ChangeAppPositionModal } from '../components/Dashboard/Modals/ChangePosition/ChangeAppPositionModal';
import { ChangeWidgetPositionModal } from '../components/Dashboard/Modals/ChangePosition/ChangeWidgetPositionModal';
import { EditAppModal } from '../components/Dashboard/Modals/EditAppModal/EditAppModal';
@@ -149,26 +150,22 @@ function App(
}
App.getInitialProps = ({ ctx }: { ctx: GetServerSidePropsContext }) => {
const disableEditMode =
process.env.DISABLE_EDIT_MODE && process.env.DISABLE_EDIT_MODE.toLowerCase() === 'true';
if (disableEditMode) {
if (process.env.DISABLE_EDIT_MODE === 'true') {
Consola.warn(
'EXPERIMENTAL: You have disabled the edit mode. Modifications are no longer possible and any requests on the API will be dropped. If you want to disable this, unset the DISABLE_EDIT_MODE environment variable. This behaviour may be removed in future versions of Homarr'
);
}
if (process.env.DEFAULT_COLOR_SCHEME !== undefined) {
Consola.debug(`Overriding the default color scheme with ${process.env.DEFAULT_COLOR_SCHEME}`);
if (env.DEFAULT_COLOR_SCHEME !== 'light') {
Consola.debug(`Overriding the default color scheme with ${env.DEFAULT_COLOR_SCHEME}`);
}
const colorScheme: ColorScheme = (process.env.DEFAULT_COLOR_SCHEME as ColorScheme) ?? 'light';
return {
pageProps: {
colorScheme: getCookie('color-scheme', ctx) || 'light',
packageAttributes: getServiceSidePackageAttributes(),
editModeEnabled: !disableEditMode,
defaultColorScheme: colorScheme,
editModeEnabled: process.env.DISABLE_EDIT_MODE !== 'true',
defaultColorScheme: env.DEFAULT_COLOR_SCHEME,
},
};
};

View File

@@ -1,4 +1,5 @@
import Docker from 'dockerode';
import { env } from '~/env';
export default class DockerSingleton extends Docker {
private static dockerInstance: DockerSingleton;
@@ -10,10 +11,8 @@ export default class DockerSingleton extends Docker {
public static getInstance(): DockerSingleton {
if (!DockerSingleton.dockerInstance) {
DockerSingleton.dockerInstance = new Docker({
// If env variable DOCKER_HOST is not set, it will use the default socket
...(process.env.DOCKER_HOST && { host: process.env.DOCKER_HOST }),
// Same thing for docker port
...(process.env.DOCKER_PORT && { port: process.env.DOCKER_PORT }),
host: env.DOCKER_HOST,
port: env.DOCKER_PORT,
});
}
return DockerSingleton.dockerInstance;

View File

@@ -1,5 +1,6 @@
import { createNextApiHandler } from '@trpc/server/adapters/next';
import Consola from 'consola';
import { env } from '~/env';
import { rootRouter } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
@@ -8,7 +9,7 @@ export default createNextApiHandler({
router: rootRouter,
createContext: createTRPCContext,
onError:
process.env.NODE_ENV === 'development'
env.NODE_ENV === 'development'
? ({ path, error }) => {
Consola.error(`❌ tRPC failed on ${path ?? '<no-path>'}: ${error.message}`);
}

View File

@@ -1,4 +1,5 @@
import Docker from 'dockerode';
import { env } from '~/env';
export default class DockerSingleton extends Docker {
private static dockerInstance: DockerSingleton;
@@ -10,10 +11,8 @@ export default class DockerSingleton extends Docker {
public static getInstance(): DockerSingleton {
if (!DockerSingleton.dockerInstance) {
DockerSingleton.dockerInstance = new Docker({
// If env variable DOCKER_HOST is not set, it will use the default socket
...(process.env.DOCKER_HOST && { host: process.env.DOCKER_HOST }),
// Same thing for docker port
...(process.env.DOCKER_PORT && { port: process.env.DOCKER_PORT }),
host: env.DOCKER_HOST,
port: env.DOCKER_PORT,
});
}
return DockerSingleton.dockerInstance;

View File

@@ -1,8 +1,10 @@
import { env } from '~/env';
import packageJson from '../../../package.json';
const getServerPackageVersion = (): string | undefined => packageJson.version;
const getServerNodeEnvironment = (): 'development' | 'production' | 'test' => process.env.NODE_ENV;
const getServerNodeEnvironment = () => env.NODE_ENV;
const getDependencies = (): PackageJsonDependencies => packageJson.dependencies;

View File

@@ -8,6 +8,7 @@ import { createTRPCProxyClient, httpBatchLink, loggerLink } from '@trpc/client';
import { createTRPCNext } from '@trpc/next';
import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server';
import superjson from 'superjson';
import { env } from '~/env';
import { type RootRouter } from '~/server/api/root';
const getTrpcConfiguration = () => ({
@@ -26,7 +27,7 @@ const getTrpcConfiguration = () => ({
links: [
loggerLink({
enabled: (opts) =>
process.env.NODE_ENV === 'development' ||
env.NEXT_PUBLIC_NODE_ENV === 'development' ||
(opts.direction === 'down' && opts.result instanceof Error),
}),
httpBatchLink({
@@ -37,8 +38,7 @@ const getTrpcConfiguration = () => ({
const getBaseUrl = () => {
if (typeof window !== 'undefined') return ''; // browser should use relative url
if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; // SSR should use vercel url
return `http://localhost:${process.env.PORT ?? 3000}`; // dev SSR should use localhost
return `http://localhost:${env.NEXT_PUBLIC_PORT ?? 3000}`; // dev SSR should use localhost
};
/** A set of type-safe react-query hooks for your tRPC API. */