mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 23:33:12 +09:00
Fix crash on continuing an active connection (#369)
Fix ServerConnector reaching an invalid state if a continue operation is performed on an active connection. The continue would cause the connection established logic to be runned before the connection lost logic of the pervious connection is perfomed, resulting in a leaked heartbeat interval and the connection lost logic being performed on the new connection instead of the old. Prevent this by closing both the new and the old connection in this case.
This commit is contained in:
1 parent
72d0994ca6
commit
a2d56d4a8d
4 files changed
+50
-2
No files matched your search
@@ -2,11 +2,15 @@
|
||||
const assert = require("assert").strict;
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
const events = require("events");
|
||||
|
||||
const libLink = require("@clusterio/lib/link");
|
||||
const libUsers = require("@clusterio/lib/users");
|
||||
|
||||
const { slowTest, get, exec, execCtl, sendRcon, getControl, instancesDir } = require("./index");
|
||||
const {
|
||||
TestControl, TestControlConnector, url, controlToken, slowTest,
|
||||
get, exec, execCtl, sendRcon, getControl, instancesDir,
|
||||
} = require("./index");
|
||||
|
||||
|
||||
async function getInstances() {
|
||||
@@ -32,6 +36,29 @@ describe("Integration of Clusterio", function() {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("run", function() {
|
||||
it("should handle resume of an active connection", async function() {
|
||||
slowTest(this);
|
||||
let tlsCa = await fs.readFile("test/file/tls/cert.pem");
|
||||
let connectorA = new TestControlConnector(url, 2, tlsCa);
|
||||
connectorA.token = controlToken;
|
||||
let controlA = new TestControl(connectorA);
|
||||
await connectorA.connect();
|
||||
connectorA._state = "closing";
|
||||
connectorA.stopHeartbeat();
|
||||
connectorA.on("error", () => {});
|
||||
|
||||
let connectorB = new TestControlConnector(url, 2, tlsCa);
|
||||
connectorB.token = controlToken;
|
||||
let controlB = new TestControl(connectorB);
|
||||
connectorB._sessionToken = connectorA._sessionToken;
|
||||
connectorB._state = "handshake";
|
||||
await connectorB._doConnect();
|
||||
await events.once(connectorB, "resume");
|
||||
await connectorB.close();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("clusterioctl", function() {
|
||||
|
||||
@@ -197,6 +197,7 @@ module.exports = {
|
||||
getControl,
|
||||
|
||||
url,
|
||||
controlToken,
|
||||
instancesDir,
|
||||
databaseDir,
|
||||
masterConfigPath,
|
||||
|
||||
Reference in new issue
Block a user