Custom prefix support, add Valheim support and QoL update (#64)

- Add Custom prefix support
- Add shared utilities between main code base and configuration package
- Add Valheim config pack
- Bump version to 1.3.0

Author: 314pies

lambda/discord_command_processer/index.ts

@@ -1,6 +1,7 @@
 import { Context } from 'aws-lambda';
 import * as AWS from 'aws-sdk';
 import axios from 'axios';
+import { getFullDiscordCommand } from '../shared_util';
 
 const InstanceIds = [process.env.INSTANCE_ID!];
 const ec2_instance_region = process.env.EC2_REGION;
@@ -20,7 +21,7 @@ exports.handler = async (event: any, context: Context) => {
   const commandName = body.data.name;
   console.log('commandName: ', commandName);
 
-  if (commandName == 'mc_start') {
+  if (commandName == getFullDiscordCommand('start')) {
     try {
       const result = await ec2.startInstances({ InstanceIds }).promise();
       console.log('startInstances succeed, result: \n', result);
@@ -34,7 +35,7 @@ exports.handler = async (event: any, context: Context) => {
     }
   }
 
-  if (commandName == 'mc_stop') {
+  if (commandName == getFullDiscordCommand('stop')) {
     try {
       const result = await ec2.stopInstances({ InstanceIds }).promise();
       console.log('stopInstance suceeed, result: \n', result);
@@ -47,7 +48,7 @@ exports.handler = async (event: any, context: Context) => {
     }
   }
 
-  if (commandName == 'mc_restart') {
+  if (commandName == getFullDiscordCommand('restart')) {
     try {
       const result = await sendCommands(['sudo systemctl restart minecloud']);
       console.log('mc_restart result: ', result);
@@ -60,7 +61,7 @@ exports.handler = async (event: any, context: Context) => {
     }
   }
 
-  if (commandName == 'mc_backup') {
+  if (commandName == getFullDiscordCommand('backup')) {
     try {
       const result = await sendCommands([
         'cd /opt/minecloud/',
@@ -76,7 +77,7 @@ exports.handler = async (event: any, context: Context) => {
     }
   }
 
-  if (commandName == 'mc_backup_download') {
+  if (commandName == getFullDiscordCommand('backup_download')) {
     const s3 = new AWS.S3({ signatureVersion: 'v4' });
 
     const bucketName: string = process.env.BACKUP_BUCKET_NAME as string;

lambda/discord_commands_register/index.ts

@@ -4,25 +4,26 @@ import {
   Context
 } from 'aws-lambda';
 import axios from 'axios';
+import { getFullDiscordCommand } from '../shared_util';
 
 // The deployment will fail if exception was thrown.
 exports.handler = async (event: CdkCustomResourceEvent, context: Context) => {
   if (event.RequestType !== 'Delete') {
     const apiEndpoint = `https://discord.com/api/v10/applications/${process.env.APP_ID}/commands`;
-    await registerCommand('mc_start', 'Start the server', apiEndpoint);
-    await registerCommand('mc_stop', 'Stop the server', apiEndpoint);
+    await registerCommand(getFullDiscordCommand('start'), 'Start the server', apiEndpoint);
+    await registerCommand(getFullDiscordCommand('stop'), 'Stop the server', apiEndpoint);
     await registerCommand(
-      'mc_restart',
+      getFullDiscordCommand('restart'),
       'Restart the server system service',
       apiEndpoint
     );
     await registerCommand(
-      'mc_backup',
+      getFullDiscordCommand('backup'),
       'Stop the server and make a backup',
       apiEndpoint
     );
     await registerCommand(
-      'mc_backup_download',
+      getFullDiscordCommand('backup_download'),
       'Get the latest backup',
       apiEndpoint
     );
@@ -64,4 +65,4 @@ async function registerCommand(
   console.log('register request: ', request);
   const response = await axios(request);
   console.log('register response: ', response.data);
-}
+}

lambda/shared_util.ts

@@ -0,0 +1,5 @@
+import { DISCORD_COMMAND_PREFIX } from "../minecloud_configs/MineCloud-Configs";
+
+export function getFullDiscordCommand(command: string){
+    return `${DISCORD_COMMAND_PREFIX}_${command}`
+  }

lib/instance-init.ts

@@ -19,33 +19,12 @@ import {
   MINECLOUD_BASE_DIR,
   MINECLOUD_SERVER_DIR
 } from './const/minecloud-dir';
+import { setUpEnviromentVariable, setUpShellScript } from '../shared_lib/minecloud-utilities';
 
 const MINECLOUD_USER = 'minecloud';
 // Not the same name since cfn-init can't figure it out for some reason
 const MINECLOUD_GROUP = 'minecloud-group';
 
-function setUpShellScript(
-  targetDir: string,
-  targetFileName: string,
-  localFilePath: string
-) {
-  return [
-    InitFile.fromFileInline(`${targetDir}/${targetFileName}`, localFilePath),
-    InitCommand.shellCommand(`sudo chmod +x ${targetFileName}`, {
-      cwd: targetDir
-    }),
-    // To convert Windows's EOL to Linux
-    InitCommand.shellCommand(`sed -i 's/\r//' ${targetFileName}`, {
-      cwd: targetDir
-    })
-  ];
-}
-
-function setUpEnviromentVariable(name: string, value: string) {
-  return [
-    InitCommand.shellCommand(`echo '${name}=${value}' >> /etc/environment`)
-  ];
-}
 
 export function getInitConfig(backupBucketName: string) {
   return CloudFormationInit.fromConfigSets({

minecloud-version.txt

@@ -1 +1 @@
-1.2.3
+1.3.0

minecloud_configs/MineCloud-Configs.ts

@@ -1,6 +1,8 @@
 // ------------- CloudFormation ------------- //
 export const STACK_NAME = 'MinecraftExample';
 
+export const DISCORD_COMMAND_PREFIX = 'mc';
+
 // -------------- Server Executable ------------- //
 // If set to true, /minecloud_configs/server/server.zip will be deployed
 export const DEPLOY_LOCAL_SERVER_EXECUTABLE = false;

minecloud_configs/README.md

@@ -4,6 +4,7 @@ The folders hierarchy should look like this after installation:
 ```
 - /MineCloud-x.x.x
   - /minecloud_configs
+    - config-pack-info.json
     - MineCloud-Configs.ts
     - /server
       - ...

minecloud_configs/advanced_configs/get_connection_count.sh

@@ -1,6 +1,5 @@
 function get_current_connection_count()
 {
-    # Check for TCP connection on port 25565
     local  mcCons=$(netstat -anp | grep :25565 | grep ESTABLISHED | wc -l)
     echo "$mcCons"
 }

minecloud_configs/advanced_configs/get_connection_count_udp_template.sh

@@ -1,10 +1,7 @@
 function get_current_connection_count()
 {
-    # If there's no udp package recieved on port 34197 for 20 second,
-    # return an empty string, else return the package info
     local mcCons=$(sudo timeout 300 tcpdump -c 1 udp port 25565 2>/dev/null)
 
-    # Return 0 if "mcCons" is an empty string, else 1
     if [[ -z $mcCons ]]; then
         echo 0
     else

minecloud_configs/config-pack-info.json

@@ -1,4 +1,4 @@
 {
-  "name": "example-config-pack",
-  "MineCloudVersion": "1.2.3"
+  "name": "Minecraft_Example",
+  "MineCloudVersion": "1.3.0"
 }