Compare commits
11 Commits
ddcd186605
...
e458279492
Author | SHA1 | Date | |
---|---|---|---|
e458279492 | |||
fb47806537 | |||
5c939419e2 | |||
915c87210a | |||
13ea5a92d5 | |||
76c8973e35 | |||
f6152d9f47 | |||
3dc7f2b485 | |||
0ea67b7f57 | |||
253fe6f5ff | |||
a4f3b94e9b |
@ -1,7 +1,7 @@
|
||||
import { RequestHandler } from "express";
|
||||
import { config } from "@/src/services/configService";
|
||||
import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
|
||||
import { saveConfig } from "@/src/services/configWriterService";
|
||||
import { saveConfig } from "@/src/services/configWatcherService";
|
||||
import { sendWsBroadcastExcept } from "@/src/services/wsService";
|
||||
|
||||
export const getConfigController: RequestHandler = async (req, res) => {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { RequestHandler } from "express";
|
||||
import { getAccountForRequest, isAdministrator, isNameTaken } from "@/src/services/loginService";
|
||||
import { config } from "@/src/services/configService";
|
||||
import { saveConfig } from "@/src/services/configWriterService";
|
||||
import { saveConfig } from "@/src/services/configWatcherService";
|
||||
|
||||
export const renameAccountController: RequestHandler = async (req, res) => {
|
||||
const account = await getAccountForRequest(req);
|
||||
|
@ -1,14 +1,17 @@
|
||||
import chokidar from "chokidar";
|
||||
import fsPromises from "fs/promises";
|
||||
import { logger } from "@/src/utils/logger";
|
||||
import { config, configPath, loadConfig } from "@/src/services/configService";
|
||||
import { saveConfig, shouldReloadConfig } from "@/src/services/configWriterService";
|
||||
import { getWebPorts, startWebServer, stopWebServer } from "@/src/services/webService";
|
||||
import { sendWsBroadcast } from "@/src/services/wsService";
|
||||
import { Inbox } from "@/src/models/inboxModel";
|
||||
import varzia from "@/static/fixed_responses/worldState/varzia.json";
|
||||
|
||||
let amnesia = false;
|
||||
chokidar.watch(configPath).on("change", () => {
|
||||
if (shouldReloadConfig()) {
|
||||
if (amnesia) {
|
||||
amnesia = false;
|
||||
} else {
|
||||
logger.info("Detected a change to config file, reloading its contents.");
|
||||
try {
|
||||
loadConfig();
|
||||
@ -69,6 +72,11 @@ export const validateConfig = (): void => {
|
||||
}
|
||||
};
|
||||
|
||||
export const saveConfig = async (): Promise<void> => {
|
||||
amnesia = true;
|
||||
await fsPromises.writeFile(configPath, JSON.stringify(config, null, 2));
|
||||
};
|
||||
|
||||
export const syncConfigWithDatabase = (): void => {
|
||||
// Event messages are deleted after endDate. Since we don't use beginDate/endDate and instead have config toggles, we need to delete the messages once those bools are false.
|
||||
if (!config.worldState?.galleonOfGhouls) {
|
||||
|
@ -1,17 +0,0 @@
|
||||
import fsPromises from "fs/promises";
|
||||
import { config, configPath } from "@/src/services/configService";
|
||||
|
||||
let amnesia = false;
|
||||
|
||||
export const saveConfig = async (): Promise<void> => {
|
||||
amnesia = true;
|
||||
await fsPromises.writeFile(configPath, JSON.stringify(config, null, 2));
|
||||
};
|
||||
|
||||
export const shouldReloadConfig = (): boolean => {
|
||||
if (amnesia) {
|
||||
amnesia = false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
Loading…
x
Reference in New Issue
Block a user