[FEATURE] Mutable Servers & Edit UI (#8)

Co-authored-by: Dunemask <dunemask@gmail.com>
Reviewed-on: https://gitea.dunemask.dev/elysium/minecluster/pulls/8

lib/controllers/lifecycle-controller.js

@@ -4,34 +4,19 @@ import {
   createServerEntry,
   deleteServerEntry,
   getServerEntry,
+  modifyServerEntry,
 } from "../database/queries/server-queries.js";
-import { sendError } from "../util/ExpressClientError.js";
+import ExpressClientError, { sendError } from "../util/ExpressClientError.js";
 import { toggleServer } from "../k8s/k8s-server-control.js";
 
 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;
-  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 ||
@@ -57,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)
@@ -65,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);
@@ -117,3 +124,34 @@ export async function stopServer(req, res) {
     .then(() => res.sendStatus(200))
     .catch(sendError(res));
 }
+
+export async function getServer(req, res) {
+  // Ensure spec is safe
+  const serverSpec = req.body;
+  try {
+    checkServerId(serverSpec);
+  } catch (e) {
+    return sendError(res)(e);
+  }
+  const { id } = serverSpec;
+  getServerEntry(id).then((s) => {
+    delete s.backupKey; // Do not let this ever get to an API client
+    s.backupBucket = s.backupPath;
+    delete s.backupPath;
+    delete s.backupId; // Do not let this ever get to an API client
+    res.json(s);
+  });
+}
+
+export async function modifyServer(req, res) {
+  if (payloadFilter(req, res) !== "filtered") return;
+  const serverSpec = req.body;
+  try {
+    checkServerId(serverSpec);
+    const serverEntry = await modifyServerEntry(serverSpec);
+    // await createServerResources(serverEntry);
+    res.sendStatus(200);
+  } catch (e) {
+    sendError(res)(e);
+  }
+}

lib/database/queries/server-queries.js

@@ -1,5 +1,10 @@
 import pg from "../postgres.js";
-import { deleteQuery, insertQuery, selectWhereQuery } from "../pg-query.js";
+import {
+  deleteQuery,
+  insertQuery,
+  selectWhereQuery,
+  updateWhereAllQuery,
+} from "../pg-query.js";
 import ExpressClientError from "../../util/ExpressClientError.js";
 const table = "servers";
 
@@ -30,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,
@@ -128,6 +133,45 @@ export async function getServerEntry(serverId) {
   }
 }
 
+export async function modifyServerEntry(serverSpec) {
+  const {
+    id,
+    name,
+    host,
+    version,
+    serverType: server_type,
+    memory,
+    extraPorts: extra_ports,
+    backupEnabled: backup_enabled,
+    backupHost: backup_host,
+    backupBucket: backup_bucket_path,
+    backupId: backup_id,
+    backupKey: backup_key,
+    backupInterval: backup_interval,
+  } = serverSpec;
+
+  const q = updateWhereAllQuery(
+    table,
+    {
+      name,
+      host,
+      version,
+      server_type,
+      memory,
+      extra_ports,
+      backup_enabled,
+      backup_host,
+      backup_bucket_path,
+      backup_id,
+      backup_key,
+      backup_interval,
+    },
+    { id },
+  );
+
+  return pg.query(q);
+}
+
 export async function getServerEntries() {
   const q = `SELECT * FROM ${table}`;
   return pg.query(q);

lib/routes/server-route.js

@@ -4,6 +4,8 @@ import {
   deleteServer,
   startServer,
   stopServer,
+  getServer,
+  modifyServer,
 } from "../controllers/lifecycle-controller.js";
 import {
   serverInstances,
@@ -18,4 +20,6 @@ router.post("/start", startServer);
 router.post("/stop", stopServer);
 router.get("/list", serverList);
 router.get("/instances", serverInstances);
+router.post("/blueprint", getServer);
+router.post("/modify", modifyServer);
 export default router;