X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=f7b05952cd50ed46ee7255163a48cee125cc7236;hb=f44a2c07039e9f86fbc5927f6ba097d9d42b3e21;hp=867092410952132fbed87c87c7c37ac8d2f3c8e9;hpb=c9aed227f82c103fefe81355ebff9dfbe2c6ef53;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java index 8670924..f7b0595 100644 --- a/src/main/java/net/pterodactylus/xdcc/core/Core.java +++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java @@ -18,8 +18,6 @@ package net.pterodactylus.xdcc.core; import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; -import static java.util.concurrent.TimeUnit.HOURS; import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned; import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly; import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance; @@ -33,15 +31,21 @@ 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; -import net.pterodactylus.irc.ConnectionBuilder; +import net.pterodactylus.irc.ConnectionFactory; import net.pterodactylus.irc.DccReceiver; +import net.pterodactylus.irc.DefaultConnection; import net.pterodactylus.irc.event.ChannelJoined; import net.pterodactylus.irc.event.ChannelLeft; import net.pterodactylus.irc.event.ChannelMessageReceived; @@ -70,12 +74,12 @@ import net.pterodactylus.xdcc.core.event.GenericMessage; import net.pterodactylus.xdcc.core.event.MessageReceived; import net.pterodactylus.xdcc.data.Bot; import net.pterodactylus.xdcc.data.Channel; +import net.pterodactylus.xdcc.data.ConnectedNetwork; import net.pterodactylus.xdcc.data.Download; import net.pterodactylus.xdcc.data.Network; import net.pterodactylus.xdcc.data.Pack; import net.pterodactylus.xdcc.data.Server; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; @@ -105,10 +109,13 @@ public class Core extends AbstractExecutionThreadService { /** The logger. */ private static final Logger logger = Logger.getLogger(Core.class.getName()); + private final Object syncObject = new Object(); /** The event bus. */ private final EventBus eventBus; + 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; @@ -121,6 +128,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(); @@ -148,8 +156,9 @@ public class Core extends AbstractExecutionThreadService { * The directory to move finished files to */ @Inject - public Core(EventBus eventBus, String temporaryDirectory, String finalDirectory) { + public Core(EventBus eventBus, ConnectionFactory connectionFactory, String temporaryDirectory, String finalDirectory) { this.eventBus = eventBus; + this.connectionFactory = connectionFactory; this.temporaryDirectory = temporaryDirectory; this.finalDirectory = finalDirectory; } @@ -181,13 +190,25 @@ public class Core extends AbstractExecutionThreadService { * * @return All connected networks */ - public Collection connectedNetworks() { - return Lists.newArrayList(Optional.presentInstances(FluentIterable.from(networkConnections.values()).transform(new Function>() { - @Override - public Optional apply(Connection connection) { - return getNetwork(connection); - } - }))); + public Collection connectedNetworks() { + return networkConnections.entrySet().stream().map((entry) -> { + Network network = entry.getKey(); + Collection bots = networkBots.row(network).values(); + int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).orElse(0); + return new ConnectedNetwork(network, entry.getValue().hostname(), + entry.getValue().port(), entry.getValue().nickname(), + channels.stream() + .filter((channel) -> channel.network() + .equals(network)) + .map(Channel::name) + .collect(Collectors.toList()), + extraChannels.stream() + .filter((channel) -> channel.network() + .equals(network)) + .map(Channel::name) + .collect(Collectors.toList()), + bots.size(), packCount); + }).collect(Collectors.toList()); } /** @@ -362,39 +383,76 @@ public class Core extends AbstractExecutionThreadService { @Override protected void run() throws Exception { while (isRunning()) { - try { - Thread.sleep(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; } - - 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()))); + if (networkConnections.containsKey(channel.network())) { + if (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 (!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 { - connection.joinChannel(channel.name()); + channelsBeingJoined.add(missingChannel); + networkConnections.get(network).joinChannel(missingChannel.name()); } catch (IOException ioe1) { - eventBus.post(new GenericMessage(String.format("Could not join %s on %s.", channel.name(), channel.network().name()))); + logger.warn(String.format("Could not join %s on %s!", missingChannel.name(), network.name()), ioe1); + } + } + } else if (missingNetworks.isEmpty()) { + synchronized (syncObject) { + try { + syncObject.wait(TimeUnit.MINUTES.toMillis(1)); + } catch (InterruptedException ie1) { + /* ignore. */ + } + } + continue; + } + + Map timesForNextConnects = new TreeMap<>(missingNetworks.stream() + .collect(Collectors.toMap(connectionBackoff::getBackoff, Function.identity(), (network, ignore) -> network))); + + Entry firstNetwork = timesForNextConnects.entrySet().stream().findFirst().get(); + if (firstNetwork.getKey() > 0) { + eventBus.post(new GenericMessage(String.format("Waiting %d seconds to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.getKey()), firstNetwork.getValue().name()))); + synchronized (syncObject) { + try { + syncObject.wait(firstNetwork.getKey()); + } catch (InterruptedException ie1) { + /* ignore. */ } } + if (!isRunning()) { + break; + } } + + connectNetwork(firstNetwork.getValue()); } } @Override - protected void shutDown() { + protected void triggerShutdown() { + synchronized (syncObject) { + syncObject.notifyAll(); + } } // @@ -417,10 +475,11 @@ public class Core extends AbstractExecutionThreadService { return; } Server server = servers.get((int) (Math.random() * servers.size())); - Connection connection = new ConnectionBuilder(eventBus).connect(server.hostname()).port(server.unencryptedPorts().iterator().next()).build(); + Connection connection = connectionFactory.createConnection(server.hostname(), + server.unencryptedPorts().iterator().next()); connection.username(RandomNickname.get()).realName(RandomNickname.get()); networkConnections.put(network, connection); - connection.start(); + connection.open(); } } @@ -435,6 +494,10 @@ public class Core extends AbstractExecutionThreadService { if (!network.isPresent()) { return; } + networkConnections.remove(network.get()); + if (!connection.established()) { + return; + } /* find all channels that need to be removed. */ for (Collection channels : ImmutableList.of(joinedChannels, extraChannels)) { @@ -457,9 +520,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()); } // @@ -485,6 +545,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. */ @@ -508,7 +569,9 @@ public class Core extends AbstractExecutionThreadService { */ @Subscribe public void connectionClosed(ConnectionClosed connectionClosed) { + connectionBackoff.connectionFailed(getNetwork(connectionClosed.connection()).get()); removeConnection(connectionClosed.connection()); + eventBus.post(new GenericMessage(String.format("Connection closed by %s.", connectionClosed.connection().hostname()))); } /** @@ -519,7 +582,9 @@ public class Core extends AbstractExecutionThreadService { */ @Subscribe public void connectionFailed(ConnectionFailed connectionFailed) { + connectionBackoff.connectionFailed(getNetwork(connectionFailed.connection()).get()); removeConnection(connectionFailed.connection()); + eventBus.post(new GenericMessage(String.format("Could not connect to %s: %s.", connectionFailed.connection().hostname(), connectionFailed.cause()))); } /** @@ -546,6 +611,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())); } } @@ -563,18 +629,28 @@ public class Core extends AbstractExecutionThreadService { return; } + channelsBeingJoined.remove(channel.get()); + + /* remove all bots for this channel, we might have been kicked. */ + Collection botsToRemove = networkBots.row(network.get()) + .values().stream() + .filter(bot -> bot.channel() + .equalsIgnoreCase(channel.get().name())) + .collect(Collectors.toSet()); + botsToRemove.stream() + .forEach(bot -> networkBots.row(network.get()) + .remove(bot.name())); + if (channelNotJoined.reason() == registeredNicknamesOnly) { - Optional channel = getChannel(network.get(), channelNotJoined.channel()); - if (channel.isPresent()) { - eventBus.post(new GenericMessage(format("Not trying to join %s anymore.", channel.get()))); - channels.remove(channel.get()); - } + 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()); eventBus.post(new GenericMessage( - format("Banned from %s, suspending join for day.", + format("Banned from %s, suspending join for a day.", channel.get()))); return; } @@ -642,9 +718,9 @@ public class Core extends AbstractExecutionThreadService { return; } - extraChannels.remove(channel); + extraChannels.remove(channel.get()); } else { - channels.remove(channel.get()); + joinedChannels.remove(channel.get()); } eventBus.post(new GenericMessage(format( "Kicked from %s by %s: %s", @@ -727,7 +803,8 @@ public class Core extends AbstractExecutionThreadService { Bot bot; synchronized (networkBots) { if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) { - bot = new Bot(network.get(), channelMessageReceived.source().nick().get()); + bot = new Bot(network.get(), channelMessageReceived.channel(), + channelMessageReceived.source().nick().get()); networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot); eventBus.post(new BotAdded(bot)); } else {