Merge pull request #461 from Hornwitser/small-things-8

Small things 8
This commit is contained in:
Hornwitser authored and GitHub committed 2022-06-20 13:26:14 +02:00
commit 36808b34de
11 files changed
+149 -65

No files matched your search

+6
View File
@@ -277,6 +277,12 @@ FactorioGroup.define({
type: "boolean",
initial_value: false,
});
FactorioGroup.define({
name: "enable_authserver_bans",
description: "Turn on Factorio.com based multiplayer bans.",
type: "boolean",
initial_value: false,
});
FactorioGroup.define({
name: "settings",
description: "Settings overridden in server-settings.json",
+6
View File
@@ -429,6 +429,8 @@ class FactorioServer extends events.EventEmitter {
* @param {number} options.rconPort - TCP port to use for RCON.
* @param {string} options.rconPassword - Password use for RCON.
* @param {boolean} options.enableWhitelist - Turn on whitelisting.
* @param {boolean} options.enableAuthserverBans -
* Enable Factorio.com based multiplayer bans.
* @param {boolean} options.verboseLogging - Enable verbose logging.
* @param {boolean} options.stripPaths - Strip paths in the console.
* @param {number} options.maxConcurrentCommands -
@@ -457,6 +459,8 @@ class FactorioServer extends events.EventEmitter {
this.rconPassword = options.rconPassword;
/** Enable player whitelist */
this.enableWhitelist = options.enableWhitelist;
/** Enable Factorio.com based multiplayer bans **/
this.enableAuthserverBans = options.enableAuthserverBans;
/** Enable verbose logging */
this.verboseLogging = options.verboseLogging;
/** Maximum number of RCON commands transmitted in parallel on the RCON connection */
@@ -828,6 +832,7 @@ class FactorioServer extends events.EventEmitter {
"--rcon-port", this.rconPort,
"--rcon-password", this.rconPassword,
...(this.enableWhitelist ? ["--use-server-whitelist"] : []),
...(this.enableAuthserverBans ? ["--use-authserver-bans"] : []),
...(this.verboseLogging ? ["--verbose"] : []),
],
{
@@ -872,6 +877,7 @@ class FactorioServer extends events.EventEmitter {
"--rcon-port", this.rconPort,
"--rcon-password", this.rconPassword,
...(this.enableWhitelist ? ["--use-server-whitelist"] : []),
...(this.enableAuthserverBans ? ["--use-authserver-bans"] : []),
...(this.verboseLogging ? ["--verbose"] : []),
],
{
@@ -281,8 +281,11 @@ function serialize.deserialize_inventory(inventory, serialized)
local repeat_count = entry.r or 0
for offset = 0, repeat_count do
-- XXX what if the inventory is smaller on this instance?
local index = base_index + offset
if index > #inventory then
print("Error: Inventory index out of bounds deserializing inventory, voiding excess slots")
break
end
local slot = inventory[index]
if entry.f then
local call_success, call_return = pcall(inventory.set_filter, index, entry.f)
+1
View File
@@ -167,6 +167,7 @@ class Instance extends libLink.Link {
rconPort: this.config.get("factorio.rcon_port"),
rconPassword: this.config.get("factorio.rcon_password"),
enableWhitelist: this.config.get("factorio.enable_whitelist"),
enableAuthserverBans: this.config.get("factorio.enable_authserver_bans"),
verboseLogging: this.config.get("factorio.verbose_logging"),
stripPaths: this.config.get("factorio.strip_paths"),
maxConcurrentCommands: this.config.get("factorio.max_concurrent_commands"),
+29 -12
View File
@@ -25,7 +25,7 @@ async function loadScript(url) {
return result;
}
async function loadPlugins() {
async function loadPluginInfos() {
let response = await fetch(`${webRoot}api/plugins`);
let pluginList;
if (response.ok) {
@@ -36,7 +36,7 @@ async function loadPlugins() {
pluginList = [];
}
let plugins = new Map();
let pluginInfos = [];
await __webpack_init_sharing__("default");
for (let meta of pluginList) {
if (meta.web.error) {
@@ -51,26 +51,43 @@ async function loadPlugins() {
}
await container.init(__webpack_share_scopes__.default);
let pluginInfo = (await container.get("./info"))();
let pluginPackage = (await container.get("./package.json"))();
pluginInfo.container = container;
pluginInfo.package = (await container.get("./package.json"))();
pluginInfo.enabled = meta.enabled;
pluginInfos.push(pluginInfo);
} catch (err) {
logger.error(`Failed to load plugin info for ${meta.name}`);
if (err.stack) {
logger.error(err.stack);
}
}
}
return pluginInfos;
}
async function loadPlugins(pluginInfos) {
let plugins = new Map();
for (let pluginInfo of pluginInfos) {
if (!pluginInfo.enabled) {
continue;
}
try {
let WebPluginClass = libPlugin.BaseWebPlugin;
if (meta.enabled && pluginInfo.webEntrypoint) {
let webModule = (await container.get(pluginInfo.webEntrypoint))();
if (pluginInfo.webEntrypoint) {
let webModule = (await pluginInfo.container.get(pluginInfo.webEntrypoint))();
if (!webModule.WebPlugin) {
throw new Error("Plugin webEntrypoint does not export WebPlugin class");
}
WebPluginClass = webModule.WebPlugin;
}
let plugin = new WebPluginClass(container, pluginPackage, pluginInfo, logger);
let plugin = new WebPluginClass(pluginInfo.container, pluginInfo.package, pluginInfo, logger);
await plugin.init();
plugins.set(pluginInfo.name, plugin);
} catch (err) {
if (err.message) {
meta.web.error = err.message;
}
logger.error(`Failed to load plugin ${meta.name}`);
logger.error(`Failed to load plugin ${pluginInfo.name}`);
if (err.stack) {
logger.error(err.stack);
}
@@ -84,10 +101,10 @@ export default async function bootstrap() {
level: "verbose",
format: new WebConsoleFormat(),
}));
let plugins = await loadPlugins();
let pluginInfos = [...plugins.values()].map(p => p.info);
let pluginInfos = await loadPluginInfos();
libConfig.registerPluginConfigGroups(pluginInfos);
libConfig.finalizeConfigs();
let plugins = await loadPlugins(pluginInfos);
let wsUrl = new URL(window.webRoot, document.location);
wsUrl.protocol = wsUrl.protocol.replace("http", "ws");
@@ -92,7 +92,35 @@ export default function InstanceViewPage(props) {
</PageLayout>;
}
let instanceButtonMenuItems = [];
if (account.hasPermission("core.instance.export_data")) {
instanceButtonMenuItems.push({
disabled: exportingData || instance.status !== "stopped",
key: "export",
label: "Export data",
});
}
if (account.hasPermission("core.instance.kill")) {
instanceButtonMenuItems.push({
disabled: ["unknown", "unassigned", "stopped"].includes(instance["status"]),
key: "kill",
label: "Kill process",
});
}
if (account.hasPermission("core.instance.delete")) {
if (instanceButtonMenuItems.length) {
instanceButtonMenuItems.push({ type: "divider" });
}
instanceButtonMenuItems.push({
disabled: !["unknown", "unassigned", "stopped"].includes(instance["status"]),
danger: true,
key: "delete",
icon: <DeleteOutlined />,
label: "Delete",
});
}
let instanceButtonsMenu = <Menu
items={instanceButtonMenuItems}
onClick={({ key }) => {
if (key === "export") {
setExportingData(true);
@@ -125,25 +153,7 @@ export default function InstanceViewPage(props) {
});
}
}}
>
{account.hasPermission("core.instance.export_data") && <Menu.Item
disabled={exportingData || instance.status !== "stopped"}
key="export"
>Export data</Menu.Item>}
{account.hasPermission("core.instance.kill") && <Menu.Item
disabled={["unknown", "unassigned", "stopped"].includes(instance["status"])}
key="kill"
>Kill process</Menu.Item>}
{account.hasPermission("core.instance.delete") && <>
<Menu.Divider />
<Menu.Item
disabled={!["unknown", "unassigned", "stopped"].includes(instance["status"])}
danger
key="delete"
icon={<DeleteOutlined />}
>Delete</Menu.Item>
</>}
</Menu>;
/>;
let instanceButtons = <Space>
{
account.hasAnyPermission("core.instance.start", "core.instance.stop")
@@ -76,7 +76,7 @@ export default function LogConsole(props) {
limit: 400,
order: "desc",
}).then(result => {
setPastLines(result.log.map((info, index) => formatLog(info, index)).reverse());
setPastLines(result.log.map((info, index) => formatLog(info, -index - 1)).reverse());
}).catch(err => {
setPastLines([<span key={0}>{`Error loading log: ${err.message}`}<br/></span>]);
});
@@ -100,7 +100,7 @@ export default function LogConsole(props) {
<Paragraph code className="instance-console">
{pastLines}
{lines}
<div className="scroll-anchor" ref={anchor} />
<div className="scroll-anchor" key="anchor" ref={anchor} />
</Paragraph>
</>;
}
+25 -14
View File
@@ -26,11 +26,20 @@ export default function SiteLayout(props) {
return null;
}
let accountMenu = <Menu>
<Menu.Item key="1" onClick={() => { history.push(`/users/${account.name}/view`); }}>{account.name}</Menu.Item>
<Menu.Divider/>
<Menu.Item key="2" danger onClick={() => { account.logOut(); }}>Log out</Menu.Item>
</Menu>;
let accountMenu = <Menu
onClick={({ key }) => {
if (key === "user") {
history.push(`/users/${account.name}/view`);
} else if (key === "logout") {
account.logout();
}
}}
items={[
{ label: account.name, key: "user" },
{ type: "divider" },
{ label: "Log out", danger: true, key: "logout" },
]}
/>;
let combinedPages = [...pages];
for (let plugin of plugins.values()) {
@@ -49,13 +58,13 @@ export default function SiteLayout(props) {
group = [];
menuGroups.set(sidebarGroup, group);
}
group.push(<Menu.Item key={path}>{sidebarName}</Menu.Item>);
group.push({ label: sidebarName, key: path });
} else {
menuItems.push(<Menu.Item key={path}>{sidebarName}</Menu.Item>);
menuItems.push({ label: sidebarName, key: path });
}
}
for (let [name, group] of menuGroups) {
menuItems.push(<Menu.ItemGroup key={name} title={name}>{group}</Menu.ItemGroup>);
menuItems.push({ type: "group", label: name, children: group, key: name });
}
return <Layout style={{ minHeight: "100vh" }}>
@@ -63,9 +72,12 @@ export default function SiteLayout(props) {
<div className="site-logo" />
<span className="site-name">Clusterio</span>
<span className="site-version">{ webUiPackage.version }</span>
<Menu theme="dark" mode="horizontal" defaultSelectedKeys={["1"]}>
<Menu.Item key="1">Dashboard</Menu.Item>
</Menu>
<Menu
theme="dark"
mode="horizontal"
defaultSelectedKeys={["1"]}
items={[{ label: "Dashboard", key: "1" }]}
/>
<Dropdown
className="account-dropdown-header"
placement="bottomRight"
@@ -90,9 +102,8 @@ export default function SiteLayout(props) {
selectedKeys={[currentSidebarPath]}
style={{ height: "100%", borderRight: 0 }}
onClick={({ key }) => history.push(key)}
>
{menuItems}
</Menu>
items={menuItems}
/>
</Sider>
<Layout className="site-layout-content-container">
<Switch>
@@ -3,6 +3,32 @@ local ensure_character = require("modules/inventory_sync/ensure_character")
local serialize = require("modules/inventory_sync/serialize")
local load_crafting_queue = require("modules/inventory_sync/load_crafting_queue")
local can_enter_vehicle = {
[defines.controllers.character] = true,
[defines.controllers.god] = true,
[defines.controllers.editor] = true,
}
local function restore_position(record, player)
if record.vehicle and record.vehicle.valid and can_enter_vehicle[player.controller_type] then
player.teleport(record.vehicle.position, record.vehicle.surface)
player.driving = true
-- Teleport to safe location if unable to enter vehicle
if not player.driving and player.controller_type == defines.controllers.character then
local safe_position = record.vehicle.surface.find_non_colliding_position(
player.character.name, player.position, 32, 1/8
)
if safe_position then
player.teleport(safe_position, player.surface)
end
end
elseif record.surface and record.position then
player.teleport(record.position, record.surface)
end
end
local function download_inventory(player_name, data, number, total)
local player = game.get_player(player_name)
if player == nil then
@@ -33,10 +59,8 @@ local function download_inventory(player_name, data, number, total)
-- Give the player a character and pretend that's the synced player data
ensure_character(player)
-- Restore player position in case they moved while being spectator
if record.surface and record.position then
player.teleport(record.position, record.surface)
end
-- Restore player position and driving state
restore_position(record, player)
global.inventory_sync.active_downloads[player_name] = nil
player_record.dirty = player.connected
@@ -87,10 +111,8 @@ local function download_inventory(player_name, data, number, total)
local serialized_player = game.json_to_table(record.data)
serialize.deserialize_player(player, serialized_player)
-- Restore player position in case they moved while being spectator
if record.surface and record.position then
player.teleport(record.position, record.surface)
end
-- Restore player position and driving state
restore_position(record, player)
-- Load crafting queue
if player.character then
@@ -310,13 +310,16 @@ function inventory_sync.initiate_inventory_download(player, player_record, gener
-- If this is a synced player turn them into a spectator while the
-- player data is downloading
if player_record.sync then
local character = player.character
player.set_controller({ type = defines.controllers.spectator })
if character ~= nil then character.destroy() end
-- Store original position to teleport back to
record.surface = player.surface
record.position = player.position
if player.driving then
record.vehicle = player.vehicle
end
local character = player.character
player.set_controller({ type = defines.controllers.spectator })
if character ~= nil then character.destroy() end
-- Indicate this state shouldn't be persisted
player_record.dirty = false
+10 -5
View File
@@ -75,9 +75,11 @@ function serialize.serialize_personal_logistic_slots(player)
local serialized = nil
-- Serialize personal logistic slots
for i = 1, 200 do -- Nobody will have more than 200 logistic slots, right?
local last_valid = 0
for i = 1, 65536 do
local slot = player.get_personal_logistic_slot(i)
if slot.name ~= nil then
if slot.name then
last_valid = i
if not serialized then
serialized = {}
end
@@ -86,6 +88,10 @@ function serialize.serialize_personal_logistic_slots(player)
min = slot.min,
max = slot.max,
}
-- Stop after 100 empty slots
elseif last_valid + 100 <= i then
break
end
end
@@ -98,10 +104,9 @@ function serialize.deserialize_personal_logistic_slots(player, serialized)
end
-- Load personal logistic slots
for i = 1, 200 do
local slot = serialized[tostring(i)] -- 1 is empty to force array to be spare
for i, slot in pairs(serialized) do
if slot ~= nil then
player.set_personal_logistic_slot(i, slot)
player.set_personal_logistic_slot(tonumber(i), slot)
end
end
end