Fixed environment variables and sensible defaults

Author: javedh-dev

.env.example

@@ -6,7 +6,7 @@
 # -----------------------------------------------------------------------------
 # Application Environment
 # -----------------------------------------------------------------------------
-NODE_ENV=development
+ENVIRONMENT=development
 
 # -----------------------------------------------------------------------------
 # Server Configuration
@@ -22,11 +22,6 @@ CLIENT_PORT=5173
 # -----------------------------------------------------------------------------
 # API Configuration
 # -----------------------------------------------------------------------------
-# Base URL for API calls (used by frontend)
-# In development: http://localhost:3000
-# In production: your domain or leave empty for relative URLs
-API_BASE_URL=http://localhost:3000
-
 # SvelteKit public environment variables (PUBLIC_ prefix required)
 PUBLIC_API_BASE_URL=http://localhost:3000
 
@@ -39,9 +34,6 @@ DATABASE_PATH=./vehicles.db
 # -----------------------------------------------------------------------------
 # Application Features
 # -----------------------------------------------------------------------------
-# Enable demo mode (disables certain features for public demos)
-DEMO_MODE=false
-
 # SvelteKit public demo mode (PUBLIC_ prefix required)
 PUBLIC_DEMO_MODE=false
 

app/backend/index.ts

@@ -1,9 +1,3 @@
-import { config } from "dotenv";
-import { resolve } from "path";
-
-// Load environment variables from root directory
-config({ path: resolve(process.cwd(), "../../.env") });
-
 import express from "express";
 import cors from "cors";
 import pinRoutes from "@routes/pinRoutes.js";
@@ -21,21 +15,21 @@ const app = express();
 // Configure CORS - simplified for development
 const corsOptions = env.isDevelopment()
   ? {
-      // In development, allow all origins for easier debugging
-      origin: true,
-      credentials: true,
-      methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-      allowedHeaders: ["Content-Type", "Authorization", "X-User-PIN"],
-      optionsSuccessStatus: 200,
-    }
+    // In development, allow all origins for easier debugging
+    origin: true,
+    credentials: true,
+    methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+    allowedHeaders: ["Content-Type", "Authorization", "X-User-PIN"],
+    optionsSuccessStatus: 200,
+  }
   : {
-      // In production, use strict origin checking
-      origin: env.CORS_ORIGINS,
-      credentials: true,
-      methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-      allowedHeaders: ["Content-Type", "Authorization", "X-User-PIN"],
-      optionsSuccessStatus: 200,
-    };
+    // In production, use strict origin checking
+    origin: env.CORS_ORIGINS,
+    credentials: true,
+    methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+    allowedHeaders: ["Content-Type", "Authorization", "X-User-PIN"],
+    optionsSuccessStatus: 200,
+  };
 
 app.use(cors(corsOptions));
 
@@ -69,14 +63,14 @@ initializeDatabase()
       console.log(
         `🚀 Server running at http://${env.SERVER_HOST}:${env.SERVER_PORT}`
       );
-      console.log(`📊 Environment: ${env.NODE_ENV}`);
-      console.log(`🗄️ Database: ${env.DATABASE_PATH}`);
-      console.log(`🎭 Demo Mode: ${env.DEMO_MODE ? "Enabled" : "Disabled"}`);
+      console.log(`Environment: ${env.ENVIRONMENT}`);
+      console.log(`Database: ${env.DATABASE_PATH}`);
+      console.log(`Demo Mode: ${env.DEMO_MODE ? "Enabled" : "Disabled"}`);
       console.log(
-        `🌐 CORS: ${env.isDevelopment() ? "Permissive (Development)" : "Strict (Production)"}`
+        `CORS: ${env.isDevelopment() ? "Permissive (Development)" : "Strict (Production)"}`
       );
       if (!env.isDevelopment()) {
-        console.log(`📋 Allowed origins: ${env.CORS_ORIGINS.join(", ")}`);
+        console.log(`Allowed origins: ${env.CORS_ORIGINS.join(", ")}`);
       }
       console.log("─".repeat(75));
     });

app/backend/nodemon.json

