diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js index e02dd2a5..024f5f11 100755 --- a/packages/ctl/ctl.js +++ b/packages/ctl/ctl.js @@ -36,11 +36,15 @@ class ControlConnector extends libLink.WebSocketClientConnector { register() { logger.verbose("Connector | registering control"); - this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData( - this._token, - "clusterioctl", - version, - ))); + this.sendHandshake( + new libData.MessageRegisterControl( + new libData.RegisterControlData( + this._token, + "clusterioctl", + version, + ) + ) + ); } } @@ -87,9 +91,11 @@ class Control extends libLink.Link { instanceIds = [], maxLevel = null, }) { - await this.send(new libData.LogSetSubscriptionsRequest( - all, controller, hostIds, instanceIds, maxLevel, - )); + await this.send( + new libData.LogSetSubscriptionsRequest( + all, controller, hostIds, instanceIds, maxLevel, + ) + ); } async handleLogMessageEvent(event) { @@ -166,11 +172,13 @@ async function startControl() { let args = yargs.parse(); // Log stream for the ctl session. - logger.add(new ConsoleTransport({ - errorLevels: Object.keys(levels), - level: args.logLevel, - format: new libLoggingUtils.TerminalFormat(), - })); + logger.add( + new ConsoleTransport({ + errorLevels: Object.keys(levels), + level: args.logLevel, + format: new libLoggingUtils.TerminalFormat(), + }) + ); libLoggingUtils.handleUnhandledErrors(logger); logger.verbose(`Loading available plugins from ${args.pluginList}`); diff --git a/packages/host/host.js b/packages/host/host.js index 159e1aac..679e926b 100755 --- a/packages/host/host.js +++ b/packages/host/host.js @@ -52,15 +52,19 @@ class HostConnector extends libLink.WebSocketClientConnector { plugins[pluginInfo.name] = pluginInfo.version; } - this.sendHandshake(new libData.MessageRegisterHost(new libData.RegisterHostData( - this.hostConfig.get("host.controller_token"), - "Clusterio Host", - version, - this.hostConfig.get("host.name"), - this.hostConfig.get("host.id"), - this.hostConfig.get("host.public_address"), - plugins, - ))); + this.sendHandshake( + new libData.MessageRegisterHost( + new libData.RegisterHostData( + this.hostConfig.get("host.controller_token"), + "Clusterio Host", + version, + this.hostConfig.get("host.name"), + this.hostConfig.get("host.id"), + this.hostConfig.get("host.public_address"), + plugins, + ) + ) + ); } } diff --git a/packages/web_ui/src/util/websocket.jsx b/packages/web_ui/src/util/websocket.jsx index 314745d0..7a4f4b9f 100644 --- a/packages/web_ui/src/util/websocket.jsx +++ b/packages/web_ui/src/util/websocket.jsx @@ -19,11 +19,15 @@ export class ControlConnector extends libLink.WebSocketClientConnector { } logger.verbose("Connector | registering control"); - this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData( - this.token, - "Clusterio Web UI", - packageJson.version, - ))); + this.sendHandshake( + new libData.MessageRegisterControl( + new libData.RegisterControlData( + this.token, + "Clusterio Web UI", + packageJson.version, + ) + ) + ); } } diff --git a/test/host/Instance.js b/test/host/Instance.js index 50d38fea..224a4927 100644 --- a/test/host/Instance.js +++ b/test/host/Instance.js @@ -64,11 +64,15 @@ describe("class Instance", function() { let stats = instance.playerStats.get("player"); assert.deepEqual( connector.sentMessages[0], - new libData.MessageEvent(1, src, addr("controller"), "InstancePlayerUpdateEvent", - new libData.InstancePlayerUpdateEvent("join", "player", undefined, new PlayerStats({ - join_count: 1, - last_join_at: stats.lastJoinAt.getTime(), - })) + new libData.MessageEvent( + 1, src, addr("controller"), "InstancePlayerUpdateEvent", + new libData.InstancePlayerUpdateEvent( + "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"); assert.deepEqual( connector.sentMessages[1], - new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent", - new libData.InstancePlayerUpdateEvent("leave", "player", "quit", new PlayerStats({ - join_count: 1, - online_time_ms: stats.onlineTimeMs, - last_join_at: stats.lastJoinAt.getTime(), - last_leave_at: stats.lastLeaveAt.getTime(), - last_leave_reason: "quit", - })) + new libData.MessageEvent( + 2, src, addr("controller"), "InstancePlayerUpdateEvent", + new libData.InstancePlayerUpdateEvent( + "leave", "player", "quit", + new PlayerStats({ + join_count: 1, + 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"); assert.deepEqual( connector.sentMessages[1], - new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent", - new libData.InstancePlayerUpdateEvent("join", "foo", undefined, new PlayerStats({ - join_count: 1, - last_join_at: stats.lastJoinAt.getTime(), - })) + new libData.MessageEvent( + 2, src, addr("controller"), "InstancePlayerUpdateEvent", + new libData.InstancePlayerUpdateEvent( + "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"); assert.deepEqual( connector.sentMessages[1], - new libData.MessageEvent(2, src, addr("controller"), "InstancePlayerUpdateEvent", - new libData.InstancePlayerUpdateEvent("leave", "player", "quit", new PlayerStats({ - join_count: 1, - online_time_ms: stats.onlineTimeMs, - last_join_at: stats.lastJoinAt.getTime(), - last_leave_at: stats.lastLeaveAt.getTime(), - last_leave_reason: "quit", - })) + new libData.MessageEvent( + 2, src, addr("controller"), "InstancePlayerUpdateEvent", + new libData.InstancePlayerUpdateEvent( + "leave", "player", "quit", + new PlayerStats({ + join_count: 1, + online_time_ms: stats.onlineTimeMs, + last_join_at: stats.lastJoinAt.getTime(), + last_leave_at: stats.lastLeaveAt.getTime(), + last_leave_reason: "quit", + }) + ) ) ); }); diff --git a/test/integration/index.js b/test/integration/index.js index 3f6c4eeb..1139382f 100644 --- a/test/integration/index.js +++ b/test/integration/index.js @@ -89,11 +89,15 @@ class TestControl extends libLink.Link { class TestControlConnector extends libLink.WebSocketClientConnector { register() { - this.sendHandshake(new libData.MessageRegisterControl(new libData.RegisterControlData( - this.token, - "clusterioctl", - "test", - ))); + this.sendHandshake( + new libData.MessageRegisterControl( + new libData.RegisterControlData( + this.token, + "clusterioctl", + "test", + ) + ) + ); } } diff --git a/test/lib/link/connector.js b/test/lib/link/connector.js index eaeb2961..ddcfbd49 100644 --- a/test/lib/link/connector.js +++ b/test/lib/link/connector.js @@ -95,18 +95,26 @@ describe("lib/link/connectors", function() { it("should call register on hello", function() { let called = false; 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"); }); it("should emit connect on ready", async function() { let result = events.once(testConnector, "connect"); - testConnector._processHandshake(new libData.MessageReady(new libData.ReadyData( - new libData.Address(libData.Address.control, 1), - "x", - 20, - 10, - undefined - ))); + testConnector._processHandshake( + new libData.MessageReady( + new libData.ReadyData( + new libData.Address(libData.Address.control, 1), + "x", + 20, + 10, + undefined + ) + ) + ); await result; clearInterval(testConnector._heartbeatId); }); diff --git a/test/lib/link/link.js b/test/lib/link/link.js index e88df1f1..2b6a2f61 100644 --- a/test/lib/link/link.js +++ b/test/lib/link/link.js @@ -283,7 +283,10 @@ describe("lib/link/link", function() { let request = testLink.send(new SimpleRequest()); let srcReq = new libData.Address(libData.Address.control, 1, 1); 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( request, @@ -345,11 +348,14 @@ describe("lib/link/link", function() { let response = (await message)[0]; assert.deepEqual( response, - new libData.MessageResponseError(1, src, dst, new libData.ResponseError( - "Request NumberRequest failed validation", - response.data.code, - response.data.stack, - )) + new libData.MessageResponseError( + 1, src, dst, + new libData.ResponseError( + "Request NumberRequest failed validation", + response.data.code, + response.data.stack, + ) + ) ); }); 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]; assert.deepEqual( response, - new libData.MessageResponseError(1, src, dst, new libData.ResponseError( - "Response for request NumberRequest failed validation", - response.data.code, - response.data.stack, - )) + new libData.MessageResponseError( + 1, src, dst, + new libData.ResponseError( + "Response for request NumberRequest failed validation", + response.data.code, + response.data.stack, + ) + ) ); }); it("should send value returned from request handler", async function() {