aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-12 23:04:52 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,293 Commits 15 Branches 45 Tags
dfaf74aac5f4566346c829beb0f577adeea626f4
Commit Graph
1293 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hornwitser dfaf74aac5 Supress webpack asset size warning 
Set threshold for webpack's asset size warning to 2 MB due to Ant Design
being large.
 2020-09-28 05:57:10 +02:00
Hornwitser 86b8775df0 Fix modals stuck after web interface import 
Fix the modals for adding new entries to instances, users, and roles not
being closable due to a missing bind of the close method.
 2020-09-28 05:52:31 +02:00
Hornwitser bccc89fa0b Finish linting web interface 
Fix remaining linter errors detected in web interface code.
 2020-09-28 05:52:31 +02:00
Hornwitser 03b7d22ba6 Use consistent semi-colon placment 
Add semicolons to web interface code to be consistent with project
standard.
 2020-09-28 05:52:29 +02:00
Hornwitser 8dce1dd0fd Fix web interface indents 
Use project standard of tabs for indents.
 2020-09-28 05:51:15 +02:00
Hornwitser 94200433cc Serve interface on all routes for the interface 
Add all routes the web interface is served on to the express app and
serve the index.html file on.  Due to the index html not knowing which
path it's hosted under, a path to the root of the web interface is
replaced using string substitution from the master server.
 2020-09-28 05:51:11 +02:00
Hornwitser 392a7655c4 Use property for calculating handler name 
Replace usage of .constructor.name with a separate property to avoid
issue with JavaScript terser mangling the class name during minification
for the web build.
 2020-09-28 04:23:45 +02:00
Hornwitser f1f9b4d020 Close webpack middleware on shutdown 
Call the .close method on the webpack-dev-middleware in order to
properly shut it down.
 2020-09-28 04:23:45 +02:00
Hornwitser 701ff87bcd Implement webpack build for web interface 
Set up webpack for the master server's web interface and fix the issues
from the imported interface source files.  The .jsx files in
package/master/web are bundled together into package/master/static and
served by the master server via express.
 2020-09-28 04:23:45 +02:00
Danielv123 2382f4bbdc Import web interface from clusterio/clusterioWeb 
Import the source files in use for the web interface, excluding the
copied and modified lib/link files.
 2020-09-28 04:19:00 +02:00
Hornwitser f318f8826b Adapt config and link library to web 
Make the config and link libraries compatible with packing for web with
webpack.  This would fail due to ws not being web compatible and config
using a node function not available in the web shim for util.
 2020-09-28 04:19:00 +02:00
Hornwitser fbf2843f5b Remove old web interface 2020-09-22 22:06:03 +02:00
Daniel bca949f7be Merge pull request #318 from Hornwitser/restructure-project 
Restructure project
 2020-09-21 11:57:43 -07:00
Hornwitser 5e410a6ac3 Use full path when referencing files in documentation 
Include the packages/ component in paths referenced in the documentation
to make it clear where the files are located in the repository.

[skip travis]
 2020-09-21 19:57:52 +02:00
Hornwitser 0cca9ed22c Mark user creation tests as slow 
Mark the "should not create the user if not instructed to" and "should
create the user if instructed to" tests as slow as these take more than
2 seconds to execute on travis.
 2020-09-21 19:27:24 +02:00
Hornwitser 6621e37e23 Do not use ci in travis environment 
Disable ci mode for lerna in travis environment as this requires
package-lock.json files to be commited to the repository and we do not
for the time being do this.
 2020-09-21 18:51:21 +02:00
Hornwitser bd8f685a18 Fix JSDoc module references 
Fix module names, which are incorrectly deduced by JSDoc, and references
to master, slave and ctl modules that are now in separate packages.
 2020-09-21 18:00:07 +02:00
Hornwitser 3485c9ac68 Rename clusterctl to clusterioctl 
Rename the clusterctl command line utility to clusterioctl in order to
be consistent with the naming of the commands for master and slave.
 2020-09-21 18:00:07 +02:00
Hornwitser bf5a4a8a9c Split up into multiple packages with Lerna 
Split up codebase into the packages @clsterio/lib, @clusterio/master,
@clusterio/slave, and @clusterio/ctl using lerna to manage them.  This
will allow deployment to use only the parts needed reducing install
size, and better separate the code into shared library, master, slave
and control.
 2020-09-21 18:00:07 +02:00
Hornwitser 198d5c344b Remove unused dependencies from dead code 
Remove dependencies used by inventoryImports, external plugins and the
removed modManager code.
 2020-09-16 15:09:23 +02:00
Hornwitser efa3eff0d5 Delete old mod manager code 2020-09-16 15:09:23 +02:00
Hornwitser 6fde461da5 Merge pull request #313 from Hornwitser/list-management 
List management
 2020-09-16 15:08:21 +02:00
