[REV] Adjusted servers table

This commit is contained in:
Dunemask 2023-12-22 11:59:08 -07:00
parent f732710c7c
commit e94aca7c96
3 changed files with 19 additions and 23 deletions

View file

@ -6,32 +6,24 @@ import {
getServerEntry,
} from "../database/queries/server-queries.js";
import { sendError } from "../util/ExpressClientError.js";
import {
startServerContainer,
stopServerContainer,
} from "../k8s/server-control.js";
import { toggleServer } from "../k8s/k8s-server-control.js";
function payloadFilter(req, res) {
const serverSpec = req.body;
if (!serverSpec) return res.sendStatus(400);
const { name, host, version, serverType, difficulty, gamemode, memory } =
const { name, host, version, serverType, memory } =
serverSpec;
if (!name) return res.status(400).send("Server name is required!");
if (!host) return res.status(400).send("Server host is required!");
if (!version) return res.status(400).send("Server version is required!");
if (!difficulty)
return res.status(400).send("Server difficulty is required!");
if (!serverType) return res.status(400).send("Server type is required!");
if (!gamemode) return res.status(400).send("Server Gamemode is required!");
if (!memory) return res.status(400).send("Memory is required!");
req.body.name = req.body.name.toLowerCase();
return "filtered";
}
function checkServerName(serverSpec) {
function checkServerHost(serverSpec) {
if (!serverSpec) throw new ExpressClientError({ c: 400 });
if (!serverSpec.name)
if (!serverSpec.host)
throw new ExpressClientError({ c: 400, m: "Server name required!" });
}
@ -39,7 +31,7 @@ export async function createServer(req, res) {
if (payloadFilter(req, res) !== "filtered") return;
const serverSpec = req.body;
try {
const serverSpecs = await getServerEntry(serverSpec.name);
const serverSpecs = await getServerEntry(serverSpec.id);
if (serverSpecs.length !== 0) throw Error("Server already exists in DB!");
await createServerResources(serverSpec);
await createServerEntry(serverSpec);
@ -53,11 +45,11 @@ export async function deleteServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerName(serverSpec);
checkServerHost(serverSpec);
} catch (e) {
return sendError(res)(e);
}
const deleteEntry = deleteServerEntry(serverSpec.name);
const deleteEntry = deleteServerEntry(serverSpec.id);
const deleteResources = deleteServerResources(serverSpec);
Promise.all([deleteEntry, deleteResources])
.then(() => res.sendStatus(200))
@ -68,7 +60,7 @@ export async function startServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerName(serverSpec);
checkServerHost(serverSpec);
} catch (e) {
return sendError(res)(e);
}
@ -82,7 +74,7 @@ export async function stopServer(req, res) {
// Ensure spec is safe
const serverSpec = req.body;
try {
checkServerName(serverSpec);
checkServerHost(serverSpec);
} catch (e) {
return sendError(res)(e);
}