Altitude/Boosters
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Watch booster file changes as it is now loaded from a rsynced file instead of a shared file

Browse Source
This commit is contained in:
stijn
2026-08-29 00:57:00 +02:00
parent e47ff95c3f
commit 1be3e898b1
2 changed files with 158 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/alttd/boosterapi/config/BoosterFileStorage.java
+147 -51
View File
@@ -4,11 +4,10 @@ import com.alttd.boosterapi.data.Booster;
import com.alttd.boosterapi.data.BoosterType; import com.alttd.boosterapi.data.BoosterType;
import com.alttd.boosterapi.util.Logger; import com.alttd.boosterapi.util.Logger;
import com.fasterxml.jackson.core.*; import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.*;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.LinkedList; import java.util.LinkedList;
@@ -20,6 +19,9 @@ public class BoosterFileStorage {
private File CONFIG_FILE; private File CONFIG_FILE;
private final Logger logger; private final Logger logger;
private WatchService watchService;
private Thread watchThread;
public BoosterFileStorage(Logger logger) { public BoosterFileStorage(Logger logger) {
this.logger = logger; this.logger = logger;
logger.info("Preparing booster file storage..."); logger.info("Preparing booster file storage...");
@@ -29,103 +31,198 @@ public class BoosterFileStorage {
private void init() { private void init() {
File CONFIG_PATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "Boosters"); File CONFIG_PATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "Boosters");
if (!CONFIG_PATH.exists()) { if (!CONFIG_PATH.exists()) {
if (!CONFIG_PATH.mkdir()) if (!CONFIG_PATH.mkdir()) {
logger.severe("Unable to create json storage directory"); logger.severe("Unable to create json storage directory");
} }
}
CONFIG_FILE = new File(CONFIG_PATH, "storage.json"); CONFIG_FILE = new File(CONFIG_PATH, "storage.json");
if (!CONFIG_FILE.exists()) { if (!CONFIG_FILE.exists()) {
try { try {
if (!CONFIG_FILE.createNewFile()) if (!CONFIG_FILE.createNewFile()) {
logger.severe("Unable to create json storeage file"); logger.severe("Unable to create json storage file");
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); throw new RuntimeException(e);
}
} }
} }
ObjectMapper mapper = new ObjectMapper(); /**
mapper.enable(SerializationFeature.INDENT_OUTPUT); * Attempts to reload the whole storage file.
} *
* Optional.empty() means the file was invalid/incomplete and callers should
public synchronized List<Booster> reload() { * keep their current in-memory state rather than replacing it.
*/
public synchronized Optional<List<Booster>> reload() {
logger.debug("Reloading boosters..."); logger.debug("Reloading boosters...");
return loadBoosters(); return loadBoosters();
} }
private List<Booster> loadBoosters() { /**
List<Booster> boosters = new LinkedList<>(); * Watches storage.json and asks the owner of the cache to reload whenever
* the file changes or is replaced.
*/
public synchronized void startWatching(Runnable onReload) {
if (watchThread != null && watchThread.isAlive())
return;
try { try {
JsonParser parser = new JsonFactory().createParser(CONFIG_FILE); Path directory = CONFIG_FILE.toPath().getParent();
if (parser == null) { watchService = FileSystems.getDefault().newWatchService();
logger.warning("Unable to load in boosters from storage file."); directory.register(
return boosters; watchService,
StandardWatchEventKinds.ENTRY_MODIFY,
StandardWatchEventKinds.ENTRY_CREATE
);
watchThread = new Thread(() -> watchLoop(onReload), "booster-storage-watcher");
watchThread.setDaemon(true);
watchThread.start();
} catch (IOException e) {
throw new RuntimeException("Unable to watch booster storage file", e);
} }
parser.nextToken(); }
while (parser.currentToken() != null && parser.currentToken().isStructStart()) {
Optional<Booster> optionalBooster = loadBooster(parser); private void watchLoop(Runnable onReload) {
if (optionalBooster.isEmpty()) Path fileName = CONFIG_FILE.toPath().getFileName();
while (!Thread.currentThread().isInterrupted()) {
try {
WatchKey key = watchService.take();
boolean changed = false;
for (WatchEvent<?> event : key.pollEvents()) {
if (event.kind() == StandardWatchEventKinds.OVERFLOW)
continue; continue;
Path changedFile = (Path) event.context();
if (fileName.equals(changedFile))
changed = true;
}
if (!key.reset())
break;
if (changed) {
try {
onReload.run();
} catch (RuntimeException e) {
logger.severe("Unable to reload boosters after storage file changed: " + e.getMessage());
}
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ClosedWatchServiceException e) {
break;
}
}
}
private Optional<List<Booster>> loadBoosters() {
List<Booster> boosters = new LinkedList<>();
try (JsonParser parser = new JsonFactory().createParser(CONFIG_FILE)) {
JsonToken token = parser.nextToken();
// An empty file represents an empty booster list.
if (token == null)
return Optional.of(boosters);
while (token != null) {
if (token != JsonToken.START_OBJECT)
return invalid("Expected booster object start but found " + token);
Optional<Booster> optionalBooster = loadBooster(parser);
if (optionalBooster.isEmpty()) {
return Optional.empty();
}
Booster booster = optionalBooster.get(); Booster booster = optionalBooster.get();
logger.debug("Loading booster:" + booster.getBoosterType()); logger.debug("Loading booster:" + booster.getBoosterType());
boosters.add(booster); boosters.add(booster);
if (parser.nextToken() != null && !parser.currentToken().isStructEnd()) {
logger.warning("Last loaded booster had more data than expected, skipping it..."); token = parser.nextToken();
while (!parser.nextToken().isStructEnd()) if (token != JsonToken.END_OBJECT) {
; return invalid("Expected booster object end but found " + token);
} }
parser.nextToken();
token = parser.nextToken();
} }
parser.close();
} catch (IOException e) { return Optional.of(boosters);
throw new RuntimeException(e); } catch (IOException | IllegalArgumentException e) {
logger.warning("Unable to load boosters from storage file: " + e.getMessage());
return Optional.empty();
} }
return boosters;
} }
public Optional<Booster> loadBooster(JsonParser parser) throws IOException { public Optional<Booster> loadBooster(JsonParser parser) throws IOException {
JsonToken jsonToken = parser.getCurrentToken(); JsonToken jsonToken = parser.nextToken();
if (!jsonToken.isStructStart()) if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName())) {
return error("Didn't find struct start");
jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName()))
return error("Didn't find boosterUUID at expected location"); return error("Didn't find boosterUUID at expected location");
parser.nextValue(); }
if (parser.nextToken() != JsonToken.VALUE_STRING) {
return error("boosterUUID was not a string");
}
UUID boosterUUID = UUID.fromString(parser.getValueAsString()); UUID boosterUUID = UUID.fromString(parser.getValueAsString());
jsonToken = parser.nextToken(); jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName())) if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName())) {
return error("Didn't find activatorName at expected location"); return error("Didn't find activatorName at expected location");
parser.nextValue(); }
if (parser.nextToken() != JsonToken.VALUE_STRING) {
return error("activatorName was not a string");
}
String activatorName = parser.getValueAsString(); String activatorName = parser.getValueAsString();
jsonToken = parser.nextToken(); jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName())) if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName())) {
return error("Didn't find boosterType at expected location"); return error("Didn't find boosterType at expected location");
parser.nextValue(); }
if (parser.nextToken() != JsonToken.VALUE_STRING) {
return error("boosterType was not a string");
}
BoosterType boosterType = BoosterType.getByName(parser.getValueAsString()); BoosterType boosterType = BoosterType.getByName(parser.getValueAsString());
if (boosterType == null) {
return error("Unknown boosterType");
}
jsonToken = parser.nextToken(); jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName())) if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName())) {
return error("Didn't find startingTime at expected location"); return error("Didn't find startingTime at expected location");
parser.nextValue(); }
Instant startingTime = Instant.ofEpochMilli(parser.getValueAsLong()); if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
return error("startingTime was not an integer");
}
Instant startingTime = Instant.ofEpochMilli(parser.getLongValue());
jsonToken = parser.nextToken(); jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName())) if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName())) {
return error("Didn't find duration at expected location"); return error("Didn't find duration at expected location");
parser.nextValue(); }
Duration duration = Duration.ofMillis(parser.getValueAsLong()); if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
return error("duration was not an integer");
}
Duration duration = Duration.ofMillis(parser.getLongValue());
jsonToken = parser.nextToken(); jsonToken = parser.nextToken();
if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName())) if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName())) {
return error("Didn't find multiplier at expected location"); return error("Didn't find multiplier at expected location");
parser.nextValue(); }
double multiplier = parser.getValueAsDouble(); JsonToken multiplierToken = parser.nextToken();
if (multiplierToken != JsonToken.VALUE_NUMBER_INT && multiplierToken != JsonToken.VALUE_NUMBER_FLOAT) {
return error("multiplier was not a number");
}
double multiplier = parser.getDoubleValue();
return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier)); return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier));
} }
private <T> Optional<T> invalid(String error) {
logger.severe(error);
return Optional.empty();
}
private Optional<Booster> error(String error) { private Optional<Booster> error(String error) {
logger.severe(error); logger.severe(error);
return Optional.empty(); return Optional.empty();
@@ -143,7 +240,6 @@ public class BoosterFileStorage {
} }
} }
private void saveBooster(Booster booster, JsonGenerator generator) throws IOException { private void saveBooster(Booster booster, JsonGenerator generator) throws IOException {
generator.writeStartObject(); generator.writeStartObject();
api/src/main/java/com/alttd/boosterapi/data/BoosterCache.java
+12 -5
View File
@@ -17,16 +17,23 @@ public class BoosterCache {
public BoosterCache(BoosterFileStorage boosterFileStorage) { public BoosterCache(BoosterFileStorage boosterFileStorage) {
this.boosterFileStorage = boosterFileStorage; this.boosterFileStorage = boosterFileStorage;
reloadBoosters(); reloadBoosters();
boosterFileStorage.startWatching(this::reloadBoosters);
} }
public synchronized void reloadBoosters() { public synchronized void reloadBoosters() {
boosters.clear(); Optional<List<Booster>> reloadedBoosters = boosterFileStorage.reload();
List<Booster> allBoosters = boosterFileStorage.reload(); if (reloadedBoosters.isEmpty())
for (Booster booster : allBoosters) { return;
LinkedList<Booster> list = boosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
HashMap<BoosterType, LinkedList<Booster>> newBoosters = new HashMap<>();
for (Booster booster : reloadedBoosters.get()) {
LinkedList<Booster> list = newBoosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
list.add(booster); list.add(booster);
boosters.put(booster.getBoosterType(), list); newBoosters.put(booster.getBoosterType(), list);
} }
boosters.clear();
boosters.putAll(newBoosters);
updateOrder(); updateOrder();
} }