Merge pull request #98 from ThePesta/main

Fix discord message server start not being sent

Author: arguser

Dockerfile

@@ -120,7 +120,7 @@ ENV PUID=1000 \
     DISCORD_PLAYER_LEAVE_COLOR="11477760" \
     # Server Start
     DISCORD_SERVER_START_ENABLED=true \
-    DISCORD_SERVER_START_MESSAGE='**World:** ${world_name}\n**GameID:** ${gameid}' \
+    DISCORD_SERVER_START_MESSAGE="" \
     DISCORD_SERVER_START_TITLE="Server Started" \
     DISCORD_SERVER_START_COLOR="2013440" \
     # Server Stop

README.md

@@ -110,7 +110,7 @@ These are the arguments you can use to customize server behavior with default va
 | DISCORD_PLAYER_LEAVE_TITLE | "Player Left" | Embed title |
 | DISCORD_PLAYER_LEAVE_COLOR | "11477760" | Embed color |
 | DISCORD_SERVER_START_ENABLED | true | Enable/Disable message on server start |
-| DISCORD_SERVER_START_MESSAGE | `"**World:** $${world_name}\n**GameID:** $${gameid}"` | Embed message |
+| DISCORD_SERVER_START_MESSAGE | `"**World:** $${world_name}\n**GameID:** $${gameid}"` | Embed message. Available variables are `world_name`, `gameid`, (the following only in direct connection mode) `allowed_platforms`, `public_ip`, `port`, `password`, `join_string`|
 | DISCORD_SERVER_START_TITLE | "Server Started" | Embed title |
 | DISCORD_SERVER_START_COLOR | "2013440" | Embed color |
 | DISCORD_SERVER_STOP_ENABLED | true | Enable/Disable message on server stop |

scripts/launch.sh

@@ -25,6 +25,7 @@ function kill_corekeeperserver {
 trap kill_corekeeperserver EXIT
 
 if [ -f "GameID.txt" ]; then rm GameID.txt; fi
+if [ -f "GameInfo.txt" ]; then rm GameInfo.txt; fi
 
 # Compile Parameters
 # Populates `params` array with parameters.

scripts/logfile-parser.sh

@@ -37,15 +37,73 @@ LogParser() {
             SendDiscordMessage "$DISCORD_PLAYER_LEAVE_TITLE" "$message" "$DISCORD_PLAYER_LEAVE_COLOR"
         fi
 
-        if [[ "$line" == "Started session with Game ID "* ]]; then
+        if [[ "$line" == "Started session with info: "* ]]; then
             [[ "${DISCORD_SERVER_START_ENABLED,,}" == false ]] && continue
 
-            # Extract Game ID
-            gameid=$(echo "$line" | awk '{print $6}')
-
-            # Build message from vars and send message
-            message=$(world_name="$WORLD_NAME" gameid="$gameid" envsubst <<<"$DISCORD_SERVER_START_MESSAGE")
-            SendDiscordMessage "$DISCORD_SERVER_START_TITLE" "$message" "$DISCORD_SERVER_START_COLOR"
+            sendServerStartMessage &
         fi
     done
 }
+
+sendServerStartMessage() {
+    game_info="${STEAMAPPDIR}/GameInfo.txt"
+    game_info_timeout=5
+    game_info_count=0
+
+    LogDebug "Detecting file $game_info (max $game_info_timeout seconds)..."
+
+    # GameInfo.txt creation can happen shortly after the log line appears
+    until [[ -f "$game_info" ]] || [ "$game_info_count" -ge "$game_info_timeout" ]; do
+        sleep 1
+        ((game_info_count++))
+    done
+
+    if [[ ! -f "$game_info" ]]; then
+        LogDebug "Failed to detect file $game_info after $game_info_timeout seconds"
+    else
+
+        LogDebug "Detected file $game_info, sending discord server start message"
+
+        read -r gameid \
+                allowed_platforms \
+                public_ip \
+                port \
+                password  < <(
+            awk -F': ' '
+              BEGIN { gameid=""; allowed_platforms=""; public_ip=""; port=""; password=""; }
+              /^GameID:/ { gameid=$2 }
+              /^Allowed platforms:/ { allowed_platforms=$2 }
+              /^Public IP:/ { public_ip=$2 }
+              /^Port:/ { port=$2 }
+              /^Password:/ { password=$2 }
+              END { print gameid, allowed_platforms, public_ip, port, password }
+            ' "$game_info"
+        )
+
+        if [[ -n "$port" ]]; then # Port will be set in Direct Connection and is empty in Steam Datagram Relay
+            join_string="${public_ip}:${port}::${password}"
+        fi
+
+        if [[ -n "$DISCORD_SERVER_START_MESSAGE" ]]; then
+          start_message_template="$DISCORD_SERVER_START_MESSAGE"
+        elif [[ -n "$port" ]]; then
+          start_message_template='**World:** ${world_name}\n**GameID:** ${gameid}\n**Allowed Platforms:** ${allowed_platforms}\n**Server IP:** ${public_ip}\n**Port:** ${port}\n**Password:** ${password}\n**Join String:** ${join_string}'
+        else
+          start_message_template='**World:** ${world_name}\n**GameID:** ${gameid}'
+        fi
+
+        # Build message from vars and send message
+        message=$(
+            world_name="$WORLD_NAME" \
+            gameid="$gameid" \
+            allowed_platforms="$allowed_platforms" \
+            public_ip="$public_ip" \
+            port="$port" \
+            password="$password" \
+            join_string="$join_string" \
+            envsubst <<<"$start_message_template"
+        )
+
+        SendDiscordMessage "$DISCORD_SERVER_START_TITLE" "$message" "$DISCORD_SERVER_START_COLOR"
+    fi
+}