@@ -1,8 +1,10 @@
 {
-  "watch": ["./**/*.ts"],
+  "watch": [
+    "./**/*.ts"
+  ],
   "ext": "ts",
   "exec": "tsx index.ts",
   "env": {
-    "NODE_ENV": "development"
+    "ENVIRONMENT": "development"
   }
-}
+}

app/backend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "server",
+  "name": "backend",
   "version": "0.0.1",
   "description": "Tractor backend",
   "main": "dist/index.js",
@@ -45,4 +45,4 @@
     "tsx": "^4.20.3",
     "typescript": "^5.8.3"
   }
-}
+}

app/backend/src/config/env.ts

@@ -1,11 +1,36 @@
-/**
- * Environment Configuration
- * Centralized environment variable management for the backend
- */
+import { config } from "dotenv";
+import { resolve } from "path";
+
+// Load environment variables from root directory
+config({
+  path: resolve(process.cwd(), "../../.env"),
+  override: true,
+  quiet: true,
+});
+
+
+const getOrigins = (): string[] => {
+  const origins = process.env.CORS_ORIGINS;
+  if (!origins) {
+    // Allow localhost by default in development
+    if (process.env.ENVIRONMENT === "development") {
+      return ["*"];
+    } else {
+      return [
+        "http://localhost:5173",
+        "http://localhost:3000",
+        "http://127.0.0.1:5173",
+        "http://127.0.0.1:3000",
+      ]
+    }
+  }
+
+  return origins.split(",").map(origin => origin.trim()).filter(Boolean);
+}
 
 export const env = {
   // Application Environment
-  NODE_ENV: process.env.NODE_ENV || "development",
+  ENVIRONMENT: process.env.NODE_ENV || "development",
 
   // Server Configuration
   SERVER_HOST: process.env.SERVER_HOST || "0.0.0.0",
@@ -15,26 +40,19 @@ export const env = {
   DATABASE_PATH: process.env.DATABASE_PATH || "./vehicles.db",
 
   // Application Features
-  DEMO_MODE: process.env.DEMO_MODE === "true",
+  DEMO_MODE: process.env.PUBLIC_DEMO_MODE === "true",
 
   // CORS Configuration
-  CORS_ORIGINS: process.env.CORS_ORIGINS?.split(",").map((origin) =>
-    origin.trim(),
-  ) || [
-    "http://localhost:5173",
-    "http://localhost:3000",
-    "http://127.0.0.1:5173",
-    "http://127.0.0.1:3000",
-  ],
+  CORS_ORIGINS: getOrigins(),
 
   // Logging Configuration
   LOG_LEVEL: process.env.LOG_LEVEL || "info",
   LOG_REQUESTS: process.env.LOG_REQUESTS === "true",
 
   // Helper methods
-  isDevelopment: () => process.env.NODE_ENV === "development",
-  isProduction: () => process.env.NODE_ENV === "production",
-  isTest: () => process.env.NODE_ENV === "test",
+  isDevelopment: () => !process.env.ENVIRONMENT || process.env.ENVIRONMENT === "development",
+  isProduction: () => process.env.ENVIRONMENT === "production",
+  isTest: () => process.env.ENVIRONMENT === "test",
 } as const;
 
 export default env;
@@ -43,7 +61,7 @@ export default env;
  * Validate required environment variables
  */
 export function validateEnvironment(): void {
-  const required = ["NODE_ENV"];
+  const required: string[] = [];
   const missing = required.filter((key) => !process.env[key]);
 
   if (missing.length > 0) {
@@ -65,4 +83,4 @@ export function validateEnvironment(): void {
   }
 
   console.log("✅ Environment validation passed");
-}
+}

app/backend/src/db/index.ts

@@ -6,9 +6,13 @@ import { db } from "./db.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Determine if we're running in development (TypeScript) or production (compiled JavaScript)
+const isProduction = __filename.includes("/dist/");
+const migrationExtension = isProduction ? "js" : "ts";
+
 const umzug = new Umzug({
   migrations: {
-    glob: path.join(__dirname, "migrations/*.js"),
+    glob: path.join(__dirname, `migrations/*.${migrationExtension}`),
     resolve: ({ name, path: migrationPath }) => {
       return {
         name,
@@ -36,7 +40,7 @@ type Migration = typeof umzug._types.migration;
 const performDbMigrations = async () => {
   try {
     console.log("Running database migrations...");
-    await umzug.up();
+    await umzug.up({});
     console.log("Migrations completed successfully");
   } catch (error) {
     console.error("Migration failed:", error);

app/backend/src/middleware/async-handler.ts

@@ -0,0 +1,8 @@
+import { Request, Response, NextFunction } from "express";
+
+// Wrapper to catch async errors and pass them to Express error handler
+export const asyncHandler = (fn: Function) => {
+  return (req: Request, res: Response, next: NextFunction) => {
+    Promise.resolve(fn(req, res, next)).catch(next);
+  };
+};

app/backend/src/middleware/error-handler.ts

@@ -1,34 +1,47 @@
-import { Request, Response } from "express";
+import { Request, Response, NextFunction } from "express";
 import { ValidationError } from "sequelize";
 
 export const errorHandler = (
   err: any,
   req: Request,
   res: Response,
-  next: any,
+  next: NextFunction
 ) => {
+  // Log the error for debugging
+  console.error(`Error in ${req.method} ${req.path}:`, err);
+
   res.setHeader("Content-Type", "application/json");
+
+  let statusCode = 500;
   let body = {};
+
   switch (err.name) {
     case "SequelizeValidationError":
+      statusCode = 400;
       body = {
         type: "ValidationError",
-        errors: err.errors.map((e: any) => {
-          return {
-            message: e.message,
-            path: e.path,
-          };
-        }),
+        errors: err.errors.map((e: any) => ({
+          message: e.message,
+          path: e.path,
+        })),
       };
       break;
-    default:
+    case "AuthError":
+      // Use the status from the error if available, otherwise default to 500
+      statusCode = err.status || 500;
       body = {
-        type: err.name,
+        type: "AuthError",
         errors: [{ message: err.message }],
       };
+      break;
+    default:
+      // Check if error has a status property
+      statusCode = err.status || err.statusCode || 500;
+      body = {
+        type: err.name || "Error",
+        errors: [{ message: err.message || "Internal server error" }],
+      };
   }
 
-  console.error(err.name);
-  res.status(500);
-  res.send(JSON.stringify(body));
+  res.status(statusCode).json(body);
 };

app/backend/src/routes/configRoutes.ts

@@ -4,11 +4,12 @@ import {
   getConfigByKey,
   updateConfig,
 } from "@controllers/ConfigController.js";
+import { asyncHandler } from "@middleware/async-handler.js";
 
 const router = Router();
 
-router.get("/", getConfig);
-router.get("/:key", getConfigByKey); // Alias for getConfig
-router.put("/", updateConfig);
+router.get("/", asyncHandler(getConfig));
+router.get("/:key", asyncHandler(getConfigByKey)); // Alias for getConfig
+router.put("/", asyncHandler(updateConfig));
 
 export default router;

app/backend/src/routes/fuelLogRoutes.ts

@@ -7,13 +7,14 @@ import {
   deleteFuelLog,
 } from "@controllers/FuelLogController.js";
 import { authenticatePin } from "@middleware/auth.js";
+import { asyncHandler } from "@middleware/async-handler.js";
 
 const router = Router({ mergeParams: true });
 
-router.post("/", authenticatePin, addFuelLog);
-router.get("/", authenticatePin, getFuelLogs);
-router.get("/:id", authenticatePin, getFuelLogById);
-router.put("/:id", authenticatePin, updateFuelLog);
-router.delete("/:id", authenticatePin, deleteFuelLog);
+router.post("/", authenticatePin, asyncHandler(addFuelLog));
+router.get("/", authenticatePin, asyncHandler(getFuelLogs));
+router.get("/:id", authenticatePin, asyncHandler(getFuelLogById));
+router.put("/:id", authenticatePin, asyncHandler(updateFuelLog));
+router.delete("/:id", authenticatePin, asyncHandler(deleteFuelLog));
 
 export default router;