Timeout error message

Author: ianthomas23

src/wasm/constants.hpp

@@ -8,4 +8,4 @@
 // Environment variable for http transport timeout.
 // Must be a positive number as a timeout of 0 will block forever.
 inline constexpr std::string_view WASM_HTTP_TRANSPORT_TIMEOUT_NAME = "GIT_HTTP_TIMEOUT";
-inline constexpr unsigned int WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT = 10;
+inline constexpr unsigned int WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT_S = 10;

src/wasm/stream.cpp

@@ -8,6 +8,7 @@
 #    include <emscripten.h>
 
 #    include "../utils/common.hpp"
+#    include "constants.hpp"
 #    include "response.hpp"
 
 // Buffer size used in transport_smart, hardcoded in libgit2.
@@ -106,7 +107,7 @@ EM_JS(
             // clang-format off
             Module["git2cpp_js_error"] = { name: err.name ?? "", message : err.message ?? "" };
             // clang-format on
-            console.error(err);
+            (err.name == "TimeoutError" ? console.warn : console.error)(err);
             return -1;
         }
     }
@@ -208,7 +209,7 @@ EM_JS(
             // clang-format off
             Module["git2cpp_js_error"] = { name: err.name ?? "", message : err.message ?? "" };
             // clang-format on
-            console.error(err);
+            (err.name == "TimeoutError" ? console.warn : console.error)(err);
             return -1;
         }
     }
@@ -245,7 +246,7 @@ EM_JS(size_t, js_write, (int request_index, const char* buffer, size_t buffer_si
         // clang-format off
         Module["git2cpp_js_error"] = { name: err.name ?? "", message : err.message ?? "" };
         // clang-format on
-        console.error(err);
+        (err.name == "TimeoutError" ? console.warn : console.error)(err);
         return -1;
     }
 });
@@ -273,6 +274,16 @@ static void convert_js_to_git_error(wasm_http_stream* stream)
             stream->m_unconverted_url.c_str()
         );
     }
+    else if (std::string_view(error_str).starts_with("TimeoutError:"))
+    {
+        git_error_set(
+            GIT_ERROR_HTTP,
+            "network request timed out connecting to %s. You can set a longer timeout in seconds using the environment variable %s, the default value is %u seconds.",
+            stream->m_unconverted_url.c_str(),
+            WASM_HTTP_TRANSPORT_TIMEOUT_NAME.data(),
+            WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT_S
+        );
+    }
     else
     {
         git_error_set(GIT_ERROR_HTTP, "%s", error_str);

src/wasm/utils.cpp

@@ -8,16 +8,16 @@
 
 unsigned long get_request_timeout_ms()
 {
-    double timeout_seconds = WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT;
+    double timeout_seconds = WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT_S;
     auto env_var = std::getenv(WASM_HTTP_TRANSPORT_TIMEOUT_NAME.data());
     if (env_var != nullptr)
     {
         try
         {
             auto value = std::stod(env_var);
-            if (value <= 0)
+            if (value < 1e-3)  // Must be at least 1 ms.
             {
-                throw std::runtime_error("negative or zero");
+                throw std::runtime_error("");  // Caught below.
             }
             timeout_seconds = value;
         }
@@ -28,7 +28,7 @@ unsigned long get_request_timeout_ms()
             std::cout << termcolor::yellow << "Warning: environment variable "
                       << WASM_HTTP_TRANSPORT_TIMEOUT_NAME
                       << " must be a positive number of seconds, using default value of "
-                      << WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT << " seconds instead." << termcolor::reset
+                      << WASM_HTTP_TRANSPORT_TIMEOUT_DEFAULT_S << " seconds instead." << termcolor::reset
                       << std::endl;
         }
     }