Added public_address field to lists

- InstanceList
- SlavesPage
Added public_address field to messages
- slaveProperties
- instanceProperties
This commit is contained in:
bbassie committed 2021-11-04 01:39:28 +01:00
1 parent c3a1b420ea
commit 83b720eade
8 files changed
+37 -3

No files matched your search

+2
View File
@@ -337,6 +337,7 @@ let slaveProperties = {
"name": { type: "string" }, "name": { type: "string" },
"id": { type: "integer" }, "id": { type: "integer" },
"connected": { type: "boolean" }, "connected": { type: "boolean" },
"public_address": { type: ["null", "string"] },
}; };
messages.listSlaves = new Request({ messages.listSlaves = new Request({
@@ -372,6 +373,7 @@ let instanceProperties = {
"name": { type: "string" }, "name": { type: "string" },
"id": { type: "integer" }, "id": { type: "integer" },
"assigned_slave": { type: ["null", "integer"] }, "assigned_slave": { type: ["null", "integer"] },
"game_port": { type: ["null", "integer"] },
"status": { enum: [ "status": { enum: [
"unknown", "unassigned", "stopped", "starting", "running", "stopping", "unknown", "unassigned", "stopped", "starting", "running", "stopping",
"creating_save", "exporting_data", "deleted", "creating_save", "exporting_data", "deleted",
+1
View File
@@ -178,6 +178,7 @@ const clientHandshake = ajv.compile({
"version": { type: "string" }, "version": { type: "string" },
"name": { type: "string" }, "name": { type: "string" },
"id": { type: "integer" }, "id": { type: "integer" },
"public_address": { type: "string" },
"plugins": { "plugins": {
type: "object", type: "object",
additionalProperties: { type: "string" }, additionalProperties: { type: "string" },
+4
View File
@@ -106,6 +106,7 @@ class ControlConnection extends BaseConnection {
version: slave.version, version: slave.version,
id: slave.id, id: slave.id,
name: slave.name, name: slave.name,
public_address: slave.public_address,
connected: this._master.wsServer.slaveConnections.has(slave.id), connected: this._master.wsServer.slaveConnections.has(slave.id),
}); });
} }
@@ -169,6 +170,7 @@ class ControlConnection extends BaseConnection {
id, id,
name: instance.config.get("instance.name"), name: instance.config.get("instance.name"),
assigned_slave: instance.config.get("instance.assigned_slave"), assigned_slave: instance.config.get("instance.assigned_slave"),
game_port: instance.config.get("factorio.game_port"),
status: instance.status, status: instance.status,
}; };
} }
@@ -180,6 +182,7 @@ class ControlConnection extends BaseConnection {
id: instance.config.get("instance.id"), id: instance.config.get("instance.id"),
name: instance.config.get("instance.name"), name: instance.config.get("instance.name"),
assigned_slave: instance.config.get("instance.assigned_slave"), assigned_slave: instance.config.get("instance.assigned_slave"),
game_port: instance.config.get("factorio.game_port"),
status: instance.status, status: instance.status,
}); });
} }
@@ -199,6 +202,7 @@ class ControlConnection extends BaseConnection {
id: instance.config.get("instance.id"), id: instance.config.get("instance.id"),
name: instance.config.get("instance.name"), name: instance.config.get("instance.name"),
assigned_slave: instance.config.get("instance.assigned_slave"), assigned_slave: instance.config.get("instance.assigned_slave"),
game_port: instance.config.get("factorio.game_port"),
status: instance.status, status: instance.status,
}); });
} }
+1
View File
@@ -368,6 +368,7 @@ class Master {
version: slave.version, version: slave.version,
id: slave.id, id: slave.id,
name: slave.name, name: slave.name,
public_address: slave.public_address,
connected: this.wsServer.slaveConnections.has(slave.id), connected: this.wsServer.slaveConnections.has(slave.id),
}; };
+1
View File
@@ -28,6 +28,7 @@ class SlaveConnection extends BaseConnection {
id: this._id, id: this._id,
name: this._name, name: this._name,
version: this._version, version: this._version,
public_address: registerData.public_address,
plugins: registerData.plugins, plugins: registerData.plugins,
}); });
+1
View File
@@ -1004,6 +1004,7 @@ class SlaveConnector extends libLink.WebSocketClientConnector {
version, version,
id: this.slaveConfig.get("slave.id"), id: this.slaveConfig.get("slave.id"),
name: this.slaveConfig.get("slave.name"), name: this.slaveConfig.get("slave.name"),
public_address: this.slaveConfig.get("slave.public_address"),
plugins, plugins,
}); });
} }
@@ -19,7 +19,13 @@ export default function InstanceList(props) {
} }
return String(slaveId); return String(slaveId);
} }
function slavePublicAddress(slaveId) {
let slave = slaveList.find(s => s.id === slaveId);
if (slave) {
return slave.public_address;
}
return null;
}
let columns = [ let columns = [
{ {
title: "Name", title: "Name",
@@ -33,6 +39,15 @@ export default function InstanceList(props) {
render: instance => slaveName(instance["assigned_slave"]), render: instance => slaveName(instance["assigned_slave"]),
sorter: (a, b) => strcmp(slaveName(a["assigned_slave"]), slaveName(b["assigned_slave"])), sorter: (a, b) => strcmp(slaveName(a["assigned_slave"]), slaveName(b["assigned_slave"])),
}, },
{
title: "Public address",
key: "public_address",
render: instance => {
let address = slavePublicAddress(instance["assigned_slave"]);
return address ? `${address}:${instance["game_port"] || "unknown"}` : "";
},
sorter: (a, b) => strcmp(slavePublicAddress(a["assigned_slave"]), slavePublicAddress(b["assigned_slave"])),
},
{ {
title: "Status", title: "Status",
dataIndex: "status", dataIndex: "status",
+11 -2
View File
@@ -1,6 +1,6 @@
import React, { useContext, useRef, useState } from "react"; import React, { useContext, useRef, useState } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, Input, Modal, PageHeader, Table } from "antd"; import { Button, Form, Input, Modal, PageHeader, Table, Tag } from "antd";
import { libLink } from "@clusterio/lib"; import { libLink } from "@clusterio/lib";
@@ -104,10 +104,19 @@ export default function SlavesPage() {
dataIndex: "version", dataIndex: "version",
sorter: (a, b) => strcmp(a["version"], b["version"]), sorter: (a, b) => strcmp(a["version"], b["version"]),
}, },
{
title: "Public address",
dataIndex: "public_address",
sorter: (a, b) => strcmp(a["public_address"], b["public_address"]),
},
{ {
title: "Connected", title: "Connected",
key: "connected", key: "connected",
render: slave => slave["connected"] && "Yes", render: slave => <Tag
color={slave["connected"] ? "#389e0d" : "#cf1322"}
>
{slave["connected"] ? "Connected" : "Disconnected"}
</Tag>,
sorter: (a, b) => a["connected"] - b["connected"], sorter: (a, b) => a["connected"] - b["connected"],
}, },
]} ]}