org1/gitea-pages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持模板渲染 / 修复 bug

Browse Source
This commit is contained in:
dragon
2025-04-15 16:31:19 +08:00
parent b505b6a5fb
commit bd37e64c1c
10 changed files with 226 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/core/domain.go
View File

@@ -6,6 +6,8 @@ import (
"regexp"
"strings"
"code.d7z.net/d7z-project/gitea-pages/pkg/renders"
"code.d7z.net/d7z-project/gitea-pages/pkg/utils"
"github.com/pkg/errors"
@@ -43,6 +45,17 @@ func (m *PageDomainContent) CacheKey() string {
return fmt.Sprintf("%s/%s/%s/%s", m.Owner, m.Repo, m.CommitID, m.Path)
}
func (m *PageDomainContent) TryRender(path ...string) renders.Render {
for _, s := range path {
for _, compiler := range m.rendersL {
if compiler.regex.Match(s) {
return compiler.Render
}
}
}
return nil
}
func (p *PageDomain) ParseDomainMeta(domain, path, branch string) (*PageDomainContent, error) {
if branch == "" {
branch = p.defaultBranch
@@ -93,6 +106,8 @@ func (p *PageDomain) ReturnMeta(owner string, repo string, branch string, path [
}
}
return rel, nil
} else {
zap.L().Debug("查询错误", zap.Error(err))
}
return nil, os.ErrNotExist
return nil, errors.Wrapf(os.ErrNotExist, strings.Join(path, "/"))
}

66
pkg/core/meta.go
View File

@@ -10,6 +10,10 @@ import (
"strings"
"time"
"code.d7z.net/d7z-project/gitea-pages/pkg/renders"
"github.com/gobwas/glob"
"go.uber.org/zap"
"github.com/pkg/errors"
@@ -29,17 +33,33 @@ type ServerMeta struct {
locker *utils.Locker
}
type renderCompiler struct {
regex glob.Glob
renders.Render
}
type PageMetaContent struct {
CommitID string `json:"id"` // 提交 COMMIT ID
IsPage bool `json:"pg"` // 是否为 Page
Domain string `json:"domain"` // 匹配的域名
HistoryRouteMode bool `json:"historyRouteMode"` // 路由模式
CustomNotFound bool `json:"404"` // 注册了自定义 404 页面
LastModified time.Time `json:"up"` // 上次更新时间
CommitID string `json:"id"` // 提交 COMMIT ID
IsPage bool `json:"pg"` // 是否为 Page
Domain string `json:"domain"` // 匹配的域名
HistoryRouteMode bool `json:"historyRouteMode"` // 路由模式
CustomNotFound bool `json:"404"` // 注册了自定义 404 页面
LastModified time.Time `json:"up"` // 上次更新时间
Renders map[string]string `json:"renders"` // 配置的渲染器
rendersL []*renderCompiler
}
func (m *PageMetaContent) From(data string) error {
return json.Unmarshal([]byte(data), m)
err := json.Unmarshal([]byte(data), m)
clear(m.rendersL)
for key, g := range m.Renders {
m.rendersL = append(m.rendersL, &renderCompiler{
regex: glob.MustCompile(g),
Render: renders.GetRender(key),
})
}
return err
}
func (m *PageMetaContent) String() string {
@@ -53,7 +73,8 @@ func NewServerMeta(client *http.Client, backend Backend, config utils.Config, tt
func (s *ServerMeta) GetMeta(owner, repo, branch string) (*PageMetaContent, error) {
rel := &PageMetaContent{
IsPage: false,
IsPage: false,
Renders: make(map[string]string),
}
if repos, err := s.Repos(owner); err != nil {
return nil, err
@@ -111,11 +132,9 @@ func (s *ServerMeta) GetMeta(owner, repo, branch string) (*PageMetaContent, erro
rel.IsPage = true
}
if find, _ := s.FileExists(owner, repo, rel.CommitID, "404.html"); !find {
rel.CustomNotFound = true
rel.CustomNotFound = find
}
if cname, err := s.ReadString(owner, repo, rel.CommitID, "CNAME"); err != nil && !errors.Is(err, os.ErrNotExist) {
return nil, err
} else {
if cname, err := s.ReadString(owner, repo, rel.CommitID, "CNAME"); err == nil {
cname = strings.TrimSpace(cname)
if regexpHostname.MatchString(cname) {
rel.Domain = cname
@@ -123,6 +142,29 @@ func (s *ServerMeta) GetMeta(owner, repo, branch string) (*PageMetaContent, erro
zap.L().Debug("指定的 CNAME 不合法", zap.String("cname", cname))
}
}
if r, err := s.ReadString(owner, repo, rel.CommitID, ".render"); err == nil {
for _, render := range strings.Split(r, "\n") {
render = strings.TrimSpace(render)
if strings.HasPrefix(render, "#") {
continue
}
before, after, found := strings.Cut(render, " ")
before = strings.TrimSpace(before)
after = strings.TrimSpace(after)
if found {
if r := renders.GetRender(before); r != nil {
if g, err := glob.Compile(after); err == nil {
rel.Renders[before] = after
rel.rendersL = append(rel.rendersL, &renderCompiler{
regex: g,
Render: r,
})
}
}
}
}
}
if find, _ := s.FileExists(owner, repo, rel.CommitID, ".history"); find {
rel.HistoryRouteMode = true
}

7
pkg/providers/gitea.go
View File

@@ -37,11 +37,10 @@ func (g *ProviderGitea) Repos(owner string) (map[string]string, error) {
ListOptions: gitea.ListOptions{
PageSize: GiteaMaxCount,
},
}); err != nil || (resp != nil && resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound) {
}); err != nil {
if resp != nil {
_ = resp.Body.Close()
}
return nil, err
} else {
if resp != nil {
_ = resp.Body.Close()
@@ -49,17 +48,17 @@ func (g *ProviderGitea) Repos(owner string) (map[string]string, error) {
for _, item := range repos {
result[item.Name] = item.DefaultBranch
}
return result, nil
}
if len(result) == 0 {
if repos, resp, err := g.gitea.ListUserRepos(owner, gitea.ListReposOptions{
ListOptions: gitea.ListOptions{
PageSize: GiteaMaxCount,
},
}); err != nil || (resp != nil && resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound) {
}); err != nil {
if resp != nil {
_ = resp.Body.Close()
}
return nil, err
} else {
if resp != nil {
_ = resp.Body.Close()

44
pkg/renders/gotemplate.go Normal file
View File

@@ -0,0 +1,44 @@
package renders
import (
"bytes"
"io"
"net/http"
"strings"
"text/template"
sprig "github.com/go-task/slim-sprig/v3"
)
type GoTemplate struct{}
func init() {
RegisterRender("gotemplate", &GoTemplate{})
}
func (g GoTemplate) Render(w http.ResponseWriter, r *http.Request, input io.Reader) error {
dataB, err := io.ReadAll(input)
if err != nil {
return err
}
out := &bytes.Buffer{}
parse, err := template.New("tmpl").Funcs(sprig.FuncMap()).Option("missingkey=error").Parse(string(dataB))
headers := make(map[string]string)
for k, vs := range r.Header {
headers[k] = strings.Join(vs, ",")
}
if err != nil {
return err
}
err = parse.Execute(out, map[string]interface{}{
"Request": map[string]any{
"Method": r.Method,
"Headers": headers,
},
})
if err != nil {
return err
}
_, err = out.WriteTo(w)
return err
}

29
pkg/renders/render.go Normal file
View File

@@ -0,0 +1,29 @@
package renders
import (
"io"
"net/http"
"sync"
)
var (
renders = make(map[string]Render)
lock = &sync.Mutex{}
)
type Render interface {
Render(w http.ResponseWriter, r *http.Request, input io.Reader) error
}
func RegisterRender(fType string, r Render) {
lock.Lock()
defer lock.Unlock()
if renders[fType] != nil {
panic("duplicate render type: " + fType)
}
renders[fType] = r
}
func GetRender(key string) Render {
return renders[key]
}

43
pkg/server.go
View File

@@ -79,16 +79,20 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
}()
err := s.Serve(writer, request)
if err != nil {
zap.L().Debug("错误请求", zap.Error(err), zap.Any("request", request.RequestURI))
s.options.DefaultErrorHandler(writer, request, err)
}
}
func (s *Server) Serve(writer http.ResponseWriter, request *http.Request) error {
if request.Method != "GET" {
return os.ErrNotExist
}
meta, err := s.meta.ParseDomainMeta(request.Host, request.URL.Path, request.URL.Query().Get("branch"))
if err != nil {
return err
}
zap.L().Debug("获取请求", zap.Any("meta", meta))
zap.L().Debug("获取请求", zap.Any("request", meta.Path))
// todo(feat) : 支持 http range
result, err := s.reader.Open(meta.Owner, meta.Repo, meta.CommitID, meta.Path)
if err != nil {
@@ -106,27 +110,48 @@ func (s *Server) Serve(writer http.ResponseWriter, request *http.Request) error
}
writer.Header().Set("Content-Type", mime.TypeByExtension(".html"))
writer.WriteHeader(http.StatusNotFound)
_, _ = io.Copy(writer, result)
_ = result.Close()
if render := meta.TryRender(meta.Path, "/404.html"); render != nil {
defer result.Close()
if err = render.Render(writer, request, result); err != nil {
return err
}
return nil
} else {
_, _ = io.Copy(writer, result)
_ = result.Close()
}
return nil
}
fileName := filepath.Base(meta.Path)
render := meta.TryRender(meta.Path)
defer result.Close()
if reader, ok := result.(*utils.CacheContent); ok {
writer.Header().Add("X-Cache", "HIT")
writer.Header().Set("Content-Type", mime.TypeByExtension(filepath.Ext(fileName)))
writer.Header().Add("Cache-Control", "public, max-age=86400")
http.ServeContent(writer, request, fileName, reader.LastModified, reader)
_ = reader.Close()
if render != nil {
if err = render.Render(writer, request, reader); err != nil {
return err
}
} else {
http.ServeContent(writer, request, fileName, reader.LastModified, reader)
}
} else {
if reader, ok := result.(*utils.SizeReadCloser); ok {
if reader, ok := result.(*utils.SizeReadCloser); ok && render == nil {
writer.Header().Add("Content-Length", strconv.Itoa(reader.Size))
}
// todo(bug) : 直连模式下告知数据长度
writer.Header().Add("X-Cache", "MISS")
writer.Header().Add("Cache-Control", "public, max-age=86400")
writer.Header().Set("Content-Type", mime.TypeByExtension(meta.Path))
writer.Header().Set("Content-Type", mime.TypeByExtension(filepath.Ext(fileName)))
writer.WriteHeader(http.StatusOK)
_, _ = io.Copy(writer, result)
_ = result.Close()
if render != nil {
if err = render.Render(writer, request, reader); err != nil {
return err
}
} else {
_, _ = io.Copy(writer, result)
}
}
return nil
}