Merge pull request #2 from XDex/expose_configs

Expose connectionTimeout and perMessageDeflate configs

Author: XDex

src/main/java/io/github/sac/Socket.java

@@ -34,12 +34,14 @@ public class Socket extends Emitter {
     private WebSocketAdapter adapter;
     private Map<String, String> headers;
     private SocketClusterCodec codec;
+    private int connectionTimeout = 5000;
+    private boolean perMessageDeflate = true;
 
     private static final ObjectMapper mapper = new ObjectMapper();
 
     public Socket(String URL) {
         this.URL = URL;
-        factory = new WebSocketFactory().setConnectionTimeout(5000);
+        factory = new WebSocketFactory();
         counter = new AtomicInteger(1);
         acks = new HashMap<>();
         channels = new ArrayList<>();
@@ -89,6 +91,21 @@ public void setCodec(SocketClusterCodec codec) {
         this.codec = codec;
     }
 
+    /**
+     * Set Websocket connection timeout - set to 5000 by default
+     * @param timeout - connection timeout in Milliseconds
+     */
+    public void setConnectionTimeout(int timeout) {
+        connectionTimeout = timeout;
+    }
+
+    /**
+     * Disable Websocket perMessageDeflate compression, which is enabled by default
+     */
+    public void disablePerMessageDeflateCompression() {
+        perMessageDeflate = false;
+    }
+
     /**
      * used to set up TLS/SSL connection to server for more details visit neovisionaries websocket client
      */
@@ -411,20 +428,28 @@ public Map<String, String> getHeaders() {
         return headers;
     }
 
-    public void connect() {
-
+    private void setupConnection() {
         try {
+            factory.setConnectionTimeout(connectionTimeout);
             ws = factory.createSocket(URL);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        ws.addExtension("permessage-deflate; client_max_window_bits");
+
+        if (perMessageDeflate) {
+            ws.addExtension(WebSocketExtension.PERMESSAGE_DEFLATE);
+        }
+        ws.addExtension("client_max_window_bits");
+
         for (Map.Entry<String, String> entry : headers.entrySet()) {
             ws.addHeader(entry.getKey(), entry.getValue());
         }
 
         ws.addListener(adapter);
+    }
 
+    public void connect() {
+        setupConnection();
         try {
             ws.connect();
         } catch (OpeningHandshakeException e) {
@@ -468,17 +493,7 @@ public void connect() {
     }
 
     public void connectAsync() {
-        try {
-            ws = factory.createSocket(URL);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        ws.addExtension("permessage-deflate; client_max_window_bits");
-        for (Map.Entry<String, String> entry : headers.entrySet()) {
-            ws.addHeader(entry.getKey(), entry.getValue());
-        }
-
-        ws.addListener(adapter);
+        setupConnection();
         ws.connectAsynchronously();
     }