mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
Prefer putting nested structures on new lines
Format arguments to have nested structures start on a new line instead of inline to make it easier to see where the structures starts and what structure it is.
This commit is contained in:
1 parent
cb21a63ac2
commit
156d517976
7 files changed
+130
-77
No files matched your search
+21
-13
@@ -36,11 +36,15 @@ class ControlConnector extends libLink.WebSocketClientConnector {
|
|||||||
|
|
||||||
register() {
|
register() {
|
||||||
logger.verbose("Connector | registering control");
|
logger.verbose("Connector | registering control");
|
||||||
this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData(
|
this.sendHandshake(
|
||||||
this._token,
|
new libData.MessageRegisterControl(
|
||||||
"clusterioctl",
|
new libData.RegisterControlData(
|
||||||
version,
|
this._token,
|
||||||
)));
|
"clusterioctl",
|
||||||
|
version,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,9 +91,11 @@ class Control extends libLink.Link {
|
|||||||
instanceIds = [],
|
instanceIds = [],
|
||||||
maxLevel = null,
|
maxLevel = null,
|
||||||
}) {
|
}) {
|
||||||
await this.send(new libData.LogSetSubscriptionsRequest(
|
await this.send(
|
||||||
all, controller, hostIds, instanceIds, maxLevel,
|
new libData.LogSetSubscriptionsRequest(
|
||||||
));
|
all, controller, hostIds, instanceIds, maxLevel,
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleLogMessageEvent(event) {
|
async handleLogMessageEvent(event) {
|
||||||
@@ -166,11 +172,13 @@ async function startControl() {
|
|||||||
let args = yargs.parse();
|
let args = yargs.parse();
|
||||||
|
|
||||||
// Log stream for the ctl session.
|
// Log stream for the ctl session.
|
||||||
logger.add(new ConsoleTransport({
|
logger.add(
|
||||||
errorLevels: Object.keys(levels),
|
new ConsoleTransport({
|
||||||
level: args.logLevel,
|
errorLevels: Object.keys(levels),
|
||||||
format: new libLoggingUtils.TerminalFormat(),
|
level: args.logLevel,
|
||||||
}));
|
format: new libLoggingUtils.TerminalFormat(),
|
||||||
|
})
|
||||||
|
);
|
||||||
libLoggingUtils.handleUnhandledErrors(logger);
|
libLoggingUtils.handleUnhandledErrors(logger);
|
||||||
|
|
||||||
logger.verbose(`Loading available plugins from ${args.pluginList}`);
|
logger.verbose(`Loading available plugins from ${args.pluginList}`);
|
||||||
|
|||||||
+13
-9
@@ -52,15 +52,19 @@ class HostConnector extends libLink.WebSocketClientConnector {
|
|||||||
plugins[pluginInfo.name] = pluginInfo.version;
|
plugins[pluginInfo.name] = pluginInfo.version;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.sendHandshake(new libData.MessageRegisterHost(new libData.RegisterHostData(
|
this.sendHandshake(
|
||||||
this.hostConfig.get("host.controller_token"),
|
new libData.MessageRegisterHost(
|
||||||
"Clusterio Host",
|
new libData.RegisterHostData(
|
||||||
version,
|
this.hostConfig.get("host.controller_token"),
|
||||||
this.hostConfig.get("host.name"),
|
"Clusterio Host",
|
||||||
this.hostConfig.get("host.id"),
|
version,
|
||||||
this.hostConfig.get("host.public_address"),
|
this.hostConfig.get("host.name"),
|
||||||
plugins,
|
this.hostConfig.get("host.id"),
|
||||||
)));
|
this.hostConfig.get("host.public_address"),
|
||||||
|
plugins,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,11 +19,15 @@ export class ControlConnector extends libLink.WebSocketClientConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.verbose("Connector | registering control");
|
logger.verbose("Connector | registering control");
|
||||||
this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData(
|
this.sendHandshake(
|
||||||
this.token,
|
new libData.MessageRegisterControl(
|
||||||
"Clusterio Web UI",
|
new libData.RegisterControlData(
|
||||||
packageJson.version,
|
this.token,
|
||||||
)));
|
"Clusterio Web UI",
|
||||||
|
packageJson.version,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+42
-26
@@ -64,11 +64,15 @@ describe("class Instance", function() {
|
|||||||
let stats = instance.playerStats.get("player");
|
let stats = instance.playerStats.get("player");
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
connector.sentMessages[0],
|
connector.sentMessages[0],
|
||||||
new libData.MessageEvent(1, src, addr("controller"), "InstancePlayerUpdateEvent",
|
new libData.MessageEvent(
|
||||||
new libData.InstancePlayerUpdateEvent("join", "player", undefined, new PlayerStats({
|
1, src, addr("controller"), "InstancePlayerUpdateEvent",
|
||||||
join_count: 1,
|
new libData.InstancePlayerUpdateEvent(
|
||||||
last_join_at: stats.lastJoinAt.getTime(),
|
"join", "player", undefined,
|
||||||
}))
|
new PlayerStats({
|
||||||
|
join_count: 1,
|
||||||
|
last_join_at: stats.lastJoinAt.getTime(),
|
||||||
|
})
|
||||||
|
)
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -105,14 +109,18 @@ describe("class Instance", function() {
|
|||||||
let stats = instance.playerStats.get("player");
|
let stats = instance.playerStats.get("player");
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
connector.sentMessages[1],
|
connector.sentMessages[1],
|
||||||
new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
new libData.MessageEvent(
|
||||||
new libData.InstancePlayerUpdateEvent("leave", "player", "quit", new PlayerStats({
|
2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
||||||
join_count: 1,
|
new libData.InstancePlayerUpdateEvent(
|
||||||
online_time_ms: stats.onlineTimeMs,
|
"leave", "player", "quit",
|
||||||
last_join_at: stats.lastJoinAt.getTime(),
|
new PlayerStats({
|
||||||
last_leave_at: stats.lastLeaveAt.getTime(),
|
join_count: 1,
|
||||||
last_leave_reason: "quit",
|
online_time_ms: stats.onlineTimeMs,
|
||||||
}))
|
last_join_at: stats.lastJoinAt.getTime(),
|
||||||
|
last_leave_at: stats.lastLeaveAt.getTime(),
|
||||||
|
last_leave_reason: "quit",
|
||||||
|
})
|
||||||
|
)
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -151,11 +159,15 @@ describe("class Instance", function() {
|
|||||||
let stats = instance.playerStats.get("foo");
|
let stats = instance.playerStats.get("foo");
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
connector.sentMessages[1],
|
connector.sentMessages[1],
|
||||||
new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
new libData.MessageEvent(
|
||||||
new libData.InstancePlayerUpdateEvent("join", "foo", undefined, new PlayerStats({
|
2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
||||||
join_count: 1,
|
new libData.InstancePlayerUpdateEvent(
|
||||||
last_join_at: stats.lastJoinAt.getTime(),
|
"join", "foo", undefined,
|
||||||
}))
|
new PlayerStats({
|
||||||
|
join_count: 1,
|
||||||
|
last_join_at: stats.lastJoinAt.getTime(),
|
||||||
|
})
|
||||||
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -168,14 +180,18 @@ describe("class Instance", function() {
|
|||||||
let stats = instance.playerStats.get("player");
|
let stats = instance.playerStats.get("player");
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
connector.sentMessages[1],
|
connector.sentMessages[1],
|
||||||
new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
new libData.MessageEvent(
|
||||||
new libData.InstancePlayerUpdateEvent("leave", "player", "quit", new PlayerStats({
|
2, src, addr("controller"), "InstancePlayerUpdateEvent",
|
||||||
join_count: 1,
|
new libData.InstancePlayerUpdateEvent(
|
||||||
online_time_ms: stats.onlineTimeMs,
|
"leave", "player", "quit",
|
||||||
last_join_at: stats.lastJoinAt.getTime(),
|
new PlayerStats({
|
||||||
last_leave_at: stats.lastLeaveAt.getTime(),
|
join_count: 1,
|
||||||
last_leave_reason: "quit",
|
online_time_ms: stats.onlineTimeMs,
|
||||||
}))
|
last_join_at: stats.lastJoinAt.getTime(),
|
||||||
|
last_leave_at: stats.lastLeaveAt.getTime(),
|
||||||
|
last_leave_reason: "quit",
|
||||||
|
})
|
||||||
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -89,11 +89,15 @@ class TestControl extends libLink.Link {
|
|||||||
|
|
||||||
class TestControlConnector extends libLink.WebSocketClientConnector {
|
class TestControlConnector extends libLink.WebSocketClientConnector {
|
||||||
register() {
|
register() {
|
||||||
this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData(
|
this.sendHandshake(
|
||||||
this.token,
|
new libData.MessageRegisterControl(
|
||||||
"clusterioctl",
|
new libData.RegisterControlData(
|
||||||
"test",
|
this.token,
|
||||||
)));
|
"clusterioctl",
|
||||||
|
"test",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,18 +95,26 @@ describe("lib/link/connectors", function() {
|
|||||||
it("should call register on hello", function() {
|
it("should call register on hello", function() {
|
||||||
let called = false;
|
let called = false;
|
||||||
testConnector.register = () => { called = true; };
|
testConnector.register = () => { called = true; };
|
||||||
testConnector._processHandshake(new libData.MessageHello(new libData.HelloData("test", {})));
|
testConnector._processHandshake(
|
||||||
|
new libData.MessageHello(
|
||||||
|
new libData.HelloData("test", {})
|
||||||
|
)
|
||||||
|
);
|
||||||
assert(called, "register was not called");
|
assert(called, "register was not called");
|
||||||
});
|
});
|
||||||
it("should emit connect on ready", async function() {
|
it("should emit connect on ready", async function() {
|
||||||
let result = events.once(testConnector, "connect");
|
let result = events.once(testConnector, "connect");
|
||||||
testConnector._processHandshake(new libData.MessageReady(new libData.ReadyData(
|
testConnector._processHandshake(
|
||||||
new libData.Address(libData.Address.control, 1),
|
new libData.MessageReady(
|
||||||
"x",
|
new libData.ReadyData(
|
||||||
20,
|
new libData.Address(libData.Address.control, 1),
|
||||||
10,
|
"x",
|
||||||
undefined
|
20,
|
||||||
)));
|
10,
|
||||||
|
undefined
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
await result;
|
await result;
|
||||||
clearInterval(testConnector._heartbeatId);
|
clearInterval(testConnector._heartbeatId);
|
||||||
});
|
});
|
||||||
|
|||||||
+20
-11
@@ -283,7 +283,10 @@ describe("lib/link/link", function() {
|
|||||||
let request = testLink.send(new SimpleRequest());
|
let request = testLink.send(new SimpleRequest());
|
||||||
let srcReq = new libData.Address(libData.Address.control, 1, 1);
|
let srcReq = new libData.Address(libData.Address.control, 1, 1);
|
||||||
testConnector.emit(
|
testConnector.emit(
|
||||||
"message", new libData.MessageResponseError(1, dst, srcReq, new libData.ResponseError("Error"))
|
"message",
|
||||||
|
new libData.MessageResponseError(
|
||||||
|
1, dst, srcReq, new libData.ResponseError("Error")
|
||||||
|
)
|
||||||
);
|
);
|
||||||
await assert.rejects(
|
await assert.rejects(
|
||||||
request,
|
request,
|
||||||
@@ -345,11 +348,14 @@ describe("lib/link/link", function() {
|
|||||||
let response = (await message)[0];
|
let response = (await message)[0];
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
response,
|
response,
|
||||||
new libData.MessageResponseError(1, src, dst, new libData.ResponseError(
|
new libData.MessageResponseError(
|
||||||
"Request NumberRequest failed validation",
|
1, src, dst,
|
||||||
response.data.code,
|
new libData.ResponseError(
|
||||||
response.data.stack,
|
"Request NumberRequest failed validation",
|
||||||
))
|
response.data.code,
|
||||||
|
response.data.stack,
|
||||||
|
)
|
||||||
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
it("should send response error on response validation failing", async function() {
|
it("should send response error on response validation failing", async function() {
|
||||||
@@ -360,11 +366,14 @@ describe("lib/link/link", function() {
|
|||||||
let response = (await message)[0];
|
let response = (await message)[0];
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
response,
|
response,
|
||||||
new libData.MessageResponseError(1, src, dst, new libData.ResponseError(
|
new libData.MessageResponseError(
|
||||||
"Response for request NumberRequest failed validation",
|
1, src, dst,
|
||||||
response.data.code,
|
new libData.ResponseError(
|
||||||
response.data.stack,
|
"Response for request NumberRequest failed validation",
|
||||||
))
|
response.data.code,
|
||||||
|
response.data.stack,
|
||||||
|
)
|
||||||
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
it("should send value returned from request handler", async function() {
|
it("should send value returned from request handler", async function() {
|
||||||
|
|||||||
Reference in new issue
Block a user