NuVotifier 2.7.2

Relocate gson

.drone.yml

@@ -1,16 +0,0 @@
-pipeline:
-  build:
-    image: cogniteev/oracle-java
-    commands: ./gradlew build test --no-daemon
-  publish:
-    image: cogniteev/oracle-java
-    commands: 
-    - ./gradlew publishversionedPublicationToParallelBlockRepository
-    - ./gradlew publishLatestToParallelBlockRaw
-    environment:
-      - PUBLISH=yes
-      - LATEST_BUILD=yes
-    secrets: [SNAPSHOT_REPO, RELEASE_REPO, REPO_USERNAME, REPO_PASSWORD, RAW_UPLOAD_PATH]
-    when:
-      branch: master
-      event: push

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.paypal.me/ibj

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,73 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Thank you for submitting an issue for NuVotifier. We appreciate
+any and all bug reports.
+
+Before you continue, please ensure you are reporting
+a real bug and are not suffering from a configuration issue
+or a plugin problem. Once NuVotifier has received and
+called your vote listeners, it's not our issue any more.
+
+If you are having difficulty setting up NuVotifier to receive
+votes, you are in the wrong place. Please view our wiki
+at https://github.com/NuVotifier/NuVotifier/wiki for a
+comprehensive set of instructions for configuring and
+diagnosing common problems with NuVotifier.
+
+If you are certain that there is a problem with
+NuVotifier, please continue filling the form below.
+Make sure to follow these instructions:
+
+1. Tell the exact NuVotifier version you're using.
+   If you just say "latest" your issue will get closed.
+2. Please include all relevant logs and configuration
+   files. Make sure to redact any tokens in the config
+   file.
+3. Don't write anything between these arrows.
+   We won't see it otherwise.
+4. Before you create your issue, delete this block of
+   text and the code block at the very bottom. -->
+
+### Information
+
+**Platform on which you run NuVotifier**: <!-- Either Bukkit, Sponge, BungeeCord, or Velocity. -->
+
+**Version of NuVotifier**: 
+
+```
+<!--
+Getting this depends on your platform:
+
+Bukkit: Use /version Votifier
+
+Sponge: Use /sponge plugins and find NuVotifier
+
+BungeeCord: No such command exists.
+
+Velocity: Use /velocity plugins from in-game and hover over "nuvotifier"
+-->
+```
+
+**Relevant log**: <!-- Paste the log on https://gist.github.com/, replace this with link -->
+### Details
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+```
+Please make sure to delete this line of text and the three ``` characters surrounding it, or your issue will be closed.
+```

.gitignore

@@ -46,3 +46,4 @@ debug.txt
 
 # gradle stuff
 .gradle/
+.gradletasknamecache

Jenkinsfile

@@ -0,0 +1,37 @@
+pipeline {
+    agent {
+        docker { image 'openjdk:12-jdk' }
+    }
+
+    stages {
+        stage('Build') {
+            steps {
+                sh './gradlew build --no-daemon'            
+            }
+        }
+        
+        stage('Test') {
+            steps {
+                sh './gradlew test --no-daemon'            
+            }
+        }
+        
+        stage('Publish') {
+            when {
+                branch "master"
+            }
+            environment {
+                SNAPSHOT_REPO   = credentials('ibj-nexus-snapshot-repo')
+                RELEASE_REPO    = credentials('ibj-nexus-release-repo')
+                RAW_UPLOAD_PATH = credentials('ibj-nexus-raw-path')
+                REPO            = credentials('ibj-nexus-access')
+                PUBLISH = 'true'
+                LATEST_BUILD = 'true'
+            }
+            steps {
+                sh './gradlew publishVersionedPublicationToIbjRepository'
+                sh './gradlew publishLatestToIbjBlockRaw'
+            }
+        }
+    }
+}

README.md

@@ -1,35 +1,25 @@
 # NuVotifier
 
-NuVotifier is a Bukkit plugin whose purpose is to be notified (aka *votified*)
-when a vote is made on a Minecraft server top list for the server.  NuVotifier
-creates a *lightweight* server that waits for connections by Minecraft server
-lists and uses a simple protocol to get the required information.  NuVotifier is
-*secure*, and makes sure that all vote notifications are delivered by authentic
-top lists.
+NuVotifier is a secure alternative to using the original Votifier project.
+NuVotifier will work in place of Votifier - any vote listener that supports
+Votifier will also support NuVotifier.
 
-## Why fork Votifier?
+NuVotifier supports many different platforms using the same universal JAR:
 
-Votifier has lagged in activity, has severe security flaws in its protocol, and
-is vulnerable to denial of service attacks.
++ Bukkit / Spigot / Paper >=1.7.10
++ Sponge 7
++ BungeeCord / Waterfall
++ Velocity
 
-## Is NuVotifier a drop-in replacement for Votifier?
+NuVotifier also adds forwarding and listener test commands not present in the
+original version.
 
-Yes! Except for some minor non-breaking changes (look into the [technical qa
-docs](docs/technical_qa.md) for more info), NuVotifier is 100% compatible with
-the old Votifier with many more features.
+[Setup Guide](https://github.com/NuVotifier/NuVotifier/wiki/Setup-Guide)
 
-# Documentation / Configuration Guide
+[Troubleshooting Guide](https://github.com/NuVotifier/NuVotifier/wiki/Troubleshooting-Guide)
 
-All documentation is located under the [docs](docs/) directory. A server admin
-configuration guide is available [here](docs/usage.md).
-
-# Support
-
-Feel free to join the MOSS Discord server using the below link:
-
-[![Discord](https://i.imgur.com/HLPoNnY.png)](https://discord.gg/anUtuAC)
+[Developer Information](https://github.com/NuVotifier/NuVotifier/wiki/Developer-Documentation)
 
 # License
 
-NuVotifier is GNU GPLv3 licensed. This project's license can be viewed
-[here](LICENSE).
+NuVotifier is GNU GPLv3 licensed. This project's license can be viewed [here](LICENSE).

api/README.md

@@ -0,0 +1,4 @@
+# nuvotifier-api
+
+Files in this directory have a strong API promise - they really shouldn't
+change over time. Feel free to depend against it!

api/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    implementation 'com.google.code.gson:gson:2.8.0'
+}

api/src/main/java/com/vexsoftware/votifier/model/Vote.java

@@ -21,6 +21,9 @@ package com.vexsoftware.votifier.model;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+import java.util.Arrays;
+import java.util.Base64;
+
 /**
  * A model for a vote.
  *
@@ -48,26 +51,31 @@ public class Vote {
      */
     private String timeStamp;
 
-    /**
-     * Timestamp (unix-millis) normalized and taken from a known source
-     */
-    private final long localTimestamp;
+    private byte[] additionalData;
 
     @Deprecated
     public Vote() {
-        localTimestamp = System.currentTimeMillis();
     }
 
     public Vote(String serviceName, String username, String address, String timeStamp) {
-        this(serviceName, username, address, timeStamp, System.currentTimeMillis());
-    }
-
-    public Vote(String serviceName, String username, String address, String timeStamp, long localTimestamp) {
         this.serviceName = serviceName;
         this.username = username;
         this.address = address;
         this.timeStamp = timeStamp;
-        this.localTimestamp = localTimestamp;
+        this.additionalData = null;
+    }
+
+    public Vote(String serviceName, String username, String address, String timeStamp, byte[] additionalData) {
+        this.serviceName = serviceName;
+        this.username = username;
+        this.address = address;
+        this.timeStamp = timeStamp;
+        this.additionalData = additionalData == null ? null : additionalData.clone();
+    }
+
+    public Vote(Vote vote) {
+        this(vote.getServiceName(), vote.getUsername(), vote.getAddress(), vote.getTimeStamp(),
+                vote.getAdditionalData() == null ? null : vote.getAdditionalData().clone());
     }
 
     private static String getTimestamp(JsonElement object) {
@@ -82,16 +90,22 @@ public class Vote {
         this(jsonObject.get("serviceName").getAsString(),
                 jsonObject.get("username").getAsString(),
                 jsonObject.get("address").getAsString(),
-                getTimestamp(jsonObject.get("timestamp")),
-                // maintained for backwards compatibility with <2.3.6 peers
-                (jsonObject.has("localTimestamp") ? jsonObject.get("localTimestamp").getAsLong() : System.currentTimeMillis()));
+                getTimestamp(jsonObject.get("timestamp")));
+        if (jsonObject.has("additionalData"))
+            additionalData = Base64.getDecoder().decode(jsonObject.get("additionalData").getAsString());
     }
 
     @Override
     public String toString() {
+        String data;
+        if (additionalData == null)
+            data = "null";
+        else
+            data = Base64.getEncoder().encodeToString(additionalData);
+
         return "Vote (from:" + serviceName + " username:" + username
                 + " address:" + address + " timeStamp:" + timeStamp
-                + " localTimestamp:" + localTimestamp + ")";
+                + " additionalData:" + data + ")";
     }
 
     /**
@@ -171,12 +185,12 @@ public class Vote {
     }
 
     /**
-     * Gets the local timestamp, in unix-millis. Calculated locally by a NuVotifier instance
+     * Returns additional data sent with the vote, if it exists.
      *
-     * @return The local timestamp
+     * @return Additional data sent with the vote
      */
-    public long getLocalTimestamp() {
-        return localTimestamp;
+    public byte[] getAdditionalData() {
+        return additionalData == null ? null : additionalData.clone();
     }
 
     public JsonObject serialize() {
@@ -185,21 +199,23 @@ public class Vote {
         ret.addProperty("username", username);
         ret.addProperty("address", address);
         ret.addProperty("timestamp", timeStamp);
-        ret.addProperty("localTimestamp", localTimestamp);
+        if (additionalData != null)
+            ret.addProperty("additionalData", Base64.getEncoder().encodeToString(additionalData));
         return ret;
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (!(o instanceof Vote)) return false;
 
         Vote vote = (Vote) o;
 
         if (!serviceName.equals(vote.serviceName)) return false;
         if (!username.equals(vote.username)) return false;
         if (!address.equals(vote.address)) return false;
-        return timeStamp.equals(vote.timeStamp);
+        if (!timeStamp.equals(vote.timeStamp)) return false;
+        return Arrays.equals(additionalData, vote.additionalData);
     }
 
     @Override

api/src/test/java/com/vexsoftware/votifier/model/VoteTest.java

@@ -0,0 +1,77 @@
+package com.vexsoftware.votifier.model;
+
+import com.google.gson.JsonObject;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class VoteTest {
+    @Test
+    public void testVoteConstructFromJsonObject() {
+
+        String serviceName = "serviceNameA";
+        String username = "usernameA";
+        String address = "home";
+        String timestamp = "1234";
+
+        JsonObject o = new JsonObject();
+        o.addProperty("serviceName", serviceName);
+        o.addProperty("username", username);
+        o.addProperty("address", address);
+        o.addProperty("timestamp", timestamp);
+
+        Vote v = new Vote(o);
+
+        assertEquals(serviceName, v.getServiceName());
+        assertEquals(username, v.getUsername());
+        assertEquals(address, v.getAddress());
+        assertEquals(timestamp, v.getTimeStamp());
+    }
+
+    @Test
+    public void testVoteConstructFromJsonObjectLongTS() {
+
+        String serviceName = "serviceNameA";
+        String username = "usernameA";
+        String address = "home";
+
+        JsonObject o = new JsonObject();
+        o.addProperty("serviceName", serviceName);
+        o.addProperty("username", username);
+        o.addProperty("address", address);
+        o.addProperty("timestamp", 1234);
+
+        Vote v = new Vote(o);
+
+        assertEquals(serviceName, v.getServiceName());
+        assertEquals(username, v.getUsername());
+        assertEquals(address, v.getAddress());
+        assertEquals("1234", v.getTimeStamp());
+    }
+
+    @Test
+    public void testVoteSerialize() {
+        Vote v = new Vote("service", "username", "address", "1234");
+        JsonObject o = v.serialize();
+
+        assertEquals(4, o.size());
+        assertEquals("service", o.get("serviceName").getAsString());
+        assertEquals("username", o.get("username").getAsString());
+        assertEquals("address", o.get("address").getAsString());
+        assertEquals("1234", o.get("timestamp").getAsString());
+    }
+
+    @Test
+    public void testVoteEquals() {
+        Vote v1 = new Vote("service", "username", "address", "1234");
+        assertEquals(v1, v1);
+        assertEquals(v1.hashCode(), new Vote("service", "username", "address", "1234").hashCode());
+        assertEquals(v1, new Vote("service", "username", "address", "1234"));
+        assertNotEquals(v1, new Object());
+        assertNotEquals(v1, null);
+        assertNotEquals(v1, new Vote("service2", "username", "address", "1234"));
+        assertNotEquals(v1, new Vote("service", "username1", "address", "1234"));
+        assertNotEquals(v1, new Vote("service", "username", "address1", "1234"));
+        assertNotEquals(v1, new Vote("service", "username", "address", "12345"));
+    }
+}

build.gradle

@@ -1,34 +1,60 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
+plugins {
+    id "com.github.spotbugs" version "4.2.4" apply false
+    id "net.kyori.blossom" version "1.1.0" apply false
+}
+
 allprojects {
     group 'com.vexsoftware'
-    version '2.3.7'
+    version '2.7.2'
 }
 
 subprojects {
     apply plugin: 'java'
+    apply plugin: "com.github.spotbugs"
 
     sourceCompatibility = 1.8
 
     repositories {
         mavenCentral()
         maven {
-            url 'https://hub.spigotmc.org/nexus/content/groups/public/'
+            url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
         }
         maven {
-            url "https://oss.sonatype.org/content/groups/public/"
+            url "https://oss.sonatype.org/content/repositories/snapshots"
         }
         maven {
-            url "http://repo.spongepowered.org/maven"
+            url "https://repo.spongepowered.org/maven"
         }
+        maven {
+            url "https://repo.velocitypowered.com/snapshots/"
+        }
+    }
+
+    dependencies {
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+        testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
+        testImplementation "org.mockito:mockito-core:2.+"
     }
 
     processResources {
         filter(ReplaceTokens, tokens: ["app.version": this.project.version])
     }
-}
 
-if (System.env.PUBLISH) {
-    apply from: 'publish.gradle'
+    test {
+        useJUnitPlatform()
+    }
+
+    tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
+        reports {
+            html {
+                enabled = true
+                destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
+                stylesheet = 'fancy-hist.xsl'
+            }
+        }
+    }
 }

bukkit/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
     compileOnly group: "org.spigotmc", name: "spigot-api", version: "1.8.8-R0.1-SNAPSHOT"
-    compile project(":nuvotifier-common")
+    implementation project(":nuvotifier-api")
+    implementation project(":nuvotifier-common")
 }
 

bukkit/src/main/java/com/vexsoftware/votifier/BukkitScheduler.java

@@ -0,0 +1,57 @@
+package com.vexsoftware.votifier;
+
+import com.vexsoftware.votifier.platform.scheduler.ScheduledVotifierTask;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.util.concurrent.TimeUnit;
+
+class BukkitScheduler implements VotifierScheduler {
+    private final NuVotifierBukkit plugin;
+
+    public BukkitScheduler(NuVotifierBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    private int toTicks(int time, TimeUnit unit) {
+        return (int) (unit.toMillis(time) / 50);
+    }
+
+    @Override
+    public ScheduledVotifierTask sync(Runnable runnable) {
+        return new BukkitTaskWrapper(plugin.getServer().getScheduler().runTask(plugin, runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask onPool(Runnable runnable) {
+        return new BukkitTaskWrapper(plugin.getServer().getScheduler().runTaskAsynchronously(plugin, runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit) {
+        return new BukkitTaskWrapper(plugin.getServer().getScheduler().runTaskLater(plugin, runnable, toTicks(delay, unit)));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit) {
+        return new BukkitTaskWrapper(plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, runnable, toTicks(delay, unit)));
+    }
+
+    @Override
+    public ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit) {
+        return new BukkitTaskWrapper(plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, runnable, toTicks(delay, unit), toTicks(repeat, unit)));
+    }
+
+    private static class BukkitTaskWrapper implements ScheduledVotifierTask {
+        private final BukkitTask task;
+
+        private BukkitTaskWrapper(BukkitTask task) {
+            this.task = task;
+        }
+
+        @Override
+        public void cancel() {
+            task.cancel();
+        }
+    }
+}

bukkit/src/main/java/com/vexsoftware/votifier/NuVotifierBukkit.java

@@ -18,39 +18,35 @@
 
 package com.vexsoftware.votifier;
 
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
+import com.vexsoftware.votifier.cmd.NVReloadCmd;
+import com.vexsoftware.votifier.cmd.TestVoteCmd;
 import com.vexsoftware.votifier.forwarding.BukkitPluginMessagingForwardingSink;
-import com.vexsoftware.votifier.forwarding.ForwardedVoteListener;
-import com.vexsoftware.votifier.forwarding.ForwardingVoteSink;
+import com.vexsoftware.votifier.support.forwarding.ForwardedVoteListener;
+import com.vexsoftware.votifier.support.forwarding.ForwardingVoteSink;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
+import com.vexsoftware.votifier.net.VotifierServerBootstrap;
 import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSAKeygen;
+import com.vexsoftware.votifier.platform.JavaUtilLogger;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import com.vexsoftware.votifier.util.IOUtil;
 import com.vexsoftware.votifier.util.KeyCreator;
 import com.vexsoftware.votifier.util.TokenUtil;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.security.Key;
 import java.security.KeyPair;
 import java.util.HashMap;
@@ -66,24 +62,9 @@ import java.util.logging.Level;
 public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, VotifierPlugin, ForwardedVoteListener {
 
     /**
-     * The Votifier instance.
+     * The server bootstrap.
      */
-    private static NuVotifierBukkit instance;
-
-    /**
-     * The current Votifier version.
-     */
-    private String version;
-
-    /**
-     * The server channel.
-     */
-    private Channel serverChannel;
-
-    /**
-     * The event group handling the channel.
-     */
-    private NioEventLoopGroup serverGroup;
+    private VotifierServerBootstrap bootstrap;
 
     /**
      * The RSA key pair.
@@ -101,22 +82,20 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
     private Map<String, Key> tokens = new HashMap<>();
 
     private ForwardingVoteSink forwardingMethod;
+    private VotifierScheduler scheduler;
+    private LoggingAdapter pluginLogger;
 
-    @Override
-    public void onEnable() {
-        NuVotifierBukkit.instance = this;
-
-        // Set the plugin version.
-        version = getDescription().getVersion();
-
+    private boolean loadAndBind() {
+        scheduler = new BukkitScheduler(this);
+        pluginLogger = new JavaUtilLogger(getLogger());
         if (!getDataFolder().exists()) {
-            getDataFolder().mkdir();
+            if (!getDataFolder().mkdir()) {
+                throw new RuntimeException("Unable to create the plugin data folder " + getDataFolder());
+            }
         }
 
         // Handle configuration.
-        File config = new File(getDataFolder() + "/config.yml");
-        YamlConfiguration cfg;
-        File rsaDirectory = new File(getDataFolder() + "/rsa");
+        File config = new File(getDataFolder(), "config.yml");
 
         /*
          * Use IP address from server.properties as a default for
@@ -137,13 +116,15 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                 getLogger().info("Configuring Votifier for the first time...");
 
                 // Initialize the configuration file.
-                config.createNewFile();
+                if (!config.createNewFile()) {
+                    throw new IOException("Unable to create the config file at " + config);
+                }
 
                 // Load and manually replace variables in the configuration.
-                String cfgStr = new String(ByteStreams.toByteArray(getResource("bukkitConfig.yml")), StandardCharsets.UTF_8);
+                String cfgStr = new String(IOUtil.readAllBytes(getResource("bukkitConfig.yml")), StandardCharsets.UTF_8);
                 String token = TokenUtil.newToken();
                 cfgStr = cfgStr.replace("%default_token%", token).replace("%ip%", hostAddr);
-                Files.write(cfgStr, config, StandardCharsets.UTF_8);
+                Files.copy(new ByteArrayInputStream(cfgStr.getBytes(StandardCharsets.UTF_8)), config.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
                 /*
                  * Remind hosted server admins to be sure they have the right
@@ -161,11 +142,13 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                 getLogger().info("------------------------------------------------------------------------------");
             } catch (Exception ex) {
                 getLogger().log(Level.SEVERE, "Error creating configuration file", ex);
-                gracefulExit();
-                return;
+                return false;
             }
         }
 
+        YamlConfiguration cfg;
+        File rsaDirectory = new File(getDataFolder(), "rsa");
+
         // Load configuration.
         cfg = YamlConfiguration.loadConfiguration(config);
 
@@ -175,7 +158,9 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
          */
         try {
             if (!rsaDirectory.exists()) {
-                rsaDirectory.mkdir();
+                if (!rsaDirectory.mkdir()) {
+                    throw new RuntimeException("Unable to create the RSA key folder " + rsaDirectory);
+                }
                 keyPair = RSAKeygen.generate(2048);
                 RSAIO.save(rsaDirectory, keyPair);
             } else {
@@ -184,13 +169,18 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
         } catch (Exception ex) {
             getLogger().log(Level.SEVERE,
                     "Error reading configuration file or RSA tokens", ex);
-            gracefulExit();
-            return;
+            return false;
         }
 
-        debug = cfg.getBoolean("debug", false);
+        // the quiet flag always runs priority to the debug flag
+        if (cfg.isBoolean("quiet")) {
+            debug = !cfg.getBoolean("quiet");
+        } else {
+            // otherwise, default to being noisy
+            debug = cfg.getBoolean("debug", true);
+        }
 
-// Load Votifier tokens.
+        // Load Votifier tokens.
         ConfigurationSection tokenSection = cfg.getConfigurationSection("tokens");
 
         if (tokenSection != null) {
@@ -209,8 +199,7 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
             } catch (IOException e) {
                 getLogger().log(Level.SEVERE,
                         "Error generating Votifier token", e);
-                gracefulExit();
-                return;
+                return false;
             }
             getLogger().info("------------------------------------------------------------------------------");
             getLogger().info("No tokens were found in your configuration, so we've generated one for you.");
@@ -223,8 +212,9 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
         // Initialize the receiver.
         final String host = cfg.getString("host", hostAddr);
         final int port = cfg.getInt("port", 8192);
-        if (debug)
-            getLogger().info("DEBUG mode enabled!");
+        if (!debug)
+            getLogger().info("QUIET mode enabled!");
+
         if (port >= 0) {
             final boolean disablev1 = cfg.getBoolean("disable-v1-protocol");
             if (disablev1) {
@@ -234,37 +224,8 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                 getLogger().info("------------------------------------------------------------------------------");
             }
 
-            serverGroup = new NioEventLoopGroup(1);
-
-            new ServerBootstrap()
-                    .channel(NioServerSocketChannel.class)
-                    .group(serverGroup)
-                    .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                        @Override
-                        protected void initChannel(NioSocketChannel channel) throws Exception {
-                            channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                            channel.attr(VotifierPlugin.KEY).set(NuVotifierBukkit.this);
-                            channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                            channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !disablev1));
-                            channel.pipeline().addLast("voteHandler", new VoteInboundHandler(NuVotifierBukkit.this));
-                        }
-                    })
-                    .bind(host, port)
-                    .addListener(new ChannelFutureListener() {
-                        @Override
-                        public void operationComplete(ChannelFuture future) throws Exception {
-                            if (future.isSuccess()) {
-                                serverChannel = future.channel();
-                                getLogger().info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
-                            } else {
-                                SocketAddress socketAddress = future.channel().localAddress();
-                                if (socketAddress == null) {
-                                    socketAddress = new InetSocketAddress(host, port);
-                                }
-                                getLogger().log(Level.SEVERE, "Votifier was not able to bind to " + socketAddress, future.cause());
-                            }
-                        }
-                    });
+            this.bootstrap = new VotifierServerBootstrap(host, port, this, disablev1);
+            this.bootstrap.start(error -> {});
         } else {
             getLogger().info("------------------------------------------------------------------------------");
             getLogger().info("Your Votifier port is less than 0, so we assume you do NOT want to start the");
@@ -290,42 +251,72 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                 getLogger().severe("No vote forwarding method '" + method + "' known. Defaulting to noop implementation.");
             }
         }
+        return true;
+    }
+
+    private void halt() {
+        // Shut down the network handlers.
+        if (bootstrap != null) {
+            bootstrap.shutdown();
+            bootstrap = null;
+        }
+
+        if (forwardingMethod != null) {
+            forwardingMethod.halt();
+            forwardingMethod = null;
+        }
+    }
+
+    @Override
+    public void onEnable() {
+        getCommand("nvreload").setExecutor(new NVReloadCmd(this));
+        getCommand("testvote").setExecutor(new TestVoteCmd(this));
+
+        if (!loadAndBind()) {
+            gracefulExit();
+            setEnabled(false); // safer to just bomb out
+        }
     }
 
     @Override
     public void onDisable() {
-        // Shut down the network handlers.
-        if (serverGroup != null) {
-            if (serverChannel != null)
-                serverChannel.close();
-            serverGroup.shutdownGracefully();
-        }
-        if (forwardingMethod != null) {
-            forwardingMethod.halt();
-        }
+        halt();
         getLogger().info("Votifier disabled.");
     }
 
+    public boolean reload() {
+        try {
+            halt();
+        } catch (Exception ex) {
+            getLogger().log(Level.SEVERE, "On halt, an exception was thrown. This may be fine!", ex);
+        }
+
+        if (loadAndBind()) {
+            getLogger().info("Reload was successful.");
+            return true;
+        } else {
+            try {
+                halt();
+                getLogger().log(Level.SEVERE, "On reload, there was a problem with the configuration. Votifier currently does nothing!");
+            } catch (Exception ex) {
+                getLogger().log(Level.SEVERE, "On reload, there was a problem loading, and we could not re-halt the server. Votifier is in an unstable state!", ex);
+            }
+            return false;
+        }
+    }
+
     private void gracefulExit() {
         getLogger().log(Level.SEVERE, "Votifier did not initialize properly!");
     }
 
-    /**
-     * Gets the instance.
-     *
-     * @return The instance
-     */
-    public static NuVotifierBukkit getInstance() {
-        return instance;
+    @Override
+    public LoggingAdapter getPluginLogger() {
+        return pluginLogger;
     }
 
-    /**
-     * Gets the version.
-     *
-     * @return The version
-     */
-    public String getVersion() {
-        return version;
+    @Override
+    public VotifierScheduler getScheduler() {
+        return scheduler;
     }
 
     public boolean isDebug() {
@@ -343,33 +334,24 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
     }
 
     @Override
-    public void onVoteReceived(Channel channel, final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion, String remoteAddress) {
         if (debug) {
-            if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record from " + channel.remoteAddress() + " -> " + vote);
-            } else {
-                getLogger().info("Got a protocol v2 vote record from " + channel.remoteAddress() + " -> " + vote);
-            }
+            getLogger().info("Got a " + protocolVersion.humanReadable + " vote record from " + remoteAddress + " -> " + vote);
         }
-        Bukkit.getScheduler().runTask(this, new Runnable() {
-            @Override
-            public void run() {
-                Bukkit.getPluginManager().callEvent(new VotifierEvent(vote));
-            }
-        });
+        Bukkit.getScheduler().runTask(this, () -> fireVotifierEvent(vote));
     }
 
     @Override
-    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
+    public void onError(Throwable throwable, boolean alreadyHandledVote, String remoteAddress) {
         if (debug) {
             if (alreadyHandledVote) {
                 getLogger().log(Level.SEVERE, "Vote processed, however an exception " +
-                        "occurred with a vote from " + channel.remoteAddress(), throwable);
+                        "occurred with a vote from " + remoteAddress, throwable);
             } else {
-                getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
+                getLogger().log(Level.SEVERE, "Unable to process vote from " + remoteAddress, throwable);
             }
         } else if (!alreadyHandledVote) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
+            getLogger().log(Level.SEVERE, "Unable to process vote from " + remoteAddress);
         }
     }
 
@@ -378,11 +360,15 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
         if (debug) {
             getLogger().info("Got a forwarded vote -> " + v);
         }
-        Bukkit.getScheduler().runTask(this, new Runnable() {
-            @Override
-            public void run() {
-                Bukkit.getPluginManager().callEvent(new VotifierEvent(v));
-            }
-        });
+        Bukkit.getScheduler().runTask(this, () -> fireVotifierEvent(v));
+    }
+
+    private void fireVotifierEvent(Vote vote) {
+        if (VotifierEvent.getHandlerList().getRegisteredListeners().length == 0) {
+            getLogger().log(Level.SEVERE, "A vote was received, but you don't have any listeners available to listen for it.");
+            getLogger().log(Level.SEVERE, "See https://github.com/NuVotifier/NuVotifier/wiki/Setup-Guide#vote-listeners for");
+            getLogger().log(Level.SEVERE, "a list of listeners you can configure.");
+        }
+        Bukkit.getPluginManager().callEvent(new VotifierEvent(vote));
     }
 }

bukkit/src/main/java/com/vexsoftware/votifier/cmd/NVReloadCmd.java

@@ -0,0 +1,31 @@
+package com.vexsoftware.votifier.cmd;
+
+import com.vexsoftware.votifier.NuVotifierBukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class NVReloadCmd implements CommandExecutor {
+
+    private final NuVotifierBukkit plugin;
+
+    public NVReloadCmd(NuVotifierBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (sender.hasPermission("nuvotifier.reload")) {
+            sender.sendMessage(ChatColor.GRAY + "Reloading NuVotifier...");
+            if (plugin.reload()) {
+                sender.sendMessage(ChatColor.DARK_GREEN + "NuVotifier has been reloaded!");
+            } else {
+                sender.sendMessage(ChatColor.DARK_RED + "Looks like there was a problem reloading NuVotifier, check the console!");
+            }
+        } else {
+            sender.sendMessage(ChatColor.DARK_RED + "You do not have permission to do this!");
+        }
+        return true;
+    }
+}

bukkit/src/main/java/com/vexsoftware/votifier/cmd/TestVoteCmd.java

@@ -0,0 +1,40 @@
+package com.vexsoftware.votifier.cmd;
+
+import com.vexsoftware.votifier.NuVotifierBukkit;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.ArgsToVote;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class TestVoteCmd implements CommandExecutor {
+
+    private final NuVotifierBukkit plugin;
+
+    public TestVoteCmd(NuVotifierBukkit plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (sender.hasPermission("nuvotifier.testvote")) {
+            Vote v;
+            try {
+                v = ArgsToVote.parse(args);
+            } catch (IllegalArgumentException e) {
+                sender.sendMessage(ChatColor.DARK_RED + "Error while parsing arguments to create test vote: " + e.getMessage());
+                sender.sendMessage(ChatColor.GRAY + "Usage hint: /testvote [username] [serviceName=?] [username=?] [address=?] [localTimestamp=?] [timestamp=?]");
+                return true;
+            }
+
+            plugin.onVoteReceived(v, VotifierSession.ProtocolVersion.TEST, "localhost.test");
+            sender.sendMessage(ChatColor.GREEN + "Test vote executed: " + v.toString());
+        } else {
+            sender.sendMessage(ChatColor.DARK_RED + "You do not have permission to do this!");
+        }
+        return true;
+
+    }
+}

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/BukkitPluginMessagingForwardingSink.java

@@ -1,34 +1,31 @@
 package com.vexsoftware.votifier.forwarding;
 
-import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.NuVotifierBukkit;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.util.GsonInst;
+import com.vexsoftware.votifier.support.forwarding.AbstractPluginMessagingForwardingSink;
+import com.vexsoftware.votifier.support.forwarding.ForwardedVoteListener;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
-import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 
 /**
  * Created by Joe Hirschfeld on 10/20/2015.
  */
-public class BukkitPluginMessagingForwardingSink implements ForwardingVoteSink, PluginMessageListener {
+public class BukkitPluginMessagingForwardingSink extends AbstractPluginMessagingForwardingSink implements PluginMessageListener {
 
     public BukkitPluginMessagingForwardingSink(Plugin p, String channel, ForwardedVoteListener listener) {
+        super(listener);
         Validate.notNull(channel, "Channel cannot be null.");
         this.channel = channel;
         Bukkit.getMessenger().registerIncomingPluginChannel(p, channel, this);
-        this.listener = listener;
         this.p = p;
     }
 
     private final Plugin p;
     private final String channel;
-    private final ForwardedVoteListener listener;
 
     @Override
     public void halt() {
@@ -38,12 +35,9 @@ public class BukkitPluginMessagingForwardingSink implements ForwardingVoteSink,
     @Override
     public void onPluginMessageReceived(String s, Player player, byte[] bytes) {
         try {
-            String message = new String(bytes, StandardCharsets.UTF_8);
-            JsonObject jsonObject = GsonInst.gson.fromJson(message, JsonObject.class);
-            Vote v = new Vote(jsonObject);
-            listener.onForward(v);
+            this.handlePluginMessage(bytes);
         } catch (Exception e) {
-            NuVotifierBukkit.getInstance().getLogger().log(Level.SEVERE, "There was an unknown error when processing a forwarded vote.", e);
+            p.getLogger().log(Level.SEVERE, "There was an unknown error when processing a forwarded vote.", e);
         }
     }
 }

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/ForwardingVoteSink.java

@@ -1,13 +0,0 @@
-package com.vexsoftware.votifier.forwarding;
-
-/**
- * Represents a method at which to receive forwarded votes.
- */
-public interface ForwardingVoteSink {
-
-    /**
-     * Stop or close any oustanding network interfaces. Occurs on the onDisable method of a plugin.
-     */
-    void halt();
-
-}

bukkit/src/main/resources/bukkitConfig.yml

@@ -5,10 +5,6 @@ host: %ip%
 # Port to listen for new votes on
 port: 8192
 
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
 # Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
 # option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
 # using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.
@@ -26,4 +22,4 @@ forwarding:
   # - pluginMessaging - Sets up plugin messaging
   method: none
   pluginMessaging:
-    channel: NuVotifier
+    channel: nuvotifier:votes

bukkit/src/main/resources/plugin.yml

@@ -2,4 +2,25 @@ name: Votifier
 main: com.vexsoftware.votifier.NuVotifierBukkit
 version: @app.version@
 description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [ParallelBlock, blakeman8192, Kramer, tuxed]
+authors: [Ichbinjoe, blakeman8192, Kramer, tuxed]
+api-version: 1.13
+
+commands:
+  nvreload:
+    description: Reloads the NuVotifier configuration
+    permission: nuvotifier.reload
+    permission-message: "You do not have permission to run this command."
+    usage: "/nvreload"
+  testvote:
+    description: Sends a test vote to the server
+    permission: nuvotifier.testvote
+    permission-message: "You do not have permission to run this command."
+    usage: "/testvote [username] [serviceName=?] [username=?] [address=?] [localTimestamp=?] [timestamp=?]"
+
+permissions:
+  nuvotifier.reload:
+    description: Allows you to reload the NuVotifier plugin
+    default: op
+  nuvotifier.testvote:
+    description: Allows you to send a test vote
+    default: op

bungeecord/build.gradle

@@ -1,4 +1,5 @@
 dependencies {
     compileOnly group: "net.md-5", name: "bungeecord-api", version: "1.8-SNAPSHOT"
-    compile project(":nuvotifier-common")
+    implementation project(":nuvotifier-api")
+    implementation project(":nuvotifier-common")
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/BungeeBackendServer.java

@@ -0,0 +1,29 @@
+package com.vexsoftware.votifier.bungee;
+
+import com.vexsoftware.votifier.platform.BackendServer;
+import net.md_5.bungee.api.config.ServerInfo;
+
+import java.util.Objects;
+
+public class BungeeBackendServer implements BackendServer {
+    private final ServerInfo info;
+
+    public BungeeBackendServer(ServerInfo info) {
+        this.info = Objects.requireNonNull(info, "info");
+    }
+
+    @Override
+    public String getName() {
+        return info.getName();
+    }
+
+    @Override
+    public boolean sendPluginMessage(String channel, byte[] data) {
+        return info.sendData(channel, data, false);
+    }
+
+    @Override
+    public String toString() {
+        return info.getName();
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/BungeeScheduler.java

@@ -0,0 +1,53 @@
+package com.vexsoftware.votifier.bungee;
+
+import com.vexsoftware.votifier.platform.scheduler.ScheduledVotifierTask;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import net.md_5.bungee.api.scheduler.ScheduledTask;
+
+import java.util.concurrent.TimeUnit;
+
+class BungeeScheduler implements VotifierScheduler {
+    private final NuVotifier plugin;
+
+    public BungeeScheduler(NuVotifier plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public ScheduledVotifierTask sync(Runnable runnable) {
+        return onPool(runnable);
+    }
+
+    @Override
+    public ScheduledVotifierTask onPool(Runnable runnable) {
+        return new BungeeTaskWrapper(plugin.getProxy().getScheduler().runAsync(plugin, runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit) {
+        return delayedOnPool(runnable, delay, unit);
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit) {
+        return new BungeeTaskWrapper(plugin.getProxy().getScheduler().schedule(plugin, runnable, delay, unit));
+    }
+
+    @Override
+    public ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit) {
+        return new BungeeTaskWrapper(plugin.getProxy().getScheduler().schedule(plugin, runnable, delay, repeat, unit));
+    }
+
+    private static class BungeeTaskWrapper implements ScheduledVotifierTask {
+        private final ScheduledTask task;
+
+        private BungeeTaskWrapper(ScheduledTask task) {
+            this.task = task;
+        }
+
+        @Override
+        public void cancel() {
+            this.task.cancel();
+        }
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/NuVotifier.java

@@ -1,70 +1,61 @@
 package com.vexsoftware.votifier.bungee;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
+import com.google.common.collect.ImmutableList;
 import com.vexsoftware.votifier.VoteHandler;
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.bungee.cmd.NVReloadCmd;
+import com.vexsoftware.votifier.bungee.cmd.TestVoteCmd;
+import com.vexsoftware.votifier.net.VotifierServerBootstrap;
+import com.vexsoftware.votifier.platform.BackendServer;
+import com.vexsoftware.votifier.platform.JavaUtilLogger;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.ProxyVotifierPlugin;
 import com.vexsoftware.votifier.bungee.events.VotifierEvent;
-import com.vexsoftware.votifier.bungee.forwarding.ForwardingVoteSource;
-import com.vexsoftware.votifier.bungee.forwarding.OnlineForwardPluginMessagingForwardingSource;
-import com.vexsoftware.votifier.bungee.forwarding.PluginMessagingForwardingSource;
-import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.cache.MemoryVoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.ProxyForwardingVoteSource;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import com.vexsoftware.votifier.support.forwarding.ForwardingVoteSource;
+import com.vexsoftware.votifier.support.forwarding.ServerFilter;
+import com.vexsoftware.votifier.support.forwarding.cache.FileVoteCache;
+import com.vexsoftware.votifier.support.forwarding.cache.MemoryVoteCache;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.support.forwarding.proxy.ProxyForwardingVoteSource;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSAKeygen;
+import com.vexsoftware.votifier.util.IOUtil;
 import com.vexsoftware.votifier.util.KeyCreator;
 import com.vexsoftware.votifier.util.TokenUtil;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
 import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.security.Key;
 import java.security.KeyPair;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
-public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
+public class NuVotifier extends Plugin implements VoteHandler, ProxyVotifierPlugin {
 
     /**
      * The server channel.
      */
-    private Channel serverChannel;
-
-    /**
-     * The event group handling the channel.
-     */
-    private NioEventLoopGroup serverGroup;
+    private VotifierServerBootstrap bootstrap;
 
     /**
      * The RSA key pair.
@@ -86,15 +77,19 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
      */
     private ForwardingVoteSource forwardingMethod;
 
-    @Override
-    public void onEnable() {
+    private VotifierScheduler scheduler;
+    private LoggingAdapter pluginLogger;
+
+    private void loadAndBind() {
         if (!getDataFolder().exists()) {
-            getDataFolder().mkdir();
+            if (!getDataFolder().mkdir()) {
+                throw new RuntimeException("Unable to create the plugin data folder " + getDataFolder());
+            }
         }
 
         // Handle configuration.
-        File config = new File(getDataFolder() + "/config.yml");
-        File rsaDirectory = new File(getDataFolder() + "/rsa");
+        File config = new File(getDataFolder() , "config.yml");
+        File rsaDirectory = new File(getDataFolder() , "rsa");
         Configuration configuration;
 
         if (!config.exists()) {
@@ -103,12 +98,14 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                 getLogger().info("Configuring Votifier for the first time...");
 
                 // Initialize the configuration file.
-                config.createNewFile();
+                if (!config.createNewFile()) {
+                    throw new IOException("Unable to create the config file at " + config);
+                }
 
-                String cfgStr = new String(ByteStreams.toByteArray(getResourceAsStream("bungeeConfig.yml")), StandardCharsets.UTF_8);
+                String cfgStr = new String(IOUtil.readAllBytes(getResourceAsStream("bungeeConfig.yml")), StandardCharsets.UTF_8);
                 String token = TokenUtil.newToken();
                 cfgStr = cfgStr.replace("%default_token%", token);
-                Files.write(cfgStr, config, StandardCharsets.UTF_8);
+                Files.copy(new ByteArrayInputStream(cfgStr.getBytes(StandardCharsets.UTF_8)), config.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
                 /*
                  * Remind hosted server admins to be sure they have the right
@@ -146,7 +143,9 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
          */
         try {
             if (!rsaDirectory.exists()) {
-                rsaDirectory.mkdir();
+                if (!rsaDirectory.mkdir()) {
+                    throw new RuntimeException("Unable to create the RSA key folder " + rsaDirectory);
+                }
                 keyPair = RSAKeygen.generate(2048);
                 RSAIO.save(rsaDirectory, keyPair);
             } else {
@@ -166,7 +165,7 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
             }
         } else {
             String token = TokenUtil.newToken();
-            configuration.set("tokens", ImmutableMap.of("default", token));
+            configuration.set("tokens", Collections.singletonMap("default", token));
             tokens.put("default", KeyCreator.createKeyFrom(token));
             try {
                 ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, config);
@@ -184,9 +183,14 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
         // Initialize the receiver.
         final String host = configuration.getString("host", "0.0.0.0");
         final int port = configuration.getInt("port", 8192);
-        debug = configuration.getBoolean("debug", false);
-        if (debug)
-            getLogger().info("DEBUG mode enabled!");
+
+        if (configuration.get("quiet") != null)
+            debug = !configuration.getBoolean("quiet");
+        else
+            debug = configuration.getBoolean("debug", true);
+
+        if (!debug)
+            getLogger().info("QUIET mode enabled!");
 
         final boolean disablev1 = configuration.getBoolean("disable-v1-protocol");
         if (disablev1) {
@@ -197,41 +201,9 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
         }
 
         // Must set up server asynchronously due to BungeeCord goofiness.
-        FutureTask<?> initTask = new FutureTask<>(Executors.callable(new Runnable() {
-            @Override
-            public void run() {
-                serverGroup = new NioEventLoopGroup(2);
-
-                new ServerBootstrap()
-                        .channel(NioServerSocketChannel.class)
-                        .group(serverGroup)
-                        .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                            @Override
-                            protected void initChannel(NioSocketChannel channel) throws Exception {
-                                channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                                channel.attr(VotifierPlugin.KEY).set(NuVotifier.this);
-                                channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                                channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !disablev1));
-                                channel.pipeline().addLast("voteHandler", new VoteInboundHandler(NuVotifier.this));
-                            }
-                        })
-                        .bind(host, port)
-                        .addListener(new ChannelFutureListener() {
-                            @Override
-                            public void operationComplete(ChannelFuture future) throws Exception {
-                                if (future.isSuccess()) {
-                                    serverChannel = future.channel();
-                                    getLogger().info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
-                                } else {
-                                    SocketAddress socketAddress = future.channel().localAddress();
-                                    if (socketAddress == null) {
-                                        socketAddress = new InetSocketAddress(host, port);
-                                    }
-                                    getLogger().log(Level.SEVERE, "Votifier was not able to bind to " + socketAddress, future.cause());
-                                }
-                            }
-                        });
-            }
+        FutureTask<?> initTask = new FutureTask<>(Executors.callable(() -> {
+            this.bootstrap = new VotifierServerBootstrap(host, port, NuVotifier.this, disablev1);
+            this.bootstrap.start(err -> {});
         }));
         getProxy().getScheduler().runAsync(this, initTask);
         try {
@@ -251,24 +223,31 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
             if ("none".equals(cacheMethod)) {
                 getLogger().info("Vote cache none selected for caching: votes that cannot be immediately delivered will be lost.");
             } else if ("memory".equals(cacheMethod)) {
-                voteCache = new MemoryVoteCache(ProxyServer.getInstance().getServers().size());
+                voteCache = new MemoryVoteCache(
+                        this,
+                        fwdCfg.getInt("pluginMessaging.memory.cacheTime", -1));
                 getLogger().info("Using in-memory cache for votes that are not able to be delivered.");
             } else if ("file".equals(cacheMethod)) {
                 try {
                     voteCache = new FileVoteCache(
-                            ProxyServer.getInstance().getServers().size(), this,
+                            this,
                             new File(getDataFolder(), fwdCfg.getString("pluginMessaging.file.name")),
                             fwdCfg.getInt("pluginMessaging.file.cacheTime", -1));
                 } catch (IOException e) {
                     getLogger().log(Level.SEVERE, "Unload to load file cache. Votes will be lost!", e);
                 }
             }
+
+            int dumpRate = fwdCfg.getInt("pluginMessaging.dumpRate", 5);
+
+            ServerFilter filter = new ServerFilter(
+                    fwdCfg.getStringList("pluginMessaging.excludedServers"),
+                    fwdCfg.getBoolean("pluginMessaging.whitelist", false)
+            );
+
             if (!fwdCfg.getBoolean("pluginMessaging.onlySendToJoinedServer")) {
-
-                List<String> ignoredServers = fwdCfg.getStringList("pluginMessaging.excludedServers");
-
                 try {
-                    forwardingMethod = new PluginMessagingForwardingSource(channel, ignoredServers, this, voteCache);
+                    forwardingMethod = new PluginMessagingForwardingSource(channel, filter, this, voteCache, dumpRate);
                     getLogger().info("Forwarding votes over PluginMessaging channel '" + channel + "' for vote forwarding!");
                 } catch (RuntimeException e) {
                     getLogger().log(Level.SEVERE, "NuVotifier could not set up PluginMessaging for vote forwarding!", e);
@@ -277,7 +256,8 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                 try {
                     String fallbackServer = fwdCfg.getString("pluginMessaging.joinedServerFallback", null);
                     if (fallbackServer != null && fallbackServer.isEmpty()) fallbackServer = null;
-                    forwardingMethod = new OnlineForwardPluginMessagingForwardingSource(channel, this, voteCache, fallbackServer);
+                    forwardingMethod = new OnlineForwardPluginMessagingForwardingSource(channel, this, filter, voteCache, fallbackServer, dumpRate);
+                    getLogger().info("Forwarding votes over PluginMessaging channel '" + channel + "' for vote forwarding for online players!");
                 } catch (RuntimeException e) {
                     getLogger().log(Level.SEVERE, "NuVotifier could not set up PluginMessaging for vote forwarding!", e);
                 }
@@ -312,66 +292,96 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                 }
             }
 
-            forwardingMethod = new ProxyForwardingVoteSource(this, serverGroup, serverList, null);
+            forwardingMethod = bootstrap.createForwardingSource(serverList, null);
             getLogger().info("Forwarding votes from this NuVotifier instance to another NuVotifier server.");
         } else {
             getLogger().severe("No vote forwarding method '" + fwdMethod + "' known. Defaulting to noop implementation.");
         }
     }
 
-
     @Override
-    public void onDisable() {
+    public void onEnable() {
+        scheduler = new BungeeScheduler(this);
+        pluginLogger = new JavaUtilLogger(getLogger());
+
+        PluginManager pm = ProxyServer.getInstance().getPluginManager();
+        pm.registerCommand(this, new NVReloadCmd(this));
+        pm.registerCommand(this, new TestVoteCmd(this));
+        pm.registerListener(this, new ReloadListener(this));
+
+        loadAndBind();
+    }
+
+    private void halt() {
         // Shut down the network handlers.
-        if (serverChannel != null)
-            serverChannel.close();
-        serverGroup.shutdownGracefully();
+        if (bootstrap != null) {
+            bootstrap.shutdown();
+            bootstrap = null;
+        }
 
         if (forwardingMethod != null) {
             forwardingMethod.halt();
+            forwardingMethod = null;
+        }
+    }
+
+    public boolean reload() {
+        try {
+            halt();
+        } catch (Exception ex) {
+            getLogger().log(Level.SEVERE, "On halt, an exception was thrown. This may be fine!", ex);
         }
 
+        try {
+            loadAndBind();
+            getLogger().info("Reload was successful.");
+            return true;
+        } catch (Exception ex) {
+            try {
+                halt();
+                getLogger().log(Level.SEVERE, "On reload, there was a problem with the configuration. Votifier currently does nothing!", ex);
+            } catch (Exception ex2) {
+                getLogger().log(Level.SEVERE, "On reload, there was a problem loading, and we could not re-halt the server. Votifier is in an unstable state!", ex);
+                getLogger().log(Level.SEVERE, "(halt exception)", ex2);
+            }
+            return false;
+        }
+    }
+
+    @Override
+    public void onDisable() {
+        halt();
         getLogger().info("Votifier disabled.");
     }
 
     @Override
-    public void onVoteReceived(Channel channel, final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion, String remoteAddress) {
         if (debug) {
             if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record from " + channel.remoteAddress() + " -> " + vote);
+                getLogger().info("Got a protocol v1 vote record from " + remoteAddress + " -> " + vote);
             } else {
-                getLogger().info("Got a protocol v2 vote record from " + channel.remoteAddress() + " -> " + vote);
+                getLogger().info("Got a protocol v2 vote record from " + remoteAddress + " -> " + vote);
             }
         }
 
-        getProxy().getScheduler().runAsync(this, new Runnable() {
-            @Override
-            public void run() {
-                getProxy().getPluginManager().callEvent(new VotifierEvent(vote));
-            }
-        });
+        getProxy().getScheduler().runAsync(this, () -> getProxy().getPluginManager().callEvent(new VotifierEvent(vote)));
 
         if (forwardingMethod != null) {
-            getProxy().getScheduler().runAsync(this, new Runnable() {
-                @Override
-                public void run() {
-                    forwardingMethod.forward(vote);
-                }
-            });
+            getProxy().getScheduler().runAsync(this, () -> forwardingMethod.forward(vote));
         }
     }
 
     @Override
-    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
+    public void onError(Throwable throwable, boolean alreadyHandledVote, String remoteAddress) {
         if (debug) {
             if (alreadyHandledVote) {
                 getLogger().log(Level.SEVERE, "Vote processed, however an exception " +
-                        "occurred with a vote from " + channel.remoteAddress(), throwable);
+                        "occurred with a vote from " + remoteAddress, throwable);
             } else {
-                getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
+                getLogger().log(Level.SEVERE, "Unable to process vote from " + remoteAddress, throwable);
             }
         } else if (!alreadyHandledVote) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
+            getLogger().log(Level.SEVERE, "Unable to process vote from " + remoteAddress);
         }
     }
 
@@ -386,11 +396,29 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
     }
 
     @Override
-    public String getVersion() {
-        return getDescription().getVersion();
+    public LoggingAdapter getPluginLogger() {
+        return pluginLogger;
+    }
+
+    @Override
+    public VotifierScheduler getScheduler() {
+        return scheduler;
     }
 
     public boolean isDebug() {
         return debug;
     }
+
+    @Override
+    public Collection<BackendServer> getAllBackendServers() {
+        return getProxy().getServers().values().stream()
+                .map(BungeeBackendServer::new)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public Optional<BackendServer> getServer(String name) {
+        ServerInfo info = getProxy().getServerInfo(name);
+        return Optional.ofNullable(info).map(BungeeBackendServer::new);
+    }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/OnlineForwardPluginMessagingForwardingSource.java

@@ -0,0 +1,63 @@
+package com.vexsoftware.votifier.bungee;
+
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.platform.BackendServer;
+import com.vexsoftware.votifier.support.forwarding.AbstractPluginMessagingForwardingSource;
+import com.vexsoftware.votifier.support.forwarding.ServerFilter;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+/**
+ * @author Joseph Hirschfeld
+ * @date 12/31/2015
+ */
+public final class OnlineForwardPluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
+    public OnlineForwardPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, ServerFilter serverFilter,
+                                                        VoteCache cache, String fallbackServer, int dumpRate) {
+        super(channel, serverFilter, nuVotifier, cache, dumpRate);
+        this.fallbackServer = fallbackServer;
+        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
+    }
+
+    private final String fallbackServer;
+
+    @Override
+    public void forward(Vote v) {
+        ProxiedPlayer p = ProxyServer.getInstance().getPlayer(v.getUsername());
+        if (p != null && p.getServer() != null &&
+                serverFilter.isAllowed(p.getServer().getInfo().getName())) {
+            if (forwardSpecific(new BungeeBackendServer(p.getServer().getInfo()), v)) {
+                if (plugin.isDebug()) {
+                    plugin.getPluginLogger().info("Successfully forwarded vote " + v + " to server " + p.getServer().getInfo().getName());
+                }
+                return;
+            }
+        }
+
+        ServerInfo serverInfo = ProxyServer.getInstance().getServers().get(fallbackServer);
+
+        // nowhere to fall back to, yet still not online. lets save this vote yet!
+        if (serverInfo == null)
+            attemptToAddToPlayerCache(v, v.getUsername());
+        else if (!forwardSpecific(new BungeeBackendServer(serverInfo), v))
+            attemptToAddToCache(v, fallbackServer);
+    }
+
+    @EventHandler
+    public void onPluginMessage(PluginMessageEvent e) {
+        if (e.getTag().equals(channel)) e.setCancelled(true);
+    }
+
+    @EventHandler
+    public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
+        BackendServer server = new BungeeBackendServer(e.getServer().getInfo());
+        handlePlayerSwitch(server, e.getPlayer().getName());
+        onServerConnect(server);
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/PluginMessagingForwardingSource.java

@@ -1,24 +1,23 @@
-package com.vexsoftware.votifier.bungee.forwarding;
+package com.vexsoftware.votifier.bungee;
 
-import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.support.forwarding.AbstractPluginMessagingForwardingSource;
+import com.vexsoftware.votifier.support.forwarding.ServerFilter;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-import java.util.List;
-
 public class PluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
 
-    public PluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
-        super(channel, ignoredServers, nuVotifier, cache);
+    public PluginMessagingForwardingSource(String channel, ServerFilter serverFilter, NuVotifier nuVotifier, VoteCache cache, int dumpRate) {
+        super(channel, serverFilter, nuVotifier, cache, dumpRate);
         ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
-    protected PluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
-        super(channel, nuVotifier, voteCache);
+    protected PluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache, int dumpRate) {
+        super(channel, nuVotifier, voteCache, dumpRate);
         ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
@@ -29,6 +28,6 @@ public class PluginMessagingForwardingSource extends AbstractPluginMessagingForw
 
     @EventHandler
     public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
-        handleServerConnected(e);
+        onServerConnect(new BungeeBackendServer(e.getServer().getInfo()));
     }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/ReloadListener.java

@@ -0,0 +1,18 @@
+package com.vexsoftware.votifier.bungee;
+
+import net.md_5.bungee.api.event.ProxyReloadEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+public class ReloadListener implements Listener {
+    private final NuVotifier nuVotifier;
+
+    public ReloadListener(NuVotifier nuVotifier) {
+        this.nuVotifier = nuVotifier;
+    }
+
+    @EventHandler
+    public void onProxyReload(ProxyReloadEvent event) {
+        this.nuVotifier.reload();
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/cmd/NVReloadCmd.java

@@ -0,0 +1,44 @@
+package com.vexsoftware.votifier.bungee.cmd;
+
+import com.vexsoftware.votifier.bungee.NuVotifier;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Command;
+
+public class NVReloadCmd extends Command {
+
+    private final NuVotifier plugin;
+
+    private static final BaseComponent reloadingNuVotifier = new TextComponent("Reloading NuVotifier...");
+    private static final BaseComponent nuvotifierHasBeenReloaded = new TextComponent("NuVotifier has been reloaded!");
+    private static final BaseComponent problem = new TextComponent("Looks like there was a problem reloading NuVotifier, check the console!");
+    private static final BaseComponent permission = new TextComponent("You do not have permission to do this!");
+
+    static {
+        reloadingNuVotifier.setColor(ChatColor.GRAY);
+        nuvotifierHasBeenReloaded.setColor(ChatColor.DARK_GREEN);
+        problem.setColor(ChatColor.DARK_RED);
+        permission.setColor(ChatColor.DARK_RED);
+    }
+
+    public NVReloadCmd(NuVotifier plugin) {
+        super("pnvreload", "nuvotifier.reload");
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (sender.hasPermission("nuvotifier.reload")) {
+            sender.sendMessage(reloadingNuVotifier);
+            if (plugin.reload()) {
+                sender.sendMessage(nuvotifierHasBeenReloaded);
+            } else {
+                sender.sendMessage(problem);
+            }
+        } else {
+            sender.sendMessage(permission);
+        }
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/cmd/TestVoteCmd.java

@@ -0,0 +1,51 @@
+package com.vexsoftware.votifier.bungee.cmd;
+
+import com.vexsoftware.votifier.bungee.NuVotifier;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.ArgsToVote;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Command;
+
+public class TestVoteCmd extends Command {
+
+    private final NuVotifier plugin;
+
+    private static final BaseComponent permission = new TextComponent("You do not have permission to do this!");
+    private static final BaseComponent usage = new TextComponent("Usage hint: /ptestvote [username] [serviceName=?] [username=?] [address=?] [localTimestamp=?] [timestamp=?]");
+
+    static {
+        usage.setColor(ChatColor.GRAY);
+    }
+
+    public TestVoteCmd(NuVotifier plugin) {
+        super("ptestvote", "nuvotifier.testvote");
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (sender.hasPermission("nuvotifier.testvote")) {
+            Vote v;
+            try {
+                v = ArgsToVote.parse(args);
+            } catch (IllegalArgumentException e) {
+                TextComponent c = new TextComponent("Error while parsing arguments to create test vote: " + e.getMessage());
+                c.setColor(ChatColor.DARK_RED);
+                sender.sendMessage(c);
+                sender.sendMessage(usage);
+                return;
+            }
+
+            plugin.onVoteReceived(v, VotifierSession.ProtocolVersion.TEST, "localhost.test");
+            TextComponent c = new TextComponent("Test vote executed: " + v.toString());
+            c.setColor(ChatColor.GREEN);
+            sender.sendMessage(c);
+        } else {
+            sender.sendMessage(permission);
+        }
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/AbstractPluginMessagingForwardingSource.java

@@ -1,141 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding;
-
-import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.model.Vote;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.event.PluginMessageEvent;
-import net.md_5.bungee.api.event.ServerConnectedEvent;
-import net.md_5.bungee.event.EventHandler;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-
-public abstract class AbstractPluginMessagingForwardingSource implements ForwardingVoteSource {
-
-    public AbstractPluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
-        ProxyServer.getInstance().registerChannel(channel);
-        this.channel = channel;
-        this.nuVotifier = nuVotifier;
-        this.cache = cache;
-        this.ignoredServers = ignoredServers;
-    }
-
-    protected AbstractPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
-        this(channel, null, nuVotifier, voteCache);
-    }
-
-    protected final NuVotifier nuVotifier;
-    protected final String channel;
-    protected final VoteCache cache;
-    protected final List<String> ignoredServers;
-
-    @Override
-    public void forward(Vote v) {
-        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        for (ServerInfo s : ProxyServer.getInstance().getServers().values()) {
-            if (ignoredServers != null && ignoredServers.contains(s.getName())) continue;
-            if (!forwardSpecific(s, rawData)) attemptToAddToCache(v, s.getName());
-        }
-    }
-
-    protected boolean forwardSpecific(ServerInfo connection, Vote vote) {
-        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        return connection.sendData(channel, rawData, false);
-    }
-
-    private boolean forwardSpecific(ServerInfo connection, byte[] data) {
-        return connection.sendData(channel, data, false);
-    }
-
-    @Override
-    public void halt() {
-        ProxyServer.getInstance().unregisterChannel(channel);
-
-        if (cache != null && cache instanceof FileVoteCache) {
-            try {
-                ((FileVoteCache) cache).halt();
-            } catch (IOException e) {
-                nuVotifier.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost.", e);
-            }
-        }
-    }
-
-    protected void handleServerConnected(final ServerConnectedEvent e) {
-        if (cache == null) return;
-        final String serverName = e.getServer().getInfo().getName();
-        final Collection<Vote> cachedVotes = cache.evict(serverName);
-        final Collection<Vote> failedVotes = dumpVotesToServer(cachedVotes, e.getServer().getInfo(), "server '" + serverName + "'");
-        for (Vote v : failedVotes)
-            cache.addToCache(v, serverName);
-    }
-
-    protected void attemptToAddToCache(Vote v, String server) {
-        if (cache != null) {
-            cache.addToCache(v, server);
-            if (nuVotifier.isDebug())
-                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> " + server);
-        } else if (nuVotifier.isDebug())
-            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
-    }
-
-    protected void attempToAddToPlayerCache(Vote v, String player) {
-        if (cache != null) {
-            cache.addToCachePlayer(v, player);
-            if (nuVotifier.isDebug())
-                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> (player) " + player);
-        } else if (nuVotifier.isDebug())
-            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> (player) " + player);
-
-    }
-
-    // returns a collection of failed votes
-    private Collection<Vote> dumpVotesToServer(Collection<Vote> cachedVotes, ServerInfo target, String identifier) {
-        List<Vote> failures = new ArrayList<>();
-
-        if (!cachedVotes.isEmpty()) {
-            nuVotifier.getProxy().getScheduler().schedule(nuVotifier, new Runnable() {
-                @Override
-                public void run() {
-                    int evicted = 0;
-                    int unsuccessfulEvictions = 0;
-                    for (Vote v : cachedVotes) {
-                        if (forwardSpecific(target, v)) {
-                            evicted++;
-                        } else {
-                            // Re-add to cache to send later.
-                            failures.add(v);
-                            unsuccessfulEvictions++;
-                        }
-                    }
-                    if (nuVotifier.isDebug()) {
-                        nuVotifier.getLogger().info("Successfully evicted " + evicted + " votes to " + identifier + ".");
-                        if (unsuccessfulEvictions > 0) {
-                            nuVotifier.getLogger().info("Held " + unsuccessfulEvictions + " votes for " + identifier + ".");
-                        }
-                    }
-                }
-            }, 1, TimeUnit.SECONDS);
-        }
-        return failures;
-    }
-
-    protected void handlePlayerSwitch(ServerConnectedEvent e) {
-        if (cache == null) return;
-        if (ignoredServers != null && ignoredServers.contains(e.getServer().getInfo().getName())) return;
-
-        String playerName = e.getPlayer().getName();
-
-        final Collection<Vote> cachedVotes = cache.evictPlayer(playerName);
-        final Collection<Vote> failedVotes = dumpVotesToServer(cachedVotes, e.getServer().getInfo(), "player '" + playerName);
-        for (Vote v : failedVotes)
-            cache.addToCachePlayer(v, playerName);
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/OnlineForwardPluginMessagingForwardingSource.java

@@ -1,58 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding;
-
-import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.model.Vote;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.PluginMessageEvent;
-import net.md_5.bungee.api.event.ServerConnectedEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-/**
- * @author Joseph Hirschfeld
- * @date 12/31/2015
- */
-public final class OnlineForwardPluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
-    public OnlineForwardPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache cache, String fallbackServer) {
-        super(channel, nuVotifier, cache);
-        this.fallbackServer = fallbackServer;
-        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
-    }
-
-    private final String fallbackServer;
-
-    @Override
-    public void forward(Vote v) {
-        ProxiedPlayer p = ProxyServer.getInstance().getPlayer(v.getUsername());
-        if (p == null || !forwardSpecific(p.getServer().getInfo(), v)) {
-            ServerInfo serverInfo = ProxyServer.getInstance().getServers().get(fallbackServer);
-
-            // nowhere to fall back to, yet still not online. lets save this vote yet!
-            if (serverInfo == null)
-                attempToAddToPlayerCache(v, v.getUsername());
-
-            else if (!forwardSpecific(serverInfo, v))
-                attemptToAddToCache(v, fallbackServer);
-        }
-    }
-
-    // The below is to allow us to share code since the event handlers from the parent class don't get
-    // picked up.
-    @EventHandler
-    public void onPluginMessage(PluginMessageEvent e) {
-        if (e.getTag().equals(channel)) e.setCancelled(true);
-    }
-
-    @EventHandler
-    public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
-        handleServerConnected(e);
-    }
-
-    @EventHandler
-    public void onPlayerSwitch(ServerConnectedEvent e) {
-        handlePlayerSwitch(e);
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/MemoryVoteCache.java

@@ -1,90 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
-
-import com.google.common.collect.ImmutableList;
-import com.vexsoftware.votifier.model.Vote;
-
-import java.util.*;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Created by Joe Hirschfeld on 10/20/2015.
- */
-public class MemoryVoteCache implements VoteCache {
-
-    public MemoryVoteCache(int initialSize) {
-        voteCache = new HashMap<>(initialSize);
-        this.playerVoteCache = new HashMap<>();
-    }
-
-    protected final Map<String, Collection<Vote>> voteCache;
-
-    protected final Map<String, Collection<Vote>> playerVoteCache;
-
-    protected final ReentrantLock cacheLock = new ReentrantLock();
-
-    @Override
-    public Collection<String> getCachedServers() {
-        cacheLock.lock();
-        try {
-            return ImmutableList.copyOf(voteCache.keySet());
-        } finally {
-            cacheLock.unlock();
-        }
-    }
-
-    @Override
-    public void addToCache(Vote v, String server) {
-        if (server == null) throw new NullPointerException();
-        cacheLock.lock();
-        try {
-            Collection<Vote> voteCollection = voteCache.get(server);
-            if (voteCollection == null) {
-                voteCollection = new ArrayList<>();
-                voteCache.put(server, voteCollection);
-            }
-            voteCollection.add(v);
-        } finally {
-            cacheLock.unlock();
-        }
-    }
-
-    @Override
-    public void addToCachePlayer(Vote v, String player) {
-        if (player == null) throw new NullPointerException();
-        cacheLock.lock();
-        try {
-            Collection<Vote> voteCollection = playerVoteCache.get(player);
-            if (voteCollection == null) {
-                voteCollection = new ArrayList<>();
-                playerVoteCache.put(player, voteCollection);
-            }
-            voteCollection.add(v);
-        } finally {
-            cacheLock.unlock();
-        }
-    }
-
-    @Override
-    public Collection<Vote> evictPlayer(String player) {
-        if (player == null) throw new NullPointerException();
-        cacheLock.lock();
-        try {
-            Collection<Vote> fromCollection = playerVoteCache.remove(player);
-            return fromCollection != null ? fromCollection : ImmutableList.of();
-        } finally {
-            cacheLock.unlock();
-        }
-    }
-
-    @Override
-    public Collection<Vote> evict(String server) {
-        if (server == null) throw new NullPointerException();
-        cacheLock.lock();
-        try {
-            Collection<Vote> fromCollection = voteCache.remove(server);
-            return fromCollection != null ? fromCollection : ImmutableList.of();
-        } finally {
-            cacheLock.unlock();
-        }
-    }
-}

bungeecord/src/main/resources/bungee.yml

@@ -1,4 +1,4 @@
 name: NuVotifier
 main: com.vexsoftware.votifier.bungee.NuVotifier
 version: @app.version@
-author: ParallelBlock, blakeman8192, Kramer, tuxed
+author: Ichbinjoe, blakeman8192, Kramer, tuxed

bungeecord/src/main/resources/bungeeConfig.yml

@@ -5,10 +5,6 @@ host: 0.0.0.0
 # Port to listen for new votes on
 port: 8192
 
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
 # All tokens, labeled by the serviceName of each server list.
 tokens:
   # Default token for all server lists, if another isn't supplied.
@@ -26,21 +22,22 @@ forwarding:
   # - proxy - Proxies votes to other NuVotifier servers from this server.
   method: none
   pluginMessaging:
-    channel: NuVotifier
+    channel: nuvotifier:votes
 
     #Only send votes to certain servers. If a server is present on excludedServers, then votes will NOT be forwarded
     #to them. If excludedServers is not present, votes will be sent to all servers.
-    #If onlySendToJoinedServer is true, this option is ignored.
-
+    # If onlySendToJoinedServer is true and a player is on one of these servers, NuVotifier will process the vote as if the
+    # player was not on the network at all.
     #excludedServers:
     #- server1
     #- server2
 
+    # If uncommented, turns excludedServers into an includedServers, where only servers on the list will be used.
+    #whitelist: true
 
     # Sets which cache to use if there are no players on the server that the vote is being sent to. Supported caches:
     # - none - Votes will simply be lost when no players are present on the server.
     # - memory - Votes will be cached in memory when no players are present. When Bungee is restarted, the votes will be lost.
-    #   This method is NOT recommended for production systems!
     # - file - Votes will be saved to a local file every 3 minutes and on shutdown and reloaded when Bungee is restarted. This is suitable for
     #   most set ups.
     cache: file
@@ -50,11 +47,17 @@ forwarding:
     #If you do not want the vote forwarded to a fallback, set this value to empty ('')
     #ONLY USED IF onlySendToJoinedServer is true!!
     joinedServerFallback: 'Hub'
+    # Defines how quickly to dump votes over a player's connection when offloading a cache in votes per second
+    dumpRate: 5
     # Options for file caching.
     file:
       name: cached-votes.json
       # days before a vote is considered 'dead' - removed from cache with a console warning
-      voteTTL: 10
+      cacheTime: 10
+    # Options for memory caching.
+    memory:
+      # days before a vote is considered 'dead' and removed from memory. All votes are removed when the server restarts. -1 signifies no TTL
+      cacheTime: -1
   # Specify servers to proxy votes for.
   proxy:
     Hub:

common/build.gradle

@@ -1,7 +1,8 @@
 dependencies {
-    compile group: "io.netty", name: "netty-handler", version: "4.1.16.Final"
-    compile 'com.google.code.gson:gson:2.8.2'
-    compile 'com.google.guava:guava:24.1-jre'
-    testCompile group: "junit", name: "junit", version: "4.12"
-    testCompile group: "org.json", name: "json", version: "20180130" // retain this for testing reasons
+    implementation project(":nuvotifier-api")
+    implementation group: "io.netty", name: "netty-handler", version: "4.1.49.Final"
+    implementation group: "io.netty", name: "netty-transport-native-epoll", version: "4.1.49.Final", classifier: "linux-x86_64"
+    implementation 'com.google.code.gson:gson:2.8.0'
+    testImplementation group: "org.json", name: "json", version: "20180130" // retain this for testing reasons
+    testImplementation 'com.google.guava:guava:28.1-jre'
 }

common/src/main/java/com/vexsoftware/votifier/VoteHandler.java

@@ -5,16 +5,11 @@ import com.vexsoftware.votifier.net.VotifierSession;
 import io.netty.channel.Channel;
 
 public interface VoteHandler {
-    void onVoteReceived(Channel channel, Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception;
 
-    // these default members are kept for compatibility sake - there probably isn't anyone out there implementing these
-    // on their own, but we still deprecate them before removing them because we are nice!
-    default void onError(Channel channel, boolean voteAlreadyCompleted, Throwable throwable) {
-        onError(channel, throwable);
-    }
+    void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion, String remoteAddress) throws Exception;
 
-    @Deprecated
-    default void onError(Channel channel, Throwable throwable) {
+    default void onError(Throwable throwable, boolean voteAlreadyCompleted, String remoteAddress) {
         throw new RuntimeException("Unimplemented onError handler");
     }
+
 }

common/src/main/java/com/vexsoftware/votifier/VotifierPlugin.java

@@ -1,17 +0,0 @@
-package com.vexsoftware.votifier;
-
-import io.netty.util.AttributeKey;
-
-import java.security.Key;
-import java.security.KeyPair;
-import java.util.Map;
-
-public interface VotifierPlugin {
-    AttributeKey<VotifierPlugin> KEY = AttributeKey.valueOf("votifier_plugin");
-
-    Map<String, Key> getTokens();
-
-    KeyPair getProtocolV1Key();
-
-    String getVersion();
-}

common/src/main/java/com/vexsoftware/votifier/net/VotifierServerBootstrap.java

@@ -0,0 +1,125 @@
+package com.vexsoftware.votifier.net;
+
+import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
+import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
+import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.support.forwarding.proxy.ProxyForwardingVoteSource;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.Epoll;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.util.concurrent.FastThreadLocalThread;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ThreadFactory;
+import java.util.function.Consumer;
+
+public class VotifierServerBootstrap {
+    private static final boolean USE_EPOLL = Epoll.isAvailable();
+
+    private final String host;
+    private final int port;
+    private final EventLoopGroup bossLoopGroup;
+    private final EventLoopGroup eventLoopGroup;
+    private final VotifierPlugin plugin;
+    private final boolean v1Disable;
+
+    private Channel serverChannel;
+
+    public VotifierServerBootstrap(String host, int port, VotifierPlugin plugin, boolean v1Disable) {
+        this.host = host;
+        this.port = port;
+        this.plugin = plugin;
+        this.v1Disable = v1Disable;
+        if (USE_EPOLL) {
+            this.bossLoopGroup = new EpollEventLoopGroup(1, createThreadFactory("Votifier epoll boss"));
+            this.eventLoopGroup = new EpollEventLoopGroup(3, createThreadFactory("Votifier epoll worker"));
+            plugin.getPluginLogger().info("Using epoll transport to accept votes.");
+        } else {
+            this.bossLoopGroup = new NioEventLoopGroup(1, createThreadFactory("Votifier NIO boss"));
+            this.eventLoopGroup = new NioEventLoopGroup(3, createThreadFactory("Votifier NIO worker"));
+            plugin.getPluginLogger().info("Using NIO transport to accept votes.");
+        }
+    }
+
+    private static ThreadFactory createThreadFactory(String name) {
+        return runnable -> {
+            FastThreadLocalThread thread = new FastThreadLocalThread(runnable, name);
+            thread.setDaemon(true);
+            return thread;
+        };
+    }
+
+    public void start(Consumer<Throwable> error) {
+        Objects.requireNonNull(error, "error");
+
+        VoteInboundHandler voteInboundHandler = new VoteInboundHandler(plugin);
+
+        new ServerBootstrap()
+                .channel(USE_EPOLL ? EpollServerSocketChannel.class : NioServerSocketChannel.class)
+                .group(bossLoopGroup, eventLoopGroup)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    protected void initChannel(SocketChannel channel) {
+                        channel.attr(VotifierSession.KEY).set(new VotifierSession());
+                        channel.attr(VotifierPlugin.KEY).set(plugin);
+                        channel.pipeline().addLast("greetingHandler", VotifierGreetingHandler.INSTANCE);
+                        channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !v1Disable));
+                        channel.pipeline().addLast("voteHandler", voteInboundHandler);
+                    }
+                })
+                .bind(host, port)
+                .addListener((ChannelFutureListener) future -> {
+                    if (future.isSuccess()) {
+                        serverChannel = future.channel();
+                        plugin.getPluginLogger().info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
+                        error.accept(null);
+                    } else {
+                        SocketAddress socketAddress = future.channel().localAddress();
+                        if (socketAddress == null) {
+                            socketAddress = new InetSocketAddress(host, port);
+                        }
+                        plugin.getPluginLogger().error("Votifier was not able to bind to " + socketAddress.toString(), future.cause());
+                        error.accept(future.cause());
+                    }
+                });
+    }
+
+    private Bootstrap client() {
+        return new Bootstrap()
+                .channel(USE_EPOLL ? EpollSocketChannel.class : NioSocketChannel.class)
+                .group(eventLoopGroup);
+    }
+
+    public ProxyForwardingVoteSource createForwardingSource(List<ProxyForwardingVoteSource.BackendServer> backendServers,
+                                                            VoteCache voteCache) {
+        return new ProxyForwardingVoteSource(plugin, this::client, backendServers, voteCache);
+    }
+
+    public void shutdown() {
+        if (serverChannel != null) {
+            try {
+                serverChannel.close().syncUninterruptibly();
+            } catch (Exception e) {
+                plugin.getPluginLogger().error("Unable to shutdown server channel", e);
+            }
+        }
+        eventLoopGroup.shutdownGracefully();
+        bossLoopGroup.shutdownGracefully();
+    }
+}

common/src/main/java/com/vexsoftware/votifier/net/VotifierSession.java

@@ -40,8 +40,14 @@ public class VotifierSession {
     }
 
     public enum ProtocolVersion {
-        UNKNOWN,
-        ONE,
-        TWO
+        UNKNOWN("unknown"),
+        ONE("protocol v1"),
+        TWO("protocol v2"),
+        TEST("test");
+
+        public final String humanReadable;
+        ProtocolVersion(String hr) {
+            this.humanReadable = hr;
+        }
     }
 }

common/src/main/java/com/vexsoftware/votifier/net/protocol/VoteInboundHandler.java

@@ -6,21 +6,29 @@ import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
 import com.vexsoftware.votifier.util.GsonInst;
 import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 
+import java.util.concurrent.atomic.AtomicLong;
+
+@ChannelHandler.Sharable
 public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
     private final VoteHandler handler;
+    private final AtomicLong lastError;
+    private final AtomicLong errorsSent;
 
     public VoteInboundHandler(VoteHandler handler) {
         this.handler = handler;
+        this.lastError = new AtomicLong();
+        this.errorsSent = new AtomicLong();
     }
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, final Vote vote) throws Exception {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
-        handler.onVoteReceived(ctx.channel(), vote, session.getVersion());
+        handler.onVoteReceived(vote, session.getVersion(), ctx.channel().remoteAddress().toString());
         session.completeVote();
 
         if (session.getVersion() == VotifierSession.ProtocolVersion.ONE) {
@@ -33,13 +41,13 @@ public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
-        handler.onError(ctx.channel(), session.hasCompletedVote(), cause);
+        String remoteAddr = ctx.channel().remoteAddress().toString();
+        boolean hasCompletedVote = session.hasCompletedVote();
 
         if (session.getVersion() == VotifierSession.ProtocolVersion.TWO) {
-
             JsonObject object = new JsonObject();
             object.addProperty("status", "error");
             object.addProperty("cause", cause.getClass().getSimpleName());
@@ -48,5 +56,22 @@ public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
         } else {
             ctx.close();
         }
+
+        if (!willThrottleErrorLogging()) {
+            handler.onError(cause, hasCompletedVote, remoteAddr);
+        }
+    }
+
+    private boolean willThrottleErrorLogging() {
+        long lastErrorAt = this.lastError.get();
+        long now = System.currentTimeMillis();
+
+        if (lastErrorAt + 2000 >= now) {
+            return this.errorsSent.incrementAndGet() >= 5;
+        } else {
+            this.lastError.set(now);
+            this.errorsSent.set(0);
+            return false;
+        }
     }
 }

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierGreetingHandler.java

@@ -1,9 +1,9 @@
 package com.vexsoftware.votifier.net.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
 import com.vexsoftware.votifier.net.VotifierSession;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
@@ -12,13 +12,16 @@ import java.nio.charset.StandardCharsets;
 /**
  * Handles the Votifier greeting.
  */
+@ChannelHandler.Sharable
 public class VotifierGreetingHandler extends ChannelInboundHandlerAdapter {
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
-        VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
+    public static final VotifierGreetingHandler INSTANCE = new VotifierGreetingHandler();
 
-        String version = "VOTIFIER " + plugin.getVersion() + " " + session.getChallenge() + "\n";
+    private VotifierGreetingHandler() {}
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
+        String version = "VOTIFIER 2 " + session.getChallenge() + "\n";
         ByteBuf versionBuf = Unpooled.copiedBuffer(version, StandardCharsets.UTF_8);
         ctx.writeAndFlush(versionBuf);
     }

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol1Decoder.java

@@ -1,9 +1,11 @@
 package com.vexsoftware.votifier.net.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSA;
+import com.vexsoftware.votifier.util.QuietException;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -17,32 +19,45 @@ import java.util.List;
 public class VotifierProtocol1Decoder extends ByteToMessageDecoder {
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
-        if (buf.readableBytes() < 256) {
+        if (!ctx.channel().isActive()) {
+            buf.skipBytes(buf.readableBytes());
             return;
         }
 
-        byte[] block = new byte[buf.readableBytes()];
-        buf.getBytes(0, block);
-        // "Drain" the whole buffer
-        buf.readerIndex(buf.readableBytes());
+        if (buf.readableBytes() < 256) {
+            // The client might have not sent all the data yet, so don't eject the connection.
+            return;
+        }
+
+        if (buf.readableBytes() > 256) {
+            // They sent too much data.
+            throw new QuietException("Could not decrypt data from " + ctx.channel().remoteAddress() + " as it is too long. Attack?");
+        }
+
+        byte[] block = ByteBufUtil.getBytes(buf);
+        buf.skipBytes(buf.readableBytes());
 
         VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
 
         try {
             block = RSA.decrypt(block, plugin.getProtocolV1Key().getPrivate());
         } catch (Exception e) {
-            throw new CorruptedFrameException("Could not decrypt data (is your key correct?)", e);
+            if (plugin.isDebug()) {
+                throw new CorruptedFrameException("Could not decrypt data from " + ctx.channel().remoteAddress() + ". Make sure the public key on the list is correct.", e);
+            } else {
+                throw new QuietException("Could not decrypt data from " + ctx.channel().remoteAddress() + ". Make sure the public key on the list is correct.");
+            }
         }
 
         // Parse the string we received.
         String all = new String(block, StandardCharsets.US_ASCII);
         String[] split = all.split("\n");
         if (split.length < 5) {
-            throw new CorruptedFrameException("Not enough fields specified in vote.");
+            throw new QuietException("Not enough fields specified in vote. This is not a NuVotifier issue. Got " + split.length + " fields, but needed 5.");
         }
 
         if (!split[0].equals("VOTE")) {
-            throw new CorruptedFrameException("VOTE opcode not found");
+            throw new QuietException("The VOTE opcode was not present. This is not a NuVotifier issue, but a bug with the server list.");
         }
 
         // Create the vote.

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2Decoder.java

@@ -1,7 +1,7 @@
 package com.vexsoftware.votifier.net.protocol;
 
 import com.google.gson.JsonObject;
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
 import com.vexsoftware.votifier.util.GsonInst;

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocolDifferentiator.java

@@ -1,10 +1,10 @@
 package com.vexsoftware.votifier.net.protocol;
 
 import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.QuietException;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
@@ -16,6 +16,8 @@ import java.util.List;
  * Attempts to determine if original protocol or protocol v2 is being used.
  */
 public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
+    private static final QuietException V2_ONLY = new QuietException("This server only accepts well-formed Votifier v2 packets.");
+
     private static final short PROTOCOL_2_MAGIC = 0x733A;
     private final boolean testMode;
     private final boolean allowv1;
@@ -35,11 +37,7 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
             return;
         }
 
-        short readMagic = buf.readShort();
-
-        // Reset reader index again
-        buf.readerIndex(0);
-
+        short readMagic = buf.getShort(0);
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
         if (readMagic == PROTOCOL_2_MAGIC) {
@@ -55,7 +53,7 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
             }
         } else {
             if (!allowv1) {
-                throw new CorruptedFrameException("This server only accepts well-formed Votifier v2 packets.");
+                throw V2_ONLY;
             }
             // Probably Protocol v1 Vote Message
             session.setVersion(VotifierSession.ProtocolVersion.ONE);

common/src/main/java/com/vexsoftware/votifier/net/protocol/v1crypto/RSAIO.java

@@ -18,6 +18,7 @@
 
 package com.vexsoftware.votifier.net.protocol.v1crypto;
 
+import java.io.IOException;
 import java.util.Base64;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -59,6 +60,19 @@ public class RSAIO {
         }
     }
 
+    public static byte[] readB64File(File directory, String name) throws IOException {
+        File f = new File(directory, name);
+        byte[] contents = Files.readAllBytes(f.toPath());
+        String strContents = new String(contents, StandardCharsets.US_ASCII);
+        strContents = strContents.trim();
+        try {
+            return Base64.getDecoder().decode(strContents);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Base64 decoding exception: This is probably due to a corrupted file, " +
+                    "but in case it isn't, here is a b64 representation of what we read: " + new String(Base64.getEncoder().encode(contents), StandardCharsets.UTF_8), e);
+        }
+    }
+
     /**
      * Loads an RSA key pair from a directory. The directory must have the files
      * "public.key" and "private.key".
@@ -69,14 +83,10 @@ public class RSAIO {
      */
     public static KeyPair load(File directory) throws Exception {
         // Read the public key file.
-        File publicKeyFile = new File(directory + "/public.key");
-        byte[] encodedPublicKey = Files.readAllBytes(publicKeyFile.toPath());
-        encodedPublicKey = Base64.getDecoder().decode(new String(encodedPublicKey, StandardCharsets.UTF_8));
+        byte[] encodedPublicKey = readB64File(directory, "public.key");
 
         // Read the private key file.
-        File privateKeyFile = new File(directory + "/private.key");
-        byte[] encodedPrivateKey = Files.readAllBytes(privateKeyFile.toPath());
-        encodedPrivateKey = Base64.getDecoder().decode(new String(encodedPrivateKey, StandardCharsets.UTF_8));
+        byte[] encodedPrivateKey = readB64File(directory, "private.key");
 
         // Instantiate and return the key pair.
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");

common/src/main/java/com/vexsoftware/votifier/platform/BackendServer.java

@@ -0,0 +1,7 @@
+package com.vexsoftware.votifier.platform;
+
+public interface BackendServer {
+    String getName();
+
+    boolean sendPluginMessage(String channel, byte[] data);
+}

common/src/main/java/com/vexsoftware/votifier/platform/JavaUtilLogger.java

@@ -0,0 +1,43 @@
+package com.vexsoftware.votifier.platform;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class JavaUtilLogger implements LoggingAdapter {
+
+    private final Logger logger;
+
+    public JavaUtilLogger(Logger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    public void error(String s) {
+        logger.severe(s);
+    }
+
+    @Override
+    public void error(String s, Object... o) {
+        logger.log(Level.SEVERE, s, o);
+    }
+
+    @Override
+    public void warn(String s) {
+        logger.warning(s);
+    }
+
+    @Override
+    public void warn(String s, Object... o) {
+        logger.log(Level.WARNING, s, o);
+    }
+
+    @Override
+    public void info(String s) {
+        logger.info(s);
+    }
+
+    @Override
+    public void info(String s, Object... o) {
+        logger.log(Level.INFO, s, o);
+    }
+}

common/src/main/java/com/vexsoftware/votifier/platform/LoggingAdapter.java

@@ -0,0 +1,13 @@
+package com.vexsoftware.votifier.platform;
+
+public interface LoggingAdapter {
+    void error(String s);
+    void error(String s, Object... o);
+
+    void warn(String s);
+    void warn(String s, Object... o);
+
+    void info(String s);
+    void info(String s, Object... o);
+}
+

common/src/main/java/com/vexsoftware/votifier/platform/ProxyVotifierPlugin.java

@@ -0,0 +1,10 @@
+package com.vexsoftware.votifier.platform;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public interface ProxyVotifierPlugin extends VotifierPlugin {
+    Collection<BackendServer> getAllBackendServers();
+
+    Optional<BackendServer> getServer(String name);
+}

common/src/main/java/com/vexsoftware/votifier/platform/VotifierPlugin.java

@@ -0,0 +1,25 @@
+package com.vexsoftware.votifier.platform;
+
+import com.vexsoftware.votifier.VoteHandler;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import io.netty.util.AttributeKey;
+
+import java.security.Key;
+import java.security.KeyPair;
+import java.util.Map;
+
+public interface VotifierPlugin extends VoteHandler {
+    AttributeKey<VotifierPlugin> KEY = AttributeKey.valueOf("votifier_plugin");
+
+    Map<String, Key> getTokens();
+
+    KeyPair getProtocolV1Key();
+
+    LoggingAdapter getPluginLogger();
+
+    VotifierScheduler getScheduler();
+
+    default boolean isDebug() {
+        return false;
+    }
+}

common/src/main/java/com/vexsoftware/votifier/platform/scheduler/ScheduledExecutorServiceVotifierScheduler.java

@@ -0,0 +1,52 @@
+package com.vexsoftware.votifier.platform.scheduler;
+
+import java.util.Objects;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+public class ScheduledExecutorServiceVotifierScheduler implements VotifierScheduler {
+    private final ScheduledExecutorService service;
+
+    public ScheduledExecutorServiceVotifierScheduler(ScheduledExecutorService service) {
+        this.service = Objects.requireNonNull(service, "service");
+    }
+
+    @Override
+    public ScheduledVotifierTask sync(Runnable runnable) {
+        return new ScheduledVotifierTaskWrapper(service.submit(runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask onPool(Runnable runnable) {
+        return new ScheduledVotifierTaskWrapper(service.submit(runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.schedule(runnable, delay, unit));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.schedule(runnable, delay, unit));
+    }
+
+    @Override
+    public ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.scheduleAtFixedRate(runnable, delay, repeat, unit));
+    }
+
+    private static class ScheduledVotifierTaskWrapper implements ScheduledVotifierTask {
+        private final Future<?> future;
+
+        private ScheduledVotifierTaskWrapper(Future<?> future) {
+            this.future = future;
+        }
+
+        @Override
+        public void cancel() {
+            future.cancel(false);
+        }
+    }
+}

common/src/main/java/com/vexsoftware/votifier/platform/scheduler/ScheduledVotifierTask.java

@@ -0,0 +1,5 @@
+package com.vexsoftware.votifier.platform.scheduler;
+
+public interface ScheduledVotifierTask {
+    void cancel();
+}

common/src/main/java/com/vexsoftware/votifier/platform/scheduler/VotifierScheduler.java

@@ -0,0 +1,15 @@
+package com.vexsoftware.votifier.platform.scheduler;
+
+import java.util.concurrent.TimeUnit;
+
+public interface VotifierScheduler {
+    ScheduledVotifierTask sync(Runnable runnable);
+
+    ScheduledVotifierTask onPool(Runnable runnable);
+
+    ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit);
+
+    ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit);
+
+    ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit);
+}

common/src/main/java/com/vexsoftware/votifier/support/forwarding/AbstractPluginMessagingForwardingSink.java

@@ -0,0 +1,46 @@
+package com.vexsoftware.votifier.support.forwarding;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.vexsoftware.votifier.model.Vote;
+
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public abstract class AbstractPluginMessagingForwardingSink implements ForwardingVoteSink {
+
+    public AbstractPluginMessagingForwardingSink(ForwardedVoteListener listener) {
+        this.listener = listener;
+    }
+
+    private final ForwardedVoteListener listener;
+
+    public void handlePluginMessage(byte[] message) {
+        String strMessage = new String(message, StandardCharsets.UTF_8);
+        try (CharArrayReader reader = new CharArrayReader(strMessage.toCharArray())) {
+            JsonReader r = new JsonReader(reader);
+            r.setLenient(true);
+            while (r.peek() != JsonToken.END_DOCUMENT) {
+                r.beginObject();
+                JsonObject o = new JsonObject();
+
+                while (r.hasNext()) {
+                    String name = r.nextName();
+                    if (r.peek() == JsonToken.NUMBER)
+                        o.add(name, new JsonPrimitive(r.nextLong()));
+                    else
+                        o.add(name, new JsonPrimitive(r.nextString()));
+                }
+                r.endObject();
+
+                Vote v = new Vote(o);
+                listener.onForward(v);
+            }
+        } catch (IOException e) {
+            e.printStackTrace(); // Should never happen.
+        }
+    }
+}

common/src/main/java/com/vexsoftware/votifier/support/forwarding/AbstractPluginMessagingForwardingSource.java

@@ -0,0 +1,160 @@
+package com.vexsoftware.votifier.support.forwarding;
+
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.platform.BackendServer;
+import com.vexsoftware.votifier.platform.ProxyVotifierPlugin;
+import com.vexsoftware.votifier.support.forwarding.cache.FileVoteCache;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+public abstract class AbstractPluginMessagingForwardingSource implements ForwardingVoteSource {
+
+    public AbstractPluginMessagingForwardingSource(String channel, ServerFilter serverFilter, ProxyVotifierPlugin plugin, VoteCache cache, int dumpRate) {
+        this.channel = channel;
+        this.plugin = plugin;
+        this.cache = cache;
+        this.serverFilter = serverFilter;
+        this.dumpRate = dumpRate;
+    }
+
+    protected AbstractPluginMessagingForwardingSource(String channel, ProxyVotifierPlugin plugin, VoteCache voteCache, int dumpRate) {
+        this(channel, null, plugin, voteCache, dumpRate);
+    }
+
+    protected final ProxyVotifierPlugin plugin;
+    protected final String channel;
+    protected final VoteCache cache;
+    protected final ServerFilter serverFilter;
+    private final int dumpRate;
+
+    @Override
+    public void forward(Vote v) {
+        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        for (BackendServer server : plugin.getAllBackendServers()) {
+            if (!serverFilter.isAllowed(server.getName())) continue;
+            if (!forwardSpecific(server, rawData)) {
+                attemptToAddToCache(v, server.getName());
+            } else if (plugin.isDebug()) {
+                plugin.getPluginLogger().info("Successfully forwarded vote " + v + " to server " + server.getName());
+            }
+        }
+    }
+
+    protected boolean forwardSpecific(BackendServer connection, Vote vote) {
+        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        return forwardSpecific(connection, rawData);
+    }
+
+    protected boolean forwardSpecific(BackendServer connection, Collection<Vote> votes) {
+        StringBuilder data = new StringBuilder();
+        for (Vote v : votes) {
+            data.append(v.serialize().toString());
+        }
+
+        return forwardSpecific(connection, data.toString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    private boolean forwardSpecific(BackendServer connection, byte[] data) {
+        return connection.sendPluginMessage(channel, data);
+    }
+
+    @Override
+    public void halt() {
+        if (cache instanceof FileVoteCache) {
+            try {
+                ((FileVoteCache) cache).halt();
+            } catch (IOException e) {
+                plugin.getPluginLogger().error("Unable to save cached votes, votes will be lost.", e);
+            }
+        }
+    }
+
+    protected void onServerConnect(BackendServer server) {
+        if (cache == null) return;
+        final Collection<Vote> cachedVotes = cache.evict(server.getName());
+        dumpVotesToServer(cachedVotes, server, "server '" + server + "'", failedVotes -> {
+            for (Vote v : failedVotes)
+                cache.addToCache(v, server.getName());
+        });
+    }
+
+    protected void attemptToAddToCache(Vote v, String server) {
+        if (cache != null) {
+            cache.addToCache(v, server);
+            if (plugin.isDebug())
+                plugin.getPluginLogger().info("Added to forwarding cache: " + v + " -> " + server);
+        } else if (plugin.isDebug())
+            plugin.getPluginLogger().error("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
+    }
+
+    protected void attemptToAddToPlayerCache(Vote v, String player) {
+        if (cache != null) {
+            cache.addToCachePlayer(v, player);
+            if (plugin.isDebug())
+                plugin.getPluginLogger().info("Added to forwarding cache: " + v + " -> (player) " + player);
+        } else if (plugin.isDebug())
+            plugin.getPluginLogger().error("Could not immediately send vote to backend, vote lost! " + v + " -> (player) " + player);
+
+    }
+
+    // returns a collection of failed votes
+    private void dumpVotesToServer(Collection<Vote> cachedVotes, BackendServer target, String identifier, Consumer<Collection<Vote>> cb) {
+        dumpVotesToServer(cachedVotes, target, identifier, 0, cb);
+    }
+    private void dumpVotesToServer(Collection<Vote> cachedVotes, BackendServer target, String identifier, int evictedAlready, Consumer<Collection<Vote>> cb) {
+        if (!cachedVotes.isEmpty()) {
+            plugin.getScheduler().delayedOnPool(() -> {
+                int evicted = 0;
+                Iterator<Vote> vi = cachedVotes.iterator();
+                Collection<Vote> chunk = new ArrayList<>(dumpRate);
+                while (vi.hasNext() && evicted < dumpRate) {
+                    chunk.add(vi.next());
+                    vi.remove();
+                }
+
+                if (forwardSpecific(target, chunk)) {
+                    evicted += chunk.size();
+
+                    if (evicted >= dumpRate && !cachedVotes.isEmpty()) {
+                        // if we evicted everything we could but still need to evict more
+                        dumpVotesToServer(cachedVotes, target, identifier, evictedAlready + evicted, cb);
+                        return;
+                    }
+                } else {
+                    // so since our forwarding failed, break like we are done
+                    cachedVotes.addAll(chunk);
+                }
+
+                if (plugin.isDebug()) {
+                    plugin.getPluginLogger().info("Successfully evicted " + (evictedAlready + evicted) + " votes to " + identifier + ".");
+                    if (!cachedVotes.isEmpty()) {
+                        plugin.getPluginLogger().info("Held " + cachedVotes.size() + " votes for " + identifier + ".");
+                    }
+                }
+
+                // cachedVotes contains any votes which have yet to be evicted
+                cb.accept(cachedVotes);
+            }, 1, TimeUnit.SECONDS);
+        } else {
+            cb.accept(cachedVotes);
+        }
+    }
+
+    protected void handlePlayerSwitch(BackendServer server, String playerName) {
+        if (cache == null) return;
+        if (!serverFilter.isAllowed(server.getName())) return;
+
+        final Collection<Vote> cachedVotes = cache.evictPlayer(playerName);
+        dumpVotesToServer(cachedVotes, server, "player '" + playerName + "'", failedVotes -> {
+            for (Vote v : failedVotes)
+                cache.addToCachePlayer(v, playerName);
+        });
+    }
+}

common/src/main/java/com/vexsoftware/votifier/support/forwarding/ForwardedVoteListener.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.forwarding;
+package com.vexsoftware.votifier.support.forwarding;
 
 import com.vexsoftware.votifier.model.Vote;
 

common/src/main/java/com/vexsoftware/votifier/support/forwarding/ForwardingVoteSink.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.sponge.forwarding;
+package com.vexsoftware.votifier.support.forwarding;
 
 /**
  * Represents a method at which to receive forwarded votes.

common/src/main/java/com/vexsoftware/votifier/support/forwarding/ForwardingVoteSource.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding;
+package com.vexsoftware.votifier.support.forwarding;
 
 import com.vexsoftware.votifier.model.Vote;
 

common/src/main/java/com/vexsoftware/votifier/support/forwarding/ServerFilter.java

@@ -0,0 +1,23 @@
+package com.vexsoftware.votifier.support.forwarding;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class ServerFilter {
+
+    public ServerFilter(Collection<String> names, boolean whitelist) {
+        this.names = names;
+        this.whitelist = whitelist;
+    }
+
+    public ServerFilter() {
+        this(Collections.emptySet(), true);
+    }
+
+    private final Collection<String> names;
+    private final boolean whitelist;
+
+    public boolean isAllowed(String name) {
+        return names.contains(name) == whitelist;
+    }
+}

common/src/main/java/com/vexsoftware/votifier/support/forwarding/cache/FileVoteCache.java

@@ -1,54 +1,60 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
+package com.vexsoftware.votifier.support.forwarding.cache;
 
-import com.google.common.io.Files;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.platform.scheduler.ScheduledVotifierTask;
 import com.vexsoftware.votifier.util.GsonInst;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.scheduler.ScheduledTask;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class FileVoteCache extends MemoryVoteCache {
 
-    private final Logger l;
+    private final LoggingAdapter l;
     private final File cacheFile;
-    private final int voteTTL;
-    private final ScheduledTask saveTask;
+    private final ScheduledVotifierTask saveTask;
 
-    public FileVoteCache(int initialMemorySize, final Plugin plugin, File cacheFile, int voteTTL) throws IOException {
-        super(initialMemorySize);
+    public FileVoteCache(final VotifierPlugin plugin, File cacheFile, long voteTTL) throws IOException {
+        super(plugin, voteTTL);
         this.cacheFile = cacheFile;
-        this.voteTTL = voteTTL;
-        this.l = plugin.getLogger();
+        this.l = plugin.getPluginLogger();
 
         load();
 
-        saveTask = ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    save();
-                } catch (IOException e) {
-                    l.log(Level.SEVERE, "Unable to save cached votes, votes will be lost if you restart.", e);
-                }
+        saveTask = plugin.getScheduler().repeatOnPool(() -> {
+            try {
+                save();
+            } catch (IOException e) {
+                l.error("Unable to save cached votes, votes will be lost if you restart.", e);
             }
         }, 3, 3, TimeUnit.MINUTES);
     }
 
+    private static Set<String> keySet(JsonObject object) {
+        Set<String> set = new HashSet<>();
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
+            set.add(entry.getKey());
+        }
+        return set;
+    }
+
     private void load() throws IOException {
         // Load the cache from disk
         JsonObject object;
-        try (BufferedReader reader = Files.newReader(cacheFile, StandardCharsets.UTF_8)) {
+        try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath(), StandardCharsets.UTF_8)) {
             object = GsonInst.gson.fromJson(reader, JsonObject.class);
-        } catch (FileNotFoundException e) {
+            if (object == null) {
+                // When the input is not malformed but instead empty, this returns null. Simply assume it is empty.
+                object = new JsonObject();
+            }
+        } catch (NoSuchFileException e) {
             object = new JsonObject();
         }
 
@@ -70,11 +76,11 @@ public class FileVoteCache extends MemoryVoteCache {
         JsonObject players = object.getAsJsonObject("players");
         JsonObject servers = object.getAsJsonObject("servers");
 
-        for (String player : players.keySet()) {
+        for (String player : keySet(players)) {
             playerVoteCache.put(player, readVotes(players.getAsJsonArray(player)));
         }
 
-        for (String server : servers.keySet()) {
+        for (String server : keySet(servers)) {
             voteCache.put(server, readVotes(servers.getAsJsonArray(server)));
         }
 
@@ -87,22 +93,22 @@ public class FileVoteCache extends MemoryVoteCache {
             }
 
             if (!cacheFile.renameTo(replacementFile)) {
-                l.log(Level.SEVERE, "Backup movement failed! Will not save.");
+                l.error("Backup movement failed! Will not save.");
                 return;
             }
 
-            l.log(Level.WARNING, "Saving new vote cache format to file - backup moved to " + replacementFile.getAbsolutePath());
+            l.warn("Saving new vote cache format to file - backup moved to " + replacementFile.getAbsolutePath());
             save();
         }
     }
 
-    private Collection<Vote> readVotes(JsonArray voteArray) {
-        List<Vote> votes = new ArrayList<>(voteArray.size());
+    private Collection<VoteWithRecordedTimestamp> readVotes(JsonArray voteArray) {
+        Collection<VoteWithRecordedTimestamp> votes = new HashSet<>(voteArray.size());
         for (int i = 0; i < voteArray.size(); i++) {
             JsonObject voteObject = voteArray.get(i).getAsJsonObject();
-            Vote v = new Vote(voteObject);
+            VoteWithRecordedTimestamp v = new VoteWithRecordedTimestamp(voteObject);
             if (hasTimedOut(v))
-                l.log(Level.WARNING, "Purging out of date vote.", v);
+                l.warn("Purging out of date vote.", v);
             else
                 votes.add(v);
         }
@@ -110,35 +116,36 @@ public class FileVoteCache extends MemoryVoteCache {
     }
 
     public void save() throws IOException {
-        cacheLock.lock();
         JsonObject votesObject = new JsonObject();
-        votesObject.addProperty("version", 2);
+
+        cacheLock.lock();
         try {
+            votesObject.addProperty("version", 2);
             votesObject.add("players", serializeMap(playerVoteCache));
             votesObject.add("servers", serializeMap(voteCache));
         } finally {
             cacheLock.unlock();
         }
 
-        try (BufferedWriter writer = Files.newWriter(cacheFile, StandardCharsets.UTF_8)) {
+        try (BufferedWriter writer = Files.newBufferedWriter(cacheFile.toPath(), StandardCharsets.UTF_8)) {
             GsonInst.gson.toJson(votesObject, writer);
         }
     }
 
-    public JsonObject serializeMap(Map<String, Collection<Vote>> map) {
+    public JsonObject serializeMap(Map<String, Collection<VoteWithRecordedTimestamp>> map) {
         JsonObject o = new JsonObject();
 
-        Iterator<Map.Entry<String, Collection<Vote>>> entryItr = map.entrySet().iterator();
+        Iterator<Map.Entry<String, Collection<VoteWithRecordedTimestamp>>> entryItr = map.entrySet().iterator();
         while (entryItr.hasNext()) {
-            Map.Entry<String, Collection<Vote>> entry = entryItr.next();
+            Map.Entry<String, Collection<VoteWithRecordedTimestamp>> entry = entryItr.next();
             JsonArray array = new JsonArray();
-            Iterator<Vote> voteItr = entry.getValue().iterator();
+            Iterator<VoteWithRecordedTimestamp> voteItr = entry.getValue().iterator();
             while (voteItr.hasNext()) {
-                Vote vote = voteItr.next();
+                VoteWithRecordedTimestamp vote = voteItr.next();
 
                 // if the vote is no longer valid, notify and remove
                 if (hasTimedOut(vote)) {
-                    l.log(Level.WARNING, "Purging out of date vote.", vote);
+                    l.warn("Purging out of date vote.", vote);
                     voteItr.remove();
                 } else {
                     array.add(vote.serialize());
@@ -154,11 +161,6 @@ public class FileVoteCache extends MemoryVoteCache {
         return o;
     }
 
-    private boolean hasTimedOut(Vote v) {
-        if (voteTTL == -1) return false;
-        // scale voteTTL to milliseconds
-        return v.getLocalTimestamp() + voteTTL * 24 * 60 * 60 * 1000 < System.currentTimeMillis();
-    }
 
     public void halt() throws IOException {
         saveTask.cancel();

common/src/main/java/com/vexsoftware/votifier/support/forwarding/cache/MemoryVoteCache.java

@@ -0,0 +1,175 @@
+package com.vexsoftware.votifier.support.forwarding.cache;
+
+import com.google.gson.JsonObject;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.platform.scheduler.ScheduledVotifierTask;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Created by Joe Hirschfeld on 10/20/2015.
+ */
+public class MemoryVoteCache implements VoteCache {
+
+    private final LoggingAdapter l;
+    private final long voteTTL;
+
+    protected final Map<String, Collection<VoteWithRecordedTimestamp>> voteCache;
+    protected final Map<String, Collection<VoteWithRecordedTimestamp>> playerVoteCache;
+
+    protected final ReentrantLock cacheLock = new ReentrantLock();
+
+    private final ScheduledVotifierTask sweepTask;
+
+    public MemoryVoteCache(VotifierPlugin p, long voteTTL) {
+        voteCache = new HashMap<>();
+        playerVoteCache = new HashMap<>();
+
+        this.voteTTL = voteTTL;
+
+        this.l = p.getPluginLogger();
+        this.sweepTask = p.getScheduler().repeatOnPool(this::sweep, 12, 12, TimeUnit.HOURS);
+    }
+
+    @Override
+    public Collection<String> getCachedServers() {
+        cacheLock.lock();
+        try {
+            return Collections.unmodifiableCollection(new ArrayList<>(voteCache.keySet()));
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public void addToCache(Vote v, String server) {
+        if (server == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            voteCache.computeIfAbsent(server, k -> new HashSet<>()).add(new VoteWithRecordedTimestamp(v));
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public void addToCachePlayer(Vote v, String player) {
+        if (player == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            playerVoteCache.computeIfAbsent(player, k -> new HashSet<>()).add(new VoteWithRecordedTimestamp(v));
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public Collection<Vote> evictPlayer(String player) {
+        if (player == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            Collection<VoteWithRecordedTimestamp> playerVotes = playerVoteCache.remove(player);
+            if (playerVotes != null) {
+                return new HashSet<>(playerVotes);
+            } else {
+                return Collections.emptySet();
+            }
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public Collection<Vote> evict(String server) {
+        if (server == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            Collection<VoteWithRecordedTimestamp> serverVotes = voteCache.remove(server);
+            if (serverVotes != null) {
+                return new HashSet<>(serverVotes);
+            } else {
+                return Collections.emptySet();
+            }
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    public void sweep() {
+        cacheLock.lock();
+        try {
+            sweep(voteCache);
+            sweep(playerVoteCache);
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    private void sweep(Map<String, Collection<VoteWithRecordedTimestamp>> m) {
+        for (Map.Entry<String, Collection<VoteWithRecordedTimestamp>> entry : m.entrySet()) {
+            Iterator<VoteWithRecordedTimestamp> vi = entry.getValue().iterator();
+            while (vi.hasNext()) {
+                VoteWithRecordedTimestamp v = vi.next();
+                if (hasTimedOut(v)) {
+                    l.warn("Purging out of date vote.", v);
+                    vi.remove();
+                }
+            }
+        }
+    }
+
+    protected boolean hasTimedOut(VoteWithRecordedTimestamp v) {
+        if (voteTTL == -1) return false;
+
+        long daysAsMillis = TimeUnit.DAYS.toMillis(voteTTL);
+        return v.recorded + daysAsMillis < System.currentTimeMillis();
+    }
+
+    static class VoteWithRecordedTimestamp extends Vote {
+        private final long recorded;
+
+        VoteWithRecordedTimestamp(Vote vote) {
+            super(vote);
+            this.recorded = System.currentTimeMillis();
+        }
+
+        VoteWithRecordedTimestamp(JsonObject object) {
+            super(object);
+            if (object.has("recorded")) {
+                this.recorded = object.get("recorded").getAsLong();
+            } else {
+                // Assign the current time, in the hope that the stale votes will eventually get purged.
+                this.recorded = System.currentTimeMillis();
+            }
+        }
+
+        @Override
+        public JsonObject serialize() {
+            JsonObject object = super.serialize();
+            object.addProperty("recorded", this.recorded);
+            return object;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            if (!super.equals(o)) return false;
+
+            VoteWithRecordedTimestamp that = (VoteWithRecordedTimestamp) o;
+
+            return recorded == that.recorded;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = super.hashCode();
+            result = 31 * result + (int) (recorded ^ (recorded >>> 32));
+            return result;
+        }
+    }
+}

common/src/main/java/com/vexsoftware/votifier/support/forwarding/cache/VoteCache.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
+package com.vexsoftware.votifier.support.forwarding.cache;
 
 import com.vexsoftware.votifier.model.Vote;
 

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/ProxyForwardingVoteSource.java

@@ -1,18 +1,16 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy;
+package com.vexsoftware.votifier.support.forwarding.proxy;
 
-import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.ForwardingVoteSource;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierProtocol2Encoder;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierProtocol2HandshakeHandler;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierResponseHandler;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.support.forwarding.ForwardingVoteSource;
+import com.vexsoftware.votifier.support.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.support.forwarding.proxy.client.VotifierProtocol2Encoder;
+import com.vexsoftware.votifier.support.forwarding.proxy.client.VotifierProtocol2HandshakeHandler;
+import com.vexsoftware.votifier.support.forwarding.proxy.client.VotifierResponseHandler;
 import com.vexsoftware.votifier.model.Vote;
 import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.DelimiterBasedFrameDecoder;
 import io.netty.handler.codec.Delimiters;
 import io.netty.handler.codec.string.StringDecoder;
@@ -23,20 +21,20 @@ import java.nio.charset.StandardCharsets;
 import java.security.Key;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
+import java.util.function.Supplier;
 
 public class ProxyForwardingVoteSource implements ForwardingVoteSource {
     private static final int MAX_RETRIES = 5;
-    private final NuVotifier plugin;
-    private final NioEventLoopGroup eventLoopGroup;
+    private final VotifierPlugin plugin;
+    private final Supplier<Bootstrap> nettyBootstrap;
     private final List<BackendServer> backendServers;
     private final VoteCache voteCache;
 
     private static final StringDecoder STRING_DECODER = new StringDecoder(StandardCharsets.US_ASCII);
 
-    public ProxyForwardingVoteSource(NuVotifier plugin, NioEventLoopGroup eventLoopGroup, List<BackendServer> backendServers, VoteCache voteCache) {
+    public ProxyForwardingVoteSource(VotifierPlugin plugin, Supplier<Bootstrap> nettyBootstrap, List<BackendServer> backendServers, VoteCache voteCache) {
         this.plugin = plugin;
-        this.eventLoopGroup = eventLoopGroup;
+        this.nettyBootstrap = nettyBootstrap;
         this.backendServers = backendServers;
         this.voteCache = voteCache;
     }
@@ -54,21 +52,19 @@ public class ProxyForwardingVoteSource implements ForwardingVoteSource {
     }
 
     private void forwardVote(final BackendServer server, final Vote v, final int tries) {
-        new Bootstrap()
-                .channel(NioSocketChannel.class)
-                .group(eventLoopGroup)
-                .handler(new ChannelInitializer<NioSocketChannel>() {
+        nettyBootstrap.get()
+                .handler(new ChannelInitializer<SocketChannel>() {
                     @Override
-                    protected void initChannel(NioSocketChannel channel) throws Exception {
+                    protected void initChannel(SocketChannel channel) {
                         channel.pipeline().addLast(new DelimiterBasedFrameDecoder(256, true, Delimiters.lineDelimiter()));
-                        channel.pipeline().addLast(new ReadTimeoutHandler(8, TimeUnit.SECONDS));
+                        channel.pipeline().addLast(new ReadTimeoutHandler(5, TimeUnit.SECONDS));
                         channel.pipeline().addLast(STRING_DECODER);
                         channel.pipeline().addLast(new VotifierProtocol2Encoder(server.key));
                         channel.pipeline().addLast(new VotifierProtocol2HandshakeHandler(v, new VotifierResponseHandler() {
                             @Override
                             public void onSuccess() {
                                 if (plugin.isDebug()) {
-                                    plugin.getLogger().info("Successfully forwarded vote " + v + " to " + server.address + ".");
+                                    plugin.getPluginLogger().info("Successfully forwarded vote " + v + " to " + server.address + ".");
                                 }
                             }
 
@@ -80,12 +76,9 @@ public class ProxyForwardingVoteSource implements ForwardingVoteSource {
                     }
                 })
                 .connect(server.address)
-                .addListener(new ChannelFutureListener() {
-                    @Override
-                    public void operationComplete(ChannelFuture future) throws Exception {
-                        if (!future.isSuccess()) {
-                            handleFailure(server, v, future.cause(), tries);
-                        }
+                .addListener((ChannelFutureListener) future -> {
+                    if (!future.isSuccess()) {
+                        handleFailure(server, v, future.cause(), tries);
                     }
                 });
     }
@@ -106,18 +99,13 @@ public class ProxyForwardingVoteSource implements ForwardingVoteSource {
         }
 
         if (plugin.isDebug()) {
-            plugin.getLogger().log(Level.SEVERE, msg, cause);
+            plugin.getPluginLogger().error(msg, cause);
         } else {
-            plugin.getLogger().log(Level.SEVERE, msg);
+            plugin.getPluginLogger().error(msg);
         }
 
         if (willRetry) {
-            plugin.getProxy().getScheduler().schedule(plugin, new Runnable() {
-                @Override
-                public void run() {
-                    forwardVote(server, v, tries + 1);
-                }
-            }, nextDelay, TimeUnit.SECONDS);
+            plugin.getScheduler().delayedOnPool(() -> forwardVote(server, v, tries + 1), nextDelay, TimeUnit.SECONDS);
         }
     }
 

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/client/VoteRequest.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
+package com.vexsoftware.votifier.support.forwarding.proxy.client;
 
 import com.vexsoftware.votifier.model.Vote;
 

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/client/VotifierProtocol2Encoder.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
+package com.vexsoftware.votifier.support.forwarding.proxy.client;
 
 import com.google.gson.JsonObject;
 import io.netty.buffer.ByteBuf;

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/client/VotifierProtocol2HandshakeHandler.java

@@ -1,6 +1,6 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
+package com.vexsoftware.votifier.support.forwarding.proxy.client;
 
-import com.vexsoftware.votifier.bungee.NuVotifier;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -9,16 +9,16 @@ import io.netty.handler.codec.CorruptedFrameException;
 public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandler<String> {
     private final Vote toSend;
     private final VotifierResponseHandler responseHandler;
-    private final NuVotifier nuVotifier;
+    private final VotifierPlugin nuVotifier;
 
-    public VotifierProtocol2HandshakeHandler(Vote toSend, VotifierResponseHandler responseHandler, NuVotifier nuVotifier) {
+    public VotifierProtocol2HandshakeHandler(Vote toSend, VotifierResponseHandler responseHandler, VotifierPlugin nuVotifier) {
         this.toSend = toSend;
         this.responseHandler = responseHandler;
         this.nuVotifier = nuVotifier;
     }
 
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, String s) {
         String[] handshakeContents = s.split(" ");
         if (handshakeContents.length != 3) {
             throw new CorruptedFrameException("Handshake is not valid.");
@@ -26,7 +26,7 @@ public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandl
 
         VoteRequest request = new VoteRequest(handshakeContents[2], toSend);
         if (nuVotifier.isDebug()) {
-            nuVotifier.getLogger().info("Sent request: " + request.toString());
+            nuVotifier.getPluginLogger().info("Sent request: " + request.toString());
         }
         ctx.writeAndFlush(request);
         ctx.pipeline().addLast(new VotifierProtocol2ResponseHandler(responseHandler));
@@ -35,7 +35,7 @@ public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandl
 
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         responseHandler.onFailure(cause);
         ctx.close();
     }

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/client/VotifierProtocol2ResponseHandler.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
+package com.vexsoftware.votifier.support.forwarding.proxy.client;
 
 import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.util.GsonInst;
@@ -13,7 +13,7 @@ public class VotifierProtocol2ResponseHandler extends SimpleChannelInboundHandle
     }
 
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, String msg) {
         JsonObject object = GsonInst.gson.fromJson(msg, JsonObject.class);
         String status = object.get("status").getAsString();
         if (status.equals("ok")) {
@@ -26,7 +26,7 @@ public class VotifierProtocol2ResponseHandler extends SimpleChannelInboundHandle
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         responseHandler.onFailure(cause);
         ctx.close();
     }

common/src/main/java/com/vexsoftware/votifier/support/forwarding/proxy/client/VotifierResponseHandler.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
+package com.vexsoftware.votifier.support.forwarding.proxy.client;
 
 public interface VotifierResponseHandler {
     void onSuccess();

common/src/main/java/com/vexsoftware/votifier/util/ArgsToVote.java

@@ -0,0 +1,62 @@
+package com.vexsoftware.votifier.util;
+
+import com.vexsoftware.votifier.model.Vote;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ArgsToVote {
+
+    private static final Pattern argumentPattern = Pattern.compile("([a-zA-Z]+)=(\\S*)");
+
+    public static Vote parse(String[] arguments)  {
+        return parse(arguments, null);
+    }
+
+    public static Vote parse(String[] arguments, Map<String, String> additionalArgs) {
+        String serviceName = "TestVote";
+        String username = null;
+        String address = "127.0.0.1";
+        long localTimestamp = System.currentTimeMillis();
+        String timestamp = Long.toString(localTimestamp, 10);
+
+        for (String s : arguments) {
+            Matcher m = argumentPattern.matcher(s);
+            if (m.matches()) {
+                String key = m.group(1).toLowerCase();
+                String v = m.group(2);
+                switch (key) {
+                    case "servicename":
+                        serviceName = v;
+                        break;
+                    case "username":
+                        if (v.length() > 16)
+                            throw new IllegalArgumentException("Illegal username - must be less than 16 characters long.");
+                        username = v;
+                        break;
+                    case "address":
+                        address = v;
+                        break;
+                    case "timestamp":
+                        timestamp = v;
+                        break;
+                    default:
+                        if (additionalArgs != null)
+                            additionalArgs.put(key, v);
+                        break;
+                }
+
+            } else {
+                if (s.length() > 16)
+                    throw new IllegalArgumentException("Illegal username - must be less than 16 characters long.");
+                username = s; // ezpz
+            }
+        }
+
+        if (username == null)
+            throw new IllegalArgumentException("Username not specified!");
+
+        return new Vote(serviceName, username, address, timestamp);
+    }
+}

common/src/main/java/com/vexsoftware/votifier/util/IOUtil.java

@@ -0,0 +1,17 @@
+package com.vexsoftware.votifier.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class IOUtil {
+    public static byte[] readAllBytes(InputStream from) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream(8192);
+        byte[] buf = new byte[8192];
+        int read;
+        while ((read = from.read(buf)) != -1) {
+            out.write(buf, 0, read);
+        }
+        return out.toByteArray();
+    }
+}

common/src/main/java/com/vexsoftware/votifier/util/QuietException.java

@@ -0,0 +1,15 @@
+package com.vexsoftware.votifier.util;
+
+public class QuietException extends Exception {
+    public QuietException() {
+    }
+
+    public QuietException(String s) {
+        super(s);
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return null;
+    }
+}

common/src/main/java/com/vexsoftware/votifier/util/standalone/StandaloneVotifierPlugin.java

@@ -1,19 +1,13 @@
 package com.vexsoftware.votifier.util.standalone;
 
-import com.vexsoftware.votifier.VoteHandler;
-import com.vexsoftware.votifier.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.VotifierServerBootstrap;
 import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
+import com.vexsoftware.votifier.platform.JavaUtilLogger;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.platform.scheduler.ScheduledExecutorServiceVotifierScheduler;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
 
 import java.net.InetSocketAddress;
 import java.security.Key;
@@ -21,45 +15,36 @@ import java.security.KeyPair;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
 
-public class StandaloneVotifierPlugin implements VotifierPlugin, VoteHandler {
+public class StandaloneVotifierPlugin implements VotifierPlugin {
     private final Map<String, Key> tokens;
     private final VoteReceiver receiver;
     private final KeyPair v1Key;
     private final InetSocketAddress bind;
-    private NioEventLoopGroup group;
+    private final VotifierScheduler scheduler;
+    private VotifierServerBootstrap bootstrap;
 
     public StandaloneVotifierPlugin(Map<String, Key> tokens, VoteReceiver receiver, KeyPair v1Key, InetSocketAddress bind) {
         this.receiver = receiver;
         this.bind = bind;
         this.tokens = Collections.unmodifiableMap(new HashMap<>(tokens));
         this.v1Key = v1Key;
+        this.scheduler = new ScheduledExecutorServiceVotifierScheduler(Executors.newScheduledThreadPool(1));
     }
 
-    public Throwable start() throws Throwable {
-        group = new NioEventLoopGroup(2);
+    public void start() {
+        start(o -> {});
+    }
 
-        ChannelFuture future = new ServerBootstrap()
-                .channel(NioServerSocketChannel.class)
-                .group(group)
-                .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                    @Override
-                    protected void initChannel(NioSocketChannel channel) throws Exception {
-                        channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                        channel.attr(VotifierPlugin.KEY).set(StandaloneVotifierPlugin.this);
-                        channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                        channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, v1Key != null));
-                        channel.pipeline().addLast("voteHandler", new VoteInboundHandler(StandaloneVotifierPlugin.this));
-                    }
-                })
-                .bind(bind)
-                .syncUninterruptibly();
-
-        if (!future.isSuccess()) {
-            return future.cause();
-        } else {
-            return null;
+    public void start(Consumer<Throwable> error) {
+        if (bootstrap != null) {
+            bootstrap.shutdown();
         }
+        this.bootstrap = new VotifierServerBootstrap(bind.getHostString(), bind.getPort(), this, v1Key == null);
+        this.bootstrap.start(error);
     }
 
     @Override
@@ -73,17 +58,22 @@ public class StandaloneVotifierPlugin implements VotifierPlugin, VoteHandler {
     }
 
     @Override
-    public String getVersion() {
-        return "2.3.5";
+    public LoggingAdapter getPluginLogger() {
+        return new JavaUtilLogger(Logger.getAnonymousLogger());
     }
 
     @Override
-    public void onVoteReceived(Channel channel, Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public VotifierScheduler getScheduler() {
+        return scheduler;
+    }
+
+    @Override
+    public void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion, String remoteAddress) throws Exception {
         receiver.onVote(vote);
     }
 
     @Override
-    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
+    public void onError(Throwable throwable, boolean alreadyHandledVote, String remoteAddress) {
         receiver.onException(throwable);
     }
 }

common/src/test/java/com/vexsoftware/votifier/net/protocol/TestVotifierPlugin.java

@@ -1,7 +1,12 @@
 package com.vexsoftware.votifier.net.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.platform.LoggingAdapter;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
+import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
 import com.vexsoftware.votifier.util.KeyCreator;
+import io.netty.channel.Channel;
 
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -71,8 +76,18 @@ public class TestVotifierPlugin implements VotifierPlugin {
     }
 
     @Override
-    public String getVersion() {
-        return "2.3";
+    public LoggingAdapter getPluginLogger() {
+        return null;
+    }
+
+    @Override
+    public VotifierScheduler getScheduler() {
+        return null;
+    }
+
+    @Override
+    public boolean isDebug() {
+        return true;
     }
 
     public void specificKeysOnly() {
@@ -84,4 +99,9 @@ public class TestVotifierPlugin implements VotifierPlugin {
         keyMap.clear();
         keyMap.put("default", KeyCreator.createKeyFrom("test"));
     }
+
+    @Override
+    public void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion, String remoteAddress) throws Exception {
+
+    }
 }

common/src/test/java/com/vexsoftware/votifier/net/protocol/VoteUtil.java

@@ -26,6 +26,6 @@ public class VoteUtil {
             builder.append(s).append('\n'); // naive join needed!
         }
 
-        return RSA.encrypt(builder.toString().getBytes(StandardCharsets.UTF_8), key);
+        return RSA.encrypt(builder.toString().getBytes(StandardCharsets.US_ASCII), key);
     }
 }

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol1DecoderTest.java

@@ -1,21 +1,23 @@
 package com.vexsoftware.votifier.net.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
 import com.vexsoftware.votifier.net.protocol.v1crypto.RSA;
+import com.vexsoftware.votifier.util.QuietException;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.CorruptedFrameException;
-import org.junit.Test;
+import io.netty.handler.codec.DecoderException;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class VotifierProtocol1DecoderTest {
     private static final VotifierSession SESSION = new VotifierSession();
@@ -50,24 +52,21 @@ public class VotifierProtocol1DecoderTest {
         byte[] encrypted = RSA.encrypt(bad.getBytes(StandardCharsets.UTF_8), TestVotifierPlugin.getI().getProtocolV1Key().getPublic());
         ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
 
-        try {
-            channel.writeInbound(encryptedByteBuf);
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, () -> channel.writeInbound(encryptedByteBuf));
+        channel.close();
     }
 
-    @Test(expected = CorruptedFrameException.class)
+    @Test
     public void testFailureDecodeMissingField() throws Exception {
         verifyFailure("VOTE\nTest\ntest\ntest"); // missing field
     }
 
-    @Test(expected = CorruptedFrameException.class)
+    @Test
     public void testFailureDecodeBadOpcode() throws Exception {
         verifyFailure("TEST\nTest\ntest\ntest\ntest\n");
     }
 
-    @Test(expected = CorruptedFrameException.class)
+    @Test
     public void testFailureDecodeBadRsa() throws Exception {
         // Decode our bad RSA key
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");
@@ -80,10 +79,7 @@ public class VotifierProtocol1DecoderTest {
         byte[] encrypted = VoteUtil.encodePOJOv1(new Vote("Test", "test", "test", "test"), badPublicKey);
         ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
 
-        try {
-            channel.writeInbound(encryptedByteBuf);
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, ()->channel.writeInbound(encryptedByteBuf));
+        channel.close();
     }
 }

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2DecoderTest.java

@@ -1,7 +1,7 @@
 package com.vexsoftware.votifier.net.protocol;
 
 import com.google.gson.JsonObject;
-import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
 import com.vexsoftware.votifier.util.GsonInst;
@@ -10,14 +10,14 @@ import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.DecoderException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.Mac;
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
 import java.util.Base64;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class VotifierProtocol2DecoderTest {
     private static final VotifierSession SESSION = new VotifierSession();
@@ -61,8 +61,8 @@ public class VotifierProtocol2DecoderTest {
         sendVote(new Vote("Test", "test", "test", "0"), TestVotifierPlugin.getI().getTokens().get("default"), true);
     }
 
-    @Test(expected = DecoderException.class)
-    public void testFailureDecodeBadPacket() throws Exception {
+    @Test
+    public void testFailureDecodeBadPacket() {
         // Create a well-formed request
         EmbeddedChannel channel = createChannel();
 
@@ -73,14 +73,11 @@ public class VotifierProtocol2DecoderTest {
         object.put("payload", GsonInst.gson.toJson(payload));
         // We "forget" the signature.
 
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, () -> channel.writeInbound(object.toString()));
+        channel.close();
     }
 
-    @Test(expected = DecoderException.class)
+    @Test
     public void testFailureDecodeBadVoteField() throws Exception {
         // Create a well-formed request
         EmbeddedChannel channel = createChannel();
@@ -96,14 +93,11 @@ public class VotifierProtocol2DecoderTest {
         object.put("signature",
                 Base64.getEncoder().encodeToString(mac.doFinal(payloadEncoded.getBytes(StandardCharsets.UTF_8))));
 
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, () -> channel.writeInbound(object.toString()));
+        channel.close();
     }
 
-    @Test(expected = DecoderException.class)
+    @Test
     public void testFailureDecodeBadChallenge() throws Exception {
         // Create a well-formed request
         EmbeddedChannel channel = createChannel();
@@ -120,29 +114,24 @@ public class VotifierProtocol2DecoderTest {
         object.put("signature",
                 Base64.getEncoder().encode(mac.doFinal(payloadEncoded.getBytes(StandardCharsets.UTF_8))));
 
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, () -> channel.writeInbound(object.toString()));
+        channel.close();
     }
 
-    @Test(expected = DecoderException.class)
+    @Test
     public void testFailureDecodeNonExistentKey() throws Exception {
         TestVotifierPlugin.getI().specificKeysOnly();
 
         Vote vote = new Vote("Bad Service", "test", "test", "0");
 
-        try {
-            sendVote(vote, TestVotifierPlugin.getI().getTokens().get("Test"), false);
-        } finally {
-            TestVotifierPlugin.getI().restoreDefault();
-        }
+        assertThrows(DecoderException.class, () -> sendVote(vote, TestVotifierPlugin.getI().getTokens().get("Test"), false));
+
+        TestVotifierPlugin.getI().restoreDefault();
     }
 
-    @Test(expected = CorruptedFrameException.class)
-    public void testFailureDecodeBadSignature() throws Exception {
+    @Test
+    public void testFailureDecodeBadSignature() {
         Vote vote = new Vote("Bad Service", "test", "test", "0");
-        sendVote(vote, KeyCreator.createKeyFrom("BadKey"), false);
+        assertThrows(CorruptedFrameException.class, () -> sendVote(vote, KeyCreator.createKeyFrom("BadKey"), false));
     }
 }

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocolDifferentiatorTest.java

@@ -2,13 +2,16 @@ package com.vexsoftware.votifier.net.protocol;
 
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.QuietException;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.DecoderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class VotifierProtocolDifferentiatorTest {
     @Test
@@ -43,7 +46,7 @@ public class VotifierProtocolDifferentiatorTest {
         channel.close();
     }
 
-    @Test(expected = DecoderException.class)
+    @Test
     public void failIfv1NotSupported() {
         EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
 
@@ -54,13 +57,11 @@ public class VotifierProtocolDifferentiatorTest {
         for (int i = 0; i < 256; i++) {
             test.writeByte(0);
         }
-        channel.writeInbound(test);
-
-        assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
+        assertThrows(DecoderException.class, () -> channel.writeInbound(test));
         channel.close();
     }
 
-    @Test(expected = DecoderException.class)
+    @Test
     public void failOnBadPacketTest() {
         EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
 
@@ -69,11 +70,8 @@ public class VotifierProtocolDifferentiatorTest {
             buf.writeByte(0);
         }
 
-        try {
-            channel.writeInbound(buf);
-        } finally {
-            channel.close();
-        }
+        assertThrows(DecoderException.class, () -> channel.writeInbound(buf));
+        channel.close();
     }
 
     @Test

common/src/test/java/com/vexsoftware/votifier/support/forwarding/PMForwardingSinkTest.java

@@ -0,0 +1,49 @@
+package com.vexsoftware.votifier.support.forwarding;
+
+import com.vexsoftware.votifier.model.Vote;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class PMForwardingSinkTest {
+
+    @Test
+    public void testSuccessfulMultiDecode() throws Exception {
+        List<Vote> receivedVotes = new ArrayList<>();
+        ForwardedVoteListener vl = receivedVotes::add;
+
+        List<Vote> sentVotes = new ArrayList<>(Arrays.asList(
+                new Vote("serviceA", "usernameA", "1.1.1.1", "1546300800"),
+                new Vote("serviceB", "usernameBBBBBBB", "1.2.23.4", "1514764800")
+        ));
+
+        StringBuilder message = new StringBuilder();
+
+        for (Vote v : sentVotes) {
+            message.append(v.serialize());
+        }
+
+        byte[] messageBytes = message.toString().getBytes(StandardCharsets.UTF_8);
+        System.out.println(message.toString());
+
+        AbstractPluginMessagingForwardingSink sink = new AbstractPluginMessagingForwardingSink(vl) {
+            @Override
+            public void halt() {
+
+            }
+        };
+
+        sink.handlePluginMessage(messageBytes);
+
+        assertEquals(sentVotes.size(), receivedVotes.size());
+
+        for (int i = 0; i < receivedVotes.size(); i++) {
+            assertEquals(sentVotes.get(i), receivedVotes.get(i));
+        }
+    }
+}

common/src/test/java/com/vexsoftware/votifier/util/ArgsToVoteTest.java

@@ -0,0 +1,108 @@
+package com.vexsoftware.votifier.util;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.vexsoftware.votifier.model.Vote;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.lang.reflect.Method;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ArgsToVoteTest {
+    @Test
+    void handlesInvalidRequest() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ArgsToVote.parse(new String[0]);
+        });
+    }
+
+    @Test
+    void handlesSingleUsername() {
+        Vote vote = ArgsToVote.parse(new String[] { "dummy_user" });
+        assertEquals("dummy_user", vote.getUsername());
+    }
+
+    @Test
+    void handlesSingleUsernameTooLong() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ArgsToVote.parse(new String[] { "AVeryVeryVeryLongUsername" });
+        });
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "servicename", "address", "timestamp" })
+    void handlesAdditionalKeywordArguments(String key) throws Exception {
+        Vote vote = ArgsToVote.parse(new String[] { "username=abc123", key + "=dummy" });
+
+        // Find the getter on the Vote object
+        for (Method method : Vote.class.getDeclaredMethods()) {
+            if (method.getName().toLowerCase(Locale.ENGLISH).equals("get" + key)) {
+                assertEquals("dummy", method.invoke(vote));
+                return;
+            }
+        }
+
+        fail("Unable to find appropriate getter - this is a bug");
+    }
+
+    @Test
+    void handlesUsernameKeywordArgument() {
+        Vote vote = ArgsToVote.parse(new String[] { "username=dummy_user" });
+        assertEquals("dummy_user", vote.getUsername());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "servicename", "address", "timestamp" })
+    void handlesMixedUsernameAndKeywordArgument(String key) throws Exception {
+        Vote vote = ArgsToVote.parse(new String[] { "abc123", key + "=dummy" });
+
+        assertEquals("abc123", vote.getUsername());
+
+        // Find the getter on the Vote object
+        for (Method method : Vote.class.getDeclaredMethods()) {
+            if (method.getName().toLowerCase(Locale.ENGLISH).equals("get" + key)) {
+                assertEquals("dummy", method.invoke(vote));
+                return;
+            }
+        }
+
+        fail("Unable to find appropriate getter - this is a bug");
+    }
+
+    @ParameterizedTest
+    @MethodSource("powerSetArgs")
+    void handlesMixedKeywordArguments(Set<String> keys) throws Exception {
+        String[] args = new String[keys.size() + 1];
+        args[0] = "abc123";
+        for (int i = 0; i < keys.size(); i++) {
+            args[i + 1] = ImmutableList.copyOf(keys).get(i) + "=dummy";
+        }
+        Vote vote = ArgsToVote.parse(args);
+
+        assertEquals("abc123", vote.getUsername());
+
+        // Find the getters on the Vote object
+        outer: for (String key : keys) {
+            for (Method method : Vote.class.getDeclaredMethods()) {
+                if (method.getName().toLowerCase(Locale.ENGLISH).equals("get" + key)) {
+                    assertEquals("dummy", method.invoke(vote));
+                    continue outer;
+                }
+            }
+
+            fail("Unable to find appropriate getter - this is a bug");
+        }
+    }
+
+    private static Stream<Set<String>> powerSetArgs() {
+        return Sets.powerSet(ImmutableSet.of("servicename", "address", "timestamp")).stream();
+    }
+}

dev/.gitignore

@@ -0,0 +1 @@
+resources/

dev/Makefile

@@ -0,0 +1,32 @@
+
+.PHONY: clean all run
+
+all : resources/paper.jar resources/waterfall.jar resources/velocity.jar resources/sponge.jar resources/viaversion.jar
+
+resources :
+	mkdir resources
+
+resources/paper.jar : resources
+	wget -O resources/paper.jar https://papermc.io/api/v1/paper/1.16.2/182/download
+
+resources/waterfall.jar : resources
+	wget -O resources/waterfall.jar https://papermc.io/ci/job/Waterfall/lastSuccessfulBuild/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar
+
+resources/velocity.jar : resources
+	wget -O resources/velocity.jar https://ci.velocitypowered.com/job/velocity-1.1.0/lastSuccessfulBuild/artifact/proxy/build/libs/velocity-proxy-1.1.0-SNAPSHOT-all.jar
+
+resources/sponge.jar : resources
+	wget -O resources/sponge.jar https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/1.12.2-7.3.0/spongevanilla-1.12.2-7.3.0.jar
+
+resources/viaversion.jar : resources
+	wget -O resources/viaversion.jar https://ci.viaversion.com/job/ViaVersion/459/artifact/jar/target/ViaVersion-3.1.1-SNAPSHOT.jar
+
+clean :
+	rm -r resources/
+
+run :
+	tmux new-session './p1/run.sh' \; \
+	    split-window -h './p2/run.sh' \; \
+		split-window -h './s1/run.sh' \; \
+		split-window -h './s2/run.sh' \; \
+		select-layout even-horizontal

dev/README.md

@@ -0,0 +1,29 @@
+## Using this testbed
+
+This testbed runs two proxies, labeled p1 and p2, as well as two servers behind it,
+labeled s1 and s2. Ports for where everything is bound is listed below.
+
+First, download required sources using the following command:
+
+```
+make
+```
+
+Then, each time you want to launch a session, run:
+
+```
+make run
+```
+
+FYI, this only works in Linux afaik because thats what I do my development on.
+
+# Ports
+
+| Server | Server Software        | MC Port | Votifier Port |
+| ------ | ---------------------- | ------- | ------------- |
+| p1     | Waterfall/BungeeCord   | 25577   | 8192          |
+| p2     | Velocity               | 25578   | 8193          |
+| s1     | Paper (1.16.1)         | 25565   | 8194          |
+| s2     | SpongeVanilla (1.12.2) | 25566   | 8195          |
+
+For compatibility with 1.16.1, s2 includes ViaVersion.

dev/p1/.gitignore

@@ -0,0 +1,4 @@
+logs/
+modules/
+locations.yml
+

dev/p1/config.yml

@@ -0,0 +1,52 @@
+server_connect_timeout: 5000
+listeners:
+- query_port: 25577
+  motd: '&4its a bungee cord surbur'
+  tab_list: GLOBAL_PING
+  query_enabled: false
+  proxy_protocol: false
+  forced_hosts: {}
+  ping_passthrough: false
+  priorities:
+  - s1
+  bind_local_address: true
+  host: 0.0.0.0:25577
+  max_players: 1
+  tab_size: 60
+  force_default_server: false
+remote_ping_cache: -1
+network_compression_threshold: 256
+permissions:
+  default:
+  - bungeecord.command.server
+  - bungeecord.command.list
+  admin:
+  - bungeecord.command.alert
+  - bungeecord.command.end
+  - bungeecord.command.ip
+  - bungeecord.command.reload
+log_pings: true
+connection_throttle_limit: 3
+prevent_proxy_connections: true
+timeout: 30000
+player_limit: -1
+ip_forward: true
+groups:
+  md_5:
+  - admin
+remote_ping_timeout: 5000
+connection_throttle: 1
+log_commands: false
+stats: bf8a54ea-2917-4b9e-b463-2c05bd7f1ac6
+online_mode: true
+forge_support: true
+disabled_commands: []
+servers:
+  s1:
+    motd: SERVER 1
+    address: localhost:25565
+    restricted: false
+  s2:
+    motd: SERVER 2
+    address: localhost:25566
+    restricted: false

dev/p1/modules.yml

@@ -0,0 +1,8 @@
+version: 2
+modules:
+- jenkins://cmd_alert
+- jenkins://cmd_find
+- jenkins://cmd_list
+- jenkins://cmd_send
+- jenkins://cmd_server
+- jenkins://reconnect_yaml

dev/p1/plugins/NuVotifier/.gitignore

@@ -0,0 +1,2 @@
+rsa/
+cached-votes.json

dev/p1/plugins/NuVotifier/config.yml

@@ -0,0 +1,74 @@
+# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
+# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
+host: 0.0.0.0
+
+# Port to listen for new votes on
+port: 8192
+
+# Whether or not to print debug messages. In a production system, this should be set to false.
+# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
+debug: true
+
+# All tokens, labeled by the serviceName of each server list.
+tokens:
+  # Default token for all server lists, if another isn't supplied.
+  default: proxy1token
+
+# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
+# option is currently not recommended as most voting sites only support the old protocol at present.
+disable-v1-protocol: false
+
+# Configuration section for all vote forwarding to NuVotifier
+forwarding:
+  # Sets whether to set up a remote method for fowarding. Supported methods:
+  # - none - Does not set up a forwarding method.
+  # - pluginMessaging - Sets up plugin messaging.
+  # - proxy - Proxies votes to other NuVotifier servers from this server.
+  method: pluginMessaging
+  pluginMessaging:
+    channel: nuvotifier:votes
+
+    #Only send votes to certain servers. If a server is present on excludedServers, then votes will NOT be forwarded
+    #to them. If excludedServers is not present, votes will be sent to all servers.
+    # If onlySendToJoinedServer is true and a player is on one of these servers, NuVotifier will process the vote as if the
+    # player was not on the network at all.
+    #excludedServers:
+    #- server1
+    #- server2
+
+    # If uncommented, turns excludedServers into an includedServers, where only servers on the list will be used.
+    #whitelist: true
+
+    # Sets which cache to use if there are no players on the server that the vote is being sent to. Supported caches:
+    # - none - Votes will simply be lost when no players are present on the server.
+    # - memory - Votes will be cached in memory when no players are present. When Bungee is restarted, the votes will be lost.
+    # - file - Votes will be saved to a local file every 3 minutes and on shutdown and reloaded when Bungee is restarted. This is suitable for
+    #   most set ups.
+    cache: file
+    # Only sends the vote to the server in which the player is currently joined.
+    onlySendToJoinedServer: true
+    #Sets which server to send the vote in the event the player is not online when the vote is cast
+    #If you do not want the vote forwarded to a fallback, set this value to empty ('')
+    #ONLY USED IF onlySendToJoinedServer is true!!
+    joinedServerFallback: 's1'
+    # Defines how quickly to dump votes over a player's connection when offloading a cache in votes per second
+    dumpRate: 5
+    # Options for file caching.
+    file:
+      name: cached-votes.json
+      # days before a vote is considered 'dead' - removed from cache with a console warning
+      cacheTime: 10
+    # Options for memory caching.
+    memory:
+      # days before a vote is considered 'dead' and removed from memory. All votes are removed when the server restarts. -1 signifies no TTL
+      cacheTime: -1
+  # Specify servers to proxy votes for.
+  proxy:
+    Hub:
+      address: 127.0.0.1
+      port: 8194
+      token: server1token
+    Hub2:
+      address: 127.0.0.1
+      port: 8195
+      token: server2token

dev/p1/plugins/nuvotifier.jar

@@ -0,0 +1 @@
+../../../universal/build/libs/nuvotifier.jar

dev/p1/proxy.jar

@@ -0,0 +1 @@
+../resources/waterfall.jar

dev/p1/run.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+cd $DIR
+
+java -jar proxy.jar

dev/p1/waterfall.yml

@@ -0,0 +1,9 @@
+allow_empty_packets: false
+throttling:
+  tab_complete: 1000
+game_version: ''
+disable_modern_tab_limiter: true
+use_netty_dns_resolver: true
+disable_entity_metadata_rewrite: false
+log_initial_handler_connections: true
+log_server_list_ping: false

dev/p2/.gitignore

@@ -0,0 +1 @@
+logs/

dev/p2/plugins/nuvotifier.jar

@@ -0,0 +1 @@
+../../../universal/build/libs/nuvotifier.jar

dev/p2/plugins/nuvotifier/.gitignore

@@ -0,0 +1,2 @@
+rsa/
+cached-votes.json

dev/p2/plugins/nuvotifier/config.toml

@@ -0,0 +1,79 @@
+# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
+# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
+host = "0.0.0.0"
+
+# Port to listen for new votes on
+port = 8193
+
+# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
+# option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
+# using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.
+disable-v1-protocol = false
+
+# All tokens, labeled by the serviceName of each server list.
+[tokens]
+# Default token for all server lists, if another isn't supplied.
+default = "proxy2token"
+
+# Configuration section for all vote forwarding to NuVotifier
+[forwarding]
+# Sets whether to set up a remote method for fowarding. Supported methods:
+# - none - Does not set up a forwarding method.
+# - pluginMessaging - Sets up plugin messaging.
+# - proxy - Proxies votes to other NuVotifier servers from this server.
+method = "pluginMessaging"
+
+[forwarding.pluginMessaging]
+channel = "nuvotifier:votes"
+
+# Only send votes to certain servers. If a server is present on excludedServers, then votes will NOT be forwarded
+# to them. If excludedServers is not present, votes will be sent to all servers.
+# If onlySendToJoinedServer is true and a player is on one of these servers, NuVotifier will process the vote as if the
+# player was not on the network at all.
+# excludedServers = ["server1", "server2"]
+
+# If uncommented, turns excludedServers into an includedServers, where only servers on the list will be used.
+# whitelist = true
+
+# Sets which cache to use if there are no players on the server that the vote is being sent to. Supported caches:
+# - none - Votes will simply be lost when no players are present on the server.
+# - memory - Votes will be cached in memory when no players are present. When Bungee is restarted, the votes will be lost.
+# - file - Votes will be saved to a local file every 3 minutes and on shutdown and reloaded when Bungee is restarted. This is suitable for
+#   most set ups.
+cache = "file"
+# Only sends the vote to the server in which the player is currently joined.
+onlySendToJoinedServer = false
+
+# Sets which server to send the vote in the event the player is not online when the vote is cast
+# If you do not want the vote forwarded to a fallback, set this value to empty ('')
+# ONLY USED IF onlySendToJoinedServer is true!!
+joinedServerFallback = "s1"
+
+# Defines how quickly to dump votes over a player's connection while offloading a cache in votes per second
+dumpRate = 5
+
+[forwarding.file-cache]
+# Options for file caching.
+name = "cached-votes.json"
+# days before a vote is considered 'dead' - removed from cache with a console warning. -1 signifies no cache.
+cacheTime = 10
+
+[forwarding.memory-cache]
+# Options for file caching.
+name = "cached-votes.json"
+# days before a vote is considered 'dead' - removed from cache with a console warning. -1 signifies no cache. Votes are
+# also removed on restart
+cacheTime = 10
+
+[forwarding.proxy]
+# Specify servers to proxy votes for.
+
+[forwarding.proxy.Hub]
+address = "127.0.0.1"
+port = 8194
+token = "server1token"
+
+[forwarding.proxy.Hub2]
+address = "127.0.0.1"
+port = 8195
+token = "server2token"

dev/p2/proxy.jar

@@ -0,0 +1 @@
+../resources/velocity.jar

dev/p2/run.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+cd $DIR
+
+java -jar proxy.jar

dev/p2/velocity.toml

@@ -0,0 +1,135 @@
+# Config version. Do not change this
+config-version = "1.0"
+
+# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577.
+bind = "0.0.0.0:25578"
+
+# What should be the MOTD? This gets displayed when the player adds your server to
+# their server list. Legacy color codes and JSON are accepted.
+motd = "&3doot doot imma velocity serbur"
+
+# What should we display for the maximum number of players? (Velocity does not support a cap
+# on the number of players online.)
+show-max-players = 500
+
+# Should we authenticate players with Mojang? By default, this is on.
+online-mode = true
+
+# If client's ISP/AS sent from this proxy is different from the one from Mojang's
+# authentication server, the player is kicked. This disallows some VPN and proxy
+# connections but is a weak form of protection.
+prevent-client-proxy-connections = false
+
+# Should we forward IP addresses and other data to backend servers?
+# Available options:
+# - "none":        No forwarding will be done. All players will appear to be connecting
+#                  from the proxy and will have offline-mode UUIDs.
+# - "legacy":      Forward player IPs and UUIDs in a BungeeCord-compatible format. Use this
+#                  if you run servers using Minecraft 1.12 or lower.
+# - "bungeeguard": Forward player IPs and UUIDs in a format supported by the BungeeGuard
+#                  plugin. Use this if you run servers using Minecraft 1.12 or lower, and are
+#                  unable to implement network level firewalling (on a shared host).
+# - "modern":      Forward player IPs and UUIDs as part of the login process using
+#                  Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher.
+player-info-forwarding-mode = "LEGACY"
+
+# If you are using modern or BungeeGuard IP forwarding, configure an unique secret here.
+forwarding-secret = "not at all secret lolololol"
+
+# Announce whether or not your server supports Forge. If you run a modded server, we
+# suggest turning this on.
+# 
+# If your network runs one modpack consistently, consider using ping-passthrough = "mods"
+# instead for a nicer display in the server list.
+announce-forge = false
+
+# If enabled (default is false) and the proxy is in online mode, Velocity will kick
+# any existing player who is online if a duplicate connection attempt is made.
+kick-existing-players = false
+
+# Should Velocity pass server list ping requests to a backend server?
+# Available options:
+# - "disabled":    No pass-through will be done. The velocity.toml and server-icon.png
+#                  will determine the initial server list ping response.
+# - "mods":        Passes only the mod list from your backend server into the response.
+#                  The first server in your try list (or forced host) with a mod list will be
+#                  used. If no backend servers can be contacted, Velocity won't display any
+#                  mod information.
+# - "description": Uses the description and mod list from the backend server. The first
+#                  server in the try (or forced host) list that responds is used for the
+#                  description and mod list.
+# - "all":         Uses the backend server's response as the proxy response. The Velocity
+#                  configuration is used if no servers could be contacted.
+ping-passthrough = "DISABLED"
+
+[servers]
+# Configure your servers here. Each key represents the server's name, and the value
+# represents the IP address of the server to connect to.
+s1 = "127.0.0.1:25565"
+s2 = "127.0.0.1:25566"
+
+# In what order we should try servers when a player logs in or is kicked from aserver.
+try = [
+  "s1"
+]
+
+[forced-hosts]
+# Configure your forced hosts here.
+
+[advanced]
+# How large a Minecraft packet has to be before we compress it. Setting this to zero will
+# compress all packets, and setting it to -1 will disable compression entirely.
+compression-threshold = 256
+
+# How much compression should be done (from 0-9). The default is -1, which uses the
+# default level of 6.
+compression-level = -1
+
+# How fast (in milliseconds) are clients allowed to connect after the last connection? By
+# default, this is three seconds. Disable this by setting this to 0.
+login-ratelimit = 3000
+
+# Specify a custom timeout for connection timeouts here. The default is five seconds.
+connection-timeout = 5000
+
+# Specify a read timeout for connections here. The default is 30 seconds.
+read-timeout = 30000
+
+# Enables compatibility with HAProxy.
+proxy-protocol = false
+
+# Enables TCP fast open support on the proxy. Requires the proxy to run on Linux.
+tcp-fast-open = false
+
+# Enables BungeeCord plugin messaging channel support on Velocity.
+bungee-plugin-message-channel = true
+
+# Shows ping requests to the proxy from clients.
+show-ping-requests = false
+
+[query]
+# Whether to enable responding to GameSpy 4 query responses or not.
+enabled = false
+
+# If query is enabled, on what port should the query protocol listen on?
+port = 25577
+
+# This is the map name that is reported to the query services.
+map = "Velocity"
+
+# Whether plugins should be shown in query response by default or not
+show-plugins = false
+
+[metrics]
+# Whether metrics will be reported to bStats (https://bstats.org).
+# bStats collects some basic information, like how many people use Velocity and their
+# player count. We recommend keeping bStats enabled, but if you're not comfortable with
+# this, you can turn this setting off. There is no performance penalty associated with
+# having metrics enabled, and data sent to bStats can't identify your server.
+enabled = true
+
+# A unique, anonymous ID to identify this proxy with.
+id = "729fe923-b383-4e5b-b456-5adf554bfe69"
+
+log-failure = false
+

dev/s-run.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+cd $DIR
+echo <<WARNING
+Hey! Just so you know, I am using the IReallyKnowWhatIAmDoingISwear flag, as
+well as overriding the eula check. If you don't agree to the Mojang EULA
+thingie, then uh, smash your computer or something because you totally agreed
+to it so just fyi
+WARNING
+java -DIReallyKnowWhatIAmDoingISwear -Dcom.mojang.eula.agree=true -jar paper.jar nogui

dev/s1/.gitignore

@@ -0,0 +1,19 @@
+banned-ips.json
+banned-players.json
+
+cache/
+
+eula.txt
+
+logs/
+
+permissions.yml
+
+ops.json
+usercache.json
+version_history.json
+whitelist.json
+
+world/
+world_nether/
+world_the_end/