Release v1.9.9

Author: Ayideyia

bridge/bridge.go

@@ -27,6 +27,7 @@ var Env = &EnvResult{
 	IsStartup:   true,
 	FromTaskSch: false,
 	AppName:     "",
+	AppVersion:  "v1.9.9",
 	BasePath:    "",
 	OS:          sysruntime.GOOS,
 	ARCH:        sysruntime.GOARCH,
@@ -92,11 +93,12 @@ func (a *App) RestartApp() FlagResult {
 
 func (a *App) GetEnv() EnvResult {
 	return EnvResult{
-		AppName:  Env.AppName,
-		BasePath: Env.BasePath,
-		OS:       Env.OS,
-		ARCH:     Env.ARCH,
-		X64Level: Env.X64Level,
+		AppName:    Env.AppName,
+		AppVersion: Env.AppVersion,
+		BasePath:   Env.BasePath,
+		OS:         Env.OS,
+		ARCH:       Env.ARCH,
+		X64Level:   Env.X64Level,
 	}
 }
 
@@ -139,7 +141,7 @@ func createMacOSMenus(app *App) {
 	})
 	appMenu.AddSeparator()
 	appMenu.AddText("Quit", keys.CmdOrCtrl("q"), func(_ *menu.CallbackData) {
-		runtime.EventsEmit(app.Ctx, "exitApp")
+		runtime.EventsEmit(app.Ctx, "onExitApp")
 	})
 
 	// on macos platform, we should append EditMenu to enable Cmd+C,Cmd+V,Cmd+Z... shortcut

bridge/exec.go

@@ -2,7 +2,7 @@ package bridge
 
 import (
 	"bufio"
-	"errors"
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -142,23 +142,28 @@ func (a *App) KillProcess(pid int, timeout int) FlagResult {
 }
 
 func waitForProcessExitWithTimeout(process *os.Process, timeoutSeconds int) error {
-	done := make(chan error, 1)
-	go func() {
-		_, err := process.Wait()
-		done <- err
-	}()
-
-	timer := time.NewTimer(time.Duration(timeoutSeconds) * time.Second)
-	defer timer.Stop()
-
-	select {
-	case err := <-done:
-		return err
-	case <-timer.C:
-		if killErr := process.Kill(); killErr != nil {
-			return fmt.Errorf("timeout reached and failed to kill process: %w", killErr)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeoutSeconds)*time.Second)
+	defer cancel()
+
+	ticker := time.NewTicker(500 * time.Millisecond)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			if killErr := process.Kill(); killErr != nil {
+				return fmt.Errorf("timed out after %d seconds waiting for process %d, and failed to kill it: %w", timeoutSeconds, process.Pid, killErr)
+			}
+			return nil
+
+		case <-ticker.C:
+			alive, err := IsProcessAlive(process)
+			if err != nil {
+				return fmt.Errorf("failed to check status of process %d: %w", process.Pid, err)
+			}
+			if !alive {
+				return nil
+			}
 		}
-		<-done
-		return errors.New("timeout waiting for process to exit")
 	}
 }

bridge/exec_others.go

