api alignment

include/zenoh/api/hello.hxx

@@ -62,5 +62,25 @@ class Hello : public Owned<::z_owned_hello_t> {
 #endif
         return locators;
     }
+
+    /// @brief Copy contructor
+    Hello(const Hello& other) : Owned(nullptr) { ::z_hello_clone(&this->_0, interop::as_loaned_c_ptr(other)); };
+
+    /// @brief Move constructor
+    Hello(Hello&& other) = default;
+
+    /// @name Operators
+
+    /// @brief Assignment operator.
+    Hello& operator=(const Hello& other) {
+        if (this != &other) {
+            ::z_drop(z_move(this->_0));
+            ::z_hello_clone(&this->_0, interop::as_loaned_c_ptr(other));
+        }
+        return *this;
+    };
+
+    /// @brief Move assignment operator.
+    Hello& operator=(Hello&& other) = default;
 };
 }  // namespace zenoh

include/zenoh/api/id.hxx

@@ -16,6 +16,7 @@
 #include <array>
 #include <iomanip>
 #include <iostream>
+#include <string_view>
 
 #include "../zenohc.hxx"
 #include "base.hxx"
@@ -44,9 +45,10 @@ class Id : public Copyable<::z_id_t> {
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
 /// @brief Print ``Id`` in the hex format.
 inline std::ostream& operator<<(std::ostream& os, const Id& id) {
-    auto id_ptr = reinterpret_cast<const ::z_id_t*>(&id)->id;
-    for (size_t i = 0; id_ptr[i] != 0 && i < 16; i++)
-        os << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(id_ptr[i]);
+    ::z_owned_string_t s;
+    ::z_id_to_string(interop::as_copyable_c_ptr(id), &s);
+    os << std::string_view(::z_string_data(::z_loan(s)), ::z_string_len(::z_loan(s)));
+    ::z_drop(::z_move(s));
     return os;
 }
 }  // namespace zenoh

include/zenoh/api/publisher.hxx

@@ -101,13 +101,10 @@ class Publisher : public Owned<::z_owned_publisher_t> {
                              "Failed to perform delete_resource operation");
     }
 
-#ifdef ZENOHCXX_ZENOHC
     /// @brief Get the key expression of the publisher.
-    /// @note zenoh-c only.
     const KeyExpr& get_keyexpr() const {
         return interop::as_owned_cpp_ref<KeyExpr>(::z_publisher_keyexpr(interop::as_loaned_c_ptr(*this)));
     }
-#endif
 #if defined(ZENOHCXX_ZENOHC) && defined(UNSTABLE)
     /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
     /// release.

include/zenoh/api/queryable.hxx

@@ -27,6 +27,15 @@ class QueryableBase : public Owned<::z_owned_queryable_t> {
     QueryableBase(zenoh::detail::null_object_t) : Owned(nullptr){};
     QueryableBase(::z_owned_queryable_t* q) : Owned(q){};
 
+   public:
+    /// @brief Undeclares queryable.
+    /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
+    /// thrown in case of error.
+    void undeclare(ZResult* err = nullptr) && {
+        __ZENOH_RESULT_CHECK(::z_undeclare_queryable(interop::as_moved_c_ptr(*this)), err,
+                             "Failed to undeclare queryable");
+    }
+
     friend class zenoh::Session;
 };
 }  // namespace detail
@@ -40,13 +49,15 @@ class Queryable<void> : public detail::QueryableBase {
 
    public:
     using QueryableBase::QueryableBase;
-
+    using QueryableBase::undeclare;
     friend class Session;
 };
 
 /// A Zenoh queryable. Constructed by ``Session::declare_queryable`` method.
 /// @tparam Handler Streaming handler exposing data. If `void`, no handler access is provided and instead data is being
