Use single runtime env file and generic database URL - PR_26167_193-env-runtime-single-file-and-generic-db-url

Author: ToolboxAid

.env

@@ -1,2 +1,4 @@
-TEST_VAR=hello_world
-API_URL=http://localhost:3000
+GAMEFOUNDRY_SUPABASE_URL=
+GAMEFOUNDRY_SUPABASE_ANON_KEY=
+GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY=
+GAMEFOUNDRY_DATABASE_URL=

.env.example

@@ -1,14 +1,14 @@
 # Game Foundry Studio local development environment
 
-# Configure the local API account and product-data connections here.
+# Configure the runtime auth and database connections here.
 # Missing connection configuration reports diagnostics instead of falling back.
 
 # Browser-safe account connection configuration.
-# Leave values empty in this example; local values belong in .env.local.
+# Leave values empty in this example; local values belong in user-managed copy files.
 GAMEFOUNDRY_SUPABASE_URL=
 GAMEFOUNDRY_SUPABASE_ANON_KEY=
 
 # Server-only product-data and account administration connection configuration.
 # Do not expose these values to browser JavaScript, HTML, reports, or screenshots.
 GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY=
-GAMEFOUNDRY_SUPABASE_DATABASE_URL=
+GAMEFOUNDRY_DATABASE_URL=

.env.uat

@@ -6,4 +6,4 @@
 GAMEFOUNDRY_SUPABASE_URL=
 GAMEFOUNDRY_SUPABASE_ANON_KEY=
 GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY=
-GAMEFOUNDRY_SUPABASE_DATABASE_URL=
+GAMEFOUNDRY_DATABASE_URL=

.gitignore

@@ -37,4 +37,5 @@ docs/dev/reports/playwright_v8_coverage_report.txt
 *.mp4
 *.mkv
 
+.env
 .env.local

scripts/apply-supabase-dev-ddl.mjs

