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

Merge branch 'master' into fix/compatible-v2

Browse Source
This commit is contained in:
nkzawa
2017-07-14 14:20:39 +09:00
parent ad4449bfee 9b5c684349
commit 6e5fab39de
6 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/socket/client/IO.java
View File

@@ -6,6 +6,7 @@ import okhttp3.Call;
import okhttp3.OkHttpClient;
import okhttp3.WebSocket;
import java.util.logging.Level;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.net.URI;
@@ -75,11 +76,15 @@ public class IO {
Manager io;
if (newConnection) {
logger.fine(String.format("ignoring socket cache for %s", source));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("ignoring socket cache for %s", source));
}
io = new Manager(source, opts);
} else {
if (!managers.containsKey(id)) {
logger.fine(String.format("new io instance for %s", source));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("new io instance for %s", source));
}
managers.putIfAbsent(id, new Manager(source, opts));
}
io = managers.get(id);

12
src/main/java/io/socket/client/Manager.java
View File

@@ -259,10 +259,14 @@ public class Manager extends Emitter {
EventThread.exec(new Runnable() {
@Override
public void run() {
logger.fine(String.format("readyState %s", Manager.this.readyState));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("readyState %s", Manager.this.readyState));
}
if (Manager.this.readyState == ReadyState.OPEN || Manager.this.readyState == ReadyState.OPENING) return;
logger.fine(String.format("opening %s", Manager.this.uri));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("opening %s", Manager.this.uri));
}
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
final io.socket.engineio.client.Socket socket = Manager.this.engine;
final Manager self = Manager.this;
@@ -467,7 +471,9 @@ public class Manager extends Emitter {
}
/*package*/ void packet(Packet packet) {
logger.fine(String.format("writing packet %s", packet));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("writing packet %s", packet));
}
final Manager self = this;
if (packet.query != null && !packet.query.isEmpty() && packet.type == Parser.CONNECT) {

28
src/main/java/io/socket/client/Socket.java
View File

@@ -262,7 +262,9 @@ public class Socket extends Emitter {
}
private void onclose(String reason) {
logger.fine(String.format("close (%s)", reason));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("close (%s)", reason));
}
this.connected = false;
this.id = null;
this.emit(EVENT_DISCONNECT, reason);
@@ -316,7 +318,9 @@ public class Socket extends Emitter {
private void onevent(Packet<JSONArray> packet) {
List<Object> args = new ArrayList<Object>(Arrays.asList(toArray(packet.data)));
logger.fine(String.format("emitting event %s", args));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("emitting event %s", args));
}
if (packet.id >= 0) {
logger.fine("attaching ack callback to event");
@@ -343,7 +347,9 @@ public class Socket extends Emitter {
public void run() {
if (sent[0]) return;
sent[0] = true;
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
}
JSONArray jsonArgs = new JSONArray();
for (Object arg : args) {
@@ -362,10 +368,14 @@ public class Socket extends Emitter {
private void onack(Packet<JSONArray> packet) {
Ack fn = this.acks.remove(packet.id);
if (fn != null) {
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
}
fn.call(toArray(packet.data));
} else {
logger.fine(String.format("bad ack %s", packet.id));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("bad ack %s", packet.id));
}
}
}
@@ -391,7 +401,9 @@ public class Socket extends Emitter {
}
private void ondisconnect() {
logger.fine(String.format("server disconnect (%s)", this.nsp));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("server disconnect (%s)", this.nsp));
}
this.destroy();
this.onclose("io server disconnect");
}
@@ -418,7 +430,9 @@ public class Socket extends Emitter {
@Override
public void run() {
if (Socket.this.connected) {
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
}
Socket.this.packet(new Packet(Parser.DISCONNECT));
}

13
src/main/java/io/socket/parser/IOParser.java
View File

@@ -1,6 +1,5 @@
package io.socket.parser;
import io.socket.client.IO;
import io.socket.hasbinary.HasBinary;
import org.json.JSONException;
import org.json.JSONTokener;
@@ -31,7 +30,9 @@ final public class IOParser implements Parser {
obj.type = obj.type == EVENT ? BINARY_EVENT : BINARY_ACK;
}
logger.fine(String.format("encoding packet %s", obj));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("encoding packet %s", obj));
}
if (BINARY_EVENT == obj.type || BINARY_ACK == obj.type) {
encodeAsBinary(obj, callback);
@@ -62,7 +63,9 @@ final public class IOParser implements Parser {
str.append(obj.data);
}
logger.fine(String.format("encoded %s as %s", obj, str));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("encoded %s as %s", obj, str));
}
return str.toString();
}
@@ -182,7 +185,9 @@ final public class IOParser implements Parser {
}
}
logger.fine(String.format("decoded %s as %s", str, p));
if (logger.isLoggable(Level.FINE)) {
logger.fine(String.format("decoded %s as %s", str, p));
}
return p;
}

11
src/main/java/io/socket/parser/Parser.java
View File

@@ -1,16 +1,5 @@
package io.socket.parser;
import io.socket.emitter.Emitter;
import io.socket.hasbinary.HasBinary;
import org.json.JSONException;
import org.json.JSONTokener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public interface Parser {
/**