oxen-io
/
oxen-pyoxenmq
mirror of https://github.com/oxen-io/oxen-pyoxenmq.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into debian/sid

This commit is contained in:
Jason Rhinelander 2021-12-03 15:41:32 -04:00
parent be15af17df b5f3ff6132
commit 0e197ec803
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -3,7 +3,7 @@ from setuptools import setup
# Available at setup time due to pyproject.toml # Available at setup time due to pyproject.toml
from pybind11.setup_helpers import Pybind11Extension, build_ext from pybind11.setup_helpers import Pybind11Extension, build_ext
__version__ = "1.0.1" __version__ = "1.0.2"
# Note: # Note:
# Sort input source files if you glob sources to ensure bit-for-bit # Sort input source files if you glob sources to ensure bit-for-bit

17
src/oxenmq.cpp
View File

@ -62,6 +62,7 @@ OxenMQ_Init(py::module& mod)
.def(py::self != py::self) .def(py::self != py::self)
.def_property_readonly("service_node", &ConnectionID::sn) .def_property_readonly("service_node", &ConnectionID::sn)
.def_property_readonly("pubkey", [](const ConnectionID& c) { return py::bytes(c.pubkey()); }) .def_property_readonly("pubkey", [](const ConnectionID& c) { return py::bytes(c.pubkey()); })
.def(py::hash(py::self))
; ;
py::class_<address>(mod, "Address") py::class_<address>(mod, "Address")
.def(py::init<std::string_view>(), "addr"_a, .def(py::init<std::string_view>(), "addr"_a,
@ -152,11 +153,13 @@ This typically protects administrative commands like shutting down or access to
msg msg
.def_property_readonly("is_reply", [](const Message& m) { return !m.reply_tag.empty(); }, .def_property_readonly("is_reply", [](const Message& m) { return !m.reply_tag.empty(); },
"True if this message is expecting a reply (i.e. it was received on a request_command endpoint)") "True if this message is expecting a reply (i.e. it was received on a request_command endpoint)")
.def_readonly("remote", &Message::remote, R"(Some sort of remote address from which the request came. .def_readonly("remote", &Message::remote, py::return_value_policy::copy,
R"(Some sort of remote address from which the request came.
Typically the IP address string for TCP connections and "localhost:UID:GID:PID" for unix socket IPC connections.)") Typically the IP address string for TCP connections and "localhost:UID:GID:PID" for unix socket IPC connections.)")
.def_readonly("conn", &Message::conn, "The connection ID info for routing a reply") .def_readonly("conn", &Message::conn, py::return_value_policy::copy,
.def_readonly("access", &Message::access, "The connection ID info for routing a reply")
.def_readonly("access", &Message::access, py::return_value_policy::copy,
"The access level of the invoker (which can be higher than the access level required for the command category") "The access level of the invoker (which can be higher than the access level required for the command category")
.def("dataview", [](const Message& m) { .def("dataview", [](const Message& m) {
py::list l; py::list l;
@ -436,13 +439,13 @@ Things you want to do before calling this:
.def("listen", [](OxenMQ& self, .def("listen", [](OxenMQ& self,
std::string bind, std::string bind,
bool curve, bool curve,
py::function pyallow, std::optional<py::function> pyallow,
std::function<void(bool success)> on_bind) { std::function<void(bool success)> on_bind) {
OxenMQ::AllowFunc allow; OxenMQ::AllowFunc allow;
if (!pyallow.is_none()) if (pyallow)
// We need to wrap this to pass the pubkey as bytes (otherwise pybind tries to utf-8 // We need to wrap this to pass the pubkey as bytes (otherwise pybind tries to utf-8
// encode it). // encode it).
allow = [pyallow=std::move(pyallow)](std::string_view addr, std::string_view pubkey, bool sn) { allow = [pyallow=std::move(*pyallow)](std::string_view addr, std::string_view pubkey, bool sn) {
py::gil_scoped_acquire gil; py::gil_scoped_acquire gil;
return py::cast<AuthLevel>( return py::cast<AuthLevel>(
pyallow(addr, py::bytes{pubkey.data(), pubkey.size()}, sn) pyallow(addr, py::bytes{pubkey.data(), pubkey.size()}, sn)
@ -454,7 +457,7 @@ Things you want to do before calling this:
else else
self.listen_plain(bind, std::move(allow), std::move(on_bind)); self.listen_plain(bind, std::move(allow), std::move(on_bind));
}, },
"bind"_a, "curve"_a, kwonly, "allow_connection"_a = nullptr, "on_bind"_a = nullptr, "bind"_a, "curve"_a, kwonly, "allow_connection"_a = std::nullopt, "on_bind"_a = nullptr,
R"(Start listening on the given bind address. R"(Start listening on the given bind address.
Incoming connections can come from anywhere. `allow_connection` is invoked for any incoming Incoming connections can come from anywhere. `allow_connection` is invoked for any incoming