fix: resolve frontend/backend env validation and DB schema fallback for time control columns

Author: Kaycee276

backend/.gitignore

@@ -12,7 +12,6 @@ dist
 dist-ssr
 *.local
 .env
-database/
 
 # Editor directories and files
 .vscode/*

backend/database/migrations/013_add_time_control_preset_and_undo.sql

@@ -0,0 +1,11 @@
+-- Migration: Add time_control_preset, time_increment_seconds, and undo_request columns to games table
+ALTER TABLE games ADD COLUMN IF NOT EXISTS time_control_preset VARCHAR(20);
+ALTER TABLE games ADD COLUMN IF NOT EXISTS time_increment_seconds INTEGER DEFAULT 0;
+ALTER TABLE games ADD COLUMN IF NOT EXISTS undo_request VARCHAR(10);
+ALTER TABLE games ADD COLUMN IF NOT EXISTS undo_request_at TIMESTAMP WITH TIME ZONE;
+
+-- DOWN
+ALTER TABLE games DROP COLUMN IF EXISTS time_control_preset;
+ALTER TABLE games DROP COLUMN IF EXISTS time_increment_seconds;
+ALTER TABLE games DROP COLUMN IF EXISTS undo_request;
+ALTER TABLE games DROP COLUMN IF EXISTS undo_request_at;

backend/models/gameModel.js

@@ -21,24 +21,38 @@ class GameModel {
 		if (!gameCode) gameCode = this.generateGameCode();
 		const initialBoard = chessEngine.initBoard();
 
-		const { data, error } = await supabase
+		const insertPayload = {
+			game_code: gameCode,
+			game_type: gameType,
+			board_state: initialBoard,
+			current_turn: "white",
+			status: "waiting",
+			wager_amount: wagerAmount,
+			player_white_address: playerWhiteAddress,
+			escrow_status: wagerAmount ? "pending" : null,
+			time_control_seconds: timeControlSeconds,
+			time_control_preset: timeControlPreset,
+			time_increment_seconds: timeIncrementSeconds || 0,
+		};
+
+		let { data, error } = await supabase
 			.from("games")
-			.insert({
-				game_code: gameCode,
-				game_type: gameType,
-				board_state: initialBoard,
-				current_turn: "white",
-				status: "waiting",
-				wager_amount: wagerAmount,
-				player_white_address: playerWhiteAddress,
-				escrow_status: wagerAmount ? "pending" : null,
-				time_control_seconds: timeControlSeconds,
-				time_control_preset: timeControlPreset,
-				time_increment_seconds: timeIncrementSeconds || 0,
-			})
+			.insert(insertPayload)
 			.select()
 			.single();
 
+		if (error && error.message && (error.message.includes("time_control_preset") || error.message.includes("time_increment_seconds"))) {
+			delete insertPayload.time_control_preset;
+			delete insertPayload.time_increment_seconds;
+			const retry = await supabase
+				.from("games")
+				.insert(insertPayload)
+				.select()
+				.single();
+			data = retry.data;
+			error = retry.error;
+		}
+
 		if (error) throw error;
 		return data;
 	}

backend/tests/envValidator.test.js

@@ -31,6 +31,7 @@ describe("Backend Environment Validator (envValidator)", () => {
   it("throws error when SUPABASE_KEY is missing", () => {
     process.env.SUPABASE_URL = "https://example.supabase.co";
     delete process.env.SUPABASE_KEY;
+    delete process.env.SUPABASE_ANON_KEY;
     process.env.SOROBAN_RPC_URL = "https://soroban-testnet.stellar.org";
 
     expect(() => validateEnv({ skipExit: true })).toThrow(/SUPABASE_KEY/);
@@ -40,6 +41,7 @@ describe("Backend Environment Validator (envValidator)", () => {
     process.env.SUPABASE_URL = "https://example.supabase.co";
     process.env.SUPABASE_KEY = "test-key-123";
     delete process.env.SOROBAN_RPC_URL;
+    delete process.env.STELLAR_RPC_URL;
 
     expect(() => validateEnv({ skipExit: true })).toThrow(/SOROBAN_RPC_URL/);
   });

frontend/.env.example

@@ -1,3 +1,4 @@
+VITE_CONTRACT_ID=your_contract_address
 VITE_ESCROW_CONTRACT_ADDRESS=your_contract_address
 VITE_BACKEND_URL=http://localhost:3000/
 VITE_STELLAR_RPC_URL=https://soroban-testnet.stellar.org

frontend/src/services/stellarService.ts

@@ -3,7 +3,7 @@ import { signTransaction } from "@stellar/freighter-api";
 
 const RPC_URL = import.meta.env.VITE_STELLAR_RPC_URL || "https://soroban-testnet.stellar.org";
 const NETWORK_PASSPHRASE = import.meta.env.VITE_STELLAR_NETWORK_PASSPHRASE || Networks.TESTNET;
-const ESCROW_ADDRESS = import.meta.env.VITE_ESCROW_CONTRACT_ADDRESS || "";
+const ESCROW_ADDRESS = import.meta.env.VITE_ESCROW_CONTRACT_ADDRESS || import.meta.env.VITE_CONTRACT_ID || "";
 
 const server = new rpc.Server(RPC_URL);
 

frontend/src/utils/envValidator.ts

@@ -23,7 +23,10 @@ export function validateFrontendEnv(): boolean {
   const missing: RequiredFrontendEnv[] = [];
 
   for (const envVar of REQUIRED_FRONTEND_VARS) {
-    const value = import.meta.env[envVar.key];
+    let value = import.meta.env[envVar.key];
+    if (!value && envVar.key === "VITE_CONTRACT_ID") {
+      value = import.meta.env.VITE_ESCROW_CONTRACT_ADDRESS;
+    }
     if (!value || String(value).trim() === "") {
       missing.push(envVar);
     }