Release v1.9.8-Alpha

Author: Ayideyia

.github/workflows/release.yml

@@ -42,31 +42,30 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: ./go.mod
+          go-version-file: go.mod
+          check-latest: true
       - run: go version
       - name: Set up pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 9
-      - run: pnpm -v
+          version: latest
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "latest"
           cache: "pnpm"
           cache-dependency-path: frontend/pnpm-lock.yaml
-      - run: node -v
       - name: Install dependencies
         run: |
-          cd frontend && pnpm install
+          cd frontend && pnpm install --frozen-lockfile
           go install github.com/wailsapp/wails/v2/cmd/wails@latest
 
       # Dependencies: GNU/Linux
       - name: Update system and dependencies
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev
+          sudo apt-get install libgtk-3-dev libwebkit2gtk-4.1-dev
 
       # Hide dock bar icon: macOS
       - name: Update system and dependencies
@@ -125,6 +124,6 @@ jobs:
           release_name: ${{ github.ref_name }}
           overwrite: true
           draft: false
-          prerelease: false
+          prerelease: true
           body: |
             Auto-generated release from GitHub Actions.

.github/workflows/rolling-release.yml

@@ -19,15 +19,15 @@ jobs:
       - name: Set up pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: latest
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "latest"
           cache: "pnpm"
           cache-dependency-path: frontend/pnpm-lock.yaml
       - name: Install dependencies
-        run: cd frontend && pnpm install
+        run: cd frontend && pnpm install --frozen-lockfile
       - name: Build Frontend
         run: cd frontend && pnpm build-only
       - name: Create a compressed file

README.md

@@ -34,9 +34,7 @@ git clone https://github.com/GUI-for-Cores/GUI.for.Clash.git
 
 cd GUI.for.Clash/frontend
 
-pnpm install
-
-pnpm build
+pnpm install --frozen-lockfile && pnpm build
 
 cd ..
 

bridge/exec.go

