SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-04 12:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make clash api and gVisor optional

Browse source
This commit is contained in:
世界 2022-07-20 07:12:40 +08:00
parent c5b3e8b042
commit 6ac1b395cf
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
9 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
box.go
View file

@ -7,7 +7,7 @@ import (
"time"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/experimental/clashapi"
"github.com/sagernet/sing-box/experimental"
"github.com/sagernet/sing-box/inbound"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
@ -28,7 +28,7 @@ type Box struct {
logFactory log.Factory
logger log.ContextLogger
logFile *os.File
clashServer *clashapi.Server
clashServer adapter.ClashServer
}
func New(ctx context.Context, options option.Options) (*Box, error) {
@ -141,9 +141,12 @@ func New(ctx context.Context, options option.Options) (*Box, error) {
return nil, err
}
var clashServer *clashapi.Server
var clashServer adapter.ClashServer
if needClashAPI {
clashServer = clashapi.NewServer(router, observableLogFactory, common.PtrValueOrDefault(options.Experimental.ClashAPI))
clashServer, err = experimental.NewClashServer(router, observableLogFactory, common.PtrValueOrDefault(options.Experimental.ClashAPI))
if err != nil {
return nil, E.Cause(err, "create clash api server")
}
router.SetTrafficController(clashServer)
}
return &Box{
@ -175,7 +178,7 @@ func (s *Box) Start() error {
if s.clashServer != nil {
err = s.clashServer.Start()
if err != nil {
return E.Cause(err, "start clash api")
return E.Cause(err, "start clash api server")
}
}
s.logger.Info("sing-box started (", F.Seconds(time.Since(s.createdAt).Seconds()), "s)")
@ -191,7 +194,7 @@ func (s *Box) Close() error {
}
return common.Close(
s.router,
s.clashServer,
common.PtrOrNil(s.logFile),
common.PtrOrNil(s.clashServer),
)
}