Added PID field in V2Ray config

services/v2ray/types/config.go

@@ -115,20 +115,21 @@ type APIConfig struct {
 }
 
 type ProxyConfig struct {
-	Port uint16 `json:"port"`
+	Port uint16 `json:"-"`
 }
 
 type VMessConfig struct {
-	Address   string `json:"address"`
-	ID        string `json:"id"`
-	Port      uint16 `json:"port"`
-	Transport string `json:"transport"`
+	Address   string `json:"-"`
+	ID        string `json:"-"`
+	Port      uint16 `json:"-"`
+	Transport string `json:"-"`
 }
 
 type Config struct {
+	PID   int32        `json:"pid"`
 	API   *APIConfig   `json:"api"`
-	Proxy *ProxyConfig `json:"proxy"`
-	VMess *VMessConfig `json:"vmess"`
+	Proxy *ProxyConfig `json:"-"`
+	VMess *VMessConfig `json:"-"`
 }
 
 func (c *Config) WriteToFile(path string) error {

services/v2ray/v2ray.go

@@ -1,7 +1,7 @@
 package v2ray
 
 import (
-	"encoding/binary"
+	"encoding/json"
 	"os"
 	"path/filepath"
 
@@ -18,22 +18,27 @@ var (
 )
 
 type V2Ray struct {
-	cfg  *types.Config
-	info []byte
+	cfg *types.Config
 }
 
-func NewV2Ray(cfg *types.Config, info []byte) *V2Ray {
+func NewV2Ray(cfg *types.Config) *V2Ray {
 	return &V2Ray{
-		cfg:  cfg,
-		info: info,
+		cfg: cfg,
 	}
 }
 
 func (s *V2Ray) home() string           { return viper.GetString(flags.FlagHome) }
 func (s *V2Ray) configFilePath() string { return filepath.Join(s.home(), types.DefaultConfigFileName) }
-func (s *V2Ray) pid() int32             { return int32(binary.BigEndian.Uint32(s.info[0:4])) }
+func (s *V2Ray) pid() int32             { return s.cfg.PID }
 
-func (s *V2Ray) Info() []byte { return s.info }
+func (s *V2Ray) Info() []byte {
+	buf, err := json.Marshal(s.cfg)
+	if err != nil {
+		panic(err)
+	}
+
+	return buf
+}
 
 func (s *V2Ray) PreUp() error {
 	cfgFilePath := s.configFilePath()

services/v2ray/v2ray_darwin.go

@@ -7,13 +7,17 @@ import (
 	"strings"
 )
 
+const (
+	v2ray = "v2ray"
+)
+
 func (s *V2Ray) execFile(name string) string {
 	return name
 }
 
 func (s *V2Ray) Up() error {
 	cmd := exec.Command(
-		s.execFile("v2ray"),
+		s.execFile(v2ray),
 		strings.Split(
 			fmt.Sprintf("run --config %s", s.configFilePath()),
 			" ",
@@ -22,5 +26,10 @@ func (s *V2Ray) Up() error {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	return cmd.Start()
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	s.cfg.PID = int32(cmd.Process.Pid)
+	return nil
 }

services/v2ray/v2ray_linux.go

@@ -7,13 +7,17 @@ import (
 	"strings"
 )
 
+const (
+	v2ray = "v2ray"
+)
+
 func (s *V2Ray) execFile(name string) string {
 	return name
 }
 
 func (s *V2Ray) Up() error {
 	cmd := exec.Command(
-		s.execFile("v2ray"),
+		s.execFile(v2ray),
 		strings.Split(
 			fmt.Sprintf("run --config %s", s.configFilePath()),
 			" ",
@@ -22,5 +26,10 @@ func (s *V2Ray) Up() error {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	return cmd.Start()
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	s.cfg.PID = int32(cmd.Process.Pid)
+	return nil
 }

services/v2ray/v2ray_windows.go

@@ -6,17 +6,26 @@ import (
 	"path/filepath"
 )
 
+const (
+	v2ray = "v2ray.exe"
+)
+
 func (s *V2Ray) execFile(name string) string {
-	return ".\\" + filepath.Join("V2Ray", name+".exe")
+	return ".\\" + filepath.Join("V2Ray", name)
 }
 
 func (s *V2Ray) Up() error {
 	cmd := exec.Command(
-		s.execFile("v2ray"),
+		s.execFile(v2ray),
 		"run", "--config", s.configFilePath(),
 	)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	return cmd.Start()
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	s.cfg.PID = int32(cmd.Process.Pid)
+	return nil
 }