MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 00:32:35 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Candidate split room::state interface (const part).

Browse source
This commit is contained in:
Jason Volk 2018-02-10 00:25:20 -08:00
parent 9405166a7a
commit 23387155df
4 changed files with 291 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
include/ircd/m/room.h
View file

@ -75,6 +75,8 @@ struct ircd::m::room
{
struct state;
struct members;
struct messages;
struct origins;
using id = m::id::room;
using alias = m::id::room_alias;
@ -84,25 +86,13 @@ struct ircd::m::room
operator const id &() const { return room_id; }
// observer
string_view root(m::state::id_buffer &) const;
void for_each(const string_view &type, const event::closure &view) const;
bool test(const string_view &type, const event::closure_bool &view) const;
bool has(const string_view &type, const string_view &state_key) const;
bool has(const string_view &type) const;
// X
bool get(const event::closure &) const;
void for_each(const event::closure &) const;
bool get(const string_view &type, const string_view &state_key, const event::closure &) const;
bool get(const string_view &type, const event::closure &view) const;
bool get(const event::closure &view) const;
bool prev(const string_view &type, const string_view &state_key, const event::closure &) const;
bool prev(const string_view &type, const event::closure &view) const;
bool prev(const event::closure &view) const;
// observer misc
// misc
bool membership(const m::id::user &, const string_view &membership = "join") const;
// modify
room(const alias &, const event::id &event_id = {});
room(const id &room_id, const event::id &event_id = {})
:room_id{room_id}
@ -110,6 +100,46 @@ struct ircd::m::room
{}
};
/// Interface to room state.
///
/// This interface focuses specifically on the details of room state.
///
struct ircd::m::room::state
{
struct tuple;
m::room room;
// Get the state root node ID
string_view root(m::state::id_buffer &) const;
// Iterate the state; for_each protocol
void for_each(const string_view &type, const event::id::closure &) const;
void for_each(const string_view &type, const event::closure &) const;
void for_each(const event::id::closure &) const;
void for_each(const event::closure &) const;
// Iterate the state; test protocol
bool test(const string_view &type, const event::id::closure_bool &view) const;
bool test(const string_view &type, const event::closure_bool &view) const;
bool test(const event::id::closure_bool &view) const;
bool test(const event::closure_bool &view) const;
// Existential
bool has(const string_view &type, const string_view &state_key) const;
bool has(const string_view &type) const;
// Fetch a state event
bool get(std::nothrow_t, const string_view &type, const string_view &state_key, const event::id::closure &) const;
bool get(std::nothrow_t, const string_view &type, const string_view &state_key, const event::closure &) const;
void get(const string_view &type, const string_view &state_key, const event::id::closure &) const;
void get(const string_view &type, const string_view &state_key, const event::closure &) const;
state(m::room room)
:room{room}
{}
};
/// Interface to the members of a room.
///
/// This interface focuses specifically on room membership and its routines
@ -117,8 +147,6 @@ struct ircd::m::room
///
struct ircd::m::room::members
{
struct origins;
m::room room;
bool until(const string_view &membership, const event::closure_bool &view) const;
@ -129,15 +157,14 @@ struct ircd::m::room::members
{}
};
/// Interface to the origins of members of a room
/// Interface to the origins (autonomous systems) of a room
///
/// This interface focuses even more specifically on the servers (origins) for
/// the members of a room. As multiple users from the same origin may be
/// members of a room -- all in different membership states etc -- this
/// interface distills that fact away from what would otherwise burden users
/// of the more general room::members interface.
/// This interface focuses specifically on the origins (from the field in the
/// event object) which are servers/networks/autonomous systems, or something.
/// Messages have to be sent to them, and an efficient iteration of the
/// origins as provided by this interface helps with that.
///
struct ircd::m::room::members::origins
struct ircd::m::room::origins
{
using closure = std::function<void (const string_view &)>;
using closure_bool = std::function<bool (const string_view &)>;
@ -167,7 +194,7 @@ struct ircd::m::room::members::origins
/// A "JS null" is rarer and carried with a hack which will not be discussed
/// here.
///
struct ircd::m::room::state
struct ircd::m::room::state::tuple
:json::tuple
<
json::property<name::m_room_aliases, event>,
@ -187,13 +214,13 @@ struct ircd::m::room::state
{
using super_type::tuple;
state(const json::array &pdus);
state(const room &, const mutable_buffer &);
state() = default;
tuple(const json::array &pdus);
tuple(const m::room &, const mutable_buffer &);
tuple() = default;
using super_type::operator=;
friend std::string pretty(const room::state &);
friend std::string pretty_oneline(const room::state &);
friend std::string pretty(const room::state::tuple &);
friend std::string pretty_oneline(const room::state::tuple &);
};
#pragma GCC diagnostic pop

6
ircd/m/m.cc
View file

@ -456,7 +456,7 @@ const
};
bool ret{false};
room.get(type, state_key, [&supplied_hash, &ret]
room::state{room}.get(type, state_key, [&supplied_hash, &ret]
(const m::event &event)
{
const json::object &content
@ -480,8 +480,8 @@ ircd::m::user::is_active()
const
{
bool ret{false};
accounts.get("ircd.user", user_id, [&ret]
(const auto &event)
room::state{accounts}.get("ircd.user", user_id, [&ret]
(const m::event &event)
{
const json::object &content
{

364
ircd/m/room.cc
View file

@ -330,21 +330,11 @@ ircd::m::room::membership(const m::id::user &user_id,
const string_view &membership)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
bool ret{false};
static const auto type{"m.room.member"};
m::state::get(std::nothrow, state_root, type, user_id, [&membership, &ret]
(const string_view &event_id)
static const string_view type{"m.room.member"};
state{*this}.get(std::nothrow, type, user_id, [&membership, &ret]
(const m::event &event)
{
event::fetch event;
if(!seek(event, unquote(event_id), std::nothrow))
return;
assert(json::get<"type"_>(event) == "m.room.member");
ret = at<"membership"_>(event) == membership;
});
@ -352,8 +342,37 @@ const
return ret;
}
void
ircd::m::room::for_each(const event::closure &closure)
const
{
auto it
{
dbs::room_events.begin(room_id)
};
event::fetch event;
if(it) do
{
const auto &key{it->first};
const auto part
{
dbs::room_events_key(key)
};
const auto event_id
{
std::get<1>(part)
};
if(seek(event, event_id, std::nothrow))
closure(event);
}
while(++it);
}
bool
ircd::m::room::prev(const event::closure &closure)
ircd::m::room::get(const event::closure &closure)
const try
{
auto it
@ -388,166 +407,225 @@ catch(const NOT_FOUND &)
return false;
}
bool
ircd::m::room::get(const event::closure &closure)
//
// room::state
//
void
ircd::m::room::state::get(const string_view &type,
const string_view &state_key,
const event::closure &closure)
const
{
auto it
get(type, state_key, event::id::closure{[&closure]
(const event::id &event_id)
{
dbs::room_events.begin(room_id)
};
event::fetch event;
if(it) do
{
const auto &key{it->first};
const auto part
event::fetch event
{
dbs::room_events_key(key)
event_id
};
const auto event_id
{
std::get<1>(part)
};
if(seek(event, event_id, std::nothrow))
if(event.valid(event_id))
closure(event);
}
while(++it); else return false;
return true;
}});
}
bool
ircd::m::room::get(const string_view &type,
const event::closure &closure)
void
ircd::m::room::state::get(const string_view &type,
const string_view &state_key,
const event::id::closure &closure)
const
{
return get(type, string_view{}, closure);
}
bool
ircd::m::room::get(const string_view &type,
const string_view &state_key,
const event::closure &closure)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
return m::state::get(std::nothrow, state_root, type, state_key, [&closure]
m::state::id_buffer buf;
m::state::get(root(buf), type, state_key, [&closure]
(const string_view &event_id)
{
event::fetch event;
closure(unquote(event_id));
});
}
bool
ircd::m::room::state::get(std::nothrow_t,
const string_view &type,
const string_view &state_key,
const event::closure &closure)
const
{
return get(std::nothrow, type, state_key, event::id::closure{[&closure]
(const event::id &event_id)
{
event::fetch event
{
event_id, std::nothrow
};
if(event.valid(event_id))
closure(event);
}});
}
bool
ircd::m::room::state::get(std::nothrow_t,
const string_view &type,
const string_view &state_key,
const event::id::closure &closure)
const
{
m::state::id_buffer buf;
return m::state::get(std::nothrow, root(buf), type, state_key, [&closure]
(const string_view &event_id)
{
closure(unquote(event_id));
});
}
bool
ircd::m::room::state::has(const string_view &type)
const
{
return test(type, event::id::closure_bool{[](const m::event::id &)
{
return true;
}});
}
bool
ircd::m::room::state::has(const string_view &type,
const string_view &state_key)
const
{
m::state::id_buffer buf;
return m::state::get(std::nothrow, root(buf), type, state_key, []
(const string_view &event_id)
{
});
}
bool
ircd::m::room::state::test(const event::closure_bool &closure)
const
{
event::fetch event;
return test(event::id::closure_bool{[&event, &closure]
(const event::id &event_id)
{
if(seek(event, unquote(event_id), std::nothrow))
closure(event);
});
}
if(closure(event))
return true;
bool
ircd::m::room::has(const string_view &type)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
bool ret{false};
m::state::each(state_root, type, [&ret]
(const json::array &key, const string_view &val)
{
ret = true;
return false;
});
return ret;
}});
}
bool
ircd::m::room::has(const string_view &type,
const string_view &state_key)
ircd::m::room::state::test(const event::id::closure_bool &closure)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
return m::state::get(std::nothrow, state_root, type, state_key, []
(const string_view &event_id)
{
});
}
bool
ircd::m::room::test(const string_view &type,
const event::closure_bool &closure)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
event::fetch event;
return !m::state::each(state_root, type, [&event, &closure]
m::state::id_buffer buf;
return m::state::test(root(buf), [&closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
return closure(unquote(event_id));
});
}
// logical inversion for test vs. until protocol.
return !closure(event);
bool
ircd::m::room::state::test(const string_view &type,
const event::closure_bool &closure)
const
{
event::fetch event;
return test(type, event::id::closure_bool{[&event, &closure]
(const event::id &event_id)
{
if(seek(event, unquote(event_id), std::nothrow))
if(closure(event))
return true;
return false;
}});
}
bool
ircd::m::room::state::test(const string_view &type,
const event::id::closure_bool &closure)
const
{
m::state::id_buffer buf;
return m::state::test(root(buf), type, [&closure]
(const json::array &key, const string_view &event_id)
{
return closure(unquote(event_id));
});
}
void
ircd::m::room::for_each(const string_view &type,
const event::closure &closure)
ircd::m::room::state::for_each(const event::closure &closure)
const
{
m::state::id_buffer root;
const auto state_root
{
this->root(root)
};
event::fetch event;
m::state::each(state_root, type, [&event, &closure]
for_each(event::id::closure{[&event, &closure]
(const event::id &event_id)
{
if(seek(event, unquote(event_id), std::nothrow))
closure(event);
}});
}
void
ircd::m::room::state::for_each(const event::id::closure &closure)
const
{
m::state::id_buffer buf;
m::state::for_each(root(buf), [&closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
closure(unquote(event_id));
});
}
// logical inversion for test vs. until protocol.
closure(event);
return true;
void
ircd::m::room::state::for_each(const string_view &type,
const event::closure &closure)
const
{
event::fetch event;
for_each(type, event::id::closure{[&event, &closure]
(const event::id &event_id)
{
if(seek(event, unquote(event_id), std::nothrow))
closure(event);
}});
}
void
ircd::m::room::state::for_each(const string_view &type,
const event::id::closure &closure)
const
{
m::state::id_buffer buf;
m::state::for_each(root(buf), type, [&closure]
(const json::array &key, const string_view &event_id)
{
closure(unquote(event_id));
});
}
ircd::string_view
ircd::m::room::root(m::state::id_buffer &buf)
ircd::m::room::state::root(m::state::id_buffer &buf)
const
{
const event::id::buf event_id_buf
{
!event_id? head(room_id) : string_view{}
!room.event_id? head(room.room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
room.event_id? room.event_id : event_id_buf
};
return dbs::state_root(buf, room_id, event_id);
return dbs::state_root(buf, room.room_id, event_id);
}
//
@ -558,22 +636,17 @@ bool
ircd::m::room::members::until(const event::closure_bool &view)
const
{
m::state::id_buffer root;
const auto state_root
const room::state state
{
room.root(root)
room
};
event::fetch event;
static const string_view type{"m.room.member"};
return m::state::each(state_root, type, [&event, &view]
(const json::array &key, const string_view &event_id)
return !state.test(type, event::closure_bool{[&view]
(const m::event &event)
{
if(!seek(event, unquote(event_id), std::nothrow))
return false;
return view(event);
});
return !view(event);
}});
}
bool
@ -593,16 +666,16 @@ const
}
//
// room::members::origins
// room::origins
//
bool
ircd::m::room::members::origins::until(const closure_bool &view)
ircd::m::room::origins::until(const closure_bool &view)
const
{
db::index index
{
*event::events, "origin in room_id"
*dbs::events, "origin_joined in room_id"
};
auto it(index.begin(room.room_id));
@ -618,15 +691,16 @@ const
}
//
// room::state
// room::state::tuple
//
ircd::m::room::state::state(const room &room)
ircd::m::room::state::tuple::tuple(const m::room &room,
const mutable_buffer &buf)
{
}
ircd::m::room::state::state(const json::array &pdus)
ircd::m::room::state::tuple::tuple(const json::array &pdus)
{
for(const json::object &pdu : pdus)
{
@ -636,7 +710,7 @@ ircd::m::room::state::state(const json::array &pdus)
}
std::string
ircd::m::pretty(const room::state &state)
ircd::m::pretty(const room::state::tuple &state)
{
std::string ret;
std::stringstream s;
@ -662,7 +736,7 @@ ircd::m::pretty(const room::state &state)
}
std::string
ircd::m::pretty_oneline(const room::state &state)
ircd::m::pretty_oneline(const room::state::tuple &state)
{
std::string ret;
std::stringstream s;

29
modules/client/rooms.cc
View file

@ -112,25 +112,19 @@ get_state(client &client,
const m::room::id &room_id,
const string_view &event_id)
{
const m::room room
const m::room::state state
{
room_id, event_id
m::room{room_id, event_id}
};
//TODO: Introduce the progressive json::stream with socket <-> db yield dialectic.
std::vector<json::value> ret;
ret.reserve(2048); // 2048 * 16 bytes... good enuf atm
m::event::fetch event;
m::state::id_buffer root;
m::state::each(room.root(root), [&event, &ret]
(const json::array &key, const string_view &event_id)
state.for_each([&ret]
(const m::event &event)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
ret.emplace_back(event);
return true;
});
return resource::response
@ -149,15 +143,15 @@ get_state(client &client,
const string_view &event_id,
const string_view &type)
{
const m::room room
const m::room::state state
{
room_id, event_id
m::room{room_id, event_id}
};
//TODO: Introduce the progressive json::stream with socket <-> db yield dialectic.
std::vector<json::value> ret;
ret.reserve(2048); // 2048 * 16 bytes... good enuf atm
room.for_each(type, [&ret]
state.for_each(type, [&ret]
(const m::event &event)
{
//TODO: Fix conversion derpage
@ -181,18 +175,17 @@ get_state(client &client,
const string_view &type,
const string_view &state_key)
{
const m::room room
const m::room::state state
{
room_id, event_id
m::room{room_id, event_id}
};
size_t i(0);
std::array<json::value, 1> ret;
i += room.get(type, state_key, [&ret]
const bool i{state.get(std::nothrow, type, state_key, [&ret]
(const m::event &event)
{
ret[0] = event;
});
})};
return resource::response
{