diff --git a/daemon/instance.go b/daemon/instance.go index 9bdce84c..5947452f 100644 --- a/daemon/instance.go +++ b/daemon/instance.go @@ -9,6 +9,7 @@ import ( "github.com/sagernet/sing-box/common/urltest" "github.com/sagernet/sing-box/experimental/deprecated" "github.com/sagernet/sing-box/include" + "github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/option" E "github.com/sagernet/sing/common/exceptions" "github.com/sagernet/sing/common/json" @@ -103,6 +104,7 @@ func (s *StartedService) newInstance(profileContent string, overrideOptions *Ove i.clashServer = service.FromContext[adapter.ClashServer](ctx) i.pauseManager = service.FromContext[pause.Manager](ctx) i.cacheFile = service.FromContext[adapter.CacheFile](ctx) + log.SetStdLogger(boxInstance.LogFactory().Logger()) return i, nil } diff --git a/experimental/libbox/command_client.go b/experimental/libbox/command_client.go index f0788d7a..84fe9595 100644 --- a/experimental/libbox/command_client.go +++ b/experimental/libbox/command_client.go @@ -362,7 +362,7 @@ func (c *CommandClient) handleStatusStream() { c.handler.Disconnected(err.Error()) return } - c.handler.WriteStatus(StatusMessageFromGRPC(status)) + c.handler.WriteStatus(statusMessageFromGRPC(status)) } } @@ -381,7 +381,7 @@ func (c *CommandClient) handleGroupStream() { c.handler.Disconnected(err.Error()) return } - c.handler.WriteGroups(OutboundGroupIteratorFromGRPC(groups)) + c.handler.WriteGroups(outboundGroupIteratorFromGRPC(groups)) } } @@ -447,7 +447,7 @@ func (c *CommandClient) handleConnectionsStream() { c.handler.Disconnected(err.Error()) return } - libboxEvents := ConnectionEventsFromGRPC(events) + libboxEvents := connectionEventsFromGRPC(events) c.handler.WriteConnectionEvents(libboxEvents) } } @@ -523,7 +523,7 @@ func (c *CommandClient) GetSystemProxyStatus() (*SystemProxyStatus, error) { if err != nil { return nil, err } - return SystemProxyStatusFromGRPC(status), nil + return systemProxyStatusFromGRPC(status), nil }) } diff --git a/experimental/libbox/command_server.go b/experimental/libbox/command_server.go index f889c381..2b4ac71b 100644 --- a/experimental/libbox/command_server.go +++ b/experimental/libbox/command_server.go @@ -43,7 +43,7 @@ type CommandServerHandler interface { } func NewCommandServer(handler CommandServerHandler, platformInterface PlatformInterface) (*CommandServer, error) { - ctx := BaseContext(platformInterface) + ctx := baseContext(platformInterface) platformWrapper := &platformInterfaceWrapper{ iif: platformInterface, useProcFS: platformInterface.UseProcFS(), diff --git a/experimental/libbox/command_types.go b/experimental/libbox/command_types.go index 1091b3f7..39027ac7 100644 --- a/experimental/libbox/command_types.go +++ b/experimental/libbox/command_types.go @@ -32,11 +32,11 @@ type OutboundGroup struct { Selectable bool Selected string IsExpand bool - ItemList []*OutboundGroupItem + itemList []*OutboundGroupItem } func (g *OutboundGroup) GetItems() OutboundGroupItemIterator { - return newIterator(g.ItemList) + return newIterator(g.itemList) } type OutboundGroupIterator interface { @@ -267,12 +267,12 @@ type Connection struct { Rule string Outbound string OutboundType string - ChainList []string + chainList []string ProcessInfo *ProcessInfo } func (c *Connection) Chain() StringIterator { - return newIterator(c.ChainList) + return newIterator(c.chainList) } func (c *Connection) DisplayDestination() string { @@ -292,7 +292,7 @@ type ConnectionIterator interface { HasNext() bool } -func StatusMessageFromGRPC(status *daemon.Status) *StatusMessage { +func statusMessageFromGRPC(status *daemon.Status) *StatusMessage { if status == nil { return nil } @@ -309,7 +309,7 @@ func StatusMessageFromGRPC(status *daemon.Status) *StatusMessage { } } -func OutboundGroupIteratorFromGRPC(groups *daemon.Groups) OutboundGroupIterator { +func outboundGroupIteratorFromGRPC(groups *daemon.Groups) OutboundGroupIterator { if groups == nil || len(groups.Group) == 0 { return newIterator([]*OutboundGroup{}) } @@ -323,7 +323,7 @@ func OutboundGroupIteratorFromGRPC(groups *daemon.Groups) OutboundGroupIterator IsExpand: g.IsExpand, } for _, item := range g.Items { - libboxGroup.ItemList = append(libboxGroup.ItemList, &OutboundGroupItem{ + libboxGroup.itemList = append(libboxGroup.itemList, &OutboundGroupItem{ Tag: item.Tag, Type: item.Type, URLTestTime: item.UrlTestTime, @@ -335,7 +335,7 @@ func OutboundGroupIteratorFromGRPC(groups *daemon.Groups) OutboundGroupIterator return newIterator(libboxGroups) } -func ConnectionFromGRPC(conn *daemon.Connection) Connection { +func connectionFromGRPC(conn *daemon.Connection) Connection { var processInfo *ProcessInfo if conn.ProcessInfo != nil { processInfo = &ProcessInfo{ @@ -367,12 +367,12 @@ func ConnectionFromGRPC(conn *daemon.Connection) Connection { Rule: conn.Rule, Outbound: conn.Outbound, OutboundType: conn.OutboundType, - ChainList: conn.ChainList, + chainList: conn.ChainList, ProcessInfo: processInfo, } } -func ConnectionEventFromGRPC(event *daemon.ConnectionEvent) *ConnectionEvent { +func connectionEventFromGRPC(event *daemon.ConnectionEvent) *ConnectionEvent { if event == nil { return nil } @@ -384,13 +384,13 @@ func ConnectionEventFromGRPC(event *daemon.ConnectionEvent) *ConnectionEvent { ClosedAt: event.ClosedAt, } if event.Connection != nil { - conn := ConnectionFromGRPC(event.Connection) + conn := connectionFromGRPC(event.Connection) libboxEvent.Connection = &conn } return libboxEvent } -func ConnectionEventsFromGRPC(events *daemon.ConnectionEvents) *ConnectionEvents { +func connectionEventsFromGRPC(events *daemon.ConnectionEvents) *ConnectionEvents { if events == nil { return nil } @@ -398,14 +398,14 @@ func ConnectionEventsFromGRPC(events *daemon.ConnectionEvents) *ConnectionEvents Reset: events.Reset_, } for _, event := range events.Events { - if libboxEvent := ConnectionEventFromGRPC(event); libboxEvent != nil { + if libboxEvent := connectionEventFromGRPC(event); libboxEvent != nil { libboxEvents.events = append(libboxEvents.events, libboxEvent) } } return libboxEvents } -func SystemProxyStatusFromGRPC(status *daemon.SystemProxyStatus) *SystemProxyStatus { +func systemProxyStatusFromGRPC(status *daemon.SystemProxyStatus) *SystemProxyStatus { if status == nil { return nil } @@ -415,7 +415,7 @@ func SystemProxyStatusFromGRPC(status *daemon.SystemProxyStatus) *SystemProxySta } } -func SystemProxyStatusToGRPC(status *SystemProxyStatus) *daemon.SystemProxyStatus { +func systemProxyStatusToGRPC(status *SystemProxyStatus) *daemon.SystemProxyStatus { if status == nil { return nil } diff --git a/experimental/libbox/config.go b/experimental/libbox/config.go index c89f3d69..122425d2 100644 --- a/experimental/libbox/config.go +++ b/experimental/libbox/config.go @@ -22,7 +22,7 @@ import ( "github.com/sagernet/sing/service/filemanager" ) -func BaseContext(platformInterface PlatformInterface) context.Context { +func baseContext(platformInterface PlatformInterface) context.Context { dnsRegistry := include.DNSTransportRegistry() if platformInterface != nil { if localTransport := platformInterface.LocalDNSTransport(); localTransport != nil { @@ -45,7 +45,7 @@ func parseConfig(ctx context.Context, configContent string) (option.Options, err } func CheckConfig(configContent string) error { - ctx := BaseContext(nil) + ctx := baseContext(nil) options, err := parseConfig(ctx, configContent) if err != nil { return err @@ -189,7 +189,7 @@ func (s *interfaceMonitorStub) MyInterface() string { } func FormatConfig(configContent string) (*StringBox, error) { - options, err := parseConfig(BaseContext(nil), configContent) + options, err := parseConfig(baseContext(nil), configContent) if err != nil { return nil, err }