Rename Slave to Host

The role of a slave as a host for Factorio servers is not well reflected
in its name and has caused confusion among users.  Rename slave to host
to better reflect its role as a host of Factorio servers.
This commit is contained in:
Hornwitser committed 2023-02-22 15:30:51 +01:00
1 parent 70ad295a89
commit 6fc3abafd5
101 files changed
+1168 -1168

No files matched your search

@@ -5,14 +5,14 @@ import { libLink } from "@clusterio/lib";
import ControlContext from "./ControlContext";
import { notifyErrorHandler } from "../util/notify";
import { useSlaveList } from "../model/slave";
import { useHostList } from "../model/host";
const { Paragraph } = Typography;
export default function AssignInstanceModal(props) {
let [visible, setVisible] = useState(false);
let [slaveList] = useSlaveList();
let [hostList] = useHostList();
let [applying, setApplying] = useState(false);
let [form] = Form.useForm();
let control = useContext(ControlContext);
@@ -22,20 +22,20 @@ export default function AssignInstanceModal(props) {
}
function handleAssign() {
let slaveId = form.getFieldValue("slave");
if (slaveId === undefined) {
let hostId = form.getFieldValue("host");
if (hostId === undefined) {
setVisible(false);
return;
}
if (slaveId === "null") {
slaveId = null;
if (hostId === "null") {
hostId = null;
}
setApplying(true);
libLink.messages.assignInstanceCommand.send(control, {
instance_id: props.id,
slave_id: slaveId,
host_id: hostId,
}).then(() => {
setVisible(false);
if (props.onFinish) {
@@ -66,24 +66,24 @@ export default function AssignInstanceModal(props) {
destroyOnClose
>
<Paragraph style={{ maxWidth: "30em" }}>
Select a Slave to assign this instance to. Assignment
creates the necessary files on the slave to start up
Select a Host to assign this instance to. Assignment
creates the necessary files on the host to start up
the instance. Note that reassigning an instance from
one slave to another will not move the server save over.
one host to another will not move the server save over.
</Paragraph>
<Form form={form} initialValues={{ slave: props.slaveId === null ? "null" : props.slaveId }}>
<Form.Item name="slave" label="Slave">
<Form form={form} initialValues={{ host: props.hostId === null ? "null" : props.hostId }}>
<Form.Item name="host" label="Host">
<Select>
<Select.Option value={"null"}>
<Typography.Text italic>Unassigned</Typography.Text>
</Select.Option>
{slaveList.map((slave) => <Select.Option
key={slave["id"]}
value={slave["id"]}
disabled={!slave["connected"]}
{hostList.map((host) => <Select.Option
key={host["id"]}
value={host["id"]}
disabled={!host["connected"]}
>
{slave["name"]}
{!slave["connected"] && " (offline)"}
{host["name"]}
{!host["connected"] && " (offline)"}
</Select.Option>)}
</Select>
</Form.Item>
@@ -6,61 +6,61 @@ import InstanceList from "./InstanceList";
import LogConsole from "./LogConsole";
import { useAccount } from "../model/account";
import { useInstanceList } from "../model/instance";
import { useSlave } from "../model/slave";
import { useHost } from "../model/host";
import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra";
const { Title } = Typography;
export default function SlaveViewPage(props) {
export default function HostViewPage(props) {
let params = useParams();
let slaveId = Number(params.id);
let hostId = Number(params.id);
let account = useAccount();
let [instanceList] = useInstanceList();
let [slave] = useSlave(slaveId);
let [host] = useHost(hostId);
instanceList = instanceList.filter(instance => instance["assigned_slave"] === slaveId);
instanceList = instanceList.filter(instance => instance["assigned_host"] === hostId);
let nav = [{ name: "Slaves", path: "/slaves" }, { name: slave.name || slaveId }];
if (slave.loading) {
let nav = [{ name: "Hosts", path: "/hosts" }, { name: host.name || hostId }];
if (host.loading) {
return <PageLayout nav={nav}><Spin size="large" /></PageLayout>;
}
if (slave.missing) {
if (host.missing) {
return <PageLayout nav={nav}>
<PageHeader
className="site-page-header"
title={slaveId}
title={hostId}
/>
<p>Slave with id {slaveId} was not found on the controller.</p>
<p>Host with id {hostId} was not found on the controller.</p>
</PageLayout>;
}
return <PageLayout nav={nav}>
<PageHeader
className="site-page-header"
title={slave.name || slaveId}
title={host.name || hostId}
/>
<Descriptions bordered size="small" column={{ xs: 1, sm: 2, xl: 4 }}>
<Descriptions.Item label="Name">{slave["name"]}</Descriptions.Item>
<Descriptions.Item label="Name">{host["name"]}</Descriptions.Item>
<Descriptions.Item label="Connected">
<Tag color={slave["connected"] ? "#389e0d" : "#cf1322"}>
{slave["connected"] ? "Connected" : "Disconnected"}
<Tag color={host["connected"] ? "#389e0d" : "#cf1322"}>
{host["connected"] ? "Connected" : "Disconnected"}
</Tag>
</Descriptions.Item>
<Descriptions.Item label="Agent">{slave["agent"]}</Descriptions.Item>
<Descriptions.Item label="Version">{slave["version"]}</Descriptions.Item>
<Descriptions.Item label="Agent">{host["agent"]}</Descriptions.Item>
<Descriptions.Item label="Version">{host["version"]}</Descriptions.Item>
</Descriptions>
{account.hasPermission("core.instance.list") && <>
<Title level={5} style={{ marginTop: 16 }}>Instances</Title>
<InstanceList instances={instanceList} size="small" hideAssignedSlave />
<InstanceList instances={instanceList} size="small" hideAssignedHost />
</>}
{account.hasPermission("core.log.follow") && <>
<Title level={5} style={{ marginTop: 16 }}>Console</Title>
<LogConsole slaves={[slaveId]} />
<LogConsole hosts={[hostId]} />
</>}
<PluginExtra component="SlaveViewPage" slave={slave} />
<PluginExtra component="HostViewPage" host={host} />
</PageLayout>;
}
@@ -9,17 +9,17 @@ import { useAccount } from "../model/account";
import ControlContext from "./ControlContext";
import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra";
import { useSlaveList } from "../model/slave";
import { useHostList } from "../model/host";
import notify, { notifyErrorHandler } from "../util/notify";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
function GenerateSlaveTokenButton(props) {
function GenerateHostTokenButton(props) {
let control = useContext(ControlContext);
let [visible, setVisible] = useState(false);
let [token, setToken] = useState(null);
let [slaveId, setSlaveId] = useState(null);
let [hostId, setHostId] = useState(null);
let [form] = Form.useForm();
let [pluginList, setPluginList] = useState([]);
useEffect(() => {
@@ -37,18 +37,18 @@ function GenerateSlaveTokenButton(props) {
async function generateToken() {
let id;
let values = form.getFieldsValue();
if (values.slaveId) {
id = Number.parseInt(values.slaveId, 10);
if (values.hostId) {
id = Number.parseInt(values.hostId, 10);
if (Number.isNaN(id)) {
form.setFields([{ name: "slaveId", errors: ["Must be an integer"] }]);
form.setFields([{ name: "hostId", errors: ["Must be an integer"] }]);
return;
}
form.setFields([{ name: "slaveId", errors: [] }]);
form.setFields([{ name: "hostId", errors: [] }]);
}
let result = await libLink.messages.generateSlaveToken.send(control, { slave_id: id || null });
let result = await libLink.messages.generateHostToken.send(control, { host_id: id || null });
setToken(result.token);
setSlaveId(id);
setHostId(id);
}
// Generate a new random
@@ -65,7 +65,7 @@ function GenerateSlaveTokenButton(props) {
onClick={() => { setVisible(true); }}
>Generate Token</Button>
<Modal
title="Generate Slave Token"
title="Generate Host Token"
visible={visible}
footer={null}
onCancel={() => {
@@ -76,7 +76,7 @@ function GenerateSlaveTokenButton(props) {
width="700px"
>
<Form form={form} layout="vertical" requiredMark="optional">
<Form.Item name="slaveId" label="Slave ID">
<Form.Item name="hostId" label="Host ID">
<InputNumber onChange={() => {
generateToken().catch(notifyErrorHandler("Error generating token"));
}} />
@@ -84,7 +84,7 @@ function GenerateSlaveTokenButton(props) {
</Form>
{token !== null && <>
<Typography.Paragraph>
Slave auth token:
Host auth token:
</Typography.Paragraph>
<div className="codeblock">
<CopyButton
@@ -94,43 +94,43 @@ function GenerateSlaveTokenButton(props) {
{token}
</div>
<Typography.Paragraph>
You can set the token on an existing slave with the following command:
You can set the token on an existing host with the following command:
</Typography.Paragraph>
<div className="codeblock">
<CopyButton
message={"Copied configuration commands to clipboard"}
text={`npx clusterioslave config set slave.controller_token ${token}
npx clusterioslave config set slave.id ${slaveId}`}
text={`npx clusteriohost config set host.controller_token ${token}
npx clusteriohost config set host.id ${hostId}`}
/>
<p>npx clusterioslave config set slave.controller_token &lt;token&gt;</p>
<p>npx clusterioslave config set slave.id &lt;slaveId&gt;</p>
<p>npx clusteriohost config set host.controller_token &lt;token&gt;</p>
<p>npx clusteriohost config set host.id &lt;hostId&gt;</p>
</div>
<Typography.Paragraph>
Example slave setup commands:
Example host setup commands:
</Typography.Paragraph>
<div className="codeblock">
<CopyButton
message={"Copied slave setup commands to clipboard"}
message={"Copied host setup commands to clipboard"}
text={`
mkdir clusterio
cd clusterio
`+
// eslint-disable-next-line max-len
`npm init "@clusterio" -- --controller-token ${token} --mode "slave" --download-headless --controller-url ${document.location.origin}/ --slave-name "Slave ${slaveId || "?"}" --public-address localhost ${pluginString.length ? "--plugins" : ""} ${pluginString}`
`npm init "@clusterio" -- --controller-token ${token} --mode "host" --download-headless --controller-url ${document.location.origin}/ --host-name "Host ${hostId || "?"}" --public-address localhost ${pluginString.length ? "--plugins" : ""} ${pluginString}`
}/>
<p>&gt; mkdir clusterio</p>
<p>&gt; cd clusterio</p>
<p>
&gt; npm init "@clusterio" --
--controller-token <span className="highlight">{token} </span>
--mode "slave"
--mode "host"
--download-headless
--controller-url <span className="highlight">{document.location.origin}/ </span>
--slave-name <span className="highlight">"Slave {slaveId || "?"}" </span>
--host-name <span className="highlight">"Host {hostId || "?"}" </span>
--public-address <span className="highlight">localhost </span>
{pluginString.length ? "--plugins" : ""} <span className="highlight">{pluginString}</span>
</p>
<p>&gt; ./run-slave</p>
<p>&gt; ./run-host</p>
</div>
</>}
</Modal>
@@ -175,16 +175,16 @@ function CopyButton({ text, message }) {
}
export default function SlavesPage() {
export default function HostsPage() {
let account = useAccount();
let history = useHistory();
let [slaveList] = useSlaveList();
let [hostList] = useHostList();
return <PageLayout nav={[{ name: "Slaves" }]}>
return <PageLayout nav={[{ name: "Hosts" }]}>
<PageHeader
className="site-page-header"
title="Slaves"
extra={account.hasPermission("core.slave.generate_token") && <GenerateSlaveTokenButton />}
title="Hosts"
extra={account.hasPermission("core.host.generate_token") && <GenerateHostTokenButton />}
/>
<Table
columns={[
@@ -213,23 +213,23 @@ export default function SlavesPage() {
{
title: "Connected",
key: "connected",
render: slave => <Tag
color={slave["connected"] ? "#389e0d" : "#cf1322"}
render: host => <Tag
color={host["connected"] ? "#389e0d" : "#cf1322"}
>
{slave["connected"] ? "Connected" : "Disconnected"}
{host["connected"] ? "Connected" : "Disconnected"}
</Tag>,
sorter: (a, b) => a["connected"] - b["connected"],
},
]}
dataSource={slaveList}
rowKey={slave => slave["id"]}
dataSource={hostList}
rowKey={host => host["id"]}
pagination={false}
onRow={(record, rowIndex) => ({
onClick: event => {
history.push(`/slaves/${record.id}/view`);
history.push(`/hosts/${record.id}/view`);
},
})}
/>
<PluginExtra component="SlavesPage" />
<PluginExtra component="HostsPage" />
</PageLayout>;
};
+18 -18
View File
@@ -4,7 +4,7 @@ import { message, Button, Space, Table } from "antd";
import CopyOutlined from "@ant-design/icons/CopyOutlined";
import { useAccount } from "../model/account";
import { useSlaveList } from "../model/slave";
import { useHostList } from "../model/host";
import InstanceStatusTag from "./InstanceStatusTag";
import StartStopInstanceButton from "./StartStopInstanceButton";
@@ -13,26 +13,26 @@ const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "ba
export default function InstanceList(props) {
let account = useAccount();
let history = useHistory();
let [slaveList] = useSlaveList();
let [hostList] = useHostList();
function slaveName(slaveId) {
if (slaveId === null) {
function hostName(hostId) {
if (hostId === null) {
return "";
}
let slave = slaveList.find(s => s.id === slaveId);
if (slave) {
return slave.name;
let host = hostList.find(s => s.id === hostId);
if (host) {
return host.name;
}
return String(slaveId);
return String(hostId);
}
function instancePublicAddress(instance) {
let slave = slaveList.find(s => s.id === instance.assigned_slave);
if (slave && slave.public_address) {
let host = hostList.find(s => s.id === instance.assigned_host);
if (host && host.public_address) {
if (instance.game_port) {
return `${slave.public_address}:${instance.game_port}`;
return `${host.public_address}:${instance.game_port}`;
}
return slave.public_address;
return host.public_address;
}
return null;
}
@@ -45,10 +45,10 @@ export default function InstanceList(props) {
sorter: (a, b) => strcmp(a["name"], b["name"]),
},
{
title: "Assigned Slave",
key: "assigned_slave",
render: instance => slaveName(instance["assigned_slave"]),
sorter: (a, b) => strcmp(slaveName(a["assigned_slave"]), slaveName(b["assigned_slave"])),
title: "Assigned Host",
key: "assigned_host",
render: instance => hostName(instance["assigned_host"]),
sorter: (a, b) => strcmp(hostName(a["assigned_host"]), hostName(b["assigned_host"])),
responsive: ["sm"],
},
{
@@ -69,7 +69,7 @@ export default function InstanceList(props) {
/>
</> : "";
},
sorter: (a, b) => strcmp(slavePublicAddress(a["assigned_slave"]), slavePublicAddress(b["assigned_slave"])),
sorter: (a, b) => strcmp(hostPublicAddress(a["assigned_host"]), hostPublicAddress(b["assigned_host"])),
responsive: ["lg"],
},
{
@@ -90,7 +90,7 @@ export default function InstanceList(props) {
}] : []),
];
if (props.hideAssignedSlave) {
if (props.hideAssignedHost) {
columns.splice(1, 1);
}
@@ -19,7 +19,7 @@ import LoadScenarioModal from "./LoadScenarioModal";
import SavesList from "./SavesList";
import { notifyErrorHandler } from "../util/notify";
import { useInstance } from "../model/instance";
import { useSlave } from "../model/slave";
import { useHost } from "../model/host";
import InstanceStatusTag from "./InstanceStatusTag";
const { Title } = Typography;
@@ -28,20 +28,20 @@ const { Title } = Typography;
function InstanceDescription(props) {
let account = useAccount();
const { slave, instance } = props;
let assigned = instance["assigned_slave"] !== null;
const { host, instance } = props;
let assigned = instance["assigned_host"] !== null;
return <Descriptions
bordered
size="small"
>
<Descriptions.Item label="Slave">
<Descriptions.Item label="Host">
{!assigned
? <em>Unassigned</em>
: slave["name"] || instance["assigned_slave"]
: host["name"] || instance["assigned_host"]
}
{account.hasPermission("core.instance.assign") && <AssignInstanceModal
id={instance["id"]}
slaveId={instance["assigned_slave"]}
hostId={instance["assigned_host"]}
buttonProps={{
size: "small",
style: { float: "Right" },
@@ -64,7 +64,7 @@ export default function InstanceViewPage(props) {
let account = useAccount();
let control = useContext(ControlContext);
let [instance] = useInstance(instanceId);
let [slave] = useSlave(Number(instance["assigned_slave"]));
let [host] = useHost(Number(instance["assigned_host"]));
let [exportingData, setExportingData] = useState(false);
@@ -188,7 +188,7 @@ export default function InstanceViewPage(props) {
title={instance["name"]}
extra={instanceButtons}
/>
<InstanceDescription slave={slave} instance={instance} />
<InstanceDescription host={host} instance={instance} />
{
account.hasAllPermission("core.instance.save.list", "core.instance.save.list_subscribe")
@@ -60,7 +60,7 @@ export default function LogConsole(props) {
let logFilter = {
all: props.all || false,
controller: props.controller || false,
slave_ids: props.slaves || [],
host_ids: props.hosts || [],
instance_ids: props.instances || [],
};
@@ -94,7 +94,7 @@ export default function LogConsole(props) {
return () => {
control.offLog(logFilter, logHandler);
};
}, [props.all, props.controller, (props.slaves || []).join(), (props.instances || []).join()]);
}, [props.all, props.controller, (props.hosts || []).join(), (props.instances || []).join()]);
return <>
<Paragraph code className="instance-console">
+8 -8
View File
@@ -186,7 +186,7 @@ export default function SavesList(props) {
let [starting, setStarting] = useState(false);
let [uploadingFiles, setUploadingFiles] = useState([]);
let slaveOffline = ["unassigned", "unknown"].includes(props.instance.status);
let hostOffline = ["unassigned", "unknown"].includes(props.instance.status);
const saveTable = <Table
size="small"
columns={[
@@ -237,13 +237,13 @@ export default function SavesList(props) {
}}
>Load save</Button>}
{account.hasPermission("core.instance.save.rename") && <RenameModal
disabled={slaveOffline} instanceId={props.instance.id} save={save}
disabled={hostOffline} instanceId={props.instance.id} save={save}
/>}
{account.hasPermission("core.instance.save.copy") && <CopyModal
disabled={slaveOffline} instanceId={props.instance.id} save={save}
disabled={hostOffline} instanceId={props.instance.id} save={save}
/>}
{account.hasPermission("core.instance.save.download") && <Button
disabled={slaveOffline}
disabled={hostOffline}
onClick={() => {
libLink.messages.downloadSave.send(
control, { instance_id: props.instance.id, save: save.name }
@@ -257,7 +257,7 @@ export default function SavesList(props) {
}}
>Download</Button>}
{account.hasPermission("core.instance.save.transfer") && <TransferModal
disabled={slaveOffline} instanceId={props.instance.id} save={save}
disabled={hostOffline} instanceId={props.instance.id} save={save}
/>}
{account.hasPermission("core.instance.save.delete") && <Popconfirm
title="Permanently delete save?"
@@ -270,7 +270,7 @@ export default function SavesList(props) {
).catch(notifyErrorHandler("Error deleting save"));
}}
>
<Button danger disabled={slaveOffline}>Delete</Button>
<Button danger disabled={hostOffline}>Delete</Button>
</Popconfirm>}
</Space>,
}}
@@ -309,7 +309,7 @@ export default function SavesList(props) {
}
let uploadProps = {
disabled: slaveOffline,
disabled: hostOffline,
name: "file",
accept: ".zip",
headers: {
@@ -326,7 +326,7 @@ export default function SavesList(props) {
return <div>
<SectionHeader title="Saves" extra={<Space>
{account.hasPermission("core.instance.save.upload") && <Upload {...uploadProps} >
<Button disabled={slaveOffline}>Upload save</Button>
<Button disabled={hostOffline}>Upload save</Button>
</Upload>}
{account.hasPermission("core.instance.save.create") && <CreateSaveModal instance={props.instance} />}
</Space>} />
+1 -1
View File
@@ -2,7 +2,7 @@ export { default as bootstrap } from "./bootstrap.jsx";
export { default as notify, notifyErrorHandler } from "./util/notify.jsx";
export * from "./model/instance.jsx";
export * from "./model/slave.jsx";
export * from "./model/host.jsx";
export * from "./model/locale.jsx";
export * from "./model/item_metadata.jsx";
export * from "./model/account.jsx";
+77
View File
@@ -0,0 +1,77 @@
import { useEffect, useContext, useState } from "react";
import ControlContext from "../components/ControlContext";
import { libLink } from "@clusterio/lib";
export function useHost(id) {
let control = useContext(ControlContext);
let [host, setHost] = useState({ loading: true });
function updateHost() {
// XXX optimize by requesting only the host in question
libLink.messages.listHosts.send(control).then(result => {
let match = result.list.find(i => i.id === id);
if (!match) {
setHost({ missing: true });
} else {
setHost({ ...match, present: true });
}
});
}
useEffect(() => {
if (!Number.isInteger(id)) {
setHost({ missing: true });
return undefined;
}
updateHost();
function updateHandler(newHost) {
setHost({ ...newHost, present: true });
}
control.onHostUpdate(id, updateHandler);
return () => {
control.offHostUpdate(id, updateHandler);
};
}, [id]);
return [host, updateHost];
}
export function useHostList() {
let control = useContext(ControlContext);
let [hostList, setHostList] = useState([]);
function updateHostList() {
libLink.messages.listHosts.send(control).then(result => {
setHostList(result.list);
});
}
useEffect(() => {
updateHostList();
function updateHandler(newHost) {
setHostList(oldList => {
let newList = oldList.concat();
let index = newList.findIndex(s => s.id === newHost.id);
if (index !== -1) {
newList[index] = newHost;
} else {
newList.push(newHost);
}
return newList;
});
}
control.onHostUpdate(null, updateHandler);
return () => {
control.offHostUpdate(null, updateHandler);
};
}, []);
return [hostList];
}
-77
View File
@@ -1,77 +0,0 @@
import { useEffect, useContext, useState } from "react";
import ControlContext from "../components/ControlContext";
import { libLink } from "@clusterio/lib";
export function useSlave(id) {
let control = useContext(ControlContext);
let [slave, setSlave] = useState({ loading: true });
function updateSlave() {
// XXX optimize by requesting only the slave in question
libLink.messages.listSlaves.send(control).then(result => {
let match = result.list.find(i => i.id === id);
if (!match) {
setSlave({ missing: true });
} else {
setSlave({ ...match, present: true });
}
});
}
useEffect(() => {
if (!Number.isInteger(id)) {
setSlave({ missing: true });
return undefined;
}
updateSlave();
function updateHandler(newSlave) {
setSlave({ ...newSlave, present: true });
}
control.onSlaveUpdate(id, updateHandler);
return () => {
control.offSlaveUpdate(id, updateHandler);
};
}, [id]);
return [slave, updateSlave];
}
export function useSlaveList() {
let control = useContext(ControlContext);
let [slaveList, setSlaveList] = useState([]);
function updateSlaveList() {
libLink.messages.listSlaves.send(control).then(result => {
setSlaveList(result.list);
});
}
useEffect(() => {
updateSlaveList();
function updateHandler(newSlave) {
setSlaveList(oldList => {
let newList = oldList.concat();
let index = newList.findIndex(s => s.id === newSlave.id);
if (index !== -1) {
newList[index] = newSlave;
} else {
newList.push(newSlave);
}
return newList;
});
}
control.onSlaveUpdate(null, updateHandler);
return () => {
control.offSlaveUpdate(null, updateHandler);
};
}, []);
return [slaveList];
}
+9 -9
View File
@@ -1,8 +1,8 @@
import React from "react";
import ControllerPage from "./components/ControllerPage";
import SlavesPage from "./components/SlavesPage";
import SlaveViewPage from "./components/SlaveViewPage";
import HostsPage from "./components/HostsPage";
import HostViewPage from "./components/HostViewPage";
import InstancesPage from "./components/InstancesPage";
import InstanceViewPage from "./components/InstanceViewPage";
import ModPackViewPage from "./components/ModPackViewPage";
@@ -22,15 +22,15 @@ export const pages = [
content: <ControllerPage />,
},
{
path: "/slaves",
sidebarName: "Slaves",
permission: "core.slave.list",
content: <SlavesPage />,
path: "/hosts",
sidebarName: "Hosts",
permission: "core.host.list",
content: <HostsPage />,
},
{
path: "/slaves/:id/view",
sidebarPath: "/slaves",
content: <SlaveViewPage />,
path: "/hosts/:id/view",
sidebarPath: "/hosts",
content: <HostViewPage />,
},
{
path: "/instances",
+25 -25
View File
@@ -67,7 +67,7 @@ export class Control extends libLink.Link {
this.accountRoles = null;
this.accountUpdateHandlers = [];
this.slaveUpdateHandlers = new Map();
this.hostUpdateHandlers = new Map();
this.instanceUpdateHandlers = new Map();
this.saveListUpdateHandlers = new Map();
this.modPackUpdateHandlers = new Map();
@@ -79,8 +79,8 @@ export class Control extends libLink.Link {
this.accountName = data.account.name;
this.accountRoles = data.account.roles;
this.emitAccountUpdate();
this.updateSlaveSubscriptions().catch(err => logger.error(
`Unexpected error updating slave subscriptions:\n${err.stack}`
this.updateHostSubscriptions().catch(err => logger.error(
`Unexpected error updating host subscriptions:\n${err.stack}`
));
this.updateInstanceSubscriptions().catch(err => logger.error(
`Unexpected error updating instance subscriptions:\n${err.stack}`
@@ -143,60 +143,60 @@ export class Control extends libLink.Link {
this.accountUpdateHandlers.splice(index, 1);
}
async slaveUpdateEventHandler(message) {
async hostUpdateEventHandler(message) {
let handlers = [].concat(
this.slaveUpdateHandlers.get(null) || [],
this.slaveUpdateHandlers.get(message.data.id) || [],
this.hostUpdateHandlers.get(null) || [],
this.hostUpdateHandlers.get(message.data.id) || [],
);
for (let handler of handlers) {
handler(message.data);
}
}
async onSlaveUpdate(id, handler) {
async onHostUpdate(id, handler) {
if (id !== null && !Number.isInteger(id)) {
throw new Error("Invalid slave id");
throw new Error("Invalid host id");
}
let handlers = this.slaveUpdateHandlers.get(id);
let handlers = this.hostUpdateHandlers.get(id);
if (!handlers) {
handlers = [];
this.slaveUpdateHandlers.set(id, handlers);
this.hostUpdateHandlers.set(id, handlers);
}
handlers.push(handler);
if (handlers.length === 1) {
await this.updateSlaveSubscriptions();
await this.updateHostSubscriptions();
}
}
async offSlaveUpdate(id, handler) {
let handlers = this.slaveUpdateHandlers.get(id);
async offHostUpdate(id, handler) {
let handlers = this.hostUpdateHandlers.get(id);
if (!handlers || !handlers.length) {
throw new Error(`No handlers for slave ${id} exists`);
throw new Error(`No handlers for host ${id} exists`);
}
let index = handlers.lastIndexOf(handler);
if (index === -1) {
throw new Error(`Given handler is not registered for slave ${id}`);
throw new Error(`Given handler is not registered for host ${id}`);
}
handlers.splice(index, 1);
if (!handlers.length) {
this.slaveUpdateHandlers.delete(id);
await this.updateSlaveSubscriptions();
this.hostUpdateHandlers.delete(id);
await this.updateHostSubscriptions();
}
}
async updateSlaveSubscriptions() {
async updateHostSubscriptions() {
if (!this.connector.connected) {
return;
}
await libLink.messages.setSlaveSubscriptions.send(this, {
all: this.slaveUpdateHandlers.has(null),
slave_ids: [...this.slaveUpdateHandlers.keys()].filter(e => e !== null),
await libLink.messages.setHostSubscriptions.send(this, {
all: this.hostUpdateHandlers.has(null),
host_ids: [...this.hostUpdateHandlers.keys()].filter(e => e !== null),
});
}
@@ -536,16 +536,16 @@ export class Control extends libLink.Link {
let combinedFilter = {
all: false,
controller: false,
slave_ids: [],
host_ids: [],
instance_ids: [],
};
for (let filter of this.logHandlers.keys()) {
if (filter.all) { combinedFilter.all = true; }
if (filter.controller) { combinedFilter.controller = true; }
for (let slaveId of filter.slave_ids || []) {
if (!combinedFilter.slave_ids.includes(slaveId)) {
combinedFilter.slave_ids.push(slaveId);
for (let hostId of filter.host_ids || []) {
if (!combinedFilter.host_ids.includes(hostId)) {
combinedFilter.host_ids.push(hostId);
}
}
for (let instanceId of filter.instance_ids || []) {