Merge branch 'feature_tcp_client_sukai' of git.tigerbrokers.net:server/openapi/openapi-cpp-sdk into feature_tcp_client_sukai

Author: tigersk

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -460,20 +460,32 @@ void asset_changed_callback(const tigeropen::push::pb::AssetData& data) {
 	ucout << "- cashbalance: " << data.cashbalance() << std::endl;
 }
 
+std::atomic<bool> keep_running(true);
+void signal_handler(int signal)
+{
+	if (signal == SIGINT || signal == SIGTERM)
+    {
+		keep_running = false;
+	}
+}
+
 int main()
 {
     /************************** set config **********************/
-    ClientConfig config = ClientConfig();
-#if 1
-	// config.private_key = U("");
-	// config.tiger_id = U("");
-	// config.account = U("");
-#else
-	config.private_key = U("");
-	config.tiger_id = U("");
-	config.account = U("");
-#endif
-
+    bool sandbox_debug = false;
+    ClientConfig config = ClientConfig(sandbox_debug);
+    if (sandbox_debug)
+    {
+		config.private_key = U("");
+		config.tiger_id = U("");
+		config.account = U("");
+    }
+    else
+    {
+		config.private_key = U("");
+		config.tiger_id = U("");
+		config.account = U("");
+    }
 
 	auto push_client = IPushClient::create_push_client(config);
     push_client->set_position_changed_callback(std::function<void(const tigeropen::push::pb::PositionData&)>(position_changed_callback));
@@ -485,20 +497,6 @@ int main()
     push_client->subscribe_asset("");
 
     push_client->connect();
-	std::string input;
-	while (true)
-    {
-		std::cout << "Enter command (type 'exit' to quit): ";
-		std::getline(std::cin, input);
-
-		if (input == "exit") {
-			std::cout << "Exiting loop." << std::endl;
-            // push_client->disconnect();
-			break;
-		}
-		// Process other commands or input here
-		std::cout << "You entered: " << input << std::endl;
-	}
 
     //config.lang = U("en_US");
 
@@ -520,8 +518,15 @@ int main()
       */
       //    std::shared_ptr<TigerClient> tigerapi = std::make_shared<TigerClient>(config);
       //    TestTigerApi::test_grab_quote_permission(tigerapi);
+	
+	std::signal(SIGINT, signal_handler);  //Ctrl+C
+	std::signal(SIGTERM, signal_handler); //kill
+	while (keep_running)
+    {
+		std::this_thread::sleep_for(std::chrono::seconds(1));
+	}
 
-
+    push_client->disconnect();
 
     return 0;
 }

include/tigerapi/push_client.h

@@ -54,6 +54,7 @@ namespace TIGER_API
 
 		virtual void set_query_subscribed_symbols_changed_callback(const std::function<void(const tigeropen::push::pb::Response& query_subscribed_symbols_response)>& cb) = 0;
 		virtual void query_subscribed_symbols() = 0;
+		
 		virtual void set_quote_changed_callback(const std::function<void(const tigeropen::push::pb::QuoteBasicData&)>& cb) = 0;
 		virtual bool subscribe_quote(const std::vector<std::string>& symbols) = 0;
 		virtual bool subscribe_future_quote(const std::vector<std::string>& symbols) = 0;
@@ -90,10 +91,6 @@ namespace TIGER_API
 		virtual void set_option_top_changed_callback(const std::function<void(const tigeropen::push::pb::OptionTopData&)>& cb) = 0;
 		virtual bool subscribe_option_top(const std::string& market) = 0;
 		virtual bool unsubscribe_option_top(const std::string& market) = 0;
-
-
-		
-		//TODO:other
 	};
 }
 

src/push_socket/push_socket.cpp

@@ -84,6 +84,7 @@ void TIGER_API::PushSocket::disconnect()
 {
 	if (keep_alive_timer_)
 	{
+		LOG(INFO) << "stop keep alive scheduled task";
 		boost::system::error_code ec;
 		keep_alive_timer_->cancel(ec);
 		if (ec)
@@ -173,6 +174,7 @@ void TIGER_API::PushSocket::close_session()
 		bool open = socket_->lowest_layer().is_open();
 		if (open)
 		{
+			LOG(INFO) << "socket shutdown both";
 			boost::system::error_code ec;
 			socket_->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
 			if (ec)
@@ -181,20 +183,26 @@ void TIGER_API::PushSocket::close_session()
 				dispatch_inner_error_callback(ec.message());
 			}
 
+			LOG(INFO) << "socket execute close";
 			socket_->lowest_layer().close(ec);
 			if (ec)
 			{
 				LOG(ERROR) << ec;
 				dispatch_inner_error_callback(ec.message());
 			}
 		}
+		else
+		{
+			LOG(INFO) << "socket already closed";
+		}
 	}
 	catch (const boost::system::system_error& e)
 	{
 		LOG(ERROR) << e.what();
 		dispatch_inner_error_callback(e.what());
 	}
 
+	LOG(INFO) << "socket close success";
 	dispatch_disconnected_callback();
 }
 
@@ -268,6 +276,7 @@ void TIGER_API::PushSocket::auto_reconnect()
 
 void TIGER_API::PushSocket::cancel_reconnect_timer()
 {
+	LOG(INFO) << "stop auto reconnect scheduled task";
 	if (reconnect_timer_)
 	{
 		boost::system::error_code ec;