Fix memory issue in websocket

README.md

@@ -12,7 +12,7 @@ If you already use SDK v1, it is strongly suggested migrate to v2 as we refactor
   - [Installation](#Installation)
   - [Run examples](#Run-examples)
   - [Client](#client)
-- [Migrate from v1](#Migrate-from-v1)
+  - [Migrate from v1](#Migrate-from-v1)
 - [Request example](#Request-example)
   - [Reference data](#Reference-data)
   - [Market data](#Market-data)

demo/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.10...3.17)
+project(demo LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(/usr/local/huobi)
+
+add_subdirectory(account)
+add_subdirectory(crossmargin)
+add_subdirectory(isolatedmargin)
+add_subdirectory(market)
+add_subdirectory(reference)
+add_subdirectory(trade)
+add_subdirectory(wallet)
+add_subdirectory(websocketAsset)
+add_subdirectory(websocketMarket)
+add_subdirectory(websocketOrders)
+
+find_package(cpprestsdk REQUIRED)
+
+link_directories(/usr/local/lib/)
+link_directories(/usr/local/huobi/)

demo/account/accountdemo.cpp

@@ -1,4 +1,3 @@
-
 #include <client/accountClient.h>
 
 using namespace std;

demo/crossmargin/crossmargindemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/crossMarginClient.h>
 
 using namespace std;

demo/isolatedmargin/isolatedmargindemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/isolatedMarginClient.h>
 
 using namespace std;

demo/reference/referencedemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <iostream>
 #include <client/referenceClient.h>
 

demo/trade/tradedemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/tradeClient.h>
 
 using namespace std;

demo/wallet/walletdemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/walletClient.h>
 
 using namespace std;

demo/websocketAsset/websocketAssetdemo.cpp

@@ -1,12 +1,10 @@
-
-
 #include <iostream>
 #include <client/websocketAssetClient.h>
 
 using namespace std;
 
 int main() {
-    websocketAssetClient client{APIKEY, SECRETKEY};
+    WebsocketAssetClient client{APIKEY, SECRETKEY};
 
     client.subAccounts(1, [](AccountsUpdate accountsUpdate) {
         cout << accountsUpdate.changeType << endl;

demo/websocketMarket/websocketMarketdemo.cpp

@@ -1,11 +1,10 @@
-
 #include <iostream>
 #include <client/websocketMarketClient.h>
 
 using namespace std;
 
 int main() {
-    websocketMarketClient client;
+    WebsocketMarketClient client;
     const char *symbol = "htusdt";
     client.subKline(symbol, "1min", [](Candlestick candlestick) {
         cout << candlestick.amount << endl;

demo/websocketOrders/websocketOrdersdemo.cpp

@@ -1,12 +1,10 @@
-
-
 #include <iostream>
 #include <client/websocketOrdersClient.h>
 
 using namespace std;
 
 int main() {
-    websocketOrdersClient client{APIKEY, SECRETKEY};
+    WebsocketOrdersClient client{APIKEY, SECRETKEY};
 
     client.subOrders("htusdt", [](OrdersUpdate ordersUpdate) {
         cout << ordersUpdate.symbol << endl;

docker/Dockerfile

@@ -0,0 +1,45 @@
+#
+# Ubuntu Dockerfile
+#
+# https://github.com/dockerfile/ubuntu
+#
+
+# Pull base image.
+FROM ubuntu:18.04
+
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -y upgrade && \
+  apt-get install -y build-essential && \
+  apt-get install -y curl git vim wget cmake && \
+  apt-get install -y libssl-dev libcurl4-openssl-dev zlib1g-dev libcpprest-dev && \
+  rm -rf /var/lib/apt/lists/*
+
+# Set environment variables.
+ENV HOME /root
+
+# Define working directory.
+WORKDIR /root
+
+RUN \
+  git clone https://github.com/huobiapi/huobi_Cpp.git && \
+  cd huobi_Cpp && \
+  mkdir build && \
+  cd build && \
+  cmake .. -DCMAKE_PREFIX_PATH=/opt/cpprest-2.10.16/lib64/cmake/ && \
+  make && \
+  make install
+
+WORKDIR /root
+
+RUN \
+  cd huobi_Cpp/demo/reference && \
+  mkdir build && \
+  cd build && \
+  cmake .. -DCMAKE_PREFIX_PATH=/opt/cpprest-2.10.16/lib64/cmake/ -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/cmake && \
+  make
+
+# Define default command.
+CMD ["bash"]

include/client/accountClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ACCOUNTCLIENT_H
 #define HUOBI_ACCOUNTCLIENT_H
 

include/client/crossMarginClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_CROSSMARGINCLIENT_H
 #define HUOBI_CROSSMARGINCLIENT_H
 

include/client/isolatedMarginClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ISOLATEDMARGINCLIENT_H
 #define HUOBI_ISOLATEDMARGINCLIENT_H
 

include/client/marketClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_MARKETCLIENT_H
 #define HUOBI_MARKETCLIENT_H
 

include/client/referenceClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_REFERENCECLIENT_H
 #define HUOBI_REFERENCECLIENT_H
 

include/client/tradeClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_TRADECLIENT_H
 #define HUOBI_TRADECLIENT_H
 

include/client/walletClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_WALLETCLIENT_H
 #define HUOBI_WALLETCLIENT_H
 

include/client/websocketAssetClient.h

@@ -1,12 +1,10 @@
-
-
 #ifndef HUOBI_WEBSOCKETASSETCLIENT_H
 #define HUOBI_WEBSOCKETASSETCLIENT_H
 
 #include "include.h"
 
-struct websocketAssetClient {
-    websocketAssetClient(char *accessKey, char *secretKey) : signature{accessKey, secretKey} {
+struct WebsocketAssetClient {
+    WebsocketAssetClient(char *accessKey, char *secretKey) : signature{accessKey, secretKey} {
     }
 
     void subAccounts(int mode, const std::function<void(const AccountsUpdate &)> &handler);

include/client/websocketHelper.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_WEBSOCKETHELPER_H
 #define HUOBI_WEBSOCKETHELPER_H
 
@@ -10,7 +8,7 @@ using namespace web;
 using namespace web::websockets::client;
 using namespace rapidjson;
 
-struct websocketHelper {
+struct WebsocketHelper {
     static websocket_outgoing_message pong(string ping);
 
     static websocket_outgoing_message buildSubTopic(string topic);

include/client/websocketMarketClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_WEBSOCKETMARKETCLIENT_H
 #define HUOBI_WEBSOCKETMARKETCLIENT_H
 
@@ -11,7 +9,7 @@ using namespace web;
 using namespace web::websockets::client;
 using namespace rapidjson;
 
-struct websocketMarketClient {
+struct WebsocketMarketClient {
     void subKline(const char *symbol, const char *period, const std::function<void(const Candlestick &)> &handler);
 
     void reqKline(const char *symbol, const char *period, long from, long to,

include/client/websocketOrdersClient.h

@@ -1,12 +1,10 @@
-
-
 #ifndef HUOBI_WEBSOCKETORDERSCLIENT_H
 #define HUOBI_WEBSOCKETORDERSCLIENT_H
 
 #include "include.h"
 
-struct websocketOrdersClient {
-    websocketOrdersClient(char *accessKey, char *secretKey) : signature{accessKey, secretKey} {
+struct WebsocketOrdersClient {
+    WebsocketOrdersClient(char *accessKey, char *secretKey) : signature{accessKey, secretKey} {
     }
 
     void subOrders(const char* symbol, const std::function<void(const OrdersUpdate &)> &handler);

include/define.h

@@ -1,12 +1,10 @@
-
-
 #ifndef HUOBI_DEFINE_H
 #define HUOBI_DEFINE_H
 
 #define GET "GET"
 #define POST "POST"
 
-#define HOST "api.huobi.de.com"
+#define HOST "api.huobi.pro"
 #define SPLICE(x) "https://" HOST x
 #define WEBSOCKET_HOST "wss://api.huobi.pro/ws"
 #define WEBSOCKET_V2_HOST "wss://api.huobi.pro/ws/v2"

include/gzDecompress.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_GZDECOMPRESS_H
 #define HUOBI_GZDECOMPRESS_H
 #include <zlib.h>

include/include.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_INCLUDE_H
 #define HUOBI_INCLUDE_H
 

include/request/accounts/futurestransfer.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_FUTURESTRANSFERREQUEST_H
 #define HUOBI_FUTURESTRANSFERREQUEST_H
 

include/request/accounts/historyrequest.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ACCOUNTHISTORYREQUEST_H
 #define HUOBI_ACCOUNTHISTORYREQUEST_H
 

include/request/accounts/ledger.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ACCOUNTLEDGERREQUEST_H
 #define HUOBI_ACCOUNTLEDGERREQUEST_H
 

include/request/accounts/managesubuser.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_MANAGESUBUSERREQUEST_H
 #define HUOBI_MANAGESUBUSERREQUEST_H
 

include/request/accounts/subusertransfer.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_SUBUSERTRANSFERREQUEST_H
 #define HUOBI_SUBUSERTRANSFERREQUEST_H
 

include/request/crossMargin/loanorders.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_CROSSMARGINLOANORDERSREQUEST_H
 #define HUOBI_CROSSMARGINLOANORDERSREQUEST_H
 

include/request/crossMargin/transferorapply.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_CROSSMARGINTRANSFERORAPPLYREQUEST_H
 #define HUOBI_CROSSMARGINTRANSFERORAPPLYREQUEST_H
 

include/request/isolatedMargin/balance.h

@@ -1,4 +1,3 @@
-
 #ifndef HUOBI_ISOLATEDMARGINBALANCEREQUEST_H
 #define HUOBI_ISOLATEDMARGINBALANCEREQUEST_H
 

include/request/isolatedMargin/loanorders.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_LOANORDERSREQUEST_H
 #define HUOBI_LOANORDERSREQUEST_H
 

include/request/isolatedMargin/transferorapply.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ISOLATEDMARGINTRANSFERORAPPLYREQUEST_H
 #define HUOBI_ISOLATEDMARGINTRANSFERORAPPLYREQUEST_H
 

include/request/market/candlestick.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_CANDLESTICKREQUEST_H
 #define HUOBI_CANDLESTICKREQUEST_H
 

include/request/market/depth.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_DEPTHREQUEST_H
 #define HUOBI_DEPTHREQUEST_H
 

include/request/market/historytrade.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_HISTORYTRADEREQUEST_H
 #define HUOBI_HISTORYTRADEREQUEST_H
 struct HistoryTradeRequest {

include/request/market/ticker.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_TICKERREQUEST_H
 #define HUOBI_TICKERREQUEST_H
 struct TickerRequest {

include/request/market/trade.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_TRADEREQUEST_H
 #define HUOBI_TRADEREQUEST_H
 struct TradeRequest{

include/request/reference/currencies.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_REFERENCECURRENCIESREQUEST_H
 #define HUOBI_REFERENCECURRENCIESREQUEST_H
 

include/request/trade/batchcancelopenorders.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_BATCHCANCELOPENORDERSREQUEST_H
 #define HUOBI_BATCHCANCELOPENORDERSREQUEST_H
 

include/request/trade/batchcancelorders.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_BATCHCANCELORDERSREQUEST_H
 #define HUOBI_BATCHCANCELORDERSREQUEST_H
 

include/request/trade/matchresultshistory.h

@@ -1,5 +1,4 @@
 
-
 #ifndef HUOBI_MATCHRESULTSHISTORYREQUEST_H
 #define HUOBI_MATCHRESULTSHISTORYREQUEST_H