MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 23:40:57 +01:00
Code Issues Releases Wiki Activity

modules/federation/federation: Abstract the m::feds request process.

Browse source
This commit is contained in:
Jason Volk 2019-04-12 00:09:32 -07:00
parent 4cd8a0c80d
commit 2ce53fef3c
1 changed files with 73 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
modules/federation/federation.cc
View file

@ -18,7 +18,16 @@ IRCD_MODULE
namespace ircd::m::feds namespace ircd::m::feds
{ {
template<class T> struct request; template<class T>
struct request;
template<class T>
static bool
handler(const opts &, const closure &, std::list<request<T>> &);
template<class T>
static std::list<request<T>>
creator(const opts &, const std::function<T (request<T> &, const string_view &origin)> &);
} }
template<class T> template<class T>
@ -38,37 +47,27 @@ ircd::m::feds::request<T>::request(const std::function<T (request &)> &closure)
:T{closure(*this)} :T{closure(*this)}
{} {}
bool template<class T>
IRCD_MODULE_EXPORT std::list<m::feds::request<T>>
ircd::m::feds::version(const opts &opts, ircd::m::feds::creator(const opts &opts,
const closure &closure) const std::function<T (request<T> &, const string_view &origin)> &closure)
{ {
static const auto make_request{[] assert(opts.room_id);
(auto &request, const auto &origin) const m::room::origins origins
{ {
m::v1::version::opts opts; opts.room_id
opts.dynamic = false; };
opts.remote = string_view
{
request.origin, strlcpy{request.origin, origin}
};
return m::v1::version std::list<m::feds::request<T>> ret;
{ origins.for_each([&ret, &closure]
request.buf, std::move(opts)
};
}};
std::list<m::feds::request<m::v1::version>> reqs;
m::room::origins{opts.room_id}.for_each([&reqs]
(const string_view &origin) (const string_view &origin)
{ {
if(!server::errmsg(origin)) try if(!server::errmsg(origin)) try
{ {
reqs.emplace_back([&origin] ret.emplace_back([&closure, &origin]
(auto &request) (auto &request)
{ {
return make_request(request, origin); return closure(request, origin);
}); });
} }
catch(const std::exception &) catch(const std::exception &)
@ -77,6 +76,15 @@ ircd::m::feds::version(const opts &opts,
} }
}); });
return ret;
}
template<class T>
bool
ircd::m::feds::handler(const opts &opts,
const closure &closure,
std::list<request<T>> &reqs)
{
const auto when const auto when
{ {
now<steady_point>() + opts.timeout now<steady_point>() + opts.timeout
@ -100,8 +108,9 @@ ircd::m::feds::version(const opts &opts,
auto &req{*it}; try auto &req{*it}; try
{ {
const auto code{req.get()}; const auto code{req.get()};
const json::object &response{req}; const json::array &array{req.in.content};
if(!closure({req.origin, {}, response})) const json::object &object{req.in.content};
if(!closure({req.origin, {}, object, array}))
return false; return false;
} }
catch(const std::exception &) catch(const std::exception &)
@ -117,6 +126,35 @@ ircd::m::feds::version(const opts &opts,
return true; return true;
} }
bool
IRCD_MODULE_EXPORT
ircd::m::feds::version(const opts &opts,
const closure &closure)
{
static const auto make_request{[]
(auto &request, const auto &origin)
{
m::v1::version::opts opts;
opts.dynamic = false;
opts.remote = string_view
{
request.origin, strlcpy{request.origin, origin}
};
return m::v1::version
{
request.buf, std::move(opts)
};
}};
auto requests
{
creator<m::v1::version>(opts, make_request)
};
return handler(opts, closure, requests);
}
bool bool
IRCD_MODULE_EXPORT IRCD_MODULE_EXPORT
ircd::m::feds::state(const opts &opts, ircd::m::feds::state(const opts &opts,
@ -140,62 +178,12 @@ ircd::m::feds::state(const opts &opts,
}; };
}}; }};
std::list<m::feds::request<m::v1::state>> reqs; auto requests
m::room::origins{opts.room_id}.for_each([&reqs, &make_request]
(const string_view &origin)
{ {
if(!server::errmsg(origin)) try creator<m::v1::state>(opts, make_request)
{
reqs.emplace_back([&origin, &make_request]
(auto &request)
{
return make_request(request, origin);
});
}
catch(const std::exception &)
{
return;
}
});
const auto when
{
now<steady_point>() + opts.timeout
}; };
while(!reqs.empty()) return handler(opts, closure, requests);
{
auto next
{
ctx::when_any(begin(reqs), end(reqs))
};
if(!next.wait_until(when, std::nothrow))
break;
const auto it
{
next.get()
};
auto &req{*it}; try
{
const auto code{req.get()};
const json::object &response{req};
if(!closure({req.origin, {}, response}))
return false;
}
catch(const std::exception &)
{
const ctx::exception_handler eptr;
if(!closure({req.origin, eptr}))
return false;
}
reqs.erase(it);
}
return true;
} }
bool bool
@ -218,64 +206,18 @@ ircd::m::feds::head(const opts &opts,
}; };
}}; }};
std::list<m::feds::request<m::v1::make_join>> reqs; auto requests
m::room::origins{opts.room_id}.for_each([&reqs, &make_request]
(const string_view &origin)
{ {
if(!server::errmsg(origin)) try creator<m::v1::make_join>(opts, make_request)
{
reqs.emplace_back([&origin, &make_request]
(auto &request)
{
return make_request(request, origin);
});
}
catch(const std::exception &)
{
return;
}
});
const auto when
{
now<steady_point>() + opts.timeout
}; };
while(!reqs.empty()) return handler(opts, closure, requests);
{
auto next
{
ctx::when_any(begin(reqs), end(reqs))
};
if(!next.wait_until(when, std::nothrow))
break;
const auto it
{
next.get()
};
auto &req{*it}; try
{
const auto code{req.get()};
const json::object &response{req};
if(!closure({req.origin, {}, response}))
return false;
}
catch(const std::exception &)
{
const ctx::exception_handler eptr;
if(!closure({req.origin, eptr}))
return false;
}
reqs.erase(it);
}
return true;
} }
//
// legacy
//
extern "C" void extern "C" void
feds__event(const m::event::id &event_id, std::ostream &out) feds__event(const m::event::id &event_id, std::ostream &out)
{ {