refactor(entrypoint): rename shortLinkTree to shortLinkMatcher

This commit is contained in:
yusing
2026-02-01 10:00:04 +08:00
parent fb96a2a4f1
commit 0a2df3b9e3
2 changed files with 6 additions and 6 deletions

View File

@@ -22,7 +22,7 @@ type Entrypoint struct {
notFoundHandler http.Handler notFoundHandler http.Handler
accessLogger accesslog.AccessLogger accessLogger accesslog.AccessLogger
findRouteFunc func(host string) types.HTTPRoute findRouteFunc func(host string) types.HTTPRoute
shortLinkTree *ShortLinkMatcher shortLinkMatcher *ShortLinkMatcher
} }
// nil-safe // nil-safe
@@ -36,12 +36,12 @@ func init() {
func NewEntrypoint() Entrypoint { func NewEntrypoint() Entrypoint {
return Entrypoint{ return Entrypoint{
findRouteFunc: findRouteAnyDomain, findRouteFunc: findRouteAnyDomain,
shortLinkTree: newShortLinkTree(), shortLinkMatcher: newShortLinkMatcher(),
} }
} }
func (ep *Entrypoint) ShortLinkMatcher() *ShortLinkMatcher { func (ep *Entrypoint) ShortLinkMatcher() *ShortLinkMatcher {
return ep.shortLinkTree return ep.shortLinkMatcher
} }
func (ep *Entrypoint) SetFindRouteDomains(domains []string) { func (ep *Entrypoint) SetFindRouteDomains(domains []string) {
@@ -130,9 +130,9 @@ func (ep *Entrypoint) tryHandleShortLink(w http.ResponseWriter, r *http.Request)
} }
if strings.EqualFold(host, common.ShortLinkPrefix) { if strings.EqualFold(host, common.ShortLinkPrefix) {
if ep.middleware != nil { if ep.middleware != nil {
ep.middleware.ServeHTTP(ep.shortLinkTree.ServeHTTP, w, r) ep.middleware.ServeHTTP(ep.shortLinkMatcher.ServeHTTP, w, r)
} else { } else {
ep.shortLinkTree.ServeHTTP(w, r) ep.shortLinkMatcher.ServeHTTP(w, r)
} }
return true return true
} }

View File

@@ -14,7 +14,7 @@ type ShortLinkMatcher struct {
subdomainRoutes *xsync.Map[string, struct{}] subdomainRoutes *xsync.Map[string, struct{}]
} }
func newShortLinkTree() *ShortLinkMatcher { func newShortLinkMatcher() *ShortLinkMatcher {
return &ShortLinkMatcher{ return &ShortLinkMatcher{
fqdnRoutes: xsync.NewMap[string, string](), fqdnRoutes: xsync.NewMap[string, string](),
subdomainRoutes: xsync.NewMap[string, struct{}](), subdomainRoutes: xsync.NewMap[string, struct{}](),