Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2024-11-23 04:28:01 +00:00
Code Releases Activity

updated bungeecord to support Redis cluster

Browse Source
This commit is contained in:
mohammed jasem alaajel 2022-07-17 07:41:18 +04:00
parent 019bb30c09
commit 38de948c6b
8 changed files with 630 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/RedisBungeePlugin.java
View File

@ -12,15 +12,13 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
* This Class has all internal methods needed by every redis bungee plugin, and it can be used to implement another platforms than bungeecord * This Class has all internal methods needed by every redis bungee plugin, and it can be used to implement another platforms than bungeecord
* *
* @author Ham1255 * @author Ham1255
* @since 0.7.0 * @since 0.7.0
*
*/ */
public interface RedisBungeePlugin<P> extends EventsPlatform{ public interface RedisBungeePlugin<P> extends EventsPlatform {
default void initialize() { default void initialize() {
@ -56,7 +54,7 @@ public interface RedisBungeePlugin<P> extends EventsPlatform{
List<String> getServerIds(); List<String> getServerIds();
List<String > getCurrentServerIds(boolean nag, boolean lagged); List<String> getCurrentServerIds(boolean nag, boolean lagged);
PubSubListener getPubSubListener(); PubSubListener getPubSubListener();

16
RedisBungee-Bungee/pom.xml
View File

@ -61,42 +61,42 @@
<relocations> <relocations>
<relocation> <relocation>
<pattern>redis.clients.jedis</pattern> <pattern>redis.clients.jedis</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.jedis <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.jedis
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>redis.clients.util</pattern> <pattern>redis.clients.util</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.jedisutil <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.jedisutil
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.commons.pool</pattern> <pattern>org.apache.commons.pool</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.commonspool <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.commonspool
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.squareup.okhttp</pattern> <pattern>com.squareup.okhttp</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.okhttp <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.okhttp
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>okio</pattern> <pattern>okio</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.okio <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.okio
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.google</pattern> <pattern>com.google</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.google <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.google
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.json</pattern> <pattern>org.json</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.json <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.json
</shadedPattern> </shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.checkerframework</pattern> <pattern>org.checkerframework</pattern>
<shadedPattern>com.imaginarycode.minecraft.redisbungee.internal.checkframework <shadedPattern>com.imaginarycode.minecraft.redisbungee.api.checkframework
</shadedPattern> </shadedPattern>
</relocation> </relocation>
</relocations> </relocations>

4
RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeeDataManager.java
View File

@ -1,8 +1,8 @@
package com.imaginarycode.minecraft.redisbungee; package com.imaginarycode.minecraft.redisbungee;
import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
import com.imaginarycode.minecraft.redisbungee.internal.AbstractDataManager; import com.imaginarycode.minecraft.redisbungee.api.AbstractDataManager;
import com.imaginarycode.minecraft.redisbungee.internal.RedisBungeePlugin; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.event.PostLoginEvent;

28
RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java → RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/PlayerUtils.java
View File

@ -1,15 +1,16 @@
package com.imaginarycode.minecraft.redisbungee; package com.imaginarycode.minecraft.redisbungee;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.imaginarycode.minecraft.redisbungee.internal.AbstractDataManager; import com.imaginarycode.minecraft.redisbungee.api.AbstractDataManager;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import redis.clients.jedis.JedisCluster;
import redis.clients.jedis.Pipeline; import redis.clients.jedis.Pipeline;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class RBUtils { public class PlayerUtils {
private static final Gson gson = new Gson(); private static final Gson gson = new Gson();
@ -35,5 +36,28 @@ public class RBUtils {
} }
} }
protected static void createPlayer(ProxiedPlayer player, JedisCluster jedisCluster, boolean fireEvent) {
createPlayer(player.getPendingConnection(), jedisCluster, fireEvent);
if (player.getServer() != null)
jedisCluster.hset("player:" + player.getUniqueId().toString(), "server", player.getServer().getInfo().getName());
}
protected static void createPlayer(PendingConnection connection, JedisCluster jedisCluster, boolean fireEvent) {
Map<String, String> playerData = new HashMap<>(4);
playerData.put("online", "0");
playerData.put("ip", connection.getAddress().getAddress().getHostAddress());
playerData.put("proxy", RedisBungeeAPI.getRedisBungeeApi().getServerId());
jedisCluster.sadd("proxy:" + RedisBungeeAPI.getRedisBungeeApi().getServerId() + ":usersOnline", connection.getUniqueId().toString());
jedisCluster.hmset("player:" + connection.getUniqueId().toString(), playerData);
if (fireEvent) {
jedisCluster.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage<>(
connection.getUniqueId(), RedisBungeeAPI.getRedisBungeeApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.JOIN,
new AbstractDataManager.LoginPayload(connection.getAddress().getAddress()))));
}
}
} }

97
RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java
View File

