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;
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;
/** 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;
/** The channels that are currentlymonitored. */
private final Collection<Channel> joinedChannels = Sets.newHashSet();
+ private final Set<Channel> channelsBeingJoined = new HashSet<>();
/** The channels that are joined but not configured. */
private final Collection<Channel> extraChannels = Sets.newHashSet();
* 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;
}
return networkConnections.entrySet().stream().map((entry) -> {
Network network = entry.getKey();
Collection<Bot> bots = networkBots.row(network).values();
- int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).getAsInt();
+ 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()
@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<Channel> 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<Network> 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<Long, Network> 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<Entry<Long, Network>> 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());
}
}
@Override
- protected void shutDown() {
+ protected void triggerShutdown() {
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
}
//
return;
}
Server server = servers.get((int) (Math.random() * servers.size()));
- Connection connection = new ConnectionBuilder(eventBus).connect(server.hostname()).port(server.unencryptedPorts().iterator().next()).build();
+ 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());
networkConnections.put(network, connection);
- connection.start();
+ connection.open();
}
}
if (!network.isPresent()) {
return;
}
+ networkConnections.remove(network.get());
if (!connection.established()) {
return;
}
}
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());
}
//
return;
}
+ connectionBackoff.connectionSuccessful(network.get());
eventBus.post(new GenericMessage(String.format("Connected to network %s.", network.get().name())));
/* join all channels on this network. */
*/
@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())));
}
/**
*/
@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())));
}
/**
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()));
}
}
}
Optional<Channel> 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<Bot> 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()));
+
+ 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("Banned from %s, suspending join for day.",
+ format("%s is invite-only, suspending join for a day.",
channel.get())));
- return;
+ } else if (channelNotJoined.reason() == banned) {
+ eventBus.post(new GenericMessage(
+ format("Banned from %s, suspending join for a day.",
+ channel.get())));
+ } 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())));
}
/**
} 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())));
}
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",
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 {
projects / xudocci.git / blobdiff