MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-29 00:03:45 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:feds: Migrate feds::perspective() to interface.

Browse source
This commit is contained in:
Jason Volk 2019-04-12 00:53:32 -07:00
parent 06e381ce2b
commit 360cc01dc8
4 changed files with 71 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/m/feds.h
View file

@ -34,6 +34,7 @@ namespace ircd::m::feds
bool event(const opts &, const closure &);
bool state(const opts &, const closure &);
bool version(const opts &, const closure &);
bool perspective(const opts &, const closure &);
};
struct ircd::m::feds::result

14
ircd/m.cc
View file

@ -1045,6 +1045,20 @@ ircd::m::app::exists(const string_view &id)
// m/feds.h
//
bool
ircd::m::feds::perspective(const opts &o,
const closure &c)
{
using prototype = bool (const opts &, const closure &);
static mods::import<prototype> call
{
"federation_federation", "ircd::m::feds::perspective"
};
return call(o, c);
}
bool
ircd::m::feds::version(const opts &o,
const closure &c)

42
modules/console.cc
View file

@ -10365,34 +10365,36 @@ console_cmd__feds__perspective(opt &out, const string_view &line)
param.at(2)
};
using closure_prototype = bool (const string_view &,
std::exception_ptr,
const json::array &);
using prototype = void (const m::room::id &,
const m::v1::key::server_key &,
const milliseconds &,
const std::function<closure_prototype> &);
static mods::import<prototype> feds__perspective
{
"federation_federation", "feds__perspective"
};
const m::v1::key::server_key server_key
{
server_name, key_id
};
feds__perspective(room_id, server_key, out.timeout, [&out]
(const string_view &origin, std::exception_ptr eptr, const json::array &keys)
m::feds::opts opts;
opts.timeout = out.timeout;
opts.room_id = room_id;
opts.arg[0] = server_key.first;
opts.arg[1] = server_key.second;
m::feds::perspective(opts, [&out](const auto &result)
{
if(eptr)
return true;
out << std::setw(32) << trunc(result.origin, 32) << " :";
for(const json::object &_key : keys)
if(result.eptr)
{
const m::keys &key{_key};
out << what(result.eptr)
<< std::endl;
return true;
}
const json::array &server_keys
{
result.object["server_keys"]
};
for(const json::object &server_key : server_keys)
{
const m::keys &key{server_key};
out << key << std::endl;
}

139
modules/federation/federation.cc
View file

@ -50,6 +50,40 @@ struct ircd::m::feds::request
// m/feds.h
//
bool
IRCD_MODULE_EXPORT
ircd::m::feds::perspective(const opts &opts,
const closure &closure)
{
const auto make_request{[&opts]
(auto &request, const auto &origin)
{
m::v1::key::query::opts v1opts;
v1opts.dynamic = false;
v1opts.remote = string_view
{
request.origin, strlcpy{request.origin, origin}
};
const m::v1::key::server_key server_key
{
opts.arg[0], opts.arg[1]
};
return m::v1::key::query
{
{&server_key, 1}, request.buf, std::move(v1opts)
};
}};
auto requests
{
creator<m::v1::key::query>(opts, make_request)
};
return handler(opts, closure, requests);
}
bool
IRCD_MODULE_EXPORT
ircd::m::feds::version(const opts &opts,
@ -431,108 +465,3 @@ feds__backfill(const m::room::id &room_id,
out << "| " << req.origin << std::endl;
}
}
namespace ircd::m::feds::v1
{
struct perspective;
}
struct ircd::m::feds::v1::perspective
:m::v1::key::query
{
using closure = std::function<bool (const string_view &, std::exception_ptr, const json::array &)>;
char origin[256];
char buf[24_KiB];
perspective(const string_view &origin,
const m::v1::key::server_key &server_key)
:m::v1::key::query{[&]
{
m::v1::key::opts opts;
opts.dynamic = false;
opts.remote = string_view{this->origin, strlcpy(this->origin, origin)};
return m::v1::key::query
{
{&server_key, 1}, mutable_buffer{buf}, std::move(opts)
};
}()}
{}
perspective(perspective &&) = delete;
perspective(const perspective &) = delete;
};
std::list<m::feds::v1::perspective>
feds__perspective(const m::room::id &room_id,
const m::v1::key::server_key &server_key)
{
std::list<m::feds::v1::perspective> reqs;
m::room::origins{room_id}.for_each([&reqs, &server_key]
(const string_view &origin)
{
const auto emsg
{
ircd::server::errmsg(origin)
};
if(!emsg) try
{
reqs.emplace_back(origin, server_key);
}
catch(const std::exception &)
{
return;
}
});
return std::move(reqs);
}
extern "C" void
feds__perspective(const m::room::id &room_id,
const m::v1::key::server_key &server_key, // pair<server_name, key_id>
const milliseconds &timeout,
const m::feds::v1::perspective::closure &closure)
{
auto reqs
{
feds__perspective(room_id, server_key)
};
auto when
{
now<steady_point>() + timeout
};
while(!reqs.empty())
{
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::array &response{req};
if(!closure(req.origin, {}, response))
break;
}
catch(const std::exception &)
{
if(!closure(req.origin, std::current_exception(), {}))
break;
}
reqs.erase(it);
}
}