@ -6,11 +6,12 @@ import com.google.common.collect.Multimap;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.imaginarycode.minecraft.redisbungee.internal.AbstractRedisBungeeListener; import com.imaginarycode.minecraft.redisbungee.api.AbstractRedisBungeeListener;
import com.imaginarycode.minecraft.redisbungee.internal.AbstractDataManager; import com.imaginarycode.minecraft.redisbungee.api.AbstractDataManager;
import com.imaginarycode.minecraft.redisbungee.internal.RedisBungeePlugin; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
import com.imaginarycode.minecraft.redisbungee.api.tasks.RedisTask;
import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
import com.imaginarycode.minecraft.redisbungee.internal.RedisUtil; import com.imaginarycode.minecraft.redisbungee.api.util.RedisUtil;
import net.md_5.bungee.api.AbstractReconnectHandler; import net.md_5.bungee.api.AbstractReconnectHandler;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
@ -37,9 +38,9 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener<Login
@EventHandler @EventHandler
public void onLogin(LoginEvent event) { public void onLogin(LoginEvent event) {
event.registerIntent((Plugin) plugin); event.registerIntent((Plugin) plugin);
plugin.executeAsync(new RedisCallable<Void>(plugin) { plugin.executeAsync(new RedisTask<Void>(plugin) {
@Override @Override
protected Void call(Jedis jedis) { public Void jedisTask(Jedis jedis) {
try { try {
if (event.isCancelled()) { if (event.isCancelled()) {
return null; return null;
@ -71,25 +72,76 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener<Login
event.completeIntent((Plugin) plugin); event.completeIntent((Plugin) plugin);
} }
} }
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
try {
if (event.isCancelled()) {
return null;
}
// We make sure they aren't trying to use an existing player's name.
// This is problematic for online-mode servers as they always disconnect old clients.
if (plugin.isOnlineMode()) {
ProxiedPlayer player = (ProxiedPlayer) plugin.getPlayer(event.getConnection().getName());
if (player != null) {
event.setCancelled(true);
// TODO: Make it accept a BaseComponent[] like everything else.
event.setCancelReason(ONLINE_MODE_RECONNECT);
return null;
}
}
for (String s : plugin.getServerIds()) {
if (jedisCluster.sismember("proxy:" + s + ":usersOnline", event.getConnection().getUniqueId().toString())) {
event.setCancelled(true);
// TODO: Make it accept a BaseComponent[] like everything else.
event.setCancelReason(ALREADY_LOGGED_IN);
return null;
}
}
return null;
} finally {
event.completeIntent((Plugin) plugin);
}
}
}); });
} }
@Override @Override
@EventHandler @EventHandler
public void onPostLogin(PostLoginEvent event) { public void onPostLogin(PostLoginEvent event) {
plugin.executeAsync(new RedisCallable<Void>(plugin) { plugin.executeAsync(new RedisTask<Void>(plugin) {
@Override @Override
protected Void call(Jedis jedis) { public Void jedisTask(Jedis jedis) {
// this code was moved out from login event due being async.. // this code was moved out from login event due being async..
// and it can be cancelled but it will show as false in redis-bungee // and it can be cancelled but it will show as false in redis-bungee
// which will register the player into the redis database. // which will register the player into the redis database.
Pipeline pipeline = jedis.pipelined(); Pipeline pipeline = jedis.pipelined();
plugin.getUuidTranslator().persistInfo(event.getPlayer().getName(), event.getPlayer().getUniqueId(), pipeline); plugin.getUuidTranslator().persistInfo(event.getPlayer().getName(), event.getPlayer().getUniqueId(), pipeline);
RBUtils.createPlayer(event.getPlayer(), pipeline, false); PlayerUtils.createPlayer(event.getPlayer(), pipeline, false);
pipeline.sync(); pipeline.sync();
// the end of moved code. // the end of moved code.
jedis.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage( jedis.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage<>(
event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.JOIN,
new AbstractDataManager.LoginPayload(event.getPlayer().getAddress().getAddress()))));
return null;
}
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
// this code was moved out from login event due being async..
// and it can be cancelled but it will show as false in redis-bungee
// which will register the player into the redis database.
// due no support to pipeline in jedis cluster just use the instance instead.
plugin.getUuidTranslator().persistInfo(event.getPlayer().getName(), event.getPlayer().getUniqueId(), jedisCluster);
PlayerUtils.createPlayer(event.getPlayer(), jedisCluster, false);
// the end of moved code.
jedisCluster.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage<>(
event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.JOIN, event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.JOIN,
new AbstractDataManager.LoginPayload(event.getPlayer().getAddress().getAddress())))); new AbstractDataManager.LoginPayload(event.getPlayer().getAddress().getAddress()))));
return null; return null;
@ -100,14 +152,23 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener<Login
@Override @Override
@EventHandler @EventHandler
public void onPlayerDisconnect(PlayerDisconnectEvent event) { public void onPlayerDisconnect(PlayerDisconnectEvent event) {
plugin.executeAsync(new RedisCallable<Void>(plugin) { plugin.executeAsync(new RedisTask<Void>(plugin) {
@Override @Override
protected Void call(Jedis jedis) { public Void jedisTask(Jedis jedis) {
Pipeline pipeline = jedis.pipelined(); Pipeline pipeline = jedis.pipelined();
RedisUtil.cleanUpPlayer(event.getPlayer().getUniqueId().toString(), pipeline); RedisUtil.cleanUpPlayer(event.getPlayer().getUniqueId().toString(), pipeline);
pipeline.sync(); pipeline.sync();
return null; return null;
} }
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
// Due some reason JedisCluster does not support pipeline, use instance instead
RedisUtil.cleanUpPlayer(event.getPlayer().getUniqueId().toString(), jedisCluster);
return null;
}
}); });
} }
@ -116,18 +177,22 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener<Login
@EventHandler @EventHandler
public void onServerChange(ServerConnectedEvent event) { public void onServerChange(ServerConnectedEvent event) {
final String currentServer = event.getPlayer().getServer() == null ? null : event.getPlayer().getServer().getInfo().getName(); final String currentServer = event.getPlayer().getServer() == null ? null : event.getPlayer().getServer().getInfo().getName();
plugin.executeAsync(new RedisCallable<Void>(plugin) { plugin.executeAsync(new RedisTask<Void>(plugin) {
@Override @Override
protected Void call(Jedis jedis) { public Void jedisTask(Jedis jedis) {
jedis.hset("player:" + event.getPlayer().getUniqueId().toString(), "server", event.getServer().getInfo().getName()); jedis.hset("player:" + event.getPlayer().getUniqueId().toString(), "server", event.getServer().getInfo().getName());
jedis.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage( jedis.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage<>(
event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.SERVER_CHANGE, event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.SERVER_CHANGE,
new AbstractDataManager.ServerChangePayload(event.getServer().getInfo().getName(), currentServer)))); new AbstractDataManager.ServerChangePayload(event.getServer().getInfo().getName(), currentServer))));
return null; return null;
} }
@Override @Override
protected Void call(JedisCluster jedisCluster) { public Void clusterJedisTask(JedisCluster jedisCluster) {
jedisCluster.hset("player:" + event.getPlayer().getUniqueId().toString(), "server", event.getServer().getInfo().getName());
jedisCluster.publish("redisbungee-data", gson.toJson(new AbstractDataManager.DataManagerMessage<>(
event.getPlayer().getUniqueId(), plugin.getApi().getServerId(), AbstractDataManager.DataManagerMessage.Action.SERVER_CHANGE,
new AbstractDataManager.ServerChangePayload(event.getServer().getInfo().getName(), currentServer))));
return null; return null;
} }
}); });

564
RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
View File

