Refactor master code

Move implementation of master systems into dedicated classes for better
organization.
This commit is contained in:
Hornwitser committed 2021-05-12 20:42:40 +02:00
1 parent 8b32267858
commit 67219ede6b
19 files changed
+2135 -1932

No files matched your search

+1 -1
View File
@@ -156,7 +156,7 @@ before(async function() {
await exec("node ../../packages/master bootstrap create-ctl-config test");
await exec("node ../../packages/ctl control-config set control.tls_ca ../../test/file/tls/cert.pem");
masterProcess = await spawn("master:", "node ../../packages/master run", /All plugins loaded/);
masterProcess = await spawn("master:", "node ../../packages/master run", /Started master/);
await execCtl("slave create-config --id 4 --name slave --generate-token");
await exec(`node ../../packages/slave config set slave.factorio_directory ${path.join("..", "..", "factorio")}`);
+10 -13
View File
@@ -2,13 +2,14 @@
const events = require("events");
const http = require("http");
const express = require("express");
const bodyParser = require("body-parser");
const libLink = require("@clusterio/lib/link");
const libPlugin = require("@clusterio/lib/plugin");
const libUsers = require("@clusterio/lib/users");
const libPrometheus = require("@clusterio/lib/prometheus");
const UserManager = require("@clusterio/master/src/UserManager");
class MockLogger {
child() { return this; }
@@ -149,7 +150,6 @@ class MockControl extends libLink.Link {
class MockMaster {
constructor() {
this.app = express();
this.app.use(bodyParser.json({ limit: "10mb" }));
this.mockConfigEntries = new Map([
["master.external_address", "test"],
["master.auth_secret", "TestSecretDoNotUse"],
@@ -163,22 +163,19 @@ class MockMaster {
},
};
let roles = new Map([
this.userManager = new UserManager();
this.userManager.roles = new Map([
[0, new libUsers.Role({ id: 0, name: "Admin", description: "admin", permissions: ["core.admin"] })],
[1, new libUsers.Role({ id: 1, name: "Player", description: "player", permissions: [] })],
]);
roles.get(1).grantDefaultPermissions();
this.userManager.roles.get(1).grantDefaultPermissions();
let users = new Map([
["test", new libUsers.User({ name: "test", roles: [0, 1] }, roles)],
["player", new libUsers.User({ name: "player", roles: [1] }, roles)],
this.userManager.users = new Map([
["test", new libUsers.User({ name: "test", roles: [0, 1] }, this.userManager.roles)],
["player", new libUsers.User({ name: "player", roles: [1] }, this.userManager.roles)],
]);
this.db = {
instances: new Map(),
slaves: new Map(),
roles,
users,
};
this.instances = new Map();
this.slaves = new Map();
}
getMasterUrl() {
-1
View File
@@ -9,7 +9,6 @@
"@clusterio/lib": "2.0.0-alpha.5",
"@clusterio/master": "2.0.0-alpha.5",
"@clusterio/slave": "2.0.0-alpha.5",
"body-parser": "^1.18.2",
"express": "^4.16.2",
"fs-extra": "^8.1.0",
"jsonwebtoken": "^8.2.1",