elysium/minecluster
elysium/minecluster
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[FEATURE] Initial Mutability Features

Browse source
This commit is contained in:
Dunemask 2024-01-23 13:02:16 -07:00
parent eb53e56dc7
commit ea54ee6239
6 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lib/controllers/lifecycle-controller.js
View file

@ -13,28 +13,10 @@ const dnsRegex = new RegExp(
`^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$`,
);
function payloadFilter(req, res) {
function backupPayloadFilter(req, res) {
const serverSpec = req.body;
if (!serverSpec) return res.sendStatus(400);
const { name, host, version, serverType, memory, extraPorts } = serverSpec;
const { backupHost, backupBucket, backupId, backupKey, backupInterval } =
serverSpec;
console.log("GOT VVV");
console.log(serverSpec);
if (!name) return res.status(400).send("Server name is required!");
if (!host) return res.status(400).send("Server host is required!");
if (!dnsRegex.test(host)) return res.status(400).send("Hostname invalid!");
if (!version) return res.status(400).send("Server version is required!");
if (!serverType) return res.status(400).send("Server type is required!");
if (!memory) return res.status(400).send("Memory is required!");
if (
!!extraPorts &&
(!Array.isArray(extraPorts) ||
extraPorts.find((e) => typeof e !== "string" || e.length > 5))
)
return res
.status(400)
.send("Extra ports must be a list of strings with length of 5!");
// TODO: Impliment non creation time backups
if (
!!backupHost ||
@ -60,6 +42,27 @@ function payloadFilter(req, res) {
return "filtered";
}
function payloadFilter(req, res) {
const serverSpec = req.body;
if (!serverSpec) return res.sendStatus(400);
const { name, host, version, serverType, memory, extraPorts } = serverSpec;
if (!name) return res.status(400).send("Server name is required!");
if (!host) return res.status(400).send("Server host is required!");
if (!dnsRegex.test(host)) return res.status(400).send("Hostname invalid!");
if (!version) return res.status(400).send("Server version is required!");
if (!serverType) return res.status(400).send("Server type is required!");
if (!memory) return res.status(400).send("Memory is required!");
if (
!!extraPorts &&
(!Array.isArray(extraPorts) ||
extraPorts.find((e) => typeof e !== "string" || e.length > 5))
)
return res
.status(400)
.send("Extra ports must be a list of strings with length of 5!");
return "filtered";
}
function checkServerId(serverSpec) {
if (!serverSpec) throw new ExpressClientError({ c: 400 });
if (!serverSpec.id)
@ -68,6 +71,7 @@ function checkServerId(serverSpec) {
export async function createServer(req, res) {
if (payloadFilter(req, res) !== "filtered") return;
if (backupPayloadFilter(req, res) !== "filtered") return;
const serverSpec = req.body;
try {
const serverEntry = await createServerEntry(serverSpec);
@ -130,7 +134,12 @@ export async function getServer(req, res) {
return sendError(res)(e);
}
const { id } = serverSpec;
getServerEntry(id).then((s) => res.json(s));
getServerEntry(id).then((s) => {
delete s.backupKey;
s.backupBucket = s.backupPath;
delete s.backupPath;
res.json(s);
});
}
export async function modifyServer(req, res) {
@ -139,8 +148,6 @@ export async function modifyServer(req, res) {
try {
checkServerId(serverSpec);
const serverEntry = await modifyServerEntry(serverSpec);
console.log("NEW ENTRY");
console.log(serverEntry);
// await createServerResources(serverEntry);
res.sendStatus(200);
} catch (e) {

2
lib/database/queries/server-queries.js
View file

@ -35,7 +35,7 @@ export async function createServerEntry(serverSpec) {
server_type,
memory,
extra_ports,
backup_enabled: !!backup_interval, // We already verified the payload, so any backup key will work
backup_enabled: !!backup_interval ? true : null, // We already verified the payload, so any backup key will work
backup_host,
backup_bucket_path,
backup_id,