diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/crow.h | 2 | ||||
-rw-r--r-- | include/http_connection.h | 89 | ||||
-rw-r--r-- | include/middleware_context.h | 25 | ||||
-rw-r--r-- | include/utility.h | 11 |
4 files changed, 115 insertions, 12 deletions
diff --git a/include/crow.h b/include/crow.h index a4b82df..fdc5206 100644 --- a/include/crow.h +++ b/include/crow.h @@ -82,7 +82,7 @@ namespace crow // middleware using context_t = detail::context<Middlewares...>; template <typename T> - typename T::context& get_middleware_context(const request& req) + typename T::context& get_context(const request& req) { static_assert(black_magic::contains<T, Middlewares...>::value, "App doesn't have the specified middleware type."); auto& ctx = *reinterpret_cast<context_t*>(req.middleware_context); diff --git a/include/http_connection.h b/include/http_connection.h index a8631d9..3a9fe65 100644 --- a/include/http_connection.h +++ b/include/http_connection.h @@ -20,21 +20,53 @@ namespace crow { namespace detail { + template <typename MW, typename Context, typename ParentContext> + void before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx, + decltype(std::declval<MW>().before_handle(std::declval<request&>(), std::declval<response&>(), std::declval<typename MW::context&>()))* dummy = 0) + { + mw.before_handle(req, res, ctx.template get<MW>()); + } + + template <typename MW, typename Context, typename ParentContext> + void before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx, + decltype(std::declval<MW>().before_handle(std::declval<request&>(), std::declval<response&>(), std::declval<typename MW::context&>(), std::declval<Context&>))* dummy = 0) + { + mw.before_handle(req, res, ctx.template get<MW>(), parent_ctx); + } + + template <typename MW, typename Context, typename ParentContext> + void after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx, + decltype(std::declval<MW>().before_handle(std::declval<request&>(), std::declval<response&>(), std::declval<typename MW::context&>()))* dummy = 0) + { + mw.after_handle(req, res, ctx.template get<MW>()); + } + + template <typename MW, typename Context, typename ParentContext> + void after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx, + decltype(std::declval<MW>().before_handle(std::declval<request&>(), std::declval<response&>(), std::declval<typename MW::context&>(), std::declval<Context&>))* dummy = 0) + { + mw.after_handle(req, res, ctx.template get<MW>(), parent_ctx); + } + template <int N, typename Context, typename Container, typename CurrentMW, typename ... Middlewares> bool middleware_call_helper(Container& middlewares, request& req, response& res, Context& ctx) { - // TODO cut ctx to partial_context<0..N-1> - std::get<N>(middlewares).before_handle(req, res, ctx.template get<CurrentMW>(), ctx); + using parent_context_t = typename Context::template partial<N-1>; + using current_context_t = typename Context::template partial<N>; + before_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx)); + if (res.is_completed()) { - std::get<N>(middlewares).after_handle(req, res, ctx.template get<CurrentMW>(), ctx); + after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx)); return true; } - if (middleware_call_helper<N+1, Context, Middlewares...>(middlewares, req, res, ctx)) + + if (middleware_call_helper<N+1, Context, Container, Middlewares...>(middlewares, req, res, ctx)) { - std::get<N>(middlewares).after_handle(req, res, ctx.template get<CurrentMW>(), ctx); + after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx)); return true; } + return false; } @@ -43,6 +75,31 @@ namespace crow { return false; } + + template <int N, typename Context, typename Container> + typename std::enable_if<(N<0)>::type + after_handlers_call_helper(Container& middlewares, Context& context, request& req, response& res) + { + } + + template <int N, typename Context, typename Container> + typename std::enable_if<(N==0)>::type after_handlers_call_helper(Container& middlewares, Context& ctx, request& req, response& res) + { + using parent_context_t = typename Context::template partial<N-1>; + using current_context_t = typename Context::template partial<N>; + using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type; + after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx)); + } + + template <int N, typename Context, typename Container> + typename std::enable_if<(N>0)>::type after_handlers_call_helper(Container& middlewares, Context& ctx, request& req, response& res) + { + using parent_context_t = typename Context::template partial<N-1>; + using current_context_t = typename Context::template partial<N>; + using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type; + after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx)); + after_handlers_call_helper<N-1, Context, Container>(middlewares, ctx, req, res); + } } using namespace boost; @@ -112,7 +169,8 @@ namespace crow cancel_deadline_timer(); bool is_invalid_request = false; - request req = parser_.to_request(); + req_ = std::move(parser_.to_request()); + request& req = req_; if (parser_.check_version(1, 0)) { // HTTP/1.0 @@ -138,17 +196,24 @@ namespace crow need_to_call_after_handlers_ = false; if (!is_invalid_request) { - res.complete_request_handler_ = [this]{ this->complete_request(); }; + res.complete_request_handler_ = []{}; res.is_alive_helper_ = [this]()->bool{ return socket_.is_open(); }; + ctx_ = detail::context<Middlewares...>(); req.middleware_context = (void*)&ctx_; detail::middleware_call_helper<0, decltype(ctx_), decltype(middlewares_), Middlewares...>(middlewares_, req, res, ctx_); + CROW_LOG_DEBUG << "ALATDA " << req.url; if (!res.completed_) { + res.complete_request_handler_ = [this]{ this->complete_request(); }; need_to_call_after_handlers_ = true; handler_->handle(req, res); } + else + { + complete_request(); + } } else { @@ -158,11 +223,16 @@ namespace crow void complete_request() { - CROW_LOG_INFO << "Response: " << this << ' ' << res.code << ' ' << close_connection_; + CROW_LOG_INFO << "Response: " << this << ' ' << req_.url << ' ' << res.code << ' ' << close_connection_; if (need_to_call_after_handlers_) { - // TODO call all of after_handlers + // call all after_handler of middlewares + detail::after_handlers_call_helper< + ((int)sizeof...(Middlewares)-1), + decltype(ctx_), + decltype(middlewares_)> + (middlewares_, ctx_, req_, res); } //auto self = this->shared_from_this(); @@ -381,6 +451,7 @@ namespace crow boost::array<char, 4096> buffer_; HTTPParser<Connection> parser_; + request req_; response res; bool close_connection_ = false; diff --git a/include/middleware_context.h b/include/middleware_context.h index 6dbf923..980a821 100644 --- a/include/middleware_context.h +++ b/include/middleware_context.h @@ -11,22 +11,47 @@ namespace crow : public black_magic::pop_back<Middlewares...>::template rebind<partial_context> , public black_magic::last_element_type<Middlewares...>::type::context { + using parent_context = typename black_magic::pop_back<Middlewares...>::template rebind<::crow::detail::partial_context>; + template <int N> + using partial = typename std::conditional<N == sizeof...(Middlewares)-1, partial_context, typename parent_context::template partial<N>>::type; + + template <typename T> + typename T::context& get() + { + return static_cast<typename T::context&>(*this); + } }; template <> struct partial_context<> { + template <int> + using partial = partial_context; }; + template <int N, typename Context, typename Container, typename CurrentMW, typename ... Middlewares> + bool middleware_call_helper(Container& middlewares, request& req, response& res, Context& ctx); + template <typename ... Middlewares> struct context : private partial_context<Middlewares...> //struct context : private Middlewares::context... // simple but less type-safe { + template <int N, typename Context, typename Container> + friend typename std::enable_if<(N==0)>::type after_handlers_call_helper(Container& middlewares, Context& ctx, request& req, response& res); + template <int N, typename Context, typename Container> + friend typename std::enable_if<(N>0)>::type after_handlers_call_helper(Container& middlewares, Context& ctx, request& req, response& res); + + template <int N, typename Context, typename Container, typename CurrentMW, typename ... Middlewares2> + friend bool middleware_call_helper(Container& middlewares, request& req, response& res, Context& ctx); + template <typename T> typename T::context& get() { return static_cast<typename T::context&>(*this); } + + template <int N> + using partial = typename partial_context<Middlewares...>::template partial<N>; }; } } diff --git a/include/utility.h b/include/utility.h index 35ea848..b2e61f1 100644 --- a/include/utility.h +++ b/include/utility.h @@ -256,12 +256,14 @@ template <typename F, typename Set> struct pop_back_helper<seq<N...>, Tuple> { template <template <typename ... Args> class U> - using rebind = U<std::tuple_element<N, Tuple>...>; + using rebind = U<typename std::tuple_element<N, Tuple>::type...>; }; template <typename ... T> - struct pop_back : public pop_back_helper<typename gen_seq<sizeof...(T)-1>::type, std::tuple<T...>> + struct pop_back //: public pop_back_helper<typename gen_seq<sizeof...(T)-1>::type, std::tuple<T...>> { + template <template <typename ... Args> class U> + using rebind = typename pop_back_helper<typename gen_seq<sizeof...(T)-1>::type, std::tuple<T...>>::template rebind<U>; }; template <> @@ -284,5 +286,10 @@ template <typename F, typename Set> template < typename Tp > struct contains<Tp> : std::false_type {}; + + template <typename T> + struct empty_context + { + }; } } |