Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Collection!T getters with arguments in the RPC module #2798

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Enable Collection!T getters with arguments in the RPC module #2798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions web/vibe/web/rpc.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,24 +718,10 @@ private final class WebSocketHandler(I) {
alias outparams = refOutParameterIndices!method;
alias paramnames = ParameterIdentifierTuple!method;

SI impl = resolveImpl!qualified_name(m_impl);

static if (isAuthenticated!(SI, method)) {
typeof(handleAuthentication!method(impl, m_peerInfo)) auth_info;

auth_info = handleAuthentication!method(impl, m_peerInfo);
}
SI impl = resolveImpl!qualified_name(m_impl, arguments);

ParameterTypeTuple!method args;
foreach (i, name; paramnames) {
static if (is(typeof(args[i]) == AuthInfo!SI))
args[i] = auth_info;
else static if (!(ParameterStorageClassTuple!method[i] & ParameterStorageClass.out_))
args[i] = deserializeBson!(typeof(args[i]))(arguments[name]);
}

static if (isAuthenticated!(SI, method))
handleAuthorization!(SI, method, args)(auth_info);
resolveArguments!method(impl, arguments, args);

alias RT = typeof(__traits(getMember, impl, __traits(identifier, method))(args));
static if (!is(RT == void)) {
Expand All @@ -756,20 +742,46 @@ private final class WebSocketHandler(I) {
return bret;
}

private auto resolveImpl(string qualified_name, RI)(RI base)
private auto resolveImpl(string qualified_name, RI)(RI base, Bson arguments)
if (is(RI == interface))
{
import std.string : indexOf;
enum idx = qualified_name.indexOf('.');
static if (idx < 0) return base;
else {
enum mname = qualified_name[0 .. idx];
alias method = __traits(getMember, base, mname);

ParameterTypeTuple!method args;
resolveArguments!method(base, arguments, args);

static if (isInstanceOf!(Collection, ReturnType!(__traits(getMember, base, mname))))
return resolveImpl!(qualified_name[idx+1 .. $])(__traits(getMember, base, mname).m_interface);
return resolveImpl!(qualified_name[idx+1 .. $])(__traits(getMember, base, mname)(args).m_interface, arguments);
else
return resolveImpl!(qualified_name[idx+1 .. $])(__traits(getMember, base, mname));
return resolveImpl!(qualified_name[idx+1 .. $])(__traits(getMember, base, mname)(args), arguments);
}
}

private void resolveArguments(alias method, SI)(SI impl, Bson arguments, out typeof(ParameterTypeTuple!method.init) args)
{
alias paramnames = ParameterIdentifierTuple!method;

static if (isAuthenticated!(SI, method)) {
typeof(handleAuthentication!method(impl, m_peerInfo)) auth_info;

auth_info = handleAuthentication!method(impl, m_peerInfo);
}

foreach (i, name; paramnames) {
static if (is(typeof(args[i]) == AuthInfo!SI))
args[i] = auth_info;
else static if (!(ParameterStorageClassTuple!method[i] & ParameterStorageClass.out_))
args[i] = deserializeBson!(typeof(args[i]))(arguments[name]);
}

static if (isAuthenticated!(SI, method))
handleAuthorization!(SI, method, args)(auth_info);
}
}


Expand Down
Loading