Skip to content

Commit bcd62a3

Browse files
committed
Fixing some glitches of socket.io, IOConnection now handles frameless protocols, too.
It seems like all connected namespaces are also connected to the default namespace. This behavior is also covered by tests now.
1 parent eb6a95e commit bcd62a3

3 files changed

Lines changed: 112 additions & 44 deletions

File tree

‎src/io/socket/IOConnection.java‎

Lines changed: 100 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.net.URLConnection;
1616
import java.util.Arrays;
1717
import java.util.HashMap;
18+
import java.util.Iterator;
1819
import java.util.LinkedList;
1920
import java.util.List;
2021
import java.util.Map.Entry;
@@ -32,9 +33,11 @@
3233
/**
3334
* The Class IOConnection.
3435
*/
35-
class IOConnection {
36+
class IOConnection implements IOCallback {
3637
/** Debug logger */
3738
static final Logger logger = Logger.getLogger("io.socket");
39+
40+
public static final String FRAME_DELIMITER = "\ufffd";
3841

3942
/** The Constant STATE_INIT. */
4043
private static final int STATE_INIT = 0;
@@ -93,6 +96,9 @@ class IOConnection {
9396
/** Custom Request headers used while handshaking */
9497
private Properties headers;
9598

99+
/** Input buffer used for framing */
100+
private final StringBuilder inputBuffer = new StringBuilder();
101+
96102
/**
97103
* The first socket to be connected. the socket.io server does not send a
98104
* connected response to this one.
@@ -286,8 +292,8 @@ private IOAcknowledge remoteAcknowledge(IOMessage message) {
286292
String _id = message.getId();
287293
if (_id.equals(""))
288294
return null;
289-
else if(_id.endsWith("+") == false)
290-
_id = _id+"+";
295+
else if (_id.endsWith("+") == false)
296+
_id = _id + "+";
291297
final String id = _id;
292298
final String endPoint = message.getEndpoint();
293299
return new IOAcknowledge() {
@@ -322,7 +328,7 @@ private void synthesizeAck(IOMessage message, IOAcknowledge ack) {
322328
if (ack != null) {
323329
int id = nextId++;
324330
acknowledge.put(id, ack);
325-
message.setId(id+"+");
331+
message.setId(id + "+");
326332
}
327333
}
328334

@@ -523,11 +529,38 @@ public void transportError(Exception error) {
523529
}
524530

525531
/**
526-
* Transport message.
532+
* {@link IOTransport} should call this function if it does not support framing. If it does, transportMessage should be used
527533
*
528534
* @param text
529-
* the text {@link IOTransport} calls this, when a message has
530-
* been received.
535+
* the text
536+
*/
537+
public void transportData(String text) {
538+
if(!text.startsWith(FRAME_DELIMITER)) {
539+
transportMessage(text);
540+
return;
541+
}
542+
543+
Iterator<String> fragments = Arrays.asList(text.split(FRAME_DELIMITER)).listIterator(1);
544+
while (fragments.hasNext()) {
545+
int length = Integer.parseInt(fragments.next());
546+
String string = (String) fragments.next();
547+
// Potential BUG: it is not defined if length is in bytes or characters. Assuming characters.
548+
549+
if(length != string.length()) {
550+
error(new SocketIOException("Garbage from server: " + text));
551+
return;
552+
}
553+
554+
transportMessage(string);
555+
}
556+
}
557+
558+
/**
559+
* Transport message. {@link IOTransport} calls this, when a message has
560+
* been received.
561+
*
562+
* @param text
563+
* the text
531564
*/
532565
public void transportMessage(String text) {
533566
logger.info("< " + text);
@@ -541,21 +574,16 @@ public void transportMessage(String text) {
541574
resetTimeout();
542575
switch (message.getType()) {
543576
case IOMessage.TYPE_DISCONNECT:
544-
if (message.getEndpoint().equals("")) {
545-
for (SocketIO socket : sockets.values()) {
546-
socket.getCallback().onDisconnect();
547-
}
548-
} else
549-
try {
550-
findCallback(message).onDisconnect();
551-
} catch (Exception e) {
552-
error(new SocketIOException(
553-
"Exception was thrown in onDisconnect()", e));
554-
}
577+
try {
578+
findCallback(message).onDisconnect();
579+
} catch (Exception e) {
580+
error(new SocketIOException(
581+
"Exception was thrown in onDisconnect()", e));
582+
}
555583
break;
556584
case IOMessage.TYPE_CONNECT:
557585
try {
558-
if (firstSocket != null && message.getEndpoint().equals("")) {
586+
if (firstSocket != null && "".equals(message.getEndpoint())) {
559587
if (firstSocket.getNamespace().equals("")) {
560588
firstSocket.getCallback().onConnect();
561589
} else {
@@ -607,7 +635,7 @@ public void transportMessage(String text) {
607635
case IOMessage.TYPE_EVENT:
608636
try {
609637
JSONObject event = new JSONObject(message.getData());
610-
Object[] argsArray = new Object[0];
638+
Object[] argsArray = empty;
611639
if (event.has("args")) {
612640
JSONArray args = event.getJSONArray("args");
613641
argsArray = new Object[args.length()];
@@ -656,14 +684,8 @@ public void transportMessage(String text) {
656684
}
657685
break;
658686
case IOMessage.TYPE_ERROR:
659-
if (message.getEndpoint().equals(""))
660-
for (SocketIO socket : sockets.values()) {
661-
socket.getCallback().onError(
662-
new SocketIOException(message.getData()));
663-
}
664-
else
665-
findCallback(message).onError(
666-
new SocketIOException(message.getData()));
687+
findCallback(message).onError(
688+
new SocketIOException(message.getData()));
667689
if (message.getData().endsWith("+0")) {
668690
// We are advised to disconnect
669691
cleanup();
@@ -704,9 +726,12 @@ public void reconnect() {
704726
* @return the iO callback
705727
*/
706728
private IOCallback findCallback(IOMessage message) {
729+
if("".equals(message.getEndpoint()))
730+
return this;
707731
SocketIO socket = sockets.get(message.getEndpoint());
708732
if (socket == null) {
709-
logger.warning("Cannot find socket for '" + message.getEndpoint() + "'");
733+
logger.warning("Cannot find socket for '" + message.getEndpoint()
734+
+ "'");
710735
return DUMMY_CALLBACK;
711736
}
712737
return socket.getCallback();
@@ -826,35 +851,75 @@ public IOTransport getTransport() {
826851
public void onDisconnect() {
827852
logger.info("Disconnect");
828853
}
829-
854+
830855
@Override
831856
public void onConnect() {
832857
logger.info("Connect");
833858
}
834-
859+
835860
@Override
836861
public void onMessage(String data, IOAcknowledge ack) {
837862
logger.info("Message:\n" + data + "\n-------------");
838863
}
839-
864+
840865
@Override
841866
public void onMessage(JSONObject json, IOAcknowledge ack) {
842867
logger.info("Message:\n" + json.toString() + "\n-------------");
843868
}
844-
869+
845870
@Override
846871
public void on(String event, IOAcknowledge ack, Object... args) {
847872
logger.info("Event '" + event + "':\n");
848873
for (Object arg : args)
849874
logger.info(arg.toString());
850875
logger.info("\n-------------");
851876
}
852-
877+
853878
@Override
854879
public void onError(SocketIOException socketIOException) {
855880
logger.info("Error");
856881
throw new RuntimeException(socketIOException);
857882
}
858-
883+
859884
};
885+
886+
private static final Object[] empty = new Object[0];
887+
888+
@Override
889+
public void onDisconnect() {
890+
SocketIO socket = sockets.get("");
891+
if(socket != null)
892+
socket.getCallback().onConnect();
893+
}
894+
895+
@Override
896+
public void onConnect() {
897+
SocketIO socket = sockets.get("");
898+
if(socket != null)
899+
socket.getCallback().onConnect();
900+
}
901+
902+
@Override
903+
public void onMessage(String data, IOAcknowledge ack) {
904+
for(SocketIO socket : sockets.values())
905+
socket.getCallback().onMessage(data, ack);
906+
}
907+
908+
@Override
909+
public void onMessage(JSONObject json, IOAcknowledge ack) {
910+
for(SocketIO socket : sockets.values())
911+
socket.getCallback().onMessage(json, ack);
912+
}
913+
914+
@Override
915+
public void on(String event, IOAcknowledge ack, Object... args) {
916+
for(SocketIO socket : sockets.values())
917+
socket.getCallback().on(event, ack, args);
918+
}
919+
920+
@Override
921+
public void onError(SocketIOException socketIOException) {
922+
for(SocketIO socket : sockets.values())
923+
socket.getCallback().onError(socketIOException);
924+
}
860925
}

‎tests/io/socket/AbstractTestSocketIO.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void tearDown() throws Exception {
190190
*/
191191
void doConnect() throws Exception {
192192
// Setting up socket connection
193-
socket = new SocketIO("http://127.0.0.1:" + getProxyPort(), this);
193+
socket = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/main", this);
194194
assertEquals("onConnect", takeEvent());
195195
assertEquals(transport, socket.getTransport());
196196
}
@@ -295,23 +295,22 @@ public void namespaces() throws Exception {
295295
this);
296296
assertEquals("onConnect", takeEvent());
297297

298-
// In some very rare cases, it is possible to receive data on an socket
299-
// which isn't connected yet, this sleep assures that these events
300-
// aren't submitted. This is a server side problem. Maybe socket.io-java
301-
// could cache these events until the server drops the connect event.
302-
Thread.sleep(200);
303298
doConnect();
304-
305299
ns1.disconnect();
306300
assertEquals("onDisconnect", takeEvent());
307301

308302
SocketIO ns2 = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/ns2",
309303
this);
310304
assertEquals("onConnect", takeEvent());
311-
312305
assertEquals("onMessage_string", takeEvent());
313306
assertEquals("ns2", takeArg());
314307

308+
socket.emit("defaultns", "TESTSTRING");
309+
assertEquals("onMessage_string", takeEvent());
310+
assertEquals("TESTSTRING", takeArg());
311+
assertEquals("onMessage_string", takeEvent());
312+
assertEquals("TESTSTRING", takeArg());
313+
315314
SocketIO ns2_2 = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/ns2",
316315
this);
317316
assertEquals("onConnect", takeEvent());
@@ -433,6 +432,7 @@ public void onDisconnect() {
433432
*/
434433
@Override
435434
public void onConnect() {
435+
System.out.println("onConnect");
436436
events.add("onConnect");
437437
}
438438

‎tests/io/socket/testutils/socketio.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ stdin.on('data', function(chunk) {
1111

1212
io.set('transports', [ process.argv[3] ]);
1313

14-
var main = io.sockets.on('connection', function(socket) {
14+
var main = io.of("/main").on('connection', function(socket) {
1515
socket.on('echo', function(data) {
1616
if(data)
1717
socket.emit('echo', data);
@@ -36,6 +36,9 @@ var main = io.sockets.on('connection', function(socket) {
3636
socket.on('message', function(m) {
3737
process.stdout.write("__:MESSAGE:" + m + "\n");
3838
});
39+
socket.on('defaultns', function(m) {
40+
io.sockets.send(m);
41+
})
3942
});
4043

4144
var ns1 = io.of('/ns1').on('connection', function(socket) {

0 commit comments

Comments
 (0)