wangjia/sing-box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix remote control when Clash server is unavailable

Browse Source
This commit is contained in:
世界
2026-06-15 13:02:09 +08:00
parent 3035af688e
commit f4061770bb
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
experimental/libbox/command_client.go
+12 -12
View File
@@ -456,23 +456,17 @@ func (c *CommandClient) handleClashModeStream() {
modeStatus, err := client.GetClashModeStatus(ctx, &emptypb.Empty{})
if err != nil {
c.handler.Disconnected(E.Cause(err, "get clash mode status").Error())
return
if status.Code(err) != codes.NotFound {
c.handler.Disconnected(E.Cause(err, "get clash mode status").Error())
return
}
modeStatus = &daemon.ClashModeStatus{}
}
if sFixAndroidStack {
go func() {
c.handler.InitializeClashMode(newIterator(modeStatus.ModeList), modeStatus.CurrentMode)
if len(modeStatus.ModeList) == 0 {
c.handler.Disconnected(E.Cause(os.ErrInvalid, "empty clash mode list").Error())
}
}()
go c.handler.InitializeClashMode(newIterator(modeStatus.ModeList), modeStatus.CurrentMode)
} else {
c.handler.InitializeClashMode(newIterator(modeStatus.ModeList), modeStatus.CurrentMode)
if len(modeStatus.ModeList) == 0 {
c.handler.Disconnected(E.Cause(os.ErrInvalid, "empty clash mode list").Error())
return
}
}
if len(modeStatus.ModeList) == 0 {
@@ -481,6 +475,9 @@ func (c *CommandClient) handleClashModeStream() {
stream, err := client.SubscribeClashMode(ctx, &emptypb.Empty{})
if err != nil {
if status.Code(err) == codes.NotFound {
return
}
c.handler.Disconnected(E.Cause(err, "subscribe clash mode").Error())
return
}
@@ -488,6 +485,9 @@ func (c *CommandClient) handleClashModeStream() {
for {
mode, err := stream.Recv()
if err != nil {
if status.Code(err) == codes.NotFound {
return
}
c.handler.Disconnected(E.Cause(err, "clash mode stream recv").Error())
return
}