mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 15:30:41 +09:00
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.
This commit is contained in:
1 parent
198d5c344b
commit
bf5a4a8a9c
133 files changed
+367
-259
No files matched your search
+3
-8
@@ -1,24 +1,19 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
const chalk = require("chalk");
|
||||
|
||||
const { testLines } = require("./lib/factorio/lines");
|
||||
const clusterctl = require("../clusterctl.js");
|
||||
const clusterctl = require("@clusterio/ctl/clusterctl.js");
|
||||
|
||||
|
||||
describe("clusterctl", function() {
|
||||
describe("formatOutputColored()", function() {
|
||||
it("should pass the test lines", function() {
|
||||
// Ensure tests get uncoloured output.
|
||||
let old = chalk.level;
|
||||
chalk.level = 0;
|
||||
|
||||
for (let [reference, output] of testLines) {
|
||||
let line = clusterctl._formatOutputColored(output);
|
||||
// Strip colours
|
||||
line = line.replace(/\x1B\[\d+m/g, "");
|
||||
assert.deepEqual(line, reference);
|
||||
}
|
||||
|
||||
chalk.level = old;
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -5,7 +5,7 @@ const path = require("path");
|
||||
const validateHTML = require("html5-validator");
|
||||
const parallel = require("mocha.parallel");
|
||||
|
||||
const link = require("lib/link");
|
||||
const link = require("@clusterio/lib/link");
|
||||
|
||||
const { slowTest, get, execCtl, sendRcon, getControl, instancesDir } = require("./index");
|
||||
|
||||
@@ -18,7 +18,7 @@ describe("Integration of Clusterio", function() {
|
||||
for (let path of paths) {
|
||||
it(`sends some HTML when accessing ${path}`, async function() {
|
||||
let res = await get(path);
|
||||
let validation = await validateHTML(res.body);
|
||||
let validation = await validateHTML(res.body.toString());
|
||||
let filtered = validation.messages.filter(msg => msg.type !== "info");
|
||||
assert(
|
||||
filtered.length === 0,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
const assert = require("assert").strict;
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
|
||||
|
||||
describe("Integration of lib/factorio/export", function() {
|
||||
|
||||
+23
-19
@@ -3,12 +3,12 @@ const path = require("path");
|
||||
const fs = require("fs-extra");
|
||||
const child_process = require("child_process");
|
||||
const jwt = require("jsonwebtoken");
|
||||
const needle = require("needle");
|
||||
const phin = require("phin");
|
||||
const util = require("util");
|
||||
const events = require("events");
|
||||
|
||||
const link = require("lib/link");
|
||||
const server = require("lib/factorio/server");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const server = require("@clusterio/lib/factorio/server");
|
||||
|
||||
|
||||
class TestControl extends link.Link {
|
||||
@@ -45,7 +45,11 @@ function slowTest(test) {
|
||||
}
|
||||
|
||||
async function get(path) {
|
||||
let res = await needle("get", `https://localhost:4443${path}`, { rejectUnauthorized: false });
|
||||
let res = await phin({
|
||||
method: "GET",
|
||||
url: `https://localhost:4443${path}`,
|
||||
core: { rejectUnauthorized: false },
|
||||
});
|
||||
if (res.statusCode != 200) {
|
||||
throw new Error(`Got response code ${res.statusCode}, content: ${res.body}`);
|
||||
}
|
||||
@@ -70,7 +74,7 @@ async function exec(...args) {
|
||||
}
|
||||
|
||||
async function execCtl(...args) {
|
||||
args[0] = `node clusterctl --config ${controlConfigPath} ${args[0]}`;
|
||||
args[0] = `node packages/ctl --config ${controlConfigPath} ${args[0]}`;
|
||||
return await exec(...args);
|
||||
}
|
||||
|
||||
@@ -113,26 +117,26 @@ before(async function() {
|
||||
await fs.remove(slaveConfigPath);
|
||||
await fs.remove(controlConfigPath);
|
||||
|
||||
await exec(`node master --config ${masterConfigPath} config set master.database_directory ${databaseDir}`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.auth_secret TestSecretDoNotUse`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.http_port 8880`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.https_port 4443`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.tls_certificate ${path.join(databaseDir, "cert.crt")}`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.tls_private_key ${path.join(databaseDir, "cert.key")}`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.tls_bits 1024`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.heartbeat_interval 0.25`);
|
||||
await exec(`node master --config ${masterConfigPath} config set master.connector_shutdown_timeout 2`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.database_directory ${databaseDir}`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.auth_secret TestSecretDoNotUse`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.http_port 8880`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.https_port 4443`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.tls_certificate ${path.join(databaseDir, "cert.crt")}`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.tls_private_key ${path.join(databaseDir, "cert.key")}`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.tls_bits 1024`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.heartbeat_interval 0.25`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} config set master.connector_shutdown_timeout 2`);
|
||||
|
||||
await exec(`node master --config ${masterConfigPath} bootstrap create-admin test`);
|
||||
await exec(`node master --config ${masterConfigPath} bootstrap create-ctl-config test --output ${controlConfigPath}`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} bootstrap create-admin test`);
|
||||
await exec(`node packages/master --config ${masterConfigPath} bootstrap create-ctl-config test --output ${controlConfigPath}`);
|
||||
|
||||
masterProcess = await spawn("master:", `node master --config ${masterConfigPath} run`, "All plugins loaded");
|
||||
masterProcess = await spawn("master:", `node packages/master --config ${masterConfigPath} run`, "All plugins loaded");
|
||||
|
||||
let createArgs = `--id 4 --name slave --generate-token --output ${slaveConfigPath}`;
|
||||
await execCtl(`slave create-config ${createArgs}`);
|
||||
await exec(`node slave --config ${slaveConfigPath} config set slave.instances_directory ${instancesDir}`);
|
||||
await exec(`node packages/slave --config ${slaveConfigPath} config set slave.instances_directory ${instancesDir}`);
|
||||
|
||||
slaveProcess = await spawn("slave:", `node slave --config ${slaveConfigPath} run`, "SOCKET | received ready from master");
|
||||
slaveProcess = await spawn("slave:", `node packages/slave --config ${slaveConfigPath} run`, "SOCKET | received ready from master");
|
||||
|
||||
let controlConnector = new TestControlConnector(url, 2);
|
||||
controlConnector.token = controlToken;
|
||||
|
||||
@@ -4,7 +4,7 @@ const fs = require("fs-extra");
|
||||
const jszip = require("jszip");
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
|
||||
const { slowTest } = require("./index");
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ const events = require("events");
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const errors = require("lib/errors");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
const errors = require("@clusterio/lib/errors");
|
||||
|
||||
const { slowTest } = require("./index");
|
||||
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const command = require("lib/command");
|
||||
const errors = require("lib/errors");
|
||||
const link = require("lib/link");
|
||||
const command = require("@clusterio/lib/command");
|
||||
const errors = require("@clusterio/lib/errors");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const mock = require("../mock");
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
"use strict";
|
||||
const classes = require("lib/config/classes");
|
||||
const classes = require("@clusterio/lib/config/classes");
|
||||
const assert = require("assert").strict;
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ const assert = require("assert").strict;
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const database = require("lib/database");
|
||||
const database = require("@clusterio/lib/database");
|
||||
|
||||
describe("lib/database", function() {
|
||||
describe("mapToObject()", function() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
const assert = require("assert").strict;
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
|
||||
|
||||
describe("lib/factorio/export", function() {
|
||||
|
||||
@@ -4,7 +4,7 @@ const fs = require("fs-extra");
|
||||
const jszip = require("jszip");
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
|
||||
|
||||
describe("lib/factorio", function() {
|
||||
|
||||
@@ -4,7 +4,7 @@ const events = require("events");
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const factorio = require("lib/factorio");
|
||||
const factorio = require("@clusterio/lib/factorio");
|
||||
const { testLines } = require("./lines");
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ const assert = require("assert").strict;
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const fileOps = require("lib/fileOps");
|
||||
const fileOps = require("@clusterio/lib/fileOps");
|
||||
|
||||
describe("fileOps.js", function(){
|
||||
let baseDir = path.join("temp", "test", "fileOps");
|
||||
|
||||
@@ -3,7 +3,7 @@ const assert = require("assert");
|
||||
const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const generateSSLcert = require("lib/generateSSLcert");
|
||||
const generateSSLcert = require("@clusterio/master/src/generate_ssl_cert");
|
||||
|
||||
describe("generateSSLcert.js(options)", function() {
|
||||
let testDir = path.join("temp", "test", "certTest");
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ const fs = require("fs");
|
||||
const path = require("path");
|
||||
const stream = require("stream");
|
||||
|
||||
const hash = require("lib/hash");
|
||||
const hash = require("@clusterio/lib/hash");
|
||||
|
||||
|
||||
describe("lib/hash", function() {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const helpers = require("lib/helpers");
|
||||
const helpers = require("@clusterio/lib/helpers");
|
||||
|
||||
|
||||
describe("lib/helpers", function() {
|
||||
|
||||
@@ -3,7 +3,7 @@ const assert = require("assert").strict;
|
||||
const events = require("events");
|
||||
|
||||
const mock = require("../../mock");
|
||||
const link = require("lib/link");
|
||||
const link = require("@clusterio/lib/link");
|
||||
|
||||
|
||||
describe("lib/link/connectors", function() {
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
const assert = require("assert").strict;
|
||||
const events = require("events");
|
||||
|
||||
const link = require("lib/link");
|
||||
const errors = require("lib/errors");
|
||||
const schema = require("lib/schema");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const errors = require("@clusterio/lib/errors");
|
||||
const schema = require("@clusterio/lib/schema");
|
||||
const mock = require("../../mock");
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const link = require("lib/link");
|
||||
const errors = require("lib/errors");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const errors = require("@clusterio/lib/errors");
|
||||
const mock = require("../../mock");
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const luaTools = require("lib/luaTools");
|
||||
const luaTools = require("@clusterio/lib/luaTools");
|
||||
|
||||
|
||||
describe("lib/luaTools", function() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
var assert = require("assert");
|
||||
var objectOps = require("lib/objectOps");
|
||||
var objectOps = require("@clusterio/lib/objectOps");
|
||||
|
||||
describe("objectOps.js", function(){
|
||||
describe("objectOps.deepclone()", function(){
|
||||
|
||||
+3
-3
@@ -4,9 +4,9 @@ const fs = require("fs-extra");
|
||||
const path = require("path");
|
||||
|
||||
const mock = require("../mock");
|
||||
const link = require("lib/link");
|
||||
const plugin = require("lib/plugin");
|
||||
const errors = require("lib/errors");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const plugin = require("@clusterio/lib/plugin");
|
||||
const errors = require("@clusterio/lib/errors");
|
||||
|
||||
|
||||
describe("lib/plugin", function() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const prometheus = require("lib/prometheus");
|
||||
const prometheus = require("@clusterio/lib/prometheus");
|
||||
|
||||
|
||||
describe("lib/prometheus", function() {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
const assert = require("assert").strict;
|
||||
const users = require("lib/users");
|
||||
const users = require("@clusterio/lib/users");
|
||||
|
||||
|
||||
describe("lib/users", function() {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
const assert = require("assert").strict;
|
||||
|
||||
const mock = require("./mock");
|
||||
const master = require("../master");
|
||||
const master = require("@clusterio/master/master");
|
||||
|
||||
|
||||
describe("Master testing", function() {
|
||||
|
||||
+1
-1
@@ -2,4 +2,4 @@
|
||||
// required here in order to track coverage for them.
|
||||
|
||||
"use strict";
|
||||
require("lib/npmPostinstall.js");
|
||||
require("@clusterio/master/npm_post_install.js");
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
"use strict";
|
||||
const events = require("events");
|
||||
|
||||
const link = require("lib/link");
|
||||
const link = require("@clusterio/lib/link");
|
||||
|
||||
|
||||
class MockSocket {
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@ const assert = require("assert").strict;
|
||||
const path = require("path");
|
||||
const fs = require("fs-extra");
|
||||
|
||||
const link = require("lib/link");
|
||||
const config = require("lib/config");
|
||||
const slave = require("../slave");
|
||||
const link = require("@clusterio/lib/link");
|
||||
const config = require("@clusterio/lib/config");
|
||||
const slave = require("@clusterio/slave/slave");
|
||||
|
||||
describe("Slave testing", function() {
|
||||
before(function() {
|
||||
|
||||
Reference in new issue
Block a user