mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 23:30:41 +09:00
Download at the next join when the controller did not store an upload
The controller gave an upload it did not store the same empty reply as one it stored, and the instance confirmed either to the save. An instance restarting after a crash uploads the players it had online, and when another instance had since uploaded the same generation the save took its own copy for the stored one: the next join kept it, and the leave after that stored it over the newer data. The reply now says whether the upload was stored. One that was not marks the save's copy outdated, so it is not uploaded again and the next join downloads. Fixes #1218 Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JyNnVzRW4jPWaoWTxCyhM7
This commit is contained in:
1 parent
635b10a3dc
commit
b6bc118297
7 files changed
+84
-6
No files matched your search
@@ -5,7 +5,7 @@ import * as lib from "@clusterio/lib";
|
||||
|
||||
import * as mock from "../../../test/mock.js";
|
||||
import loadInstancePlugin, { recipeNotificationDelta, applyRecipeNotificationDelta } from "../dist/node/instance.js";
|
||||
import { AcquireResponse, DownloadResponse, PrefetchEvent } from "../dist/node/messages.js";
|
||||
import { AcquireResponse, DownloadResponse, PrefetchEvent, UploadResponse } from "../dist/node/messages.js";
|
||||
import { components } from "../dist/node/components.js";
|
||||
import { plugin as info } from "../dist/node/index.js";
|
||||
|
||||
@@ -275,6 +275,25 @@ describe("player_sync", function() {
|
||||
const request = await upload({ name: "test", generation: 2 });
|
||||
assert.equal(request.destinationInstanceId, undefined);
|
||||
});
|
||||
async function rconAfterReply(stored) {
|
||||
instance.server.reset();
|
||||
instance.connector.once("send", message => {
|
||||
instance.connector.emit("message", new lib.MessageResponse(
|
||||
1, message.dst, message.src, new UploadResponse(stored)
|
||||
));
|
||||
});
|
||||
instance.server.emit("ipc-player_sync_upload", { name: "test", generation: 2 });
|
||||
for (let i = 0; i < 100 && !instance.server.rconCommands.length; i++) {
|
||||
await lib.wait(1);
|
||||
}
|
||||
return instance.server.rconCommands;
|
||||
}
|
||||
it("should confirm an upload the controller stored", async function() {
|
||||
assert.deepEqual(await rconAfterReply(true), ['/sc player_sync.confirm_upload("test", 2)']);
|
||||
});
|
||||
it("should reject an upload the controller did not store", async function() {
|
||||
assert.deepEqual(await rconAfterReply(false), ['/sc player_sync.reject_upload("test", 2)']);
|
||||
});
|
||||
});
|
||||
|
||||
describe("PrefetchEvent", function() {
|
||||
|
||||
Reference in new issue
Block a user