h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tests for handshake and upgrade

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2013-05-03 02:45:08 +09:00
parent 09432364de
commit 9f2ef5b5e0
3 changed files with 110 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/github/nkzawa/engineio/client/Socket.java
View File

@@ -6,9 +6,7 @@ import com.github.nkzawa.engineio.client.transports.PollingXHR;
import com.github.nkzawa.engineio.client.transports.WebSocket;
import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.Gson;
import java.net.URI;
import java.net.URISyntaxException;
@@ -20,6 +18,8 @@ public abstract class Socket extends Emitter {
private static final Logger logger = Logger.getLogger(Socket.class.getName());
private static final Gson gson = new Gson();
private static final int OPENING = 0;
private static final int OPEN = 1;
private static final int CLOSING = 2;
@@ -244,7 +244,7 @@ public abstract class Socket extends Emitter {
logger.fine("changing transport and sending upgrade packet");
transport[0].off(Transport.EVENT_ERROR, onerror);
self.emit(EVENT_UPGRADE, transport);
self.emit(EVENT_UPGRADE, transport[0]);
self.setTransport(transport[0]);
Packet packet = new Packet(Packet.UPGRADE);
transport[0].send(new Packet[]{packet});
@@ -316,7 +316,7 @@ public abstract class Socket extends Emitter {
this.emit(EVENT_HEARTBEAT);
if (Packet.OPEN.equals(packet.type)) {
this.onHandshake(new JsonParser().parse(packet.data).getAsJsonObject());
this.onHandshake(gson.fromJson(packet.data, HandshakeData.class));
} else if (Packet.PONG.equals(packet.type)) {
this.ping();
} else if (Packet.ERROR.equals(packet.type)) {
@@ -334,19 +334,13 @@ public abstract class Socket extends Emitter {
}
}
private void onHandshake(JsonObject data) {
private void onHandshake(HandshakeData data) {
this.emit(EVENT_HANDSHAKE, data);
this.id = data.get("sid").getAsString();
this.transport.query.put("sid", data.get("sid").getAsString());
List<String> upgrades = new ArrayList<String>();
for (JsonElement upgrade : data.get("upgrades").getAsJsonArray()) {
upgrades.add(upgrade.getAsString());
}
this.upgrades = this.filterUpgrades(upgrades);
this.pingInterval = data.get("pingInterval").getAsLong();
this.pingTimeout = data.get("pingTimeout").getAsLong();
this.id = data.sid;
this.transport.query.put("sid", data.sid);
this.upgrades = this.filterUpgrades(data.upgrades);
this.pingInterval = data.pingInterval;
this.pingTimeout = data.pingTimeout;
this.onOpen();
this.ping();
@@ -526,6 +520,7 @@ public abstract class Socket extends Emitter {
public abstract void onclose();
public static class Options extends Transport.Options {
public String host;
@@ -558,4 +553,12 @@ public abstract class Socket extends Emitter {
public Emitter evs = new Emitter();
}
public static class HandshakeData {
public String sid;
public List<String> upgrades;
public long pingInterval;
public long pingTimeout;
}
}