From 8f6fd33b77451f9a1d0e75e2c04e966199b6c0ab Mon Sep 17 00:00:00 2001
From: Sainan <sainan@calamity.inc>
Date: Sun, 29 Dec 2024 23:54:00 +0100
Subject: [PATCH] chore: fix static/data for 'npm run build' Previously,
 buildConfig.json was loaded from build/static/data while cache files were
 loaded from static/data. Now all files are loaded from static/data and there
 is no build/static/data folder anymore.

---
 src/controllers/api/loginController.ts          |  2 +-
 src/controllers/dynamic/worldStateController.ts |  2 +-
 src/routes/cache.ts                             |  2 +-
 src/services/buildConfigService.ts              | 13 +++++++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/services/buildConfigService.ts

diff --git a/src/controllers/api/loginController.ts b/src/controllers/api/loginController.ts
index 52d4d6ac..452cd61b 100644
--- a/src/controllers/api/loginController.ts
+++ b/src/controllers/api/loginController.ts
@@ -1,7 +1,7 @@
 import { RequestHandler } from "express";
 
 import { config } from "@/src/services/configService";
-import buildConfig from "@/static/data/buildConfig.json";
+import { buildConfig } from "@/src/services/buildConfigService";
 
 import { Account } from "@/src/models/loginModel";
 import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
diff --git a/src/controllers/dynamic/worldStateController.ts b/src/controllers/dynamic/worldStateController.ts
index e4fdb8f2..9bc7f137 100644
--- a/src/controllers/dynamic/worldStateController.ts
+++ b/src/controllers/dynamic/worldStateController.ts
@@ -1,6 +1,6 @@
 import { RequestHandler } from "express";
 import staticWorldState from "@/static/fixed_responses/worldState.json";
-import buildConfig from "@/static/data/buildConfig.json";
+import { buildConfig } from "@/src/services/buildConfigService";
 import { IMongoDate, IOid } from "@/src/types/commonTypes";
 
 export const worldStateController: RequestHandler = (req, res) => {
diff --git a/src/routes/cache.ts b/src/routes/cache.ts
index d3230cdc..d40bb59a 100644
--- a/src/routes/cache.ts
+++ b/src/routes/cache.ts
@@ -1,5 +1,5 @@
 import express from "express";
-import buildConfig from "@/static/data/buildConfig.json";
+import { buildConfig } from "@/src/services/buildConfigService";
 import fs from "fs/promises";
 
 const cacheRouter = express.Router();
diff --git a/src/services/buildConfigService.ts b/src/services/buildConfigService.ts
new file mode 100644
index 00000000..f1653aff
--- /dev/null
+++ b/src/services/buildConfigService.ts
@@ -0,0 +1,13 @@
+import path from "path";
+import fs from "fs";
+
+const rootDir = path.join(__dirname, "../..");
+const repoDir = path.basename(rootDir) == "build" ? path.join(rootDir, "..") : rootDir;
+const buildConfigPath = path.join(repoDir, "static/data/buildConfig.json");
+export const buildConfig = JSON.parse(fs.readFileSync(buildConfigPath, "utf-8")) as IBuildConfig;
+
+interface IBuildConfig {
+    version: string;
+    buildLabel: string;
+    matchmakingBuildId: string;
+}
-- 
2.47.2