[FEATURE] Basic System with file manager (#4)

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

lib/Minecluster.js

@@ -7,6 +7,7 @@ import { INFO, OK, logInfo } from "./util/logging.js";
 // Import Core Modules
 import buildRoutes from "./server/router.js";
 import injectSockets from "./server/sockets.js";
+import pg from "./database/postgres.js";
 
 // Constants
 const title = "MCL";
@@ -23,6 +24,7 @@ export default class Minecluster {
     logInfo(fig.textSync(title, "Larry 3D"));
     INFO("INIT", "Initializing...");
     this.app = express();
+    this.pg = pg;
     this.server = http.createServer(this.app);
     this.sockets = injectSockets(this.server, this.jobs);
     this.routes = buildRoutes(this.sockets);
@@ -31,11 +33,12 @@ export default class Minecluster {
   }
 
   async _connect() {
-    // await this.pg.connect();
+    await this.pg.connect();
   }
 
   start() {
     const mcl = this;
+
     return new Promise(async function init(res) {
       mcl._preinitialize();
       await mcl._connect();

lib/controllers/file-controller.js

@@ -0,0 +1,70 @@
+import {
+  createServerFolder,
+  getServerItem,
+  listServerFiles,
+  removeServerItem,
+  uploadServerItem,
+} from "../k8s/server-files.js";
+import { sendError } from "../util/ExpressClientError.js";
+
+export async function listFiles(req, res) {
+  const serverSpec = req.body;
+  if (!serverSpec) return res.sendStatus(400);
+  if (!serverSpec.name) return res.status(400).send("Server name required!");
+  listServerFiles(serverSpec)
+    .then((f) => {
+      const fileData = f.map((fi, i) => ({
+        name: fi.name,
+        isDir: fi.type === 2,
+        id: `${fi.name}-${i}`,
+        isHidden: fi.name.startsWith("."),
+        isSymLink: !!fi.link,
+        size: fi.size,
+      }));
+      res.json(fileData);
+    })
+    .catch(sendError(res));
+}
+
+export async function createFolder(req, res) {
+  const serverSpec = req.body;
+  if (!serverSpec) return res.sendStatus(400);
+  if (!serverSpec.name) return res.status(400).send("Server name required!");
+  if (!serverSpec.path) return res.status(400).send("Path required!");
+  createServerFolder(serverSpec)
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}
+
+export async function deleteItem(req, res) {
+  const serverSpec = req.body;
+  if (!serverSpec) return res.sendStatus(400);
+  if (!serverSpec.name) return res.status(400).send("Server name required!");
+  if (!serverSpec.path) return res.status(400).send("Path required!");
+  if (serverSpec.isDir === undefined || serverSpec.isDir === null)
+    return res.status(400).send("IsDIr required!");
+  removeServerItem(serverSpec)
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}
+
+export async function uploadItem(req, res) {
+  const serverSpec = req.body;
+  if (!serverSpec.name) return res.status(400).send("Server name required!");
+  if (!serverSpec.path) return res.status(400).send("Path required!");
+  uploadServerItem(serverSpec, req.file)
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}
+
+export async function getItem(req, res) {
+  const serverSpec = req.body;
+  if (!serverSpec.name) return res.status(400).send("Server name required!");
+  if (!serverSpec.path) return res.status(400).send("Path required!");
+  getServerItem(serverSpec, res)
+    .then(({ ds, ftpTransfer }) => {
+      ds.pipe(res).on("error", sendError(res));
+      return ftpTransfer;
+    })
+    .catch(sendError(res));
+}

lib/controllers/lifecycle-controller.js

@@ -0,0 +1,93 @@
+import createServerResources from "../k8s/server-create.js";
+import deleteServerResources from "../k8s/server-delete.js";
+import {
+  createServerEntry,
+  deleteServerEntry,
+  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 } =
+    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) {
+  if (!serverSpec) throw new ExpressClientError({ c: 400 });
+  if (!serverSpec.name)
+    throw new ExpressClientError({ c: 400, m: "Server name required!" });
+}
+
+export async function createServer(req, res) {
+  if (payloadFilter(req, res) !== "filtered") return;
+  const serverSpec = req.body;
+  try {
+    const serverSpecs = await getServerEntry(serverSpec.name);
+    if (serverSpecs.length !== 0) throw Error("Server already exists in DB!");
+    await createServerResources(serverSpec);
+    await createServerEntry(serverSpec);
+    res.sendStatus(200);
+  } catch (e) {
+    sendError(res)(e);
+  }
+}
+
+export async function deleteServer(req, res) {
+  // Ensure spec is safe
+  const serverSpec = req.body;
+  try {
+    checkServerName(serverSpec);
+  } catch (e) {
+    return sendError(res)(e);
+  }
+  const deleteEntry = deleteServerEntry(serverSpec.name);
+  const deleteResources = deleteServerResources(serverSpec);
+  Promise.all([deleteEntry, deleteResources])
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}
+
+export async function startServer(req, res) {
+  // Ensure spec is safe
+  const serverSpec = req.body;
+  try {
+    checkServerName(serverSpec);
+  } catch (e) {
+    return sendError(res)(e);
+  }
+  const { name } = serverSpec;
+  toggleServer(name, true)
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}
+
+export async function stopServer(req, res) {
+  // Ensure spec is safe
+  const serverSpec = req.body;
+  try {
+    checkServerName(serverSpec);
+  } catch (e) {
+    return sendError(res)(e);
+  }
+  const { name } = serverSpec;
+  toggleServer(name, false)
+    .then(() => res.sendStatus(200))
+    .catch(sendError(res));
+}

lib/controllers/status-controller.js

@@ -0,0 +1,18 @@
+import { getDeployments } from "../k8s/k8s-server-control.js";
+import { getInstances } from "../k8s/server-control.js";
+import { sendError } from "../util/ExpressClientError.js";
+
+export function serverList(req, res) {
+  getDeployments()
+    .then((sd) => res.json(sd.map((s) => s.metadata.name.substring(4))))
+    .catch((e) => {
+      ERR("SERVER CONTROL", e);
+      res.status(500).send("Couldn't get server list");
+    });
+}
+
+export function serverInstances(req, res) {
+  getInstances()
+    .then((i) => res.json(i))
+    .catch(sendError(res));
+}

lib/controllers/sub-controllers/console-controller.js

@@ -0,0 +1,65 @@
+// Imports
+import k8s from "@kubernetes/client-node";
+import { Rcon as RconClient } from "rcon-client";
+import stream from "stream";
+import { ERR, WARN } from "../../util/logging.js";
+
+// Kubernetes Configuration
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
+const namespace = process.env.MCL_SERVER_NAMESPACE;
+
+// Retrieves logs from the minecraft server container
+export async function webConsoleLogs(socket) {
+  const { serverName } = socket.mcs;
+  const podName = `mcl-${serverName}`;
+  const containerName = `${podName}-server`;
+  const podResponse = await k8sCore.listNamespacedPod(namespace);
+  const pods = podResponse.body.items.map((vp1) => vp1.metadata.name);
+  const mcsPods = pods.filter((p) => p.startsWith(podName));
+  if (mcsPods.length === 0)
+    throw Error(`Could not find a pod that starts with ${podName}`);
+  if (mcsPods.length > 1)
+    throw Error(`Multiple pods match the name ${podName}`);
+
+  const log = new k8s.Log(kc);
+  const logStream = new stream.PassThrough();
+  logStream.on("data", (chunk) =>
+    socket.emit("push", Buffer.from(chunk).toString()),
+  );
+  log
+    .log(namespace, mcsPods[0], containerName, logStream, {
+      follow: true,
+      pretty: false,
+      timestamps: false,
+    })
+    .catch((e) => ERR("CONSOLE CONTROLLER", "Error streaming logs", e));
+}
+
+// Creates an RCON connection to the minecraft container
+export async function webConsoleRcon(socket) {
+  if (socket.rconClient)
+    return VERB("RCON", "Socket already connected to RCON");
+  const rconSecret = `mcl-${socket.mcs.serverName}-rcon-secret`;
+  const rconRes = await k8sCore.readNamespacedSecret(rconSecret, namespace);
+  const rconPassword = Buffer.from(
+    rconRes.body.data["rcon-password"],
+    "base64",
+  ).toString("utf8");
+  const { serverName } = socket.mcs;
+  const rconHost = `mcl-${serverName}-rcon.${namespace}.svc.cluster.local`;
+  const rcon = new RconClient({
+    host: rconHost,
+    port: 25575,
+    password: rconPassword,
+  });
+  rcon.on("error", (error) => socket.emit("push", error));
+  try {
+    await rcon.connect();
+  } catch (error) {
+    socket.emit("push", "Could not connect RCON Input to server!");
+    WARN("RCON", `Could not connect to '${rconHost}'`);
+  }
+  socket.rconClient = rcon;
+}

lib/database/migrations/1_create_servers_table.sql

@@ -0,0 +1,12 @@
+CREATE SEQUENCE servers_id_seq;
+CREATE TABLE servers (
+  id bigint NOT NULL DEFAULT nextval('servers_id_seq') PRIMARY KEY,
+  name varchar(255) DEFAULT NULL,
+  host varchar(255) DEFAULT NULL,
+  version varchar(63) DEFAULT 'latest',
+  server_type varchar(63) DEFAULT 'VANILLA',
+  memory varchar(63) DEFAULT '512',
+  CONSTRAINT unique_name UNIQUE(name),
+  CONSTRAINT unique_host UNIQUE(host)
+);
+ALTER SEQUENCE servers_id_seq OWNED BY servers.id;

lib/database/pg-query.js

@@ -0,0 +1,121 @@
+const buildPostgresEntry = (entry) => {
+  const pgEntry = { ...entry };
+  Object.keys(pgEntry).forEach((col) => {
+    if (pgEntry[col] === undefined) delete pgEntry[col];
+  });
+  return pgEntry;
+};
+
+export const buildPostgresValue = (jsVar) => {
+  if (jsVar === null) return "null";
+  if (typeof jsVar === "string") return buildPostgresString(jsVar);
+  if (Array.isArray(jsVar) && jsVar.length === 0) return "null";
+  if (Array.isArray(jsVar) && isTypeArray(jsVar, "string"))
+    return buildPostgresStringArray(jsVar);
+  return jsVar;
+};
+
+const buildPostgresStringArray = (jsonArray) => {
+  if (jsonArray.length === 0) return null;
+  var pgArray = [...jsonArray];
+  var arrayString = "ARRAY [";
+  pgArray.forEach((e, i) => (pgArray[i] = `'${e}'`));
+  arrayString += pgArray.join(",");
+  arrayString += "]";
+  return arrayString;
+};
+
+const isTypeArray = (jsonArray, type) =>
+  jsonArray.every((e) => typeof e === type);
+
+const buildPostgresString = (jsonString) =>
+  (jsonString && `'${jsonString.replaceAll("'", "''")}'`) || null;
+
+export const insertQuery = (table, jsEntry) => {
+  if (typeof jsEntry !== "object") throw Error("PG Inserts must be objects!");
+  const entry = buildPostgresEntry(jsEntry);
+  const cols = Object.keys(entry);
+  cols.forEach((col, i) => {
+    entry[col] = buildPostgresValue(entry[col]);
+    cols[i] = `"${col}"`;
+  });
+  var query = `INSERT INTO ${table}(${cols.join(",")})\n`;
+  query += `VALUES(${Object.values(entry).join(",")})`;
+  return query;
+};
+
+export const deleteQuery = (table, jsEntry) => {
+  if (typeof jsEntry !== "object")
+    throw Error("PG Delete conditionals must be an object!");
+  const entry = buildPostgresEntry(jsEntry);
+  const cols = Object.keys(entry);
+  const conditionals = [];
+  for (var col of cols) {
+    entry[col] = buildPostgresValue(entry[col]);
+    if (entry[col] === "null") conditionals.push(`x.${col} IS NULL`);
+    else conditionals.push(`x.${col}=${entry[col]}`);
+  }
+  return `DELETE FROM ${table} x WHERE ${conditionals.join(" AND ")}`;
+};
+export const onConflictUpdate = (conflicts, updates) => {
+  if (!Array.isArray(conflicts)) throw Error("PG Conflicts must be an array!");
+  if (typeof updates !== "object") throw Error("PG Updates must be objects!");
+  const entry = buildPostgresEntry(updates);
+  var query = `ON CONFLICT (${conflicts.join(",")}) DO UPDATE SET\n`;
+  const cols = Object.keys(entry);
+  for (var col of cols) {
+    entry[col] = buildPostgresValue(entry[col]);
+  }
+  query += cols.map((c) => `${c}=${entry[c]}`).join(",");
+  return query;
+};
+export const clearTableQuery = (table) => {
+  return `TRUNCATE ${table}`;
+};
+
+export const selectWhereQuery = (table, jsEntry, joinWith) => {
+  if (typeof jsEntry !== "object") throw Error("PG Where must be an object!");
+  const where = buildPostgresEntry(jsEntry);
+  const cols = Object.keys(where);
+  var query = `SELECT * FROM ${table} AS x WHERE\n`;
+  for (var col of cols) {
+    where[col] = buildPostgresValue(where[col]);
+  }
+  return (query += cols.map((c) => `x.${c}=${where[c]}`).join(joinWith));
+};
+export const updateWhereQuery = (table, updates, wheres, joinWith) => {
+  if (typeof updates !== "object") throw Error("PG Updates must be an object!");
+  if (typeof wheres !== "object") throw Error("PG Wheres must be an object!");
+  const update = buildPostgresEntry(updates);
+  const where = buildPostgresEntry(wheres);
+  const updateCols = Object.keys(update);
+  const whereCols = Object.keys(where);
+  var query = `UPDATE ${table}\n`;
+  var updateQuery = updateCols
+    .map((c) => `${c} = ${buildPostgresValue(update[c])}`)
+    .join(",");
+  var whereQuery = whereCols
+    .map((c) => `${c} = ${buildPostgresValue(where[c])}`)
+    .join(joinWith);
+  return (query += `SET ${updateQuery} WHERE ${whereQuery}`);
+};
+export const updateWhereAnyQuery = (table, updates, wheres) =>
+  updateWhereQuery(table, updates, wheres, " OR ");
+export const updateWhereAllQuery = (table, updates, wheres) =>
+  updateWhereQuery(table, updates, wheres, " AND ");
+export const selectWhereAnyQuery = (table, where) =>
+  selectWhereQuery(table, where, " OR ");
+export const selectWhereAllQuery = (table, where) =>
+  selectWhereQuery(table, where, " AND ");
+
+export default {
+  selectWhereAnyQuery,
+  selectWhereAllQuery,
+  updateWhereAnyQuery,
+  updateWhereAllQuery,
+  insertQuery,
+  deleteQuery,
+  buildPostgresValue,
+  onConflictUpdate,
+  clearTableQuery,
+};

lib/database/postgres.js

@@ -0,0 +1,63 @@
+// Imports
+import path from "node:path";
+import { URL } from "node:url";
+import { migrate } from "postgres-migrations";
+import createPgp from "pg-promise";
+import moment from "moment";
+import { INFO, WARN, OK, VERB } from "../util/logging.js";
+
+// Environment Variables
+const {
+  MCL_POSTGRES_DATABASE: database,
+  MCL_POSTGRES_ENABLED: pgEnabled,
+  MCL_POSTGRES_HOST: host,
+  MCL_POSTGRES_PASSWORD: password,
+  MCL_POSTGRES_PORT: port,
+  MCL_POSTGRES_USER: user,
+} = process.env;
+
+// Postgres-promise Configuration
+// Ensure dates get saved as UTC date strings
+// This prevents the parser from doing strange datetime operations
+const pgp = createPgp();
+pgp.pg.types.setTypeParser(1114, (str) => moment.utc(str).format());
+
+// Database Config
+const dbConfig = {
+  database: database ?? "minecluster",
+  user: user ?? "postgres",
+  password: password ?? "postgres",
+  host: host ?? "localhost",
+  port: port ?? 5432,
+  ensureDatabaseExists: true,
+};
+
+const databaseDir = new URL(".", import.meta.url).pathname;
+const migrationsDir = path.resolve(databaseDir, "migrations/");
+
+const queryMock = (str) => INFO("POSTGRES MOCK", str);
+
+const connect = (pg) => async () => {
+  if (pgEnabled === "false") {
+    WARN("POSTGRES", "Postgres Disabled!");
+    return { query: queryMock };
+  }
+  VERB("POSTGRES", "Migrating...");
+  await migrate(dbConfig, migrationsDir);
+  // Override fake methods
+  const pgInstance = pgp(dbConfig);
+  for (var k in pgInstance) pg[k] = pgInstance[k];
+  VERB("POSTGRES", "Migrated Successfully!");
+  await pg.connect();
+  VERB("POSTGRES", "Postgres connected Successfully!");
+
+  OK("POSTGRES", `Connected to database ${dbConfig.database}!`);
+};
+
+const buildPostgres = () => {
+  var pg = { query: queryMock };
+  pg.connect = connect(pg);
+  return pg;
+};
+
+export default buildPostgres();

lib/database/queries/server-queries.js

@@ -0,0 +1,41 @@
+import pg from "../postgres.js";
+import { deleteQuery, insertQuery, selectWhereQuery } from "../pg-query.js";
+import ExpressClientError from "../../util/ExpressClientError.js";
+const table = "servers";
+
+const asExpressClientError = (e) => {
+  throw new ExpressClientError({ m: e.message, c: 409 });
+};
+
+export async function createServerEntry(serverSpec) {
+  const { name, host, version, serverType: server_type, memory } = serverSpec;
+  const q = insertQuery(table, { name, host, version, server_type, memory });
+  return pg.query(q).catch(asExpressClientError);
+}
+
+export async function deleteServerEntry(serverName) {
+  if (!serverName) asExpressClientError({ message: "Server Name Required!" });
+  const q = deleteQuery(table, { name: serverName });
+  return pg.query(q).catch(asExpressClientError);
+}
+
+export async function getServerEntry(serverName) {
+  if (!serverName) asExpressClientError({ message: "Server Name Required!" });
+  const q = selectWhereQuery(table, { name: serverName });
+  try {
+    const serverSpecs = await pg.query(q);
+    if (serverSpecs.length === 0) return [];
+    if (!serverSpecs.length === 1)
+      throw Error("Multiple servers found with the same name!");
+    const {
+      name,
+      host,
+      version,
+      server_type: serverType,
+      memory,
+    } = serverSpecs[0];
+    return { name, host, version, serverType, memory };
+  } catch (e) {
+    asExpressClientError(e);
+  }
+}

lib/k8s.js

@@ -1,8 +0,0 @@
-import k8s from "@kubernetes/client-node";
-const kc = new k8s.KubeConfig();
-kc.loadFromDefault();
-
-const k8sApi = kc.makeApiClient(k8s.CoreV1Api);
-k8sApi.listNamespacedPod("mc-garden-default").then((res) => {
-  console.log(res.body);
-});

lib/k8s/configs/containers/ftp-server.yml

@@ -0,0 +1,36 @@
+env:
+  - name: FTP_USER
+    value: "minecluster"
+  - name: FTP_PASS
+    value: "minecluster"
+image: garethflowers/ftp-server
+imagePullPolicy: IfNotPresent
+livenessProbe:
+exec:
+  command: ["echo"]
+failureThreshold: 20
+initialDelaySeconds: 30
+periodSeconds: 5
+successThreshold: 1
+timeoutSeconds: 1
+name: changeme-name-ftp
+ports: [] # Programatically add all the ports for easier readability, Ports include: 20,21,40000-400009
+readinessProbe:
+  exec:
+    command: ["echo"]
+    failureThreshold: 20
+    initialDelaySeconds: 30
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 1
+resources:
+  requests:
+    cpu: 50m
+    memory: 64Mi
+stdin: true
+terminationMessagePath: /dev/termination-log
+terminationMessagePolicy: File
+tty: true
+volumeMounts:
+  - mountPath: /home/minecluster
+    name: datadir

lib/k8s/configs/containers/minecraft-backup.yml

@@ -0,0 +1,63 @@
+env:
+  - name: SRC_DIR
+    value: /data
+  - name: BACKUP_NAME
+    value: world
+  - name: INITIAL_DELAY
+    value: 2m
+  - name: BACKUP_INTERVAL
+    value: 24h
+  - name: PRUNE_BACKUPS_DAYS
+    value: "2"
+  - name: PAUSE_IF_NO_PLAYERS
+    value: "true"
+  - name: SERVER_PORT
+    value: "25565"
+  - name: RCON_HOST
+    value: localhost
+  - name: RCON_PORT
+    value: "25575"
+  - name: RCON_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        key: rcon-password
+        name: changeme-rcon-secret
+  - name: RCON_RETRIES
+    value: "5"
+  - name: RCON_RETRY_INTERVAL
+    value: 10s
+  - name: EXCLUDES
+    value: "*.jar,cache,logs"
+  - name: BACKUP_METHOD
+    value: rclone
+  - name: DEST_DIR
+    value: /backups
+  - name: LINK_LATEST
+    value: "false"
+  - name: TAR_COMPRESS_METHOD
+    value: gzip
+  - name: ZSTD_PARAMETERS
+    value: -3 --long=25 --single-thread
+  - name: RCLONE_REMOTE
+    value: mc-dunemask-net
+  - name: RCLONE_DEST_DIR
+    value: /minecraft-backups/deltasmp-backups
+  - name: RCLONE_COMPRESS_METHOD
+    value: gzip
+image: itzg/mc-backup:latest
+imagePullPolicy: IfNotPresent
+name: mcs-deltasmp-minecraft-mc-backup
+resources:
+  requests:
+    cpu: 500m
+    memory: 512Mi
+terminationMessagePath: /dev/termination-log
+terminationMessagePolicy: File
+volumeMounts:
+  - mountPath: /data
+    name: datadir
+    readOnly: true
+  - mountPath: /backups
+    name: backupdir
+  - mountPath: /config/rclone
+    name: rclone-config

lib/k8s/configs/containers/minecraft-server.yml

@@ -0,0 +1,113 @@
+env:
+  # System Values
+  - name: JVM_OPTS
+  - name: JVM_XX_OPTS
+  - name: OVERRIDE_SERVER_PROPERTIES
+    value: "false"
+  - name: EULA
+    value: "TRUE"
+  # Updated at recreation
+  - name: MEMORY
+    value: 1024M
+  - name: TYPE
+    value: VANILLA
+  - name: VERSION
+    value: "latest"
+  # Set at creation but not updated on recreation
+  - name: DIFFICULTY
+    value: easy
+  - name: WHITELIST
+  - name: OPS
+  - name: MAX_PLAYERS
+    value: "20"
+  - name: MAX_WORLD_SIZE
+    value: "10000"
+  - name: ALLOW_NETHER
+    value: "true"
+  - name: ANNOUNCE_PLAYER_ACHIEVEMENTS
+    value: "true"
+  - name: ENABLE_COMMAND_BLOCK
+    value: "true"
+  - name: FORCE_GAMEMODE
+    value: "false"
+  - name: GENERATE_STRUCTURES
+    value: "true"
+  - name: HARDCORE
+    value: "false"
+  - name: MAX_BUILD_HEIGHT
+    value: "256"
+  - name: MAX_TICK_TIME
+    value: "60000"
+  - name: SPAWN_ANIMALS
+    value: "true"
+  - name: SPAWN_MONSTERS
+    value: "true"
+  - name: SPAWN_NPCS
+    value: "true"
+  - name: SPAWN_PROTECTION
+    value: "16"
+  - name: VIEW_DISTANCE
+    value: "10"
+  - name: SEED
+  - name: MODE
+    value: survival
+  - name: MOTD
+    value: §6Minecluster Hosting
+  - name: PVP
+    value: "true"
+  - name: LEVEL_TYPE
+    value: DEFAULT
+  - name: GENERATOR_SETTINGS
+  - name: LEVEL
+    value: world
+  - name: ONLINE_MODE
+    value: "true"
+  - name: ENABLE_RCON
+    value: "true"
+  - name: RCON_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        key: rcon-password
+        name: changeme-rcon-secret
+image: itzg/minecraft-server:latest
+imagePullPolicy: IfNotPresent
+livenessProbe:
+  exec:
+    command:
+      - mc-health
+  failureThreshold: 20
+  initialDelaySeconds: 30
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
+name: changeme-name-server
+ports:
+  - containerPort: 25565
+    name: minecraft
+    protocol: TCP
+  - containerPort: 25575
+    name: rcon
+    protocol: TCP
+readinessProbe:
+  exec:
+    command:
+      - mc-health
+  failureThreshold: 20
+  initialDelaySeconds: 30
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
+resources:
+  requests:
+    cpu: 500m
+    memory: 512Mi
+stdin: true
+terminationMessagePath: /dev/termination-log
+terminationMessagePolicy: File
+tty: true
+volumeMounts:
+  - mountPath: /data
+    name: datadir
+  - mountPath: /backups
+    name: backupdir
+    readOnly: true

lib/k8s/configs/rcon-secret.yml

@@ -3,6 +3,8 @@ data:
   rcon-password: UEphT3V2aGJlQjNvc3M0dElwQU5YTUZrSkltR1RsRVl0ZGx3elFqZjJLdVZrZXNtV0hja1VhUUd3bmZDcElpbA==
 kind: Secret
 metadata:
+  annotations:
+    minecluster.dunemask.net/server-name: changeme-server-name
   labels:
     app: changeme-app-label
   name: changeme-rcon-secret

lib/k8s/configs/rcon-svc.yml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    minecluster.dunemask.net/server-name: changeme-server-name
   labels:
     app: changeme-app
   name: changeme-rcon

lib/k8s/configs/server-deployment.yml

@@ -1,6 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+    minecluster.dunemask.net/server-name: changeme-server-name
   name: changeme-name
   namespace: changeme-namespace
 spec:
@@ -14,191 +16,18 @@ spec:
     type: Recreate
   template:
     metadata:
+      annotations:
+        minecluster.dunemask.net/server-name: changeme-server-name
       labels:
         app: changeme-app
     spec:
-      containers:
-        - env:
-            - name: SRC_DIR
-              value: /data
-            - name: BACKUP_NAME
-              value: world
-            - name: INITIAL_DELAY
-              value: 2m
-            - name: BACKUP_INTERVAL
-              value: 24h
-            - name: PRUNE_BACKUPS_DAYS
-              value: "2"
-            - name: PAUSE_IF_NO_PLAYERS
-              value: "true"
-            - name: SERVER_PORT
-              value: "25565"
-            - name: RCON_HOST
-              value: localhost
-            - name: RCON_PORT
-              value: "25575"
-            - name: RCON_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  key: rcon-password
-                  name: changeme-rcon-secret
-            - name: RCON_RETRIES
-              value: "5"
-            - name: RCON_RETRY_INTERVAL
-              value: 10s
-            - name: EXCLUDES
-              value: "*.jar,cache,logs"
-            - name: BACKUP_METHOD
-              value: rclone
-            - name: DEST_DIR
-              value: /backups
-            - name: LINK_LATEST
-              value: "false"
-            - name: TAR_COMPRESS_METHOD
-              value: gzip
-            - name: ZSTD_PARAMETERS
-              value: -3 --long=25 --single-thread
-            - name: RCLONE_REMOTE
-              value: mc-dunemask-net
-            - name: RCLONE_DEST_DIR
-              value: /minecraft-backups/deltasmp-backups
-            - name: RCLONE_COMPRESS_METHOD
-              value: gzip
-          image: itzg/mc-backup:latest
-          imagePullPolicy: IfNotPresent
-          name: mcs-deltasmp-minecraft-mc-backup
-          resources:
-            requests:
-              cpu: 500m
-              memory: 512Mi
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          volumeMounts:
-            - mountPath: /data
-              name: datadir
-              readOnly: true
-            - mountPath: /backups
-              name: backupdir
-            - mountPath: /config/rclone
-              name: rclone-config
-        - env:
-            - name: EULA
-              value: "TRUE"
-            - name: TYPE
-              value: VANILLA
-            - name: VERSION
-              value: "latest"
-            - name: DIFFICULTY
-              value: easy
-            - name: WHITELIST
-            - name: OPS
-            - name: ICON
-            - name: MAX_PLAYERS
-              value: "20"
-            - name: MAX_WORLD_SIZE
-              value: "10000"
-            - name: ALLOW_NETHER
-              value: "true"
-            - name: ANNOUNCE_PLAYER_ACHIEVEMENTS
-              value: "true"
-            - name: ENABLE_COMMAND_BLOCK
-              value: "true"
-            - name: FORCE_GAMEMODE
-              value: "false"
-            - name: GENERATE_STRUCTURES
-              value: "true"
-            - name: HARDCORE
-              value: "false"
-            - name: MAX_BUILD_HEIGHT
-              value: "256"
-            - name: MAX_TICK_TIME
-              value: "60000"
-            - name: SPAWN_ANIMALS
-              value: "true"
-            - name: SPAWN_MONSTERS
-              value: "true"
-            - name: SPAWN_NPCS
-              value: "true"
-            - name: SPAWN_PROTECTION
-              value: "16"
-            - name: VIEW_DISTANCE
-              value: "10"
-            - name: SEED
-            - name: MODE
-              value: survival
-            - name: MOTD
-              value: §6Minecluster Hosting
-            - name: PVP
-              value: "true"
-            - name: LEVEL_TYPE
-              value: DEFAULT
-            - name: GENERATOR_SETTINGS
-            - name: LEVEL
-              value: world
-            - name: MODPACK
-            - name: ONLINE_MODE
-              value: "true"
-            - name: MEMORY
-              value: 1024M
-            - name: JVM_OPTS
-            - name: JVM_XX_OPTS
-            - name: OVERRIDE_SERVER_PROPERTIES
-              value: "true"
-            - name: ENABLE_RCON
-              value: "true"
-            - name: RCON_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  key: rcon-password
-                  name: changeme-rcon-secret
-          image: itzg/minecraft-server:latest
-          imagePullPolicy: IfNotPresent
-          livenessProbe:
-            exec:
-              command:
-                - mc-health
-            failureThreshold: 20
-            initialDelaySeconds: 30
-            periodSeconds: 5
-            successThreshold: 1
-            timeoutSeconds: 1
-          name: changeme-name
-          ports:
-            - containerPort: 25565
-              name: minecraft
-              protocol: TCP
-            - containerPort: 25575
-              name: rcon
-              protocol: TCP
-          readinessProbe:
-            exec:
-              command:
-                - mc-health
-            failureThreshold: 20
-            initialDelaySeconds: 30
-            periodSeconds: 5
-            successThreshold: 1
-            timeoutSeconds: 1
-          resources:
-            requests:
-              cpu: 500m
-              memory: 512Mi
-          stdin: true
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          tty: true
-          volumeMounts:
-            - mountPath: /data
-              name: datadir
-            - mountPath: /backups
-              name: backupdir
-              readOnly: true
+      containers: []
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
-      securityContext:
-        fsGroup: 2000
-        runAsUser: 1000
+      # securityContext:
+      #   fsGroup: 2000
+      #   runAsUser: 1000
       terminationGracePeriodSeconds: 30
       volumes:
         - name: datadir

lib/k8s/configs/server-pvc.yml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  annotations:
+    minecluster.dunemask.net/server-name: changeme-server-name
   labels:
     service: changeme-service-name
   name: changeme-pvc-name

lib/k8s/configs/server-svc.yml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     ingress.qumine.io/hostname: changeme-url
     ingress.qumine.io/portname: minecraft
+    minecluster.dunemask.net/server-name: changeme-server-name
   labels:
     app: changeme-app
   name: changeme-name
@@ -13,11 +14,15 @@ spec:
   ipFamilies:
     - IPv4
   ipFamilyPolicy: SingleStack
-  ports:
+  ports: # Programatically add all FTP ports. Port range includes 20, 21, 40000-40001
     - name: minecraft
       port: 25565
       protocol: TCP
       targetPort: minecraft
+    # - name: ftp-data
+    #   port: 20
+    #   protocol: TCP
+    #   targetPort: ftp-data
   selector:
     app: changeme-app
   sessionAffinity: None

lib/k8s/k8s-server-control.js

@@ -0,0 +1,146 @@
+import k8s from "@kubernetes/client-node";
+import yaml from "js-yaml";
+import { VERB, ERR } from "../util/logging.js";
+import { getServerEntry } from "../database/queries/server-queries.js";
+import {
+  getFtpContainer,
+  getCoreServerContainer,
+  getBackupContainer,
+} from "./server-containers.js";
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+
+const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
+const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
+
+const namespace = process.env.MCL_SERVER_NAMESPACE;
+
+const loadYaml = (f) => yaml.load(fs.readFileSync(path.resolve(f), "utf8"));
+
+const mineclusterManaged = (o) =>
+  o.metadata &&
+  o.metadata.annotations &&
+  o.metadata.annotations["minecluster.dunemask.net/server-name"] !== undefined;
+
+export const serverMatch = (serverName) => (o) =>
+  o.metadata.annotations["minecluster.dunemask.net/server-name"] === serverName;
+
+export async function getDeployments() {
+  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
+  const serverDeployments = deploymentRes.body.items.filter(mineclusterManaged);
+  return serverDeployments;
+}
+
+export async function getServices() {
+  const serviceRes = await k8sCore.listNamespacedService(namespace);
+  const serverServices = serviceRes.body.items.filter(mineclusterManaged);
+  return serverServices;
+}
+
+export async function getSecrets() {
+  const secretRes = await k8sCore.listNamespacedSecret(namespace);
+  const serverSecrets = secretRes.body.items.filter(mineclusterManaged);
+  return serverSecrets;
+}
+
+export async function getVolumes() {
+  const volumeRes =
+    await k8sCore.listNamespacedPersistentVolumeClaim(namespace);
+  const serverVolumes = volumeRes.body.items.filter(mineclusterManaged);
+  return serverVolumes;
+}
+
+export function getServerAssets(serverName) {
+  const serverFilter = serverMatch(serverName);
+  return Promise.all([
+    getDeployments(),
+    getServices(),
+    getSecrets(),
+    getVolumes(),
+  ])
+    .then(([deps, svcs, scrts, vols]) => {
+      const deployments = deps.filter(serverFilter);
+      const services = svcs.filter(serverFilter);
+      const secrets = scrts.filter(serverFilter);
+      const volumes = vols.filter(serverFilter);
+
+      if (deployments.length > 1) throw Error("Deployment filter broken!");
+      if (volumes.length > 1) throw Error("Volume filter broken!");
+      if (secrets.length > 1) throw Error("Secrets broken!");
+      const serverAssets = {
+        deployment: deployments[0],
+        service: services.find(
+          (s) => s.metadata.name === `mcl-${serverName}-server`,
+        ),
+        volume: volumes[0],
+        rconService: services.find(
+          (s) => s.metadata.name === `mcl-${serverName}-rcon`,
+        ),
+        rconSecret: secrets[0],
+      };
+      for (var k in serverAssets) if (serverAssets[k]) return serverAssets;
+      // If no assets exist, return nothing
+    })
+    .catch((e) => ERR("SERVER ASSETS", e));
+}
+
+export async function getDeployment(serverName) {
+  const servers = await getDeployments();
+  const serverDeployment = servers.find(
+    (s) =>
+      s.metadata.annotations["minecluster.dunemask.net/server-name"] ===
+      serverName,
+  );
+  if (!serverDeployment)
+    throw Error(`MCL Deployment '${serverName}' could not be found!`);
+
+  return serverDeployment;
+}
+
+export async function getContainers(serverName) {
+  const deployment = await getDeployment(serverName);
+  return deployment.spec.template.spec.containers;
+}
+
+async function containerControl(serverName, deployment, scaleUp) {
+  const { containers } = deployment.spec.template.spec;
+  const depFtp = containers.find((c) => c.name.endsWith("-ftp"));
+  const depServer = containers.find((c) => c.name.endsWith("-server"));
+  const depBackup = containers.find((c) => c.name.endsWith("-backup"));
+  const serverSpec = await getServerEntry(serverName);
+  const ftpContainer = depFtp ?? getFtpContainer(serverSpec);
+  const serverContainer = depServer ?? getCoreServerContainer(serverSpec);
+  const backupContainer = depBackup ?? getBackupContainer(serverSpec);
+  if (scaleUp) return [ftpContainer, serverContainer];
+  return [ftpContainer];
+}
+
+export async function toggleServer(serverName, scaleUp = false) {
+  const deployment = await getDeployment(serverName);
+  deployment.spec.template.spec.containers = await containerControl(
+    serverName,
+    deployment,
+    scaleUp,
+  );
+  return k8sDeps.replaceNamespacedDeployment(
+    deployment.metadata.name,
+    namespace,
+    deployment,
+  );
+}
+
+export async function scaleDeployment(serverName, scaleUp = false) {
+  const deployment = await getDeployment(serverName);
+  if (deployment.spec.replicas === 1 && scaleUp)
+    return VERB(
+      "KSC",
+      `MCL Deployment '${serverName}' is already scaled! Ignoring scale adjustment.`,
+    );
+  deployment.spec.replicas = scaleUp ? 1 : 0;
+
+  return k8sDeps.replaceNamespacedDeployment(
+    deployment.metadata.name,
+    namespace,
+    deployment,
+  );
+}

lib/k8s/live-logging.js

@@ -1,30 +0,0 @@
-import stream from "stream";
-import k8s from "@kubernetes/client-node";
-import { ERR } from "../util/logging.js";
-
-const kc = new k8s.KubeConfig();
-kc.loadFromDefault();
-const k8sApi = kc.makeApiClient(k8s.CoreV1Api);
-export default async function liveLogging(socket, serverNamespace) {
-  const containerName = `mcl-${socket.mcs.serverName}`;
-  const podResponse = await k8sApi.listNamespacedPod(serverNamespace);
-  const pods = podResponse.body.items.map((vp1) => vp1.metadata.name);
-  const mcsPods = pods.filter((p) => p.startsWith(containerName));
-  if (mcsPods.length === 0)
-    throw Error(`Could not find a pod that starts with ${containerName}`);
-  if (mcsPods.length > 1)
-    throw Error(`Multiple pods match the name ${containerName}`);
-
-  const log = new k8s.Log(kc);
-  const logStream = new stream.PassThrough();
-  logStream.on("data", (chunk) =>
-    socket.emit("push", Buffer.from(chunk).toString())
-  );
-  log
-    .log(serverNamespace, mcsPods[0], containerName, logStream, {
-      follow: true,
-      pretty: false,
-      timestamps: false,
-    })
-    .catch((e) => ERR("K8S", e));
-}

lib/k8s/server-containers.js

@@ -0,0 +1,67 @@
+import fs from "node:fs";
+import path from "node:path";
+import yaml from "js-yaml";
+const loadYaml = (f) => yaml.load(fs.readFileSync(path.resolve(f), "utf8"));
+
+export function getFtpContainer(serverSpec) {
+  const { name } = serverSpec;
+  const ftpContainer = loadYaml("lib/k8s/configs/containers/ftp-server.yml");
+  ftpContainer.name = `mcl-${name}-ftp`;
+  const ftpPortList = [
+    { p: 20, n: "ftp-data" },
+    { p: 21, n: "ftp-commands" },
+  ];
+  for (var p = 40000; p <= 40009; p++)
+    ftpPortList.push({ p, n: `ftp-passive-${p - 40000}` });
+  ftpContainer.ports = ftpPortList.map(({ p: containerPort, n: name }) => ({
+    containerPort,
+    name,
+    protocol: "TCP",
+  }));
+  return ftpContainer;
+}
+
+export function getCoreServerContainer(serverSpec) {
+  const { name, version, serverType, memory } = serverSpec;
+  const container = loadYaml("lib/k8s/configs/containers/minecraft-server.yml");
+  // Container Updates
+  container.name = `mcl-${name}-server`;
+  container.resources.requests.memory = `${memory}Mi`;
+
+  const findEnv = (k) => container.env.find(({ name: n }) => n === k);
+  const updateEnv = (k, v) => (findEnv(k).value = v);
+
+  // Enviornment variables
+  updateEnv("TYPE", serverType);
+  updateEnv("VERSION", version);
+  updateEnv("MEMORY", `${memory}M`);
+  // RCON
+  const rs = `mcl-${name}-rcon-secret`;
+  findEnv("RCON_PASSWORD").valueFrom.secretKeyRef.name = rs;
+  return container;
+}
+
+export function getServerContainer(serverSpec) {
+  const { difficulty, gamemode, motd, maxPlayers, seed, ops, whitelist } =
+    serverSpec;
+  const container = getCoreServerContainer(serverSpec);
+
+  const findEnv = (k) => container.env.find(({ name: n }) => n === k);
+  const updateEnv = (k, v) => (findEnv(k).value = v);
+
+  // Enviornment variables
+  updateEnv("DIFFICULTY", difficulty);
+  updateEnv("MODE", gamemode);
+  updateEnv("MOTD", motd);
+  updateEnv("MAX_PLAYERS", maxPlayers);
+  updateEnv("SEED", seed);
+  updateEnv("OPS", ops);
+  updateEnv("WHITELIST", whitelist);
+
+  return container;
+}
+
+export function getBackupContainer(serverSpec) {
+  const container = loadYaml("lib/k8s/configs/containers/minecraft-backup.yml");
+  return container;
+}

lib/k8s/server-control.js

@@ -1,95 +1,86 @@
 import k8s from "@kubernetes/client-node";
+import {
+  getDeployment,
+  getDeployments,
+  getServerAssets,
+  scaleDeployment,
+} from "./k8s-server-control.js";
 import { ERR } from "../util/logging.js";
+import ExpressClientError from "../util/ExpressClientError.js";
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
 
-const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
-const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
 const k8sMetrics = new k8s.Metrics(kc);
+const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
 const namespace = process.env.MCL_SERVER_NAMESPACE;
 
-export async function startServer(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec) return res.sendStatus(400);
-  if (!serverSpec.name) return res.status(400).send("Server name required!");
+export async function startServerContainer(serverSpec) {
   const { name } = serverSpec;
-  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
-  const dep = deploymentRes.body.items.find(
-    (i) => i.metadata.name === `mcl-${name}`
-  );
-  if (!dep) return res.status(409).send("Server does not exist!");
-  if (dep.spec.replicas === 1)
-    return res.status(409).send("Server already started!");
-  dep.spec.replicas = 1;
-  k8sDeps.replaceNamespacedDeployment(`mcl-${name}`, namespace, dep);
-  res.sendStatus(200);
+  try {
+    await scaleDeployment(name, true);
+  } catch (e) {
+    ERR("SERVER CONTROL", e);
+    throw new ExpressClientError({
+      c: 500,
+      m: `Error updating server '${name}'!\n`,
+    });
+  }
 }
 
-export async function stopServer(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec) return res.sendStatus(400);
-  if (!serverSpec.name) return res.status(400).send("Server name required!");
+export async function stopServerContainer(serverSpec) {
   const { name } = serverSpec;
-  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
-  const dep = deploymentRes.body.items.find(
-    (i) => i.metadata.name === `mcl-${name}`
-  );
-  if (!dep) return res.status(409).send("Server does not exist!");
-  if (dep.spec.replicas === 0)
-    return res.status(409).send("Server already stopped!");
-  dep.spec.replicas = 0;
-  k8sDeps.replaceNamespacedDeployment(`mcl-${name}`, namespace, dep);
-  res.sendStatus(200);
+  try {
+    await scaleDeployment(name, false);
+  } catch (e) {
+    ERR("SERVER CONTROL", e);
+    throw new ExpressClientError({
+      c: 500,
+      m: `Error updating server '${name}'!`,
+    });
+  }
 }
 
-export async function serverList(req, res) {
-  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
-  const deployments = deploymentRes.body.items.map((i) => i.metadata.name);
-  // TODO Add an annotation and manage using that
-  const serverDeployments = deployments.filter((d) => d.startsWith("mcl-"));
-  res.json(serverDeployments.map((sd) => sd.substring(4)));
-}
-
-export async function getServers(req, res) {
-  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
-  const deployments = deploymentRes.body.items;
+export async function getInstances() {
+  const serverDeployments = await getDeployments();
   const podMetricsResponse = await k8sMetrics.getPodMetrics(namespace);
-  // TODO Add an annotation and manage using that
-  const serverDeployments = deployments.filter((d) =>
-    d.metadata.name.startsWith("mcl-")
-  );
   var name, metrics, started;
-  const servers = serverDeployments.map((s) => {
-    name = s.metadata.name.substring(4);
+  const serverInstances = serverDeployments.map((s) => {
+    name = s.metadata.annotations["minecluster.dunemask.net/server-name"];
     metrics = null;
-    started = !!s.spec.replicas;
+    started = !!s.spec.template.spec.containers.find((c) =>
+      c.name.includes(`mcl-${name}-server`),
+    );
     const pod = podMetricsResponse.items.find(({ metadata: md }) => {
       return md.labels && md.labels.app && md.labels.app === `mcl-${name}-app`;
     });
-    if (pod) {
+    if (started && pod) {
       const podCpus = pod.containers.map(
-        ({ usage }) => parseInt(usage.cpu) / 1_000_000
+        ({ usage }) => parseInt(usage.cpu) / 1_000_000,
       );
       const podMems = pod.containers.map(
-        ({ usage }) => parseInt(usage.memory) / 1024
+        ({ usage }) => parseInt(usage.memory) / 1024,
       );
       metrics = {
         cpu: Math.ceil(podCpus.reduce((a, b) => a + b)),
         memory: Math.ceil(podMems.reduce((a, b) => a + b)),
       };
     }
-
     return { name, metrics, started };
   });
+  return serverInstances;
+}
+
+export async function getNamespaceMetrics() {
+  const serverInstances = await getInstances();
   var clusterMetrics = { cpu: 0, memory: 0 };
   if (servers.length > 1) {
-    const clusterCpu = servers
+    const clusterCpu = serverInstances
       .map(({ metrics }) => (metrics ? metrics.cpu : 0))
       .reduce((a, b) => a + b);
-    const clusterMem = servers
+    const clusterMem = serverInstances
       .map(({ metrics }) => (metrics ? metrics.memory : 0))
       .reduce((a, b) => a + b);
     clusterMetrics = { cpu: clusterCpu, memory: clusterMem };
   }
-  res.json({ servers, clusterMetrics });
+  return clusterMetrics;
 }

lib/k8s/server-create.js

@@ -4,158 +4,130 @@ import k8s from "@kubernetes/client-node";
 import yaml from "js-yaml";
 import fs from "node:fs";
 import path from "node:path";
+import ExpressClientError from "../util/ExpressClientError.js";
+import {
+  getFtpContainer,
+  getServerContainer,
+  getBackupContainer,
+} from "./server-containers.js";
+
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
 const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
 const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
 const namespace = process.env.MCL_SERVER_NAMESPACE;
 
-function payloadFilter(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec) return res.sendStatus(400);
-  const { name, url, version, serverType, difficulty, gamemode, memory } =
-    serverSpec;
-  if (!name) return res.status(400).send("Server name is required!");
-  if (!url) return res.status(400).send("Server url 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";
-}
+const loadYaml = (f) => yaml.load(fs.readFileSync(path.resolve(f), "utf8"));
 
 function createRconSecret(serverSpec) {
   const { name } = serverSpec;
-  const rconYaml = yaml.load(
-    fs.readFileSync(path.resolve("lib/k8s/configs/rcon-secret.yml"), "utf8")
-  );
-
+  const rconYaml = loadYaml("lib/k8s/configs/rcon-secret.yml");
   // TODO: Dyamic rconPassword
   const rconPassword = bcrypt.hashSync(uuidv4(), 10);
   rconYaml.data["rcon-password"] = Buffer.from(rconPassword).toString("base64");
   rconYaml.metadata.labels.app = `mcl-${name}-app`;
   rconYaml.metadata.name = `mcl-${name}-rcon-secret`;
   rconYaml.metadata.namespace = namespace;
+  rconYaml.metadata.annotations["minecluster.dunemask.net/server-name"] = name;
   return rconYaml;
 }
 
 function createServerVolume(serverSpec) {
   const { name } = serverSpec;
-  const volumeYaml = yaml.load(
-    fs.readFileSync(path.resolve("lib/k8s/configs/server-pvc.yml"), "utf8")
-  );
+  const volumeYaml = loadYaml("lib/k8s/configs/server-pvc.yml");
   volumeYaml.metadata.labels.service = `mcl-${name}-server`;
   volumeYaml.metadata.name = `mcl-${name}-volume`;
   volumeYaml.metadata.namespace = namespace;
+  volumeYaml.metadata.annotations["minecluster.dunemask.net/server-name"] =
+    name;
   volumeYaml.spec.resources.requests.storage = "1Gi"; // TODO: Changeme
   return volumeYaml;
 }
 
 function createServerDeploy(serverSpec) {
-  const {
-    name,
-    version,
-    serverType,
-    difficulty,
-    gamemode,
-    memory,
-    motd,
-    maxPlayers,
-    seed,
-    modpack,
-    ops,
-    whitelist,
-  } = serverSpec;
-  const deployYaml = yaml.load(
-    fs.readFileSync(
-      path.resolve("lib/k8s/configs/server-deployment.yml"),
-      "utf8"
-    )
-  );
-  deployYaml.metadata.name = `mcl-${name}`;
-  deployYaml.metadata.namespace = namespace;
-  deployYaml.spec.replicas = 0; // TODO: User control for autostart
+  const { name, host } = serverSpec;
+  const deployYaml = loadYaml("lib/k8s/configs/server-deployment.yml");
+  const { metadata } = deployYaml;
+  const serverContainer = getServerContainer(serverSpec);
+  const backupContainer = getBackupContainer(serverSpec);
+  const ftpContainer = getFtpContainer(serverSpec);
+
+  // Configure Metadata;
+  metadata.name = `mcl-${name}`;
+  metadata.namespace = namespace;
+  metadata.annotations["minecluster.dunemask.net/server-name"] = name;
+  deployYaml.metadata = metadata;
+
+  // Configure Lables & Selectors
   deployYaml.spec.selector.matchLabels.app = `mcl-${name}-app`;
   deployYaml.spec.template.metadata.labels.app = `mcl-${name}-app`;
-  deployYaml.spec.template.spec.containers.splice(0, 1); //TODO: Currently removing backup container
-  const serverContainer = deployYaml.spec.template.spec.containers[0];
 
-  // Enviornment variables
-  serverContainer.env.find(({ name: n }) => n === "TYPE").value = serverType;
-  serverContainer.env.find(({ name: n }) => n === "VERSION").value = version;
-  serverContainer.env.find(({ name: n }) => n === "DIFFICULTY").value =
-    difficulty;
-  serverContainer.env.find(({ name: n }) => n === "MODE").value = gamemode;
-  serverContainer.env.find(({ name: n }) => n === "MOTD").value = motd;
-  serverContainer.env.find(({ name: n }) => n === "MAX_PLAYERS").value =
-    maxPlayers;
-  serverContainer.env.find(({ name: n }) => n === "SEED").value = seed;
-  serverContainer.env.find(({ name: n }) => n === "OPS").value = ops;
-  serverContainer.env.find(({ name: n }) => n === "WHITELIST").value =
-    whitelist;
-  serverContainer.env.find(
-    ({ name: n }) => n === "MEMORY"
-  ).value = `${memory}M`;
-  if (version !== "VANILLA")
-    delete serverContainer.env.find(({ name: n }) => n === "MODPACK").value;
-  else
-    serverContainer.env.find(({ name: n }) => n === "MODPACK").value = modpack;
-
-  serverContainer.env.find(
-    ({ name }) => name === "RCON_PASSWORD"
-  ).valueFrom.secretKeyRef.name = `mcl-${name}-rcon-secret`;
-  // Server Container Name
-  serverContainer.name = `mcl-${name}`;
-  // Resources
-  serverContainer.resources.requests.memory = `${memory}Mi`;
-  // serverContainer.resources.limits.memory = `${memory}Mi`; // TODO Allow for limits beyond initial startup
   // Volumes
   deployYaml.spec.template.spec.volumes.find(
-    ({ name }) => name === "datadir"
+    ({ name }) => name === "datadir",
   ).persistentVolumeClaim.claimName = `mcl-${name}-volume`;
-  deployYaml.spec.template.spec.containers[0] = serverContainer;
+
+  // Apply Containers  TODO: User control for autostart
+  deployYaml.spec.template.spec.containers.push(serverContainer);
+  deployYaml.spec.template.spec.containers.push(ftpContainer);
+  deployYaml.spec.replicas = 1;
   return deployYaml;
 }
 
 function createServerService(serverSpec) {
-  const { name, url } = serverSpec;
-  const serviceYaml = yaml.load(
-    fs.readFileSync(path.resolve("lib/k8s/configs/server-svc.yml"), "utf8")
-  );
-  serviceYaml.metadata.annotations["ingress.qumine.io/hostname"] = url;
+  const { name, host } = serverSpec;
+  const serviceYaml = loadYaml("lib/k8s/configs/server-svc.yml");
+  serviceYaml.metadata.annotations["ingress.qumine.io/hostname"] = host;
+  serviceYaml.metadata.annotations["mc-router.itzg.me/externalServerName"] =
+    host;
   serviceYaml.metadata.labels.app = `mcl-${name}-app`;
   serviceYaml.metadata.name = `mcl-${name}-server`;
   serviceYaml.metadata.namespace = namespace;
+  serviceYaml.metadata.annotations["minecluster.dunemask.net/server-name"] =
+    name;
   serviceYaml.spec.selector.app = `mcl-${name}-app`;
+  // Port List:
+  const serverPortList = [{ p: 25565, n: "minecraft" }];
+
+  // Apply FTP Port List
+  const ftpPortList = [
+    { p: 20, n: "ftp-data" },
+    { p: 21, n: "ftp-commands" },
+  ];
+  for (var p = 40000; p <= 40009; p++)
+    ftpPortList.push({ p, n: `ftp-passive-${p - 40000}` });
+
+  const portList = [...serverPortList, ...ftpPortList];
+  serviceYaml.spec.ports = portList.map(({ p: port, n: name }) => ({
+    port,
+    name,
+    protocol: "TCP",
+    targetPort: port,
+  }));
   return serviceYaml;
 }
 
 function createRconService(serverSpec) {
-  const { name, url } = serverSpec;
-  const rconSvcYaml = yaml.load(
-    fs.readFileSync(path.resolve("lib/k8s/configs/rcon-svc.yml"), "utf8")
-  );
+  const { name } = serverSpec;
+  const rconSvcYaml = loadYaml("lib/k8s/configs/rcon-svc.yml");
   rconSvcYaml.metadata.labels.app = `mcl-${name}-app`;
   rconSvcYaml.metadata.name = `mcl-${name}-rcon`;
   rconSvcYaml.metadata.namespace = namespace;
+  rconSvcYaml.metadata.annotations["minecluster.dunemask.net/server-name"] =
+    name;
   rconSvcYaml.spec.selector.app = `mcl-${name}-app`;
   return rconSvcYaml;
 }
 
-export default async function createServer(req, res) {
-  if (payloadFilter(req, res) !== "filtered") return;
-  const serverSpec = req.body;
+export default async function createServerResources(serverSpec) {
   const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
   const deployments = deploymentRes.body.items.map((i) => i.metadata.name);
   if (deployments.includes(`mcl-${serverSpec.name}`))
-    return res.status(409).send("Server already exists!");
+    throw new ExpressClientError({ m: "Server already exists!", c: 409 });
   const pvcRes = await k8sCore.listNamespacedPersistentVolumeClaim(namespace);
   const pvcs = pvcRes.body.items.map((i) => i.metadata.name);
   if (pvcs.includes(`mcl-${serverSpec.name}-volume`))
-    return res.status(409).send("Server PVC already exists!");
+    throw new ExpressClientError({ m: "Server PVC already exists!", c: 409 });
   const rconSecret = createRconSecret(serverSpec);
   const serverVolume = createServerVolume(serverSpec);
   const serverDeploy = createServerDeploy(serverSpec);
@@ -166,6 +138,4 @@ export default async function createServer(req, res) {
   k8sCore.createNamespacedService(namespace, serverService);
   k8sCore.createNamespacedService(namespace, rconService);
   k8sDeps.createNamespacedDeployment(namespace, serverDeploy);
-
-  res.sendStatus(200);
 }

lib/k8s/server-delete.js

@@ -1,5 +1,7 @@
 import k8s from "@kubernetes/client-node";
 import { ERR } from "../util/logging.js";
+import { getServerAssets } from "./k8s-server-control.js";
+import ExpressClientError from "../util/ExpressClientError.js";
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
 
@@ -7,49 +9,52 @@ const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
 const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
 const namespace = process.env.MCL_SERVER_NAMESPACE;
 
-const deleteError = (res) => (err) => {
-  res.status(500).send("Error deleting a resource!");
+const deleteError = (err) => {
   ERR("K8S", "An error occurred while deleting a resource", err);
+  throw new ExpressClientError({
+    c: 500,
+    m: "Error deleting a resource!\n" + err,
+  });
 };
 
-export default async function deleteServer(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec) return res.sendStatus(400);
-  if (!serverSpec.name) return res.status(400).send("Server name required!");
+function deleteOnExist(o, fn) {
+  if (o) return fn(o.metadata.name);
+}
+
+export default async function deleteServerResources(serverSpec) {
   const { name } = serverSpec;
   // Ensure deployment exists
-  const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
-  const deployments = deploymentRes.body.items.map((i) => i.metadata.name);
-  if (!deployments.includes(`mcl-${serverSpec.name}`))
-    return res.status(409).send("Server does not exist!");
+  const server = await getServerAssets(name);
+  if (!server)
+    throw new ExpressClientError({
+      c: 404,
+      m: "No Resources for that server were found!",
+    });
+
   // Delete in reverse order
-  const deleteDeploy = k8sDeps.deleteNamespacedDeployment(
-    `mcl-${serverSpec.name}`,
-    namespace
+  const deleteDeploy = deleteOnExist(server.deployment, (name) =>
+    k8sDeps.deleteNamespacedDeployment(name, namespace),
   );
-  const deleteService = k8sCore.deleteNamespacedService(
-    `mcl-${name}-server`,
-    namespace
+
+  const deleteService = deleteOnExist(server.service, (name) =>
+    k8sCore.deleteNamespacedService(name, namespace),
   );
-  const deleteRconService = k8sCore.deleteNamespacedService(
-    `mcl-${name}-rcon`,
-    namespace
+  const deleteRconService = deleteOnExist(server.rconService, (name) =>
+    k8sCore.deleteNamespacedService(name, namespace),
   );
-  await deleteDeploy.catch(deleteError(res));
-  const deleteRconSecret = k8sCore.deleteNamespacedSecret(
-    `mcl-${name}-rcon-secret`,
-    namespace
+  if (deleteDeploy) await deleteDeploy.catch(deleteError);
+
+  const deleteRconSecret = deleteOnExist(server.rconSecret, (name) =>
+    k8sCore.deleteNamespacedSecret(name, namespace),
   );
-  const deleteVolume = k8sCore.deleteNamespacedPersistentVolumeClaim(
-    `mcl-${name}-volume`,
-    namespace
+  const deleteVolume = deleteOnExist(server.volume, (name) =>
+    k8sCore.deleteNamespacedPersistentVolumeClaim(name, namespace),
   );
-  Promise.all([
+
+  return Promise.all([
     deleteService,
     deleteRconService,
     deleteRconSecret,
     deleteVolume,
-  ])
-    .then(() => res.sendStatus(200))
-    .catch(deleteError(res));
+  ]).catch(deleteError);
 }

lib/k8s/server-files.js

@@ -0,0 +1,97 @@
+import ftp from "basic-ftp";
+import { ERR } from "../util/logging.js";
+import { getServerAssets } from "./k8s-server-control.js";
+import ExpressClientError from "../util/ExpressClientError.js";
+import { Readable, Writable, Transform } from "node:stream";
+
+const namespace = process.env.MCL_SERVER_NAMESPACE;
+
+const pathSecurityCheck = (path) => {
+  if (!path.startsWith("."))
+    throw new ExpressClientError({
+      m: "Only relative directories can be created",
+      c: 409,
+    });
+};
+
+const handleError = (e) => {
+  ERR("SERVER FILES", "Error occurred while preforming FTP operation!", e);
+  throw new ExpressClientError({
+    c: 500,
+    m: "Error occurred while performing FTP operation!",
+  });
+};
+
+export async function getFtpClient(serverService) {
+  const { name } = serverService.metadata;
+  const client = new ftp.Client();
+  await client.access({
+    host: `${name}.${namespace}.svc.cluster.local`,
+    user: "minecluster",
+    password: "minecluster",
+  });
+  return client;
+}
+
+export async function useServerFtp(serverSpec, fn) {
+  const { name } = serverSpec;
+  const server = await getServerAssets(name);
+  if (!server)
+    throw new ExpressClientError({
+      c: 404,
+      m: "No resources for that server were found!",
+    });
+  if (!server.service)
+    throw new ExpressClientError({
+      c: 409,
+      m: "Service doesn't exist, please contact your hosting provider!",
+    });
+  const client = await getFtpClient(server.service);
+  const result = await fn(client);
+  client.close();
+  return result;
+}
+
+export async function listServerFiles(serverSpec) {
+  const { path } = serverSpec;
+  const files = useServerFtp(serverSpec, async (c) => await c.list(path)).catch(
+    handleError,
+  );
+  return files;
+}
+
+export async function createServerFolder(serverSpec) {
+  const { path } = serverSpec;
+  pathSecurityCheck(path);
+  await useServerFtp(serverSpec, async (c) => c.ensureDir(path)).catch(
+    handleError,
+  );
+}
+
+export async function removeServerItem(serverSpec) {
+  const { path, isDir } = serverSpec;
+  pathSecurityCheck(path);
+  await useServerFtp(serverSpec, async (c) => {
+    if (isDir) await c.removeDir(path);
+    else await c.remove(path);
+  }).catch(handleError);
+}
+
+export async function uploadServerItem(serverSpec, file) {
+  const fileStream = Readable.from(file.buffer);
+  const { path } = serverSpec;
+  pathSecurityCheck(path);
+  await useServerFtp(serverSpec, async (c) => {
+    await c.uploadFrom(fileStream, `${path}/${file.originalname}`);
+  }).catch(handleError);
+}
+
+export async function getServerItem(serverSpec, writableStream) {
+  const { path } = serverSpec;
+  const ds = new Transform({ transform: (c, e, cb) => cb(null, c) });
+  pathSecurityCheck(path);
+  const ftpTransfer = useServerFtp(serverSpec, async (c) => {
+    await c.downloadTo(ds, path);
+  }).catch(handleError);
+  return { ds, ftpTransfer };
+}

lib/routes/error-route.js

@@ -0,0 +1,17 @@
+export function logErrors(err, req, res, next) {
+  console.error(err.stack);
+  next(err);
+}
+
+export function clientErrorHandler(err, req, res, next) {
+  if (req.xhr) {
+    res.status(500).send({ error: "Something failed!" });
+  } else {
+    next(err);
+  }
+}
+
+export function errorHandler(err, req, res, next) {
+  res.status(500);
+  res.render("error", { error: err });
+}

lib/routes/files-route.js

@@ -0,0 +1,21 @@
+import { Router, json as jsonMiddleware } from "express";
+import multer from "multer";
+import {
+  createFolder,
+  deleteItem,
+  listFiles,
+  uploadItem,
+  getItem,
+} from "../controllers/file-controller.js";
+
+const router = Router();
+router.use(jsonMiddleware());
+const multerMiddleware = multer();
+
+router.post("/list", listFiles);
+router.post("/folder", createFolder);
+router.delete("/item", deleteItem);
+router.post("/item", getItem);
+router.post("/upload", multerMiddleware.single("file"), uploadItem);
+
+export default router;

lib/routes/react-route.js

@@ -3,6 +3,6 @@ import path from "path";
 const router = Router();
 router.use("/", express.static(path.resolve("./build")));
 router.get("/*", (req, res) =>
-  res.sendFile(path.resolve("./build/index.html"))
+  res.sendFile(path.resolve("./build/index.html")),
 );
 export default router;

lib/routes/server-route.js

@@ -1,12 +1,14 @@
 import { Router, json as jsonMiddleware } from "express";
 import {
+  createServer,
+  deleteServer,
   startServer,
   stopServer,
+} from "../controllers/lifecycle-controller.js";
+import {
+  serverInstances,
   serverList,
-  getServers,
-} from "../k8s/server-control.js";
-import createServer from "../k8s/server-create.js";
-import deleteServer from "../k8s/server-delete.js";
+} from "../controllers/status-controller.js";
 const router = Router();
 router.use(jsonMiddleware());
 // Routes
@@ -15,5 +17,5 @@ router.delete("/delete", deleteServer);
 router.post("/start", startServer);
 router.post("/stop", stopServer);
 router.get("/list", serverList);
-router.get("/instances", getServers);
+router.get("/instances", serverInstances);
 export default router;

lib/routes/system-route.js

@@ -7,6 +7,8 @@ kc.loadFromDefault();
 const k8sApi = kc.makeApiClient(k8s.CoreV1Api);
 // Get Routes
 router.get("/available", (req, res) => {
+  return res.json({ cpu: 8000, memory: 16000 });
+  // TODO Workaround to detect available
   k8sApi.listNode().then((nodeRes) => {
     const nodeAllocatable = nodeRes.body.items.map((i) => i.status.allocatable);
     const nodeResources = nodeAllocatable.map(({ cpu, memory }) => ({

lib/server/rcon.js

@@ -1,31 +0,0 @@
-import k8s from "@kubernetes/client-node";
-import { Rcon as RconClient } from "rcon-client";
-import { ERR } from "../util/logging.js";
-const kc = new k8s.KubeConfig();
-kc.loadFromDefault();
-const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
-const namespace = process.env.MCL_SERVER_NAMESPACE;
-
-export default async function rconInterface(socket) {
-  if (socket.rconClient)
-    return VERB("RCON", "Socket already connected to RCON");
-  const rconSecret = `mcl-${socket.mcs.serverName}-rcon-secret`;
-  const rconRes = await k8sCore.readNamespacedSecret(rconSecret, namespace);
-  const rconPassword = Buffer.from(
-    rconRes.body.data["rcon-password"],
-    "base64"
-  ).toString("utf8");
-  const rconHost = `mcl-${socket.mcs.serverName}-rcon`;
-  const rcon = new RconClient({
-    host: rconHost,
-    port: 25575,
-    password: rconPassword,
-  });
-  rcon.on("error", (error) => socket.emit("push", error));
-  try {
-    await rcon.connect();
-  } catch (error) {
-    ERR("RCON", `Could not connect to 'mcl-${socket.mcs.serverName}-rcon'`);
-  }
-  socket.rconClient = rcon;
-}

lib/server/router.js

@@ -5,7 +5,13 @@ import express from "express";
 import vitals from "../routes/vitals-route.js";
 import systemRoute from "../routes/system-route.js";
 import serverRoute from "../routes/server-route.js";
+import filesRoute from "../routes/files-route.js";
 import reactRoute from "../routes/react-route.js";
+import {
+  logErrors,
+  clientErrorHandler,
+  errorHandler,
+} from "../routes/error-route.js";
 
 export default function buildRoutes(pg, skio) {
   const router = express.Router();
@@ -18,7 +24,11 @@ export default function buildRoutes(pg, skio) {
   // Routes
   router.use("/api/system", systemRoute);
   router.use("/api/server", serverRoute);
-  router.use(["/mcl","/mcl/*"], reactRoute); // Static Build Route
+  router.use("/api/files", filesRoute);
+  router.use(["/mcl", "/mcl/*"], reactRoute); // Static Build Route
+  /*router.use(logErrors);
+  router.use(clientErrorHandler);
+  router.use(errorHandler);*/
 
   return router;
 }

lib/server/sockets.js

@@ -1,9 +1,9 @@
 import { Server as Skio } from "socket.io";
 import { VERB, WARN, ERR } from "../util/logging.js";
-import liveLogging from "../k8s/live-logging.js";
-import rconInterface from "./rcon.js";
-
-const namespace = process.env.MCL_SERVER_NAMESPACE;
+import {
+  webConsoleLogs,
+  webConsoleRcon,
+} from "../controllers/sub-controllers/console-controller.js";
 
 async function rconSend(socket, m) {
   if (!socket.rconClient)
@@ -20,8 +20,8 @@ const socketConnect = async (io, socket) => {
   VERB("WS", "Websocket connecting");
   socket.mcs = { serverName: socket.handshake.query.serverName };
   try {
-    await liveLogging(socket, namespace);
-    await rconInterface(socket);
+    await webConsoleLogs(socket);
+    await webConsoleRcon(socket);
     socket.on("msg", (m) => rconSend(socket, m));
   } catch (err) {
     ERR("SOCKETS", err);

lib/storage/s3-integration.js

@@ -0,0 +1,34 @@
+import multer from "multer";
+import multerS3 from "multer-s3";
+import AWS from "aws-sdk";
+
+// Environment Variables
+const {
+  MCL_S3_ENDPOINT: s3Endpoint,
+  MCL_S3_ACCESS_KEY_ID: s3KeyId,
+  MCL_S3_ACCESS_KEY: s3Key,
+} = process.env;
+
+export const mcl = "mcl";
+
+export const s3 = new AWS.S3({
+  endpoint: s3Endpoint,
+  accessKeyId: s3KeyId,
+  secretAccessKey: s3Key,
+  sslEnabled: true,
+  s3ForcePathStyle: true,
+});
+
+const storage = multerS3({
+  s3,
+  bucket,
+  contentType: multerS3.AUTO_CONTENT_TYPE,
+  metadata: (req, file, cb) => {
+    cb(null, { fieldName: file.fieldname });
+  },
+  key: (req, file, cb) => {
+    cb(null, Date.now().toString());
+  },
+});
+
+export const upload = multer({ storage });

lib/util/ExpressClientError.js

@@ -0,0 +1,28 @@
+import { VERB } from "./logging.js";
+
+export default class ExpressClientError extends Error {
+  constructor(message, clientOptions = {}) {
+    var msg;
+    if (typeof message === "object" && message.m !== undefined) msg = message.m;
+    else if (typeof message === "object") msg = "Unknown Express Client Error!";
+    super(msg);
+    if (typeof message === "object") this.clientOptions = message;
+    else this.clientOptions = { message: msg, ...clientOptions };
+  }
+
+  sendError(res) {
+    if (!this.clientOptions.m && this.clientOptions.c)
+      res.sendStatus(this.clientOptions.c);
+    else res.status(this.clientOptions.c ?? 500).send(this.toString());
+  }
+
+  toString() {
+    return this.message;
+  }
+}
+
+export const sendError = (res) => (e) => {
+  VERB("V", e);
+  if (e instanceof ExpressClientError) e.sendError(res);
+  else res.status(500).send(e);
+};