@ -7,18 +7,22 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.imaginarycode.minecraft.redisbungee.api.summoners.ClusterJedisSummoner;
import com.imaginarycode.minecraft.redisbungee.api.summoners.JedisSummoner;
import com.imaginarycode.minecraft.redisbungee.api.tasks.RedisTask;
import com.imaginarycode.minecraft.redisbungee.api.util.RedisUtil;
import com.imaginarycode.minecraft.redisbungee.commands.RedisBungeeCommands; import com.imaginarycode.minecraft.redisbungee.commands.RedisBungeeCommands;
import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent; import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent; import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
import com.imaginarycode.minecraft.redisbungee.internal.*; import com.imaginarycode.minecraft.redisbungee.api.*;
import com.imaginarycode.minecraft.redisbungee.internal.summoners.Summoner; import com.imaginarycode.minecraft.redisbungee.api.summoners.Summoner;
import com.imaginarycode.minecraft.redisbungee.internal.summoners.SinglePoolJedisSummoner; import com.imaginarycode.minecraft.redisbungee.api.util.io.IOUtil;
import com.imaginarycode.minecraft.redisbungee.internal.util.IOUtil; import com.imaginarycode.minecraft.redisbungee.api.util.lua.LuaManager;
import com.imaginarycode.minecraft.redisbungee.internal.util.LuaManager; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeeMode;
import com.imaginarycode.minecraft.redisbungee.internal.util.uuid.NameFetcher; import com.imaginarycode.minecraft.redisbungee.api.util.uuid.NameFetcher;
import com.imaginarycode.minecraft.redisbungee.internal.util.uuid.UUIDFetcher; import com.imaginarycode.minecraft.redisbungee.api.util.uuid.UUIDFetcher;
import com.imaginarycode.minecraft.redisbungee.internal.util.uuid.UUIDTranslator; import com.imaginarycode.minecraft.redisbungee.api.util.uuid.UUIDTranslator;
import com.squareup.okhttp.Dispatcher; import com.squareup.okhttp.Dispatcher;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
@ -28,10 +32,7 @@ import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration; import net.md_5.bungee.config.YamlConfiguration;
import redis.clients.jedis.Jedis; import redis.clients.jedis.*;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
import redis.clients.jedis.Pipeline;
import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisConnectionException;
import java.io.*; import java.io.*;
@ -46,9 +47,11 @@ import java.util.logging.Level;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin<ProxiedPlayer> { public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin<ProxiedPlayer> {
private RedisBungeeAPI api; private RedisBungeeAPI api;
private RedisBungeeMode redisBungeeMode;
private PubSubListener psl = null; private PubSubListener psl = null;
private Summoner jedisSummoner; private Summoner<?> jedisSummoner;
private UUIDTranslator uuidTranslator; private UUIDTranslator uuidTranslator;
private RedisBungeeConfiguration configuration; private RedisBungeeConfiguration configuration;
private BungeeDataManager dataManager; private BungeeDataManager dataManager;
@ -58,9 +61,7 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
private final AtomicInteger globalPlayerCount = new AtomicInteger(); private final AtomicInteger globalPlayerCount = new AtomicInteger();
private Future<?> integrityCheck; private Future<?> integrityCheck;
private Future<?> heartbeatTask; private Future<?> heartbeatTask;
private LuaManager.Script serverToPlayersScript; private LuaManager.Script getRedisClusterTimeScript;
private LuaManager.Script getPlayerCountScript;
private static final Object SERVER_TO_PLAYERS_KEY = new Object(); private static final Object SERVER_TO_PLAYERS_KEY = new Object();
private final Cache<Object, Multimap<String, UUID>> serverToPlayersCache = CacheBuilder.newBuilder() private final Cache<Object, Multimap<String, UUID>> serverToPlayersCache = CacheBuilder.newBuilder()
.expireAfterWrite(5, TimeUnit.SECONDS) .expireAfterWrite(5, TimeUnit.SECONDS)
@ -79,8 +80,42 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public int getCurrentCount() { public int getCurrentCount() {
Long count = (Long) getPlayerCountScript.eval(ImmutableList.of(), ImmutableList.of()); return new RedisTask<Long>(api) {
return count.intValue(); @Override
public Long jedisTask(Jedis jedis) {
long total = 0;
long redisTime = getRedisTime(jedis.time());
Map<String, String> heartBeats = jedis.hgetAll("heartbeats");
for (Map.Entry<String, String> stringStringEntry : heartBeats.entrySet()) {
String k = stringStringEntry.getKey();
String v = stringStringEntry.getValue();
long heartbeatTime = Long.parseLong(v);
if (heartbeatTime + 30 >= redisTime) {
total = total + jedis.scard("proxy:" + k + ":usersOnline");
}
}
return total;
}
@Override
public Long clusterJedisTask(JedisCluster jedisCluster) {
long total = 0;
long redisTime = getRedisClusterTime();
Map<String, String> heartBeats = jedisCluster.hgetAll("heartbeats");
for (Map.Entry<String, String> stringStringEntry : heartBeats.entrySet()) {
String k = stringStringEntry.getKey();
String v = stringStringEntry.getValue();
long heartbeatTime = Long.parseLong(v);
if (heartbeatTime + 30 >= redisTime) {
total = total + jedisCluster.scard("proxy:" + k + ":usersOnline");
}
}
return total;
}
}.execute().intValue();
} }
@Override @Override
@ -99,15 +134,17 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public Set<UUID> getPlayers() { public Set<UUID> getPlayers() {
return new RedisTask<Set<UUID>>(api) {
@Override
public Set<UUID> jedisTask(Jedis jedis) {
ImmutableSet.Builder<UUID> setBuilder = ImmutableSet.builder(); ImmutableSet.Builder<UUID> setBuilder = ImmutableSet.builder();
if (isJedisAvailable()) { try {
try (Jedis rsc = requestJedis()) {
List<String> keys = new ArrayList<>(); List<String> keys = new ArrayList<>();
for (String i : getServerIds()) { for (String i : getServerIds()) {
keys.add("proxy:" + i + ":usersOnline"); keys.add("proxy:" + i + ":usersOnline");
} }
if (!keys.isEmpty()) { if (!keys.isEmpty()) {
Set<String> users = rsc.sunion(keys.toArray(new String[0])); Set<String> users = jedis.sunion(keys.toArray(new String[0]));
if (users != null && !users.isEmpty()) { if (users != null && !users.isEmpty()) {
for (String user : users) { for (String user : users) {
try { try {
@ -122,18 +159,36 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e); getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
throw new RuntimeException("Unable to get all players online", e); throw new RuntimeException("Unable to get all players online", e);
} }
}
return setBuilder.build(); return setBuilder.build();
} }
@Override @Override
public Jedis requestJedis() { public Set<UUID> clusterJedisTask(JedisCluster jedisCluster) {
return this.jedisSummoner.requestJedis(); ImmutableSet.Builder<UUID> setBuilder = ImmutableSet.builder();
try {
List<String> keys = new ArrayList<>();
for (String i : getServerIds()) {
keys.add("proxy:" + i + ":usersOnline");
} }
if (!keys.isEmpty()) {
@Override Set<String> users = jedisCluster.sunion(keys.toArray(new String[0]));
public boolean isJedisAvailable() { if (users != null && !users.isEmpty()) {
return this.jedisSummoner.isJedisAvailable(); for (String user : users) {
try {
setBuilder = setBuilder.add(UUID.fromString(user));
} catch (IllegalArgumentException ignored) {
}
}
}
}
} catch (JedisConnectionException e) {
// Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
throw new RuntimeException("Unable to get all players online", e);
}
return setBuilder.build();
}
}.execute();
} }
@Override @Override
@ -147,24 +202,32 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
} }
@Override @Override
@SuppressWarnings("unchecked")
public Multimap<String, UUID> serversToPlayers() { public Multimap<String, UUID> serversToPlayers() {
try { try {
return serverToPlayersCache.get(SERVER_TO_PLAYERS_KEY, () -> { return serverToPlayersCache.get(SERVER_TO_PLAYERS_KEY, new RedisTask<Multimap<String, UUID>>(api) {
Collection<String> data = (Collection<String>) serverToPlayersScript.eval(ImmutableList.of(), getServerIds()); @Override
public Multimap<String, UUID> jedisTask(Jedis jedis) {
ImmutableMultimap.Builder<String, UUID> builder = ImmutableMultimap.builder(); ImmutableMultimap.Builder<String, UUID> builder = ImmutableMultimap.builder();
String key = null; for (String serverId : getServerIds()) {
for (String s : data) { Set<String> players = jedis.smembers("proxy:" + serverId + ":usersOnline");
if (key == null) { for (String player : players) {
key = s; builder.put(serverId, UUID.fromString(player));
continue;
} }
builder.put(key, UUID.fromString(s));
key = null;
} }
return builder.build(); return builder.build();
}
@Override
public Multimap<String, UUID> clusterJedisTask(JedisCluster jedisCluster) {
ImmutableMultimap.Builder<String, UUID> builder = ImmutableMultimap.builder();
for (String serverId : getServerIds()) {
Set<String> players = jedisCluster.smembers("proxy:" + serverId + ":usersOnline");
for (String player : players) {
builder.put(serverId, UUID.fromString(player));
}
}
return builder.build();
}
}); });
} catch (ExecutionException e) { } catch (ExecutionException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -174,7 +237,9 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public Set<UUID> getPlayersOnProxy(String proxyId) { public Set<UUID> getPlayersOnProxy(String proxyId) {
checkArgument(getServerIds().contains(proxyId), proxyId + " is not a valid proxy ID"); checkArgument(getServerIds().contains(proxyId), proxyId + " is not a valid proxy ID");
try (Jedis jedis = requestJedis()) { return new RedisTask<Set<UUID>>(api) {
@Override
public Set<UUID> jedisTask(Jedis jedis) {
Set<String> users = jedis.smembers("proxy:" + proxyId + ":usersOnline"); Set<String> users = jedis.smembers("proxy:" + proxyId + ":usersOnline");
ImmutableSet.Builder<UUID> builder = ImmutableSet.builder(); ImmutableSet.Builder<UUID> builder = ImmutableSet.builder();
for (String user : users) { for (String user : users) {
@ -182,6 +247,17 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
} }
return builder.build(); return builder.build();
} }
@Override
public Set<UUID> clusterJedisTask(JedisCluster jedisCluster) {
Set<String> users = jedisCluster.smembers("proxy:" + proxyId + ":usersOnline");
ImmutableSet.Builder<UUID> builder = ImmutableSet.builder();
for (String user : users) {
builder.add(UUID.fromString(user));
}
return builder.build();
}
}.execute();
} }
@Override @Override
@ -197,7 +273,10 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public List<String> getCurrentServerIds(boolean nag, boolean lagged) { public List<String> getCurrentServerIds(boolean nag, boolean lagged) {
try (Jedis jedis = requestJedis()) { return new RedisTask<List<String>>(api) {
@Override
public List<String> jedisTask(Jedis jedis) {
try {
long time = getRedisTime(jedis.time()); long time = getRedisTime(jedis.time());
int nagTime = 0; int nagTime = 0;
if (nag) { if (nag) {
@ -227,6 +306,40 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
} }
} }
@Override
public List<String> clusterJedisTask(JedisCluster jedisCluster) {
try {
long time = getRedisClusterTime();
int nagTime = 0;
if (nag) {
nagTime = nagAboutServers.decrementAndGet();
if (nagTime <= 0) {
nagAboutServers.set(10);
}
}
ImmutableList.Builder<String> servers = ImmutableList.builder();
Map<String, String> heartbeats = jedisCluster.hgetAll("heartbeats");
for (Map.Entry<String, String> entry : heartbeats.entrySet()) {
try {
long stamp = Long.parseLong(entry.getValue());
if (lagged ? time >= stamp + 30 : time <= stamp + 30)
servers.add(entry.getKey());
else if (nag && nagTime <= 0) {
getLogger().warning(entry.getKey() + " is " + (time - stamp) + " seconds behind! (Time not synchronized or server down?) and was removed from heartbeat.");
jedisCluster.hdel("heartbeats", entry.getKey());
}
} catch (NumberFormatException ignored) {
}
}
return servers.build();
} catch (JedisConnectionException e) {
getLogger().log(Level.SEVERE, "Unable to fetch server IDs", e);
return Collections.singletonList(configuration.getServerId());
}
}
}.execute();
}
@Override @Override
public PubSubListener getPubSubListener() { public PubSubListener getPubSubListener() {
return this.psl; return this.psl;
@ -234,13 +347,31 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public void sendChannelMessage(String channel, String message) { public void sendChannelMessage(String channel, String message) {
try (Jedis jedis = requestJedis()) { new RedisTask<Void>(api) {
@Override
public Void jedisTask(Jedis jedis) {
try {
jedis.publish(channel, message); jedis.publish(channel, message);
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
// Redis server has disappeared! // Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e); getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
throw new RuntimeException("Unable to publish channel message", e); throw new RuntimeException("Unable to publish channel message", e);
} }
return null;
}
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
try {
jedisCluster.publish(channel, message);
} catch (JedisConnectionException e) {
// Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
throw new RuntimeException("Unable to publish channel message", e);
}
return null;
}
}.execute();
} }
@Override @Override
@ -343,50 +474,130 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
loadConfig(); loadConfig();
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Unable to load/save config", e); throw new RuntimeException("Unable to load/save config", e);
} catch (JedisConnectionException e) {
throw new RuntimeException("Unable to connect to your Redis server!", e);
} }
// init the api class
this.api = new RedisBungeeAPI(this); this.api = new RedisBungeeAPI(this);
// call old plugin class to support old plugins // init the http lib
new RedisBungee(api); httpClient = new OkHttpClient();
if (isJedisAvailable()) { Dispatcher dispatcher = new Dispatcher(getExecutorService());
try (Jedis tmpRsc = requestJedis()) { httpClient.setDispatcher(dispatcher);
NameFetcher.setHttpClient(httpClient);
UUIDFetcher.setHttpClient(httpClient);
// init lua manager
LuaManager luaManager = new LuaManager(this);
if (getRedisBungeeMode() == RedisBungeeMode.CLUSTER) {
this.getRedisClusterTimeScript = luaManager.createScript(IOUtil.readInputStreamAsString(getResourceAsStream("lua/get_cluster_time.lua")));
}
getLogger().info("lua manager was loaded");
// check if this proxy is recovering from a crash
new RedisTask<Void>(api) {
@Override
public Void jedisTask(Jedis jedis) {
File crashFile = new File(getDataFolder(), "restarted_from_crash.txt");
if (crashFile.exists() && crashFile.delete()) {
getLogger().info("crash file was deleted");
} else if (jedis.hexists("heartbeats", configuration.getServerId())) {
try {
long value = Long.parseLong(jedis.hget("heartbeats", configuration.getServerId()));
long redisTime = getRedisTime(jedis.time());
if (redisTime < value + 20) {
getLogger().severe("You have launched a possible impostor Velocity / Bungeecord instance. Another instance is already running.");
getLogger().severe("For data consistency reasons, RedisBungee will now disable itself.");
getLogger().severe("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check.");
throw new RuntimeException("Possible impostor instance!");
}
} catch (NumberFormatException ignored) {
}
}
return null;
}
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
File crashFile = new File(getDataFolder(), "restarted_from_crash.txt");
if (crashFile.exists() && crashFile.delete()) {
getLogger().info("crash file was deleted");
} else if (jedisCluster.hexists("heartbeats", configuration.getServerId())) {
try {
long value = Long.parseLong(jedisCluster.hget("heartbeats", configuration.getServerId()));
long redisTime = getRedisClusterTime();
if (redisTime < value + 20) {
getLogger().severe("You have launched a possible impostor Velocity / Bungeecord instance. Another instance is already running.");
getLogger().severe("For data consistency reasons, RedisBungee will now disable itself.");
getLogger().severe("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check.");
throw new RuntimeException("Possible impostor instance!");
}
} catch (NumberFormatException ignored) {
}
}
return null;
}
}.execute();
new RedisTask<Void>(this) {
@Override
public Void jedisTask(Jedis jedis) {
// This is more portable than INFO <section> // This is more portable than INFO <section>
String info = tmpRsc.info(); String info = jedis.info();
for (String s : info.split("\r\n")) { for (String s : info.split("\r\n")) {
if (s.startsWith("redis_version:")) { if (s.startsWith("redis_version:")) {
String version = s.split(":")[1]; String version = s.split(":")[1];
getLogger().info(version + " <- redis version"); getLogger().info(version + " <- redis version");
if (!RedisUtil.isRedisVersionRight(version)) { if (!RedisUtil.isRedisVersionRight(version)) {
getLogger().severe("Your version of Redis (" + version + ") is not at least version 6.0 RedisBungee requires a newer version of Redis."); getLogger().severe("Your version of Redis (" + version + ") is not at least version 3.0 RedisBungee requires a newer version of Redis.");
throw new RuntimeException("Unsupported Redis version detected"); throw new RuntimeException("Unsupported Redis version detected");
} else {
LuaManager manager = new LuaManager(this);
serverToPlayersScript = manager.createScript(IOUtil.readInputStreamAsString(getResourceAsStream("lua/server_to_players.lua")));
getPlayerCountScript = manager.createScript(IOUtil.readInputStreamAsString(getResourceAsStream("lua/get_player_count.lua")));
getLogger().info("lua manager was loaded");
} }
break; break;
} }
} }
jedis.hset("heartbeats", configuration.getServerId(), jedis.time().get(0));
tmpRsc.hset("heartbeats", configuration.getServerId(), tmpRsc.time().get(0)); long uuidCacheSize = jedis.hlen("uuid-cache");
long uuidCacheSize = tmpRsc.hlen("uuid-cache");
if (uuidCacheSize > 750000) { if (uuidCacheSize > 750000) {
getLogger().info("Looks like you have a really big UUID cache! Run https://www.spigotmc.org/resources/redisbungeecleaner.8505/ as soon as possible."); getLogger().info("Looks like you have a really big UUID cache! Run https://www.spigotmc.org/resources/redisbungeecleaner.8505/ as soon as possible.");
} }
return null;
} }
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
// This is more portable than INFO <section>
String info = (String) luaManager.createScript(IOUtil.readInputStreamAsString(getResourceAsStream("lua/get_cluster_info.lua"))).eval(Collections.singletonList("0"), Collections.emptyList());
for (String s : info.split("\r\n")) {
if (s.startsWith("redis_version:")) {
String version = s.split(":")[1];
getLogger().info(version + " <- redis version");
if (!RedisUtil.isRedisVersionRight(version)) {
getLogger().severe("Your version of Redis (" + version + ") is not at least version 3.0 RedisBungee requires a newer version of Redis.");
throw new RuntimeException("Unsupported Redis version detected");
}
break;
}
}
jedisCluster.hset("heartbeats", configuration.getServerId(), String.valueOf(getRedisClusterTime()));
long uuidCacheSize = jedisCluster.hlen("uuid-cache");
if (uuidCacheSize > 750000) {
getLogger().info("Looks like you have a really big UUID cache! Run https://www.spigotmc.org/resources/redisbungeecleaner.8505/ as soon as possible.");
}
return null;
}
}.execute();
serverIds = getCurrentServerIds(true, false); serverIds = getCurrentServerIds(true, false);
uuidTranslator = new UUIDTranslator(this); uuidTranslator = new UUIDTranslator(this);
heartbeatTask = service.scheduleAtFixedRate(() -> {
try (Jedis rsc = requestJedis()) { RedisTask<Void> heartBeatRedisTask = new RedisTask<Void>(api) {
long redisTime = getRedisTime(rsc.time()); @Override
rsc.hset("heartbeats", configuration.getServerId(), String.valueOf(redisTime)); public Void jedisTask(Jedis jedis) {
try {
long redisTime = getRedisTime(jedis.time());
jedis.hset("heartbeats", configuration.getServerId(), String.valueOf(redisTime));
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
// Redis server has disappeared! // Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to update heartbeat - did your Redis server go away?", e); getLogger().log(Level.SEVERE, "Unable to update heartbeat - did your Redis server go away?", e);
return; return null;
} }
try { try {
serverIds = getCurrentServerIds(true, false); serverIds = getCurrentServerIds(true, false);
@ -394,26 +605,53 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
} catch (Throwable e) { } catch (Throwable e) {
getLogger().log(Level.SEVERE, "Unable to update data - did your Redis server go away?", e); getLogger().log(Level.SEVERE, "Unable to update data - did your Redis server go away?", e);
} }
}, 0, 3, TimeUnit.SECONDS); return null;
}
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
try {
long redisTime = getRedisClusterTime();
jedisCluster.hset("heartbeats", configuration.getServerId(), String.valueOf(redisTime));
} catch (JedisConnectionException e) {
// Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to update heartbeat - did your Redis server go away?", e);
return null;
}
try {
serverIds = getCurrentServerIds(true, false);
globalPlayerCount.set(getCurrentCount());
} catch (Throwable e) {
getLogger().log(Level.SEVERE, "Unable to update data - did your Redis server go away?", e);
}
return null;
}
};
heartbeatTask = service.scheduleAtFixedRate(heartBeatRedisTask::execute, 0, 3, TimeUnit.SECONDS);
dataManager = new BungeeDataManager(this); dataManager = new BungeeDataManager(this);
getProxy().getPluginManager().registerListener(this, new RedisBungeeBungeeListener(this, configuration.getExemptAddresses())); getProxy().getPluginManager().registerListener(this, new RedisBungeeBungeeListener(this, configuration.getExemptAddresses()));
getProxy().getPluginManager().registerListener(this, dataManager); getProxy().getPluginManager().registerListener(this, dataManager);
psl = new PubSubListener(this); psl = new PubSubListener(this);
getProxy().getScheduler().runAsync(this, psl); getProxy().getScheduler().runAsync(this, psl);
integrityCheck = service.scheduleAtFixedRate(() -> {
try (Jedis tmpRsc = requestJedis()) { RedisTask<Void> integrityCheckRedisTask = new RedisTask<Void>(api) {
@Override
public Void jedisTask(Jedis jedis) {
try {
Set<String> players = getLocalPlayersAsUuidStrings(); Set<String> players = getLocalPlayersAsUuidStrings();
Set<String> playersInRedis = tmpRsc.smembers("proxy:" + configuration.getServerId() + ":usersOnline"); Set<String> playersInRedis = jedis.smembers("proxy:" + configuration.getServerId() + ":usersOnline");
List<String> lagged = getCurrentServerIds(false, true); List<String> lagged = getCurrentServerIds(false, true);
// Clean up lagged players. // Clean up lagged players.
for (String s : lagged) { for (String s : lagged) {
Set<String> laggedPlayers = tmpRsc.smembers("proxy:" + s + ":usersOnline"); Set<String> laggedPlayers = jedis.smembers("proxy:" + s + ":usersOnline");
tmpRsc.del("proxy:" + s + ":usersOnline"); jedis.del("proxy:" + s + ":usersOnline");
if (!laggedPlayers.isEmpty()) { if (!laggedPlayers.isEmpty()) {
getLogger().info("Cleaning up lagged proxy " + s + " (" + laggedPlayers.size() + " players)..."); getLogger().info("Cleaning up lagged proxy " + s + " (" + laggedPlayers.size() + " players)...");
for (String laggedPlayer : laggedPlayers) { for (String laggedPlayer : laggedPlayers) {
RedisUtil.cleanUpPlayer(laggedPlayer, tmpRsc); RedisUtil.cleanUpPlayer(laggedPlayer, jedis);
} }
} }
} }
@ -427,22 +665,22 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
boolean found = false; boolean found = false;
for (String proxyId : getServerIds()) { for (String proxyId : getServerIds()) {
if (proxyId.equals(configuration.getServerId())) continue; if (proxyId.equals(configuration.getServerId())) continue;
if (tmpRsc.sismember("proxy:" + proxyId + ":usersOnline", member)) { if (jedis.sismember("proxy:" + proxyId + ":usersOnline", member)) {
// Just clean up the set. // Just clean up the set.
found = true; found = true;
break; break;
} }
} }
if (!found) { if (!found) {
RedisUtil.cleanUpPlayer(member, tmpRsc); RedisUtil.cleanUpPlayer(member, jedis);
getLogger().warning("Player found in set that was not found locally and globally: " + member); getLogger().warning("Player found in set that was not found locally and globally: " + member);
} else { } else {
tmpRsc.srem("proxy:" + configuration.getServerId() + ":usersOnline", member); jedis.srem("proxy:" + configuration.getServerId() + ":usersOnline", member);
getLogger().warning("Player found in set that was not found locally, but is on another proxy: " + member); getLogger().warning("Player found in set that was not found locally, but is on another proxy: " + member);
} }
} }
Pipeline pipeline = tmpRsc.pipelined(); Pipeline pipeline = jedis.pipelined();
for (String player : absentInRedis) { for (String player : absentInRedis) {
// Player not online according to Redis but not BungeeCord. // Player not online according to Redis but not BungeeCord.
@ -452,15 +690,82 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
if (proxiedPlayer == null) if (proxiedPlayer == null)
continue; // We'll deal with it later. continue; // We'll deal with it later.
RBUtils.createPlayer(proxiedPlayer, pipeline, true); PlayerUtils.createPlayer(proxiedPlayer, pipeline, true);
} }
pipeline.sync(); pipeline.sync();
} catch (Throwable e) { } catch (Throwable e) {
getLogger().log(Level.SEVERE, "Unable to fix up stored player data", e); getLogger().log(Level.SEVERE, "Unable to fix up stored player data", e);
} }
}, 0, 1, TimeUnit.MINUTES); return null;
} }
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
try {
Set<String> players = getLocalPlayersAsUuidStrings();
Set<String> playersInRedis = jedisCluster.smembers("proxy:" + configuration.getServerId() + ":usersOnline");
List<String> lagged = getCurrentServerIds(false, true);
// Clean up lagged players.
for (String s : lagged) {
Set<String> laggedPlayers = jedisCluster.smembers("proxy:" + s + ":usersOnline");
jedisCluster.del("proxy:" + s + ":usersOnline");
if (!laggedPlayers.isEmpty()) {
getLogger().info("Cleaning up lagged proxy " + s + " (" + laggedPlayers.size() + " players)...");
for (String laggedPlayer : laggedPlayers) {
RedisUtil.cleanUpPlayer(laggedPlayer, jedisCluster);
}
}
}
Set<String> absentLocally = new HashSet<>(playersInRedis);
absentLocally.removeAll(players);
Set<String> absentInRedis = new HashSet<>(players);
absentInRedis.removeAll(playersInRedis);
for (String member : absentLocally) {
boolean found = false;
for (String proxyId : getServerIds()) {
if (proxyId.equals(configuration.getServerId())) continue;
if (jedisCluster.sismember("proxy:" + proxyId + ":usersOnline", member)) {
// Just clean up the set.
found = true;
break;
}
}
if (!found) {
RedisUtil.cleanUpPlayer(member, jedisCluster);
getLogger().warning("Player found in set that was not found locally and globally: " + member);
} else {
jedisCluster.srem("proxy:" + configuration.getServerId() + ":usersOnline", member);
getLogger().warning("Player found in set that was not found locally, but is on another proxy: " + member);
}
}
// due JedisCluster does not support pipelined.
//Pipeline pipeline = jedis.pipelined();
for (String player : absentInRedis) {
// Player not online according to Redis but not BungeeCord.
getLogger().warning("Player " + player + " is on the proxy but not in Redis.");
ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(UUID.fromString(player));
if (proxiedPlayer == null)
continue; // We'll deal with it later.
PlayerUtils.createPlayer(proxiedPlayer, jedisCluster, true);
}
} catch (Throwable e) {
getLogger().log(Level.SEVERE, "Unable to fix up stored player data", e);
}
return null;
}
};
integrityCheck = service.scheduleAtFixedRate(integrityCheckRedisTask::execute, 0, 1, TimeUnit.MINUTES);
// register plugin messages channel.
getProxy().registerChannel("legacy:redisbungee"); getProxy().registerChannel("legacy:redisbungee");
getProxy().registerChannel("RedisBungee"); getProxy().registerChannel("RedisBungee");
// register commands // register commands
@ -479,31 +784,53 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
@Override @Override
public void stop() { public void stop() {
if (isJedisAvailable()) {
// Poison the PubSub listener // Poison the PubSub listener
if (psl != null) {
psl.poison(); psl.poison();
}
if (integrityCheck != null) {
integrityCheck.cancel(true); integrityCheck.cancel(true);
}
if (heartbeatTask != null) {
heartbeatTask.cancel(true); heartbeatTask.cancel(true);
}
getProxy().getPluginManager().unregisterListeners(this); getProxy().getPluginManager().unregisterListeners(this);
try (Jedis tmpRsc = requestJedis()) {
tmpRsc.hdel("heartbeats", configuration.getServerId()); new RedisTask<Void>(api) {
if (tmpRsc.scard("proxy:" + configuration.getServerId() + ":usersOnline") > 0) { @Override
Set<String> players = tmpRsc.smembers("proxy:" + configuration.getServerId() + ":usersOnline"); public Void jedisTask(Jedis jedis) {
jedis.hdel("heartbeats", configuration.getServerId());
if (jedis.scard("proxy:" + configuration.getServerId() + ":usersOnline") > 0) {
Set<String> players = jedis.smembers("proxy:" + configuration.getServerId() + ":usersOnline");
for (String member : players) for (String member : players)
RedisUtil.cleanUpPlayer(member, tmpRsc); RedisUtil.cleanUpPlayer(member, jedis);
} }
return null;
} }
@Override
public Void clusterJedisTask(JedisCluster jedisCluster) {
jedisCluster.hdel("heartbeats", configuration.getServerId());
if (jedisCluster.scard("proxy:" + configuration.getServerId() + ":usersOnline") > 0) {
Set<String> players = jedisCluster.smembers("proxy:" + configuration.getServerId() + ":usersOnline");
for (String member : players)
RedisUtil.cleanUpPlayer(member, jedisCluster);
}
return null;
}
}.execute();
try { try {
this.jedisSummoner.close(); this.jedisSummoner.close();
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}
} }
@Override @Override
public Summoner getSummoner() { public Summoner<?> getSummoner() {
return this.jedisSummoner; return this.jedisSummoner;
} }
@ -512,24 +839,19 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
if (!getDataFolder().exists() && getDataFolder().mkdir()) { if (!getDataFolder().exists() && getDataFolder().mkdir()) {
getLogger().info("data folder was created"); getLogger().info("data folder was created");
} }
File file = new File(getDataFolder(), "config.yml"); File file = new File(getDataFolder(), "config.yml");
if (!file.exists() && file.createNewFile()) { if (!file.exists() && file.createNewFile()) {
try (InputStream in = getResourceAsStream("example_config.yml"); try (InputStream in = getResourceAsStream("example_config.yml");
OutputStream out = Files.newOutputStream(file.toPath())) { OutputStream out = Files.newOutputStream(file.toPath())) {
ByteStreams.copy(in, out); ByteStreams.copy(in, out);
} }
} }
final Configuration yamlConfiguration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file); final Configuration yamlConfiguration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file);
final String redisServer = yamlConfiguration.getString("redis-server", "localhost"); final String redisServer = yamlConfiguration.getString("redis-server", "localhost");
final int redisPort = yamlConfiguration.getInt("redis-port", 6379); final int redisPort = yamlConfiguration.getInt("redis-port", 6379);
final boolean useSSL = yamlConfiguration.getBoolean("useSSL", false); final boolean useSSL = yamlConfiguration.getBoolean("useSSL", false);
String redisPassword = yamlConfiguration.getString("redis-password", ""); String redisPassword = yamlConfiguration.getString("redis-password", "");
String serverId = yamlConfiguration.getString("server-id"); String serverId = yamlConfiguration.getString("server-id");
// check redis password // check redis password
if (redisPassword != null && (redisPassword.isEmpty() || redisPassword.equals("none"))) { if (redisPassword != null && (redisPassword.isEmpty() || redisPassword.equals("none"))) {
redisPassword = null; redisPassword = null;
@ -550,58 +872,40 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
ConfigurationProvider.getProvider(YamlConfiguration.class).save(yamlConfiguration, new File(getDataFolder(), "config.yml")); ConfigurationProvider.getProvider(YamlConfiguration.class).save(yamlConfiguration, new File(getDataFolder(), "config.yml"));
getLogger().info("Server id was generated: " + serverId); getLogger().info("Server id was generated: " + serverId);
} else { } else {
getLogger().info("Loaded server id " + serverId + '.'); getLogger().info("server id: " + serverId + '.');
} }
this.configuration = new RedisBungeeConfiguration(serverId, yamlConfiguration.getStringList("exempt-ip-addresses"), yamlConfiguration.getBoolean("register-bungee-commands", true)); this.configuration = new RedisBungeeConfiguration(serverId, yamlConfiguration.getStringList("exempt-ip-addresses"), yamlConfiguration.getBoolean("register-bungee-commands", true));
if (redisServer != null && !redisServer.isEmpty()) { if (redisServer != null && !redisServer.isEmpty()) {
try { if (yamlConfiguration.getBoolean("cluster-mode-enabled", false)) {
this.jedisSummoner = new ClusterJedisSummoner(new JedisCluster(new HostAndPort("192.168.0.150", 7000)));
this.redisBungeeMode = RedisBungeeMode.CLUSTER;
getLogger().log(Level.INFO, "RedisBungee MODE: CLUSTER");
} else {
JedisPoolConfig config = new JedisPoolConfig(); JedisPoolConfig config = new JedisPoolConfig();
config.setMaxTotal(yamlConfiguration.getInt("max-redis-connections", 8)); config.setMaxTotal(yamlConfiguration.getInt("max-redis-connections", 8));
this.jedisSummoner = new SinglePoolJedisSummoner(new JedisPool(config, redisServer, redisPort, 0, redisPassword, useSSL)); this.jedisSummoner = new JedisSummoner(new JedisPool(config, redisServer, redisPort, 0, redisPassword, useSSL));
this.redisBungeeMode = RedisBungeeMode.SINGLE;
} catch (JedisConnectionException e) { getLogger().log(Level.INFO, "RedisBungee MODE: SINGLE");
throw new RuntimeException("Unable to create Redis pool", e);
} }
// Test the connection
try (Jedis rsc = requestJedis()) {
rsc.ping();
// If that worked, now we can check for an existing, alive Bungee:
File crashFile = new File(getDataFolder(), "restarted_from_crash.txt");
if (crashFile.exists() && crashFile.delete()) {
getLogger().info("crash file was deleted");
} else if (rsc.hexists("heartbeats", serverId)) {
try {
long value = Long.parseLong(rsc.hget("heartbeats", serverId));
long redisTime = getRedisTime(rsc.time());
if (redisTime < value + 20) {
getLogger().severe("You have launched a possible impostor Velocity / Bungeecord instance. Another instance is already running.");
getLogger().severe("For data consistency reasons, RedisBungee will now disable itself.");
getLogger().severe("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check.");
throw new RuntimeException("Possible impostor instance!");
}
} catch (NumberFormatException ignored) {
}
}
httpClient = new OkHttpClient();
Dispatcher dispatcher = new Dispatcher(getExecutorService());
httpClient.setDispatcher(dispatcher);
NameFetcher.setHttpClient(httpClient);
UUIDFetcher.setHttpClient(httpClient);
getLogger().log(Level.INFO, "Successfully connected to Redis."); getLogger().log(Level.INFO, "Successfully connected to Redis.");
} catch (JedisConnectionException e) {
this.jedisSummoner.close();
throw e;
}
} else { } else {
throw new RuntimeException("No redis server specified!"); throw new RuntimeException("No redis server specified!");
} }
} }
@Override
public RedisBungeeMode getRedisBungeeMode() {
return this.redisBungeeMode;
}
@Override
public Long getRedisClusterTime() {
return getRedisTime((List<String>) this.getRedisClusterTimeScript.eval(Collections.singletonList("0"), Collections.emptyList()));
}
@Override @Override
public void onEnable() { public void onEnable() {
initialize(); initialize();
@ -631,4 +935,6 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
public Class<?> getNetworkQuitEventClass() { public Class<?> getNetworkQuitEventClass() {
return PlayerJoinedNetworkEvent.class; return PlayerJoinedNetworkEvent.class;
} }
} }

2
RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/commands/RedisBungeeCommands.java
View File

@ -5,14 +5,12 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
import com.imaginarycode.minecraft.redisbungee.RedisBungeeBungeePlugin; import com.imaginarycode.minecraft.redisbungee.RedisBungeeBungeePlugin;
import com.imaginarycode.minecraft.redisbungee.internal.RedisBungeePlugin;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
import java.net.InetAddress; import java.net.InetAddress;

2
RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RBUtils.java → RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/PlayerUtils.java
View File

@ -1,7 +1,7 @@
package com.imaginarycode.minecraft.redisbungee; package com.imaginarycode.minecraft.redisbungee;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.imaginarycode.minecraft.redisbungee.internal.AbstractDataManager; import com.imaginarycode.minecraft.redisbungee.api.AbstractDataManager;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.ServerConnection;
import redis.clients.jedis.Pipeline; import redis.clients.jedis.Pipeline;