v2.0.0-alpha.1

Add package readmes and update project
readme file.

.eslintignore

@@ -1 +1,2 @@
 packages/master/static
+plugins/*/static

.gitignore

@@ -45,6 +45,10 @@ static/export
 saves
 /temp/
 
+# Web build
+/packages/master/static
+/plugins/*/static
+
 # IDE
 .idea/
 .vs/

README.md

@@ -30,76 +30,81 @@ the [1.2.x branch][1.2.x] for instructions on how to install the stable version.
 
 ### Table of contents
 
-* [Introduction & methodology](#introduction)
+* [Introduction](#introduction)
+* [Features](#features)
+* [Plugins](#plugins)
 * [Ubuntu setup](#ubuntu-setup)
 * [Windows setup](#windows-setup)
 * [Installing Plugins](#installing-plugins)
+* [Configure Master Server](#configure-master-server)
+  * [Hosting Behind Proxy](#hosting-behind-proxy)
+  * [Setting up an admin account](#setting-up-an-admin-account)
 * [Running Clusterio](#running-clusterio)
   * [Master Server](#master-server)
   * [Slaves](#slaves)
   * [Instances](#instances)
 * [Common problems](#Common-problems)
 
+
 ## Introduction
 
-Features:
+Clusterio is a clustered Factorio server manager that provides the
+tooling for implementing cross server interactions in Factorio.  It
+was previously best known for implementing cross server transfer and
+cloud storage of items via teleporter chests.  But this functionality
+has been pulled out of Clusterio into its own plugin for Clusterio named
+[Subspace Storage](https://github.com/clusterio/factorioClusterioMod).
 
-- Entities to send/recieve items
-
-- Cross dimensional storage
-
-- Sending of liquids
-
-- Sending of circuit network signals
-
-- Inventory combinator to display item levels in the cluster (and epoch time)
-
-- Reporting of graphs and UPS on master interface (Also has extensive Prometheus reporting)
-
-Optional extras (see [Plugins](#Plugins))
-
-- Have your inventory synchronize across servers
-
-- Teleport trans from the border of one world to te next
-
-- Show in-game chat in discord
+By itself Clusterio does change the gameplay in any way, you could even
+use Clusterio to manage completely vanilla Factorio servers.  Plugins do
+the work of modding in the visible changes into the game, see the
+[Plugins section](#plugins) for ready made plugins you can install into
+a Clusterio cluster.
 
 
-Connection diagram:
+## Features
 
-![http://i.imgur.com/7FdVfgB.png](http://i.imgur.com/7FdVfgB.png)
+- Clustered Factorio server management allowing you manage the running
+  of Factorio servers across a fleet of physical servers from both a web
+  interface and a command line interface.
 
-There can be any number of clients connected to each slave, and any number of slaves connected to a master but there can only be one master server in each cluster.
+- User list management for synchronizing in-game admins, whitelisted
+  users, and bans to all the servers in the cluster.
 
-**How does it work?**
+- Integrated support for exporting statistics for the whole cluster to
+  Prometheus via a single metrics endpoint.
 
-Traditional factorio mods have always been limited by the games deterministic design. This gives us a very bug free and predictable game, but doesn't allow us cool stuff such as internet communication.
-Clusterio exploits one of the games logging features, game.write_file and RCON to communicate between servers. Sending an item from one server to another takes this path:
+- Extensive plugin support for adding your own cross server features to
+  Factorio using Clusterio's communication backbone.
 
-1. server1: Chest has stuff in it, write the contents to a file and delete them from the game world
 
-2. client.js on server1: File has stuff in it, parse and send to the master for storage
+## Plugins
 
-3. master: server1 gave us stuff, store it in the storage and write some statistics
+The heart of Clusterio is its plugin syste.  Plugins add functionality
+to Factorio servers, Clusterio itself or both.  These are the plugins
+supported and maintained by the Clusterio developers:
 
-4. server2: get-chest is empty, write a request to file
+- [Global Chat](/plugins/global_chat/README.md): share the in-game chat
+  between servers.
+- [Research Sync](/plugins/research_sync/README.md): synchronize
+  research progress and technologies unlocked between servers.
+- [Statistics Exporter](/plugins/statistics_exporter/README.md): collect
+  in-game statistics from all the servers and makes it available to the
+  Prometheus endpoint on the master server.
+- [Subspace Storage](https://github.com/clusterio/factorioClusterioMod):
+  Provide shared storage that can transport items between servers via
+  teleport chests.
 
-5. client.js on server2: Request file has stuff in it, parse and send a request to master for more items of that type
+Want to make your own plugin?  Check out the documentation on [Writing
+Plugins](/docs/writing-plugins.md) for where to start.
 
-6. master: server2 asked for stuff, check if we have enough and how much demand there is, then send however much is appropriate back
-
-7. client.js on server2: We were allowed to import x of item y, run command /c remote.call("clusterio", "importMany", "{'copper-plate':120}")
-
-This process works the same for both items and liquids, independent on what mods are used. Yes, modded items are fully supported.
-
-Clusterio can also do a few other neat things, such as giving you access to epoch time, syncing player inventories between servers, keeping track of playtime (playerManager plugin), teleporting trains between servers (trainTeleports) and exporting tons of factorio related statistics to Prometheus for graphing in grafana.
 
 ## Ubuntu setup
 
 **Warning**: These instructions are for the unstable master version and is not
 recommended for use, see [the 1.2.x branch][1.2.x] for how to install the stable version.
 
-Clusterio runs on Node.js v12 and up, v11.13.0+ and v10.16.0+.  Node.js itself is not
+Clusterio runs on Node.js v12 and up, and v10.16.0+.  Node.js itself is not
 supported on EOL Ubuntu releases so make sure you're on a recent release of Ubuntu.
 
 Master and all slaves:
@@ -140,7 +145,7 @@ recommended for use, see [the 1.2.x branch][1.2.x] for how to install the stable
 **Requirements**
 
 download and install nodeJS 12 from http://nodejs.org.  Clusterio runs on Node.js v12 and
-up, v11.13.0+ and v10.16.0+.
+up, and v10.16.0+.
 
 **Master**
 
@@ -199,10 +204,65 @@ plugins by the absolute path to them, or a relative path that must start
 with either . or .. (which will then be resolved to an absolute path).
 
 
-## Running Clusterio
+## Configure Master Server
 
-After following the installation instructions you can use the following
-commands to run Clusterio.
+By default the master server will create a self signed TLS certificate
+and listen on HTTPS on port 8443.  You can change the port used with the
+command
+
+    npx clusteriomaster config set master.https_port 1234
+
+If you plan to make your cluster available externally set the address
+that it will be accessible under with, for example
+
+    npx clusteriomaster config set master.external_address https://192.0.2.4:8443/
+
+Change the url to reflect the IP, protocol, and port the master server
+is accessible under, dns names are also supported.  If proxyed under a
+sub-path include the sub path as well and make sure the URL ends with a
+slash.
+
+You can list the config of the master server with the `npx
+clusteriomaster config list` command.  See the [readme for
+@clusterio/master](/packages/master/README.md) for more
+information.
+
+
+### Hosting Behind Proxy
+
+If you want to host the master server behind a reverse proxy the
+recommended setup is to disable HTTPS and host it on a high port
+over HTTP to which you point your proxy to.  For example to configure
+port 8080 as the HTTP port for the master server.
+
+    npx clusteriomaster config set master.https_port # unsets https_port
+    npx clusteriomaster config set master.http_port 8080
+
+The proxy can then forward requests to a sub-path like `/cluster/` to
+`http://localhost:8080/`.
+
+Additianlly WebSocket connections to api/socket relative to the sub-path
+the interface is hosted under also needs to be forwarded.  See below for
+the specifics of setting this up on Apache.
+
+
+#### Apache Config
+
+To proxy with Apache make sure that proxy_module, proxy_http_module and
+proxy_wstunnel_module is loaded in the config, then add the following
+directives to wherever is the approriate place for your flavour of
+Apache config organization.
+
+```apache
+<Location /cluster/>
+    ProxyPass "http://localhost:8080/"
+</location>
+<Location /cluster/api/socket>
+    ProxyPass "ws://localhost:8080/api/socket"
+</Location>
+```
+
+Pay attention to the use of trailing slashes, they are important.
 
 
 ### Setting up an admin account
@@ -220,7 +280,13 @@ promotes it to a cluster admin.  The second one sets up a
 server under the given user account.
 
 
-### Running the master Server
+## Running Clusterio
+
+After following the installation and master configuration instructions
+you can use the following commands to run Clusterio.
+
+
+### Master Server
 
 It's necessary to run the master server in order for anything to work.
 Once you've completed the setup run the following command to start it
@@ -246,8 +312,8 @@ the config for a remote slave you will need to have set the
 reached on.
 
 You can list the config of a slave on the slave itself with the `npx
-clusterioslave config list` command.  Use `npx clusterioslave config
---help` for more information.
+clusterioslave config list` command.  See the [readme for
+@clusterio/slave](/packages/slave/README.md) for more information.
 
 Once the config is set up run the slave with
 
@@ -276,7 +342,8 @@ directory and files needed to run the instance on the given slave.  The
 third line starts the instance, which creates a new save if there are no
 save games present.
 
-There are many more commands available with clusterioctl.  See
+There are many more commands available with clusterioctl.  See the
+[Managing a Cluster](/docs/managing-a-cluster.md) document or
 `npx clusterioctl --help` for a full list of them.
 
 

docs/configuration.md

@@ -0,0 +1,323 @@
+Configuration
+=============
+
+
+Master Configuration
+--------------------
+
+### master.database_directory
+
+Directory used to store cluster data to.  Needs to be writeable by the
+master server.  This is also used by plugins to store its data.
+
+Defaults to "database".
+
+
+### master.http_port
+
+Port to host HTTP server on.  If set to null no HTTP server will be
+exposed.  At least one of this and master.https_port needs to be set to
+a port.
+
+Defaults to null.
+
+
+### master.https_port
+
+Port to host HTTPS server on.  Uses master.tls_certificate and
+master.tls_private_key as the certificate and private key for the HTTPS
+server.  If set to null no HTTPS server will be exposed.  At least one
+of this and master.http_port needs to be set to a port.
+
+Defaults to 8443.
+
+
+### master.external_address
+
+External address the master server is accessible on.  Currently only
+used for `clusteriomaster bootstrap create-ctl-config` in order to give
+the right url to connect to.  This should be a full URL ending with a /.
+
+Defaults to null meaning assume localhost.
+
+
+### master.tls_certificate
+
+TLS certificate to use for the HTTPS server when master.https_port is
+configured.  If neither this nor the configured master.tls_private_key
+exists a self signed certificate is automatically created.
+
+Defaults to "database/certificates/cert.crt".
+
+
+### master.tls_private_key
+
+TLS private key to use for the HTTPS server when master.https_port is
+configured.  If neither this nor the configured master.tls_certificate
+exists a self signed certificate is automatically created.
+
+Defaults to "database/certificates/cert.key".
+
+
+### master.tls_bits
+
+Number of bits to use when creating a self signed certificate.
+
+Defaults to 2048.
+
+
+### master.auth_secret
+
+Base64 encoded authentication secret used to verify tokens issued to
+slaves, users, and sessions.  This should contain 256 bytes of random
+data, and if changed will cause all tokens become invalid.  Keep this
+secret if leaked an attacker could easily compromise the cluster.
+
+Defaults to null which means generate a secure secret on startup.
+
+
+### master.heartbeat_interval
+
+Interval in seconds heartbeats are sent out at for WebSocket
+connections.  If a connection hasn't received a heartbeat in 2 times the
+heartbeat interval it will be considered stale and closed.  A lower
+value means less time between connections going stale and them being
+closed.
+
+Defaults to 60
+
+
+### master.connector_shutdown_timeout
+
+Timeout in seconds to use while shutting down the master server for link
+sessions that currently don't have an active connection and haven't been
+closed down properly.  This happens when the network between a slave and
+the master server goes down unexpectedly, or the slave goes down without
+closing the connection properly either do to crashing or the machine
+it's hosted on going down.  If the timeout expires the session is
+terminated and data loss may occur, if the slave went down this is
+unavoidable.
+
+Defaults to 30.
+
+
+### master.default_role_id
+
+Role to automatically grant to new users.  If null no role is granted.
+
+Defaults to 1 which correspond to the default Player role.
+
+
+### <plugin_name>.enabled
+
+Whether to enable the given plugin on the master server.  Plugins
+disabled on the master server will not be loaded on instances.
+
+Defaults to true.
+
+
+Slave Configuration
+-------------------
+
+### slave.name
+
+Name of the slave.  Shows up in slave lists and is used to reference
+this slave in the clusterioctl command line interface.
+
+Defaults to "New Slave".
+
+
+### slave.id
+
+Imutable numeric id of the slave which uniquely identifies this slave in
+the cluster.
+
+Defaults to a random 31 bit number.
+
+
+### slave.factorio_directory
+
+Directory to look for the Factorio server(s) in.  This can either point
+to a Factorio server directory, or to a directory containing multiple
+versions of the Factorio server.
+
+Defaults to "factorio".
+
+
+### slave.instances_directory
+
+Directory to store instances in.  One sub-directory will be created in
+it for each instance assigned to this slave and these sub-directories
+will contain logs, saves, and various auto generated configuration files
+for the instances.
+
+Defaults to "instances".
+
+
+### slave.master_url
+
+URL to connect to the master server to.
+
+Defaults to "https://localhost:8443/".
+
+
+### slave.master_token
+
+Access token used for authenticating with the master server.  You can
+generate an access token with `clusterioctl slave generate-token
+--id <slave-id>`, or use the `clusterioctl slave create-config` to
+create a new slave config with the correct url and token in it.
+
+Defaults to "enter token here".
+
+
+### slave.public_address
+
+External address instances hosted on this slave can be accessed on.
+This is used by plugins like Server Select to give the correct address
+to switch between instances in-game.
+
+Defaults to "localhost".
+
+
+### slave.reconnect_delay
+
+Delay in seconds to wait after connection to the master server is
+dropped before attempting to reconnect to it.  The actual delay on each
+reconnect will be a random number between 0 and this configured value to
+avoid all slaves trying to reconnect at the same time.
+
+Defaults to 5.
+
+
+Instance Configuration
+======================
+
+### instance.name
+
+Name of the instance, shown in instance lists and used to reference to this
+instance in the clusterioctl command line interface.
+
+Defaults to "New Instance"
+
+
+### instance.id
+
+Imutable numeric id of the instance which uniquely identifies this
+instance in the cluster.
+
+Defaluts to a random 31 bit integer.
+
+
+### instance.assigned_slave
+
+Slave this instance is assigned to.  To change this you need to use the
+separate assign instance interface.  After being assigned to a slave the
+directory for the instance is created on the slave.
+
+Defaults to null meaning not assigned.
+
+
+### factorio.version
+
+Version of Factorio to use for this instance.  Can be a version like
+"1.0.0" or special string "latest" meaning the latest version of
+Factorio found on the slave.
+
+Defaults to "latest"
+
+
+### factorio.game_port
+
+UDP port to run the Factorio server on.  If null a random port in the
+dynamyc range assigned each time the instance starts.
+
+Defaults to null
+
+
+### factorio.rcon_port
+
+TCP port to start the RCON interface on the Factorio server on.  If null
+a random port in the dynamic range is assigned each time the instance
+starts.
+
+Defaults to null
+
+
+### factorio.rcon_password
+
+Password to use for the RCON interafec.  If null a random secure
+password is generated and used each time the instance starts.
+
+Defaults to null
+
+
+### factorio.enable_save_patching
+
+Whether to use save patching or not.  When enabled lua code is patched
+into the game save before starting it.  Most plugins require the use of
+save patching to function.  Turning it off makes it possible to use
+Clusterio to run and manage regular vanilla games and scenarios not
+compatible with Clusterio.
+
+Defaults to true
+
+
+### factorio.enable_whitelist
+
+Turn on the whitelist on the server.
+
+Defaults to false
+
+
+### factorio.settings
+
+Object with the settings to put into `server-settings.json` for the
+Factorio server.  The settings in `data/server-settings.example.json` of
+the Factorio installation is used as the base and properties specified
+here overrides the properties there.
+
+Defaults to {"tags":["clusterio"],"auto_pause":false}.
+
+
+### factorio.sync_adminlist
+
+Synchronize in-game admin list with admin status of the users in
+cluster.  If enabled Clusterio will generate a new
+`server-adminlist.json` on instance startup based on the users in the
+cluster with admin status set to true, and keep the admins in sync with
+the users that have admin status while the instance is running.
+
+Defaults to true
+
+
+### factorio.sync_whitelist
+
+Synchronize in-game whitelist with the whitelisted status of the users
+in the cluster.  If enabled Clusterio will generate a new
+`server-whitelist.json` on instance startup based on the users in the
+cluster with whitelisted status set to true, and keep the whitelisted
+users in sync with the users that have whitelisted status while the
+instance in running.
+
+Defaults to true
+
+
+### factorio.sync_banlist
+
+Synchronize in-game banlist with the banned status of users in the
+cluster.  If enabled Clusterio will generate a new `server-banlist.json`
+on instance startup based on users in the cluster with banned status set
+to true, and keep the banned users in sync with the users that have the
+banned status while the instance is running.
+
+Defaults to true
+
+
+### <plugin_name>.enabled
+
+Whether to enable the given plugin on the instance.  Note that plugins
+need to be enabled on the master server in order for them to be loaded
+on instances.
+
+Defaults to true

docs/contributing.md

@@ -187,7 +187,7 @@ of this log should be self explanatory, please follow it carefully.
 Supported Node.js and Factorio Versions
 ---------------------------------------
 
-Clusterio run on Node.js v12 and up, v11.13.0+ and v10.16.0+, make sure
+Clusterio run on Node.js v12 and up, and v10 from v10.16.0, make sure
 to check that the Node builtin API's and npm packages you use are
 supported on these versions.  The Travis CI tests are runned on whatever
 version of Node.js v10 is the default, which at the time of writing is

docs/managing-a-cluster.md

@@ -1,7 +1,7 @@
 Managing a Cluster
 ==================
 
-Clusterio clusers are managed through the master server by using the
+Clusterio clusters are managed through the master server by using the
 `clusterioctl` command line interface which is invoked by running
 `npx clusterioctl <command>` in the clusterio directory.  This document
 uses the shorthand `ctl> foo` to indicate `npx clusterioctl foo` should

lerna.json

@@ -3,5 +3,5 @@
     "packages/*",
     "plugins/*"
   ],
-  "version": "2.0.0-alpha.0"
+  "version": "2.0.0-alpha.1"
 }

package.json

@@ -18,7 +18,7 @@
     ]
   },
   "engines": {
-    "node": ">=10.16 <11 || >= 11.13"
+    "node": ">=10.16 <11 || >= 12"
   },
   "devDependencies": {
     "@clusterio/ctl": "file:./packages/ctl",
@@ -33,6 +33,7 @@
     "lerna": "^3.22.1",
     "mocha": "^6.2.0",
     "nyc": "^14.1.1",
-    "phin": "^3.4.1"
+    "phin": "^3.4.1",
+    "webpack": "^5.0.0"
   }
 }

packages/ctl/README.md

@@ -0,0 +1,108 @@
+Clusterio Command Line Interface
+================================
+
+Provides a command line interface for managing a Clusterio cluster.
+
+Note that this document only describes the options and commands for
+managing clusterioctl itself, see [Managing a
+cluster](/docs/managing-a-cluster.md) for the available commands used
+for managing a cluster.
+
+
+Usage
+-----
+
+    npx clusterioctl <command>
+
+Common options:
+
+ * `--plugin-list <file>` JSON file to use for storing the list of
+   plugins that are available to ctl.  Defaults to `plugin-list.json`
+   and will be created if it does not exist. See the `plugin` command
+   for managing this list.
+
+ * `--config <file>` JSON file to use for storing configuration for
+   ctl.  Defaults to `config-control.json` and will be created if it
+   does not exist.  See the `config` command for inspecting and
+   modifying the configuration.
+
+
+### `plugin <command>`
+
+Configure plugins available to be loaded by ctl.  The available plugins
+will be automatically loaded and the commands they provide will be added
+to the ctl utility.
+
+
+#### `plugin add <path>`
+
+Add plugin either by require path or relative/absolute path to the
+plugin directory.  A relative path must start with ./ or ../ (or .\ and
+..\ on Windows) otherwise it will be assumed to be a require path for an
+installed package in node_modules.
+
+For example, installing the Subspace Storage plugin:
+
+    npm install @clusterio/plugin-subspace_storage
+    npx clusterioctl plugin add @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin remove <name>`
+
+Remove a plugin by its name.  This should be done before uninstalling
+the plugin, otherwise there will be an error when Clusterio tries to
+load the info from the plugin.  Removing and unistalling a plugin is
+usually not neccessary as the functions provided by the plugin can be
+disabled in the config.
+
+For example, uninstalling the Subspace Storage plugin:
+
+    npx clusterioctl plugin remove subspace_storage
+    npm uninstall @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin list`
+
+Lists the plugins set up to be available by name followed by path.
+
+
+### `config-control`
+
+Manage the ctl configuration.  This allows setting the url and token to
+the master server to manage.
+
+
+#### `config-control set <config-entry> [value]`
+
+Set a config entry to the given value.  If value is not provided the
+entry is set to null.  If the config entry is of type object the value
+must be a valid JSON serialization of an object.
+
+See docs/configuration.md in the main repositiory for the available
+configuration.
+
+
+#### `config-control show <config-entry>`
+
+Shows the value for a single config entry.
+
+
+#### `config-control list`
+
+Lists up all configuration entries with their currently configured values.
+
+
+## See Also
+
+[Managing a cluster](/docs/managing-a-cluster.md) for the available
+commands used for managing a cluster.
+
+[The Clusterio
+repository](https://github.com/clusterio/factorioClusterio)
+for instructions on how to set up a cluster.

packages/ctl/package.json

@@ -3,7 +3,7 @@
   "description": "Clusterio command line management tool",
   "author": "Hornwitser",
   "license": "MIT",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "main": "ctl.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -15,10 +15,10 @@
     "factorio"
   ],
   "engines": {
-    "node": ">=10.16 <11 || >= 11.13"
+    "node": ">=10.16 <11 || >= 12"
   },
   "dependencies": {
-    "@clusterio/lib": "=2.0.0-alpha.0",
+    "@clusterio/lib": "^2.0.0-alpha.1",
     "as-table": "^1.0.31",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",

packages/lib/README.md

@@ -0,0 +1,8 @@
+Common Library for Clusterio
+============================
+
+This package contains functionality shared between master, slave, ctl
+and/or plugins of Clusterio.
+
+See [the Clusterio repository](https://github.com/clusterio/factorioClusterio)
+for more inforation on Clusterio.

packages/lib/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@clusterio/lib",
   "description": "Shared library for Clusterio",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "repository": "https://github.com/clusterio/factorioClusterio",
   "license": "MIT",
   "keywords": [
     "factorio"
   ],
   "engines": {
-    "node": ">=10.16 <11 || >= 11.13"
+    "node": ">=10.16 <11 || >= 12"
   },
   "dependencies": {
+    "ajv": "^6.12.6",
     "fs-extra": "^8.1.0",
     "ini": "^1.3.5",
     "isomorphic-ws": "^4.0.1",

packages/master/.gitignore

@@ -1,2 +0,0 @@
-# Webpack output
-static

packages/master/README.md

@@ -0,0 +1,128 @@
+Clusterio Master Server
+=======================
+
+Communication hub for Clusterio clusters.  The master server forwards
+data between Clusterio slaves connected to it and allows the cluster to
+be remotely managed through WebSocket connections to it either by using
+the included web interface or the Clusterio ctl command line utility.
+
+
+Usage
+-----
+
+    npx clusteriomaster <command>
+
+Common options:
+
+ * `--plugin-list <file>` JSON file to use for storing the list of
+   plugins that are available to the master server.  Defaults to
+   `plugin-list.json` and will be created if it does not exist. See the
+   `plugin` command for managing this list.
+
+ * `--config <file>` JSON file to use for storing configuration for the
+   master server.  Defaults to `config-master.json` and will be created
+   if it does not exist.  See the `config` command for inspecting and
+   modifying the configuration.
+
+
+### `plugin <command>`
+
+Configure plugins available to be loaded by the master server.  The
+available plugins will be loaded unless they have been disabled in the
+configuration, see the config command for disabling plugins.
+
+
+#### `plugin add <path>`
+
+Add plugin either by require path or relative/absolute path to the
+plugin directory.  A relative path must start with ./ or ../ (or .\ and
+..\ on Windows) otherwise it will be assumed to be a require path for an
+installed package in node_modules.
+
+For example, installing the Subspace Storage plugin:
+
+    npm install @clusterio/plugin-subspace_storage
+    npx clusteriomaster plugin add @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin remove <name>`
+
+Remove a plugin by its name.  This should be done before uninstalling
+the plugin, otherwise there will be an error when Clusterio tries to
+load the info from the plugin.  Removing and unistalling a plugin is
+usually not neccessary as the functions provided by the plugin can be
+disabled in the config.
+
+For example, uninstalling the Subspace Storage plugin:
+
+    npx clusteriomaster plugin remove subspace_storage
+    npm uninstall @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin list`
+
+Lists the plugins set up to be available by name followed by path.
+
+
+### `config`
+
+Manage the master server configuration offline.  This should only be
+used when the master server is stopped, otherwise the config read might
+be out of date and config changes will be overwritten when the master
+server shuts down.
+
+
+#### `config set <config-entry> [value]`
+
+Set a config entry to the given value.  If value is not provided the
+entry is set to null.  If the config entry is of type object the value
+must be a valid JSON serialization of an object.
+
+See docs/configuration.md in the main repositiory for the available
+configuration entries.
+
+
+#### `config show <config-entry>`
+
+Shows the value for a single config entry.
+
+
+#### `config list`
+
+Lists up all configuration entries with their currently configured values.
+
+
+### `bootstrap`
+
+Commands for setting up initial admin acount and access to the cluster.
+
+
+#### `bootstrap create-admin <name>`
+
+Creates a new user account with the given name if it does not already
+exist in the cluster and grant it full cluster admin permission.  You
+should be using your own Factorio multiplayer username here.
+
+
+#### `bootstrap create-ctl-config <name>`
+
+Creates a clusterioctl config for the given user with url and token set
+up for connecting to the cluster.
+
+
+### `run`
+
+Runs the master server.
+
+
+## See Also
+
+[The Clusterio
+repository](https://github.com/clusterio/factorioClusterio)
+for instructions on how to set up a cluster.

packages/master/master.js

@@ -201,6 +201,16 @@ function validateSlaveToken(req, res, next) {
 	next();
 }
 
+app.get("/api/plugins", (req, res) => {
+	let plugins = [];
+	for (let pluginInfo of pluginInfos) {
+		let name = pluginInfo.name;
+		let enabled = masterPlugins.has(name) && masterConfig.group(name).get("enabled");
+		plugins.push({ name, enabled });
+	}
+	res.send(plugins);
+});
+
 // Handle an uploaded export package.
 async function uploadExport(req, res, next) {
 	endpointHitCounter.labels(req.route.path).inc();
@@ -1744,6 +1754,11 @@ async function startServer() {
 		for (let route of pluginInfo.routes || []) {
 			app.get(route, serveWeb(route));
 		}
+
+		let pluginPackagePath = require.resolve(path.posix.join(pluginInfo.requirePath, "package.json"));
+		let staticPath = path.join(path.dirname(pluginPackagePath), "static");
+		console.log(`/plugin/${pluginInfo.name}`, staticPath);
+		app.use(`/plugin/${pluginInfo.name}`, express.static(staticPath));
 	}
 
 	// Load plugins

packages/master/package.json

@@ -3,10 +3,10 @@
   "description": "Implementation of Clusterio master server",
   "author": "Hornwitser",
   "license": "MIT",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "main": "master.js",
   "scripts": {
-    "build": "webpack --env.production",
+    "build": "webpack-cli --env.production",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
@@ -16,10 +16,10 @@
     "factorio"
   ],
   "engines": {
-    "node": ">=10.16 <11 || >= 11.13"
+    "node": ">=10.16 <11 || >= 12"
   },
   "dependencies": {
-    "@clusterio/lib": "=2.0.0-alpha.0",
+    "@clusterio/lib": "^2.0.0-alpha.1",
     "body-parser": "^1.18.2",
     "compression": "^1.7.2",
     "cookie-parser": "^1.4.3",
@@ -42,15 +42,17 @@
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^4.3.0",
+    "events": "^3.2.0",
     "fast-deep-equal": "^3.1.3",
     "null-loader": "^4.0.0",
+    "path-browserify": "^1.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",
     "style-loader": "^1.2.1",
-    "webpack": "^4.44.2",
     "webpack-cli": "^3.3.12",
-    "webpack-dev-middleware": "^3.7.2"
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-merge": "^5.2.0"
   },
   "publishConfig": {
     "access": "public"

packages/master/web/basename.jsx

@@ -1,6 +1,6 @@
 // Calculate basedir of application based on current location and
 // the provided web_root from master server.
-const location = new URL(window.web_root, document.location);
+const location = new URL(window.webRoot, document.location);
 const basename = location.pathname !== "/" ? location.pathname : "";
 
 export default basename;

packages/master/web/bootstrap.jsx

@@ -0,0 +1,77 @@
+import "./index.css";
+
+import React from "react";
+import ReactDOM from "react-dom";
+
+import libConfig from "@clusterio/lib/config";
+
+import App from "./components/App";
+import { Control, ControlConnector } from "./util/websocket";
+
+async function loadScript(url) {
+	let script = document.createElement("script");
+	script.src = url;
+	script.type = "text/javascript";
+	script.async = true;
+
+	let result = new Promise((resolve, reject) => {
+		script.onload = resolve;
+		script.onerror = reject;
+	});
+
+	document.head.appendChild(script);
+	return result;
+}
+
+async function loadPluginInfos() {
+	let response = await fetch(`${webRoot}api/plugins`);
+	let pluginList;
+	if (response.ok) {
+		pluginList = await response.json();
+
+	} else {
+		console.log("Failed to get plugin data, running without plugins");
+		pluginList = [];
+	}
+
+	let pluginInfos = [];
+	await __webpack_init_sharing__("default");
+	for (let plugin of pluginList) {
+		try {
+			await loadScript(`${webRoot}plugin/${plugin.name}/remoteEntry.js`);
+			let container = window[`plugin_${plugin.name}`];
+			await container.init(__webpack_share_scopes__.default);
+			let info = (await container.get("./info"))();
+			info.container = container;
+			pluginInfos.push(info);
+
+		} catch (err) {
+			console.log(`Failed to load plugin info for ${plugin.name}`);
+			console.log(err);
+		}
+	}
+	return pluginInfos;
+}
+
+async function load() {
+	let pluginInfos = await loadPluginInfos();
+	libConfig.registerPluginConfigGroups(pluginInfos);
+	libConfig.finalizeConfigs();
+
+	let wsUrl = new URL(window.webRoot, document.location);
+	wsUrl.protocol = wsUrl.protocol.replace("http", "ws");
+
+	let controlConnector = new ControlConnector(wsUrl, 10, localStorage.getItem("master_token"));
+	// XXX come up with a better way of sharing this
+	window.control = new Control(controlConnector, []);
+	try {
+		await controlConnector.connect();
+	} catch (err) {
+		// XXX: What now?
+		console.log(err);
+	}
+
+	ReactDOM.render(<App />, document.getElementById("root"));
+}
+
+load().catch(console.log);

packages/master/web/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Clusterio</title>
     <script>
-        window.web_root = "__WEB_ROOT__";
+        window.webRoot = "__WEB_ROOT__";
     </script>
   </head>
   <body>

packages/master/web/index.jsx

@@ -1,8 +1 @@
-import "./index.css";
-
-import React from "react";
-import ReactDOM from "react-dom";
-
-import App from "./components/App";
-
-ReactDOM.render(<App />, document.getElementById("root"));
+import("./bootstrap");

packages/master/web/pages/settings/settings.jsx

@@ -36,7 +36,6 @@ export class Settings extends Component {
 				{...layout}
 				name="basic"
 				initialValues={{
-					master_url: localStorage.getItem("master_url"),
 					master_token: localStorage.getItem("master_token"),
 				}}
 				onFinish={values => {
@@ -48,18 +47,6 @@ export class Settings extends Component {
 					document.location = document.location;
 				}}
 			>
-				<Form.Item
-					label="Master URL"
-					name="master_url"
-					rules={[
-						{
-							required: true,
-							message: "Please input master url, ex ws://localhost:8080 or wss://localhost:8443/ . For SSL connections, ensure you have a valid certificate.",
-						},
-					]}
-				>
-					<Input />
-				</Form.Item>
 				<Form.Item
 					label="User auth token"
 					name="master_token"

packages/master/web/util/wslink.jsx

@@ -1,25 +1,7 @@
-import { Control, ControlConnector } from "./../util/websocket";
 import * as errors from "@clusterio/lib/errors";
 import * as link from "@clusterio/lib/link";
-import config from "@clusterio/lib/config";
 
-let control, controlConnector;
-
-// Create WS connection to master. Used by all components through the interface exported here.
-(async () => {
-	config.finalizeConfigs();
-	controlConnector = new ControlConnector(
-		localStorage.getItem("master_url"),
-		10, // Reconnect delay
-		localStorage.getItem("master_token"),
-	);
-	control = new Control(controlConnector, []);
-	try {
-		await controlConnector.connect();
-	} catch (err) {
-		console.log(err);
-	}
-})();
+// Note: control is created as in bootstrap.jsx as a global.
 
 let listSlaves = createListFunction("listSlaves");
 let listInstances = createListFunction("listInstances");

packages/master/webpack.common.js

@@ -0,0 +1,71 @@
+"use strict";
+const webpack = require("webpack");
+const { CleanWebpackPlugin } = require("clean-webpack-plugin");
+
+module.exports = (env = {}) => ({
+	mode: env.production ? "production" : "development",
+	devtool: env.production ? "source-map" : "eval-source-map",
+	performance: {
+		maxAssetSize: 2**21,
+		maxEntrypointSize: 2**21,
+	},
+	plugins: [
+		new CleanWebpackPlugin(),
+		new webpack.DefinePlugin({
+			"process.env.APP_ENV": JSON.stringify("browser"),
+		}),
+
+		// Make sure ant-design icons use the ES variant
+		new webpack.NormalModuleReplacementPlugin(
+			/@ant-design\/icons\/[A-Z]/,
+			function(resource) {
+				resource.request = resource.request.replace(/@ant-design\/icons/, "$&/es/icons");
+			}
+		),
+	],
+	module: {
+		rules: [
+			{
+				test: /node_modules.fs-extra/,
+				use: "null-loader",
+			},
+			{
+				test: /\.css$/,
+				use: [
+					"style-loader",
+					{
+						loader: "css-loader",
+						options: {
+							sourceMap: !env.production,
+						},
+					},
+				],
+			},
+			{
+				test: /\.js$/,
+				resolve: {
+					// XXX Required due to bug in babel-runtime
+					// see: https://github.com/babel/babel/issues/12058
+					fullySpecified: false,
+				},
+			},
+			{
+				test: /\.jsx$/,
+				exclude: /node_modules/,
+				use: {
+					loader: "babel-loader",
+					options: {
+						presets: ["@babel/preset-react"],
+					},
+				},
+			},
+		],
+	},
+	resolve: {
+		extensions: [".js", ".json", ".jsx"],
+		fallback: {
+			"events": require.resolve("events/"),
+			"path": require.resolve("path-browserify"),
+		},
+	},
+});

packages/master/webpack.config.js

@@ -1,12 +1,12 @@
 "use strict";
 const path = require("path");
 const webpack = require("webpack");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
+const { merge } = require("webpack-merge");
 
-module.exports = (env = {}) => ({
+const common = require("./webpack.common");
+
+module.exports = (env = {}) => merge(common(env), {
 	entry: "./web/index.jsx",
-	mode: env.production ? "production" : "development",
-	devtool: env.production ? "source-map" : "eval-source-map",
 	devServer: {
 		contentBase: "./static",
 	},
@@ -14,58 +14,16 @@ module.exports = (env = {}) => ({
 		filename: "bundle.js",
 		path: path.resolve(__dirname, "static"),
 	},
-	performance: {
-		maxAssetSize: 2**21,
-		maxEntrypointSize: 2**21,
-	},
 	plugins: [
-		new CleanWebpackPlugin(),
-		new webpack.DefinePlugin({
-			"process.env.APP_ENV": JSON.stringify("browser"),
+		new webpack.container.ModuleFederationPlugin({
+			name: "master",
+			shared: {
+				"@clusterio/lib": { singleton: true },
+				"ajv": {},
+				"antd": { singleton: true },
+				"react": { singleton: true },
+				"react-dom": { singleton: true },
+			},
 		}),
-
-		// Make sure ant-design icons use the ES variant
-		new webpack.NormalModuleReplacementPlugin(
-			/@ant-design\/icons\/[A-Z]/,
-			function(resource) {
-				resource.request = resource.request.replace(/@ant-design\/icons/, "$&/es/icons");
-			}
-		),
 	],
-	module: {
-		rules: [
-			{
-				test: /node_modules.fs-extra/,
-				use: "null-loader",
-			},
-			{
-				test: /\.css$/,
-				use: [
-					"style-loader",
-					{
-						loader: "css-loader",
-						options: {
-							sourceMap: !env.production,
-						},
-					},
-				],
-			},
-			{
-				test: /\.jsx$/,
-				exclude: /node_modules/,
-				use: {
-					loader: "babel-loader",
-					options: {
-						presets: ["@babel/preset-react"],
-					},
-				},
-			},
-		],
-	},
-	resolve: {
-		extensions: [".js", ".json", ".jsx"],
-	},
-	node: {
-		"crypto": "empty",
-	},
 });

packages/slave/README.md

@@ -0,0 +1,111 @@
+Clusterio Slave
+===============
+
+Node hosting Factorio servers in a Clusterio cluster.  Clusterio slaves
+connect to the master server and waits for commands from the master
+server to start up and stop instances.  A cluster can have any number of
+slaves in it located on different computers, and each slave can host any
+number of instances each of which is a Factorio server that talks with
+the rest of the cluster.
+
+
+Usage
+-----
+
+    npx clusterioslave <command>
+
+Common options:
+
+ * `--plugin-list <file>` JSON file to use for storing the list of
+   plugins that are available to the slave.  Defaults to
+   `plugin-list.json` and will be created if it does not exist. See the
+   `plugin` command for managing this list.
+
+ * `--config <file>` JSON file to use for storing configuration for the
+   slave.  Defaults to `config-slave.json` and will be created if it
+   does not exist.  See the `config` command for inspecting and
+   modifying the configuration.
+
+
+### `plugin <command>`
+
+Configure plugins available to be loaded by the slave.  The available
+plugins will be loaded unless they have been disabled in the
+configuration, see the config command for disabling plugins.
+
+
+#### `plugin add <path>`
+
+Add plugin either by require path or relative/absolute path to the
+plugin directory.  A relative path must start with ./ or ../ (or .\ and
+..\ on Windows) otherwise it will be assumed to be a require path for an
+installed package in node_modules.
+
+For example, installing the Subspace Storage plugin:
+
+    npm install @clusterio/plugin-subspace_storage
+    npx clusterioslave plugin add @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin remove <name>`
+
+Remove a plugin by its name.  This should be done before uninstalling
+the plugin, otherwise there will be an error when Clusterio tries to
+load the info from the plugin.  Removing and unistalling a plugin is
+usually not neccessary as the functions provided by the plugin can be
+disabled in the config.
+
+For example, uninstalling the Subspace Storage plugin:
+
+    npx clusterioslave plugin remove subspace_storage
+    npm uninstall @clusterio/plugin-subspace_storage
+
+Since the `plugin-list.json` is shared between master, slave and ctl you
+usually only need to do this once per machine.
+
+
+#### `plugin list`
+
+Lists the plugins set up to be available by name followed by path.
+
+
+### `config`
+
+Manage the slave configuration offline.  This should only be used when
+the slave is stopped, otherwise the config read might be out of date and
+config changes will be overwritten when the slave shuts down.
+
+
+#### `config set <config-entry> [value]`
+
+Set a config entry to the given value.  If value is not provided the
+entry is set to null.  If the config entry is of type object the value
+must be a valid JSON serialization of an object.
+
+See docs/configuration.md in the main repositiory for the available
+configuration.
+
+
+#### `config show <config-entry>`
+
+Shows the value for a single config entry.
+
+
+#### `config list`
+
+Lists up all configuration entries with their currently configured values.
+
+
+### `run`
+
+Runs the slave.
+
+
+## See Also
+
+[The Clusterio
+repository](https://github.com/clusterio/factorioClusterio)
+for instructions on how to set up a cluster.

packages/slave/package.json

@@ -3,7 +3,7 @@
   "description": "Implementation of Clusterio slave server",
   "author": "Hornwitser",
   "license": "MIT",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "main": "slave.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -15,10 +15,10 @@
     "factorio"
   ],
   "engines": {
-    "node": ">=10.16 <11 || >= 11.13"
+    "node": ">=10.16 <11 || >= 12"
   },
   "dependencies": {
-    "@clusterio/lib": "=2.0.0-alpha.0",
+    "@clusterio/lib": "^2.0.0-alpha.1",
     "fs-extra": "^8.1.0",
     "phin": "^3.4.1",
     "pidusage": "^2.0.18",

plugins/global_chat/README.md

@@ -0,0 +1,16 @@
+Clusterio Global Chat Plugin
+============================
+
+Plugin sharing the in-game chat between instances.
+
+
+Installation
+============
+
+Run the following commands in the folder Clusterio is installed to:
+
+    npm install @clusterio/plugin-global_chat
+    npx clusteriomaster plugin add @clusterio/plugin-global_chat
+
+Substitute clusteriomaster with clusterioslave or clusterioctl if this a
+dedicate slave or ctl installation respectively.

plugins/global_chat/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@clusterio/plugin-global_chat",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "Clusterio plugin forwarding between Factorio servers",
   "author": "Hornwitser <github@hornwitser.no>",
   "homepage": "https://github.com/clusterio/factorioClusterio#readme",
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
+    "build": "webpack-cli --env.production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
@@ -15,6 +16,18 @@
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/preset-react": "^7.10.4",
+    "@clusterio/master": "^2.0.0-alpha.1",
+    "babel-loader": "^8.1.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "events": "^3.2.0",
+    "null-loader": "^4.0.0",
+    "path-browserify": "^1.0.1",
+    "webpack-cli": "^3.3.12",
+    "webpack-merge": "^5.2.0"
+  },
   "publishConfig": {
     "access": "public"
   }

plugins/global_chat/webpack.config.js

@@ -0,0 +1,28 @@
+"use strict";
+const path = require("path");
+const webpack = require("webpack");
+const { merge } = require("webpack-merge");
+
+const common = require("@clusterio/master/webpack.common");
+
+module.exports = (env = {}) => merge(common(env), {
+	entry: "./web/index.jsx",
+	output: {
+		filename: "bundle.js",
+		path: path.resolve(__dirname, "static"),
+	},
+	plugins: [
+		new webpack.container.ModuleFederationPlugin({
+			name: "global_chat",
+			library: { type: "var", name: "plugin_global_chat" },
+			filename: "remoteEntry.js",
+			exposes: {
+				"./info": "./info.js",
+			},
+			shared: {
+				"@clusterio/lib": { import: false },
+				"ajv": { import: false },
+			},
+		}),
+	],
+});

plugins/research_sync/README.md

@@ -0,0 +1,17 @@
+Clusterio Research Sync Plugin
+==============================
+
+Plugin synchronizing research progress between instances and the
+cluster.
+
+
+Installation
+============
+
+Run the following commands in the folder Clusterio is installed to:
+
+    npm install @clusterio/plugin-research_sync
+    npx clusteriomaster plugin add @clusterio/plugin-research_sync
+
+Substitute clusteriomaster with clusterioslave or clusterioctl if this a
+dedicate slave or ctl installation respectively.

plugins/research_sync/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@clusterio/plugin-research_sync",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "Clusterio plugin for synchronizing research between Factorio servers",
   "author": "Hornwitser <github@hornwitser.no>",
   "homepage": "https://github.com/clusterio/factorioClusterio#readme",
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
+    "build": "webpack-cli --env.production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
@@ -15,9 +16,21 @@
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
-  "ependencies": {
+  "dependencies": {
     "fs-extra": "^8.1.0"
   },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/preset-react": "^7.10.4",
+    "@clusterio/master": "^2.0.0-alpha.1",
+    "babel-loader": "^8.1.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "events": "^3.2.0",
+    "null-loader": "^4.0.0",
+    "path-browserify": "^1.0.1",
+    "webpack-cli": "^3.3.12",
+    "webpack-merge": "^5.2.0"
+  },
   "publishConfig": {
     "access": "public"
   }

plugins/research_sync/webpack.config.js

@@ -0,0 +1,28 @@
+"use strict";
+const path = require("path");
+const webpack = require("webpack");
+const { merge } = require("webpack-merge");
+
+const common = require("@clusterio/master/webpack.common");
+
+module.exports = (env = {}) => merge(common(env), {
+	entry: "./web/index.jsx",
+	output: {
+		filename: "bundle.js",
+		path: path.resolve(__dirname, "static"),
+	},
+	plugins: [
+		new webpack.container.ModuleFederationPlugin({
+			name: "research_sync",
+			library: { type: "var", name: "plugin_research_sync" },
+			filename: "remoteEntry.js",
+			exposes: {
+				"./info": "./info.js",
+			},
+			shared: {
+				"@clusterio/lib": { import: false },
+				"ajv": { import: false },
+			},
+		}),
+	],
+});

plugins/statistics_exporter/README.md

@@ -0,0 +1,18 @@
+Clusterio Statistics Exporter Plugin
+====================================
+
+Plugin exporting item production, fluid production, kill count, entity
+build and poluttion statistics to the Prometheus integration to
+Clusterio.
+
+
+Installation
+============
+
+Run the following commands in the folder Clusterio is installed to:
+
+    npm install @clusterio/plugin-statistics_exporter
+    npx clusteriomaster plugin add @clusterio/plugin-statistics_exporter
+
+Substitute clusteriomaster with clusterioslave or clusterioctl if this a
+dedicate slave or ctl installation respectively.

plugins/statistics_exporter/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@clusterio/plugin-statistics_exporter",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "Clusterio plugin for gathering statistics from Factorio servers",
   "author": "Hornwitser <github@hornwitser.no>",
   "homepage": "https://github.com/clusterio/factorioClusterio#readme",
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
+    "build": "webpack-cli --env.production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
@@ -15,6 +16,18 @@
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/preset-react": "^7.10.4",
+    "@clusterio/master": "^2.0.0-alpha.1",
+    "babel-loader": "^8.1.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "events": "^3.2.0",
+    "null-loader": "^4.0.0",
+    "path-browserify": "^1.0.1",
+    "webpack-cli": "^3.3.12",
+    "webpack-merge": "^5.2.0"
+  },
   "publishConfig": {
     "access": "public"
   }

plugins/statistics_exporter/webpack.config.js

@@ -0,0 +1,28 @@
+"use strict";
+const path = require("path");
+const webpack = require("webpack");
+const { merge } = require("webpack-merge");
+
+const common = require("@clusterio/master/webpack.common");
+
+module.exports = (env = {}) => merge(common(env), {
+	entry: "./web/index.jsx",
+	output: {
+		filename: "bundle.js",
+		path: path.resolve(__dirname, "static"),
+	},
+	plugins: [
+		new webpack.container.ModuleFederationPlugin({
+			name: "statistics_exporter",
+			library: { type: "var", name: "plugin_statistics_exporter" },
+			filename: "remoteEntry.js",
+			exposes: {
+				"./info": "./info.js",
+			},
+			shared: {
+				"@clusterio/lib": { import: false },
+				"ajv": { import: false },
+			},
+		}),
+	],
+});

plugins/subspace_storage/README.md

@@ -0,0 +1,16 @@
+Clusterio Subspace Storage Plugin
+=================================
+
+Plugin for the Subpsace Storage mod.
+
+
+Installation
+============
+
+Run the following commands in the folder Clusterio is installed to:
+
+    npm install @clusterio/plugin-subspace_storage
+    npx clusteriomaster plugin add @clusterio/plugin-subspace_storage
+
+Substitute clusteriomaster with clusterioslave or clusterioctl if this a
+dedicate slave or ctl installation respectively.

plugins/subspace_storage/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@clusterio/plugin-subspace_storage",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "Clusterio plugin for sharing storage between Factorio servers",
   "author": "Hornwitser <github@hornwitser.no>",
   "homepage": "https://github.com/clusterio/clusterio#readme",
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
+    "build": "webpack-cli --env.production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
@@ -18,6 +19,21 @@
   "dependencies": {
     "fs-extra": "^8.1.0"
   },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/preset-react": "^7.10.4",
+    "@clusterio/master": "^2.0.0-alpha.1",
+    "antd": "^4.6.5",
+    "babel-loader": "^8.1.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "events": "^3.2.0",
+    "null-loader": "^4.0.0",
+    "path-browserify": "^1.0.1",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "webpack-cli": "^3.3.12",
+    "webpack-merge": "^5.2.0"
+  },
   "publishConfig": {
     "access": "public"
   }

plugins/subspace_storage/webpack.config.js

@@ -0,0 +1,31 @@
+"use strict";
+const path = require("path");
+const webpack = require("webpack");
+const { merge } = require("webpack-merge");
+
+const common = require("@clusterio/master/webpack.common");
+
+module.exports = (env = {}) => merge(common(env), {
+	entry: "./web/index.jsx",
+	output: {
+		filename: "bundle.js",
+		path: path.resolve(__dirname, "static"),
+	},
+	plugins: [
+		new webpack.container.ModuleFederationPlugin({
+			name: "subspace_storage",
+			library: { type: "var", name: "plugin_subspace_storage" },
+			filename: "remoteEntry.js",
+			exposes: {
+				"./info": "./info.js",
+			},
+			shared: {
+				"@clusterio/lib": { import: false },
+				"ajv": { import: false },
+				"antd": { import: false },
+				"react": { import: false },
+				"react-dom": { import: false },
+			},
+		}),
+	],
+});