dependabot[bot] 14ddb76a0b Bump node-forge from 0.7.6 to 0.10.0 (#315) 
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 0.7.6 to 0.10.0.
- [Release notes](https://github.com/digitalbazaar/forge/releases)
- [Changelog](https://github.com/digitalbazaar/forge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/0.7.6...0.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 14:59:35 +02:00
Hornwitser 3753c303dd Add changelog entry for list synchronization 
[skip travis]
 2020-09-01 20:33:31 +02:00
Hornwitser 08ec542907 Move integration tests for lists sync 
Move the integration tests for the admin, user, and ban list sync to be
done while an instance is running in order to hit more lines in the
coverage with them.
 2020-09-01 20:16:17 +02:00
Hornwitser a8b8232d73 Merge pull request #314 from RMuskovets/readme-typo-factorio-version 
Fix a typo in README.md
 2020-09-01 19:17:56 +02:00
RMuskovets 4f86be1b7f Fix a typo in README.md: 
Line 174, "Factorio_0.x.y" -> "Factorio.x.y.z"
Since 1.0.0 release Factorio versions no longer start from 0
 2020-09-01 19:56:08 +03:00
Hornwitser 84450b83b4 Implement adminlist, whitelist and banlist sync 
Add integration of the server adminlist, whitelist and banlist into
clusterio.  Membership is stored as booleans in the user acconuts and
changes are synchronized live to slaves which pass it on to instances
which in turn will update the running server's lists with RCON commands.
 2020-09-01 18:17:40 +02:00
Hornwitser f08774bd4a Add execCtl shortcut for clusterctl tests 
Add execCtl which is a shortcut to execute node clusterctl with the test
config set.
 2020-09-01 18:17:40 +02:00
Hornwitser 5e5a47ce02 Leave out roles array in serialized user 
Leave out the roles property containing the array of role ids if the
user does not have any roles.
 2020-09-01 17:59:19 +02:00
Hornwitser 9761fbb71c Fix test names for clusterctl 
Rename the test cases named after the old clusterctl commands for the
integrations to the new clusterctl commands.
 2020-09-01 17:59:19 +02:00
Hornwitser 3c55188a87 Merge pull request #311 from Hornwitser/fix-logger-warning 
Fix logger.warning is not a function

Fixes #303
 2020-08-27 11:41:43 +02:00
Hornwitser a40c78d85d Fix logger.warning is not a function 
Replace logger.warning with logger.warn as I incorrectly assumed the
warning method of console was called console.warning instead of
console.warn.
 2020-08-27 11:31:36 +02:00
Arvids Godjuks 0b790357f9 Merge pull request #310 from Hornwitser/remove-bcrypt 
Remove bcrypt dependency
 2020-08-27 11:28:11 +02:00
Hornwitser 2dcc5c9d47 Remove bcrypt dependency 
Remove the unused dependencies to bcrypt and bcrypt-promise.  These were
used by the playerManager plugin to implement password based
authentication, but this plugin is likely not going to be ported to 2.0.
 2020-08-27 11:17:35 +02:00
dependabot[bot] 6d8d926268 Bump express-fileupload from 1.1.5 to 1.2.0 (#308) 
Bumps [express-fileupload](https://github.com/richardgirges/express-fileupload) from 1.1.5 to 1.2.0.
- [Release notes](https://github.com/richardgirges/express-fileupload/releases)
- [Commits](https://github.com/richardgirges/express-fileupload/compare/v1.1.5...1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-27 11:07:35 +02:00
Hornwitser c59c30b840 Merge pull request #304 from Hornwitser/clusterctl-restructure 
Restructre clusterctl cli interface
 2020-08-26 13:23:33 +02:00
Hornwitser fd307e58c2 Add global-chat shout command 
Add command to broadcast a message to all instances from clusterctl.
 2020-08-18 18:52:11 +02:00
Hornwitser da1cbc16f7 Restructre clusterctl cli interface 
Turn the flat list of commands into a hierarchy of commands, converting
most required parameters into positional parameters and add plugin
loading support for clusterctl.
 2020-08-18 18:52:11 +02:00
ToxicFrazzles 9b870fde64 Fix syntax error in plugins/subspace_storage/static/storage.js (#302) 
Fix _lastData being used as a global causing the script to fail to load
after strict mode was added.
 2020-07-08 12:51:16 +02:00
Hornwitser 0802c5b29d Merge pull request #301 from Hornwitser/custom-scenario 
Add support for running custom scenarios
 2020-07-08 12:46:49 +02:00
Hornwitser 781e40428f Add enable_save_patching to mock instance config 
Handle the factorio.enable_save_patching config option in the mock
instance as these are queried by instances after 9458155.
 2020-07-07 14:24:47 +02:00
Hornwitser 999386c088 Add --keep-open option to clusterctl 
Add option to keep the console log open after starting an instance
instead of exiting as soon as it has finished starting up.
 2020-07-06 13:16:57 +02:00
Hornwitser 8c6130adba Add load scenario command 
Add alternative method of starting an instance by loading a scenario.
Since there's no save when starting a scenario it can only be used if
the save patching is disabled.
 2020-07-06 13:10:26 +02:00
Hornwitser 9458155a1b Add option to disable save patching 
Add factorio.enable_save_patching config entry to allow disabling the
save patching done on startup.  This is for running vannila games or
scenarios that are not compatible with Clusterio.
 2020-07-04 16:45:42 +02:00
Hornwitser 0969e07d79 Merge pull request #300 from Hornwitser/lint 
Lint codebase
 2020-06-17 22:12:27 +02:00
Hornwitser 9c9b3ac625 Document running tests and linting 
Add section to contributing docs detailing how to run tests and linting
on the project.
 2020-06-17 21:08:45 +02:00
Hornwitser 7814656241 Add ESLint check to travis integration 
Invoke the lint package.json script during travis integration check.
 2020-06-17 20:59:37 +02:00
Hornwitser e9f5cae4f0 Fix misc problems detected by ESLint 
Reformat and clean up issues detected by ESLint.
 2020-06-17 20:59:37 +02:00
Hornwitser 8cb21c5fa8 Add dangling commas 
Ensure multiline object and array litterals are consistenly typed out
with dangling commas for the last element.
 2020-06-17 20:59:37 +02:00