feat(daemon): initial support for nested endpoints

OldUser101 · OldUser101 · commit a020bb2e9d87 · 2026-02-22T20:43:44.000Z
diff --git a/daemon/daemon_endpoint.cpp b/daemon/daemon_endpoint.cpp
@@ -15,7 +15,9 @@ uint32_t HopperDaemon::create_endpoint(const std::filesystem::path &path) {
     if (inotify_watch_fd < 0)
         return 0;
 
-    auto *endpoint = new HopperEndpoint(endpoint_id, inotify_watch_fd, path);
+    auto name = path.lexically_relative(m_path);
+    auto *endpoint =
+        new HopperEndpoint(endpoint_id, inotify_watch_fd, path, name);
     m_endpoints[endpoint_id] = endpoint;
 
     std::cout << "CREATE " << *endpoint << std::endl;
@@ -25,15 +27,23 @@ uint32_t HopperDaemon::create_endpoint(const std::filesystem::path &path) {
         const auto &p = dir_entry.path();
 
         PipeType pipe_type = detect_pipe_type(p);
-        if (pipe_type == PipeType::NONE)
+        if (pipe_type == PipeType::NONE && std::filesystem::is_directory(p)) {
+            // nested endpoint
+            if (create_endpoint(p) == 0)
+                std::cerr << "Endpoint creation failed! Out of IDs?"
+                          << std::endl;
+        } else if (pipe_type == PipeType::NONE) {
+            // nothing of interest
             continue;
-
-        HopperPipe *pipe =
-            (pipe_type == PipeType::IN ? endpoint->add_input_pipe(p)
-                                       : endpoint->add_output_pipe(p));
-
-        if (pipe != nullptr)
-            add_pipe(pipe);
+        } else {
+            // pipe
+            HopperPipe *pipe =
+                (pipe_type == PipeType::IN ? endpoint->add_input_pipe(p)
+                                           : endpoint->add_output_pipe(p));
+
+            if (pipe != nullptr)
+                add_pipe(pipe);
+        }
     }
 
     return endpoint_id;
@@ -65,4 +75,12 @@ HopperEndpoint *HopperDaemon::endpoint_by_watch(int watch) {
     return nullptr;
 }
 
+HopperEndpoint *
+HopperDaemon::endpoint_by_path(const std::filesystem::path &path) {
+    for (const auto &[_, endpoint] : m_endpoints)
+        if (endpoint->path() == path)
+            return endpoint;
+    return nullptr;
+}
+
 }; // namespace hopper
diff --git a/daemon/daemon_inotify.cpp b/daemon/daemon_inotify.cpp
@@ -1,6 +1,7 @@
 #include "hopper/daemon/daemon.hpp"
 #include "hopper/daemon/util.hpp"
 
+#include <filesystem>
 #include <iostream>
 #include <limits.h>
 #include <unistd.h>
