Compare commits

..

No commits in common. "main" and "v1.9.5" have entirely different histories.
main ... v1.9.5

4 changed files with 20 additions and 81 deletions

View file

@ -54,11 +54,7 @@ func (c *Context) Next() {
} }
func (c *Context) prepare(ctx *Context) { func (c *Context) prepare(ctx *Context) {
// Only parse multipart form if it hasn't been parsed already ctx.Request.httpRequest.ParseMultipartForm(int64(app.Config.Request.MaxUploadFileSize))
// This prevents race conditions when multiple goroutines might access the same request
if ctx.Request.httpRequest.MultipartForm == nil {
ctx.Request.httpRequest.ParseMultipartForm(int64(app.Config.Request.MaxUploadFileSize))
}
} }
func (c *Context) GetPathParam(key string) interface{} { func (c *Context) GetPathParam(key string) interface{} {

83
core.go
View file

@ -6,7 +6,6 @@
package core package core
import ( import (
"context"
"embed" "embed"
"fmt" "fmt"
"log" "log"
@ -52,18 +51,12 @@ type configContainer struct {
// App is a struct representing the main application container and its core components. // App is a struct representing the main application container and its core components.
type App struct { type App struct {
t int // for tracking hooks (deprecated - maintained for backward compatibility) t int // for tracking hooks
chain *chain chain *chain
hooks *Hooks hooks *Hooks
Config *configContainer Config *configContainer
} }
// requestContext holds request-specific chain execution state
type requestContext struct {
chainIndex int
chainNodes []interface{}
}
// app is a global instance of the App structure used to manage application configuration and lifecycle. // app is a global instance of the App structure used to manage application configuration and lifecycle.
var app *App var app *App
@ -238,25 +231,10 @@ func (app *App) RegisterRoutes(routes []Route, router *httprouter.Router) *httpr
// makeHTTPRouterHandlerFunc creates an httprouter.Handle that handles HTTP requests with the specified controller and hooks. // makeHTTPRouterHandlerFunc creates an httprouter.Handle that handles HTTP requests with the specified controller and hooks.
func (app *App) makeHTTPRouterHandlerFunc(h Controller, ms []Hook) httprouter.Handle { func (app *App) makeHTTPRouterHandlerFunc(h Controller, ms []Hook) httprouter.Handle {
return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
// Create request-specific chain state
reqCtx := &requestContext{
chainIndex: 0,
}
// Prepare the chain nodes for this request
mw := app.hooks.GetHooks()
for _, v := range mw {
reqCtx.chainNodes = append(reqCtx.chainNodes, v)
}
rhs := app.combHandlers(h, ms)
for _, v := range rhs {
reqCtx.chainNodes = append(reqCtx.chainNodes, v)
}
// Store chain state in request context
ctx := &Context{ ctx := &Context{
Request: &Request{ Request: &Request{
httpRequest: r.WithContext(context.WithValue(r.Context(), "goffeeChain", reqCtx)), httpRequest: r,
httpPathParams: ps, httpPathParams: ps,
}, },
Response: &Response{ Response: &Response{
@ -279,16 +257,10 @@ func (app *App) makeHTTPRouterHandlerFunc(h Controller, ms []Hook) httprouter.Ha
} }
ctx.prepare(ctx) ctx.prepare(ctx)
rhs := app.combHandlers(h, ms)
// Execute the first handler in the chain app.prepareChain(rhs)
if len(reqCtx.chainNodes) > 0 { app.t = 0
n := reqCtx.chainNodes[0] app.chain.execute(ctx)
if f, ok := n.(Hook); ok {
f(ctx)
} else if ff, ok := n.(Controller); ok {
ff(ctx)
}
}
for _, header := range ctx.Response.headers { for _, header := range ctx.Response.headers {
w.Header().Add(header.key, header.val) w.Header().Add(header.key, header.val)
@ -391,30 +363,16 @@ func UseHook(mw Hook) {
// Next advances to the next middleware or controller in the chain and invokes it with the given context if available. // Next advances to the next middleware or controller in the chain and invokes it with the given context if available.
func (app *App) Next(c *Context) { func (app *App) Next(c *Context) {
// Get request-specific chain state from context app.t = app.t + 1
if reqCtx, ok := c.Request.httpRequest.Context().Value("goffeeChain").(*requestContext); ok { n := app.chain.getByIndex(app.t)
reqCtx.chainIndex++ if n != nil {
if reqCtx.chainIndex < len(reqCtx.chainNodes) { f, ok := n.(Hook)
n := reqCtx.chainNodes[reqCtx.chainIndex] if ok {
if f, ok := n.(Hook); ok { f(c)
f(c) } else {
} else if ff, ok := n.(Controller); ok { ff, ok := n.(Controller)
ff(c)
}
}
} else {
// Fallback to old behavior (not thread-safe)
app.t = app.t + 1
n := app.chain.getByIndex(app.t)
if n != nil {
f, ok := n.(Hook)
if ok { if ok {
f(c) ff(c)
} else {
ff, ok := n.(Controller)
if ok {
ff(c)
}
} }
} }
} }
@ -452,17 +410,6 @@ func (app *App) prepareChain(hs []interface{}) {
} }
} }
// prepareRequestChain prepares a request-specific chain to avoid race conditions
func (app *App) prepareRequestChain(requestChain *chain, hs []interface{}) {
mw := app.hooks.GetHooks()
for _, v := range mw {
requestChain.nodes = append(requestChain.nodes, v)
}
for _, v := range hs {
requestChain.nodes = append(requestChain.nodes, v)
}
}
// execute executes the first node in the chain, invoking it as either a Hook or Controller if applicable. // execute executes the first node in the chain, invoking it as either a Hook or Controller if applicable.
func (cn *chain) execute(ctx *Context) { func (cn *chain) execute(ctx *Context) {
i := cn.getByIndex(0) i := cn.getByIndex(0)

View file

@ -1,12 +1,10 @@
package components package components
type ContentList struct { type ContentList struct {
ID string
Items []ContentListItem Items []ContentListItem
} }
type ContentListItem struct { type ContentListItem struct {
ID string
Text string Text string
Description string Description string
EndElement string EndElement string

View file

@ -1,10 +1,8 @@
{{define "content_list"}} {{define "content_list"}}
<ul class="list-group" {{ if .ID }}id="{{.ID}}"{{end}}> <ul class="list-group">
{{ range .Items}} {{ range .Items}}
<li class="list-group-item text-wrap {{if eq .IsDisabled true}}disabled{{end}} <li class="list-group-item text-wrap {{if eq .IsDisabled true}}disabled{{end}} {{if .TypeClass}}list-group-item-{{.TypeClass}}{{end}}"
{{if .TypeClass}}list-group-item-{{.TypeClass}}{{end}}" {{if eq .IsDisabled true}}aria-disabled="true"{{end}}
{{if eq .IsDisabled true}}aria-disabled="true"{{end}}
{{ if .ID }}id="{{.ID}}"{{end}}
><div class="d-flex justify-content-between lh-sm"><p class="mb-1">{{.Text}}</p><span class="text-body-secondary ms-5">{{.EndElement}}</span></div> ><div class="d-flex justify-content-between lh-sm"><p class="mb-1">{{.Text}}</p><span class="text-body-secondary ms-5">{{.EndElement}}</span></div>
<small>{{.Description}}</small> <small>{{.Description}}</small>
</li> </li>