@@ -89,13 +89,13 @@ function envValue(key) {
 }
 
 function parseDatabaseUrl() {
-  const value = envValue("GAMEFOUNDRY_SUPABASE_DATABASE_URL");
+  const value = envValue("GAMEFOUNDRY_DATABASE_URL");
   if (!value) {
-    throw new Error("GAMEFOUNDRY_SUPABASE_DATABASE_URL is required to apply DEV DDL.");
+    throw new Error("GAMEFOUNDRY_DATABASE_URL is required to apply DEV DDL.");
   }
   const databaseUrl = new URL(value);
   if (!["postgres:", "postgresql:"].includes(databaseUrl.protocol)) {
-    throw new Error("GAMEFOUNDRY_SUPABASE_DATABASE_URL must use postgres:// or postgresql://.");
+    throw new Error("GAMEFOUNDRY_DATABASE_URL must use postgres:// or postgresql://.");
   }
   return {
     database: decodeURIComponent(databaseUrl.pathname.replace(/^\/+/, "") || "postgres"),
@@ -431,7 +431,7 @@ async function main() {
   const envLoad = loadEnvLocal();
   const config = parseDatabaseUrl();
   if (!config.user || !config.password) {
-    throw new Error("GAMEFOUNDRY_SUPABASE_DATABASE_URL must include username and password.");
+    throw new Error("GAMEFOUNDRY_DATABASE_URL must include username and password.");
   }
   const socket = await openPostgresTlsConnection(config);
   try {

scripts/start-local-api-server.mjs

@@ -3,8 +3,10 @@ import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { startLocalApiServer } from "../src/dev-runtime/server/local-api-server.mjs";
 
-function loadEnvLocal() {
-  const envPath = path.resolve(process.cwd(), ".env.local");
+const RUNTIME_ENV_FILE = ".env";
+
+function loadRuntimeEnv() {
+  const envPath = path.resolve(process.cwd(), RUNTIME_ENV_FILE);
   if (!existsSync(envPath)) {
     return {
       loaded: false,
@@ -35,7 +37,7 @@ function loadEnvLocal() {
   };
 }
 
-const envLocal = loadEnvLocal();
+const runtimeEnv = loadRuntimeEnv();
 
 function connectionStatus(requiredKeys) {
   const missingKeys = requiredKeys.filter((key) => !String(process.env[key] || "").trim());
@@ -49,21 +51,22 @@ const accountConnection = connectionStatus([
   "GAMEFOUNDRY_SUPABASE_URL",
   "GAMEFOUNDRY_SUPABASE_ANON_KEY",
 ]);
-const productDataConnection = connectionStatus([
+const databaseConnection = connectionStatus([
   "GAMEFOUNDRY_SUPABASE_URL",
   "GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY",
+  "GAMEFOUNDRY_DATABASE_URL",
 ]);
 const host = process.env.GAMEFOUNDRY_LOCAL_API_HOST || "127.0.0.1";
 const port = Number(process.env.GAMEFOUNDRY_LOCAL_API_PORT || 5501);
 
 const localServer = await startLocalApiServer({ host, port });
 
 console.log(`GameFoundry API runtime server running at ${localServer.baseUrl}/account/sign-in.html`);
-console.log(envLocal.loaded
-  ? `.env.local loaded for API runtime (${envLocal.loadedKeys} key(s) applied).`
-  : ".env.local was not found for API runtime.");
-console.log(`Configured account connection: ${accountConnection.ready ? "configured" : `missing ${accountConnection.missingKeys.join(", ")}`}.`);
-console.log(`Configured product data connection: ${productDataConnection.ready ? "configured" : `missing ${productDataConnection.missingKeys.join(", ")}`}.`);
+console.log(runtimeEnv.loaded
+  ? `.env loaded for API runtime (${runtimeEnv.loadedKeys} key(s) applied).`
+  : ".env was not found for API runtime.");
+console.log(`Configured auth connection: ${accountConnection.ready ? "configured" : `missing ${accountConnection.missingKeys.join(", ")}`}.`);
+console.log(`Configured database connection: ${databaseConnection.ready ? "configured" : `missing ${databaseConnection.missingKeys.join(", ")}`}.`);
 console.log("Press Ctrl+C to stop.");
 
 for (const signal of ["SIGINT", "SIGTERM"]) {

scripts/validate-supabase-dev.mjs

@@ -11,19 +11,19 @@ const ENV_FILE = ".env.local";
 const REQUIRED_ENV = Object.freeze([
   {
     key: "GAMEFOUNDRY_SUPABASE_URL",
-    label: "URL configured",
+    label: "Auth connection URL configured",
   },
   {
     key: "GAMEFOUNDRY_SUPABASE_ANON_KEY",
-    label: "Publishable key configured",
+    label: "Auth anon key configured",
   },
   {
     key: "GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY",
-    label: "Service role key configured",
+    label: "Auth service role key configured",
   },
   {
-    key: "GAMEFOUNDRY_SUPABASE_DATABASE_URL",
-    label: "Database URL configured",
+    key: "GAMEFOUNDRY_DATABASE_URL",
+    label: "Database connection URL configured",
   },
 ]);
 
@@ -119,7 +119,7 @@ function sanitizeDiagnostic(value) {
     }
   });
   try {
-    const databaseUrl = new URL(envValue("GAMEFOUNDRY_SUPABASE_DATABASE_URL"));
+    const databaseUrl = new URL(envValue("GAMEFOUNDRY_DATABASE_URL"));
     if (databaseUrl.password) {
       text = text.split(databaseUrl.password).join(maskValue(databaseUrl.password));
     }
@@ -283,7 +283,7 @@ async function checkTlsValidation() {
 }
 
 function parseDatabaseUrl() {
-  const databaseUrl = new URL(envValue("GAMEFOUNDRY_SUPABASE_DATABASE_URL"));
+  const databaseUrl = new URL(envValue("GAMEFOUNDRY_DATABASE_URL"));
   if (!["postgres:", "postgresql:"].includes(databaseUrl.protocol)) {
     throw new Error("Database URL must use postgres:// or postgresql://.");
   }
@@ -638,8 +638,8 @@ async function main() {
   const envLoad = loadEnvLocal();
   const results = [];
   results.push(envLoad.loaded
-    ? pass(".env.local loaded", `${envLoad.loadedKeys.length} key(s) loaded`)
-    : fail(".env.local loaded", `${ENV_FILE} was not found`));
+    ? pass("Explicit .env.local DEV validation load", `${envLoad.loadedKeys.length} key(s) loaded`)
+    : fail("Explicit .env.local DEV validation load", `${ENV_FILE} was not found`));
 
   REQUIRED_ENV.forEach(({ key, label }) => {
     const value = envValue(key);

src/dev-runtime/auth/provider-contract-stubs.mjs

@@ -51,15 +51,15 @@ const BROWSER_SAFE_SUPABASE_ENV_KEYS = Object.freeze([
 
 const SERVER_ONLY_SUPABASE_SECRET_KEYS = Object.freeze([
   "GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY",
-  "GAMEFOUNDRY_SUPABASE_DATABASE_URL",
+  "GAMEFOUNDRY_DATABASE_URL",
 ]);
 const SUPABASE_POSTGRES_CONFIG_KEYS = Object.freeze([
   "GAMEFOUNDRY_SUPABASE_URL",
   "GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY",
 ]);
 const SUPABASE_POSTGRES_SITE_SETUP_KEYS = Object.freeze([
   ...SUPABASE_POSTGRES_CONFIG_KEYS,
-  "GAMEFOUNDRY_SUPABASE_DATABASE_URL",
+  "GAMEFOUNDRY_DATABASE_URL",
 ]);
 export const SUPABASE_POSTGRES_IDENTITY_TABLES = Object.freeze(["users", "roles", "user_roles"]);
 export const SUPABASE_POSTGRES_PRODUCT_TABLES = Object.freeze([

tests/dev-runtime/SupabaseProviderContractStub.test.mjs

@@ -522,7 +522,7 @@ test("Provider contract assigns identity and product data ownership to Supabase
     GAMEFOUNDRY_AUTH_PROVIDER: "supabase-auth",
     GAMEFOUNDRY_DB_PROVIDER: "supabase-postgres",
     GAMEFOUNDRY_SUPABASE_ANON_KEY: "browser-safe-anon-key",
-    GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+    GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
     GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "server-only-service-role-key",
     GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test",
   });
@@ -1371,7 +1371,7 @@ test("Supabase stubs do not expose server-only secret names or values through th
   await withEnv({
     GAMEFOUNDRY_AUTH_PROVIDER: "supabase-auth",
     GAMEFOUNDRY_DB_PROVIDER: "supabase-postgres",
-    GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+    GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
     GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
   }, async () => {
     const server = await startApiServer();
@@ -1396,7 +1396,7 @@ test("Supabase stubs do not expose server-only secret names or values through th
       assert.equal(providerText.includes("not-a-real-service-role-test-value"), false);
       assert.equal(providerText.includes("server-only-database-url-placeholder"), false);
       assert.equal(providerText.includes("GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY"), false);
-      assert.equal(providerText.includes("GAMEFOUNDRY_SUPABASE_DATABASE_URL"), false);
+      assert.equal(providerText.includes("GAMEFOUNDRY_DATABASE_URL"), false);
       assert.equal(adapterText.includes("not-a-real-service-role-test-value"), false);
       assert.equal(adapterText.includes("server-only-database-url-placeholder"), false);
     } finally {
@@ -1490,7 +1490,7 @@ test("Supabase Postgres adapter supports identity tables and readiness when conf
   const calls = [];
   const database = new SupabasePostgresProviderAdapter({
     env: {
-      GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+      GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
       GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
       GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test/",
     },
@@ -1539,7 +1539,7 @@ test("Supabase Postgres adapter supports DEV cleanup deletes and audit reassignm
   const calls = [];
   const database = new SupabasePostgresProviderAdapter({
     env: {
-      GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+      GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
       GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
       GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test/",
     },
@@ -1604,7 +1604,7 @@ test("Supabase Postgres adapter initializes key-based users roles and user_roles
   ];
   const database = new SupabasePostgresProviderAdapter({
     env: {
-      GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+      GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
       GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
       GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test/",
     },
@@ -1686,7 +1686,7 @@ test("Supabase Postgres adapter reuses existing roleSlug and user_roles keys dur
   const calls = [];
   const database = new SupabasePostgresProviderAdapter({
     env: {
-      GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+      GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
       GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
       GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test/",
     },
@@ -1781,7 +1781,7 @@ test("Supabase activation diagnostics report readiness for fixed providers", ()
     GAMEFOUNDRY_AUTH_PROVIDER: "supabase-auth",
     GAMEFOUNDRY_DB_PROVIDER: "supabase-postgres",
     GAMEFOUNDRY_SUPABASE_ANON_KEY: "test-anon-key",
-    GAMEFOUNDRY_SUPABASE_DATABASE_URL: "server-only-database-url-placeholder",
+    GAMEFOUNDRY_DATABASE_URL: "server-only-database-url-placeholder",
     GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY: "not-a-real-service-role-test-value",
     GAMEFOUNDRY_SUPABASE_URL: "https://supabase-dev.example.test/",
   });
@@ -1845,6 +1845,6 @@ test(".env.example documents Supabase DEV variables without values", async () =>
   assert.match(contents, /^GAMEFOUNDRY_SUPABASE_URL=$/m);
   assert.match(contents, /^GAMEFOUNDRY_SUPABASE_ANON_KEY=$/m);
   assert.match(contents, /^GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY=$/m);
-  assert.match(contents, /^GAMEFOUNDRY_SUPABASE_DATABASE_URL=$/m);
+  assert.match(contents, /^GAMEFOUNDRY_DATABASE_URL=$/m);
   assert.equal(/supabase\.co|sbp_|eyJ[A-Za-z0-9_-]{20,}/.test(contents), false);
 });

tests/playwright/tools/GameWorkspaceMockRepository.spec.mjs

@@ -7,7 +7,7 @@ import { workspaceV2CoverageReporter } from "../../helpers/workspaceV2CoverageRe
 
 const SUPABASE_ENV_KEYS = Object.freeze([
   "GAMEFOUNDRY_SUPABASE_ANON_KEY",
-  "GAMEFOUNDRY_SUPABASE_DATABASE_URL",
+  "GAMEFOUNDRY_DATABASE_URL",
   "GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY",
   "GAMEFOUNDRY_SUPABASE_URL",
 ]);
@@ -91,7 +91,7 @@ test.beforeAll(async () => {
   previousSupabaseEnv = Object.fromEntries(SUPABASE_ENV_KEYS.map((key) => [key, process.env[key]]));
   fakeSupabaseServer = await startFakeSupabaseServer();
   process.env.GAMEFOUNDRY_SUPABASE_ANON_KEY = "game-workspace-anon-key";
-  process.env.GAMEFOUNDRY_SUPABASE_DATABASE_URL = "postgres://game-workspace:test@127.0.0.1:5432/game_workspace";
+  process.env.GAMEFOUNDRY_DATABASE_URL = "postgres://game-workspace:test@127.0.0.1:5432/game_workspace";
   process.env.GAMEFOUNDRY_SUPABASE_SERVICE_ROLE_KEY = "game-workspace-service-role-key";
   process.env.GAMEFOUNDRY_SUPABASE_URL = fakeSupabaseServer.baseUrl;
 });