diff --git a/packages/lib/config/definitions.js b/packages/lib/config/definitions.js
index 608ce496..35e28eb8 100644
--- a/packages/lib/config/definitions.js
+++ b/packages/lib/config/definitions.js
@@ -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",
diff --git a/packages/lib/factorio/server.js b/packages/lib/factorio/server.js
index cbe6bb39..a199f04e 100644
--- a/packages/lib/factorio/server.js
+++ b/packages/lib/factorio/server.js
@@ -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"] : []),
],
{
diff --git a/packages/slave/modules/clusterio/serialize.lua b/packages/slave/modules/clusterio/serialize.lua
index f9a77da0..b03557cf 100644
--- a/packages/slave/modules/clusterio/serialize.lua
+++ b/packages/slave/modules/clusterio/serialize.lua
@@ -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)
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index db3d0281..586152ec 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -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"),
diff --git a/packages/web_ui/src/bootstrap.jsx b/packages/web_ui/src/bootstrap.jsx
index e64be130..e6f3bbb0 100644
--- a/packages/web_ui/src/bootstrap.jsx
+++ b/packages/web_ui/src/bootstrap.jsx
@@ -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");
diff --git a/packages/web_ui/src/components/InstanceViewPage.jsx b/packages/web_ui/src/components/InstanceViewPage.jsx
index 3b3e26c0..e544bb60 100644
--- a/packages/web_ui/src/components/InstanceViewPage.jsx
+++ b/packages/web_ui/src/components/InstanceViewPage.jsx
@@ -92,7 +92,35 @@ export default function InstanceViewPage(props) {
;
}
+ 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: