go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update tunnel handler

Browse Source
This commit is contained in:
ginuerzh
2023-10-27 08:48:16 +08:00
parent e5fa371586
commit bcc75c5ba4
5 changed files with 228 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
handler/tunnel/handler.go
View File

@ -38,9 +38,10 @@ type tunnelHandler struct {
router *chain.Router
md metadata
options handler.Options
ep service.Service
pool *ConnectorPool
recorder recorder.RecorderObject
epSvc service.Service
ep *entrypoint
}
func NewHandler(opts ...handler.Option) handler.Handler {
@ -74,6 +75,13 @@ func (h *tunnelHandler) Init(md md.Metadata) (err error) {
}
}
h.ep = &entrypoint{
pool: h.pool,
ingress: h.md.ingress,
log: h.options.Logger.WithFields(map[string]any{
"kind": "entrypoint",
}),
}
if err = h.initEntrypoint(); err != nil {
return
}
@ -115,24 +123,19 @@ func (h *tunnelHandler) initEntrypoint() (err error) {
if err = epListener.Init(nil); err != nil {
return
}
epHandler := newEntrypointHandler(
h.pool,
h.md.ingress,
handler.ServiceOption(serviceName),
handler.LoggerOption(log.WithFields(map[string]any{
"kind": "handler",
})),
)
epHandler := &entrypointHandler{
ep: h.ep,
}
if err = epHandler.Init(nil); err != nil {
return
}
h.ep = xservice.NewService(
h.epSvc = xservice.NewService(
serviceName, epListener, epHandler,
xservice.LoggerOption(log),
)
go h.ep.Serve()
log.Infof("entrypoint: %s", h.ep.Addr())
go h.epSvc.Serve()
log.Infof("entrypoint: %s", h.epSvc.Addr())
return
}