db_enabled error fix

Author: Benjamin-V-Chan

server/src/index.ts

@@ -3,20 +3,27 @@ import ngrok from 'ngrok';
 import dotenv from 'dotenv-mono';
 import chalk from 'chalk';
 import { startDockerContainer, stopDockerContainer } from 'database';
-import { app } from './server.js';
 
 // If DEV is true then change the port we are running on, to prevent undesired caching
 const BACKEND_PORT = process.env.NODE_ENV === 'dev' ? 8081 : 8080;
 
 dotenv.load({ path: '.env' });
 dotenv.load({ path: '.env.local' });
 
+function parseBooleanEnv(value: string | undefined): boolean | undefined {
+    if (value == undefined) return undefined;
+    const normalized = value.trim().toLowerCase();
+    if (normalized.length === 0) return undefined;
+    if (['1', 'true', 'yes', 'on'].includes(normalized)) return true;
+    if (['0', 'false', 'no', 'off'].includes(normalized)) return false;
+    return undefined;
+}
+
 const REMOTE = process.env.LOCATION === 'remote';
 const isDev = process.env.NODE_ENV === 'dev';
-const devUseDocker = ['1', 'true', 'yes', 'on'].includes(
-    String(process.env.DEV_USE_DOCKER ?? '').toLowerCase()
-);
-const dbEnabled = !isDev || devUseDocker;
+const devUseDocker = parseBooleanEnv(process.env.DEV_USE_DOCKER) === true;
+const explicitDbEnabled = parseBooleanEnv(process.env.DB_ENABLED);
+const dbEnabled = explicitDbEnabled ?? (!isDev || devUseDocker);
 process.env.DB_ENABLED = dbEnabled ? 'true' : 'false';
 
 let container: Awaited<ReturnType<typeof startDockerContainer>> | null = null;
@@ -33,6 +40,8 @@ if (dbEnabled) {
     );
 }
 
+const { app } = await import('./server.js');
+
 const server = app.listen(BACKEND_PORT, () => {
     console.log(chalk.green('Server running at http://localhost:' + BACKEND_PORT));
 });

server/src/server.ts

@@ -40,12 +40,20 @@ import {
 
 // import { MatchData } from 'requests';
 
+function parseBooleanEnv(value: string | undefined): boolean | undefined {
+    if (value == undefined) return undefined;
+    const normalized = value.trim().toLowerCase();
+    if (normalized.length === 0) return undefined;
+    if (['1', 'true', 'yes', 'on'].includes(normalized)) return true;
+    if (['0', 'false', 'no', 'off'].includes(normalized)) return false;
+    return undefined;
+}
+
 // If DEV is true then the app should forward requests to localhost:5173 instead of serving from /static
 const DEV = process.env.NODE_ENV === 'dev';
-const DEV_USE_DOCKER = ['1', 'true', 'yes', 'on'].includes(
-    String(process.env.DEV_USE_DOCKER ?? '').toLowerCase()
-);
-const DB_ENABLED = process.env.NODE_ENV !== 'dev' || DEV_USE_DOCKER;
+const DEV_USE_DOCKER = parseBooleanEnv(process.env.DEV_USE_DOCKER) === true;
+const explicitDbEnabled = parseBooleanEnv(process.env.DB_ENABLED);
+const DB_ENABLED = explicitDbEnabled ?? (process.env.NODE_ENV !== 'dev' || DEV_USE_DOCKER);
 const currentDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(currentDir, '../..');
 const staticDir = path.resolve(currentDir, '../static');

server/src/status.ts

@@ -30,9 +30,18 @@ const redPositions = redPositionsAll.slice(
     0,
     gameConfig.allianceSizeRobots.default
 );
-const DB_ENABLED = ['1', 'true', 'yes', 'on'].includes(
-    String(process.env.DB_ENABLED ?? '').toLowerCase()
-);
+function parseBooleanEnv(value: string | undefined): boolean | undefined {
+    if (value == undefined) return undefined;
+    const normalized = value.trim().toLowerCase();
+    if (normalized.length === 0) return undefined;
+    if (['1', 'true', 'yes', 'on'].includes(normalized)) return true;
+    if (['0', 'false', 'no', 'off'].includes(normalized)) return false;
+    return undefined;
+}
+
+const DEV_USE_DOCKER = parseBooleanEnv(process.env.DEV_USE_DOCKER) === true;
+const explicitDbEnabled = parseBooleanEnv(process.env.DB_ENABLED);
+const DB_ENABLED = explicitDbEnabled ?? (process.env.NODE_ENV !== 'dev' || DEV_USE_DOCKER);
 
 function readMatchScheduleSafe(): MatchSchedule | undefined {
     try {