v1.0.0

common/platform/ctlcmd/attr_other.go

@@ -0,0 +1,9 @@
+// +build !windows
+
+package ctlcmd
+
+import "syscall"
+
+func getSysProcAttr() *syscall.SysProcAttr {
+	return nil
+}

common/platform/ctlcmd/attr_windows.go

@@ -0,0 +1,11 @@
+// +build windows
+
+package ctlcmd
+
+import "syscall"
+
+func getSysProcAttr() *syscall.SysProcAttr {
+	return &syscall.SysProcAttr{
+		HideWindow: true,
+	}
+}

common/platform/ctlcmd/ctlcmd.go

@@ -0,0 +1,50 @@
+package ctlcmd
+
+import (
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/xtls/xray-core/v1/common/buf"
+	"github.com/xtls/xray-core/v1/common/platform"
+)
+
+//go:generate go run github.com/xtls/xray-core/v1/common/errors/errorgen
+
+func Run(args []string, input io.Reader) (buf.MultiBuffer, error) {
+	xctl := platform.GetToolLocation("xctl")
+	if _, err := os.Stat(xctl); err != nil {
+		return nil, newError("xctl doesn't exist").Base(err)
+	}
+
+	var errBuffer buf.MultiBufferContainer
+	var outBuffer buf.MultiBufferContainer
+
+	cmd := exec.Command(xctl, args...)
+	cmd.Stderr = &errBuffer
+	cmd.Stdout = &outBuffer
+	cmd.SysProcAttr = getSysProcAttr()
+	if input != nil {
+		cmd.Stdin = input
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, newError("failed to start xctl").Base(err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		msg := "failed to execute xctl"
+		if errBuffer.Len() > 0 {
+			msg += ": \n" + strings.TrimSpace(errBuffer.MultiBuffer.String())
+		}
+		return nil, newError(msg).Base(err)
+	}
+
+	// log stderr, info message
+	if !errBuffer.IsEmpty() {
+		newError("<xctl message> \n", strings.TrimSpace(errBuffer.MultiBuffer.String())).AtInfo().WriteToLog()
+	}
+
+	return outBuffer.MultiBuffer, nil
+}

common/platform/ctlcmd/errors.generated.go

@@ -0,0 +1,9 @@
+package ctlcmd
+
+import "github.com/xtls/xray-core/v1/common/errors"
+
+type errPathObjHolder struct{}
+
+func newError(values ...interface{}) *errors.Error {
+	return errors.New(values...).WithPathObj(errPathObjHolder{})
+}