Compare commits

..

No commits in common. "5f4b02d912a443ab6d5a39c149bac627d37bf8fc" and "205d9a458cec2be7abc581ed19f579489865fa7b" have entirely different histories.

3 changed files with 6 additions and 238 deletions

26
.env
View File

@ -1,26 +0,0 @@
# Minecraft RCON
export MC_HOST="mc.techniverse.net"
export RCON_PORT="25575"
export RCON_PASSWORD=""
# Polling
export POLL_SECONDS="10"
export ANNOUNCE_SERVER_UPDOWN="true"
# Anzeigename/Tag
SERVER_NAME="[GER] Blockventure | ⌁25573"
SERVER_TAG="blockventure-25573"
# ntfy
export NTFY_SERVER="https://ntfy.pushservice.techniverse.net"
export NTFY_TOPIC="mc-events"
export NTFY_TOKEN=""
export NTFY_TITLE_PREFIX="🟩 Minecraft"
export NTFY_TAGS_BASE="minecraft"
export NTFY_MARKDOWN="false"
# Optional: Prioritäten (1=hoch, 5=niedrig; ntfy: 5=lowest, 1=urgent)
export NTFY_PRIORITY_JOIN="3"
export NTFY_PRIORITY_LEAVE="3"
export NTFY_PRIORITY_UP="4"
export NTFY_PRIORITY_DOWN="5"

View File

@ -1,4 +1,8 @@
Readme kommt nachträglich..
# template_repository
Wichtig: Link für Lizenz anpassen.
@ -7,5 +11,5 @@ Readme kommt nachträglich..
</p>
<p align="center">
<img src="https://assets.techniverse.net/f1/logos/small/license.png" alt="License" width="15" height="15"> <a href="./minecraft-ntfy-notify/src/branch/main/LICENSE">License</a> | <img src="https://assets.techniverse.net/f1/logos/small/matrix2.svg" alt="Matrix" width="15" height="15"> <a href="https://matrix.to/#/#community:techniverse.net">Matrix</a> | <img src="https://assets.techniverse.net/f1/logos/small/mastodon2.svg" alt="Matrix" width="15" height="15"> <a href="https://social.techniverse.net/@donnerwolke">Mastodon</a>
<img src="https://assets.techniverse.net/f1/logos/small/license.png" alt="License" width="15" height="15"> <a href="./template_repository/src/branch/main/LICENSE">License</a> | <img src="https://assets.techniverse.net/f1/logos/small/matrix2.svg" alt="Matrix" width="15" height="15"> <a href="https://matrix.to/#/#community:techniverse.net">Matrix</a> | <img src="https://assets.techniverse.net/f1/logos/small/mastodon2.svg" alt="Matrix" width="15" height="15"> <a href="https://social.techniverse.net/@donnerwolke">Mastodon</a>
</p>

View File

