Release Nageru 1.7.2.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 314a34a4a1cd377b2c942b934ca99f2d1dfefee2..57c649b61158c6f73b498aeca6556b97bc52f179 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -3,22 +3,31 @@
 
 // A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <atomic>
 #include <condition_variable>
 #include <deque>
-#include <memory>
+#include <functional>
 #include <mutex>
 #include <set>
 #include <string>
+#include <unordered_map>
+#include <utility>
+
+extern "C" {
+#include <libavutil/rational.h>
+}
 
 struct MHD_Connection;
 struct MHD_Daemon;
 
 class HTTPD {
 public:
+       // Returns a pair of content and content-type.
+       using EndpointCallback = std::function<std::pair<std::string, std::string>()>;
+
        HTTPD();
        ~HTTPD();
 
@@ -27,8 +36,21 @@ public:
                header = data;
        }
 
+       // Should be called before start() (due to threading issues).
+       enum CORSPolicy {
+               NO_CORS_POLICY,
+               ALLOW_ALL_ORIGINS
+       };
+       void add_endpoint(const std::string &url, const EndpointCallback &callback, CORSPolicy cors_policy) {
+               endpoints[url] = Endpoint{ callback, cors_policy };
+       }
+
        void start(int port);
-       void add_data(const char *buf, size_t size, bool keyframe);
+       void stop();
+       void add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase);
+       int64_t get_num_connected_clients() const {
+               return metric_num_connected_clients.load();
+       }
 
 private:
        static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -43,10 +65,6 @@ private:
 
        static void free_stream(void *cls);
 
-       static void request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
-       void request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
 
        class Stream {
        public:
@@ -54,7 +72,7 @@ private:
                        FRAMING_RAW,
                        FRAMING_METACUBE
                };
-               Stream(Framing framing) : framing(framing) {}
+               Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
 
                static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
                ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
@@ -64,10 +82,12 @@ private:
                        DATA_TYPE_KEYFRAME,
                        DATA_TYPE_OTHER
                };
-               void add_data(const char *buf, size_t size, DataType data_type);
+               void add_data(const char *buf, size_t size, DataType data_type, int64_t time, AVRational timebase);
                void stop();
+               HTTPD *get_parent() const { return parent; }
 
        private:
+               HTTPD *parent;
                Framing framing;
 
                std::mutex buffer_mutex;
@@ -81,7 +101,15 @@ private:
        MHD_Daemon *mhd = nullptr;
        std::mutex streams_mutex;
        std::set<Stream *> streams;  // Not owned.
+       struct Endpoint {
+               EndpointCallback callback;
+               CORSPolicy cors_policy;
+       };
+       std::unordered_map<std::string, Endpoint> endpoints;
        std::string header;
+
+       // Metrics.
+       std::atomic<int64_t> metric_num_connected_clients{0};
 };
 
 #endif  // !defined(_HTTPD_H)