mirror of
https://github.com/proxiodev/RedisBungee.git
synced 2024-11-26 05:58:02 +00:00
mohammed Alteneiji
1593c2d628
## NOTES data system shouldn't effect anybody, unless you do any direct query to Redis query data, you should adapt the changes, by viewing classes `ProxyDataManager` and `PlayerDataManager` # Changes * RedisBungee is compiled with `java 17` now, Due java 11 support is ending at end of September * config version is now `2` which will reset your config if older version * Adventure API is included inside RedisBungee API * new Language infrastructure for RedisBungee built-in messages #85 *commands not included yet* * New data system which replaces Redis PubSub with Redis Streams *see below* * Ability to connect player to last server they where on using an config option #84 * new environment variable `REDISBUNGEE_PROXY_ID` which can be set before launch * new environment variable `REDISBUNGEE_NETWORK_ID` which can be set before launch * RedisBungee requires redis version 6.2 or above #88 * Better command system https://github.com/ProxioDev/RedisBungee/issues/93 ## New data system Due limitation of Redis PubSub in Cluster environment, Internals of RedisBungee were changed to support Redis Streams - Network Ids - networks ids used to group network proxies - example having 'test' network and 'main' network - Networks in the same redis server / cluster share the same UUID cache - Heartbeat system: - RedisBungee old heartbeat system used hastset on redisbungee to store the current unix time of the proxy to check what every proxy died or not, now instead we publish the heartbeat using unix time, and online count to proxy which proxy store it in their memory, which allow the `get number of online players` to be faster than pooling whole list in old data system. - PubSub - since redisbungee was initially designed with pubsub in mind, registration no longer required now for event to fire, see the api changes below. ## Commands System * rewritten using [acf lib](https://github.com/aikar/commands) to be platform independent * new command `/rb` or `/redisbungee` with sub commands `help`, `info`, 'clean', 'show'. * 'rb' * '/rb' and '/rb info' ![image](https://github.com/ProxioDev/RedisBungee/assets/34905970/70796ab0-b5fd-4578-8c93-c976e517df95) * '/rb show' ![image](https://github.com/ProxioDev/RedisBungee/assets/34905970/56332c37-701f-43e0-946b-6894b845fab3) * configuration to disable or override each command from legacy to new introduced one `/rb` ```yaml # For redis bungee legacy commands # either can be run using '/rbl glist' for example # or if 'install' is set to true '/glist' can be used. # 'install' also overrides the proxy installed commands # # In legacy commands each command got it own permissions since they had it own permission pre new command system, # so it's also applied to subcommands in '/rbl'. commands: # Permission redisbungee.legacy.use redisbungee-legacy: enabled: false subcommands: # Permission redisbungee.command.glist glist: enabled: false install: false # Permission redisbungee.command.find find: enabled: false install: false # Permission redisbungee.command.lastseen lastseen: enabled: false install: false # Permission redisbungee.command.ip ip: enabled: false install: false # Permission redisbungee.command.pproxy pproxy: enabled: false install: false # Permission redisbungee.command.sendtoall sendtoall: enabled: false install: false # Permission redisbungee.command.serverid serverid: enabled: false install: false # Permission redisbungee.command.serverids serverids: enabled: false install: false # Permission redisbungee.command.plist plist: enabled: false install: false # Permission redisbungee.command.use redisbungee: enabled: true ``` ## API changes - Kick api Deprecated: - `kickPlayer(String playerName, String message) ` - `kickPlayer(UUID playerUUID, String message) ` - newer where added using adventure api: - `kickPlayer(String playerName, Component message) ` - `kickPlayer(UUID playerUUID, Component message) ` - PubSub registration api Deprecated: ```java /** * Register (a) PubSub channel(s), so that you may handle PubSubMessageEvent for it. * * @param channels the channels to register * @since 0.3 * @deprecated No longer required */ @Deprecated public final void registerPubSubChannels(String... channels) { } /** * Unregister (a) PubSub channel(s). * * @param channels the channels to unregister * @since 0.3 * @deprecated No longer required */ @Deprecated public final void unregisterPubSubChannels(String... channels) { } ``` # Contributors * `summoncraft.us` for running this branch in production * @SrBedrock for providing [Brazilian Portuguese](https://en.wikipedia.org/wiki/Brazilian_Portuguese) translation #87 # issues closes #84 closes #88 closes #92 closes #81 closes #93 --------- Signed-off-by: mohammed jasem alaajel <xrambad@gmail.com> Co-authored-by: ThiagoROX <51332006+SrBedrock@users.noreply.github.com>
250 lines
8.5 KiB
Bash
Executable File
250 lines
8.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
#
|
|
# Copyright © 2015-2021 the original authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# https://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
##############################################################################
|
|
#
|
|
# Gradle start up script for POSIX generated by Gradle.
|
|
#
|
|
# Important for running:
|
|
#
|
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
# noncompliant, but you have some other compliant shell such as ksh or
|
|
# bash, then to run this script, type that shell name before the whole
|
|
# command line, like:
|
|
#
|
|
# ksh Gradle
|
|
#
|
|
# Busybox and similar reduced shells will NOT work, because this script
|
|
# requires all of these POSIX shell features:
|
|
# * functions;
|
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
# * compound commands having a testable exit status, especially «case»;
|
|
# * various built-in commands including «command», «set», and «ulimit».
|
|
#
|
|
# Important for patching:
|
|
#
|
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
#
|
|
# The "traditional" practice of packing multiple parameters into a
|
|
# space-separated string is a well documented source of bugs and security
|
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
# options in "$@", and eventually passing that to Java.
|
|
#
|
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
# see the in-line comments for details.
|
|
#
|
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
# Darwin, MinGW, and NonStop.
|
|
#
|
|
# (3) This script is generated from the Groovy template
|
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
# within the Gradle project.
|
|
#
|
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
#
|
|
##############################################################################
|
|
|
|
# Attempt to set APP_HOME
|
|
|
|
# Resolve links: $0 may be a link
|
|
app_path=$0
|
|
|
|
# Need this for daisy-chained symlinks.
|
|
while
|
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
[ -h "$app_path" ]
|
|
do
|
|
ls=$( ls -ld "$app_path" )
|
|
link=${ls#*' -> '}
|
|
case $link in #(
|
|
/*) app_path=$link ;; #(
|
|
*) app_path=$APP_HOME$link ;;
|
|
esac
|
|
done
|
|
|
|
# This is normally unused
|
|
# shellcheck disable=SC2034
|
|
APP_BASE_NAME=${0##*/}
|
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
|
|
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
MAX_FD=maximum
|
|
|
|
warn () {
|
|
echo "$*"
|
|
} >&2
|
|
|
|
die () {
|
|
echo
|
|
echo "$*"
|
|
echo
|
|
exit 1
|
|
} >&2
|
|
|
|
# OS specific support (must be 'true' or 'false').
|
|
cygwin=false
|
|
msys=false
|
|
darwin=false
|
|
nonstop=false
|
|
case "$( uname )" in #(
|
|
CYGWIN* ) cygwin=true ;; #(
|
|
Darwin* ) darwin=true ;; #(
|
|
MSYS* | MINGW* ) msys=true ;; #(
|
|
NONSTOP* ) nonstop=true ;;
|
|
esac
|
|
|
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
|
|
|
|
# Determine the Java command to use to start the JVM.
|
|
if [ -n "$JAVA_HOME" ] ; then
|
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
# IBM's JDK on AIX uses strange locations for the executables
|
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
else
|
|
JAVACMD=$JAVA_HOME/bin/java
|
|
fi
|
|
if [ ! -x "$JAVACMD" ] ; then
|
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
|
|
Please set the JAVA_HOME variable in your environment to match the
|
|
location of your Java installation."
|
|
fi
|
|
else
|
|
JAVACMD=java
|
|
if ! command -v java >/dev/null 2>&1
|
|
then
|
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
|
|
Please set the JAVA_HOME variable in your environment to match the
|
|
location of your Java installation."
|
|
fi
|
|
fi
|
|
|
|
# Increase the maximum file descriptors if we can.
|
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
case $MAX_FD in #(
|
|
max*)
|
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
# shellcheck disable=SC2039,SC3045
|
|
MAX_FD=$( ulimit -H -n ) ||
|
|
warn "Could not query maximum file descriptor limit"
|
|
esac
|
|
case $MAX_FD in #(
|
|
'' | soft) :;; #(
|
|
*)
|
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
# shellcheck disable=SC2039,SC3045
|
|
ulimit -n "$MAX_FD" ||
|
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
esac
|
|
fi
|
|
|
|
# Collect all arguments for the java command, stacking in reverse order:
|
|
# * args from the command line
|
|
# * the main class name
|
|
# * -classpath
|
|
# * -D...appname settings
|
|
# * --module-path (only if needed)
|
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
|
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
if "$cygwin" || "$msys" ; then
|
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
|
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
|
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
for arg do
|
|
if
|
|
case $arg in #(
|
|
-*) false ;; # don't mess with options #(
|
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
[ -e "$t" ] ;; #(
|
|
*) false ;;
|
|
esac
|
|
then
|
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
fi
|
|
# Roll the args list around exactly as many times as the number of
|
|
# args, so each arg winds up back in the position where it started, but
|
|
# possibly modified.
|
|
#
|
|
# NB: a `for` loop captures its iteration list before it begins, so
|
|
# changing the positional parameters here affects neither the number of
|
|
# iterations, nor the values presented in `arg`.
|
|
shift # remove old arg
|
|
set -- "$@" "$arg" # push replacement arg
|
|
done
|
|
fi
|
|
|
|
|
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
|
|
# Collect all arguments for the java command:
|
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
# and any embedded shellness will be escaped.
|
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
# treated as '${Hostname}' itself on the command line.
|
|
|
|
set -- \
|
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
-classpath "$CLASSPATH" \
|
|
org.gradle.wrapper.GradleWrapperMain \
|
|
"$@"
|
|
|
|
# Stop when "xargs" is not available.
|
|
if ! command -v xargs >/dev/null 2>&1
|
|
then
|
|
die "xargs is not available"
|
|
fi
|
|
|
|
# Use "xargs" to parse quoted args.
|
|
#
|
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
#
|
|
# In Bash we could simply go:
|
|
#
|
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
# set -- "${ARGS[@]}" "$@"
|
|
#
|
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
# character that might be a shell metacharacter, then use eval to reverse
|
|
# that process (while maintaining the separation between arguments), and wrap
|
|
# the whole thing up as a single "set" statement.
|
|
#
|
|
# This will of course break if any of these variables contains a newline or
|
|
# an unmatched quote.
|
|
#
|
|
|
|
eval "set -- $(
|
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
xargs -n1 |
|
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
tr '\n' ' '
|
|
)" '"$@"'
|
|
|
|
exec "$JAVACMD" "$@"
|