Rename middlewares

This commit is contained in:
Akira Tempaku 2024-04-22 16:07:20 +09:00
parent 431e0c8de7
commit baf24e7cfd
6 changed files with 26 additions and 28 deletions

View file

@ -23,14 +23,12 @@
(defun setup ()
(jg:clear-middlewares *app*)
(jg:clear-routing-rules *app*)
(fbr:assign-routes *app*
:system "hp"
:directory "src/routes")
(jg:install-middleware *app* mw:*recovery*)
(jg:install-middleware *app* mw:*serve-assets*)
(jg:install-middleware *app* mw:*normalize-path*)
(jg:install-middleware *app* mw:*accesslog*)
(jg:install-middleware *app* mw:*block-unsupported-browser*))
(fbr:assign-routes *app* :system "hp" :directory "src/routes")
(jg:install-middleware *app* mw:*path-normalizer*)
(jg:install-middleware *app* mw:*assets-server*)
(jg:install-middleware *app* mw:*access-logger*)
(jg:install-middleware *app* mw:*access-blocker*)
(jg:install-middleware *app* mw:*recoverer*))
(defun update ()
(stop)

View file

@ -1,10 +1,10 @@
(defpackage #:hp/middlewares/block-unsupported-browser
(defpackage #:hp/middlewares/access-blocker
(:use #:cl)
(:local-nicknames (#:re #:cl-ppcre))
(:export #:*block-unsupported-browser*))
(in-package #:hp/middlewares/block-unsupported-browser)
(:export #:*access-blocker*))
(in-package #:hp/middlewares/access-blocker)
(defparameter *block-unsupported-browser*
(defparameter *access-blocker*
(lambda (app)
(lambda (env)
(let ((user-agent (gethash "user-agent" (getf env :headers))))

View file

@ -1,12 +1,12 @@
(defpackage #:hp/middlewares/accesslog
(defpackage #:hp/middlewares/access-logger
(:use #:cl)
(:import-from #:lack.middleware.accesslog
#:*lack-middleware-accesslog*)
(:import-from #:log4cl)
(:export *accesslog*))
(in-package #:hp/middlewares/accesslog)
(:export *access-logger*))
(in-package #:hp/middlewares/access-logger)
(defparameter *accesslog*
(defparameter *access-logger*
(lambda (app)
(funcall *lack-middleware-accesslog*
app

View file

@ -1,15 +1,15 @@
(defpackage #:hp/middlewares/serve-assets
(defpackage #:hp/middlewares/assets-server
(:use #:cl)
(:import-from #:lack.middleware.static
#:*lack-middleware-static*)
(:export #:*serve-assets*))
(in-package #:hp/middlewares/serve-assets)
(:export #:*assets-server*))
(in-package #:hp/middlewares/assets-server)
(defun exist-public-file-p (path)
(let ((pathname (probe-file (concatenate 'string "assets" path))))
(and pathname (pathname-name pathname))))
(defparameter *serve-assets*
(defparameter *assets-server*
(lambda (app)
(funcall *lack-middleware-static*
app

View file

@ -1,8 +1,8 @@
(defpackage #:hp/middlewares/normalize-path
(defpackage #:hp/middlewares/path-normalizer
(:use #:cl)
(:local-nicknames (#:re #:cl-ppcre))
(:export #:*normalize-path*))
(in-package #:hp/middlewares/normalize-path)
(:export #:*path-normalizer*))
(in-package #:hp/middlewares/path-normalizer)
(defun has-trailing-slash-p (path)
(and (not (string= path "/")) (re:scan "\/$" path)))
@ -10,7 +10,7 @@
(defun remove-trailing-slash (path)
(re:regex-replace "\/$" path ""))
(defparameter *normalize-path*
(defparameter *path-normalizer*
(lambda (app)
(lambda (env)
(let ((path (getf env :request-uri)))

View file

@ -1,17 +1,17 @@
(defpackage #:hp/middlewares/recovery
(defpackage #:hp/middlewares/recoverer
(:use #:cl)
(:import-from #:log4cl)
(:local-nicknames (#:tb #:trivial-backtrace))
(:local-nicknames (#:cfg #:hp/config/env))
(:export #:*recovery*))
(in-package #:hp/middlewares/recovery)
(:export #:*recoverer*))
(in-package #:hp/middlewares/recoverer)
(defun message (condition)
(if (cfg:dev-mode-p)
(tb:print-backtrace condition :output nil)
"Internal Server Error"))
(defparameter *recovery*
(defparameter *recoverer*
(lambda (app)
(lambda (env)
(handler-case