add desktop bin

Author: yiguo

build/app/build.py

@@ -10,6 +10,7 @@ class Builder(object):
     def __init__(self, build_dir: str):
         self.build_dir = build_dir
         self.lib_dir = os.path.join(self.build_dir, "..")
+        self.bin_file = "xray"
 
     def clean_lib_files(self, files: list[str]):
         for file in files:
@@ -23,7 +24,7 @@ def clean_lib_dirs(self, dirs: list[str]):
 
     def download_geo(self):
         os.chdir(self.lib_dir)
-        main_path = os.path.join("main", "main.go")
+        main_path = os.path.join("download_geo", "main.go")
         ret = subprocess.run(["go", "run", main_path])
         if ret.returncode != 0:
             raise Exception("download_geo failed")
@@ -101,3 +102,24 @@ def reset_package_name(self, file_name: str):
                 new_lines.append(new_line)
         with open(file_path, "w") as f:
             f.writelines(new_lines)
+
+
+    def build_desktop_bin(self):
+        output_file = os.path.join(self.lib_dir, self.bin_file)
+        run_env = os.environ.copy()
+        run_env["CGO_ENABLED"] = "0"
+
+        cmd = [
+            "go",
+            "build",
+            "-trimpath",
+            "-ldflags",
+            "-s -w",
+            f"-o={output_file}",
+            "./desktop_bin",
+        ]
+        os.chdir(self.lib_dir)
+        print(cmd)
+        ret = subprocess.run(cmd, env=run_env)
+        if ret.returncode != 0:
+            raise Exception(f"build_desktop_bin failed")

build/app/linux.py

@@ -13,7 +13,6 @@ def __init__(self, build_dir: str):
         create_dir_if_not_exists(self.framework_dir)
         self.lib_file = "libXray.so"
         self.lib_header_file = "libXray.h"
-        self.bin_file = "route"
 
     def before_build(self):
         super().before_build()
@@ -24,7 +23,7 @@ def build(self):
         self.build_linux()
         self.after_build()
 
-        self.build_linux_bin()
+        self.build_desktop_bin()
 
     def build_linux(self):
         output_dir = self.framework_dir
@@ -54,22 +53,4 @@ def after_build(self):
         super().after_build()
         self.reset_files()
 
-    def build_linux_bin(self):
-        output_file = os.path.join(self.lib_dir, self.bin_file)
-        run_env = os.environ.copy()
-        run_env["CGO_ENABLED"] = "0"
-
-        cmd = [
-            "go",
-            "build",
-            "-trimpath",
-            "-ldflags",
-            "-s -w",
-            f"-o={output_file}",
-            "./linux_route",
-        ]
-        os.chdir(self.lib_dir)
-        print(cmd)
-        ret = subprocess.run(cmd, env=run_env)
-        if ret.returncode != 0:
-            raise Exception(f"build_linux_bin failed")
+    

build/app/windows.py

@@ -13,6 +13,7 @@ def __init__(self, build_dir: str):
         create_dir_if_not_exists(self.framework_dir)
         self.lib_file = "libXray.dll"
         self.lib_header_file = "libXray.h"
+        self.bin_file = "xray.exe"
 
     def before_build(self):
         super().before_build()
@@ -23,6 +24,8 @@ def build(self):
         self.build_windows()
         self.after_build()
 
+        self.build_desktop_bin()
+
     def build_windows(self):
         output_dir = self.framework_dir
         create_dir_if_not_exists(output_dir)

desktop_bin/main.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"runtime"
+	"runtime/debug"
+	"syscall"
+
+	"github.com/xtls/libxray/xray"
+)
+
+func main() {
+	configPath := os.Args[1]
+	fmt.Println("configPath:", configPath)
+	err := runXray(configPath)
+	if err != nil {
+		os.Exit(1)
+	}
+	defer xray.StopXray()
+	// Explicitly triggering GC to remove garbage from config loading.
+	runtime.GC()
+	debug.FreeOSMemory()
+
+	{
+		osSignals := make(chan os.Signal, 1)
+		signal.Notify(osSignals, os.Interrupt, syscall.SIGTERM)
+		<-osSignals
+	}
+}

linux_route/bin_linux.go desktop_bin/route_linux.golinux_route/bin_linux.go renamed to desktop_bin/route_linux.go

@@ -4,27 +4,22 @@ package main
 
 import (
 	"net"
-	"strconv"
 
 	"github.com/vishvananda/netlink"
 )
 
 // sudo ip route add default dev tun0 metric 20
 // sudo ip -6 route add default dev tun0 metric 20
-func initIpRoute(tunName string, tunPriority string) error {
-	priority, err := strconv.Atoi(tunPriority)
-	if err != nil {
-		return err
-	}
+func initIpRoute(tunName string, tunPriority int) error {
 	link, err := netlink.LinkByName(tunName)
 	if err != nil {
 		return err
 	}
-	err = addRoute(link.Attrs().Index, "0.0.0.0/0", netlink.FAMILY_V4, priority)
+	err = addRoute(link.Attrs().Index, "0.0.0.0/0", netlink.FAMILY_V4, tunPriority)
 	if err != nil {
 		return err
 	}
-	err = addRoute(link.Attrs().Index, "::/0", netlink.FAMILY_V6, priority)
+	err = addRoute(link.Attrs().Index, "::/0", netlink.FAMILY_V6, tunPriority)
 	if err != nil {
 		return err
 	}

linux_route/bin_other.go desktop_bin/route_other.golinux_route/bin_other.go renamed to desktop_bin/route_other.go

@@ -2,6 +2,6 @@
 
 package main
 
-func initIpRoute(_ string, _ string) error {
+func initIpRoute(_ string, _ int) error {
 	return nil
 }

desktop_bin/run.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/xtls/libxray/dns"
+	"github.com/xtls/libxray/xray"
+)
+
+type runXrayConfig struct {
+	// tun
+	TunName     string `json:"tunName,omitempty"`
+	TunPriority int    `json:"tunPriority,omitempty"`
+	// dns
+	Dns           string `json:"dns,omitempty"`
+	BindInterface string `json:"bindInterface,omitempty"`
+	// xray
+	DatDir     string `json:"datDir,omitempty"`
+	ConfigPath string `json:"configPath,omitempty"`
+}
+
+func runXray(configPath string) error {
+	configBytes, err := os.ReadFile(configPath)
+	if err != nil {
+		return err
+	}
+	var config runXrayConfig
+	err = json.Unmarshal(configBytes, &config)
+	if err != nil {
+		return err
+	}
+	err = initIpRoute(config.TunName, config.TunPriority)
+	if err != nil {
+		return err
+	}
+	dns.InitDns(config.Dns, config.BindInterface)
+	return xray.RunXray(config.DatDir, config.ConfigPath)
+}