Send connection closed event when a runtime exception occurs.

[xudocci.git] / src / main / java / net / pterodactylus / irc / Connection.java

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index ac29809..b67b8db 100644 (file)
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.irc;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
@@ -60,6 +61,8 @@ import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.event.PrivateNoticeReceived;
 import net.pterodactylus.irc.event.UnknownReplyReceived;
 import net.pterodactylus.irc.util.RandomNickname;
+import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
+import net.pterodactylus.xdcc.util.io.BandwidthCountingOutputStream;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
@@ -144,6 +147,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
        //
 
        /**
+        * Returns the hostname of the remote end of the connection.
+        *
+        * @return The remote’s hostname
+        */
+       public String hostname() {
+               return hostname;
+       }
+
+       /**
+        * Returns the port number of the remote end of the connection.
+        *
+        * @return The remote’s port number
+        */
+       public int port() {
+               return port;
+       }
+
+       /**
         * Returns whether this connection has already been established.
         *
         * @return {@code true} as long as this connection is established, {@code
@@ -221,6 +242,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
        //
 
        /**
+        * Returns the current rate of the connection’s incoming side.
+        *
+        * @return The current input rate (in bytes per second)
+        */
+       public long getInputRate() {
+               return (connectionHandler != null) ? connectionHandler.getInputRate() : 0;
+       }
+
+       /**
+        * Returns the current rate of the connection’s outgoing side.
+        *
+        * @return The current output rate (in bytes per second)
+        */
+       public long getOutputRate() {
+               return (connectionHandler != null) ? connectionHandler.getOutputRate() : 0;
+       }
+
+       /**
         * Checks whether the given source is the client represented by this
         * connection.
         *
@@ -472,6 +511,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                } catch (IOException ioe1) {
                        logger.log(Level.WARNING, "I/O error", ioe1);
                        eventBus.post(new ConnectionClosed(this, ioe1));
+               } catch (RuntimeException re1) {
+                       logger.log(Level.SEVERE, "Runtime error", re1);
+                       eventBus.post(new ConnectionClosed(this, re1));
                } finally {
                        established = false;
                        logger.info("Closing Connection.");
@@ -571,7 +613,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
        private class ConnectionHandler implements Closeable {
 
                /** The output stream of the connection. */
-               private final OutputStream outputStream;
+               private final BandwidthCountingOutputStream outputStream;
+
+               /** The input stream. */
+               private final BandwidthCountingInputStream inputStream;
 
                /** The input stream of the connection. */
                private final BufferedReader inputStreamReader;
@@ -588,8 +633,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                 *              if the encoding (currently “UTF-8”) is not valid
                 */
                private ConnectionHandler(InputStream inputStream, OutputStream outputStream) throws UnsupportedEncodingException {
-                       this.outputStream = outputStream;
-                       inputStreamReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+                       this.outputStream = new BandwidthCountingOutputStream(outputStream, 5, SECONDS);
+                       this.inputStream = new BandwidthCountingInputStream(inputStream, 5, SECONDS);
+                       inputStreamReader = new BufferedReader(new InputStreamReader(this.inputStream, "UTF-8"));
                }
 
                //
@@ -597,6 +643,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                //
 
                /**
+                * Returns the current rate of the connection’s incoming side.
+                *
+                * @return The current input rate (in bytes per second)
+                */
+               public long getInputRate() {
+                       return inputStream.getCurrentRate();
+               }
+
+               /**
+                * Returns the current rate of the connection’s outgoing side.
+                *
+                * @return The current output rate (in bytes per second)
+                */
+               public long getOutputRate() {
+                       return outputStream.getCurrentRate();
+               }
+
+               /**
                 * Sends a command with the given parameters, skipping all {@link
                 * Optional#absent()} optionals.
                 *