Skip to content

Commit afa22ed

Browse files
turuslanturuslan
authored
cli base (#602)
Signed-off-by: turuslan <[email protected]>
1 parent 4887629 commit afa22ed

19 files changed

+657
-74
lines changed

‎core/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
add_subdirectory(adt)
77
add_subdirectory(api)
88
add_subdirectory(blockchain)
9+
add_subdirectory(cli)
910
add_subdirectory(clock)
1011
add_subdirectory(codec)
1112
add_subdirectory(common)

‎core/api/rpc/info.hpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@ namespace fc::api::rpc {
2323
std::string_view info{_info};
2424
auto i{info.find(":")};
2525
if (i == info.npos) {
26-
return {};
26+
address = info;
27+
} else {
28+
token = info.substr(0, i);
29+
address = info.substr(i + 1);
2730
}
28-
address = info.substr(0, i);
29-
token = info.substr(i + 1);
3031
} else if (!repo.empty()) {
31-
boost::filesystem::load_string_file(repo / "api", address);
32-
boost::filesystem::load_string_file(repo / "token", token);
32+
try {
33+
boost::filesystem::load_string_file(repo / "api", address);
34+
boost::filesystem::load_string_file(repo / "token", token);
35+
} catch (...) {
36+
return {};
37+
}
3338
} else {
3439
return {};
3540
}

‎core/cli/CMakeLists.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
6+
add_library(cli INTERFACE)
7+
target_link_libraries(cli INTERFACE
8+
Boost::program_options
9+
fmt::fmt
10+
)
11+
12+
add_subdirectory(node)

‎core/cli/cli.hpp

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
/**
2+
* Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
#pragma once
7+
8+
#include <boost/optional.hpp>
9+
#include <boost/program_options/options_description.hpp>
10+
#include <map>
11+
#include <memory>
12+
#include <typeindex>
13+
14+
#include "cli/try.hpp"
15+
16+
#define CLI_BOOL(NAME, DESCRIPTION) \
17+
struct { \
18+
bool v{}; \
19+
void operator()(Opts &opts) { \
20+
opts.add_options()(NAME, po::bool_switch(&v), DESCRIPTION); \
21+
} \
22+
operator bool() const { \
23+
return v; \
24+
} \
25+
}
26+
27+
#define CLI_DEFAULT(NAME, DESCRIPTION, TYPE, INIT) \
28+
struct { \
29+
TYPE v INIT; \
30+
void operator()(Opts &opts) { \
31+
opts.add_options()(NAME, po::value(&v), DESCRIPTION); \
32+
} \
33+
auto &operator*() const { \
34+
return v; \
35+
} \
36+
auto &operator*() { \
37+
return v; \
38+
} \
39+
auto *operator->() const { \
40+
return &v; \
41+
} \
42+
auto *operator->() { \
43+
return &v; \
44+
} \
45+
}
46+
47+
#define CLI_OPTIONAL(NAME, DESCRIPTION, TYPE) \
48+
struct { \
49+
boost::optional<TYPE> v; \
50+
void operator()(Opts &opts) { \
51+
opts.add_options()(NAME, po::value(&v), DESCRIPTION); \
52+
} \
53+
operator bool() const { \
54+
return v.operator bool(); \
55+
} \
56+
void check() const { \
57+
if (!v) { \
58+
throw ::fc::cli::CliError{"--{} argument is required but missing", \
59+
NAME}; \
60+
} \
61+
} \
62+
auto &operator*() const { \
63+
check(); \
64+
return *v; \
65+
} \
66+
auto &operator*() { \
67+
check(); \
68+
return *v; \
69+
} \
70+
auto *operator->() const { \
71+
return &**this; \
72+
} \
73+
auto *operator->() { \
74+
return &**this; \
75+
} \
76+
}
77+
78+
#define CLI_OPTS() ::fc::cli::Opts opts()
79+
#define CLI_RUN() \
80+
static ::fc::cli::RunResult run( \
81+
::fc::cli::ArgsMap &argm, Args &args, ::fc::cli::Argv &&argv)
82+
#define CLI_NO_RUN() constexpr static std::nullptr_t run{nullptr};
83+
84+
namespace fc::cli {
85+
namespace po = boost::program_options;
86+
using Opts = po::options_description;
87+
88+
using RunResult = void;
89+
struct ArgsMap {
90+
std::map<std::type_index, std::shared_ptr<void>> _;
91+
template <typename Args>
92+
void add(Args &&v) {
93+
_.emplace(typeid(Args), std::make_shared<Args>(std::forward<Args>(v)));
94+
}
95+
template <typename Cmd>
96+
typename Cmd::Args &of() {
97+
return *reinterpret_cast<typename Cmd::Args *>(
98+
_.at(typeid(typename Cmd::Args)).get());
99+
}
100+
};
101+
// note: Args is defined inside command
102+
using Argv = std::vector<std::string>;
103+
104+
const std::string &cliArgv(const Argv &argv,
105+
size_t i,
106+
const std::string_view &name) {
107+
if (i < argv.size()) {
108+
return argv[i];
109+
}
110+
throw CliError{"positional argument {} is required but missing", name};
111+
}
112+
template <typename T>
113+
T cliArgv(const std::string &arg, const std::string_view &name) {
114+
boost::any out;
115+
try {
116+
po::value<T>()->xparse(out, Argv{arg});
117+
} catch (po::validation_error &e) {
118+
e.set_option_name(std::string{name});
119+
throw;
120+
}
121+
return boost::any_cast<T>(out);
122+
}
123+
template <typename T>
124+
T cliArgv(const Argv &argv, size_t i, const std::string_view &name) {
125+
return cliArgv<T>(cliArgv(argv, i, name), name);
126+
}
127+
128+
struct Empty {
129+
struct Args {
130+
CLI_OPTS() {
131+
return {};
132+
}
133+
};
134+
CLI_NO_RUN();
135+
};
136+
using Group = Empty;
137+
138+
struct ShowHelp {};
139+
} // namespace fc::cli

‎core/cli/node/CMakeLists.txt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#
2+
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
6+
add_executable(fuhon-node-cli
7+
main.cpp
8+
)
9+
target_link_libraries(fuhon-node-cli
10+
cli
11+
rpc
12+
)
13+
set_target_properties(fuhon-node-cli PROPERTIES
14+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
15+
)

‎core/cli/node/main.cpp

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
#include "cli/node/net.hpp"
7+
#include "cli/run.hpp"
8+
9+
#define CMD(NAME, TYPE) \
10+
{ NAME, tree<TYPE>() }
11+
#define CMDS(NAME, TYPE) NAME, tree<TYPE>
12+
#define GROUP(NAME) CMDS(NAME, Group)
13+
14+
namespace fc::cli::_node {
15+
const auto _tree{tree<Node>({
16+
{GROUP("net")({
17+
CMD("connect", Node_net_connect),
18+
CMD("listen", Node_net_listen),
19+
CMD("peers", Node_net_peers),
20+
})},
21+
CMD("version", Node_version),
22+
})};
23+
} // namespace fc::cli::_node
24+
25+
int main(int argc, const char *argv[]) {
26+
fc::cli::run("fuhon-node-cli", fc::cli::_node::_tree, argc, argv);
27+
}

‎core/cli/node/net.hpp

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/**
2+
* Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
#pragma once
7+
8+
#include "cli/node/node.hpp"
9+
10+
namespace fc::cli::_node {
11+
inline void printPeer(const PeerInfo &peer) {
12+
for (const auto &addr : peer.addresses) {
13+
fmt::print("{}/p2p/{}\n", addr.getStringAddress(), peer.id.toBase58());
14+
}
15+
}
16+
17+
struct Node_net_connect : Empty {
18+
CLI_RUN() {
19+
Node::Api api{argm};
20+
for (const auto &arg : argv) {
21+
const auto peer{cliArgv<PeerInfo>(arg, "peer")};
22+
cliTry(api->NetConnect(peer));
23+
}
24+
}
25+
};
26+
27+
struct Node_net_listen : Empty {
28+
CLI_RUN() {
29+
Node::Api api{argm};
30+
const auto peer{cliTry(api->NetAddrsListen())};
31+
printPeer(peer);
32+
}
33+
};
34+
35+
struct Node_net_peers : Empty {
36+
CLI_RUN() {
37+
Node::Api api{argm};
38+
const auto peers{cliTry(api->NetPeers())};
39+
for (const auto &peer : peers) {
40+
printPeer(peer);
41+
}
42+
}
43+
};
44+
} // namespace fc::cli::_node

‎core/cli/node/node.hpp

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/**
2+
* Copyright Soramitsu Co., Ltd. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
#pragma once
7+
8+
#include "api/rpc/client_setup.hpp"
9+
#include "api/rpc/info.hpp"
10+
#include "cli/cli.hpp"
11+
#include "cli/validate/peer_info.hpp"
12+
#include "common/git_commit_version/git_commit_version.hpp"
13+
#include "common/libp2p/multi/multiaddress_fmt.hpp"
14+
15+
namespace fc::cli::_node {
16+
using libp2p::peer::PeerInfo;
17+
18+
struct Node {
19+
struct Args {
20+
CLI_BOOL("version", "") version;
21+
CLI_DEFAULT("repo", "", boost::filesystem::path, ) repo;
22+
23+
CLI_OPTS() {
24+
Opts opts;
25+
version(opts);
26+
repo(opts);
27+
return opts;
28+
}
29+
};
30+
CLI_RUN() {
31+
if (args.version) {
32+
fmt::print("fuhon-node-cli {}\n",
33+
common::git_commit_version::getGitPrettyVersion());
34+
return;
35+
}
36+
throw ShowHelp{};
37+
}
38+
39+
struct Api {
40+
private:
41+
IoThread thread;
42+
std::shared_ptr<api::rpc::Client> wsc;
43+
44+
public:
45+
std::shared_ptr<api::FullNodeApi> api;
46+
47+
Api(ArgsMap &argm) {
48+
const auto &args{argm.of<Node>()};
49+
const auto info{
50+
cliTry(api::rpc::loadInfo(*args.repo, "FULLNODE_API_INFO").o,
51+
"api info is missing")};
52+
api = std::make_shared<api::FullNodeApi>();
53+
wsc = std::make_shared<api::rpc::Client>(*thread.io);
54+
wsc->setup(*api);
55+
cliTry(wsc->connect(info.first, "/rpc/v1", info.second),
56+
"connecting to {}",
57+
info.first);
58+
}
59+
60+
auto *operator->() const {
61+
return api.operator->();
62+
}
63+
};
64+
};
65+
66+
struct Node_version : Empty {
67+
CLI_RUN() {
68+
Node::Api api{argm};
69+
const auto version{cliTry(api->Version())};
70+
fmt::print("Version: {}\n", version.version);
71+
}
72+
};
73+
} // namespace fc::cli::_node

0 commit comments

Comments
 (0)