mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
research_sync: relay the cluster queue between the controller and the save
Forward queue edits and follow requests from the save to the controller, and apply controller broadcasts and the start-up sync to the save. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
e3099e1e05
commit
ead8ede42a
1 file changed
+48
@@ -6,6 +6,9 @@ import {
|
|||||||
FinishedEvent,
|
FinishedEvent,
|
||||||
TechnologySync,
|
TechnologySync,
|
||||||
SyncTechnologiesRequest,
|
SyncTechnologiesRequest,
|
||||||
|
QueueUpdateEvent,
|
||||||
|
QueueEvent,
|
||||||
|
QueueSyncRequest,
|
||||||
} from "./messages.js";
|
} from "./messages.js";
|
||||||
|
|
||||||
// ./module/sync.lua
|
// ./module/sync.lua
|
||||||
@@ -35,6 +38,21 @@ export default async function(context: InstancePluginContext) {
|
|||||||
logger.error(`Unexpected error:\n${err.stack}`);
|
logger.error(`Unexpected error:\n${err.stack}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// An empty Lua table serialises as {}, so anything that isn't an array is an empty queue
|
||||||
|
function asArray(v: unknown): string[] {
|
||||||
|
return Array.isArray(v) ? v : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function applyQueue(data: { queue: string[], instance?: string, player?: string }) {
|
||||||
|
await sendOrderedRcon(`/sc research_sync.apply_queue("${lib.escapeString(JSON.stringify(data))}")`, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// queue null asks for the cluster queue without seeding it
|
||||||
|
async function followQueue(queue: string[] | null, player: string | null) {
|
||||||
|
let result = await instance.sendTo("controller", new QueueSyncRequest(queue, player));
|
||||||
|
await applyQueue({ queue: result });
|
||||||
|
}
|
||||||
|
|
||||||
async function researchContribution(tech: IpcContribution) {
|
async function researchContribution(tech: IpcContribution) {
|
||||||
instance.sendTo("controller", new ContributionEvent(tech.name, tech.level, tech.contribution));
|
instance.sendTo("controller", new ContributionEvent(tech.name, tech.level, tech.contribution));
|
||||||
}
|
}
|
||||||
@@ -50,6 +68,17 @@ export default async function(context: InstancePluginContext) {
|
|||||||
researchFinished(tech).catch(err => unexpectedError(err));
|
researchFinished(tech).catch(err => unexpectedError(err));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
instance.server.on("ipc-research_sync:queue", (data: { queue?: unknown, player?: string }) => {
|
||||||
|
try {
|
||||||
|
instance.sendTo("controller", new QueueUpdateEvent(asArray(data.queue), data.player ?? null));
|
||||||
|
} catch (err: any) {
|
||||||
|
unexpectedError(err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
instance.server.on("ipc-research_sync:follow", (data: { queue?: unknown, player?: string }) => {
|
||||||
|
followQueue(asArray(data.queue), data.player ?? null).catch(err => unexpectedError(err));
|
||||||
|
});
|
||||||
|
|
||||||
instance.handle(ProgressEvent, async (event: ProgressEvent) => {
|
instance.handle(ProgressEvent, async (event: ProgressEvent) => {
|
||||||
if (!syncStarted || !["starting", "running"].includes(instance.status)) {
|
if (!syncStarted || !["starting", "running"].includes(instance.status)) {
|
||||||
return;
|
return;
|
||||||
@@ -68,6 +97,19 @@ export default async function(context: InstancePluginContext) {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
instance.handle(QueueEvent, async (event: QueueEvent) => {
|
||||||
|
if (!syncStarted || !["starting", "running"].includes(instance.status)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let data: { queue: string[], instance: string, player?: string } = {
|
||||||
|
queue: event.queue, instance: event.instance,
|
||||||
|
};
|
||||||
|
if (event.player !== null) {
|
||||||
|
data.player = event.player;
|
||||||
|
}
|
||||||
|
await applyQueue(data);
|
||||||
|
});
|
||||||
|
|
||||||
instance.hooks.start.attach(plugin.name, async () => {
|
instance.hooks.start.attach(plugin.name, async () => {
|
||||||
let dumpJson = await sendOrderedRcon("/sc research_sync.dump_technologies()");
|
let dumpJson = await sendOrderedRcon("/sc research_sync.dump_technologies()");
|
||||||
let techsToSend = [];
|
let techsToSend = [];
|
||||||
@@ -102,5 +144,11 @@ export default async function(context: InstancePluginContext) {
|
|||||||
let syncJson = lib.escapeString(JSON.stringify(techsToSync));
|
let syncJson = lib.escapeString(JSON.stringify(techsToSync));
|
||||||
await sendOrderedRcon(`/sc research_sync.sync_technologies("${syncJson}")`, true);
|
await sendOrderedRcon(`/sc research_sync.sync_technologies("${syncJson}")`, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A first start counts as turning following on, which seeds an empty cluster queue
|
||||||
|
let state = JSON.parse(await sendOrderedRcon("/sc research_sync.queue_state()"));
|
||||||
|
if (state.follow) {
|
||||||
|
await followQueue(state.first ? asArray(state.queue) : null, null);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user