From e96380307b285d9f99e54d074dd940e3c53d569e Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sat, 18 Nov 2023 19:29:41 +0600 Subject: [PATCH] :building_construction: Used middleware.Chain in main with LogFmt logger --- main.go | 222 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 112 insertions(+), 110 deletions(-) diff --git a/main.go b/main.go index cfc391a..e92e784 100644 --- a/main.go +++ b/main.go @@ -28,6 +28,7 @@ import ( "source.toby3d.me/toby3d/home/internal/common" "source.toby3d.me/toby3d/home/internal/domain" + "source.toby3d.me/toby3d/home/internal/middleware" "source.toby3d.me/toby3d/home/internal/page" pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs" pageucase "source.toby3d.me/toby3d/home/internal/page/usecase" @@ -81,118 +82,119 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) { themer := themeucase.NewThemeUseCase(themes) pages := pagefsrepo.NewFileSystemPageRepository(contentDir) pager := pageucase.NewPageUseCase(pages, resources) + handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // TODO(toby3d): use exists static use case or split that on static and resource modules? + // INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it + // first before deep down to any page or it's resource which might be secured by middleware or + // something else. + static, err := staticer.Do(r.Context(), strings.TrimPrefix(r.URL.Path, "/")) + if err == nil { + http.ServeContent(w, r, static.Name(), domain.ResourceModTime(static), static) + return + } + + lang := domain.LanguageUnd + + s, err := siter.Do(r.Context(), lang) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + + return + } + + if s.IsMultiLingual() { + head, tail := urlutil.ShiftPath(r.URL.Path) + + if head == "" { + 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, _, err := language.ParseAcceptLanguage( + r.Header.Get(common.HeaderAcceptLanguage)) + if err != nil || len(requested) == 0 { + requested = append(requested, language.English) + } + + matched, _, _ := language.NewMatcher(supported).Match(requested...) + lang = domain.NewLanguage(matched.String()) + + http.Redirect(w, r, "/"+lang.Lang()+"/", http.StatusSeeOther) + + return + } + + lang = domain.NewLanguage(head) + r.URL.Path = tail + } + + if s, err = siter.Do(r.Context(), lang); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + + return + } + + p, err := pager.Do(r.Context(), lang, r.URL.Path) + if err != nil { + if !errors.Is(err, page.ErrNotExist) { + http.Error(w, err.Error(), http.StatusInternalServerError) + + return + } + + res, err := resourcer.Do(r.Context(), r.URL.Path) + if err != nil { + if errors.Is(err, fs.ErrNotExist) { + http.Error(w, err.Error(), http.StatusNotFound) + + return + } + + http.Error(w, err.Error(), http.StatusInternalServerError) + + return + } + + http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), res) + + return + } + + contentLanguage := make([]string, len(p.Translations)) + for i := range p.Translations { + contentLanguage[i] = p.Translations[i].Language.Code() + } + + w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", ")) + + tpl, err := themer.Do(r.Context()) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + + return + } + + w.Header().Set(common.HeaderContentType, common.MIMETextHTMLCharsetUTF8) + if err = tpl.Execute(w, &Context{ + Site: s, + Page: p, + }); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } + }) + chain := middleware.Chain{middleware.LogFmt()} server := &http.Server{ - Addr: config.AddrPort().String(), - Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // TODO(toby3d): use exists static use case or split that on static and resource modules? - // INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it - // first before deep down to any page or it's resource which might be secured by middleware or - // something else. - static, err := staticer.Do(r.Context(), strings.TrimPrefix(r.URL.Path, "/")) - if err == nil { - http.ServeContent(w, r, static.Name(), domain.ResourceModTime(static), static) - - return - } - - lang := domain.LanguageUnd - - s, err := siter.Do(r.Context(), lang) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - - return - } - - if s.IsMultiLingual() { - head, tail := urlutil.ShiftPath(r.URL.Path) - - if head == "" { - 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, _, err := language.ParseAcceptLanguage( - r.Header.Get(common.HeaderAcceptLanguage)) - if err != nil || len(requested) == 0 { - requested = append(requested, language.English) - } - - matched, _, _ := language.NewMatcher(supported).Match(requested...) - lang = domain.NewLanguage(matched.String()) - - http.Redirect(w, r, "/"+lang.Lang()+"/", http.StatusSeeOther) - - return - } - - lang = domain.NewLanguage(head) - r.URL.Path = tail - } - - if s, err = siter.Do(r.Context(), lang); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - - return - } - - p, err := pager.Do(r.Context(), lang, r.URL.Path) - if err != nil { - if !errors.Is(err, page.ErrNotExist) { - http.Error(w, err.Error(), http.StatusInternalServerError) - - return - } - - res, err := resourcer.Do(r.Context(), r.URL.Path) - if err != nil { - if errors.Is(err, fs.ErrNotExist) { - http.Error(w, err.Error(), http.StatusNotFound) - - return - } - - http.Error(w, err.Error(), http.StatusInternalServerError) - - return - } - - http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), res) - - return - } - - contentLanguage := make([]string, len(p.Translations)) - for i := range p.Translations { - contentLanguage[i] = p.Translations[i].Language.Code() - } - - w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", ")) - - tpl, err := themer.Do(r.Context()) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - - return - } - - w.Header().Set(common.HeaderContentType, common.MIMETextHTMLCharsetUTF8) - if err = tpl.Execute(w, &Context{ - Site: s, - Page: p, - }); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } - }), + Addr: config.AddrPort().String(), + Handler: chain.Handler(handler), ErrorLog: logger, BaseContext: func(ln net.Listener) context.Context { return ctx }, WriteTimeout: 500 * time.Millisecond,