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

compatible with 0.6.1

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2013-06-07 05:44:00 +09:00
parent 02ca2208a1
commit f558407a82
3 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,7 @@ public abstract class Socket extends Emitter {
if (Packet.OPEN.equals(packet.type)) {
this.onHandshake(gson.fromJson(packet.data, HandshakeData.class));
} else if (Packet.PONG.equals(packet.type)) {
this.ping();
this.setPing();
} else if (Packet.ERROR.equals(packet.type)) {
// TODO: handle error
EngineIOException err = new EngineIOException("server error");
@@ -402,7 +402,7 @@ public abstract class Socket extends Emitter {
this.pingInterval = data.pingInterval;
this.pingTimeout = data.pingTimeout;
this.onOpen();
this.ping();
this.setPing();
this.off(EVENT_HEARTBEAT, this.onHeartbeatAsListener);
this.on(EVENT_HEARTBEAT, this.onHeartbeatAsListener);
@@ -439,7 +439,7 @@ public abstract class Socket extends Emitter {
}, timeout, TimeUnit.MILLISECONDS);
}
private void ping() {
private void setPing() {
if (this.pingIntervalTimer != null) {
pingIntervalTimer.cancel(true);
}
@@ -452,7 +452,7 @@ public abstract class Socket extends Emitter {
@Override
public void run() {
logger.fine(String.format("writing ping packet - expecting pong within %sms", self.pingTimeout));
self.sendPacket(Packet.PING);
self.ping();
self.onHeartbeat(self.pingTimeout);
}
});
@@ -460,6 +460,18 @@ public abstract class Socket extends Emitter {
}, this.pingInterval, TimeUnit.MILLISECONDS);
}
/**
* Sends a ping packet
*/
public void ping() {
EventThread.exec(new Runnable() {
@Override
public void run() {
Socket.this.sendPacket(Packet.PING);
}
});
}
private void onDrain() {
this.callbacks();
for (int i = 0; i < this.prevBufferLen; i++) {
@@ -578,6 +590,7 @@ public abstract class Socket extends Emitter {
private void onClose(String reason, Exception desc) {
if (this.readyState == ReadyState.OPENING || this.readyState == ReadyState.OPEN) {
logger.fine(String.format("socket close with reason: %s", reason));
final Socket self = this;
if (this.pingIntervalTimer != null) {
this.pingIntervalTimer.cancel(true);
}
@@ -587,12 +600,15 @@ public abstract class Socket extends Emitter {
EventThread.nextTick(new Runnable() {
@Override
public void run() {
Socket.this.writeBuffer.clear();
Socket.this.callbackBuffer.clear();
self.writeBuffer.clear();
self.callbackBuffer.clear();
}
});
ReadyState prev = this.readyState;
this.readyState = ReadyState.CLOSED;
this.emit(EVENT_CLOSE, reason, desc);
if (prev == ReadyState.OPEN) {
this.emit(EVENT_CLOSE, reason, desc);
}
this.onclose();
this.id = null;
}