From 0ebfec2a03be64dc2283d4fa5de8931810e10dff Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Sat, 6 Aug 2022 15:30:52 +0800 Subject: [PATCH] feat: check support before start --- service/server/service/connect.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/service/server/service/connect.go b/service/server/service/connect.go index fd610589..82a5759d 100644 --- a/service/server/service/connect.go +++ b/service/server/service/connect.go @@ -5,6 +5,7 @@ import ( "github.com/v2rayA/v2rayA/core/ipforward" "github.com/v2rayA/v2rayA/core/v2ray" "github.com/v2rayA/v2rayA/core/v2ray/asset" + "github.com/v2rayA/v2rayA/core/v2ray/service" "github.com/v2rayA/v2rayA/db/configure" "github.com/v2rayA/v2rayA/pkg/util/log" ) @@ -14,6 +15,9 @@ func StopV2ray() (err error) { return nil } func StartV2ray() (err error) { + if err = checkSupport(); err != nil { + return err + } if css := configure.GetConnectedServers(); css.Len() == 0 { return fmt.Errorf("failed: no server is selected. please select at least one server") } @@ -62,6 +66,17 @@ func checkAssetsExist(setting *configure.Setting) error { return nil } +func checkSupport() (err error) { + setting := GetSetting() + if err = checkAssetsExist(setting); err != nil { + return err + } + if err = service.CheckV5(); err != nil { + return fmt.Errorf("current version of v2rayA only support v2ray-core v5: %v", err) + } + return nil +} + func Connect(which *configure.Which) (err error) { log.Trace("Connect: begin") defer log.Trace("Connect: done") @@ -71,8 +86,8 @@ func Connect(which *configure.Which) (err error) { } }() setting := GetSetting() - if err = checkAssetsExist(setting); err != nil { - return + if err = checkSupport(); err != nil { + return err } if which == nil { return fmt.Errorf("which can not be nil")