From 830983d461fddced10587104347dba06924068f3 Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sat, 16 Jul 2016 20:44:01 -0400 Subject: [PATCH] Add timeout variant to connect methods Also added more connect methods to ProxiedPlayer, in addition to the new method diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java index 333d3972..454a7229 100644 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java @@ -110,6 +110,38 @@ public interface ProxiedPlayer extends Connection, CommandSender */ void connect(ServerInfo target, Callback callback); + // Waterfall start + /** + * Connects / transfers this user to the specified connection, gracefully + * closing the current one. Depending on the implementation, this method + * might return before the user has been connected. + * + * @param target the new server to connect to + * @param callback the method called when the connection is complete, or + * when an exception is encountered. The boolean parameter denotes success + * or failure. + * @param retry whether to retry the connection if the initial connection + * fails. + */ + void connect(ServerInfo target, Callback callback, boolean retry); + + /** + * Connects / transfers this user to the specified connection, gracefully + * closing the current one. Depending on the implementation, this method + * might return before the user has been connected. + * + * @param target the new server to connect to + * @param callback the method called when the connection is complete, or + * when an exception is encountered. The boolean parameter denotes success + * or failure. + * @param retry whether to retry the connection if the initial connection + * fails. + * @param timeout timeout in milliseconds of the connection created to the + * target server + */ + void connect(ServerInfo target, Callback callback, boolean retry, int timeout); + // Waterfall end + /** * Connects / transfers this user to the specified connection, gracefully * closing the current one. Depending on the implementation, this method @@ -123,6 +155,25 @@ public interface ProxiedPlayer extends Connection, CommandSender */ void connect(ServerInfo target, Callback callback, ServerConnectEvent.Reason reason); + // Waterfall start + /** + * Connects / transfers this user to the specified connection, gracefully + * closing the current one. Depending on the implementation, this method + * might return before the user has been connected. + * + * @param target the new server to connect to + * @param callback the method called when the connection is complete, or + * when an exception is encountered. The boolean parameter denotes success + * or failure. + * @param retry whether to retry the connection if the initial connection + * fails. + * @param reason the reason for connecting to the new server + * @param timeout timeout in milliseconds of the connection created to the + * target server + */ + void connect(ServerInfo target, Callback callback, boolean retry, ServerConnectEvent.Reason reason, int timeout); + // Waterfall end + /** * Gets the server this player is connected to. * diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index 61502ea8..8344a9b6 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -256,6 +256,16 @@ public final class UserConnection implements ProxiedPlayer public void connect(ServerInfo info, final Callback callback, final boolean retry, ServerConnectEvent.Reason reason) { + // Waterfall start + connect(info, callback, retry, reason, 5000); // todo: configurable + } + public void connect(ServerInfo info, final Callback callback, final boolean retry, int timeout) { + connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout); + } + + public void connect(ServerInfo info, final Callback callback, final boolean retry, ServerConnectEvent.Reason reason, final int timeout) + { + // Waterfall end Preconditions.checkNotNull( info, "info" ); ServerConnectEvent event = new ServerConnectEvent( this, info, reason ); @@ -329,7 +339,7 @@ public final class UserConnection implements ProxiedPlayer if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) ) { sendMessage( bungee.getTranslation( "fallback_lobby" ) ); - connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK ); + connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK, timeout ); // Waterfall } else if ( dimensionChange ) { disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) ); @@ -344,7 +354,7 @@ public final class UserConnection implements ProxiedPlayer .channel( PipelineUtils.getChannel() ) .group( ch.getHandle().eventLoop() ) .handler( initializer ) - .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable + .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, timeout ) // Waterfall .remoteAddress( target.getAddress() ); // Windows is bugged, multi homed users will just have to live with random connecting IPs if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() ) -- 2.18.0