X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=d39ee2bd0ffe241a933ad8ae0c844f99c21a93f4;hp=57971f996db3ea9201ac9aa40329e6f723a93340;hb=d8c6d72caaa1ba75d09bd28f2bb10ae6f4964bf4;hpb=9a60e3ecfba9f3c5e6ae2dbae9bcdb62459faa07 diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java index 57971f9..d39ee2b 100644 --- a/src/main/java/net/pterodactylus/xdcc/core/Core.java +++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java @@ -19,6 +19,7 @@ package net.pterodactylus.xdcc.core; import static java.lang.String.format; import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned; +import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly; import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly; import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance; import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK; @@ -31,11 +32,15 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import java.util.stream.Collectors; import net.pterodactylus.irc.Connection; @@ -111,6 +116,7 @@ public class Core extends AbstractExecutionThreadService { private final ConnectionFactory connectionFactory; private final ChannelBanManager channelBanManager = new ChannelBanManager(); + private final ConnectionBackoff connectionBackoff = new ConnectionBackoff(); /** The temporary directory to download files to. */ private final String temporaryDirectory; @@ -123,6 +129,7 @@ public class Core extends AbstractExecutionThreadService { /** The channels that are currentlymonitored. */ private final Collection joinedChannels = Sets.newHashSet(); + private final Set channelsBeingJoined = new HashSet<>(); /** The channels that are joined but not configured. */ private final Collection extraChannels = Sets.newHashSet(); @@ -377,36 +384,74 @@ public class Core extends AbstractExecutionThreadService { @Override protected void run() throws Exception { while (isRunning()) { - synchronized (syncObject) { - try { - syncObject.wait(TimeUnit.MINUTES.toMillis(1)); - } catch (InterruptedException ie1) { - /* ignore. */ - } - } - /* find channels that should be monitored but are not. */ + Set missingChannels = new HashSet<>(); for (Channel channel : channels) { - if (joinedChannels.contains(channel)) { + if (joinedChannels.contains(channel) || channelsBeingJoined.contains(channel)) { continue; } - - /* are we banned from this channel? */ if (channelBanManager.isBanned(channel)) { continue; } + if (!networkConnections.containsKey(channel.network()) || networkConnections.get(channel.network()).established()) { + missingChannels.add(channel); + } + } + Set missingNetworks = missingChannels.stream() + .map(Channel::network) + .distinct() + .filter((network) -> !networkConnections.containsKey(network)) + .collect(Collectors.toSet()); + + if (missingNetworks.isEmpty()) { + if (!missingChannels.isEmpty()) { + for (Channel missingChannel : missingChannels) { + Network network = missingChannel.network(); + eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", missingChannel.name(), network))); + try { + channelsBeingJoined.add(missingChannel); + networkConnections.get(network).joinChannel(missingChannel.name()); + } catch (IOException ioe1) { + logger.warn(String.format("Could not join %s on %s!", missingChannel.name(), network.name()), ioe1); + } + } + } else { + synchronized (syncObject) { + try { + syncObject.wait(TimeUnit.MINUTES.toMillis(1)); + } catch (InterruptedException ie1) { + /* ignore. */ + } + } + } + continue; + } + + Map timesForNextConnects = new TreeMap<>(missingNetworks.stream() + .collect(Collectors.toMap(connectionBackoff::getConnectionTime, Function.identity(), (network, ignore) -> network))); - connectNetwork(channel.network()); - Connection connection = networkConnections.get(channel.network()); - if (connection.established()) { - eventBus.post(new GenericMessage(String.format("Trying to join %s on %s.", channel.name(), channel.network().name()))); + Optional> firstNetwork = Optional.fromNullable(timesForNextConnects.entrySet().stream().findFirst().orElse(null)); + if (!firstNetwork.isPresent()) { + continue; + } + if (firstNetwork.get().getKey() > System.currentTimeMillis()) { + eventBus.post(new GenericMessage(String.format("Will connect to %2$s at %1$tH:%1$tM...", firstNetwork.get().getKey(), firstNetwork.get().getValue().name()))); + synchronized (syncObject) { try { - connection.joinChannel(channel.name()); - } catch (IOException ioe1) { - eventBus.post(new GenericMessage(String.format("Could not join %s on %s.", channel.name(), channel.network().name()))); + syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis()); + } catch (InterruptedException ie1) { + /* ignore. */ } } + if (!isRunning()) { + break; + } + if (firstNetwork.get().getKey() > System.currentTimeMillis()) { + continue; + } } + + connectNetwork(firstNetwork.get().getValue()); } } @@ -437,6 +482,7 @@ public class Core extends AbstractExecutionThreadService { return; } Server server = servers.get((int) (Math.random() * servers.size())); + eventBus.post(new GenericMessage(String.format("Connecting to %s on %s...", network.name(), server.hostname()))); Connection connection = connectionFactory.createConnection(server.hostname(), server.unencryptedPorts().iterator().next()); connection.username(RandomNickname.get()).realName(RandomNickname.get()); @@ -456,6 +502,7 @@ public class Core extends AbstractExecutionThreadService { if (!network.isPresent()) { return; } + networkConnections.remove(network.get()); if (!connection.established()) { return; } @@ -481,9 +528,6 @@ public class Core extends AbstractExecutionThreadService { } bots.clear(); eventBus.post(new GenericMessage(String.format("Network %s disconnected, %d bots removed, %d packs removed.", network.get().name(), botCount, packCount))); - - /* now remove the network. */ - networkConnections.remove(network.get()); } // @@ -509,6 +553,7 @@ public class Core extends AbstractExecutionThreadService { return; } + connectionBackoff.connectionSuccessful(network.get()); eventBus.post(new GenericMessage(String.format("Connected to network %s.", network.get().name()))); /* join all channels on this network. */ @@ -532,7 +577,12 @@ public class Core extends AbstractExecutionThreadService { */ @Subscribe public void connectionClosed(ConnectionClosed connectionClosed) { + connectionBackoff.connectionFailed(getNetwork(connectionClosed.connection()).get()); removeConnection(connectionClosed.connection()); + synchronized (syncObject) { + syncObject.notifyAll(); + } + eventBus.post(new GenericMessage(String.format("Connection closed by %s.", connectionClosed.connection().hostname()))); } /** @@ -543,7 +593,12 @@ public class Core extends AbstractExecutionThreadService { */ @Subscribe public void connectionFailed(ConnectionFailed connectionFailed) { + connectionBackoff.connectionFailed(getNetwork(connectionFailed.connection()).get()); removeConnection(connectionFailed.connection()); + synchronized (syncObject) { + syncObject.notifyAll(); + } + eventBus.post(new GenericMessage(String.format("Could not connect to %s: %s.", connectionFailed.connection().hostname(), connectionFailed.cause()))); } /** @@ -570,6 +625,7 @@ public class Core extends AbstractExecutionThreadService { channelBanManager.unban(channel.get()); joinedChannels.add(channel.get()); + channelsBeingJoined.remove(channel.get()); logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name())); } } @@ -582,10 +638,15 @@ public class Core extends AbstractExecutionThreadService { } Optional channel = getChannel(network.get(), channelNotJoined.channel()); + synchronized (syncObject) { + syncObject.notifyAll(); + } if (!channel.isPresent()) { - eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channel.get()))); + eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channelNotJoined.channel()))); return; } + channelsBeingJoined.remove(channel.get()); + /* remove all bots for this channel, we might have been kicked. */ Collection botsToRemove = networkBots.row(network.get()) @@ -597,23 +658,23 @@ public class Core extends AbstractExecutionThreadService { .forEach(bot -> networkBots.row(network.get()) .remove(bot.name())); + channelBanManager.ban(channel.get()); if (channelNotJoined.reason() == registeredNicknamesOnly) { - channels.remove(channel.get()); eventBus.post(new GenericMessage( format("Not trying to join %s anymore.", channel.get()))); - return; - } - if (channelNotJoined.reason() == banned) { - channelBanManager.ban(channel.get()); + } else if (channelNotJoined.reason() == inviteOnly) { + eventBus.post(new GenericMessage( + format("%s is invite-only, suspending join for a day.", + channel.get()))); + } else if (channelNotJoined.reason() == banned) { eventBus.post(new GenericMessage( format("Banned from %s, suspending join for a day.", channel.get()))); - return; + } else { + eventBus.post(new GenericMessage( + format("Could not join %s: %s", channelNotJoined.channel(), + channelNotJoined.reason()))); } - - eventBus.post(new GenericMessage( - format("Could not join %s: %s", channelNotJoined.channel(), - channelNotJoined.reason()))); } /** @@ -646,6 +707,9 @@ public class Core extends AbstractExecutionThreadService { } else { channels.remove(channel.get()); } + synchronized (syncObject) { + syncObject.notifyAll(); + } eventBus.post(new GenericMessage(String.format("Left Channel %s on %s.", channel.get().name(), channel.get().network().name()))); } @@ -674,9 +738,12 @@ public class Core extends AbstractExecutionThreadService { return; } - extraChannels.remove(channel); + extraChannels.remove(channel.get()); } else { - channels.remove(channel.get()); + joinedChannels.remove(channel.get()); + } + synchronized (syncObject) { + syncObject.notifyAll(); } eventBus.post(new GenericMessage(format( "Kicked from %s by %s: %s",