hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-20 16:24:25 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge tag 'v1.14.3'

Browse Source
This commit is contained in:
Shtorm
2026-10-19 01:05:55 +03:00
parent 6cfc2a86f8 7054cac512
commit 2283c95513
321 changed files with 6750 additions and 5105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/manager_api/http/server/server.go
+4 -9
View File
@@ -60,7 +60,7 @@ func NewAPIServer(ctx context.Context, logger log.ContextLogger, tag string, opt
}, nil
}
func (s *APIServer) Start(stage adapter.StartStage) error {
func (s *APIServer) Start(stage adapter.StartStage, scope *adapter.Scope) error {
if stage != adapter.StartStateStart {
return nil
}
@@ -87,11 +87,13 @@ func (s *APIServer) Start(stage adapter.StartStage) error {
if err != nil {
return E.Cause(err, "create TLS config")
}
scope.Add(s.tlsConfig.Close)
}
tcpListener, err := s.listener.ListenTCP()
if err != nil {
return err
}
scope.Add(s.listener.Close)
if s.tlsConfig != nil {
if !common.Contains(s.tlsConfig.NextProtos(), http2.NextProtoTLS) {
s.tlsConfig.SetNextProtos(append([]string{"h2"}, s.tlsConfig.NextProtos()...))
@@ -101,6 +103,7 @@ func (s *APIServer) Start(stage adapter.StartStage) error {
s.httpServer = &http.Server{
Handler: chiRouter,
}
scope.Add(s.httpServer.Close)
go func() {
err = s.httpServer.Serve(tcpListener)
if err != nil && !errors.Is(err, http.ErrServerClosed) {
@@ -110,14 +113,6 @@ func (s *APIServer) Start(stage adapter.StartStage) error {
return nil
}
func (s *APIServer) Close() error {
return common.Close(
common.PtrOrNil(s.httpServer),
common.PtrOrNil(s.listener),
s.tlsConfig,
)
}
func (s *APIServer) Route(r chi.Router) {
r.Route("/manager/v1", func(r chi.Router) {
r.Use(newCORSMiddleware(s.options.CORS))