Add access to helper

.env.example

@@ -2,6 +2,5 @@ WEBSITE_ENV=
 WEBSITE_URL=
 MICROCMS_SERVICE_DOMAIN=
 MICROCMS_API_KEY=
-MICROCMS_WEBHOOK_KEY=
 CLOUDFLARE_ZONE_ID=
 CLOUDFLARE_API_KEY=

qlfile

@@ -11,4 +11,3 @@ ql local-time
 ql function-cache
 ql jonathan
 ql access
-ql flexi-streams

qlfile.lock

@@ -54,7 +54,3 @@
  (:class qlot/source/ql:source-ql
   :initargs (:%version :latest)
   :version "ql-2024-10-12"))
-("flexi-streams" .
- (:class qlot/source/ql:source-ql
-  :initargs (:%version :latest)
-  :version "ql-2024-10-12"))

src/components/header.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/components/header
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:export #:~header))
 (in-package #:website/components/header)
 

src/components/metadata.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/components/metadata
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:import-from #:website/lib/env
                 #:website-url)
   (:export #:~metadata))

src/helper.lisp

@@ -1,26 +1,15 @@
 (uiop:define-package #:website/helper
-  (:use #:cl
+  (:use #:cl)
-        #:jingle)
+  (:use-reexport #:hsx
-  (:import-from #:flexi-streams
+                 #:jingle
-                #:make-flexi-stream)
+                 #:jonathan
-  (:import-from #:jonathan
+                 #:access)
-                #:parse)
+  (:export #:api-p))
-  (:export #:api-request-p
-           #:get-request-body-plist))
 (in-package #:website/helper)
 
 (defun starts-with-p (prefix string)
   (let ((pos (search prefix string :start1 0 :end1 (length prefix) :start2 0)))
     (and pos (= pos 0))))
 
-(defun api-request-p ()
+(defun api-p ()
   (starts-with-p "/api/" (request-uri *request*)))
-
-(defun get-request-body-plist ()
-  (parse
-   (let ((text-stream (make-flexi-stream (request-raw-body *request*)
-                                         :external-format :utf-8)))
-     (with-output-to-string (out)
-       (loop :for char := (read-char text-stream nil)
-             :while char
-             :do (write-char char out))))))

src/lib/cms.lisp

@@ -17,19 +17,21 @@
 (setf microcms:*service-domain* (microcms-service-domain))
 (setf microcms:*api-key* (microcms-api-key))
 
-(defmacro memorize (name)
+(defmacro memorize (name timeout)
   (let ((origin (gensym)))
     `(progn
        (setf (fdefinition ',origin) (fdefinition ',name))
-       (defcached ,name (&key query)
+       (defcached (,name :timeout ,timeout) (&key query)
          (,origin :query query)))))
 
+(defparameter *timeout* 60)
+
 (define-object-client about)
-(memorize get-about)
+(memorize get-about *timeout*)
 
 (define-object-client work)
-(memorize get-work)
+(memorize get-work *timeout*)
 
 (define-list-client blog)
-(memorize get-blog-list)
+(memorize get-blog-list *timeout*)
-(memorize get-blog-detail)
+(memorize get-blog-detail *timeout*)

src/lib/env.lisp

@@ -18,4 +18,3 @@
 (env-var website-url "WEBSITE_URL")
 (env-var microcms-service-domain "MICROCMS_SERVICE_DOMAIN")
 (env-var microcms-api-key "MICROCMS_API_KEY")
-(env-var microcms-webhook-key "MICROCMS_WEBHOOK_KEY")

src/renderer.lisp

@@ -1,11 +1,8 @@
 (defpackage #:website/renderer
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
+  (:import-from #:hsx/element
-  (:import-from #:jonathan
+                #:element)
-                #:to-json)
-  (:import-from #:website/helper
-                #:api-request-p)
   (:import-from #:website/components/metadata
                 #:~metadata)
   (:import-from #:website/components/scripts
@@ -17,7 +14,7 @@
 (defmethod jingle:process-response :around ((app jingle:app) result)
   (when (eq (request-method *request*) :get)
     (set-response-header :cache-control "public, max-age=60"))
-  (cond ((api-request-p)
+  (cond ((api-p)
          (set-response-header :content-type "application/json; charset=utf-8") 
          (call-next-method app (to-json result)))
         (t

src/routes/about.lisp

@@ -1,8 +1,6 @@
 (defpackage #:website/routes/about
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle
-        #:access)
   (:import-from #:website/lib/cms
                 #:get-about)
   (:import-from #:website/lib/time

src/routes/api/revalidate.lisp

@@ -1,24 +0,0 @@
-(defpackage #:website/routes/api/revalidate
-  (:use #:cl
-        #:jingle)
-  (:import-from #:function-cache
-                #:clear-cache)
-  (:import-from #:website/lib/env
-                #:microcms-webhook-key)
-  (:import-from #:website/helper
-                #:get-request-body-plist)
-  (:import-from #:website/lib/cms
-                #:get-about)
-  (:export #:handle-post))
-(in-package #:website/routes/api/revalidate)
-
-(defun handle-post (params)
-  (declare (ignore params))
-  (unless (string= (car (get-request-header "X-MICROCMS-WEBHOOK-KEY"))
-                   (microcms-webhook-key))
-    (set-response-status :unauthorized)
-    (return-from handle-post '(:|message| "Invalid token")))
-  (let* ((body (get-request-body-plist))
-         (api (getf body :|api|)))
-    (cond ((string= api "about") (clear-cache 'get-about)))
-    '(:|message| "ok")))

src/routes/blog.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/blog
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:export #:handle-get))
 (in-package #:website/routes/blog)
 

src/routes/index.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/index
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:access)
   (:import-from #:website/lib/cms
                 #:get-about)
   (:export #:handle-get

src/routes/not-found.lisp

@@ -1,9 +1,6 @@
 (defpackage #:website/routes/not-found
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
-  (:import-from #:website/helper
-                #:api-request-p)
   (:export #:handle-not-found))
 (in-package #:website/routes/not-found)
 
@@ -14,7 +11,7 @@
 
 (defun handle-not-found ()
   (setf (context :metadata) *metadata*)
-  (if (api-request-p)
+  (if (api-p)
       '(:|message| "404 Not Found")
       (hsx
        (div :class "flex flex-col h-full items-center justify-center gap-y-6"

src/routes/work.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/work
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:import-from #:website/lib/cms
                 #:get-work)
   (:import-from #:website/lib/time