@@ -10,8 +10,6 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
-	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/shirou/gopsutil/process"
@@ -50,7 +48,7 @@ func (a *App) Exec(path string, args []string, options ExecOptions) FlagResult {
 }
 
 func (a *App) ExecBackground(path string, args []string, outEvent string, endEvent string, options ExecOptions) FlagResult {
-	log.Printf("ExecBackground: %s %s %v", path, args, options)
+	log.Printf("ExecBackground: %s %s %s %s %v", path, args, outEvent, endEvent, options)
 
 	exePath := GetPath(path)
 
@@ -70,45 +68,36 @@ func (a *App) ExecBackground(path string, args []string, outEvent string, endEve
 		return FlagResult{false, err.Error()}
 	}
 
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		return FlagResult{false, err.Error()}
-	}
+	cmd.Stderr = cmd.Stdout
 
 	if err := cmd.Start(); err != nil {
 		return FlagResult{false, err.Error()}
 	}
 
 	if outEvent != "" {
-		var keywordFound int32 = 0
-		wg := &sync.WaitGroup{}
-		wg.Add(2)
-
 		scanAndEmit := func(reader io.Reader) {
-			defer wg.Done()
 			scanner := bufio.NewScanner(reader)
+			stopOutput := false
 			for scanner.Scan() {
-				if atomic.LoadInt32(&keywordFound) == 1 {
-					continue
-				}
 				text := scanner.Text()
-				if options.StopOutputKeyword != "" && strings.Contains(text, options.StopOutputKeyword) {
-					atomic.StoreInt32(&keywordFound, 1)
+
+				if !stopOutput {
 					runtime.EventsEmit(a.Ctx, outEvent, text)
-					continue
+
+					if options.StopOutputKeyword != "" && strings.Contains(text, options.StopOutputKeyword) {
+						stopOutput = true
+					}
 				}
-				runtime.EventsEmit(a.Ctx, outEvent, text)
 			}
 		}
 
 		go scanAndEmit(stdout)
-		go scanAndEmit(stderr)
+	}
 
+	if endEvent != "" {
 		go func() {
-			wg.Wait()
-			if endEvent != "" {
-				runtime.EventsEmit(a.Ctx, endEvent)
-			}
+			cmd.Wait()
+			runtime.EventsEmit(a.Ctx, endEvent)
 		}()
 	}
 
@@ -133,8 +122,8 @@ func (a *App) ProcessInfo(pid int32) FlagResult {
 	return FlagResult{true, name}
 }
 
-func (a *App) KillProcess(pid int) FlagResult {
-	log.Printf("KillProcess: %d", pid)
+func (a *App) KillProcess(pid int, timeout int) FlagResult {
+	log.Printf("KillProcess: %d %d", pid, timeout)
 
 	process, err := os.FindProcess(pid)
 	if err != nil {
@@ -145,26 +134,27 @@ func (a *App) KillProcess(pid int) FlagResult {
 		log.Printf("SendExitSignal Err: %s", err.Error())
 	}
 
-	if err := waitForProcessExitWithTimeout(process, 10); err != nil {
+	if err := waitForProcessExitWithTimeout(process, timeout); err != nil {
 		return FlagResult{false, err.Error()}
 	}
 
 	return FlagResult{true, "Success"}
 }
 
-func waitForProcessExitWithTimeout(process *os.Process, timeoutSeconds int64) error {
+func waitForProcessExitWithTimeout(process *os.Process, timeoutSeconds int) error {
 	done := make(chan error, 1)
 	go func() {
 		_, err := process.Wait()
 		done <- err
 	}()
 
-	timeout := time.After(time.Duration(timeoutSeconds) * time.Second)
+	timer := time.NewTimer(time.Duration(timeoutSeconds) * time.Second)
+	defer timer.Stop()
 
 	select {
 	case err := <-done:
 		return err
-	case <-timeout:
+	case <-timer.C:
 		if killErr := process.Kill(); killErr != nil {
 			return fmt.Errorf("timeout reached and failed to kill process: %w", killErr)
 		}

bridge/net.go

@@ -27,11 +27,13 @@ func (a *App) Requests(method string, url string, headers map[string]string, bod
 
 	req.Header = GetHeader(headers)
 
-	runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
-		log.Printf("Requests Canceled: %v %v", method, url)
-		cancel()
-	})
-	defer runtime.EventsOff(a.Ctx, options.CancelId)
+	if options.CancelId != "" {
+		runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
+			log.Printf("Requests Canceled: %v %v", method, url)
+			cancel()
+		})
+		defer runtime.EventsOff(a.Ctx, options.CancelId)
+	}
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -47,23 +49,25 @@ func (a *App) Requests(method string, url string, headers map[string]string, bod
 	return HTTPResult{true, resp.StatusCode, resp.Header, string(b)}
 }
 
-func (a *App) Download(url string, path string, headers map[string]string, event string, options RequestOptions) HTTPResult {
-	log.Printf("Download: %v %v %v, %v", url, path, headers, options)
+func (a *App) Download(method string, url string, path string, headers map[string]string, event string, options RequestOptions) HTTPResult {
+	log.Printf("Download: %s %s %s %v %s %v", method, url, path, headers, event, options)
 
 	client, ctx, cancel := withRequestOptionsClient(options)
 
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, method, url, nil)
 	if err != nil {
 		return HTTPResult{false, 500, nil, err.Error()}
 	}
 
 	req.Header = GetHeader(headers)
 
-	runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
-		log.Printf("Download Canceled: %v %v", url, path)
-		cancel()
-	})
-	defer runtime.EventsOff(a.Ctx, options.CancelId)
+	if options.CancelId != "" {
+		runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
+			log.Printf("Download Canceled: %v %v", url, path)
+			cancel()
+		})
+		defer runtime.EventsOff(a.Ctx, options.CancelId)
+	}
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -84,12 +88,7 @@ func (a *App) Download(url string, path string, headers map[string]string, event
 	}
 	defer file.Close()
 
-	reader := io.TeeReader(resp.Body, &WriteTracker{
-		Total:          resp.ContentLength,
-		EmitThreshold:  128 * 1024, // 128KB
-		ProgressChange: event,
-		App:            a,
-	})
+	reader := wrapWithProgress(resp.Body, resp.ContentLength, event, a)
 
 	_, err = io.Copy(file, reader)
 	if err != nil {
@@ -99,8 +98,8 @@ func (a *App) Download(url string, path string, headers map[string]string, event
 	return HTTPResult{true, resp.StatusCode, resp.Header, "Success"}
 }
 
-func (a *App) Upload(url string, path string, headers map[string]string, event string, options RequestOptions) HTTPResult {
-	log.Printf("Upload: %v %v %v %v", url, path, headers, options)
+func (a *App) Upload(method string, url string, path string, headers map[string]string, event string, options RequestOptions) HTTPResult {
+	log.Printf("Upload: %s %s %s %v %s %v", method, url, path, headers, event, options)
 
 	path = GetPath(path)
 
@@ -123,12 +122,7 @@ func (a *App) Upload(url string, path string, headers map[string]string, event s
 		return HTTPResult{false, 500, nil, err.Error()}
 	}
 
-	reader := io.TeeReader(file, &WriteTracker{
-		Total:          fileStat.Size(),
-		EmitThreshold:  128 * 1024, // 128KB
-		ProgressChange: event,
-		App:            a,
-	})
+	reader := wrapWithProgress(file, fileStat.Size(), event, a)
 
 	_, err = io.Copy(part, reader)
 	if err != nil {
@@ -142,13 +136,15 @@ func (a *App) Upload(url string, path string, headers map[string]string, event s
 
 	client, ctx, cancel := withRequestOptionsClient(options)
 
-	runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
-		log.Printf("Upload Canceled: %v %v", url, path)
-		cancel()
-	})
-	defer runtime.EventsOff(a.Ctx, options.CancelId)
+	if options.CancelId != "" {
+		runtime.EventsOn(a.Ctx, options.CancelId, func(data ...any) {
+			log.Printf("Upload Canceled: %v %v", url, path)
+			cancel()
+		})
+		defer runtime.EventsOff(a.Ctx, options.CancelId)
+	}
 
-	req, err := http.NewRequestWithContext(ctx, "POST", url, body)
+	req, err := http.NewRequestWithContext(ctx, method, url, body)
 	if err != nil {
 		return HTTPResult{false, 500, nil, err.Error()}
 	}
@@ -174,10 +170,6 @@ func (wt *WriteTracker) Write(p []byte) (n int, err error) {
 	n = len(p)
 	wt.Progress += int64(n)
 
-	if wt.ProgressChange == "" {
-		return n, nil
-	}
-
 	shouldEmit := wt.Total <= 0 || wt.Progress-wt.LastEmitted >= wt.EmitThreshold || wt.Progress == wt.Total
 	if shouldEmit {
 		runtime.EventsEmit(wt.App.Ctx, wt.ProgressChange, wt.Progress, wt.Total)
@@ -187,6 +179,18 @@ func (wt *WriteTracker) Write(p []byte) (n int, err error) {
 	return n, nil
 }
 
+func wrapWithProgress(r io.Reader, size int64, event string, a *App) io.Reader {
+	if event == "" {
+		return r
+	}
+	return io.TeeReader(r, &WriteTracker{
+		Total:          size,
+		EmitThreshold:  128 * 1024,
+		ProgressChange: event,
+		App:            a,
+	})
+}
+
 func withRequestOptionsClient(options RequestOptions) (*http.Client, context.Context, context.CancelFunc) {
 	client := &http.Client{
 		Timeout: GetTimeout(options.Timeout),

bridge/notification.go

@@ -4,10 +4,17 @@ import (
 	"github.com/gen2brain/beeep"
 )
 
-func (a *App) Notify(title string, message string, icon string) FlagResult {
+func (a *App) Notify(title string, message string, icon string, options NotifyOptions) FlagResult {
 	fullPath := GetPath(icon)
 
-	err := beeep.Notify(title, message, fullPath)
+	beeep.AppName = options.AppName
+
+	var err error
+	if options.Beep {
+		err = beeep.Alert(title, message, fullPath)
+	} else {
+		err = beeep.Notify(title, message, fullPath)
+	}
 	if err != nil {
 		return FlagResult{false, err.Error()}
 	}

bridge/types.go

@@ -57,6 +57,11 @@ type ServerOptions struct {
 	MaxUploadSize int64  `json:"MaxUploadSize"`
 }
 
+type NotifyOptions struct {
+	AppName string `json:"AppName"`
+	Beep    bool   `json:"Beep"`
+}
+
 type HTTPResult struct {
 	Flag    bool        `json:"flag"`
 	Status  int         `json:"status"`

bridge/utils.go

@@ -66,7 +66,7 @@ func RollingRelease(next http.Handler) http.Handler {
 
 		log.Printf("[Rolling Release] %v %v\n", r.Method, url)
 
-		file := GetPath("data/rolling-release" + url)
+		file := GetPath("data/rolling-release-alpha" + url)
 
 		bytes, err := os.ReadFile(file)
 		if err != nil {

frontend/.env

@@ -1,5 +1,5 @@
 VITE_APP_TITLE = GUI.for.Clash
-VITE_APP_VERSION = v1.9.7
+VITE_APP_VERSION = v1.9.8-Alpha
 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