Skip to content

ws/stash_management_refactor #90

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

ws/stash_management_refactor #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69b9217
pass rpc_storage
Jan 11, 2023
6c52cc0
ws/stash_management_refactor
Jan 11, 2023
4774daa
update
Jan 11, 2023
93604dc
ws/stash_management_refactor
Jan 11, 2023
d2e4ef7
ws/stash_management_refactor
Jan 11, 2023
ddcdf41
ws/stash_management_refactor
Jan 11, 2023
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
8 changes: 7 additions & 1 deletion lib/Mojo/WebSocketProxy/Backend.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,13 @@ sub make_call_params {
$call_params->{args} = $args;

if (defined $stash_params) {
$call_params->{$_} = $c->stash($_) for @$stash_params;
for my $param (@$stash_params) {
$call_params->{$param} = $c->stash($param);

if (defined $c->stash('rpc_storage') && exists $c->stash('rpc_storage')->{$param}) {
$call_params->{$param} = $c->stash('rpc_storage')->{$param};
}
}
}

return $call_params;
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojo/WebSocketProxy/Dispatcher.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ use Mojo::WebSocketProxy::Config;

use Class::Method::Modifiers;

use JSON::MaybeUTF8 qw(:v1);
use JSON::MaybeUTF8 qw(:v1);
use Unicode::Normalize ();
use Future::Mojo 0.004; # ->new_timeout
use Future::Utils qw(fmap);
use Scalar::Util qw(blessed);
use Scalar::Util qw(blessed);
use Encode;
use DataDog::DogStatsd::Helper qw(stats_inc);

Expand Down
4 changes: 2 additions & 2 deletions t/05_basic.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ $t->websocket_ok('/api' => {});
$t = $t->send_ok({json => {some_action => 1}})->message_ok;
$res = decode_json_utf8($t->message->[1]);

is $url, 'http://rpc-host.com:8080/some_action', 'It should use url + method';
is $call_params->{method}, 'some_action', 'It should use method from actions';
is $url, 'http://rpc-host.com:8080/some_action', 'It should use url + method';
is $call_params->{method}, 'some_action', 'It should use method from actions';
ok $call_params->{id}, 'It should generate call id';
is_deeply $call_params->{params}->{args}, {some_action => 1}, 'It should forward message params';
is_deeply $res,
Expand Down