@@ -3,6 +3,8 @@
 package bridge
 
 import (
+	"errors"
+	"fmt"
 	"os"
 	"os/exec"
 	"syscall"
@@ -11,6 +13,25 @@ import (
 func SetCmdWindowHidden(cmd *exec.Cmd) {
 }
 
-func SendExitSignal(process *os.Process) error {
-	return process.Signal(syscall.SIGINT)
+func SendExitSignal(p *os.Process) error {
+	return p.Signal(syscall.SIGINT)
+}
+
+func IsProcessAlive(p *os.Process) (bool, error) {
+	err := p.Signal(syscall.Signal(0))
+	if err == nil {
+		return true, nil
+	}
+	if errors.Is(err, os.ErrProcessDone) {
+		return false, nil
+	}
+	if errno, ok := err.(syscall.Errno); ok {
+		switch errno {
+		case syscall.ESRCH:
+			return false, nil
+		case syscall.EPERM:
+			return true, nil
+		}
+	}
+	return false, fmt.Errorf("failed to check process %d: %w", p.Pid, err)
 }

bridge/exec_windows.go

@@ -3,13 +3,25 @@
 package bridge
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"syscall"
 
 	"golang.org/x/sys/windows"
 )
 
+const ATTACH_PARENT_PROCESS uintptr = ^uintptr(0)
+
+var (
+	modKernel32 = windows.NewLazySystemDLL("kernel32.dll")
+
+	procFreeConsole              = modKernel32.NewProc("FreeConsole")
+	procAttachConsole            = modKernel32.NewProc("AttachConsole")
+	procSetConsoleCtrlHandler    = modKernel32.NewProc("SetConsoleCtrlHandler")
+	procGenerateConsoleCtrlEvent = modKernel32.NewProc("GenerateConsoleCtrlEvent")
+)
+
 func SetCmdWindowHidden(cmd *exec.Cmd) {
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		CreationFlags: windows.CREATE_UNICODE_ENVIRONMENT | windows.CREATE_NEW_PROCESS_GROUP,
@@ -18,46 +30,49 @@ func SetCmdWindowHidden(cmd *exec.Cmd) {
 }
 
 func SendExitSignal(p *os.Process) error {
-	kernel32DLL, err := windows.LoadDLL("kernel32.dll")
-	if err != nil {
+	if ret, _, err := procFreeConsole.Call(); ret == 0 && err != windows.ERROR_INVALID_HANDLE {
 		return err
 	}
-	defer kernel32DLL.Release()
 
-	freeConsoleProc, err := kernel32DLL.FindProc("FreeConsole")
-	if err == nil {
-		if result, _, err := freeConsoleProc.Call(); result == 0 {
-			if err != windows.ERROR_INVALID_HANDLE {
-				return err
-			}
-		}
-	}
+	defer func() {
+		procAttachConsole.Call(ATTACH_PARENT_PROCESS)
+	}()
 
-	attachConsoleProc, err := kernel32DLL.FindProc("AttachConsole")
-	if err != nil {
+	if ret, _, err := procAttachConsole.Call(uintptr(p.Pid)); ret == 0 && err != windows.ERROR_ACCESS_DENIED {
 		return err
 	}
-	if result, _, err := attachConsoleProc.Call(uintptr(p.Pid)); result == 0 {
-		if err != windows.ERROR_ACCESS_DENIED {
-			return err
-		}
-	}
 
-	setConsoleCtrlHandlerProc, err := kernel32DLL.FindProc("SetConsoleCtrlHandler")
-	if err != nil {
+	if ret, _, err := procSetConsoleCtrlHandler.Call(0, 1); ret == 0 {
 		return err
 	}
-	if result, _, err := setConsoleCtrlHandlerProc.Call(0, 1); result == 0 {
+
+	if ret, _, err := procGenerateConsoleCtrlEvent.Call(windows.CTRL_BREAK_EVENT, uintptr(p.Pid)); ret == 0 {
 		return err
 	}
 
-	generateConsoleCtrlEventProc, err := kernel32DLL.FindProc("GenerateConsoleCtrlEvent")
+	return nil
+}
+
+func IsProcessAlive(p *os.Process) (bool, error) {
+	h, err := windows.OpenProcess(windows.SYNCHRONIZE, false, uint32(p.Pid))
 	if err != nil {
-		return err
-	}
-	if result, _, err := generateConsoleCtrlEventProc.Call(windows.CTRL_BREAK_EVENT, uintptr(p.Pid)); result == 0 {
-		return err
+		if err == windows.ERROR_INVALID_PARAMETER {
+			return false, nil
+		}
+		return false, err
 	}
+	defer windows.CloseHandle(h)
 
-	return nil
+	s, err := windows.WaitForSingleObject(h, 0)
+	if err != nil {
+		return false, err
+	}
+	switch s {
+	case windows.WAIT_OBJECT_0:
+		return false, nil
+	case uint32(windows.WAIT_TIMEOUT):
+		return true, nil
+	default:
+		return false, fmt.Errorf("unexpected WaitForSingleObject status: %d", s)
+	}
 }

bridge/io.go

@@ -18,8 +18,8 @@ const (
 	Text   = "Text"
 )
 
-func (a *App) Writefile(path string, content string, options IOOptions) FlagResult {
-	log.Printf("Writefile [%s]: %s", options.Mode, path)
+func (a *App) WriteFile(path string, content string, options IOOptions) FlagResult {
+	log.Printf("WriteFile [%s]: %s", options.Mode, path)
 
 	fullPath := GetPath(path)
 
@@ -49,8 +49,8 @@ func (a *App) Writefile(path string, content string, options IOOptions) FlagResu
 	return FlagResult{true, "Success"}
 }
 
-func (a *App) Readfile(path string, options IOOptions) FlagResult {
-	log.Printf("Readfile [%s]: %s", options.Mode, path)
+func (a *App) ReadFile(path string, options IOOptions) FlagResult {
+	log.Printf("ReadFile [%s]: %s", options.Mode, path)
 
 	fullPath := GetPath(path)
 
@@ -69,8 +69,8 @@ func (a *App) Readfile(path string, options IOOptions) FlagResult {
 	}
 }
 
-func (a *App) Movefile(source string, target string) FlagResult {
-	log.Printf("Movefile: %s -> %s", source, target)
+func (a *App) MoveFile(source string, target string) FlagResult {
+	log.Printf("MoveFile: %s -> %s", source, target)
 
 	fullSource := GetPath(source)
 	fullTarget := GetPath(target)
@@ -86,7 +86,7 @@ func (a *App) Movefile(source string, target string) FlagResult {
 	return FlagResult{true, "Success"}
 }
 
-func (a *App) Removefile(path string) FlagResult {
+func (a *App) RemoveFile(path string) FlagResult {
 	log.Printf("RemoveFile: %s", path)
 
 	fullPath := GetPath(path)
@@ -98,8 +98,8 @@ func (a *App) Removefile(path string) FlagResult {
 	return FlagResult{true, "Success"}
 }
 
-func (a *App) Copyfile(src string, dst string) FlagResult {
-	log.Printf("Copyfile: %s -> %s", src, dst)
+func (a *App) CopyFile(src string, dst string) FlagResult {
+	log.Printf("CopyFile: %s -> %s", src, dst)
 
 	srcPath := GetPath(src)
 	dstPath := GetPath(dst)
@@ -127,8 +127,8 @@ func (a *App) Copyfile(src string, dst string) FlagResult {
 	return FlagResult{true, "Success"}
 }
 
-func (a *App) Makedir(path string) FlagResult {
-	log.Printf("Makedir: %s", path)
+func (a *App) MakeDir(path string) FlagResult {
+	log.Printf("MakeDir: %s", path)
 
 	fullPath := GetPath(path)
 
@@ -139,8 +139,8 @@ func (a *App) Makedir(path string) FlagResult {
 	return FlagResult{true, "Success"}
 }
 
-func (a *App) Readdir(path string) FlagResult {
-	log.Printf("Readdir: %s", path)
+func (a *App) ReadDir(path string) FlagResult {
+	log.Printf("ReadDir: %s", path)
 
 	fullPath := GetPath(path)
 

bridge/types.go

@@ -17,6 +17,7 @@ type EnvResult struct {
 	IsStartup   bool   `json:"-"`
 	FromTaskSch bool   `json:"-"`
 	AppName     string `json:"appName"`
+	AppVersion  string `json:"appVersion"`
 	BasePath    string `json:"basePath"`
 	OS          string `json:"os"`
 	ARCH        string `json:"arch"`
@@ -33,9 +34,9 @@ type RequestOptions struct {
 }
 
 type ExecOptions struct {
-	StopOutputKeyword string            `json:"stopOutputKeyword"`
-	Convert           bool              `json:"convert"`
-	Env               map[string]string `json:"env"`
+	StopOutputKeyword string
+	Convert           bool
+	Env               map[string]string
 }
 
 type IOOptions struct {
@@ -48,18 +49,18 @@ type FlagResult struct {
 }
 
 type ServerOptions struct {
-	Cert          string `json:"Cert"`
-	Key           string `json:"Key"`
-	StaticPath    string `json:"StaticPath"`
-	StaticRoute   string `json:"StaticRoute"`
-	UploadPath    string `json:"UploadPath"`
-	UploadRoute   string `json:"UploadRoute"`
-	MaxUploadSize int64  `json:"MaxUploadSize"`
+	Cert          string
+	Key           string
+	StaticPath    string
+	StaticRoute   string
+	UploadPath    string
+	UploadRoute   string
+	MaxUploadSize int64
 }
 
 type NotifyOptions struct {
-	AppName string `json:"AppName"`
-	Beep    bool   `json:"Beep"`
+	AppName string
+	Beep    bool
 }
 
 type HTTPResult struct {

frontend/.env

@@ -1,5 +1,5 @@
 VITE_APP_TITLE = GUI.for.Clash
-VITE_APP_VERSION = v1.9.8
+VITE_APP_VERSION = v1.9.9
 VITE_APP_PROJECT_URL = https://github.com/GUI-for-Cores
 VITE_APP_VERSION_API = https://api.github.com/repos/GUI-for-Cores/GUI.for.Clash/releases/latest
 VITE_APP_TG_GROUP = https://t.me/GUI_for_Cores