From be786c12d7adf1bb4b4571125e1d360b55d143a5 Mon Sep 17 00:00:00 2001 From: yurisasc Date: Fri, 3 Mar 2023 13:46:52 +1000 Subject: [PATCH] Allow watchdog to listen to bedrock port if using geyser --- cdk/.env.sample | 1 + cdk/lib/config.ts | 1 + cdk/lib/minecraft-stack.ts | 1 + cdk/lib/types.ts | 8 ++++++++ minecraft-ecsfargate-watchdog/watchdog.sh | 22 +++++++++++++--------- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/cdk/.env.sample b/cdk/.env.sample index a924464..3e01599 100644 --- a/cdk/.env.sample +++ b/cdk/.env.sample @@ -25,4 +25,5 @@ TWILIO_AUTH_CODE = DEBUG = false CDK_NEW_BOOTSTRAP = 1 +USE_GEYSER = false diff --git a/cdk/lib/config.ts b/cdk/lib/config.ts index 58178a6..d88cb15 100644 --- a/cdk/lib/config.ts +++ b/cdk/lib/config.ts @@ -44,4 +44,5 @@ export const resolveConfig = (): StackConfig => ({ authCode: process.env.TWILIO_AUTH_CODE || '', }, debug: stringAsBoolean(process.env.DEBUG) || false, + useGeyser: stringAsBoolean(process.env.USE_GEYSER) || false, }); diff --git a/cdk/lib/minecraft-stack.ts b/cdk/lib/minecraft-stack.ts index 49a7816..483cf4b 100644 --- a/cdk/lib/minecraft-stack.ts +++ b/cdk/lib/minecraft-stack.ts @@ -244,6 +244,7 @@ export class MinecraftStack extends Stack { TWILIOAUTH: config.twilio.authCode, STARTUPMIN: config.startupMinutes, SHUTDOWNMIN: config.shutdownMinutes, + GEYSER: config.useGeyser.toString(), }, logging: config.debug ? new ecs.AwsLogDriver({ diff --git a/cdk/lib/types.ts b/cdk/lib/types.ts index 40506b3..7824ca1 100644 --- a/cdk/lib/types.ts +++ b/cdk/lib/types.ts @@ -145,6 +145,14 @@ export interface StackConfig { * - CloudWatch Logs for the `minecraft-ecsfargate-watchdog` ECS Container */ debug: boolean; + /** + * Setting to `true` will allow the watchdog to listen for geyser connections. + * Make sure to set `BEDROCK_SERVER_PORT` to your geyser port if it's not the default (`19132`). + * + * @default false + * @example true + */ + useGeyser: boolean; } export interface MinecraftEditionConfig { diff --git a/minecraft-ecsfargate-watchdog/watchdog.sh b/minecraft-ecsfargate-watchdog/watchdog.sh index 0970d78..17d1637 100755 --- a/minecraft-ecsfargate-watchdog/watchdog.sh +++ b/minecraft-ecsfargate-watchdog/watchdog.sh @@ -8,6 +8,8 @@ [ -n "$DNSZONE" ] || { echo "DNSZONE env variable must be set to the Route53 Hosted Zone ID" ; exit 1; } [ -n "$STARTUPMIN" ] || { echo "STARTUPMIN env variable not set, defaulting to a 10 minute startup wait" ; STARTUPMIN=10; } [ -n "$SHUTDOWNMIN" ] || { echo "SHUTDOWNMIN env variable not set, defaulting to a 20 minute shutdown wait" ; SHUTDOWNMIN=20; } +[ -n "$GEYSER" ] || { echo "GEYSER env variable not set, defaulting to false" ; GEYSER=false; } + function send_notification () { @@ -113,7 +115,7 @@ then done fi -if [ "$EDITION" == "bedrock" ] +if [[ "$EDITION" == "bedrock" || "$GEYSER" == true ]] then PINGA="\x01" ## uncommitted ping PINGB="\x00\x00\x00\x00\x00\x00\x4e\x20" ## time since start in ms. 20 seconds sounds good @@ -132,10 +134,11 @@ CONNECTED=0 while [ $CONNECTED -lt 1 ] do echo Waiting for connection, minute $COUNTER out of $STARTUPMIN... - [ "$EDITION" == "java" ] && CONNECTIONS=$(netstat -atn | grep :25565 | grep ESTABLISHED | wc -l) - [ "$EDITION" == "bedrock" ] && CONNECTIONS=$((echo -en "$BEDROCKPING" && sleep 1) | ncat -w 1 -u 127.0.0.1 19132 | cut -c34- | awk -F\; '{ print $5 }') - [ -n "$CONNECTIONS" ] || CONNECTIONS=0 - CONNECTED=$(($CONNECTED + $CONNECTIONS)) + [ "$EDITION" == "java" ] && CONNECTIONS_JAVA=$(netstat -atn | grep :19132 | grep ESTABLISHED | wc -l) + [[ "$EDITION" == "bedrock" || "$GEYSER" == true ]] && CONNECTIONS_BEDROCK=$( (echo -en "$BEDROCKPING" && sleep 1) | ncat -w 1 -u 127.0.0.1 19132 | cut -c34- | awk -F\; '{ print $5 }') + [ -n "$CONNECTIONS_JAVA" ] || CONNECTIONS_JAVA=0 + [ -n "$CONNECTIONS_BEDROCK" ] || CONNECTIONS_BEDROCK=0 + CONNECTED=$(($CONNECTED + $CONNECTIONS_JAVA + $CONNECTIONS_BEDROCK)) COUNTER=$(($COUNTER + 1)) if [ $CONNECTED -gt 0 ] ## at least one active connection detected, break out of loop then @@ -154,10 +157,11 @@ echo "We believe a connection has been made, switching to shutdown watcher." COUNTER=0 while [ $COUNTER -le $SHUTDOWNMIN ] do - [ "$EDITION" == "java" ] && CONNECTIONS=$(netstat -atn | grep :25565 | grep ESTABLISHED | wc -l) - [ "$EDITION" == "bedrock" ] && CONNECTIONS=$((echo -en "$BEDROCKPING" && sleep 1) | ncat -w 1 -u 127.0.0.1 19132 | cut -c34- | awk -F\; '{ print $5 }') - [ -n "$CONNECTIONS" ] || CONNECTIONS=0 - if [ $CONNECTIONS -lt 1 ] + [ "$EDITION" == "java" ] && CONNECTIONS_JAVA=$(netstat -atn | grep :19132 | grep ESTABLISHED | wc -l) + [[ "$EDITION" == "bedrock" || "$GEYSER" == true ]] && CONNECTIONS_BEDROCK=$( (echo -en "$BEDROCKPING" && sleep 1) | ncat -w 1 -u 127.0.0.1 19132 | cut -c34- | awk -F\; '{ print $5 }') + [ -n "$CONNECTIONS_JAVA" ] || CONNECTIONS_JAVA=0 + [ -n "$CONNECTIONS_BEDROCK" ] || CONNECTIONS_BEDROCK=0 + if [ $CONNECTIONS_JAVA -lt 1 ] && [ $CONNECTIONS_BEDROCK -lt 1 ] then echo "No active connections detected, $COUNTER out of $SHUTDOWNMIN minutes..." COUNTER=$(($COUNTER + 1))