fix(script): Enhance script security and usability

- Updated error handling for invalid environment variables
- Added required checks for VNYAN_VERSION, SERVER_PASSWORD, and MAX_LOBBY_AMOUNT
- Moved and renamed various paths for better organization
- Extracted ZIP file in a temporary directory before unpacking it
- Changed variable type for SERVER_DIR to use double quotes
- Updated find command to exclude 'VNyanNet.cfg' from copying process
- Added check to ensure config file exists before starting the server
- Applied environment variables to config file before starting/stopping the server
- Implemented trap to stop the server upon receiving SIGINT or SIGTERM signals
- Monitored config file for changes and restarted the server accordingly

Author: NekoSuneVR

entrypoint.sh

@@ -1,63 +1,118 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 
+# -------------------------------------------------
+# Paths
+# -------------------------------------------------
 SERVER_DIR="/server"
-EXE_FILE="$SERVER_DIR/VNyanNet.exe"
-ZIP_FILE="$SERVER_DIR/VNyanNetServer.zip"
+BIN_DIR="$SERVER_DIR/bin"
+CONFIG_DIR="$SERVER_DIR/config"
+
+EXE_FILE="$BIN_DIR/VNyanNet.exe"
+CONFIG_FILE="$CONFIG_DIR/VNyanNet.cfg"
 VERSION_FILE="$SERVER_DIR/VERSION.txt"
-CONFIG_FILE="$SERVER_DIR/VNyanNet.cfg"
 
-# Determine installed version
+ZIP_FILE="$SERVER_DIR/VNyanNetServer.zip"
+TMP_DIR="$SERVER_DIR/tmp_extract"
+
+# -------------------------------------------------
+# Required ENV checks
+# -------------------------------------------------
+: "${VNYAN_VERSION:?VNYAN_VERSION is required}"
+: "${SERVER_PASSWORD:?SERVER_PASSWORD is required}"
+: "${MAX_LOBBY_AMOUNT:?MAX_LOBBY_AMOUNT is required}"
+
+mkdir -p "$BIN_DIR" "$CONFIG_DIR"
+
+# -------------------------------------------------
+# Read current version
+# -------------------------------------------------
 CURRENT_VERSION=""
-if [ -f "$VERSION_FILE" ]; then
-    CURRENT_VERSION=$(cat "$VERSION_FILE")
-fi
+[[ -f "$VERSION_FILE" ]] && CURRENT_VERSION="$(cat "$VERSION_FILE")"
+
+# -------------------------------------------------
+# Update / install
+# -------------------------------------------------
+if [[ "$CURRENT_VERSION" != "$VNYAN_VERSION" ]] || [[ ! -f "$EXE_FILE" ]]; then
+  echo "[VNyanNet] Updating server: ${CURRENT_VERSION:-none} → $VNYAN_VERSION"
+
+  DOWNLOAD_URL="https://drive.nekosunevr.co.uk/public.php/dav/files/p7xjS2TpD6St7wN/VNyanNetServer-${VNYAN_VERSION}.zip"
 
-# Check if we need to update/downgrade
-if [ "$CURRENT_VERSION" != "$VNYAN_VERSION" ] || [ ! -f "$EXE_FILE" ]; then
-    echo "[VNyanNet] Installing/updating server from version '${CURRENT_VERSION:-none}' to '${VNYAN_VERSION}'..."
+  wget -O "$ZIP_FILE" "$DOWNLOAD_URL"
 
-    wget --content-disposition -O "$ZIP_FILE" "https://drive.nekosunevr.co.uk/public.php/dav/files/p7xjS2TpD6St7wN/VNyanNetServer-${VNYAN_VERSION}.zip" \
-        || echo "⚠️ Could not download VNyanNetServer-${VNYAN_VERSION}.zip. Please provide manually."
+  rm -rf "$TMP_DIR"
+  mkdir -p "$TMP_DIR"
+  unzip -o "$ZIP_FILE" -d "$TMP_DIR"
 
