fix #7

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

@@ -29,7 +29,6 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
     protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
         // Determine the number of bytes that are available.
         int readable = buf.readableBytes();
-        buf.retain(); // TODO: Is this needed?
 
         if (readable < 2) {
             // Some retarded voting sites (PMC?) seem to send empty buffers for no good reason.

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

@@ -0,0 +1,89 @@
+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.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 java.net.InetSocketAddress;
+import java.security.Key;
+import java.security.KeyPair;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class StandaloneVotifierPlugin implements VotifierPlugin, VoteHandler {
+    private final Map<String, Key> tokens;
+    private final VoteReceiver receiver;
+    private final KeyPair v1Key;
+    private final InetSocketAddress bind;
+    private NioEventLoopGroup group;
+
+    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;
+    }
+
+    public Throwable start() throws Throwable {
+        group = new NioEventLoopGroup(2);
+
+        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;
+        }
+    }
+
+    @Override
+    public Map<String, Key> getTokens() {
+        return tokens;
+    }
+
+    @Override
+    public KeyPair getProtocolV1Key() {
+        return v1Key;
+    }
+
+    @Override
+    public String getVersion() {
+        return "2.3.2.2";
+    }
+
+    @Override
+    public void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+        receiver.onVote(vote);
+    }
+
+    @Override
+    public void onError(Channel channel, Throwable throwable) {
+        receiver.onException(throwable);
+    }
+}

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

@@ -0,0 +1,8 @@
+package com.vexsoftware.votifier.util.standalone;
+
+import com.vexsoftware.votifier.model.Vote;
+
+public interface VoteReceiver {
+    void onVote(Vote vote) throws Exception;
+    void onException(Throwable throwable);
+}

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

@@ -0,0 +1,53 @@
+package com.vexsoftware.votifier.util.standalone;
+
+import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
+import com.vexsoftware.votifier.util.KeyCreator;
+
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.security.Key;
+import java.security.KeyPair;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class VotifierServerBuilder {
+    private final Map<String, Key> keyMap = new HashMap<>();
+    private KeyPair v1Key;
+    private InetSocketAddress bind;
+    private VoteReceiver receiver;
+
+    public VotifierServerBuilder addToken(String service, String token) {
+        Objects.requireNonNull(service, "service");
+        Objects.requireNonNull(token, "key");
+
+        keyMap.put(service, KeyCreator.createKeyFrom(token));
+        return this;
+    }
+
+    public VotifierServerBuilder v1Key(KeyPair v1Key) {
+        this.v1Key = Objects.requireNonNull(v1Key, "v1Key");
+        return this;
+    }
+
+    public VotifierServerBuilder v1KeyFolder(File file) throws Exception {
+        this.v1Key = RSAIO.load(Objects.requireNonNull(file, "file"));
+        return this;
+    }
+
+    public VotifierServerBuilder bind(InetSocketAddress bind) {
+        this.bind = Objects.requireNonNull(bind, "bind");
+        return this;
+    }
+
+    public VotifierServerBuilder receiver(VoteReceiver receiver) {
+        this.receiver = Objects.requireNonNull(receiver, "receiver");
+        return this;
+    }
+
+    public StandaloneVotifierPlugin create() {
+        Objects.requireNonNull(bind, "need an address to bind to");
+        Objects.requireNonNull(receiver, "need a receiver for votes");
+        return new StandaloneVotifierPlugin(keyMap, receiver, v1Key, bind);
+    }
+}

sponge/pom.xml

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>spongeapi</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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

@@ -34,6 +34,7 @@ import org.spongepowered.api.Sponge;
 import org.spongepowered.api.config.ConfigDir;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.cause.NamedCause;
 import org.spongepowered.api.event.game.state.GameStartedServerEvent;
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
 import org.spongepowered.api.plugin.Plugin;
@@ -351,7 +352,7 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
                 .execute(new Runnable() {
                     @Override
                     public void run() {
-                        VotifierEvent event = new VotifierEvent(vote, Cause.of(VotifierPlugin.this));
+                        VotifierEvent event = new VotifierEvent(vote, Cause.of(NamedCause.of("Vote", vote)));
                         Sponge.getEventManager().post(event);
                     }
                 })
@@ -377,7 +378,7 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
                 .execute(new Runnable() {
                     @Override
                     public void run() {
-                        VotifierEvent event = new VotifierEvent(v, Cause.of(VotifierPlugin.this));
+                        VotifierEvent event = new VotifierEvent(v, Cause.of(NamedCause.of("ForwardedVote", v)));
                         Sponge.getEventManager().post(event);
                     }
                 })