18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-21 21:24:58 +01:00

fix(editor): the closing doesn't wait for a geoportal service that doesn't answer (#432)

* fix(editor): the closing doesn't wait for a geoportal service that doesn't answer

When geoportal.gov.pl took the connection and never answered, the
editor's closing stood still for tens of seconds and was killed: the
WinHTTP client was synchronous and looked at the stop only between the
reads of a body, so a request waiting for the answer held the closing
for the timeouts (up to 20 s for the answer, a few tries a square),
and the map of the place-picker downloaded with no stop at all, its
std::async future waited for to the end.

On Windows the client now uses WinHTTP asynchronously: each step is
waited for while the stop is looked at every 50 ms, and a stop closes
the request at once. The timeouts, the user agent, the size limit, the
errors and the body of a response with an error status stay as they
were. The map of the place-picker is given up when it goes. libcurl
looked at the stop during the whole transfer already.

The unit tests run the client against a local server that never
answers (given up within 0.4 s of the stop), one with a body of
100 kB and one with an error status.

* fix(editor): the capabilities of a WMS service being added don't hold the closing either

The reading of the layers of a WMS service the user adds ran on a
std::async future of the editor with no stop: closing the editor while
such a service didn't answer waited for its three tries. The reading
is given up when the editor goes, as the other downloads now are, and
editor_http_get, left with no callers, goes.

The unit test's silent server no longer waits for the client to close
its connection, and the requests to the local server are skipped when
the environment names a proxy, which couldn't reach it.

* fix(editor): the stop of the WMS reading outlives the future waiting for it

The flag was declared after the future of the reading, so it was
destroyed first while the future's destructor still waited for the
task reading it.

---------

Co-authored-by: maj00r <maj00r@host>
This commit is contained in:
maj00r
2026-11-21 10:40:07 +01:00
committed by GitHub
parent c556c4c8fd
commit 988c0af589
9 changed files with 363 additions and 74 deletions

View File

@@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h"
#include "editor/editorGeoMap.hpp"
#include "editor/editorFormat.hpp"
#include "editor/editorHttp.hpp"
#include "editor/editorOrthophoto.hpp"
#include "utilities/translation.h"
@@ -164,6 +165,8 @@ bool parse_place(std::string const &Text, glm::dvec2 &Point)
editor_map::~editor_map()
{
// the download running is broken off rather than waited for to its end or its timeout
m_closing = true;
if (m_request.valid())
m_request.wait();
release();
@@ -328,12 +331,13 @@ void editor_map::request(glm::vec2 const &Size)
char bbox[160];
std::snprintf(bbox, sizeof(bbox), "%.1f,%.1f,%.1f,%.1f", low.x, low.y, high.x, high.y);
auto const url{kMapService + "?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=osm&STYLES=&SRS=EPSG:2180&BBOX=" + bbox + "&WIDTH=" + std::to_string(width) + "&HEIGHT=" + std::to_string(height) + "&FORMAT=image/png"};
m_request = std::async(std::launch::async, [url, low, high]() {
m_request = std::async(std::launch::async, [url, low, high, closing = &m_closing]() {
image result;
result.low = low;
result.high = high;
std::vector<std::uint8_t> data;
if (false == editor_http_get(url, data, result.error))
thread_local editor_http::client client;
if (false == client.get(url, data, result.error, [closing]() { return closing->load(); }))
return result;
int w{0}, h{0}, components{0};
// the texture loader turns the stb flip on for the whole process only once it loads its first texture: this thread

View File

@@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once
#include <atomic>
#include <cstdint>
#include <future>
#include <string>
@@ -86,6 +87,7 @@ class editor_map
glm::vec2 m_pressed{0.f};
bool m_dragging{false};
std::future<image> m_request;
std::atomic<bool> m_closing{false}; // the download of the map is given up: the map goes
std::uint64_t m_texture{0};
glm::dvec2 m_image_low{0.0};
glm::dvec2 m_image_high{0.0};

View File

@@ -45,15 +45,209 @@ struct client::platform
#if defined(_WIN32)
namespace
{
DWORD constexpr kStopCheck{50}; // ms between the looks at whether the transfer is to be given up
// what the callback of WinHTTP hands over to the thread waiting for it
struct transfer_state
{
HANDLE done{::CreateEventW(nullptr, FALSE, FALSE, nullptr)}; // the operation begun finished or failed
HANDLE closed{::CreateEventW(nullptr, TRUE, FALSE, nullptr)}; // the request is called back no more
DWORD error{ERROR_SUCCESS}; // of the operation that failed
DWORD size{0}; // bytes available or read
transfer_state() = default;
transfer_state(transfer_state const &) = delete;
transfer_state &operator=(transfer_state const &) = delete;
~transfer_state()
{
if (done != nullptr)
::CloseHandle(done);
if (closed != nullptr)
::CloseHandle(closed);
}
};
void CALLBACK on_status(HINTERNET, DWORD_PTR const Context, DWORD const Status, LPVOID const Info, DWORD const Length)
{
auto *state{reinterpret_cast<transfer_state *>(Context)};
if (state == nullptr)
return;
switch (Status)
{
case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE:
case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE:
break;
case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE:
state->size = *static_cast<DWORD const *>(Info);
break;
case WINHTTP_CALLBACK_STATUS_READ_COMPLETE:
state->size = Length;
break;
case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR:
state->error = static_cast<WINHTTP_ASYNC_RESULT const *>(Info)->dwError;
break;
case WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING:
::SetEvent(state->closed);
return;
default:
return;
}
::SetEvent(state->done);
}
// one GET on a connection of its own. the steps of WinHTTP are asynchronous and waited for while the stop is looked at, so a
// transfer is given up at once also while a service keeps the connection waiting: the closing of the editor doesn't wait for
// the timeouts of a service that doesn't answer
class transfer
{
public:
transfer(stop_check const &Stop, std::string &Error) :
m_stop(Stop),
m_error(Error)
{
}
~transfer()
{
close();
}
transfer(transfer const &) = delete;
transfer &operator=(transfer const &) = delete;
bool open(HINTERNET const Session, std::wstring const &Host, INTERNET_PORT const Port, std::wstring const &Path, bool const Secure)
{
if (m_state.done == nullptr || m_state.closed == nullptr)
return failed(::GetLastError());
m_connection = ::WinHttpConnect(Session, Host.c_str(), Port, 0);
if (m_connection == nullptr)
return failed(::GetLastError());
m_request = ::WinHttpOpenRequest(m_connection, L"GET", Path.c_str(), nullptr, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, Secure ? WINHTTP_FLAG_SECURE : 0);
if (m_request == nullptr)
return failed(::GetLastError());
auto context{reinterpret_cast<DWORD_PTR>(&m_state)};
if (false == ::WinHttpSetOption(m_request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)))
return failed(::GetLastError());
if (::WinHttpSetStatusCallback(m_request, on_status, WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_FLAG_HANDLES, 0) == WINHTTP_INVALID_STATUS_CALLBACK)
return failed(::GetLastError());
m_called_back = true;
return true;
}
bool send()
{
return step([this]() { return ::WinHttpSendRequest(m_request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, reinterpret_cast<DWORD_PTR>(&m_state)); });
}
bool receive()
{
return step([this]() { return ::WinHttpReceiveResponse(m_request, nullptr); });
}
DWORD status() const
{
DWORD status{0};
DWORD size{sizeof(status)};
::WinHttpQueryHeaders(m_request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, WINHTTP_HEADER_NAME_BY_INDEX, &status, &size, WINHTTP_NO_HEADER_INDEX);
return status;
}
// the whole body of the response
bool read_all(std::vector<std::uint8_t> &Out)
{
while (true)
{
if (m_stop())
{
m_error = "cancelled";
return false;
}
if (false == step([this]() { return ::WinHttpQueryDataAvailable(m_request, nullptr); }))
return false;
auto const available{m_state.size};
if (available == 0)
return true;
if (Out.size() + available > kLargest)
{
m_error = kTooLarge;
Out.clear();
return false;
}
auto const offset{Out.size()};
Out.resize(offset + available);
auto const read{step([this, &Out, offset, available]() { return ::WinHttpReadData(m_request, Out.data() + offset, available, nullptr); })};
Out.resize(offset + (read ? m_state.size : 0));
if (false == read)
return false;
}
}
void close()
{
if (m_request != nullptr)
{
::WinHttpCloseHandle(m_request);
m_request = nullptr;
// the closing is the last callback: after it the state, and the buffer of a read broken off, are no longer written to
if (m_called_back)
::WaitForSingleObject(m_state.closed, INFINITE);
m_called_back = false;
}
if (m_connection != nullptr)
{
::WinHttpCloseHandle(m_connection);
m_connection = nullptr;
}
}
private:
bool failed(DWORD const Code)
{
m_error = "WinHTTP error " + std::to_string(Code);
return false;
}
// begins an operation and waits for it: false when it failed, or a stop was asked for meanwhile
template <typename Begin> bool step(Begin const &Operation)
{
m_state.error = ERROR_SUCCESS;
if (false == Operation())
return failed(::GetLastError());
while (::WaitForSingleObject(m_state.done, kStopCheck) != WAIT_OBJECT_0)
{
if (m_stop())
{
// closed at once: the operation broken off doesn't write into the buffer any more once this returns
close();
m_error = "cancelled";
return false;
}
}
if (m_state.error != ERROR_SUCCESS)
return failed(m_state.error);
return true;
}
stop_check const &m_stop;
std::string &m_error;
transfer_state m_state;
HINTERNET m_connection{nullptr};
HINTERNET m_request{nullptr};
bool m_called_back{false}; // the closing of the request is called back
};
} // namespace
client::client() :
m_platform(std::make_unique<platform>())
{
wchar_t const *agent = L"MaSzyna-editor";
#ifdef WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY
m_platform->session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
m_platform->session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, WINHTTP_FLAG_ASYNC);
#endif
if (m_platform->session == nullptr) // automatic proxy needs windows 8.1+
m_platform->session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
m_platform->session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, WINHTTP_FLAG_ASYNC);
if (m_platform->session != nullptr)
::WinHttpSetTimeouts(m_platform->session, 10000, 10000, 15000, 20000);
}
@@ -94,64 +288,13 @@ bool client::get(std::string const &Url, std::vector<std::uint8_t> &Out, std::st
std::wstring const host(parts.lpszHostName, parts.dwHostNameLength);
std::wstring const path = std::wstring(parts.lpszUrlPath, parts.dwUrlPathLength) + std::wstring(parts.lpszExtraInfo, parts.dwExtraInfoLength);
HINTERNET connection = ::WinHttpConnect(m_platform->session, host.c_str(), parts.nPort, 0);
HINTERNET request = connection ? ::WinHttpOpenRequest(connection, L"GET", path.c_str(), nullptr, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES,
parts.nScheme == INTERNET_SCHEME_HTTPS ? WINHTTP_FLAG_SECURE : 0)
: nullptr;
auto const close = [&]() {
if (request != nullptr)
::WinHttpCloseHandle(request);
if (connection != nullptr)
::WinHttpCloseHandle(connection);
};
if (request == nullptr || !::WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0) || !::WinHttpReceiveResponse(request, nullptr))
{
Error = "WinHTTP error " + std::to_string(::GetLastError());
close();
transfer request{Stop, Error};
if (false == request.open(m_platform->session, host, parts.nPort, path, parts.nScheme == INTERNET_SCHEME_HTTPS) || false == request.send() || false == request.receive())
return false;
}
DWORD status{0};
DWORD statussize{sizeof(status)};
::WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, WINHTTP_HEADER_NAME_BY_INDEX, &status, &statussize, WINHTTP_NO_HEADER_INDEX);
for (;;)
{
if (Stop())
{
Error = "cancelled";
close();
return false;
}
DWORD available{0};
if (!::WinHttpQueryDataAvailable(request, &available))
{
Error = "WinHTTP error " + std::to_string(::GetLastError());
close();
return false;
}
if (available == 0)
break;
if (Out.size() + available > kLargest)
{
Error = kTooLarge;
close();
Out.clear();
return false;
}
std::size_t const offset = Out.size();
Out.resize(offset + available);
DWORD received{0};
if (!::WinHttpReadData(request, Out.data() + offset, available, &received))
{
Error = "WinHTTP error " + std::to_string(::GetLastError());
close();
return false;
}
Out.resize(offset + received);
}
close();
auto const status{request.status()};
if (false == request.read_all(Out))
return false;
request.close();
if (status != 200)
{

View File

@@ -63,12 +63,6 @@ double steady_seconds()
} // namespace
bool editor_http_get(std::string const &Url, std::vector<std::uint8_t> &Out, std::string &Error)
{
thread_local http_client client;
return client.get(Url, Out, Error, []() { return false; });
}
namespace
{
@@ -688,7 +682,7 @@ std::string xml_element(std::string const &Xml, std::string const &Tag, std::siz
} // namespace
editor_orthophoto::service_info editor_orthophoto::describe(std::string const &Service)
editor_orthophoto::service_info editor_orthophoto::describe(std::string const &Service, std::function<bool()> const &Stop)
{
service_info info;
auto url{Service};
@@ -700,8 +694,10 @@ editor_orthophoto::service_info editor_orthophoto::describe(std::string const &S
// a few tries, the services drop connections and time out now and then
std::vector<std::uint8_t> data;
auto read{false};
for (int attempt = 0; attempt < 3 && false == read; ++attempt)
read = editor_http_get(url, data, info.error);
stop_check const stopping{Stop ? Stop : stop_check{[]() { return false; }}};
thread_local http_client client;
for (int attempt = 0; attempt < 3 && false == read && false == stopping(); ++attempt)
read = client.get(url, data, info.error, stopping);
if (false == read)
return info;
info.error.clear();

View File

@@ -28,8 +28,6 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/Classes.h" // material_handle
#include "rendering/geometrybank.h" // gfx::geometry_handle
bool editor_http_get(std::string const &Url, std::vector<std::uint8_t> &Out, std::string &Error);
namespace scene
{
class basic_region;
@@ -183,7 +181,8 @@ class editor_orthophoto
bool puwg{false};
std::string error;
};
static service_info describe(std::string const &Service);
// Stop: true to give the reading up
static service_info describe(std::string const &Service, std::function<bool()> const &Stop = {});
static std::string cache_directory();
private: