OpenWF/SpaceNinjaServer
12
6
Fork 15
Code Issues 46 Pull Requests 6 Actions Packages Projects Releases Activity

fix: consistenly use static/data for 'npm run build' (#661)

Browse Source
This commit is contained in:
Sainan 2024-12-30 01:51:38 +01:00 committed by GitHub
parent e41022f176
commit 1024d0350f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/api/loginController.ts
View File

@ -1,7 +1,7 @@
import { RequestHandler } from "express"; import { RequestHandler } from "express";
import { config } from "@/src/services/configService"; 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 { Account } from "@/src/models/loginModel";
import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService"; import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";

2
src/controllers/dynamic/worldStateController.ts
View File

@ -1,6 +1,6 @@
import { RequestHandler } from "express"; import { RequestHandler } from "express";
import staticWorldState from "@/static/fixed_responses/worldState.json"; 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"; import { IMongoDate, IOid } from "@/src/types/commonTypes";
export const worldStateController: RequestHandler = (req, res) => { export const worldStateController: RequestHandler = (req, res) => {

2
src/routes/cache.ts
View File

@ -1,5 +1,5 @@
import express from "express"; import express from "express";
import buildConfig from "@/static/data/buildConfig.json"; import { buildConfig } from "@/src/services/buildConfigService";
import fs from "fs/promises"; import fs from "fs/promises";
const cacheRouter = express.Router(); const cacheRouter = express.Router();

13
src/services/buildConfigService.ts Normal file
View File

@ -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;
}