-/// processed inside the callback.
+/// processed inside the callback. Dropping handler-less queryable does not disable the callback. The corresponding
+/// messages are still received and processed unti the corresponding session is destroyed or closed. If callback needs
+/// to be disabled undeclare method should be called instead.
 template <class Handler>
 class Queryable : public detail::QueryableBase {
     Handler _handler;
@@ -67,7 +78,13 @@ class Queryable : public detail::QueryableBase {
     /// @brief Return handler to queryable data stream.
     const Handler& handler() const { return _handler; };
 
+    using QueryableBase::undeclare;
     friend class Session;
+
+    ~Queryable() {
+        ZResult err;
+        std::move(*this).undeclare(&err);
+    }
 };
 
 namespace interop {

include/zenoh/api/session.hxx

@@ -57,6 +57,12 @@ class Session : public Owned<::z_owned_session_t> {
         static SessionOptions create_default() { return {}; }
     };
 
+    /// @brief Options to be passed when closing a ``Session``.
+    struct SessionCloseOptions {
+        /// @name Fields
+        static SessionCloseOptions create_default() { return {}; }
+    };
+
     /// @name Constructors
 
     /// @brief Create a new Session.
@@ -66,7 +72,8 @@ class Session : public Owned<::z_owned_session_t> {
     /// thrown in case of error.
     Session(Config&& config, SessionOptions&& options = SessionOptions::create_default(), ZResult* err = nullptr)
         : Owned(nullptr) {
-        __ZENOH_RESULT_CHECK(::z_open(&this->_0, interop::as_moved_c_ptr(config)), err, "Failed to open session");
+        __ZENOH_RESULT_CHECK(::z_open(&this->_0, interop::as_moved_c_ptr(config), nullptr), err,
+                             "Failed to open session");
 #ifdef ZENOHCXX_ZENOHPICO
         if (err != nullptr && *err != Z_OK) return;
         if (options.start_background_tasks) {
@@ -76,7 +83,7 @@ class Session : public Owned<::z_owned_session_t> {
                 this->start_lease_task(&err_inner);
             }
             if (err_inner == Z_OK) return;
-            ::z_close(::z_move(this->_0));
+            ::z_close(::z_move(this->_0), nullptr);
             __ZENOH_RESULT_CHECK(err_inner, err, "Failed to start background tasks");
         }
 #else
@@ -88,9 +95,13 @@ class Session : public Owned<::z_owned_session_t> {
     /// @brief Create a new Session with custom SHM client set.
     /// @param config Zenoh session ``Config``.
     /// @param shm_storage Storage with custom SHM clients.
+    /// @param options Options to pass to session creation operation.
     /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
     /// thrown in case of error.
-    Session(Config&& config, const ShmClientStorage& shm_storage, ZResult* err = nullptr) : Owned(nullptr) {
+    Session(Config&& config, const ShmClientStorage& shm_storage,
+            SessionOptions&& options = SessionOptions::create_default(), ZResult* err = nullptr)
+        : Owned(nullptr) {
+        (void)options;
         __ZENOH_RESULT_CHECK(::z_open_with_custom_shm_clients(&this->_0, interop::as_moved_c_ptr(config),
                                                               interop::as_loaned_c_ptr(shm_storage)),
                              err, "Failed to open session");
@@ -112,24 +123,17 @@ class Session : public Owned<::z_owned_session_t> {
     /// @brief A factory method equivalent to a ``Session`` constructor for custom SHM clients list.
     /// @param config Zenoh session ``Config``.
     /// @param shm_storage Storage with custom SHM clients.
+    /// @param options Options to pass to session creation operation.
     /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
     /// thrown in case of error.
     /// @return ``Session`` object. In case of failure it will be return in invalid state.
-    static Session open(Config&& config, const ShmClientStorage& shm_storage, ZResult* err = nullptr) {
-        return Session(std::move(config), shm_storage, err);
+    static Session open(Config&& config, const ShmClientStorage& shm_storage,
+                        SessionOptions&& options = SessionOptions::create_default(), ZResult* err = nullptr) {
+        return Session(std::move(config), shm_storage, std::move(options), err);
     }
 #endif
 
     /// @name Methods
-
-    /// @brief Create a shallow copy of the session.
-    /// @return a new ``Session`` instance.
-    Session clone() const {
-        Session s(zenoh::detail::null_object);
-        ::z_session_clone(&s._0, interop::as_loaned_c_ptr(*this));
-        return s;
-    }
-
 #if defined UNSTABLE
     /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
     /// release.
@@ -879,5 +883,15 @@ class Session : public Owned<::z_owned_session_t> {
         __ZENOH_RESULT_CHECK(z_timestamp_new(&t, interop::as_loaned_c_ptr(*this)), err, "Failed to create timestamp");
         return interop::into_copyable_cpp_obj<Timestamp>(t);
     }
+
+    /// @brief Close and invalidate the session. This also undeclares all non-undeclared Subscriber and Queryable
+    /// callbacks.
+    /// @param options options to pass to close operation.
+    /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
+    /// thrown in case of error.
+    void close(SessionCloseOptions&& options = SessionCloseOptions::create_default(), ZResult* err = nullptr) && {
+        (void)options;
+        __ZENOH_RESULT_CHECK(::z_close(interop::as_moved_c_ptr(*this), nullptr), err, "Failed to close the session");
+    }
 };
 }  // namespace zenoh

include/zenoh/api/subscriber.hxx

@@ -29,13 +29,17 @@ class SubscriberBase : public Owned<::z_owned_subscriber_t> {
     SubscriberBase(::z_owned_subscriber_t* s) : Owned(s){};
 
    public:
-#ifdef ZENOHCXX_ZENOHC
     /// @brief Get the key expression of the subscriber
-    /// @note zenoh-c only.
     const KeyExpr& get_keyexpr() const {
         return interop::as_owned_cpp_ref<KeyExpr>(::z_subscriber_keyexpr(interop::as_loaned_c_ptr(*this)));
     }
-#endif
+    /// @brief Undeclares subscriber.
+    /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
+    /// thrown in case of error.
+    void undeclare(ZResult* err = nullptr) && {
+        __ZENOH_RESULT_CHECK(::z_undeclare_subscriber(interop::as_moved_c_ptr(*this)), err,
+                             "Failed to undeclare subscriber");
+    }
     friend class zenoh::Session;
 };
 
@@ -48,12 +52,18 @@ class Subscriber<void> : public detail::SubscriberBase {
    protected:
     using SubscriberBase::SubscriberBase;
     friend class Session;
+
+   public:
+    using SubscriberBase::get_keyexpr;
+    using SubscriberBase::undeclare;
 };
 
 /// A Zenoh subscriber. Destroying subscriber cancels the subscription.
 /// Constructed by ``Session::declare_subscriber`` method.
 /// @tparam Handler Streaming handler exposing data. If `void`, no handler access is provided and instead data is being
-/// processed inside the callback.
+/// processed inside the callback. Dropping handler-less subscriber does not disable the callback. The corresponding
+/// messages are still received and processed unti the corresponding session is destroyed or closed. If callback needs
+/// to be disabled undeclare method should be called instead.
 template <class Handler>
 class Subscriber : public detail::SubscriberBase {
     Handler _handler;
@@ -71,13 +81,17 @@ class Subscriber : public detail::SubscriberBase {
         : SubscriberBase(interop::as_owned_c_ptr(s)), _handler(std::move(handler)) {}
 
     /// @name Methods
-
-#ifdef ZENOHCXX_ZENOHC
     using SubscriberBase::get_keyexpr;
-#endif
+    using SubscriberBase::undeclare;
+
     /// @brief Return the handler to subscriber data stream.
     const Handler& handler() const { return _handler; };
     friend class Session;
+
+    ~Subscriber() {
+        ZResult err;
+        std::move(*this).undeclare(&err);
+    }
 };
 
 namespace interop {

tests/universal/network/pub_sub.cxx

@@ -77,6 +77,12 @@ void pub_sub(Talloc& alloc) {
     assert(received_messages[0].second == "first");
     assert(received_messages[1].first == "zenoh/test");
     assert(received_messages[1].second == "second");
+#ifdef ZENOHCXX_ZENOHC  // TODO: remove once pico supports background declarations
+    /// check that drop does not undeclare
+    assert(!subscriber_dropped);
+    std::move(session2).close();
+    std::this_thread::sleep_for(1s);
+#endif
     assert(subscriber_dropped);
 }
 

tests/universal/network/queryable_get.cxx

@@ -94,6 +94,12 @@ void queryable_get() {
     qd = {"zenoh/test/1", "err", 3};
     assert(queries[2] == qd);
 
+#ifdef ZENOHCXX_ZENOHC  // TODO: remove once pico supports background declarations
+    /// check that drop does not undeclare
+    assert(!queryable_dropped);
+    std::move(session1).close();
+    std::this_thread::sleep_for(1s);
+#endif
     assert(queryable_dropped);
 
     assert(replies.size() == 2);