chore: tidy env vars

Author: FelixNgFender

next.config.js

@@ -8,10 +8,7 @@ const nextConfig = {
     experimental: {
         instrumentationHook: true,
     },
-    webpack: (
-        config,
-        { isServer },
-    ) => {
+    webpack: (config, { isServer }) => {
         config.externals.push('@node-rs/argon2', '@node-rs/bcrypt');
         if (isServer) {
             config.ignoreWarnings = [{ module: /opentelemetry/ }];

scripts/create-bucket.mjs

@@ -6,8 +6,7 @@ if (
     !process.env.S3_USE_SSL ||
     !process.env.S3_ACCESS_KEY ||
     !process.env.S3_SECRET_KEY ||
-    !process.env.S3_BUCKET_NAME ||
-    !process.env.S3_BUCKET_REGION
+    !process.env.S3_BUCKET_NAME
 ) {
     throw new Error('S3 environment variables are not set');
 }
@@ -27,10 +26,7 @@ const main = async () => {
     } else {
         console.info(`Bucket ${process.env.S3_BUCKET_NAME} does not exist.`);
         console.info(`Creating bucket ${process.env.S3_BUCKET_NAME}...`);
-        await fileStorage.makeBucket(
-            process.env.S3_BUCKET_NAME,
-            process.env.S3_BUCKET_REGION,
-        );
+        await fileStorage.makeBucket(process.env.S3_BUCKET_NAME);
         console.info(`Bucket ${process.env.S3_BUCKET_NAME} created.`);
     }
     process.exit(0);

src/app/api/healthcheck/route.ts

@@ -1,4 +1,4 @@
-import { redis, db, fileStorage } from '@/infra';
+import { db, fileStorage, redis } from '@/infra';
 import { withErrorHandling } from '@/lib/error';
 import { HttpResponse } from '@/lib/response';
 import { sql } from 'drizzle-orm';

src/app/auth/sign-in/_facebook/route.ts

@@ -14,7 +14,7 @@
 //     });
 //     cookies().set('facebook_oauth_state', state, {
 //         path: '/',
-//         secure: env.NODE_ENV === 'production',
+//         secure: process.env.NODE_ENV === 'production',
 //         httpOnly: true,
 //         maxAge: env.AUTH_COOKIE_DURATION_S,
 //         sameSite: 'lax',

src/app/auth/sign-in/github/route.ts

@@ -14,7 +14,7 @@ export const GET = withErrorHandling(async () => {
     });
     cookies().set('github_oauth_state', state, {
         path: '/',
-        secure: env.NODE_ENV === 'production',
+        secure: process.env.NODE_ENV === 'production',
         httpOnly: true,
         maxAge: env.AUTH_COOKIE_DURATION_S,
         sameSite: 'lax',

src/app/auth/sign-in/google/route.ts

@@ -15,14 +15,14 @@ export const GET = withErrorHandling(async () => {
     });
     cookies().set('google_oauth_code_verifier', codeVerifier, {
         path: '/',
-        secure: env.NODE_ENV === 'production',
+        secure: process.env.NODE_ENV === 'production',
         httpOnly: true,
         maxAge: env.AUTH_COOKIE_DURATION_S,
         sameSite: 'lax',
     });
     cookies().set('google_oauth_state', state, {
         path: '/',
-        secure: env.NODE_ENV === 'production',
+        secure: process.env.NODE_ENV === 'production',
         httpOnly: true,
         maxAge: env.AUTH_COOKIE_DURATION_S,
         sameSite: 'lax',

src/app/layout.tsx

@@ -21,7 +21,7 @@ const fontSans = FontSans({
 
 export const metadata: Metadata = {
     metadataBase:
-        env.NODE_ENV === 'development'
+        process.env.NODE_ENV === 'development'
             ? new URL(env.ORIGIN)
             : new URL(siteConfig.url),
     title: {

src/components/ui/spotlight.tsx

@@ -10,7 +10,7 @@ export const Spotlight = ({ className, fill }: SpotlightProps) => {
     return (
         <svg
             className={cn(
-                'animate-spotlight pointer-events-none absolute z-[1]  h-[169%] w-[138%] opacity-0 lg:w-[84%]',
+                'pointer-events-none absolute z-[1] h-[169%]  w-[138%] animate-spotlight opacity-0 lg:w-[84%]',
                 className,
             )}
             xmlns="http://www.w3.org/2000/svg"

src/config/env.ts

@@ -6,15 +6,24 @@ const isBoolean = isString.transform((value) => value === 'true');
 const isNumber = isString.transform(Number);
 
 const envSchema = z.object({
-    // Node.js
-    NODE_ENV: z.enum(['development', 'production', 'test']),
-
-    // Express
+    // General
+    NEXT_MANUAL_SIG_HANDLE: isBoolean,
     PROTOCOL: z.enum(['http', 'https']),
-    APP_PORT: isNumber,
     HOST: isString,
+    APP_PORT: isNumber,
 
-    // General
+    // Authentication
+    AUTH_COOKIE_DURATION_S: isNumber,
+    GOOGLE_CLIENT_ID: isString,
+    GOOGLE_CLIENT_SECRET: isString,
+    GOOGLE_REDIRECT_URI: isString,
+    // FACEBOOK_CLIENT_ID: isString,
+    // FACEBOOK_CLIENT_SECRET: isString,
+    // FACEBOOK_REDIRECT_URI: isString,
+    GITHUB_CLIENT_ID: isString,
+    GITHUB_CLIENT_SECRET: isString,
+
+    // Logging
     APP_LOGGING: isBoolean,
     LOG_LEVEL: z.enum([
         'error',
@@ -25,25 +34,39 @@ const envSchema = z.object({
         'debug',
         'silly',
     ]),
-    ENABLE_EMAIL: isBoolean,
+
+    // Rate limiting
     ENABLE_RATE_LIMIT: isBoolean,
-    ENABLE_ANALYTICS: isBoolean,
-    AUTH_COOKIE_DURATION_S: isNumber,
+
+    // Captcha
+    NEXT_PUBLIC_ENABLE_CAPTCHA: isBoolean.optional(),
+    NEXT_PUBLIC_CAPTCHA_SITE_KEY: isString.optional(),
     CAPTCHA_SECRET_KEY: isString.optional(),
+
+    // Email
+    ENABLE_EMAIL: isBoolean,
     AWS_ACCESS_KEY_ID: isString.optional(),
     AWS_SECRET_ACCESS_KEY: isString.optional(),
 
     // Analytics
+    ENABLE_ANALYTICS: isBoolean,
     UMAMI_SCRIPT_URL: isString.optional(),
     UMAMI_ANALYTICS_ID: isString.optional(),
 
     // Instrumentation
     ENABLE_INSTRUMENTATION: isBoolean,
+    OTEL_EXPORTER_OTLP_ENDPOINT: isString.optional(),
+    OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: isString.optional(),
+    OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: isString.optional(),
+    NEXT_OTEL_VERBOSE: isNumber.optional(),
+    OTEL_LOG_LEVEL: isString.optional(),
 
     // Database
     DATABASE_LOGGING: isBoolean,
     DATABASE_URL: isString,
     REDIS_URL: isString,
+
+    // S3
     S3_ENDPOINT: isString,
     S3_PORT: isNumber,
     S3_USE_SSL: isBoolean,
@@ -52,16 +75,6 @@ const envSchema = z.object({
     S3_BUCKET_NAME: isString,
     S3_PRESIGNED_URL_EXPIRATION_S: isNumber,
 
-    // Auth
-    GOOGLE_CLIENT_ID: isString,
-    GOOGLE_CLIENT_SECRET: isString,
-    GOOGLE_REDIRECT_URI: isString,
-    // FACEBOOK_CLIENT_ID: isString,
-    // FACEBOOK_CLIENT_SECRET: isString,
-    // FACEBOOK_REDIRECT_URI: isString,
-    GITHUB_CLIENT_ID: isString,
-    GITHUB_CLIENT_SECRET: isString,
-
     // Replicate
     REPLICATE_API_TOKEN: isString,
     REPLICATE_WEBHOOK_SECRET: isString,

src/infra/database.ts

@@ -19,7 +19,7 @@ declare global {
 
 let db: PostgresJsDatabase<typeof schema>;
 
-if (env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production') {
     db = drizzle(postgres(env.DATABASE_URL), {
         logger: env.DATABASE_LOGGING && new DatabaseLogger(),
         schema,

src/infra/redis.ts

@@ -11,7 +11,7 @@ declare global {
 
 let redis: RedisClientType;
 
-if (env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production') {
     redis = createClient({ url: env.REDIS_URL, disableOfflineQueue: true });
 } else {
     if (!global.redis) {

src/lib/auth.ts

@@ -16,7 +16,7 @@ export const auth = new Lucia(adapter, {
         expires: false,
         attributes: {
             // set to `true` when using HTTPS
-            secure: env.NODE_ENV === 'production',
+            secure: process.env.NODE_ENV === 'production',
         },
     },
     getUserAttributes: (attributes) => {