From 03f4028b0fa45062a369f56b1eedce62b4ad379a Mon Sep 17 00:00:00 2001 From: Naoyuki Kanezawa Date: Fri, 11 Apr 2014 02:56:12 +0900 Subject: [PATCH] fix sending binary and add tests --- .../nkzawa/hasbinarydata/HasBinaryData.java | 2 +- .../nkzawa/socketio/client/Manager.java | 11 +- .../github/nkzawa/socketio/client/Socket.java | 5 +- .../socketio/client/ConnectionTest.java | 207 +++++++++++++++++- src/test/resources/index.js | 10 +- 5 files changed, 226 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/github/nkzawa/hasbinarydata/HasBinaryData.java b/src/main/java/com/github/nkzawa/hasbinarydata/HasBinaryData.java index b29a5a4..be08be0 100644 --- a/src/main/java/com/github/nkzawa/hasbinarydata/HasBinaryData.java +++ b/src/main/java/com/github/nkzawa/hasbinarydata/HasBinaryData.java @@ -24,7 +24,7 @@ public class HasBinaryData { JSONArray _obj = (JSONArray)obj; int length = _obj.length(); for (int i = 0; i < length; i++) { - if (recursiveCheckForBinary(_obj.get(i))) { + if (recursiveCheckForBinary(_obj.isNull(i) ? null : _obj.get(i))) { return true; } } diff --git a/src/main/java/com/github/nkzawa/socketio/client/Manager.java b/src/main/java/com/github/nkzawa/socketio/client/Manager.java index e9dffdc..3ed79a7 100644 --- a/src/main/java/com/github/nkzawa/socketio/client/Manager.java +++ b/src/main/java/com/github/nkzawa/socketio/client/Manager.java @@ -280,7 +280,12 @@ public class Manager extends Emitter { this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() { @Override public void call(Object... objects) { - Manager.this.ondata((String)objects[0]); + Object data = objects[0]; + if (data instanceof String) { + Manager.this.ondata((String)data); + } else if (data instanceof byte[]) { + Manager.this.ondata((byte[])data); + } } })); this.subs.add(On.on(this.decoder, Parser.Decoder.EVENT_DECODED, new Listener() { @@ -307,6 +312,10 @@ public class Manager extends Emitter { this.decoder.add(data); } + private void ondata(byte[] data) { + this.decoder.add(data); + } + private void ondecoded(Packet packet) { this.emit(EVENT_PACKET, packet); } diff --git a/src/main/java/com/github/nkzawa/socketio/client/Socket.java b/src/main/java/com/github/nkzawa/socketio/client/Socket.java index 7f98631..313f724 100644 --- a/src/main/java/com/github/nkzawa/socketio/client/Socket.java +++ b/src/main/java/com/github/nkzawa/socketio/client/Socket.java @@ -146,7 +146,10 @@ public class Socket extends Emitter { List _args = new ArrayList(args.length + 1); _args.add(event); _args.addAll(Arrays.asList(args)); - JSONArray jsonArgs = new JSONArray(_args); + JSONArray jsonArgs = new JSONArray(); + for (Object arg : _args) { + jsonArgs.put(arg); + } int parserType = Parser.EVENT; if (HasBinaryData.hasBinary(jsonArgs)) { parserType = Parser.BINARY_EVENT; } Packet packet = new Packet(parserType, jsonArgs); diff --git a/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java b/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java index e1f8c5d..c0d3167 100644 --- a/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java +++ b/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java @@ -8,8 +8,12 @@ import org.junit.runners.JUnit4; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.util.Timer; +import java.util.TimerTask; import java.util.concurrent.CountDownLatch; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -29,6 +33,7 @@ public class ConnectionTest extends Connection { socket.on("echoBack", new Emitter.Listener() { @Override public void call(Object... args) { + socket.close(); latch.countDown(); } }); @@ -45,13 +50,22 @@ public class ConnectionTest extends Connection { socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() { @Override public void call(Object... objects) { - JSONObject data = new JSONObject(); - data.put("test", true); - socket.emit("ack", 5, data, new Ack() { + socket.emit("callAck"); + socket.on("ack", new Emitter.Listener() { + @Override + public void call(Object... args) { + Ack fn = (Ack) args[0]; + JSONObject data = new JSONObject(); + data.put("test", true); + fn.call(5, data); + } + }); + socket.on("ackBack", new Emitter.Listener() { @Override public void call(Object... args) { JSONObject data = (JSONObject)args[1]; if ((Integer)args[0] == 5 && data.getBoolean("test")) { + socket.close(); latch.countDown(); } } @@ -74,6 +88,7 @@ public class ConnectionTest extends Connection { @Override public void call(Object... args) { assertThat((Boolean)args[0], is(false)); + socket.close(); latch.countDown(); } }); @@ -127,4 +142,190 @@ public class ConnectionTest extends Connection { socket.open(); latch.await(); } + + @Test(timeout = TIMEOUT) + public void tryToReconnectTwiceAndFailWithIncorrectAddress() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + IO.Options opts = new IO.Options(); + opts.reconnection = true; + opts.reconnectionAttempts = 2; + opts.reconnectionDelay = 10; + Manager manager = new Manager(new URI("http://localhost:3940"), opts); + socket = manager.socket("/asd"); + final int[] reconnects = new int[] {0}; + Emitter.Listener cb = new Emitter.Listener() { + @Override + public void call(Object... objects) { + reconnects[0]++; + } + }; + + manager.on(Manager.EVENT_RECONNECT_ATTEMPT, cb); + + manager.on(Manager.EVENT_RECONNECT_FAILED, new Emitter.Listener() { + @Override + public void call(Object... objects) { + assertThat(reconnects[0], is(2)); + socket.close(); + latch.countDown(); + } + }); + + socket.open(); + latch.await(); + } + + @Test(timeout = TIMEOUT) + public void tryToReconnectTwiceAndFailWithImmediateTimeout() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + IO.Options opts = new IO.Options(); + opts.reconnection = true; + opts.timeout = 0; + opts.reconnectionAttempts = 2; + opts.reconnectionDelay = 10; + Manager manager = new Manager(new URI(uri()), opts); + + final int[] reconnects = new int[] {0}; + Emitter.Listener reconnectCb = new Emitter.Listener() { + @Override + public void call(Object... objects) { + reconnects[0]++; + } + }; + + manager.on(Manager.EVENT_RECONNECT_ATTEMPT, reconnectCb); + manager.on(Manager.EVENT_RECONNECT_FAILED, new Emitter.Listener() { + @Override + public void call(Object... objects) { + assertThat(reconnects[0], is(2)); + socket.close(); + latch.countDown(); + } + }); + + socket = manager.socket("/timeout"); + socket.open(); + latch.await(); + } + + @Test(timeout = TIMEOUT) + public void notTryToReconnectWithIncorrectPort() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + IO.Options opts = new IO.Options(); + opts.reconnection = false; + Manager manager = new Manager(new URI("http://localhost:9823"), opts); + Emitter.Listener cb = new Emitter.Listener() { + @Override + public void call(Object... objects) { + socket.close(); + throw new RuntimeException(); + } + }; + manager.on(Manager.EVENT_RECONNECT_ATTEMPT, cb); + manager.on(Manager.EVENT_CONNECT_ERROR, new Emitter.Listener() { + @Override + public void call(Object... objects) { + Timer timer = new Timer(); + timer.schedule(new TimerTask() { + @Override + public void run() { + socket.close(); + latch.countDown(); + } + }, 1000); + } + }); + + socket = manager.socket("/invalid"); + socket.open(); + latch.await(); + } + + @Test(timeout = TIMEOUT) + public void sendAndGetBinaryData() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + socket = client(); + socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() { + @Override + public void call(Object... args) { + final byte[] buf = "asdfasdf".getBytes(Charset.forName("UTF-8")); + socket.emit("echo", buf); + socket.on("echoBack", new Emitter.Listener() { + @Override + public void call(Object... args) { + assertThat(args[0], instanceOf(byte[].class)); + assertThat((byte[])args[0], is(buf)); + socket.close(); + latch.countDown(); + } + }); + } + }); + socket.open(); + latch.await(); + } + + @Test(timeout = TIMEOUT) + public void sendBinaryDataMixedWithJson() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + socket = client(); + socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() { + @Override + public void call(Object... args) { + final byte[] buf = "howdy".getBytes(Charset.forName("UTF-8")); + JSONObject data = new JSONObject(); + data.put("hello", "lol"); + data.put("message", buf); + data.put("goodbye", "gotcha"); + socket.emit("echo", data); + socket.on("echoBack", new Emitter.Listener() { + @Override + public void call(Object... args) { + JSONObject a = (JSONObject)args[0]; + assertThat(a.getString("hello"), is("lol")); + assertThat((byte[])a.get("message"), is(buf)); + assertThat(a.getString("goodbye"), is("gotcha")); + socket.close(); + latch.countDown(); + } + }); + } + }); + socket.open(); + latch.await(); + } + + @Test(timeout = TIMEOUT) + public void sendEventsWithByteArraysInTheCorrectOrder() throws URISyntaxException, InterruptedException { + final CountDownLatch latch = new CountDownLatch(1); + socket = client(); + socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() { + @Override + public void call(Object... args) { + final byte[] buf = "abuff1".getBytes(Charset.forName("UTF-8")); + socket.emit("echo", buf); + socket.emit("echo", "please arrive second"); + + final boolean[] receivedAbuff1 = new boolean[] {false}; + socket.on("echoBack", new Emitter.Listener() { + @Override + public void call(Object... args) { + Object data = args[0]; + if (data instanceof byte[]) { + assertThat((byte[])data, is(buf)); + receivedAbuff1[0] = true; + return; + } + + assertThat((String)data, is("please arrive second")); + assertThat(receivedAbuff1[0], is(true)); + socket.close(); + latch.countDown(); + } + }); + } + }); + socket.open(); + latch.await(); + } } diff --git a/src/test/resources/index.js b/src/test/resources/index.js index 949173b..c7d2f92 100644 --- a/src/test/resources/index.js +++ b/src/test/resources/index.js @@ -8,23 +8,27 @@ io.of(nsp).on('connection', function(socket) { socket.on('message', function() { var args = Array.prototype.slice.call(arguments); - console.log('message:', args); socket.send.apply(socket, args); }); socket.on('echo', function() { var args = Array.prototype.slice.call(arguments); - console.log('echo:', args); socket.emit.apply(socket, ['echoBack'].concat(args)); }); socket.on('ack', function() { var args = Array.prototype.slice.call(arguments), callback = args.pop(); - console.log('ack:', args); callback.apply(null, args); }); + socket.on('callAck', function() { + socket.emit('ack', function() { + var args = Array.prototype.slice.call(arguments); + socket.emit.apply(socket, ['ackBack'].concat(args)); + }); + }); + socket.on('disconnect', function() { console.log('disconnect'); });