support tbus

Author: tigersk

changlog.md

@@ -1,3 +1,7 @@
+## 1.1.0 (2025-08-08)
+### New
+- 支持 TBUS 配置
+
 ## 1.0.4 (2025-05-12)
 ### Breaking
 - 长连接订阅请求由 bool 改为 unsigned int，表示订阅请求的 id

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -180,7 +180,7 @@ class TestTradeClient {
     }
 
     static void test_trade(const std::shared_ptr<TradeClient>& trade_client) {
-        TestTradeClient::test_price_util(trade_client);
+        TestTradeClient::test_place_order(trade_client);
     }
 
 };
@@ -267,6 +267,7 @@ class TestQuoteClient {
     }
 
     static void test_get_kline(std::shared_ptr<QuoteClient> quote_client) {
+        LOG(DEBUG) << U("test_get_kline");
         value symbols = value::array();
         symbols[0] = value::string(U("AAPL"));
         symbols[1] = value::string(U("JD"));
@@ -406,7 +407,7 @@ class TestQuoteClient {
 
 
     static void test_quote(const std::shared_ptr<QuoteClient> quote_client) {
-        TestQuoteClient::test_get_quote_delay(quote_client);
+        TestQuoteClient::test_get_kline(quote_client);
     }
 };
 
@@ -454,7 +455,8 @@ class TestPushClient {
     TestPushClient(std::shared_ptr<IPushClient> client) : push_client(client) {
         std::vector<std::string> hk_option_symbols = {"TCH.HK 20241230 410.00 CALL"};
         std::vector<std::string> future_symbols = {"CL2412"};
-        symbols = future_symbols;
+        std::vector<std::string> stock_symbols = {"AAPL", "TSLA"};
+        symbols = stock_symbols;
     }
 
     void connected_callback() {
@@ -620,13 +622,13 @@ int main(int argc, char* argv[]) {
      *  QuoteClient
      */
 //     std::shared_ptr<QuoteClient> quote_client = std::make_shared<QuoteClient>(config);
-//     TestQuoteClient::test_quote(quote_client);
+//    TestQuoteClient::test_quote(quote_client);
 
     /**
      * TradeClient
      */
-    //std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
-    //TestTradeClient::test_trade(trade_client);
+//    std::shared_ptr<TradeClient> trade_client = std::make_shared<TradeClient>(config);
+//    TestTradeClient::test_trade(trade_client);
 
     /**
     *  TigerApi

include/tigerapi/client_config.h

@@ -60,6 +60,8 @@ namespace TIGER_API {
 
         const utility::string_t& get_socket_port();
 
+        bool is_us();
+
     private:
         bool sandbox_debug = false;
         utility::string_t server_url = TIGER_SERVER_URL;

include/tigerapi/constants.h

@@ -73,15 +73,22 @@ static utility::string_t SANDBOX_TIGER_PUBLIC_KEY = U("MIGfMA0GCSqGSIb3DQEBAQUAA
                            "MidihTvHHf+tJ0PYD0o3PruI0hl3qhEjHTAxb75T5YD3SGK4IBhHn/Rk6mhqlGgI+bBrBVYaXixm"
                            "HfRo75RpUUuWACyeqQkZckgR0McxuW9xRMIa2cXZOoL1E4SL4lXKGhKoWbwIDAQAB");
 
+static utility::string_t TIGER_HOST = U("openapi.tigerfintech.com");
+static utility::string_t SANDBOX_TIGER_HOST = U("openapi-sandbox.tigerfintech.com");
+static utility::string_t US_TIGER_HOST = U("openapi.tradeup.com");
+
 /** HTTP interface service address **/
-static utility::string_t TIGER_SERVER_URL = U("https://openapi.tigerfintech.com/gateway");
-static utility::string_t SANDBOX_TIGER_SERVER_URL = U("https://openapi-sandbox.tigerfintech.com/gateway");
+static utility::string_t TIGER_SERVER_URL = U("https://") + TIGER_HOST + U("/gateway");
+static utility::string_t SANDBOX_TIGER_SERVER_URL = U("https://") + SANDBOX_TIGER_HOST + U("/gateway");
+static utility::string_t US_TIGER_SERVER_URL = U("https://") + US_TIGER_HOST + U("/gateway");
 
 /** Push service address **/ 
-static utility::string_t TIGER_SOCKET_HOST = U("openapi.tigerfintech.com");
-static utility::string_t SANDBOX_TIGER_SOCKET_HOST = U("openapi-sandbox.tigerfintech.com");
+static utility::string_t TIGER_SOCKET_HOST = TIGER_HOST;
+static utility::string_t SANDBOX_TIGER_SOCKET_HOST = SANDBOX_TIGER_HOST;
+static utility::string_t US_TIGER_SOCKET_HOST = US_TIGER_HOST;
 static utility::string_t TIGER_SOCKET_PORT = U("9883");
 static utility::string_t SANDBOX_TIGER_SOCKET_PORT = U("9885");
+static utility::string_t US_TIGER_SOCKET_PORT = U("9983");
 
 #define DEFAULT_TOKEN_FILE U("tiger_openapi_token.properties")
 #define DEFAULT_PROPS_FILE U("tiger_openapi_config.properties")

include/tigerapi/enums.h

@@ -41,6 +41,30 @@ namespace TIGER_API {
         }
     }
 
+    enum class License {
+        TBNZ,
+        TBSG,
+        TBHK,
+        TBAU,
+        TBUS
+    };
+
+    inline utility::string_t enum_to_str(License license) {
+        switch (license) {
+            case License::TBNZ:
+                return U("TBNZ");
+            case License::TBSG:
+                return U("TBSG");
+            case License::TBHK:
+                return U("TBHK");
+            case License::TBAU:
+                return U("TBAU");
+            case License::TBUS:
+                return U("TBUS");
+            default:
+                return U("");
+        }
+    }
 
     enum class TradingSession {
         PreMarket,  // PreMarket

include/tigerapi/version.h

@@ -5,6 +5,6 @@
 #ifndef TIGERAPI_VERSION_H
 #define TIGERAPI_VERSION_H
 
-#define PROJECT_VERSION "1.0.4"
+#define PROJECT_VERSION "1.1.0"
 
 #endif //TIGERAPI_VERSION_H

src/client_config.cpp

@@ -1,5 +1,6 @@
 #include "../include/tigerapi/client_config.h"
 #include "../include/tigerapi/properties.h"
+#include "../include/tigerapi/enums.h"
 
 TIGER_API::ClientConfig::ClientConfig(bool sandbox_debug /*= false*/)
 	: sandbox_debug(sandbox_debug) {
@@ -8,13 +9,22 @@ TIGER_API::ClientConfig::ClientConfig(bool sandbox_debug /*= false*/)
 		// server_url = SANDBOX_TIGER_SERVER_URL;
 		// server_public_key = SANDBOX_TIGER_PUBLIC_KEY;
 	}
+    if (is_us()) {
+        server_url = US_TIGER_SERVER_URL;
+        socket_url = US_TIGER_SOCKET_HOST;
+        socket_port = US_TIGER_SOCKET_PORT;
+    }
 };
 
 TIGER_API::ClientConfig::ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t account)
 	: tiger_id(std::move(tiger_id)),
 	private_key(std::move(private_key)),
 	account(std::move(account)) {
-
+    if (is_us()) {
+        server_url = US_TIGER_SERVER_URL;
+        socket_url = US_TIGER_SOCKET_HOST;
+        socket_port = US_TIGER_SOCKET_PORT;
+    }
 };
 
 TIGER_API::ClientConfig::ClientConfig(utility::string_t tiger_id, utility::string_t private_key, utility::string_t account, bool sandbox_debug /*= false*/, utility::string_t lang /*= U("en_US")*/)
@@ -30,13 +40,24 @@ TIGER_API::ClientConfig::ClientConfig(utility::string_t tiger_id, utility::strin
 		// socket_url = SANDBOX_TIGER_SOCKET_HOST;
 		// socket_port = SANDBOX_TIGER_SOCKET_PORT;
 	}
+    if (is_us()) {
+        server_url = US_TIGER_SERVER_URL;
+        socket_url = US_TIGER_SOCKET_HOST;
+        socket_port = US_TIGER_SOCKET_PORT;
+    }
 };
 
 TIGER_API::ClientConfig::ClientConfig(bool sandbox_debug, const utility::string_t props_path)
 	: sandbox_debug(sandbox_debug),
 	props_path(props_path) {
-	load_props();
+    load_props();
 	load_token();
+    if (is_us()) {
+        server_url = US_TIGER_SERVER_URL;
+        socket_url = US_TIGER_SOCKET_HOST;
+        socket_port = US_TIGER_SOCKET_PORT;
+    }
+    LOG(INFO) << U("ClientConfig initialized with props_path: ") << props_path << endl;
 };
 
 void TIGER_API::ClientConfig::check()
@@ -176,6 +197,9 @@ void TIGER_API::ClientConfig::load_token()
 	if (full_path.empty()) {
 		return;
 	}
+    if (!std::filesystem::exists(Utils::str16to8(full_path))) {
+        return;
+    }
 	try {
 		std::ifstream file(Utils::str16to8(full_path));
 		if (!file.is_open()) {
@@ -219,3 +243,8 @@ void TIGER_API::ClientConfig::save_token(const utility::string_t& new_token)
 		LOG(ERROR) << U("Failed to save token file: ") << Utils::str8to16(e.what()) << endl;
 	}
 }
+
+bool TIGER_API::ClientConfig::is_us()
+{
+    return !license.empty() && license == enum_to_str(License::TBUS);
+}

src/push_socket/push_client_impl.cpp

@@ -39,6 +39,7 @@ TIGER_API::PushClientImpl::PushClientImpl(const TIGER_API::ClientConfig& client_
 void TIGER_API::PushClientImpl::connect()
 {
 	LOG(INFO) << "create a worker thread to perform asynchronous network connections";
+    LOG(INFO) << "conntect to: " << client_config_.get_socket_url() << " port: " << client_config_.get_socket_port();
 	// create a worker thread to perform asynchronous network connections
 	worker_thread_ = std::shared_ptr<std::thread>(new std::thread([this]
 	{