add http proxy support

src/main/java/com/huobi/constant/HuobiOptions.java

@@ -7,6 +7,8 @@
 
 import com.huobi.constant.enums.ExchangeEnum;
 
+import java.net.Proxy;
+
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
@@ -22,7 +24,7 @@ public class HuobiOptions implements Options {
   private String apiKey;
 
   private String secretKey;
-
+  private Proxy proxy;
   @Builder.Default
   private boolean websocketAutoConnect = true;
 
@@ -56,4 +58,8 @@ public boolean isWebSocketAutoConnect() {
     return this.websocketAutoConnect;
   }
 
+  @Override
+  public Proxy getProxy(){
+    return this.proxy;
+  };
 }

src/main/java/com/huobi/constant/Options.java

@@ -2,6 +2,8 @@
 
 import com.huobi.constant.enums.ExchangeEnum;
 
+import java.net.Proxy;
+
 public interface Options {
 
   String getApiKey();
@@ -16,4 +18,6 @@ public interface Options {
 
   boolean isWebSocketAutoConnect();
 
+  Proxy getProxy();
+
 }

src/main/java/com/huobi/service/huobi/connection/HuobiRestConnection.java

@@ -26,6 +26,7 @@ public Options getOptions() {
 
   public HuobiRestConnection(Options options) {
     this.options = options;
+    ConnectionFactory.initFactory(options.getProxy());
     try {
       this.host = new URL(this.options.getRestHost()).getHost();
     } catch (MalformedURLException e) {

src/main/java/com/huobi/utils/ConnectionFactory.java

@@ -1,13 +1,12 @@
 package com.huobi.utils;
 
 import java.io.IOException;
+import java.net.Proxy;
+import java.util.Objects;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import okhttp3.ConnectionPool;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -24,94 +23,112 @@
 
 public class ConnectionFactory {
 
-  private static Boolean LATENCY_DEBUG_SWATCH = Boolean.FALSE;
+    private static Boolean LATENCY_DEBUG_SWATCH = Boolean.FALSE;
 
-  private static LinkedBlockingQueue<NetworkLatency> LATENCY_DEBUG_QUEUE = new LinkedBlockingQueue<>();
+    private static LinkedBlockingQueue<NetworkLatency> LATENCY_DEBUG_QUEUE = new LinkedBlockingQueue<>();
 
-  private static ConnectionPool connectionPool =
-      new ConnectionPool(20, 300, TimeUnit.SECONDS);
+    private static ConnectionPool connectionPool =
+            new ConnectionPool(20, 300, TimeUnit.SECONDS);
 
-  private static final OkHttpClient client = new OkHttpClient.Builder()
-      .followSslRedirects(false)
-      .followRedirects(false)
-      .connectTimeout(5000, TimeUnit.MILLISECONDS)
-      .readTimeout(5000, TimeUnit.MILLISECONDS)
-      .writeTimeout(5000, TimeUnit.MILLISECONDS)
-      .connectionPool(connectionPool)
-      .addNetworkInterceptor(new Interceptor() {
-        @NotNull
-        @Override
-        public Response intercept(@NotNull Chain chain) throws IOException {
-          Request request = chain.request();
-
-          Long startNano = System.nanoTime();
-
-          Response response = chain.proceed(request);
+    private ConnectionFactory(){}
+    public static void initFactory(Proxy proxy) {
+        init(proxy);
+    }
 
-          Long endNano = System.nanoTime();
 
-          if (LATENCY_DEBUG_SWATCH) {
-            LATENCY_DEBUG_QUEUE.add(new NetworkLatency(request.url().url().getPath(), startNano, endNano));
-          }
+    private static OkHttpClient client;
+    @Getter
+    public static OkHttpClient.Builder builder;
+//  static {
+//  }
 
-          return response;
+    private static void init(Proxy proxy) {
+        builder = new OkHttpClient.Builder();
+        if (!Objects.isNull(proxy)) {
+            builder.proxy(proxy);
         }
-      })
-      .build();
-
-  private static final Logger log = LoggerFactory.getLogger(ConnectionFactory.class);
-
-  public static String execute(Request request) {
-
-    Response response = null;
-    String str = null;
-    try {
-      log.debug("[Request URL]{}", request.url());
-      response = client.newCall(request).execute();
-      if (response.code() != 200) {
-        throw new SDKException(SDKException.EXEC_ERROR, "[Execute] Response Status Error : " + response.code() + " message:" + response.message());
-      }
-      if (response != null && response.body() != null) {
-        str = response.body().string();
-        response.close();
-      } else {
-        throw new SDKException(SDKException.ENV_ERROR, "[Execute] Cannot get the response from server");
-      }
-      log.debug("[Response]{}", str);
-      return str;
-    } catch (IOException e) {
-      e.printStackTrace();
-      throw new SDKException(SDKException.RUNTIME_ERROR, "[Execute] Cannot get the response from server");
+        client = builder
+                .followSslRedirects(false)
+                .followRedirects(false)
+                .connectTimeout(5000, TimeUnit.MILLISECONDS)
+                .readTimeout(5000, TimeUnit.MILLISECONDS)
+                .writeTimeout(5000, TimeUnit.MILLISECONDS)
+                .connectionPool(connectionPool)
+                .addNetworkInterceptor(new Interceptor() {
+                    @NotNull
+                    @Override
+                    public Response intercept(@NotNull Chain chain) throws IOException {
+                        Request request = chain.request();
+
+                        Long startNano = System.nanoTime();
+
+                        Response response = chain.proceed(request);
+
+                        Long endNano = System.nanoTime();
+
+                        if (LATENCY_DEBUG_SWATCH) {
+                            LATENCY_DEBUG_QUEUE.add(new NetworkLatency(request.url().url().getPath(), startNano, endNano));
+                        }
+
+                        return response;
+                    }
+                })
+                .build();
     }
 
-  }
+    private static final Logger log = LoggerFactory.getLogger(ConnectionFactory.class);
+
+    public static String execute(Request request) {
+
+        Response response = null;
+        String str = null;
+        try {
+            log.debug("[Request URL]{}", request.url());
+            response = client.newCall(request).execute();
+            if (response.code() != 200) {
+                throw new SDKException(SDKException.EXEC_ERROR, "[Execute] Response Status Error : " + response.code() + " message:" + response.message());
+            }
+            if (response != null && response.body() != null) {
+                str = response.body().string();
+                response.close();
+            } else {
+                throw new SDKException(SDKException.ENV_ERROR, "[Execute] Cannot get the response from server");
+            }
+            log.debug("[Response]{}", str);
+            return str;
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new SDKException(SDKException.RUNTIME_ERROR, "[Execute] Cannot get the response from server");
+        }
 
-  public static WebSocket createWebSocket(Request request, WebSocketListener listener) {
-    return client.newWebSocket(request, listener);
-  }
+    }
 
-  public static void setLatencyDebug() {
-    LATENCY_DEBUG_SWATCH = Boolean.TRUE;
-  }
+    public static WebSocket createWebSocket(Request request, WebSocketListener listener) {
+        return client.newWebSocket(request, listener);
+    }
 
-  public static LinkedBlockingQueue<NetworkLatency> getLatencyDebugQueue() {
-    return LATENCY_DEBUG_QUEUE;
-  }
+    public static void setLatencyDebug() {
+        LATENCY_DEBUG_SWATCH = Boolean.TRUE;
+    }
 
-  public static void clearLatencyDebugQueue() {
-    LATENCY_DEBUG_QUEUE.clear();
-  }
+    public static LinkedBlockingQueue<NetworkLatency> getLatencyDebugQueue() {
+        return LATENCY_DEBUG_QUEUE;
+    }
 
-  @Data
-  @Builder
-  @AllArgsConstructor
-  @NoArgsConstructor
-  public static class NetworkLatency {
+    public static void clearLatencyDebugQueue() {
+        LATENCY_DEBUG_QUEUE.clear();
+    }
 
-    private String path;
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class NetworkLatency {
 
-    private Long startNanoTime;
+        private String path;
 
-    private Long endNanoTime;
-  }
+        private Long startNanoTime;
+
+        private Long endNanoTime;
+    }
 }