@@ -54,60 +55,78 @@ void HopperDaemon::handle_endpoint_inotify(struct inotify_event *ev,
         p /= ev->name;
 
         PipeType pipe_type = detect_pipe_type(p);
-        if (pipe_type == PipeType::NONE)
+        if (pipe_type == PipeType::NONE && std::filesystem::is_directory(p)) {
+            // nested endpoint
+            if (create_endpoint(p) == 0)
+                std::cerr << "Endpoint creation failed! Out of IDs?"
+                          << std::endl;
+        } else if (pipe_type == PipeType::NONE) {
+            // nothing of interest
             return;
-
-        HopperPipe *pipe =
-            (pipe_type == PipeType::IN ? endpoint->add_input_pipe(p)
-                                       : endpoint->add_output_pipe(p));
-
-        if (pipe != nullptr)
-            add_pipe(pipe);
+        } else {
+            // pipe
+            HopperPipe *pipe =
+                (pipe_type == PipeType::IN ? endpoint->add_input_pipe(p)
+                                           : endpoint->add_output_pipe(p));
+
+            if (pipe != nullptr)
+                add_pipe(pipe);
+        }
     }
 
     if (ev->mask & IN_DELETE) {
         std::filesystem::path p = endpoint->path();
         p /= ev->name;
 
-        HopperPipe *pipe = endpoint->pipe_by_path(p);
-
-        if (pipe != nullptr) {
-            if (pipe->status() == PipeStatus::ACTIVE)
-                remove_pipe(endpoint, pipe->id());
-
-            endpoint->remove_by_id(pipe->id());
+        if (std::filesystem::is_directory(p)) {
+            // nested endpoint
+            HopperEndpoint *tgt_endpoint = endpoint_by_path(p);
+            if (tgt_endpoint != nullptr)
+                delete_endpoint(tgt_endpoint->id());
+        } else {
+            // pipe
+            HopperPipe *pipe = endpoint->pipe_by_path(p);
+
+            if (pipe != nullptr) {
+                if (pipe->status() == PipeStatus::ACTIVE)
+                    remove_pipe(endpoint, pipe->id());
+
+                endpoint->remove_by_id(pipe->id());
+            }
         }
     }
 }
 
 void HopperDaemon::handle_inotify() {
-    struct inotify_event *iev = reinterpret_cast<struct inotify_event *>(
-        std::malloc(sizeof(struct inotify_event) + NAME_MAX + 1));
+    char buf[4096];
+    ssize_t size;
+    struct inotify_event *iev = {};
 
-    if (read(m_inotify_fd, iev, sizeof(struct inotify_event) + NAME_MAX + 1) <=
-        0)
+    if ((size = read(m_inotify_fd, &buf, 4096)) <= 0)
         return;
 
-    if (iev->wd == m_inotify_root_watch) {
-        handle_root_inotify(iev);
-        std::free(iev);
-        return;
-    }
+    for (char *ptr = buf; ptr < buf + size;
+         ptr += sizeof(struct inotify_event) + iev->len) {
+        iev = reinterpret_cast<struct inotify_event *>(ptr);
 
-    HopperEndpoint *endpoint = endpoint_by_watch(iev->wd);
-    if (endpoint == nullptr) {
-        std::cout << "No endpoint found for watch ID " << iev->wd << std::endl;
-        std::free(iev);
-        return;
-    }
+        if (iev->wd == m_inotify_root_watch) {
+            handle_root_inotify(iev);
+            continue;
+        }
 
-    handle_endpoint_inotify(iev, endpoint);
+        HopperEndpoint *endpoint = endpoint_by_watch(iev->wd);
+        if (endpoint == nullptr) {
+            std::cout << "No endpoint found for watch ID " << iev->wd
+                      << std::endl;
+            continue;
+        }
 
-    // The endpoint is now closed
-    if (iev->mask & IN_IGNORED)
-        delete_endpoint(endpoint->id());
+        handle_endpoint_inotify(iev, endpoint);
 
-    std::free(iev);
+        // The endpoint is now closed
+        if (iev->mask & IN_IGNORED)
+            delete_endpoint(endpoint->id());
+    }
 }
 
 }; // namespace hopper
diff --git a/daemon/endpoint.cpp b/daemon/endpoint.cpp
@@ -8,9 +8,8 @@
 namespace hopper {
 
 HopperEndpoint::HopperEndpoint(uint32_t id, int watch_fd,
-                               std::filesystem::path path)
-    : m_path(path), m_id(id), m_watch_fd(watch_fd) {
-    m_name = path.filename();
+                               std::filesystem::path path, std::string name)
+    : m_path(path), m_name(name), m_id(id), m_watch_fd(watch_fd) {
 }
 
 HopperEndpoint::~HopperEndpoint() {
diff --git a/daemon/util.cpp b/daemon/util.cpp
@@ -3,7 +3,7 @@
 namespace hopper {
 
 PipeType detect_pipe_type(const std::filesystem::path &path) {
-    if (!path.has_extension())
+    if (!path.has_extension() || !std::filesystem::is_fifo(path))
         return PipeType::NONE;
 
     if (path.extension() == ".in")
diff --git a/include/hopper/daemon/daemon.hpp b/include/hopper/daemon/daemon.hpp
@@ -42,6 +42,7 @@ class HopperDaemon {
     void delete_endpoint(uint32_t id);
 
     HopperEndpoint *endpoint_by_watch(int watch);
+    HopperEndpoint *endpoint_by_path(const std::filesystem::path &path);
     void setup_inotify();
     void handle_inotify();
     void handle_root_inotify(struct inotify_event *ev);
diff --git a/include/hopper/daemon/endpoint.hpp b/include/hopper/daemon/endpoint.hpp
@@ -38,7 +38,7 @@ class HopperEndpoint {
     int m_watch_fd;
 
 public:
-    HopperEndpoint(uint32_t id, int watch_fd, std::filesystem::path path);
+    HopperEndpoint(uint32_t id, int watch_fd, std::filesystem::path path, std::string name);
     ~HopperEndpoint();
 
     void on_pipe_readable(uint64_t id);
