Mercurial > irccd
annotate irccdctl/cli.cpp @ 670:95ac3ace1610
Common: introduce new io code
To avoid code duplication in accept, connect, reading and writing we add a new
set of classes in `io` namespaces located in the following files:
- stream.hpp, acceptor.hpp, connector.hpp
These classes consist of pure abstract interfaces for I/O. Then we reimplement
them in the following files:
- socket_stream.hpp, socket_acceptor.hpp, socket_connector.hpp,
- tls_stream.hpp, tls_acceptor.hpp, tls_conncetor.hpp (for SSL).
This allows future independant connections such as DBus, fifo or any other fancy
optional stuff.
We also no longer need large class hierarchy such as `connection` for irccdctl
controller or transport_server, transport_client classes.
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 10 Apr 2018 21:20:30 +0200 |
parents | 4a13a016ea4f |
children | ad1ee47165fa |
rev | line source |
---|---|
344
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 /* |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 * cli.cpp -- command line for irccdctl |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 * |
628
27587ff92a64
Misc: update copyrights
David Demelier <markand@malikania.fr>
parents:
569
diff
changeset
|
4 * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr> |
344
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 * |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 * Permission to use, copy, modify, and/or distribute this software for any |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 * purpose with or without fee is hereby granted, provided that the above |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 * copyright notice and this permission notice appear in all copies. |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 * |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 */ |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
19 #include <irccd/json_util.hpp> |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
20 #include <irccd/options.hpp> |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
21 #include <irccd/string_util.hpp> |
489
349fe29d86d5
Tests: switch to Boost, closes #680
David Demelier <markand@malikania.fr>
parents:
488
diff
changeset
|
22 |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
23 #include <irccd/ctl/controller.hpp> |
344
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 #include "cli.hpp" |
452
2170aa0e38aa
Irccdctl: implement rule-add
David Demelier <markand@malikania.fr>
parents:
451
diff
changeset
|
26 |
344
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 namespace irccd { |
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
29 namespace ctl { |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
30 |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
31 void cli::recv_response(ctl::controller& ctl, nlohmann::json req, handler_t handler) |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
32 { |
670
95ac3ace1610
Common: introduce new io code
David Demelier <markand@malikania.fr>
parents:
649
diff
changeset
|
33 ctl.read([&ctl, req, handler, this] (auto code, auto message) { |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
34 if (code) |
670
95ac3ace1610
Common: introduce new io code
David Demelier <markand@malikania.fr>
parents:
649
diff
changeset
|
35 throw std::system_error(code); |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
36 |
649
4a13a016ea4f
Irccd: use new json_util::parser class
David Demelier <markand@malikania.fr>
parents:
641
diff
changeset
|
37 const auto c = json_util::parser(message).get<std::string>("command"); |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
38 |
641
7e2d0739f37c
Irccd: import json_util from code
David Demelier <markand@malikania.fr>
parents:
628
diff
changeset
|
39 if (!c) { |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
40 recv_response(ctl, std::move(req), std::move(handler)); |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
41 return; |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
42 } |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
43 |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
44 if (handler) |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
45 handler(std::move(message)); |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
46 }); |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
47 } |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
48 |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
49 void cli::request(ctl::controller& ctl, nlohmann::json req, handler_t handler) |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
50 { |
670
95ac3ace1610
Common: introduce new io code
David Demelier <markand@malikania.fr>
parents:
649
diff
changeset
|
51 ctl.write(req, [&ctl, req, handler, this] (auto code) { |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
52 if (code) |
670
95ac3ace1610
Common: introduce new io code
David Demelier <markand@malikania.fr>
parents:
649
diff
changeset
|
53 throw std::system_error(code); |
527
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
54 |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
55 recv_response(ctl, std::move(req), std::move(handler)); |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
56 }); |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
57 } |
a88796ed040a
Irccdctl: switch to Boost.Asio, closes #697
David Demelier <markand@malikania.fr>
parents:
521
diff
changeset
|
58 |
345
006452e4a997
Irccdctl: unify cli commands
David Demelier <markand@malikania.fr>
parents:
344
diff
changeset
|
59 } // !cli |
006452e4a997
Irccdctl: unify cli commands
David Demelier <markand@malikania.fr>
parents:
344
diff
changeset
|
60 |
344
4665fffff6f2
Irccdctl: new cli interface
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
61 } // !irccd |