add new Options for feeding custom OkHttpClient

This commit is contained in:
Yu-Hsuan Lin
2015-04-14 11:57:56 +08:00
parent 3ccc42ab2c
commit 464b7302d4
5 changed files with 34 additions and 38 deletions

View File

@@ -8,6 +8,8 @@ import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser;
import com.github.nkzawa.parseqs.ParseQS;
import com.github.nkzawa.thread.EventThread;
import com.squareup.okhttp.OkHttpClient;
import org.json.JSONException;
import javax.net.ssl.SSLContext;
@@ -121,6 +123,7 @@ public class Socket extends Emitter {
private Future pingTimeoutTimer;
private Future pingIntervalTimer;
private SSLContext sslContext;
private OkHttpClient okHttpClient;
private ReadyState readyState;
private ScheduledExecutorService heartbeatScheduler;
@@ -197,6 +200,7 @@ public class Socket extends Emitter {
opts.transports : new String[]{Polling.NAME, WebSocket.NAME}));
this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843;
this.rememberUpgrade = opts.rememberUpgrade;
this.okHttpClient = opts.okHttpClient;
}
/**
@@ -254,6 +258,7 @@ public class Socket extends Emitter {
opts.timestampParam = this.timestampParam;
opts.policyPort = this.policyPort;
opts.socket = this;
opts.okHttpClient = this.okHttpClient;
if (WebSocket.NAME.equals(name)) {
return new WebSocket(opts);

View File

@@ -5,6 +5,7 @@ import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser;
import com.github.nkzawa.thread.EventThread;
import com.squareup.okhttp.OkHttpClient;
import javax.net.ssl.SSLContext;
import java.util.Map;
@@ -42,6 +43,7 @@ public abstract class Transport extends Emitter {
protected String timestampParam;
protected SSLContext sslContext;
protected Socket socket;
protected OkHttpClient okHttpClient;
protected ReadyState readyState;
@@ -55,6 +57,7 @@ public abstract class Transport extends Emitter {
this.timestampRequests = opts.timestampRequests;
this.sslContext = opts.sslContext;
this.socket = opts.socket;
this.okHttpClient = opts.okHttpClient;
}
protected Transport onError(String msg, Exception desc) {
@@ -144,6 +147,7 @@ public abstract class Transport extends Emitter {
public int policyPort = -1;
public Map<String, String> query;
public SSLContext sslContext;
public OkHttpClient okHttpClient;
protected Socket socket;
}
}

View File

@@ -48,7 +48,7 @@ public class WebSocket extends Transport {
this.emit(EVENT_REQUEST_HEADERS, headers);
final WebSocket self = this;
final OkHttpClient client = new OkHttpClient();
final OkHttpClient client = this.okHttpClient != null ? this.okHttpClient : new OkHttpClient();
if (this.sslContext != null) {
SSLSocketFactory factory = sslContext.getSocketFactory();// (SSLSocketFactory) SSLSocketFactory.getDefault();
client.setSslSocketFactory(factory);