🏗️ Reuse HTTP delivery of content modules
This commit is contained in:
parent
c420a83618
commit
495fbc523a
|
@ -1,35 +1,31 @@
|
||||||
package home
|
package home
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"log"
|
"log"
|
||||||
"mime"
|
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"golang.org/x/text/language"
|
|
||||||
|
|
||||||
"source.toby3d.me/toby3d/home/internal/common"
|
|
||||||
"source.toby3d.me/toby3d/home/internal/domain"
|
"source.toby3d.me/toby3d/home/internal/domain"
|
||||||
entryhttpdelivery "source.toby3d.me/toby3d/home/internal/entry/delivery/http"
|
|
||||||
pagefsrepo "source.toby3d.me/toby3d/home/internal/entry/repository/fs"
|
pagefsrepo "source.toby3d.me/toby3d/home/internal/entry/repository/fs"
|
||||||
pageucase "source.toby3d.me/toby3d/home/internal/entry/usecase"
|
pageucase "source.toby3d.me/toby3d/home/internal/entry/usecase"
|
||||||
"source.toby3d.me/toby3d/home/internal/middleware"
|
"source.toby3d.me/toby3d/home/internal/middleware"
|
||||||
|
resourcehttpdelivery "source.toby3d.me/toby3d/home/internal/resource/delivery/http"
|
||||||
resourcefsrepo "source.toby3d.me/toby3d/home/internal/resource/repository/fs"
|
resourcefsrepo "source.toby3d.me/toby3d/home/internal/resource/repository/fs"
|
||||||
resourceucase "source.toby3d.me/toby3d/home/internal/resource/usecase"
|
resourceucase "source.toby3d.me/toby3d/home/internal/resource/usecase"
|
||||||
servercase "source.toby3d.me/toby3d/home/internal/server/usecase"
|
servercase "source.toby3d.me/toby3d/home/internal/server/usecase"
|
||||||
|
sitehttpdelivery "source.toby3d.me/toby3d/home/internal/site/delivery/http"
|
||||||
sitefsrepo "source.toby3d.me/toby3d/home/internal/site/repository/fs"
|
sitefsrepo "source.toby3d.me/toby3d/home/internal/site/repository/fs"
|
||||||
siteucase "source.toby3d.me/toby3d/home/internal/site/usecase"
|
siteucase "source.toby3d.me/toby3d/home/internal/site/usecase"
|
||||||
statichttpdelivery "source.toby3d.me/toby3d/home/internal/static/delivery/http"
|
statichttpdelivery "source.toby3d.me/toby3d/home/internal/static/delivery/http"
|
||||||
staticfsrepo "source.toby3d.me/toby3d/home/internal/static/repository/fs"
|
staticfsrepo "source.toby3d.me/toby3d/home/internal/static/repository/fs"
|
||||||
staticucase "source.toby3d.me/toby3d/home/internal/static/usecase"
|
staticucase "source.toby3d.me/toby3d/home/internal/static/usecase"
|
||||||
|
themehttpdelivery "source.toby3d.me/toby3d/home/internal/theme/delivery/http"
|
||||||
themefsrepo "source.toby3d.me/toby3d/home/internal/theme/repository/fs"
|
themefsrepo "source.toby3d.me/toby3d/home/internal/theme/repository/fs"
|
||||||
themeucase "source.toby3d.me/toby3d/home/internal/theme/usecase"
|
themeucase "source.toby3d.me/toby3d/home/internal/theme/usecase"
|
||||||
"source.toby3d.me/toby3d/home/internal/urlutil"
|
"source.toby3d.me/toby3d/home/internal/urlutil"
|
||||||
|
@ -63,8 +59,10 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
serverer := servercase.NewServerUseCase(sites)
|
serverer := servercase.NewServerUseCase(sites)
|
||||||
webfingerer := webfingerucase.NewWebFingerUseCase(sites)
|
webfingerer := webfingerucase.NewWebFingerUseCase(sites)
|
||||||
webfingerHandler := webfingerhttpdelivery.NewHandler(webfingerer)
|
webfingerHandler := webfingerhttpdelivery.NewHandler(webfingerer)
|
||||||
entryHandler := entryhttpdelivery.NewHandler(siter, entrier, themer)
|
themeHandler := themehttpdelivery.NewHandler(themer)
|
||||||
|
resourceHandler := resourcehttpdelivery.NewHandler(resourcer, contentDir)
|
||||||
staticHandler := statichttpdelivery.NewHandler(staticer)
|
staticHandler := statichttpdelivery.NewHandler(staticer)
|
||||||
|
siteHandler := sitehttpdelivery.NewHandler(siter)
|
||||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
// NOTE(toby3d): any file in $HOME_STATIC_DIR is public and
|
// NOTE(toby3d): any file in $HOME_STATIC_DIR is public and
|
||||||
// unprotected by design, so it's safe to search it first before
|
// unprotected by design, so it's safe to search it first before
|
||||||
|
@ -76,55 +74,9 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
head, tail := urlutil.ShiftPath(r.URL.Path)
|
head, tail := urlutil.ShiftPath(r.URL.Path)
|
||||||
|
|
||||||
switch strings.ToLower(head) {
|
switch strings.ToLower(head) {
|
||||||
case "": // NOTE(toby3d): render home page or redirect to home subfolder.
|
|
||||||
mediaType, _, _ := mime.ParseMediaType(r.Header.Get(common.HeaderAccept))
|
|
||||||
|
|
||||||
switch mediaType {
|
|
||||||
case common.MIMEApplicationLdJSON:
|
|
||||||
entryHandler.ServeHTTP(w, r)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE(toby3d): read $HOME_CONTENT_DIR/index.md as a
|
|
||||||
// source of truth and global settings for any child
|
|
||||||
// entry.
|
|
||||||
s, err := siter.Do(r.Context(), domain.LanguageUnd)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.IsMultiLingual() {
|
|
||||||
supported := make([]language.Tag, len(s.Languages))
|
|
||||||
for i := range s.Languages {
|
|
||||||
supported[i] = language.Make(s.Languages[i].Lang())
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.DefaultLanguage != domain.LanguageUnd {
|
|
||||||
supported = append([]language.Tag{language.Make(s.DefaultLanguage.Code())},
|
|
||||||
supported...)
|
|
||||||
}
|
|
||||||
|
|
||||||
requested, _, _ := language.ParseAcceptLanguage(r.Header.Get(
|
|
||||||
common.HeaderAcceptLanguage))
|
|
||||||
if len(requested) == 0 {
|
|
||||||
requested = append(requested, language.English)
|
|
||||||
}
|
|
||||||
|
|
||||||
matched, _, _ := language.NewMatcher(supported).Match(requested...)
|
|
||||||
http.Redirect(w, r, "/"+domain.NewLanguage(matched.String()).Lang()+"/",
|
|
||||||
http.StatusSeeOther)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
case ".well-known":
|
case ".well-known":
|
||||||
switch strings.ToLower(tail) {
|
switch strings.ToLower(tail) {
|
||||||
case "/webfinger":
|
case "/webfinger":
|
||||||
|
@ -134,30 +86,39 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if res, err := resourcer.Do(r.Context(), tail); err == nil {
|
// NOTE(toby3d): read $HOME_CONTENT_DIR/index.md as a source of
|
||||||
// TODO(toby3d) : ugly workaround, must be refactored
|
// truth and global settings for any child entry.
|
||||||
resFile, err := contentDir.Open(res.File.Filename())
|
site, handler, err := siteHandler.Handle(r.Context(), head)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, "cannot open resource: "+err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer resFile.Close()
|
|
||||||
|
|
||||||
resBytes, err := io.ReadAll(resFile)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "cannot read resource: "+err.Error(), http.StatusInternalServerError)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer resFile.Close()
|
|
||||||
|
|
||||||
http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), bytes.NewReader(resBytes))
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
entryHandler.ServeHTTP(w, r)
|
if handler != nil {
|
||||||
|
handler.ServeHTTP(w, r)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if site.IsMultiLingual() {
|
||||||
|
r.URL.Path = tail
|
||||||
|
}
|
||||||
|
|
||||||
|
if handler, err = resourceHandler.Handle(r.Context(), r.URL.Path); err == nil {
|
||||||
|
handler.ServeHTTP(w, r)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
entry, err := entrier.Do(r.Context(), site.Language, r.URL.Path)
|
||||||
|
if err != nil {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
themeHandler.Handle(site, entry).ServeHTTP(w, r)
|
||||||
})
|
})
|
||||||
chain := middleware.Chain{
|
chain := middleware.Chain{
|
||||||
// middleware.LogFmt(),
|
// middleware.LogFmt(),
|
||||||
|
|
Loading…
Reference in New Issue