@ -1,210 +0,0 @@
#!/usr/bin/env bash
#!/bin/bash
# Beschreibung: Minecraft → ntfy Notifier (Join/Leave + optional Up/Down) mit Cron-safe Locking
# Autor: Patrick Asmus
# Web: https://www.cleveradmin.de
# Repository: https://git.techniverse.net/scriptos/minecraft-ntfy-notify
# Version: 1.4
# Datum: 18.09.2025
# Modifikation:
# - Serverlabel/Tags (SERVER_NAME/SERVER_TAG) in Titel & ntfy-Tags
# - State-Verzeichnis per Instanz (Host:Port:Topic)
# - Optionales ENV_FILE zum Laden einer spezifischen .env
#####################################################
set -euo pipefail
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
# --- .env laden: zuerst ENV_FILE (falls gesetzt), sonst ./.env ---
if [[ -n "${ENV_FILE:-}" && -f "${ENV_FILE}" ]]; then
set -a; . "${ENV_FILE}"; set +a
elif [[ -f "${SCRIPT_DIR}/.env" ]]; then
set -a; . "${SCRIPT_DIR}/.env"; set +a
fi
# ===== Konfiguration via ENV =====
MC_HOST="${MC_HOST:-127.0.0.1}"
RCON_PORT="${RCON_PORT:-25575}"
RCON_PASSWORD="${RCON_PASSWORD:-changeme}"
POLL_SECONDS="${POLL_SECONDS:-10}"
ANNOUNCE_SERVER_UPDOWN="${ANNOUNCE_SERVER_UPDOWN:-true}"
# ntfy
NTFY_SERVER="${NTFY_SERVER:-}"
NTFY_TOPIC="${NTFY_TOPIC:-}"
NTFY_TOKEN="${NTFY_TOKEN:-}"
NTFY_TITLE_PREFIX="${NTFY_TITLE_PREFIX:-Minecraft}"
NTFY_TAGS_BASE="${NTFY_TAGS_BASE:-minecraft}"
NTFY_PRIORITY_JOIN="${NTFY_PRIORITY_JOIN:-3}"
NTFY_PRIORITY_LEAVE="${NTFY_PRIORITY_LEAVE:-3}"
NTFY_PRIORITY_UP="${NTFY_PRIORITY_UP:-4}"
NTFY_PRIORITY_DOWN="${NTFY_PRIORITY_DOWN:-5}"
NTFY_MARKDOWN="${NTFY_MARKDOWN:-false}"
# Server-Label/Tag
SERVER_NAME="${SERVER_NAME:-}" # z. B. "[GER] Blockventure | ⌁25573"
SERVER_LABEL="${SERVER_NAME:-${MC_HOST}:${RCON_PORT}}"
# Maschinenfreundlicher Tag, wenn nicht gesetzt: aus Name oder Host:Port ableiten
SERVER_TAG="${SERVER_TAG:-$(printf '%s' "${SERVER_NAME:-${MC_HOST}-${RCON_PORT}}" \
| tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g;s/^-+|-+$//g')}"
# ==== Lock & State (pro Instanz eindeutig nach Host:Port:Topic) ====
LOCK_KEY="$(printf '%s' "${MC_HOST}_${RCON_PORT}_${NTFY_TOPIC}" | tr -c 'A-Za-z0-9._-' '_')"
# eigenes State-Verzeichnis je Instanz (damit mehrere Server parallel sauber laufen)
STATE_DIR="${STATE_DIR:-${SCRIPT_DIR}/state.${LOCK_KEY}}"
STATE_PLAYERS="${STATE_DIR}/players.prev"
STATE_UP="${STATE_DIR}/server_up.prev"
RUN_DIR="${RUN_DIR:-${STATE_DIR}}"
LOCK_DIR="${RUN_DIR}/lock.${LOCK_KEY}"
PID_FILE="${LOCK_DIR}/pid"
RUN_MARK="${RUN_DIR}/running.${LOCK_KEY}"
# Optional Debug
DEBUG="${DEBUG:-false}"
# ===== Helpers =====
die() { echo "ERROR: $*" >&2; exit 1; }
need_bin() { command -v "$1" >/dev/null 2>&1 || die "Benötigtes Tool fehlt: $1"; }
dbg() { [[ "$DEBUG" == "true" ]] && echo "DBG: $*" >&2 || true; }
cleanup() {
rm -f "$RUN_MARK" "$PID_FILE" 2>/dev/null || true
rmdir "$LOCK_DIR" 2>/dev/null || true
}
acquire_lock() {
mkdir -p "$RUN_DIR"
if mkdir "$LOCK_DIR" 2>/dev/null; then
echo "$$" > "$PID_FILE"
trap cleanup EXIT INT TERM
else
if [[ -f "$PID_FILE" ]]; then
oldpid="$(cat "$PID_FILE" 2>/dev/null || true)"
if [[ -n "${oldpid:-}" ]] && kill -0 "$oldpid" 2>/dev/null; then
dbg "Bereits laufend (PID $oldpid), beende."
exit 0
fi
fi
rm -rf "$LOCK_DIR" 2>/dev/null || true
mkdir "$LOCK_DIR" 2>/dev/null || die "Konnte Lock nicht übernehmen: ${LOCK_DIR}"
echo "$$" > "$PID_FILE"
trap cleanup EXIT INT TERM
fi
}
ntfy_notify() {
local title="$1" body="$2" tags="$3" priority="$4"
[[ -z "$NTFY_SERVER" || -z "$NTFY_TOPIC" ]] && { echo "ntfy Server/Topic fehlt skip"; return 1; }
local url="${NTFY_SERVER%/}/${NTFY_TOPIC}"
local args=(-sS -X POST "$url" -H "Title: ${title}" -H "Priority: ${priority}" -H "Tags: ${tags}")
[[ "$NTFY_MARKDOWN" == "true" ]] && args+=(-H "Markdown: yes")
[[ -n "$NTFY_TOKEN" ]] && args+=(-H "Authorization: Bearer ${NTFY_TOKEN}")
curl "${args[@]}" --data-raw "$body" >/dev/null 2>&1 || return 1
return 0
}
ensure_state() {
mkdir -p "$STATE_DIR"
touch "$STATE_PLAYERS"
[[ -f "$STATE_UP" ]] || echo "unknown" >"$STATE_UP"
}
# Strippt ANSI-Escape-Sequenzen, MC-Farbcodes (§x), CR und Steuerzeichen
sanitize() {
sed -E $'s/\x1B\\[[0-9;]*[A-Za-z]//g' \
| sed -E 's/§[0-9A-FK-ORa-fk-or]//g' \
| tr -d '\r' \
| sed -E 's/[\x00-\x1F\x7F]//g'
}
get_players() {
local out
if ! out=$(mcrcon -H "$MC_HOST" -P "$RCON_PORT" -p "$RCON_PASSWORD" "list" 2>/dev/null); then
return 1
fi
dbg "RAW: $out"
out="$(printf '%s' "$out" | sanitize)"
if ! grep -q "players online:" <<<"$out"; then
return 0
fi
local names="${out#*:}"
names="$(echo "$names" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
if [[ -z "$names" ]]; then
return 0
fi
printf '%s\n' "$names" \
| tr ',' '\n' \
| sed 's/^[[:space:]]*//;s/[[:space:]]*$//' \
| sed '/^$/d' \
| LC_ALL=C sort -u
return 0
}
# ===== Checks & Lock =====
need_bin curl
need_bin mcrcon
[[ -n "${NTFY_SERVER}" && -n "${NTFY_TOPIC}" ]] || die "NTFY_SERVER/NTFY_TOPIC nicht gesetzt"
ensure_state
acquire_lock
echo "Starte Polling ${MC_HOST}:${RCON_PORT} → ntfy ${NTFY_SERVER}/${NTFY_TOPIC} (PID $$) [${SERVER_LABEL}]"
prev_up="$(cat "$STATE_UP")"
# ===== Main Loop =====
while :; do
date -Iseconds > "$RUN_MARK"; echo "$$" >> "$RUN_MARK"
tmp_players="$(mktemp)"
if get_players >"$tmp_players"; then
server_up="true"
else
server_up="false"
: >"$tmp_players"
fi
if [[ "$ANNOUNCE_SERVER_UPDOWN" == "true" && "$prev_up" != "unknown" && "$server_up" != "$prev_up" ]]; then
if [[ "$server_up" == "true" ]]; then
ntfy_notify "${NTFY_TITLE_PREFIX}: Server up — ${SERVER_LABEL}" \
"Server ist wieder erreichbar (${MC_HOST}:${RCON_PORT})." \
"${NTFY_TAGS_BASE},${SERVER_TAG},up" "$NTFY_PRIORITY_UP" || true
else
ntfy_notify "${NTFY_TITLE_PREFIX}: Server down — ${SERVER_LABEL}" \
"Server ist nicht erreichbar (${MC_HOST}:${RCON_PORT})." \
"${NTFY_TAGS_BASE},${SERVER_TAG},down" "$NTFY_PRIORITY_DOWN" || true
fi
fi
if [[ "$server_up" == "true" ]]; then
LC_ALL=C sort -u "$STATE_PLAYERS" -o "$STATE_PLAYERS"
joined="$(comm -13 "$STATE_PLAYERS" "$tmp_players" || true)"
left="$(comm -23 "$STATE_PLAYERS" "$tmp_players" || true)"
if [[ -n "$joined" ]]; then
while IFS= read -r name; do
[[ -z "$name" ]] && continue
ntfy_notify "${NTFY_TITLE_PREFIX}: Join — ${SERVER_LABEL}" \
"Player \"${name}\" ist beigetreten." \
"${NTFY_TAGS_BASE},${SERVER_TAG},join" "$NTFY_PRIORITY_JOIN" || true
done <<<"$joined"
fi
if [[ -n "$left" ]]; then
while IFS= read -r name; do
[[ -z "$name" ]] && continue
ntfy_notify "${NTFY_TITLE_PREFIX}: Leave — ${SERVER_LABEL}" \
"Player \"${name}\" hat den Server verlassen." \
"${NTFY_TAGS_BASE},${SERVER_TAG},leave" "$NTFY_PRIORITY_LEAVE" || true
done <<<"$left"
fi
mv "$tmp_players" "$STATE_PLAYERS"
else
rm -f "$tmp_players"
fi
echo -n "$server_up" >"$STATE_UP"
prev_up="$server_up"
sleep "$POLL_SECONDS"
done