Timeout implementation

Author: RicardRC

core/common/BaseClient.h

@@ -476,12 +476,13 @@ namespace Nakama {
         ) override;
 
     protected:
-        int _port;
-        std::string _host;
+        int _port = -1;
+        int _timeout = -1;
         bool _ssl = false;
+        std::string _host;
         std::string _basicAuthMetadata;
-        ErrorCallback _defaultErrorCallback;
         void* _userData = nullptr;
+        ErrorCallback _defaultErrorCallback;
         NPlatformParameters _platformParams;
     };
 }

core/core-rest/RestClient.cpp

@@ -72,6 +72,7 @@ RestClient::RestClient(const NClientParameters& parameters, NHttpTransportPtr ht
     _ssl = parameters.ssl;
     _platformParams = parameters.platformParams;
     _port = parameters.port;
+    _timeout = parameters.timeout;
     std::string baseUrl;
 
 
@@ -86,6 +87,11 @@ RestClient::RestClient(const NClientParameters& parameters, NHttpTransportPtr ht
 
     _httpClient->setBaseUri(baseUrl);
 
+    if (_timeout >= 0)
+    {
+        _httpClient->setTimeout(_timeout);
+    }
+
     _basicAuthMetadata = "Basic " + base64Encode(parameters.serverKey + ":");
 }
 

impl/httpCppRest/NHttpClientCppRest.cpp

@@ -92,6 +92,17 @@ void NHttpClientCppRest::setBaseUri(const std::string& uri)
     _client = std::make_unique<http_client>(http_client(FROM_STD_STR(uri)));
 }
 
+
+
+void NHttpClientCppRest::setTimeout(int seconds)
+{
+    if(_client.get())
+    {
+		// _client->set_timeout(_timeout);
+		_client->setHttpResponseTimeout(seconds);
+	}
+}
+
 void NHttpClientCppRest::tick()
 {
     ReqContextPtr ctx;

impl/httpCppRest/NHttpClientCppRest.h

@@ -39,6 +39,8 @@ namespace Nakama {
 
         void setBaseUri(const std::string& uri) override;
 
+        void setTimeout(int seconds) override;
+
         void tick() override;
 
         void request(const NHttpRequest& req, const NHttpResponseCallback& callback = nullptr) override;

impl/httpCurl/NHttpClientLibCurl.cpp

@@ -120,6 +120,16 @@ void NHttpClientLibCurl::request(const NHttpRequest& req, const NHttpResponseCal
         return;
     }
 
+    if (_timeout >= 0)
+    {
+        curl_code = curl_easy_setopt(curl_easy.get(), CURLOPT_TIMEOUT, _timeout);
+        if (curl_code != CURLE_OK)
+        {
+            handle_curl_easy_set_opt_error("setting timeout", curl_code, callback);
+            return;
+        }
+    }
+
     curl_code = curl_easy_setopt(curl_easy.get(), CURLOPT_HTTPHEADER, headers_list);
     if (curl_code != CURLE_OK)
     {
@@ -206,6 +216,11 @@ void NHttpClientLibCurl::setBaseUri(const std::string& uri)
     _base_uri = uri;
 }
 
+void NHttpClientLibCurl::setTimeout(int seconds)
+{
+    _timeout = seconds;
+}
+
 void NHttpClientLibCurl::tick()
 {
     std::unique_lock lock(_mutex, std::try_to_lock);

impl/httpCurl/NHttpClientLibCurl.h

@@ -35,12 +35,14 @@ namespace Nakama {
             NHttpClientLibCurl(const NPlatformParameters& platformParameters);
 
             void setBaseUri(const std::string& uri) override;
+            void setTimeout(int seconds) override;
             void tick() override;
             void request(const NHttpRequest& req, const NHttpResponseCallback& callback = nullptr) noexcept override;
             void cancelAllRequests() override;
         private:
             std::unique_ptr<CURLM, decltype(&curl_multi_cleanup)> _curl_multi;
             std::string _base_uri;
+            int _timeout = -1;
             // TODO implement curl_easy reuse.
             // TODO would be more performant but less safe as a map with CURL* as key
             std::list<std::pair<std::unique_ptr<CURL, decltype(&curl_easy_cleanup)>, std::unique_ptr<NHttpClientLibCurlContext>>> _contexts;

impl/httpLibHttpClient/NHttpClientLibHC.cpp

@@ -107,6 +107,11 @@ void NHttpClientLibHC::setBaseUri(const std::string& uri)
     m_baseUri = uri;
 }
 
+void NHttpClientLibHC::setTimeout(int seconds)
+{
+	HCHttpCallRequestSetTimeout(nullptr, seconds);
+}
+
 #define CHECK_CB(exp, msg, cb) { \
     HRESULT hr = exp; if (FAILED(hr)) { \
         HC_TRACE_ERROR_HR(httpTransportLibHC, hr, msg); \

impl/httpLibHttpClient/NHttpClientLibHC.h

@@ -32,6 +32,8 @@ namespace Nakama {
 
         void setBaseUri(const std::string& uri) override;
 
+        void setTimeout(int seconds) override;
+
         void tick() override;
 
         void request(const NHttpRequest& req, const NHttpResponseCallback& callback = nullptr) override;

interface/include/nakama-cpp/ClientFactory.h

@@ -46,6 +46,10 @@ NAKAMA_NAMESPACE_BEGIN
         /// See the server documentation for more information.
         bool ssl = false;
 
+        /// Set request timeout in seconds for individual calls
+        /// -1 or other negative number to leave the default
+        int timeout = -1;
+
         /// Platform specific parameters
 #ifdef DEFAULT_PLATFORM_PARAMS
         NPlatformParameters platformParams = {};

interface/include/nakama-cpp/NHttpTransportInterface.h

@@ -74,6 +74,8 @@ NAKAMA_NAMESPACE_BEGIN
 
         virtual void setBaseUri(const std::string& uri) = 0;
 
+        virtual void setTimeout(int seconds) = 0;
+
         virtual void tick() = 0;
 
         /**