-    # Extract while preserving VNyanNet.cfg
-    TMP_DIR="$SERVER_DIR/tmp_extract"
-    mkdir -p "$TMP_DIR"
-    unzip -o "$ZIP_FILE" -d "$TMP_DIR"
+  echo "[VNyanNet] Installing binaries to /bin"
+  rsync -av \
+    --exclude='VNyanNet.cfg' \
+    "$TMP_DIR"/ "$BIN_DIR"/
 
-    echo "[VNyanNet] Copying new version files (preserving VNyanNet.cfg)..."
-    # Copy all files except VNyanNet.cfg
-    find "$TMP_DIR" -type f ! -name "VNyanNet.cfg" -exec cp -f --parents {} "$SERVER_DIR" \;
+  # Copy default config ONLY if missing
+  if [[ ! -f "$CONFIG_FILE" ]] && [[ -f "$TMP_DIR/VNyanNet.cfg" ]]; then
+    echo "[VNyanNet] Installing default config"
+    cp "$TMP_DIR/VNyanNet.cfg" "$CONFIG_FILE"
+  fi
 
-    rm -rf "$TMP_DIR" "$ZIP_FILE"
+  rm -rf "$TMP_DIR" "$ZIP_FILE"
 
-    # Update version file (overwrite old version)
-    echo "$VNYAN_VERSION" > "$VERSION_FILE"
-    echo "[VNyanNet] Server updated to version $VNYAN_VERSION"
-else
-    echo "[VNyanNet] Server already at version $CURRENT_VERSION — skipping download."
+  echo "$VNYAN_VERSION" > "$VERSION_FILE"
 fi
 
-# --- Start/stop functions ---
+# -------------------------------------------------
+# Ensure config exists
+# -------------------------------------------------
+if [[ ! -f "$CONFIG_FILE" ]]; then
+  echo "❌ VNyanNet.cfg missing and no default provided"
+  exit 1
+fi
+
+# -------------------------------------------------
+# Apply ENV → config (ALWAYS)
+# -------------------------------------------------
+apply_env_to_config() {
+  echo "[VNyanNet] Applying environment variables to config"
+
+  sed -i \
+    -e "s/^ServerPassword=.*/ServerPassword=${SERVER_PASSWORD}/" \
+    -e "s/^MaxLobbyAmount=.*/MaxLobbyAmount=${MAX_LOBBY_AMOUNT}/" \
+    "$CONFIG_FILE"
+}
+
+apply_env_to_config
+
+# -------------------------------------------------
+# Start / stop
+# -------------------------------------------------
+SERVER_PID=""
+
 start_server() {
+  apply_env_to_config
   echo "[VNyanNet] Starting server..."
   xvfb-run -a wine "$EXE_FILE" &
   SERVER_PID=$!
 }
 
 stop_server() {
-  echo "[VNyanNet] Stopping server (PID $SERVER_PID)..."
-  kill "$SERVER_PID" 2>/dev/null || true
-  wait "$SERVER_PID" 2>/dev/null || true
+  if [[ -n "$SERVER_PID" ]] && kill -0 "$SERVER_PID" 2>/dev/null; then
+    echo "[VNyanNet] Stopping server (PID $SERVER_PID)"
+    kill "$SERVER_PID" 2>/dev/null || true
+    wait "$SERVER_PID" 2>/dev/null || true
+  fi
 }
 
+trap stop_server SIGINT SIGTERM
+
+# -------------------------------------------------
+# Run
+# -------------------------------------------------
 start_server
 
-# --- Monitor config file for real-time updates ---
-echo "[VNyanNet] Watching VNyanNet.cfg for changes..."
+echo "[VNyanNet] Watching config for changes..."
 while true; do
-  inotifywait -e modify,attrib,close_write,move,create,delete "$CONFIG_FILE" >/dev/null 2>&1
-  echo "[VNyanNet] Config changed — restarting server..."
+  inotifywait -e modify,close_write,move,create,delete "$CONFIG_FILE" >/dev/null 2>&1
+  echo "[VNyanNet] Config changed — restarting server"
   stop_server
   start_server
 done