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

Multiple code improvements 1

Browse Source
This commit is contained in:
George Kankava
2016-02-01 21:10:08 +04:00
parent 831203e617
commit 26b5a7754a
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/io/socket/engineio/client/Socket.java
View File

@@ -8,10 +8,12 @@ import io.socket.engineio.parser.Packet;
import io.socket.engineio.parser.Parser;
import io.socket.parseqs.ParseQS;
import io.socket.thread.EventThread;
import org.json.JSONException;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
@@ -29,7 +31,9 @@ import java.util.logging.Logger;
*/
public class Socket extends Emitter {
private static final Logger logger = Logger.getLogger(Socket.class.getName());
private static final String PROBE_ERROR = "probe error";
private static final Logger logger = Logger.getLogger(Socket.class.getName());
private enum ReadyState {
OPENING, OPEN, CLOSING, CLOSED;
@@ -95,7 +99,7 @@ public class Socket extends Emitter {
/**
* The protocol version.
*/
public static final int protocol = Parser.protocol;
public static final int PROTOCOL = Parser.PROTOCOL;
private static boolean priorWebsocketSuccess = false;
@@ -128,14 +132,12 @@ public class Socket extends Emitter {
private ReadyState readyState;
private ScheduledExecutorService heartbeatScheduler;
public static void setDefaultSSLContext(SSLContext sslContext) {
defaultSSLContext = sslContext;
}
public static void setDefaultHostnameVerifier(HostnameVerifier hostnameVerifier) {
defaultHostnameVerifier = hostnameVerifier;
}
private final Listener onHeartbeatAsListener = new Listener() {
@Override
public void call(Object... args) {
Socket.this.onHeartbeat(args.length > 0 ? (Long)args[0]: 0);
}
};
public Socket() {
this(new Options());
@@ -206,6 +208,14 @@ public class Socket extends Emitter {
this.hostnameVerifier = opts.hostnameVerifier != null ? opts.hostnameVerifier : defaultHostnameVerifier;
}
public static void setDefaultSSLContext(SSLContext sslContext) {
defaultSSLContext = sslContext;
}
public static void setDefaultHostnameVerifier(HostnameVerifier hostnameVerifier) {
defaultHostnameVerifier = hostnameVerifier;
}
/**
* Connects the client.
*
@@ -244,7 +254,7 @@ public class Socket extends Emitter {
logger.fine(String.format("creating transport '%s'", name));
Map<String, String> query = new HashMap<String, String>(this.query);
query.put("EIO", String.valueOf(Parser.protocol));
query.put("EIO", String.valueOf(Parser.PROTOCOL));
query.put("transport", name);
if (this.id != null) {
query.put("sid", this.id);
@@ -364,7 +374,7 @@ public class Socket extends Emitter {
});
} else {
logger.fine(String.format("probe transport '%s' failed", name));
EngineIOException err = new EngineIOException("probe error");
EngineIOException err = new EngineIOException(PROBE_ERROR);
err.transport = transport[0].name;
self.emit(EVENT_UPGRADE_ERROR, err);
}
@@ -394,11 +404,11 @@ public class Socket extends Emitter {
Object err = args[0];
EngineIOException error;
if (err instanceof Exception) {
error = new EngineIOException("probe error", (Exception)err);
error = new EngineIOException(PROBE_ERROR, (Exception)err);
} else if (err instanceof String) {
error = new EngineIOException("probe error: " + (String)err);
} else {
error = new EngineIOException("probe error");
error = new EngineIOException(PROBE_ERROR);
}
error.transport = transport[0].name;
@@ -518,13 +528,6 @@ public class Socket extends Emitter {
this.on(EVENT_HEARTBEAT, this.onHeartbeatAsListener);
}
private final Listener onHeartbeatAsListener = new Listener() {
@Override
public void call(Object... args) {
Socket.this.onHeartbeat(args.length > 0 ? (Long)args[0]: 0);
}
};
private void onHeartbeat(long timeout) {
if (this.pingTimeoutTimer != null) {
pingTimeoutTimer.cancel(false);