From df214749c323670456e2718f92116d991368d8ce Mon Sep 17 00:00:00 2001 From: Master Date: Fri, 26 May 2023 21:37:12 +0800 Subject: [PATCH] add version config (#2) * update * update * update --- .gitignore | 2 +- config.json | 4 +++- src/controllers/api/loginController.ts | 8 ++++++-- src/controllers/dynamic/worldStateController.ts | 4 ++++ src/routes/cache.ts | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 27a44736..7d679bbc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ /build /.env -/static/data/* \ No newline at end of file +/static/data/* diff --git a/config.json b/config.json index 7d3ea080..41a01083 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,7 @@ { "autoCreateAccount": true, "buildLabel": "2023.05.23.12.37/kM-ONnYx6PjFfVyxn0zuvw", - "matchmakingBuildId": "4920386201513015989" + "matchmakingBuildId": "4920386201513015989", + "version": "33.0.12", + "worldSeed": "SBripfQVIPcz+hCzf1LUSvFpsmnJaAfTEH2x/7YAWaiCGT8vxTMtVlk+SLLalLy5gtrFxHflQET2BJOKe8r0py9xFJAwi+TEP2VsfPGcs3l75kYvcpL7X7sEiISEFCt85O99GjXdGyyFwMhtvEvL5pzEVpaQu7dw4KcLtHY30q3aTM9pI4m4Qx1gPDkmyMrCKq7pzHHtA9QsFKWOunSwpfNJ49xCIZADeD30h5nshcFMl/3yipL9K0WHoouMZMLMwfCWMgFnxAazRznwda8XRjNgyuhfAQTeaPnFuLf3YJVde3FbJ4PBWX4uysx1PJHuVqMNaAe1TsDV6f2UzQ2M/g==" } diff --git a/src/controllers/api/loginController.ts b/src/controllers/api/loginController.ts index 1684fd3f..80f71d5f 100644 --- a/src/controllers/api/loginController.ts +++ b/src/controllers/api/loginController.ts @@ -1,13 +1,17 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +import { RequestHandler } from "express"; + +import config from "@/config.json"; + import { toLoginRequest } from "@/src/helpers/loginHelpers"; import { Account } from "@/src/models/loginModel"; import { createAccount, isCorrectPassword } from "@/src/services/loginService"; import { ILoginResponse } from "@/src/types/loginTypes"; import { DTLS, groups, HUB, IRC, Nonce, NRS, platformCDNs } from "@/static/fixed_responses/login_static"; -import { RequestHandler } from "express"; -import config from "../../../config.json"; // eslint-disable-next-line @typescript-eslint/no-misused-promises const loginController: RequestHandler = async (request, response) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-argument const body = JSON.parse(request.body); // parse octet stream of json data to json object const loginRequest = toLoginRequest(body); // console.log(body); diff --git a/src/controllers/dynamic/worldStateController.ts b/src/controllers/dynamic/worldStateController.ts index 39050c91..474cb442 100644 --- a/src/controllers/dynamic/worldStateController.ts +++ b/src/controllers/dynamic/worldStateController.ts @@ -1,7 +1,11 @@ import { RequestHandler } from "express"; +import config from "@/config.json"; import worldState from "@/static/fixed_responses/worldState.json"; const worldStateController: RequestHandler = (_req, res) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + worldState.WorldSeed = config.worldSeed; + worldState.BuildLabel = config.buildLabel; res.json(worldState); }; diff --git a/src/routes/cache.ts b/src/routes/cache.ts index 5da110b9..bb69a6db 100644 --- a/src/routes/cache.ts +++ b/src/routes/cache.ts @@ -1,4 +1,5 @@ import express from "express"; +import config from "@/config.json"; const cacheRouter = express.Router(); @@ -15,7 +16,7 @@ cacheRouter.get("/B.Cache.Windows_en.bin*", (_req, res) => { cacheRouter.get(/^\/origin\/([a-zA-Z0-9]+)\/H\.Cache\.bin.*$/, (_req, res) => { // console.log("asd", path.join(__dirname, "../data")); // console.log("asd", __dirname); - res.sendFile("static/data/H.Cache_33.0.12.bin", { root: "./" }); + res.sendFile(`static/data/H.Cache_${config.version}.bin`, { root: "./" }); }); export { cacheRouter };