mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
research_sync: cluster research queue on the controller
- QueueUpdateEvent, QueueEvent and QueueSyncRequest messages. - The controller keeps one queue (max 7 names) in research_queue.json, saved with the other data. - An update that changes the queue replaces it and is broadcast as QueueEvent; an equal update is ignored. - QueueSyncRequest returns the queue and seeds it from the request when the queue is empty. - A finished technology (completing contribution, advancing FinishedEvent, technology sync) drops its first queue entry without a broadcast. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
43243eab86
commit
e3099e1e05
4 files changed
+265
No files matched your search
@@ -13,6 +13,9 @@ import {
|
||||
TechnologySync,
|
||||
SyncTechnologiesRequest,
|
||||
TechnologyProgress,
|
||||
QueueUpdateEvent,
|
||||
QueueEvent,
|
||||
QueueSyncRequest,
|
||||
} from "./messages.js";
|
||||
|
||||
type Technology = {
|
||||
@@ -49,12 +52,58 @@ async function saveTechnologies(
|
||||
await lib.safeOutputFile(filePath, JSON.stringify([...technologies.entries()], null, "\t"));
|
||||
}
|
||||
|
||||
const MAX_QUEUE = 7;
|
||||
|
||||
async function loadQueue(controllerConfig: lib.ControllerConfig, logger: lib.Logger): Promise<string[]> {
|
||||
let filePath = path.join(controllerConfig.get("controller.database_directory"), "research_queue.json");
|
||||
logger.verbose(`Loading ${filePath}`);
|
||||
try {
|
||||
return JSON.parse(await fs.readFile(filePath, "utf8"));
|
||||
} catch (err: any) {
|
||||
if (err.code === "ENOENT") {
|
||||
logger.verbose("Creating new research queue");
|
||||
return [];
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
async function saveQueue(controllerConfig: lib.ControllerConfig, queue: string[], logger: lib.Logger) {
|
||||
let filePath = path.join(controllerConfig.get("controller.database_directory"), "research_queue.json");
|
||||
logger.verbose(`writing ${filePath}`);
|
||||
await lib.safeOutputFile(filePath, JSON.stringify(queue, null, "\t"));
|
||||
}
|
||||
|
||||
export default async function(context: ControllerPluginContext) {
|
||||
const { controller, logger, plugin } = context;
|
||||
const technologies = await loadTechnologies(controller.config, logger);
|
||||
let technologiesDirty = true;
|
||||
let queue = await loadQueue(controller.config, logger);
|
||||
let queueDirty = false;
|
||||
const progressToBroadcast = new Set<string>();
|
||||
|
||||
function instanceName(src: lib.Address) {
|
||||
return controller.instances.get(src.id)?.config.get("instance.name") ?? String(src.id);
|
||||
}
|
||||
|
||||
function removeFinished(name: string) {
|
||||
let index = queue.indexOf(name);
|
||||
if (index !== -1) {
|
||||
queue.splice(index, 1);
|
||||
queueDirty = true;
|
||||
}
|
||||
}
|
||||
|
||||
function setQueue(newQueue: string[], player: string | null, src: lib.Address) {
|
||||
newQueue = newQueue.slice(0, MAX_QUEUE);
|
||||
if (newQueue.length === queue.length && newQueue.every((name, i) => name === queue[i])) {
|
||||
return;
|
||||
}
|
||||
queue = newQueue;
|
||||
queueDirty = true;
|
||||
controller.sendTo("allInstances", new QueueEvent(queue, player, instanceName(src)));
|
||||
}
|
||||
|
||||
function broadcastProgress() {
|
||||
let techs = [];
|
||||
for (let name of progressToBroadcast) {
|
||||
@@ -109,6 +158,7 @@ export default async function(context: ControllerPluginContext) {
|
||||
tech.researched = true;
|
||||
tech.progress = null;
|
||||
progressToBroadcast.delete(name);
|
||||
removeFinished(name);
|
||||
|
||||
controller.sendTo("allInstances", new FinishedEvent(name, tech.level));
|
||||
}
|
||||
@@ -118,6 +168,9 @@ export default async function(context: ControllerPluginContext) {
|
||||
controller.handle(FinishedEvent, async (event: FinishedEvent) => {
|
||||
let { name, level } = event;
|
||||
let tech = technologies.get(name);
|
||||
if (!tech || tech.level < level || (tech.level === level && !tech.researched)) {
|
||||
removeFinished(name);
|
||||
}
|
||||
if (!tech || tech.level <= level) {
|
||||
controller.sendTo("allInstances", event);
|
||||
progressToBroadcast.delete(name);
|
||||
@@ -145,6 +198,7 @@ export default async function(context: ControllerPluginContext) {
|
||||
progressToBroadcast.add(name);
|
||||
} else if (researched || baseLevel(name) !== level) {
|
||||
controller.sendTo("allInstances", new FinishedEvent(name, level));
|
||||
removeFinished(name);
|
||||
}
|
||||
|
||||
} else {
|
||||
@@ -156,6 +210,7 @@ export default async function(context: ControllerPluginContext) {
|
||||
// Send update if the unlocked level is greater
|
||||
if (level - Number(!researched) > tech.level - Number(!tech.researched)) {
|
||||
controller.sendTo("allInstances", new FinishedEvent(name, level - Number(!researched)));
|
||||
removeFinished(name);
|
||||
}
|
||||
tech.level = level;
|
||||
tech.progress = progress;
|
||||
@@ -185,7 +240,22 @@ export default async function(context: ControllerPluginContext) {
|
||||
return result;
|
||||
});
|
||||
|
||||
controller.handle(QueueUpdateEvent, async (event: QueueUpdateEvent, src: lib.Address) => {
|
||||
setQueue(event.queue, event.player, src);
|
||||
});
|
||||
|
||||
controller.handle(QueueSyncRequest, async (request: QueueSyncRequest, src: lib.Address): Promise<string[]> => {
|
||||
if (request.queue?.length && !queue.length) {
|
||||
setQueue(request.queue, request.player, src);
|
||||
}
|
||||
return queue;
|
||||
});
|
||||
|
||||
controller.hooks.save.attach(plugin.name, async () => {
|
||||
if (queueDirty) {
|
||||
queueDirty = false;
|
||||
await saveQueue(controller.config, queue, logger);
|
||||
}
|
||||
if (technologiesDirty) {
|
||||
technologiesDirty = false;
|
||||
await saveTechnologies(controller.config, technologies, logger);
|
||||
|
||||
Reference in new issue
Block a user