luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-22 02:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #693 from bsless/faster-routes

Browse source 
Speed up routes and inline it in code ring handler
This commit is contained in:
Tommi Reiman 2024-08-27 13:58:57 +03:00 committed by GitHub
commit 517ae8ffc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
modules/reitit-ring/src/reitit/ring.cljc
View file

@ -133,21 +133,38 @@
" Use :reitit.ring/default-options-endpoint instead.")))
(r/router data opts))))
(defn routes
"Create a ring handler by combining several handlers into one."
[& handlers]
(if-let [single-arity (some->> handlers (keep identity) (seq) (apply some-fn))]
(defn- comp-handlers
"Compose two ring handlers such that if the first has an empty response
the second will be invoked."
([handler]
handler)
([handler1 handler2]
(let [single-arity (fn [request]
(or (handler1 request) (handler2 request)))
multi-arity (fn [request respond raise]
(handler1 request (fn [response]
(if response
(respond response)
(handler2 request respond raise))) raise))]
(fn
([request]
(single-arity request))
([request respond raise]
(letfn [(f [handlers]
(if (seq handlers)
(let [handler (first handlers)
respond' #(if % (respond %) (f (rest handlers)))]
(handler request respond' raise))
(respond nil)))]
(f handlers))))))
(multi-arity request respond raise))))))
(defn routes
"Create a ring handler by combining several handlers into one."
{:arglists '([& handlers])}
([] nil)
([handler] handler)
([handler1 handler2]
(cond
(and handler1 handler2) (comp-handlers handler1 handler2)
handler1 handler1
handler2 handler2
:else nil))
([handler1 handler2 & handlers]
(reduce routes (routes handler1 handler2) handlers)))
(defn redirect-trailing-slash-handler
"A ring handler that redirects a missing path if there is an
@ -363,7 +380,10 @@
result (:result match)
handler (-> result method :handler (or default-handler))
request (enrich-request request path-params match router)]
((routes handler default-handler) request respond raise))
(handler request (fn [response]
(if response
(respond response)
(default-handler request respond raise))) raise))
(default-handler (enrich-default-request request router) respond raise))
nil)))
{::r/router router}))))